Skip to content

Commit

Permalink
feat: handle multiple dataUrl parameters on map load
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbgk committed Jun 25, 2024
1 parent adc1cf4 commit bb662e3
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions umap/static/umap/js/umap.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,17 @@ U.Map = L.Map.extend({
this._default_extent = true
this.options.name = L._('Untitled map')
let data = L.Util.queryString('data', null)
let dataUrl = L.Util.queryString('dataUrl', null)
const url = new URL(window.location.href)
const dataUrls = new URLSearchParams(url.search).getAll('dataUrl')
const dataFormat = L.Util.queryString('dataFormat', 'geojson')
if (dataUrl) {
dataUrl = decodeURIComponent(dataUrl)
dataUrl = this.localizeUrl(dataUrl)
dataUrl = this.proxyUrl(dataUrl)
const datalayer = this.createDataLayer()
datalayer.importFromUrl(dataUrl, dataFormat)
if (dataUrls.length) {
for (let dataUrl of dataUrls) {
dataUrl = decodeURIComponent(dataUrl)
dataUrl = this.localizeUrl(dataUrl)
dataUrl = this.proxyUrl(dataUrl)
const datalayer = this.createDataLayer()
datalayer.importFromUrl(dataUrl, dataFormat)
}
} else if (data) {
data = decodeURIComponent(data)
const datalayer = this.createDataLayer()
Expand Down

0 comments on commit bb662e3

Please sign in to comment.