Remove marker and filter when closed

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2f0c1609750d9321ff4bc1b18a76c1f3e440d7e7..19e1f16de8ebd3b3a596fd5bbc95a7eb4b92c24a 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();


@@ -81,8 +84,6 @@ $(document).ready(function () {
 
   L.OSM.share({
     position: position,
 
   L.OSM.share({
     position: position,

-    getShortUrl: getShortUrl,
-    getUrl: getUrl,

     sidebar: sidebar,
     short: true
   }).addTo(map);
     sidebar: sidebar,
     short: true
   }).addTo(map);


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

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

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


@@ -176,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) {