From: Tom MacWright <tom@macwright.org>
Date: Mon, 10 Jun 2013 20:45:21 +0000 (-0700)
Subject: Refactor mapLayers to create layers up front
X-Git-Tag: live~4854^2~54
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c4f965489137029161a3897aa39f34e7168d7621

Refactor mapLayers to create layers up front
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2cabfc5d0..ba2aa2644 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -19,10 +19,6 @@ $(document).ready(function () {
 
   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 () {
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index a3fd53a68..74aaf5579 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -16,36 +16,31 @@ var objectLayer;
 var objectLoader;
 
 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")
-    }
-  ]
+  return [{
+    layer: new L.OSM.Mapnik(),
+    attribution: "",
+    keyid: "mapnik",
+    layerCode: "M",
+    name: I18n.t("javascripts.map.base.standard")
+  }, {
+    layer: new 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")
+  }, {
+    layer: new 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")
+  }, {
+    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'>",
+    keyid: "mapquest",
+    layerCode: "Q",
+    name: I18n.t("javascripts.map.base.mapquest")
+  }]
 }
 
 function getUserIcon(url) {