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 5f6a4efb729b15690b5f6971126e924b82d081c6..525be7e52db1982ef5ed92599641be631c3b5782 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -48,6 +48,12 @@ $(document).ready(function () {
       code: "Q",
       keyid: "mapquest",
       name: I18n.t("javascripts.map.base.mapquest")
+    }),
+    new L.OSM.HOT({
+      attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
+      code: "H",
+      keyid: "hot",
+      name: I18n.t("javascripts.map.base.hot")
     })
   ];
 
@@ -73,16 +79,18 @@ $(document).ready(function () {
     updateLayers(OSM.mapParams());
   });
 
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }
+  });
+
   map.noteLayer = new L.LayerGroup();
   map.noteLayer.options = {code: 'N'};
 
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 
-  $("#sidebar").on("opened closed", function () {
-    map.invalidateSize();
-  });
-
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
@@ -126,7 +134,20 @@ $(document).ready(function () {
 
   $('.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) {
@@ -150,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);
   }
@@ -203,18 +216,6 @@ $(document).ready(function () {
   initializeExport(map);
   initializeBrowse(map, params);
   initializeNotes(map, params);
-});
 
-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();
-}
+  if ('undefined' !== typeof initializeChangesets) initializeChangesets(map);
+});