X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ee58d77b7cef4be7642fe21f07ee978d68f0260..366fb80ddb401fde376515dd12f51e281afe62da:/app/assets/javascripts/osm.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 4430943d1..5c555a25a 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,7 +1,6 @@ OSM = { -<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %> - PIWIK_LOCATION: <%= PIWIK_LOCATION.to_json %>, - PIWIK_SITE: <%= PIWIK_SITE.to_json %>, +<% if defined?(PIWIK) %> + PIWIK: <%= PIWIK.to_json %>, <% end %> MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>, @@ -22,8 +21,8 @@ OSM = { return url; }, - mapParams: function (search) { - var params = {}, mapParams = {}, bounds, loc; + params: function(search) { + var params = {}; search = (search || window.location.search).replace('?', '').split(/&|;/); @@ -35,6 +34,12 @@ OSM = { params[key] = decodeURIComponent(val); } + return params; + }, + + mapParams: function (search) { + var params = OSM.params(search), mapParams = {}, bounds, loc; + if (params.mlon && params.mlat) { mapParams.marker = true; mapParams.mlon = parseFloat(params.mlon); @@ -81,6 +86,8 @@ OSM = { mapParams.zoom = hash.zoom; mapParams.object_zoom = false; } else if (bounds) { + mapParams.lon = bounds.getCenter().lng; // Not used by main map, but + mapParams.lat = bounds.getCenter().lat; // are used by iD/Potlatch. mapParams.bounds = bounds; mapParams.object_zoom = false; } else if (params.lon && params.lat) {