Merge remote-tracking branch 'upstream/pull/2381'

[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 a8fe29fce9d96cc75902762f8ab63b3954430ea6..ceb488f987681871e05c87476e5a464de126c79d 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,6 +1,7 @@
 //= require leaflet
 //= require leaflet.osm
 //= require leaflet
 //= require leaflet.osm

-//= require i18n/translations
+//= require i18n
+//= require i18n/embed

 
 window.onload = function () {
   if (navigator.languages) {
 
 window.onload = function () {
   if (navigator.languages) {


@@ -18,18 +19,22 @@ window.onload = function () {
     args[parts[0]] = decodeURIComponent(parts[1] || '');
   }
 
     args[parts[0]] = decodeURIComponent(parts[1] || '');
   }
 

+  var thunderforestOptions = {
+<% if Settings.key?(:thunderforest_key) %>
+    apikey: <%= Settings.thunderforest_key.to_json %>
+<% end %>
+  };
+

   var map = L.map("map");
   map.attributionControl.setPrefix('');
   map.removeControl(map.attributionControl);
 
   var map = L.map("map");
   map.attributionControl.setPrefix('');
   map.removeControl(map.attributionControl);
 

-  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender") {
+  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {

     new L.OSM.Mapnik().addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.Mapnik().addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {

-    new L.OSM.CycleMap().addTo(map);
+    new L.OSM.CycleMap(thunderforestOptions).addTo(map);

   } else if (args.layer === "transportmap") {
   } else if (args.layer === "transportmap") {

-    new L.OSM.TransportMap().addTo(map);
-  } else if (args.layer === "mapquest") {
-    new L.OSM.MapQuestOpen().addTo(map);
+    new L.OSM.TransportMap(thunderforestOptions).addTo(map);

   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
   }
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
   }