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

[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 15839a2ecbc4af23102a608c0804a4b988d92916..947c377be7ee41c214e1d787f4e130606080cc50 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,6 +1,7 @@
-//= require leaflet
+//= require leaflet/dist/leaflet-src
 //= require leaflet.osm
-//= require i18n/translations
+//= require i18n
+//= require i18n/embed
 
 window.onload = function () {
   if (navigator.languages) {
@@ -19,8 +20,8 @@ window.onload = function () {
   }
 
   var thunderforestOptions = {
-<% if defined?(THUNDERFOREST_KEY) %>
-    apikey: <%= THUNDERFOREST_KEY.to_json %>
+<% if Settings.key?(:thunderforest_key) %>
+    apikey: <%= Settings.thunderforest_key.to_json %>
 <% end %>
   };
 
@@ -34,16 +35,18 @@ window.onload = function () {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {
     new L.OSM.TransportMap(thunderforestOptions).addTo(map);
+  } else if (args.layer === "opnvkarte") {
+    new L.OSM.OPNVKarte().addTo(map);
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
   }
 
   if (args.marker) {
     L.marker(args.marker.split(','), {icon: L.icon({
-      iconUrl: <%= asset_path('images/marker-icon.png').to_json %>,
+      iconUrl: <%= asset_path('leaflet/dist/images/marker-icon.png').to_json %>,
       iconSize: new L.Point(25, 41),
       iconAnchor: new L.Point(12, 41),
-      shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+      shadowUrl: <%= asset_path('leaflet/dist/images/marker-shadow.png').to_json %>,
       shadowSize: new L.Point(41, 41)
     })}).addTo(map);
   }