X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e256c837b56d9f1c40c0c57dd89db4825bc7489e..e20bb507f122f73d18021bf93efe85fc2e189dfb:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index d933043b5..6a8b856be 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,3 +1,5 @@ +//= depend_on application.yml + OSM = { <% if defined?(PIWIK) %> PIWIK: <%= PIWIK.to_json %>, @@ -11,11 +13,19 @@ OSM = { OVERPASS_URL: <%= OVERPASS_URL.to_json %>, NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>, +<% if defined?(MAPQUEST_KEY) %> + MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>, +<% end %> +<% if defined?(MAPZEN_VALHALLA_KEY) %> + MAPZEN_VALHALLA_KEY: <%= MAPZEN_VALHALLA_KEY.to_json %>, +<% end %> + MARKER_GREEN: <%= image_path("marker-green.png").to_json %>, MARKER_RED: <%= image_path("marker-red.png").to_json %>, - MARKER_ICON: <%= image_path("marker-icon.png").to_json %>, - MARKER_ICON_2X: <%= image_path("marker-icon-2x.png").to_json %>, - MARKER_SHADOW: <%= image_path("marker-shadow.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 %>, @@ -43,7 +53,12 @@ OSM = { j = pair.indexOf('='), key = pair.slice(0, j), val = pair.slice(++j); - params[key] = decodeURIComponent(val); + + try { + params[key] = decodeURIComponent(val); + } catch (e) { + // Ignore parse exceptions + } } return params;