Convert search to pushState

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2a704f72464f8d697fe02f8b91bd592855b3ac46..91855f823c295407dd9dce453f9e0c1cfc55db71 100644 (file)
--- 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/browse
 //= require index/export
 //= require index/notes

+//= require index/changeset
+//= require router

 
 $(document).ready(function () {
   var params = OSM.mapParams();
 
 $(document).ready(function () {
   var params = OSM.mapParams();


@@ -48,26 +50,49 @@ $(document).ready(function () {
       code: "Q",
       keyid: "mapquest",
       name: I18n.t("javascripts.map.base.mapquest")
       code: "Q",
       keyid: "mapquest",
       name: I18n.t("javascripts.map.base.mapquest")

+    }),
+    new L.OSM.HOT({
+      attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
+      code: "H",
+      keyid: "hot",
+      name: I18n.t("javascripts.map.base.hot")

     })
   ];
 
     })
   ];
 

-  for (var i = layers.length - 1; i >= 0; i--) {
-    if (i === 0 || params.layers.indexOf(layers[i].options.code) >= 0) {
-      map.addLayer(layers[i]);
-      break;
+  function updateLayers(params) {
+    var layerParam = params.layers || "M";
+    var layersAdded = "";
+
+    for (var i = layers.length - 1; i >= 0; i--) {
+      if (layerParam.indexOf(layers[i].options.code) >= 0) {
+        map.addLayer(layers[i]);
+        layersAdded = layersAdded + layers[i].options.code;
+      } else if (i == 0 && layersAdded == "") {
+        map.addLayer(layers[i]);
+      } else {
+        map.removeLayer(layers[i]);
+      }

     }
   }
 
     }
   }
 

+  updateLayers(params);
+
+  $(window).on("hashchange", function () {
+    updateLayers(OSM.mapParams());
+  });
+
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }
+  });
+

   map.noteLayer = new L.LayerGroup();
   map.noteLayer.options = {code: 'N'};
 
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 
   map.noteLayer = new L.LayerGroup();
   map.noteLayer.options = {code: 'N'};
 
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 

-  $("#sidebar").on("opened closed", function () {
-    map.invalidateSize();
-  });
-

   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})


@@ -111,7 +136,32 @@ $(document).ready(function () {
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
 
   $('.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) {
+      if (e.layer.options) {
+        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+
+        if (goal) {
+          $('body').trigger('piwikgoal', goal);
+        }
+      }
+    });
+  }

 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
 
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
 


@@ -123,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.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();
 
   $("#homeanchor").on("click", function(e) {
     e.preventDefault();
 


@@ -172,22 +210,61 @@ $(document).ready(function () {
     });
   }
 
     });
   }
 

-  initializeSearch(map);
-  initializeExport(map);

   initializeBrowse(map, params);
   initializeNotes(map, params);
   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;
+  };

 
 

-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+  OSM.Browse = function(map) {
+    var page = {};

 
 

-  // Trigger hash update on layer changes.
-  this.hash.onMapMove();
-}
+    page.pushstate = page.popstate = function(path) {
+      $('#sidebar_content').load(path, page.load);
+    };
+
+    page.load = function() {
+      map.addObject(OSM.mapParams().object, {zoom: true});
+    };
+
+    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));
+  });
+});