Merge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 59335ff849e60d3d08e2c93d14f967558bd3b4e6..a044937fc1158546bc3f6cff24bac50743bc2f13 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,7 +9,7 @@
 //= require index/browse
 //= require index/export
 //= require index/notes
-//= require index/changeset
+//= require index/history
 //= require router
 
 $(document).ready(function () {
@@ -24,6 +24,10 @@ $(document).ready(function () {
 
   map.hash = L.hash(map);
 
+  $(window).on('popstate', function() {
+    map.hash.update();
+  });
+
   var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
 
   var layers = [
@@ -274,26 +278,34 @@ $(document).ready(function () {
     return page;
   };
 
-  var router = OSM.Router({
+  var history = OSM.History(map);
+
+  OSM.route = OSM.Router({
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
-    "/browse/changesets":          OSM.ChangesetList(map),
+    "/history":                    history,
+    "/user/:display_name/edits":   history,
+    "/browse/friends":             history,
+    "/browse/nearby":              history,
     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 
   $(document).on("click", "a", function(e) {
-    if (e.isPropagationStopped()) return;
-    if (router(this.pathname + this.search + this.hash)) e.preventDefault();
+    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
+    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();
   });
 
   $("#search_form").on("submit", function(e) {
     e.preventDefault();
-    router("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
+    OSM.route("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
   });
 
   $("#describe_location").on("click", function(e) {
     e.preventDefault();
-    router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+    var precision = zoomPrecision(map.getZoom());
+    OSM.route("/search?query=" + encodeURIComponent(
+      map.getCenter().lat.toFixed(precision) + "," +
+      map.getCenter().lng.toFixed(precision)));
   });
 });