Document/clarify OSM.Router use

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f1644c06f0a12a131d0e7d0b7d30a63d29c8d033..6f4603923a4d4783168c434c8fc6e80f3deaa447 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -198,26 +198,23 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
   OSM.Index = function(map) {
     var page = {};
 

-    page.pushstate = function(path) {
+    page.pushstate = function() {

       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})

-        .panBy([-300, 0], {animate: false});
-      OSM.loadSidebarContent(path);
-      page.load();
+        .panBy([-350, 0], {animate: false});

     };
 
     page.load = function() {
       return map.getState();
     };
 
     };
 
     page.load = function() {
       return map.getState();
     };
 

-    page.popstate = function(path) {
+    page.popstate = function() {

       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});

-      OSM.loadSidebarContent(path);

     };
 
     page.unload = function() {
     };
 
     page.unload = function() {

-      map.panBy([300, 0], {animate: false});
+      map.panBy([350, 0], {animate: false});

       $("#content").removeClass("overlay-sidebar");
       map.invalidateSize({pan: false});
     };
       $("#content").removeClass("overlay-sidebar");
       map.invalidateSize({pan: false});
     };


@@ -245,27 +242,26 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

-  var history = OSM.History(map),
-    note = OSM.Note(map);
+  var history = OSM.History(map);

 
 

-  OSM.route = OSM.Router(map, {
+  OSM.router = OSM.Router(map, {

     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),

-    "/history":                    history,

     "/new_note":                   OSM.NewNote(map),
     "/new_note":                   OSM.NewNote(map),

+    "/history":                    history,

     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,
     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,

-    "/browse/note/:id":            note,
+    "/browse/note/:id":            OSM.Note(map),

     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 
     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 

-  OSM.route.load();
+  OSM.router.load();

 
   $(document).on("click", "a", function(e) {
     if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
 
   $(document).on("click", "a", function(e) {
     if (e.isDefaultPrevented() || e.isPropagationStopped()) return;

-    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();
+    if (this.host === window.location.host && OSM.router.route(this.pathname + this.search + this.hash)) e.preventDefault();

   });
 
   $(".search_form").on("submit", function(e) {
   });
 
   $(".search_form").on("submit", function(e) {


@@ -273,16 +269,16 @@ $(document).ready(function () {
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     if (query) {
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     if (query) {

-      OSM.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
+      OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));

     } else {
     } else {

-      OSM.route("/" + OSM.formatHash(map));
+      OSM.router.route("/" + OSM.formatHash(map));

     }
   });
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
     var precision = zoomPrecision(map.getZoom());
     }
   });
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
     var precision = zoomPrecision(map.getZoom());

-    OSM.route("/search?query=" + encodeURIComponent(
+    OSM.router.route("/search?query=" + encodeURIComponent(

       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));
   });
       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));
   });