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

Remove use of getMap on the map itself

Browse source
This commit is contained in:
Yohan Boniface 2023-08-01 14:27:23 +02:00
parent ac30e71e74
commit 3d45242684
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
umap/static/umap/js/umap.controls.js
View file

@ -813,14 +813,14 @@ L.U.Map.include({
const advancedFiltersFull = {} const advancedFiltersFull = {}
let filtersAlreadyLoaded = true let filtersAlreadyLoaded = true
if (!this.getMap().options.advancedFilters) { if (!this.options.advancedFilters) {
this.getMap().options.advancedFilters = {} this.options.advancedFilters = {}
filtersAlreadyLoaded = false filtersAlreadyLoaded = false
} }
advancedFilterKeys.forEach((property) => { advancedFilterKeys.forEach((property) => {
advancedFiltersFull[property] = [] advancedFiltersFull[property] = []
if (!filtersAlreadyLoaded || !this.getMap().options.advancedFilters[property]) { if (!filtersAlreadyLoaded || !this.options.advancedFilters[property]) {
this.getMap().options.advancedFilters[property] = [] this.options.advancedFilters[property] = []
} }
}) })
this.eachBrowsableDataLayer((datalayer) => { this.eachBrowsableDataLayer((datalayer) => {
@ -842,10 +842,10 @@ L.U.Map.include({
filter_check.type = 'checkbox' filter_check.type = 'checkbox'
filter_check.id = `checkbox_${property}_${value}` filter_check.id = `checkbox_${property}_${value}`
filter_check.checked = filter_check.checked =
this.getMap().options.advancedFilters[property] && this.options.advancedFilters[property] &&
this.getMap().options.advancedFilters[property].includes(value) this.options.advancedFilters[property].includes(value)
filter_check.setAttribute('data-property', property) filter_check.dataset.property = property
filter_check.setAttribute('data-value', value) filter_check.dataset.value = value
filter_label.htmlFor = `checkbox_${property}_${value}` filter_label.htmlFor = `checkbox_${property}_${value}`
filter_label.innerHTML = value filter_label.innerHTML = value
L.DomEvent.on( L.DomEvent.on(
@ -855,10 +855,10 @@ L.U.Map.include({
const property = e.srcElement.dataset.property const property = e.srcElement.dataset.property
const value = e.srcElement.dataset.value const value = e.srcElement.dataset.value
if (e.srcElement.checked) { if (e.srcElement.checked) {
this.getMap().options.advancedFilters[property].push(value) this.options.advancedFilters[property].push(value)
} else { } else {
this.getMap().options.advancedFilters[property].splice( this.options.advancedFilters[property].splice(
this.getMap().options.advancedFilters[property].indexOf(value), this.options.advancedFilters[property].indexOf(value),
1 1
) )
} }