X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a01195f1497b4f4c6b7d019c7affc794d41101cd..35458c009652645972a9167d80aba1c4fdce82cf:/app/assets/javascripts/index.js?ds=sidebyside

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d09213c5d..91855f823 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,6 +9,8 @@
 //= require index/browse
 //= require index/export
 //= require index/notes
+//= require index/changeset
+//= require router
 
 $(document).ready(function () {
   var params = OSM.mapParams();
@@ -134,7 +136,20 @@ $(document).ready(function () {
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
-  map.on('moveend layeradd layerremove', updateLocation);
+  map.on('moveend layeradd layerremove', function() {
+    updatelinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
+
+    var expiry = new Date();
+    expiry.setYear(expiry.getFullYear() + 10);
+    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+
+    // Trigger hash update on layer changes.
+    map.hash.onMapMove();
+  });
 
   if (OSM.PIWIK) {
     map.on('layeradd', function (e) {
@@ -158,22 +173,10 @@ $(document).ready(function () {
     }
   }
 
-  if (params.box) {
-    L.rectangle(params.box, {
-      weight: 2,
-      color: '#e90',
-      fillOpacity: 0
-    }).addTo(map);
-  }
-
   if (params.marker) {
     marker.setLatLng([params.mlat, params.mlon]).addTo(map);
   }
 
-  if (params.object) {
-    map.addObject(params.object, { zoom: params.object_zoom });
-  }
-
   $("#homeanchor").on("click", function(e) {
     e.preventDefault();
 
@@ -207,22 +210,61 @@ $(document).ready(function () {
     });
   }
 
-  initializeSearch(map);
-  initializeExport(map);
   initializeBrowse(map, params);
   initializeNotes(map, params);
-});
 
-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap());
+  OSM.Index = function(map) {
+    var page = {};
+
+    page.pushstate = page.popstate = function(path) {
+      $("#view_tab").addClass("current");
+      $('#sidebar_content').load(path);
+    };
+
+    page.unload = function() {
+      $("#view_tab").removeClass("current");
+    };
+
+    return page;
+  };
+
+  OSM.Browse = function(map) {
+    var page = {};
+
+    page.pushstate = page.popstate = function(path) {
+      $('#sidebar_content').load(path, page.load);
+    };
 
-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+    page.load = function() {
+      map.addObject(OSM.mapParams().object, {zoom: true});
+    };
 
-  // Trigger hash update on layer changes.
-  this.hash.onMapMove();
-}
+    page.unload = function() {
+      map.removeObject();
+    };
+
+    return page;
+  };
+
+  var router = OSM.Router({
+    "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
+    "/export":                     OSM.Export(map),
+    "/browse/changesets":          OSM.ChangesetList(map),
+    "/browse/:type/:id(/history)": OSM.Browse(map)
+  });
+
+  $(document).on("click", "a", function(e) {
+    if (router(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));
+  });
+
+  $("#describe_location").on("click", function(e) {
+    e.preventDefault();
+    router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+  });
+});