Recenter marker on map pan/zoom

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 452cc0bca821d1ba5d64374f3aa9875fd4d6735c..489a29c87e732b5d8bfbd1847caf01dc1953c7cd 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -19,7 +19,7 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix('');
 
 
   map.attributionControl.setPrefix('');
 

-  new L.Hash(map);
+  map.hash = L.hash(map);

 
   var layers = [
     new L.OSM.Mapnik({
 
   var layers = [
     new L.OSM.Mapnik({


@@ -50,8 +50,11 @@ $(document).ready(function () {
 
   layers[0].addTo(map);
 
 
   layers[0].addTo(map);
 

-  map.noteLayer = new L.LayerGroup({code: 'N'});
+  map.noteLayer = new L.LayerGroup();
+  map.noteLayer.options = {code: 'N'};
+

   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer = new L.OSM.DataLayer(null);

+  map.dataLayer.options.code = 'D';

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


@@ -133,7 +136,7 @@ $(document).ready(function () {
   }
 
   if (params.object) {
   }
 
   if (params.object) {

-    addObjectToMap(params.object, map, { zoom: params.object_zoom });
+    map.addObject(params.object, { zoom: params.object_zoom });

   }
 
   $("body").on("click", "a.set_position", setPositionLink(map));
   }
 
   $("body").on("click", "a.set_position", setPositionLink(map));


@@ -161,8 +164,8 @@ $(document).ready(function () {
   }
 
   initializeExport(map);
   }
 
   initializeExport(map);

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

 });
 
 function updateLocation() {
 });
 
 function updateLocation() {


@@ -174,6 +177,9 @@ function updateLocation() {
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
   $.cookie("_osm_location", cookieContent(this), { expires: expiry });
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
   $.cookie("_osm_location", cookieContent(this), { expires: expiry });

+
+  // Trigger hash update on layer changes.
+  this.hash.onMapMove();

 }
 
 function setPositionLink(map) {
 }
 
 function setPositionLink(map) {


@@ -189,7 +195,7 @@ function setPositionLink(map) {
       }
 
       if (data.type && data.id) {
       }
 
       if (data.type && data.id) {

-        addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
+        map.addObject(data, { zoom: true, style: { opacity: 0.2, fill: false } });

       }
 
       map.markerLayer.clearLayers();
       }
 
       map.markerLayer.clearLayers();