Redirect ?node=n and similar to browse pages

[rails.git] / app / views / site / id.html.erb

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 3db8b80bedd2eedf9a834ab70a4786afd040b91e..fde4a07cd394fd10067517fb9c13fd9749342c08 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -20,7 +20,8 @@
 
     var id = iD()
       .embed(true)
-      .assetPath("/assets/iD/") <%# Can't use asset_path('iD/') in production. %>
+      .assetPath("/iD/") <%# Can't use asset_path('iD/') in production. %>
+      .assetMap(<%= assets("iD").to_json.html_safe %>)
       .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>")
       .preauth({
         <% token = @user.access_token(ID_KEY) %>
@@ -31,7 +32,7 @@
         oauth_token_secret: "<%= token.secret %>"
       });
 
-    id.map().on('move.embed', function() {
+    id.map().on('move.embed', parent.$.throttle(250, function() {
       var extent = id.map().extent(),
           zoom = ~~id.map().zoom(),
           center = id.map().center();
@@ -42,11 +43,18 @@
         },
         zoom,
         null,
-        extent[0][0],
-        extent[0][1],
-        extent[1][0],
-        extent[1][1]);
-    });
+        [[extent[0][1],
+        extent[0][0]],
+        [extent[1][1],
+        extent[1][0]]]);
+
+      // Manually resolve URL to avoid iframe JS context weirdness.
+      // http://bl.ocks.org/jfirebaugh/5439412
+      var hash = parent.OSM.formatHash({ lon: center[0], lat: center[1], zoom: zoom });
+      if (hash !== parent.location.hash) {
+        parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash));
+      }
+    }));
 
     parent.$("body").on("click", "a.set_position", function (e) {
       e.preventDefault();
@@ -61,16 +69,6 @@
       }, 0);
     });
 
-    var maximized = false;
-    id.on('toggleFullscreen.embed', function() {
-      if (maximized) {
-        parent.minimiseMap();
-      } else {
-        parent.maximiseMap();
-      }
-      maximized = !maximized;
-    });
-
     d3.select('#id-container')
       .call(id.ui());
   }