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

[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..ef6f0067098162c0a234d5f9d268e1d6231ce191 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,57 +1,73 @@
-//= require leaflet
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= require leaflet/dist/leaflet-src

 //= require leaflet.osm
 //= require leaflet.osm

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

 
 

-window.onload = function () {
-  if (navigator.languages) {
-    I18n.locale = navigator.languages[0];
-  } else if (navigator.language) {
-    I18n.locale = navigator.language;
-  }
+if (navigator.languages) {
+  I18n.locale = navigator.languages[0];
+} else if (navigator.language) {
+  I18n.locale = navigator.language;
+}

 
 

-  var query = (window.location.search || '?').substr(1),
-      args  = {};
+I18n.default_locale = <%= I18n.default_locale.to_json %>;
+I18n.fallbacks = true;
+
+window.onload = function () {
+  var query = (window.location.search || "?").slice(1),
+      args = {};

 
 

-  var pairs = query.split('&');
+  var pairs = query.split("&");

   for (var i = 0; i < pairs.length; i++) {
   for (var i = 0; i < pairs.length; i++) {

-    var parts = pairs[i].split('=');
-    args[parts[0]] = decodeURIComponent(parts[1] || '');
+    var parts = pairs[i].split("=");
+    args[parts[0]] = decodeURIComponent(parts[1] || "");

   }
 
   }
 

+  var mapnikOptions = {
+<% if Settings.key?(:tile_cdn_url) %>
+    url: <%= Settings.tile_cdn_url.to_json %>
+<% end %>
+  };
+

   var thunderforestOptions = {
   var thunderforestOptions = {

-<% if defined?(THUNDERFOREST_KEY) %>
-    apikey: <%= THUNDERFOREST_KEY.to_json %>
+<% if Settings.key?(:thunderforest_key) %>
+    apikey: <%= Settings.thunderforest_key.to_json %>

 <% end %>
   };
 
   var map = L.map("map");
 <% end %>
   };
 
   var map = L.map("map");

-  map.attributionControl.setPrefix('');
+  map.attributionControl.setPrefix("");

   map.removeControl(map.attributionControl);
 
   map.removeControl(map.attributionControl);
 

-  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
-    new L.OSM.Mapnik().addTo(map);
+  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") {
     new L.OSM.TransportMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {
     new L.OSM.TransportMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);

+  } else {
+    new L.OSM.Mapnik(mapnikOptions).addTo(map);

   }
 
   if (args.marker) {
   }
 
   if (args.marker) {

-    L.marker(args.marker.split(','), {icon: L.icon({
-      iconUrl: <%= asset_path('images/marker-icon.png').to_json %>,
+    L.marker(args.marker.split(","), { icon: L.icon({
+      iconUrl: <%= asset_path('leaflet/dist/images/marker-icon.png').to_json %>,

       iconSize: new L.Point(25, 41),
       iconAnchor: new L.Point(12, 41),
       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)
       shadowSize: new L.Point(41, 41)

-    })}).addTo(map);
+    }) }).addTo(map);

   }
 
   if (args.bbox) {
   }
 
   if (args.bbox) {

-    var bbox = args.bbox.split(',');
-    map.fitBounds([L.latLng(bbox[1], bbox[0]),
-                   L.latLng(bbox[3], bbox[2])]);
+    var bbox = args.bbox.split(",");
+    map.fitBounds([
+      L.latLng(bbox[1], bbox[0]),
+      L.latLng(bbox[3], bbox[2])
+    ]);

   } else {
     map.fitWorld();
   }
   } else {
     map.fitWorld();
   }


@@ -61,14 +77,14 @@ window.onload = function () {
 
 L.Control.OSMReportAProblem = L.Control.Attribution.extend({
   options: {
 
 L.Control.OSMReportAProblem = L.Control.Attribution.extend({
   options: {

-    position: 'bottomright',
-    prefix: '<a href="http://www.openstreetmap.org/fixthemap?lat={x}&lon={y}&zoom={z}" target="_blank">'+I18n.t('javascripts.embed.report_problem')+'</a>'
+    position: "bottomright",
+    prefix: "<a href=\"https://www.openstreetmap.org/fixthemap?lat={x}&lon={y}&zoom={z}\" target=\"_blank\">" + I18n.t("javascripts.embed.report_problem") + "</a>"

   },
 
   onAdd: function (map) {
     var container = L.Control.Attribution.prototype.onAdd.call(this, map);
 
   },
 
   onAdd: function (map) {
     var container = L.Control.Attribution.prototype.onAdd.call(this, map);
 

-    map.on('moveend', this._update, this);
+    map.on("moveend", this._update, this);

 
     return container;
   },
 
     return container;
   },


@@ -78,8 +94,8 @@ L.Control.OSMReportAProblem = L.Control.Attribution.extend({
 
     this._container.innerHTML =
       this._container.innerHTML
 
     this._container.innerHTML =
       this._container.innerHTML

-        .replace('{x}', this._map.getCenter().lat)
-        .replace('{y}', this._map.getCenter().lng)
-        .replace('{z}', this._map.getZoom());
+        .replace("{x}", this._map.getCenter().lat)
+        .replace("{y}", this._map.getCenter().lng)
+        .replace("{z}", this._map.getZoom());

   }
 });
   }
 });