Simplify geolink-related code

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index dff433a8a3e190fed06600a2394c1df09b1f7a8a..525be7e52db1982ef5ed92599641be631c3b5782 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -134,7 +134,20 @@ $(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 (OSM.PIWIK) {
     map.on('layeradd', function (e) {


@@ -158,14 +171,6 @@ $(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);
   }


@@ -214,17 +219,3 @@ $(document).ready(function () {
 
   if ('undefined' !== typeof initializeChangesets) initializeChangesets(map);
 });
 
   if ('undefined' !== typeof initializeChangesets) initializeChangesets(map);
 });

-
-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap());
-
-  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();
-}