Bump image_processing from 1.12.1 to 1.12.2

[rails.git] / app / assets / javascripts / embed.js.erb

diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 947c377be7ee41c214e1d787f4e130606080cc50..c92be45155133a245a90699d912d69d5b24fe4c0 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,3 +1,5 @@
+//= depend_on settings.yml
+//= depend_on settings.local.yml
 //= require leaflet/dist/leaflet-src
 //= require leaflet.osm
 //= require i18n
@@ -10,7 +12,7 @@ window.onload = function () {
     I18n.locale = navigator.language;
   }
 
-  var query = (window.location.search || '?').substr(1),
+  var query = (window.location.search || '?').slice(1),
       args  = {};
 
   var pairs = query.split('&');
@@ -19,6 +21,12 @@ window.onload = function () {
     args[parts[0]] = decodeURIComponent(parts[1] || '');
   }
 
+  var mapnikOptions = {
+<% if Settings.key?(:tile_cdn_url) %>
+    url: <%= Settings.tile_cdn_url.to_json %>
+<% end %>
+  };
+
   var thunderforestOptions = {
 <% if Settings.key?(:thunderforest_key) %>
     apikey: <%= Settings.thunderforest_key.to_json %>
@@ -30,7 +38,9 @@ window.onload = function () {
   map.removeControl(map.attributionControl);
 
   if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
-    new L.OSM.Mapnik().addTo(map);
+    new L.OSM.Mapnik(mapnikOptions).addTo(map);
+  } else if (args.layer === "cyclosm") {
+    new L.OSM.CyclOSM().addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {