Update location filter checkbox state correctly

[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..ccdad95572954100104e5526a5435c68a5154e2b 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -31,7 +31,7 @@
         oauth_token_secret: "<%= token.secret %>"
       });
 
         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();
       var extent = id.map().extent(),
           zoom = ~~id.map().zoom(),
           center = id.map().center();


@@ -42,11 +42,20 @@
         },
         zoom,
         null,
         },
         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]]]);
+
+      // 0ms timeout to avoid iframe JS context weirdness.
+      // http://bl.ocks.org/jfirebaugh/5439412
+      parent.setTimeout(function() {
+        var hash = parent.OSM.formatHash({ lon: center[0], lat: center[1], zoom: zoom });
+        if (hash !== parent.location.hash) {
+          parent.location.replace(hash);
+        }
+      }, 0);
+    }));

 
     parent.$("body").on("click", "a.set_position", function (e) {
       e.preventDefault();
 
     parent.$("body").on("click", "a.set_position", function (e) {
       e.preventDefault();


@@ -54,7 +63,7 @@
 
       // 0ms timeout to avoid iframe JS context weirdness.
       // http://bl.ocks.org/jfirebaugh/5439412
 
       // 0ms timeout to avoid iframe JS context weirdness.
       // http://bl.ocks.org/jfirebaugh/5439412

-      setTimeout(function() {
+      parent.setTimeout(function() {

         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));
         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));