From ccd9fc51cca66de03b17a438529cb2585eea7b8f Mon Sep 17 00:00:00 2001 From: Norbert Renner Date: Wed, 24 Mar 2021 09:06:10 +0100 Subject: [PATCH] Remove `?data=` from overpassBaseUrl --- js/LayersConfig.js | 4 +--- js/plugin/CircleGoArea.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/LayersConfig.js b/js/LayersConfig.js index ee56372..7a79cce 100644 --- a/js/LayersConfig.js +++ b/js/LayersConfig.js @@ -1,7 +1,5 @@ BR.LayersConfig = L.Class.extend({ - overpassFrontend: new OverpassFrontend( - (BR.conf.overpassBaseUrl || '//overpass-api.de/api/interpreter').replace('?data=', '') - ), + overpassFrontend: new OverpassFrontend(BR.conf.overpassBaseUrl || '//overpass-api.de/api/interpreter'), defaultBaseLayers: BR.confLayers.defaultBaseLayers, defaultOverlays: BR.confLayers.defaultOverlays, legacyNameToIdMap: BR.confLayers.legacyNameToIdMap, diff --git a/js/plugin/CircleGoArea.js b/js/plugin/CircleGoArea.js index f43a5d5..78939d3 100644 --- a/js/plugin/CircleGoArea.js +++ b/js/plugin/CircleGoArea.js @@ -11,7 +11,7 @@ BR.CircleGoArea = L.Control.extend({ options: { countriesUrl: BR.conf.countriesUrl || 'dist/boundaries/countries.topo.json', statesUrl: BR.conf.statesUrl || 'dist/boundaries/germany-states.topo.json', - overpassBaseUrl: BR.conf.overpassBaseUrl || 'https://overpass-api.de/api/interpreter?data=', + overpassDataUrl: (BR.conf.overpassBaseUrl || 'https://overpass-api.de/api/interpreter') + '?data=', shortcut: { draw: { enable: 73, // char code for 'i' @@ -137,7 +137,7 @@ BR.CircleGoArea = L.Control.extend({ query += '(area.a[admin_level="' + adminLevelFallback + '"];)->.p; relation(pivot.p); out geom;'; } - var url = this.options.overpassBaseUrl + encodeURIComponent(query); + var url = this.options.overpassDataUrl + encodeURIComponent(query); this.marker.setIcon(this.iconSpinner); BR.Util.getJson(