Clean up some of the map JS, reduce scope of globals

[rails.git] / app / assets / javascripts / map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index b3ac299f0ef627f5afe4ebe4d55c7a561cb1db78..a3fd53a682e7bdccbe84e1ab44758cf7fb05e4af 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -12,82 +12,40 @@ L.extend(L.LatLngBounds.prototype, {
 
 L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
 
-var map;
-var layers;
 var objectLayer;
 var objectLoader;
 
-function createMap(divName, options, moreOptions) {
-  if (!layers) {
-    layers = [
-      {
-        klass: L.OSM.Mapnik,
-        attribution: "",
-        keyid: "mapnik",
-        layerCode: "M",
-        name: I18n.t("javascripts.map.base.standard")
-      },
-      {
-        klass: L.OSM.CycleMap,
-        attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-        keyid: "cyclemap",
-        layerCode: "C",
-        name: I18n.t("javascripts.map.base.cycle_map")
-      },
-      {
-        klass: L.OSM.TransportMap,
-        attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-        keyid: "transportmap",
-        layerCode: "T",
-        name: I18n.t("javascripts.map.base.transport_map")
-      },
-      {
-        klass: 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'>",
-        keyid: "mapquest",
-        layerCode: "Q",
-        name: I18n.t("javascripts.map.base.mapquest")
-      }
-    ];
-  }
-
-  moreOptions = moreOptions || {};
-
-  options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
-
-  map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
-
-  if (map.attributionControl) {
-    map.attributionControl.setPrefix('');
-  }
-
-
-  var layersControl = L.control.layers();
-
-  if (options.layerControl) {
-    layersControl.addTo(map);
-    map.layersControl = layersControl;
-  }
-
-  if (moreOptions.locateControl) {
-    var loc = L.control.locate({
-        position: 'topright'
-    });
-    loc.addTo(map);
-  }
-
-  for (var i = 0; i < layers.length; i++) {
-    layers[i].layer = new (layers[i].klass)(layers[i]);
-    layersControl.addBaseLayer(layers[i].layer, layers[i].name);
-  }
-
-  layers[0].layer.addTo(map);
-
-  $("#" + divName).on("resized", function () {
-    map.invalidateSize();
-  });
-
-  return map;
+function mapLayers() {
+  return [
+    {
+      klass: L.OSM.Mapnik,
+      attribution: "",
+      keyid: "mapnik",
+      layerCode: "M",
+      name: I18n.t("javascripts.map.base.standard")
+    },
+    {
+      klass: L.OSM.CycleMap,
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      keyid: "cyclemap",
+      layerCode: "C",
+      name: I18n.t("javascripts.map.base.cycle_map")
+    },
+    {
+      klass: L.OSM.TransportMap,
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      keyid: "transportmap",
+      layerCode: "T",
+      name: I18n.t("javascripts.map.base.transport_map")
+    },
+    {
+      klass: 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'>",
+      keyid: "mapquest",
+      layerCode: "Q",
+      name: I18n.t("javascripts.map.base.mapquest")
+    }
+  ]
 }
 
 function getUserIcon(url) {
@@ -101,7 +59,7 @@ function getUserIcon(url) {
   });
 }
 
-function addObjectToMap(object, options) {
+function addObjectToMap(object, map, options) {
   if (objectLoader) {
     objectLoader.abort();
   }
@@ -150,36 +108,3 @@ function addObjectToMap(object, options) {
     }
   });
 }
-
-function getMapBaseLayer() {
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      return layers[i];
-    }
-  }
-}
-
-function getMapLayers() {
-  var layerConfig = "";
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      layerConfig += layers[i].layerCode;
-    }
-  }
-  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);
-  }
-}