From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 10 Jun 2013 20:36:28 +0000 (-0700)
Subject: Clean up some of the map JS, reduce scope of globals
X-Git-Tag: live~4882^2~55
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4563244fd1cb43dca00b427e1f13ac890b7f00a0

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index a5738e1ba..0b60778d6 100644
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -21,10 +21,16 @@ $(document).ready(function () {
     return false;
   }
 
-  var map = createMap("small_map", {
-    layerControl: false,
-    panZoomControl: false,
-    attributionControl: false
+  var map = L.map("small_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#small_map").on("resized", function () {
+    map.invalidateSize();
   });
 
   var params = $("#small_map").data();
@@ -79,7 +85,7 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
-    addObjectToMap(object, {
+    addObjectToMap(object, map, {
       zoom: true, 
       callback: function(extent) {
         $("#loading").hide();
diff --git a/app/assets/javascripts/changeset.js b/app/assets/javascripts/changeset.js
index 1010fbac9..7f21ae744 100644
--- a/app/assets/javascripts/changeset.js
+++ b/app/assets/javascripts/changeset.js
@@ -1,6 +1,18 @@
 $(document).ready(function () {
   var changesets = [], rects = {};
-  var map = createMap("changeset_list_map");
+
+  var map = L.map("changeset_list_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#changeset_list_map").on("resized", function () {
+    map.invalidateSize();
+  });
+
   var group = L.featureGroup().addTo(map);
 
   $("[data-changeset]").each(function () {
diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 291c86523..e17f59ad2 100644
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -1,5 +1,5 @@
 $(document).ready(function () {
-  var marker;
+  var marker, map;
 
   function setLocation(e) {
     $("#latitude").val(e.latlng.lat);
@@ -21,7 +21,18 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
-    var map = createMap("map");
+
+    map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());
+
+    L.control.zoom({position: 'topright'})
+      .addTo(map);
+
+    $("#map").on("resized", function () {
+      map.invalidateSize();
+    });
 
     map.setView(centre, params.zoom);
 
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 9f5c9d1ac..2cabfc5d0 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,15 +5,28 @@
 //= require index/notes
 //= require index/map_ui
 
+var map, layers; // TODO: remove globals
+
 $(document).ready(function () {
-  var permalinks = $("#permalink").detach().html();
   var marker;
   var params = OSM.mapParams();
-  var map = createMap("map", {
+
+  map = L.map("map", {
+    attributionControl: false,
     zoomControl: false,
     layerControl: false
-  }, {
-    locateControl: true
+  });
+
+  layers = mapLayers();
+
+  for (var i = 0; i < layers.length; i++) {
+    layers[i].layer = new (layers[i].klass)(layers[i]);
+  }
+
+  layers[0].layer.addTo(map);
+
+  $("#map").on("resized", function () {
+    map.invalidateSize();
   });
 
   L.control.zoom({position: 'topright'})
@@ -40,8 +53,6 @@ $(document).ready(function () {
 
   L.control.scale().addTo(map);
 
-  map.attributionControl.setPrefix(permalinks);
-
   map.on("moveend layeradd layerremove", updateLocation);
 
   if (!params.object_zoom) {
@@ -72,7 +83,7 @@ $(document).ready(function () {
   }
 
   if (params.object) {
-    addObjectToMap(params.object, { zoom: params.object_zoom });
+    addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 
   handleResize();
@@ -91,7 +102,7 @@ $(document).ready(function () {
     }
 
     if (data.type && data.id) {
-      addObjectToMap(data, { zoom: true, style: { opacity: 0.2, fill: false } });
+      addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
     }
 
     if (marker) {
@@ -172,3 +183,36 @@ $(document).ready(function () {
     $("#query").focus();
   }
 });
+
+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);
+  }
+}
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index b3ac299f0..a3fd53a68 100644
--- 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);
-  }
-}
diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 25456d04e..4e6467712 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,7 +1,14 @@
 $(document).ready(function () {
-  var map = createMap("map", {
-    zoomControl: true,
-    panZoomControl: false
+  var map = L.map("map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#map").on("resized", function () {
+    map.invalidateSize();
   });
 
   if (OSM.home) {