X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3cf3d888b28ae8d9c2697a9b1083f3d5997e3947..899dab08f91e0b6b175105c4e419000f8649f91c:/app/assets/javascripts/osm.js.erb?ds=inline diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 75562ad48..81c1e3152 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,12 +1,14 @@ OSM = { <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %> - PIWIK_LOCATION: <%= PIWIK_LOCATION.to_json %>, - PIWIK_SITE: <%= PIWIK_SITE.to_json %>, + PIWIK_LOCATION: <%= PIWIK_LOCATION.to_json %>, + PIWIK_SITE: <%= PIWIK_SITE.to_json %>, <% end %> - MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>, - SERVER_URL: <%= SERVER_URL.to_json %>, - API_VERSION: <%= API_VERSION.to_json %>, + MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>, + SERVER_URL: <%= SERVER_URL.to_json %>, + API_VERSION: <%= API_VERSION.to_json %>, + STATUS: <%= STATUS.to_json %>, + MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>, apiUrl: function (object) { var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id; @@ -23,7 +25,7 @@ OSM = { mapParams: function (search) { var params = {}, mapParams = {}, loc; - search = (search || window.location.search).replace('?', '').split('&'); + search = (search || window.location.search).replace('?', '').split(/&|;/); for (var i = 0; i < search.length; ++i) { var pair = search[i], @@ -109,6 +111,12 @@ OSM = { mapParams.lat = (mapParams.minlat + mapParams.maxlat) / 2; } + mapParams.notes = params.notes == "yes"; + + if (params.note) { + mapParams.note = parseInt(params.note); + } + var scale = parseFloat(params.scale); if (scale > 0) { mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);