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

[rails.git] / app / assets / javascripts / edit / id.js.erb

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 23726519ec53ab5a60b1a0bcc9635e749b30dcce..c53d5e382a1422b3f3b01b5f5857d7cd8f9dd700 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -1,46 +1,39 @@
-//= require querystring
-

 $(document).ready(function () {
 $(document).ready(function () {

-  var querystring = require("querystring-component");
-  var id = $("#id-embed");
-
-  if (id.data("key")) {
-    var hashParams = OSM.params(location.hash.substring(1));
-    var mapParams = OSM.mapParams();
-    var params = {};
+  const id = $("#id-embed"),
+        idData = id.data();

 
 

-    if (mapParams.object) {
-      params.id = mapParams.object.type[0] + mapParams.object.id;
-      mapParams = OSM.parseHash(location.hash);
-      if (mapParams.center) {
-        params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;
-      }
-    } else if (id.data("lat") && id.data("lon")) {
-      params.map = "16/" + id.data("lat") + "/" + id.data("lon");
-    } else {
-      params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
-    }
+  if (!idData.configured) {
+    // eslint-disable-next-line no-alert
+    alert(I18n.t("site.edit.id_not_configured"));
+    return;
+  }

 
 

-    if (hashParams.background) params.background = hashParams.background;
-    if (hashParams.comment) params.comment = hashParams.comment;
-    if (hashParams.disable_features) params.disable_features = hashParams.disable_features;
-    if (hashParams.hashtags) params.hashtags = hashParams.hashtags;
-    if (hashParams.locale) params.locale = hashParams.locale;
-    if (hashParams.maprules) params.maprules = hashParams.maprules;
-    if (hashParams.offset) params.offset = hashParams.offset;
-    if (hashParams.photo_overlay) params.photo_overlay = hashParams.photo_overlay;
-    if (hashParams.presets) params.presets = hashParams.presets;
-    if (hashParams.source) params.source = hashParams.source;
-    if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
+  const hash = location.hash.substring(1);
+  const hashParams = hash ? OSM.params(hash) : {};
+  const hashArgs = OSM.parseHash(location.hash);
+  const mapParams = OSM.mapParams();
+  const params = new URLSearchParams();
+  let zoom, lat, lon;

 
 

-    if (id.data("gpx")) {
-      params.gpx = id.data("gpx");
-    } else if (hashParams.gpx) {
-      params.gpx = hashParams.gpx;
-    }
+  if (idData.lat && idData.lon) {
+    ({ zoom, lat, lon } = idData);
+  } else if (!mapParams.object) {
+    ({ zoom, lat, lon } = mapParams);
+  }
+  if (mapParams.object) {
+    params.set("id", mapParams.object.type + "/" + mapParams.object.id);
+    if (hashArgs.center) ({ zoom, center: { lat, lng: lon } } = hashArgs);
+  }
+  if (lat && lon) params.set("map", [zoom || 17, lat, lon].join("/"));

 
 

-    id.attr("src", id.data("url") + "#" + querystring.stringify(params));
-  } else {
-    alert(I18n.t("site.edit.id_not_configured"));
+  const passThroughKeys = ["background", "comment", "disable_features", "gpx", "hashtags", "locale", "maprules", "notes", "offset", "photo", "photo_dates", "photo_overlay", "photo_username", "presets", "source", "validationDisable", "validationWarning", "validationError", "walkthrough"];
+  for (const key of passThroughKeys) {
+    if (hashParams[key]) params.set(key, hashParams[key]);

   }
   }

+
+  if (mapParams.layers.includes("N")) params.set("notes", "true");
+
+  if (idData.gpx) params.set("gpx", idData.gpx);
+
+  id.attr("src", idData.url + "#" + params.toString().replace(/\+/g, "%20"));

 });
 });