Scope map variable.

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 29e94338688472dff5d3c8c27e0b9920dd04ffb5..10f9f86f065d6fd78ffd3ff59d4744921f739e0a 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -3,6 +3,7 @@
 //= require leaflet.share
 //= require leaflet.note
 //= require leaflet.locate
+//= require leaflet.customzoom
 //= require index/browse
 //= require index/export
 //= require index/key
@@ -14,7 +15,7 @@ $(document).ready(function () {
   var marker;
   var params = OSM.mapParams();
 
-  map = L.map("map", {
+  var map = L.map("map", {
     zoomControl: false,
     layerControl: false
   });
@@ -23,31 +24,31 @@ $(document).ready(function () {
 
   layers = [{
     layer: new L.OSM.Mapnik({
-      attribution: ''
+      attribution: '',
+      code: "M"
     }),
     keyid: "mapnik",
-    layerCode: "M",
     name: I18n.t("javascripts.map.base.standard")
   }, {
-    layer: new L.OSM.CycleMap( {
+    layer: new L.OSM.CycleMap({
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      code: "C"
     }),
     keyid: "cyclemap",
-    layerCode: "C",
     name: I18n.t("javascripts.map.base.cycle_map")
   }, {
     layer: new L.OSM.TransportMap({
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      code: "T"
     }),
     keyid: "transportmap",
-    layerCode: "T",
     name: I18n.t("javascripts.map.base.transport_map")
   }, {
     layer: new L.OSM.MapQuestOpen({
       attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+      code: "Q"
     }),
     keyid: "mapquest",
-    layerCode: "Q",
     name: I18n.t("javascripts.map.base.mapquest")
   }];
 
@@ -57,27 +58,33 @@ $(document).ready(function () {
     map.invalidateSize();
   });
 
-  L.control.zoom({position: 'topright'})
+  L.control.customZoom({position: 'topright'})
     .addTo(map);
 
-  L.OSM.layers({position: 'topright', layers: layers})
-    .addTo(map);
+  var uiPane = $('#map-ui')[0];
+
+  L.OSM.layers({
+    position: 'topright',
+    layers: layers,
+    uiPane: uiPane
+  }).addTo(map);
 
   L.control.share({
-      getUrl: getShortUrl
+    getUrl: getShortUrl,
+    uiPane: uiPane
   }).addTo(map);
 
   L.control.note({
-      position: 'topright'
+    position: 'topright'
   }).addTo(map);
 
   L.control.locate({
-      position: 'topright'
+    position: 'topright'
   }).addTo(map);
 
   L.control.scale().addTo(map);
 
-  map.on("moveend layeradd layerremove", updateLocation);
+  map.on('moveend layeradd layerremove', updateLocation);
 
   if (!params.object_zoom) {
     if (params.bbox) {
@@ -99,7 +106,18 @@ $(document).ready(function () {
   }
 
   if (params.layers) {
-    setMapLayers(params.layers);
+    var foundLayer = false;
+    for (var i = 0; i < layers.length; i++) {
+      if (params.layers.indexOf(layers[i].layer.options.code) >= 0) {
+        map.addLayer(layers[i].layer);
+        foundLayer = true;
+      } else {
+        map.removeLayer(layers[i].layer);
+      }
+    }
+    if (!foundLayer) {
+      map.addLayer(layers[0].layer);
+    }
   }
 
   if (params.marker) {
@@ -136,17 +154,22 @@ $(document).ready(function () {
     marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
   });
 
-  function updateLocation() {
+  // generate a cookie-safe string of map state
+  function cookieContent(map) {
     var center = map.getCenter().wrap();
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = map.getBounds().wrap();
+    return [center.lng, center.lat, map.getZoom(), getMapLayers(map)].join('|');
+  }
 
-    updatelinks(center, zoom, layers, extents, params.object);
+  function updateLocation() {
+    updatelinks(map.getCenter().wrap(),
+        map.getZoom(),
+        getMapLayers(this),
+        map.getBounds().wrap(),
+        params.object);
 
     var expiry = new Date();
     expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
+    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
   }
 
   function remoteEditHandler() {
@@ -211,27 +234,13 @@ function getMapBaseLayer() {
   }
 }
 
-function getMapLayers() {
-  var layerConfig = "";
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      layerConfig += layers[i].layerCode;
+function getMapLayers(map) {
+  var layerConfig = '';
+  for (var i in map._layers) { // TODO: map.eachLayer
+    var layer = map._layers[i];
+    if (layer.options && layer.options.code) {
+      layerConfig += layer.options.code;
     }
   }
   return layerConfig;
 }
-
-function setMapLayers(layerConfig) {
-  var foundLayer = false;
-  for (var i = 0; i < layers.length; i++) {
-    if (layerConfig.indexOf(layers[i].layerCode) >= 0) {
-      map.addLayer(layers[i].layer);
-      foundLayer = true;
-    } else {
-      map.removeLayer(layers[i].layer);
-    }
-  }
-  if (!foundLayer) {
-    map.addLayer(layers[0].layer);
-  }
-}