Use filter instead of loop in visible node/way collections

[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 4ebb89da93134a422133640e6680119c6ab9e752..44bb1fef5dbd7dabfc465a2f46ca34ff3a34ac81 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,87 +1,86 @@
 //= depend_on settings.yml
 //= depend_on settings.local.yml
 //= depend_on settings.yml
 //= depend_on settings.local.yml

+//= depend_on layers.yml

 //= require leaflet/dist/leaflet-src
 //= require leaflet.osm
 //= require i18n
 //= require i18n/embed
 
 //= require leaflet/dist/leaflet-src
 //= require leaflet.osm
 //= 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 || '?').slice(1),
-      args  = {};
+I18n.default_locale = <%= I18n.default_locale.to_json %>;
+I18n.fallbacks = true;

 
 

-  var pairs = query.split('&');
-  for (var i = 0; i < pairs.length; i++) {
-    var parts = pairs[i].split('=');
-    args[parts[0]] = decodeURIComponent(parts[1] || '');
-  }
+window.onload = function () {
+  const args = Object.fromEntries(new URLSearchParams(window.location.search));

 
 

-  var mapnikOptions = {
+  const tileOptions = {
+    mapnik: {

 <% if Settings.key?(:tile_cdn_url) %>
 <% if Settings.key?(:tile_cdn_url) %>

-    url: <%= Settings.tile_cdn_url.to_json %>
+      url: <%= Settings.tile_cdn_url.to_json %>

 <% end %>
 <% end %>

+    }

   };
 
   };
 

-  var thunderforestOptions = {
+  const apiKeys = {

 <% if Settings.key?(:thunderforest_key) %>
 <% if Settings.key?(:thunderforest_key) %>

-    apikey: <%= Settings.thunderforest_key.to_json %>
+    THUNDERFOREST_KEY: <%= 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(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") {
-    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);
-  }
+  const layers = <%=
+    YAML.load_file(Rails.root.join("config/layers.yml"))
+      .select { |entry| entry["canEmbed"] }
+      .each_with_object({}) do |entry, obj|
+        obj[entry["layerId"]] = {
+          layer: entry["leafletOsmId"],
+          apiKeyId: entry["apiKeyId"]
+        }.compact
+      end.to_json
+    %>;
+  const layerId = (args.layer || "").replaceAll(" ", "");
+  const layerConfig = layers[layerId] || layers.mapnik;
+  const { layer, ...options } = {
+    layer: layerConfig.layer,
+    apikey: apiKeys[layerConfig.apiKeyId],
+    ...tileOptions[layerId]
+  };
+  new L.OSM[layer](options).addTo(map);

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

-    L.marker(args.marker.split(','), {icon: L.icon({
+    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),
       shadowUrl: <%= asset_path('leaflet/dist/images/marker-shadow.png').to_json %>,
       shadowSize: new L.Point(41, 41)
       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('leaflet/dist/images/marker-shadow.png').to_json %>,
       shadowSize: new L.Point(41, 41)

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

   }
 
   }
 

-  if (args.bbox) {
-    var bbox = args.bbox.split(',');
-    map.fitBounds([L.latLng(bbox[1], bbox[0]),
-                   L.latLng(bbox[3], bbox[2])]);
-  } else {
-    map.fitWorld();
-  }
+  const bbox = (args.bbox || "-180,-90,180,90").split(",");
+  map.fitBounds([[bbox[1], bbox[0]], [bbox[3], bbox[2]]]);

 
   map.addControl(new L.Control.OSMReportAProblem());
 };
 
 L.Control.OSMReportAProblem = L.Control.Attribution.extend({
   options: {
 
   map.addControl(new L.Control.OSMReportAProblem());
 };
 
 L.Control.OSMReportAProblem = L.Control.Attribution.extend({
   options: {

-    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>'
+    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;
   },


@@ -91,8 +90,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());

   }
 });
   }
 });