X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d1dba97ac4f2a018b4ee93b4ec160c6a2df108b1..b79e4f04b9197e1c1954638db46c9d97597612d4:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 3290b5e2c..e429f4479 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,5 +1,6 @@ //= depend_on settings.yml //= depend_on settings.local.yml +//= depend_on key.yml //= require qs/dist/qs OSM = { @@ -14,15 +15,23 @@ 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) %> THUNDERFOREST_KEY: <%= Settings.thunderforest_key.to_json %>, <% end %> +<% 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 %>, @@ -30,11 +39,9 @@ OSM = { 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 %>, - 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 %>, - - 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 apiType = object.type === "note" ? "notes" : object.type;