Add layer-type switching to use dark tiles

[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 50c294b41b0da937e3d09d8ec5e030b115d9f0e8..34a8b68bcf8740e880fcb6e7574ce8adc169e75b 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,44 +1,99 @@
-//= require leaflet
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= depend_on layers.yml
+//= require leaflet/dist/leaflet-src

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

+//= require i18n
+//= require i18n/embed
+
+if (navigator.languages) {
+  I18n.locale = navigator.languages[0];
+} else if (navigator.language) {
+  I18n.locale = navigator.language;
+}
+
+I18n.default_locale = <%= I18n.default_locale.to_json %>;
+I18n.fallbacks = true;

 
 window.onload = function () {
 
 window.onload = function () {

-  var query = (window.location.search || '?').substr(1),
-      args  = {};
+  const args = Object.fromEntries(new URLSearchParams(window.location.search));

 
 

-  var pairs = query.split('&');
-  for (var i = 0; i < pairs.length; i++) {
-    var parts = pairs[i].split('=');
-    args[parts[0]] = decodeURIComponent(parts[1] || '');
-  }
+  const tileOptions = {
+    mapnik: {
+<% if Settings.key?(:tile_cdn_url) %>
+      url: <%= Settings.tile_cdn_url.to_json %>
+<% end %>
+    }
+  };
+
+  const apiKeys = {
+<% if Settings.key?(:thunderforest_key) %>
+    THUNDERFOREST_KEY: <%= Settings.thunderforest_key.to_json %>
+<% end %>
+  };

 
   var map = L.map("map");
 
   var map = L.map("map");

-  map.attributionControl.setPrefix('');
-
-  if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") {
-    new L.OSM.Mapnik().addTo(map);
-  } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
-    new L.OSM.CycleMap().addTo(map);
-  } else if (args.layer == "transportmap") {
-    new L.OSM.TransportMap().addTo(map);
-  } else if (args.layer == "mapquest") {
-    new L.OSM.MapQuestOpen().addTo(map);
-  }
+  map.attributionControl.setPrefix("");
+  map.removeControl(map.attributionControl);
+
+  const isDarkTheme = args.theme === "dark" || (args.theme !== "light" && window.matchMedia("(prefers-color-scheme: dark)").matches);
+  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"],
+          darkLayer: entry["leafletOsmDarkId"],
+          apiKeyId: entry["apiKeyId"]
+        }.compact
+      end.to_json
+    %>;
+  const layerId = (args.layer || "").replaceAll(" ", "");
+  const layerConfig = layers[layerId] || layers.mapnik;
+  const { layer, ...options } = {
+    layer: layerConfig.darkLayer && isDarkTheme ? layerConfig.darkLayer : 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({
-      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) {
-    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: {
+    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);
+
+    map.on("moveend", this._update, this);
+
+    return container;
+  },
+
+  _update: function () {
+    L.Control.Attribution.prototype._update.call(this);
+
+    this._container.innerHTML =
+      this._container.innerHTML
+        .replace("{x}", this._map.getCenter().lat)
+        .replace("{y}", this._map.getCenter().lng)
+        .replace("{z}", this._map.getZoom());
+  }
+});