jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1592 from umap-project/zoomto-from-qs

Browse source 
feat: allow to set zoomTo from query string
This commit is contained in:
Yohan Boniface 2024-02-14 18:34:04 +01:00 committed by GitHub
commit 34608f55c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
umap/static/umap/js/umap.core.js
View file

@ -27,6 +27,10 @@ L.Util.setBooleanFromQueryString = (options, name) => {
const value = L.Util.queryString(name) const value = L.Util.queryString(name)
if (typeof value !== 'undefined') options[name] = value == '1' || value == 'true' if (typeof value !== 'undefined') options[name] = value == '1' || value == 'true'
} }
L.Util.setNumberFromQueryString = (options, name) => {
const value = +L.Util.queryString(name)
if (!isNaN(value)) options[name] = value
}
L.Util.setNullableBooleanFromQueryString = (options, name) => { L.Util.setNullableBooleanFromQueryString = (options, name) => {
let value = L.Util.queryString(name) let value = L.Util.queryString(name)
if (typeof value !== 'undefined') { if (typeof value !== 'undefined') {

10
umap/static/umap/js/umap.js
View file

@ -86,16 +86,16 @@ U.Map = L.Map.extend({
popupShape: String, popupShape: String,
popupTemplate: String, popupTemplate: String,
popupContentTemplate: String, popupContentTemplate: String,
zoomTo: undefined, zoomTo: Number,
captionBar: Boolean, captionBar: Boolean,
captionMenus: Boolean, captionMenus: Boolean,
slideshow: undefined, slideshow: undefined,
sortKey: undefined, sortKey: undefined,
labelKey: undefined, labelKey: String,
filterKey: undefined, filterKey: undefined,
facetKey: undefined, facetKey: undefined,
slugKey: undefined, slugKey: undefined,
showLabel: undefined, showLabel: 'NullableBoolean',
labelDirection: undefined, labelDirection: undefined,
labelInteractive: undefined, labelInteractive: undefined,
outlinkTarget: undefined, outlinkTarget: undefined,
@ -342,8 +342,12 @@ U.Map = L.Map.extend({
case 'NullableBoolean': case 'NullableBoolean':
L.Util.setNullableBooleanFromQueryString(options, key) L.Util.setNullableBooleanFromQueryString(options, key)
break break
case Number:
L.Util.setNumberFromQueryString(options, key)
break
case String: case String:
L.Util.setFromQueryString(options, key) L.Util.setFromQueryString(options, key)
break
} }
} }
// Specific case for datalayersControl // Specific case for datalayersControl

5
umap/static/umap/js/umap.layer.js
View file

@ -1458,7 +1458,10 @@ U.DataLayer = L.Evented.extend({
zoomTo: function () { zoomTo: function () {
if (!this.isVisible()) return if (!this.isVisible()) return
const bounds = this.layer.getBounds() const bounds = this.layer.getBounds()
if (bounds.isValid()) this.map.fitBounds(bounds) if (bounds.isValid()) {
const options = {maxZoom: this.getOption("zoomTo")}
this.map.fitBounds(bounds, options)
}
}, },
// Is this layer type browsable in theorie // Is this layer type browsable in theorie