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

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

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index ac18da06f7fd18a5109bb30fef0820eaf0799d0d..15f77b1c14dda0d3542b40979d1987cdd8e13e98 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -7,25 +7,33 @@ document.addEventListener("DOMContentLoaded", function () {
 
   if (typeof iD === "undefined" || !iD.utilDetect().support) {
     container.innerHTML = "This editor is supported " +
 
   if (typeof iD === "undefined" || !iD.utilDetect().support) {
     container.innerHTML = "This editor is supported " +

-      "in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " +
+      "in Firefox, Chrome, Safari, Opera and Edge. " +

       "Please upgrade your browser or use JOSM to edit the map.";
     container.className = "unsupported";
   } else {
       "Please upgrade your browser or use JOSM to edit the map.";
     container.className = "unsupported";
   } else {

-    var id = iD.coreContext()
+    var idContext = iD.coreContext();
+    idContext.connection().apiConnections([]);
+    var url = location.protocol + "//" + location.host;
+    idContext.preauth({
+      url: url,
+      apiUrl: url === "https://www.openstreetmap.org" ? "https://api.openstreetmap.org" : url,
+      access_token: container.dataset.token
+    });
+
+    var id = idContext

       .embed(true)
       .assetPath("iD/")
       .assetMap(JSON.parse(container.dataset.assetMap))
       .locale(container.dataset.locale)
       .embed(true)
       .assetPath("iD/")
       .assetMap(JSON.parse(container.dataset.assetMap))
       .locale(container.dataset.locale)

-      .preauth({
-        urlroot: location.protocol + "//" + location.host,
-        oauth_consumer_key: container.dataset.consumerKey,
-        oauth_secret: container.dataset.consumerSecret,
-        oauth_token: container.dataset.token,
-        oauth_token_secret: container.dataset.tokenSecret
-      })

       .containerNode(container)
       .init();
 
       .containerNode(container)
       .init();
 

+    if (parent === window) {
+      // iD not opened in an iframe -> skip setting of parent  handlers
+      return;
+    }
+
+    var hashChangedAutomatically = false;

     id.map().on("move.embed", parent.$.throttle(250, function () {
       if (id.inIntro()) return;
       var zoom = ~~id.map().zoom(),
     id.map().on("move.embed", parent.$.throttle(250, function () {
       if (id.inIntro()) return;
       var zoom = ~~id.map().zoom(),


@@ -35,24 +43,38 @@ document.addEventListener("DOMContentLoaded", function () {
       parent.updateLinks(llz, zoom);
 
       // Manually resolve URL to avoid iframe JS context weirdness.
       parent.updateLinks(llz, zoom);
 
       // Manually resolve URL to avoid iframe JS context weirdness.

-      // http://bl.ocks.org/jfirebaugh/5439412
+      // https://gist.github.com/jfirebaugh/5439412

       var hash = parent.OSM.formatHash(llz);
       if (hash !== parent.location.hash) {
       var hash = parent.OSM.formatHash(llz);
       if (hash !== parent.location.hash) {

+        hashChangedAutomatically = true;

         parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
       }
     }));
 
         parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
       }
     }));
 

-    parent.$("body").on("click", "a.set_position", function (e) {
-      e.preventDefault();
-      var data = parent.$(this).data();
-
+    function goToLocation(data) {

       // 0ms timeout to avoid iframe JS context weirdness.
       // 0ms timeout to avoid iframe JS context weirdness.

-      // http://bl.ocks.org/jfirebaugh/5439412
+      // https://gist.github.com/jfirebaugh/5439412

       setTimeout(function () {
         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));
       }, 0);
       setTimeout(function () {
         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));
       }, 0);

+    }
+
+    parent.$("body").on("click", "a.set_position", function (e) {
+      e.preventDefault();
+      var data = parent.$(this).data();
+      goToLocation(data);
+    });
+
+    parent.addEventListener("hashchange", function (e) {
+      if (hashChangedAutomatically) {
+        hashChangedAutomatically = false;
+        return;
+      }
+      e.preventDefault();
+      var data = parent.OSM.mapParams();
+      goToLocation(data);

     });
   }
 });
     });
   }
 });