X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9018d1af07c53b03bf8caf0480b931dc25f57147..3c38bad5611b0344b69ac6b419069ab32867f8b1:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 529ac3bea..0ffd35e2c 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -3,8 +3,8 @@ //= require qs/dist/qs OSM = { -<% if defined?(PIWIK) %> - PIWIK: <%= PIWIK.to_json %>, +<% if defined?(Settings.matomo) %> + MATOMO: <%= Settings.matomo.to_json %>, <% end %> MAX_REQUEST_AREA: <%= Settings.max_request_area.to_json %>, @@ -14,9 +14,11 @@ OSM = { STATUS: <%= Settings.status.to_json %>, MAX_NOTE_REQUEST_AREA: <%= Settings.max_note_request_area.to_json %>, OVERPASS_URL: <%= Settings.overpass_url.to_json %>, + OVERPASS_CREDENTIALS: <%= Settings.overpass_credentials.to_json %>, NOMINATIM_URL: <%= Settings.nominatim_url.to_json %>, GRAPHHOPPER_URL: <%= Settings.graphhopper_url.to_json %>, FOSSGIS_OSRM_URL: <%= Settings.fossgis_osrm_url.to_json %>, + FOSSGIS_VALHALLA_URL: <%= Settings.fossgis_valhalla_url.to_json %>, DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>, <% if Settings.key?(:thunderforest_key) %> @@ -34,10 +36,9 @@ OSM = { OPEN_NOTE_MARKER: <%= image_path("open_note_marker.png").to_json %>, CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.png").to_json %>, - SEARCHING: <%= image_path("searching.gif").to_json %>, - apiUrl: function (object) { - var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id; + var apiType = object.type === "note" ? "notes" : object.type; + var url = "/api/" + OSM.API_VERSION + "/" + apiType + "/" + object.id; if (object.type === "way" || object.type === "relation") { url += "/full"; @@ -85,6 +86,8 @@ OSM = { mapParams.object = {type: 'way', id: parseInt(params.way)}; } else if (params.relation) { mapParams.object = {type: 'relation', id: parseInt(params.relation)}; + } else if (params.note) { + mapParams.object = {type: 'note', id: parseInt(params.note)}; } var hash = OSM.parseHash(location.hash); @@ -146,7 +149,7 @@ OSM = { return args; } - hash = Qs.parse(hash.substr(i + 1)); + hash = Qs.parse(hash.slice(i + 1)); var map = (hash.map || '').split('/'), zoom = parseInt(map[0], 10),