X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c..b79e4f04b9197e1c1954638db46c9d97597612d4:/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 971f80be3..e429f4479 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,44 +1,51 @@ -//= depend_on application.yml +//= depend_on settings.yml +//= depend_on settings.local.yml +//= depend_on key.yml +//= 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: <%= 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 %>, - OVERPASS_URL: <%= OVERPASS_URL.to_json %>, - NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>, - GRAPHHOPPER_URL: <%= GRAPHHOPPER_URL.to_json %>, - MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>, - OSRM_URL: <%= OSRM_URL.to_json %>, + MAX_REQUEST_AREA: <%= Settings.max_request_area.to_json %>, + SERVER_PROTOCOL: <%= Settings.server_protocol.to_json %>, + SERVER_URL: <%= Settings.server_url.to_json %>, + API_VERSION: <%= Settings.api_version.to_json %>, + 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 defined?(MAPQUEST_KEY) %> - MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>, +<% if Settings.key?(:thunderforest_key) %> + THUNDERFOREST_KEY: <%= Settings.thunderforest_key.to_json %>, <% end %> -<% if defined?(THUNDERFOREST_KEY) %> - THUNDERFOREST_KEY: <%= THUNDERFOREST_KEY.to_json %>, + +<% if Settings.key?(:tracestrack_key) %> + TRACESTRACK_KEY: <%= Settings.tracestrack_key.to_json %>, <% end %> + LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>, + MARKER_GREEN: <%= image_path("marker-green.png").to_json %>, MARKER_RED: <%= image_path("marker-red.png").to_json %>, - MARKER_ICON: <%= image_path("images/marker-icon.png").to_json %>, - MARKER_ICON_2X: <%= image_path("images/marker-icon-2x.png").to_json %>, - MARKER_SHADOW: <%= image_path("images/marker-shadow.png").to_json %>, - - NEW_NOTE_MARKER: <%= image_path("new_note_marker.png").to_json %>, - OPEN_NOTE_MARKER: <%= image_path("open_note_marker.png").to_json %>, - CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.png").to_json %>, + MARKER_ICON: <%= image_path("leaflet/dist/images/marker-icon.png").to_json %>, + MARKER_ICON_2X: <%= image_path("leaflet/dist/images/marker-icon-2x.png").to_json %>, + MARKER_SHADOW: <%= image_path("leaflet/dist/images/marker-shadow.png").to_json %>, - SEARCHING: <%= image_path("searching.gif").to_json %>, + NEW_NOTE_MARKER: <%= image_path("new_note_marker.svg").to_json %>, + OPEN_NOTE_MARKER: <%= image_path("open_note_marker.svg").to_json %>, + CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.svg").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"; @@ -86,6 +93,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); @@ -108,7 +117,7 @@ OSM = { mapParams.lon = parseFloat(params.mlon); mapParams.lat = parseFloat(params.mlat); mapParams.zoom = parseInt(params.zoom || 12); - } else if (loc = $.cookie('_osm_location')) { + } else if (loc = Cookies.get('_osm_location')) { loc = loc.split("|"); mapParams.lon = parseFloat(loc[0]); mapParams.lat = parseFloat(loc[1]); @@ -147,7 +156,7 @@ OSM = { return args; } - hash = querystring.parse(hash.substr(i + 1)); + hash = Qs.parse(hash.slice(i + 1)); var map = (hash.map || '').split('/'), zoom = parseInt(map[0], 10), @@ -215,7 +224,7 @@ OSM = { return 6372795 * 2 * Math.asin( Math.sqrt( - Math.pow(Math.sin(latdiff / 2), 2) + + Math.pow(Math.sin(latdiff / 2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2) )); }