Consolidate search-related JavaScript

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 91855f823c295407dd9dce453f9e0c1cfc55db71..59335ff849e60d3d08e2c93d14f967558bd3b4e6 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -93,6 +93,16 @@ $(document).ready(function () {
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 

+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
+
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }
+

   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})


@@ -163,16 +173,14 @@ $(document).ready(function () {
     });
   }
 
     });
   }
 

-  var marker = L.marker([0, 0], {icon: getUserIcon()});
-
-  if (!params.object_zoom) {
-    if (params.bounds) {
-      map.fitBounds(params.bounds);
-    } else {
-      map.setView([params.lat, params.lon], params.zoom);
-    }
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);

   }
 
   }
 

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

   if (params.marker) {
     marker.setLatLng([params.mlat, params.mlon]).addTo(map);
   }
   if (params.marker) {
     marker.setLatLng([params.mlat, params.mlon]).addTo(map);
   }


@@ -210,13 +218,15 @@ $(document).ready(function () {
     });
   }
 
     });
   }
 

-  initializeBrowse(map, params);
-  initializeNotes(map, params);
+  initializeBrowse(map);
+  initializeNotes(map);

 
   OSM.Index = function(map) {
 
   OSM.Index = function(map) {

-    var page = {};
+    var page = {}, minimized = false;

 
     page.pushstate = page.popstate = function(path) {
 
     page.pushstate = page.popstate = function(path) {

+      if (minimized) $("#sidebar").addClass("minimized");
+      map.invalidateSize();

       $("#view_tab").addClass("current");
       $('#sidebar_content').load(path);
     };
       $("#view_tab").addClass("current");
       $('#sidebar_content').load(path);
     };


@@ -225,18 +235,36 @@ $(document).ready(function () {
       $("#view_tab").removeClass("current");
     };
 
       $("#view_tab").removeClass("current");
     };
 

+    page.minimizeSidebar = function() {
+      $("#sidebar").addClass("minimized");
+      map.invalidateSize();
+      minimized = true;
+    };
+
+    $(document).on("click", "#sidebar_content .close", page.minimizeSidebar);
+

     return page;
   };
 
   OSM.Browse = function(map) {
     var page = {};
 
     return page;
   };
 
   OSM.Browse = function(map) {
     var page = {};
 

-    page.pushstate = page.popstate = function(path) {
-      $('#sidebar_content').load(path, page.load);
+    page.pushstate = page.popstate = function(path, type, id) {
+      $("#sidebar").removeClass("minimized");
+      map.invalidateSize();
+      $('#sidebar_content').load(path, function() {
+        page.load(path, type, id);
+      });

     };
 
     };
 

-    page.load = function() {
-      map.addObject(OSM.mapParams().object, {zoom: true});
+    page.load = function(path, type, id) {
+      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
+
+      if (type === 'note') {
+        map.noteLayer.showNote(parseInt(id));
+      } else {
+        map.addObject({type: type, id: parseInt(id)}, {zoom: true});
+      }

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


@@ -255,6 +283,7 @@ $(document).ready(function () {
   });
 
   $(document).on("click", "a", function(e) {
   });
 
   $(document).on("click", "a", function(e) {

+    if (e.isPropagationStopped()) return;

     if (router(this.pathname + this.search + this.hash)) e.preventDefault();
   });
 
     if (router(this.pathname + this.search + this.hash)) e.preventDefault();
   });