starting to cleanup+style map controls.

[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 a3fd53a682e7bdccbe84e1ab44758cf7fb05e4af..a7e9f6f5040b549f966e67ab5215b10ad636ae0a 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -16,36 +16,35 @@ 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,
+  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")
-    },
-    {
-      klass: L.OSM.TransportMap,
+    }),
+    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")
-    },
-    {
-      klass: L.OSM.MapQuestOpen,
+    }),
+    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")
-    }
-  ]
+    }),
+    keyid: "mapquest",
+    layerCode: "Q",
+    name: I18n.t("javascripts.map.base.mapquest")
+  }]
 }
 
 function getUserIcon(url) {