X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d1ee7de08b0900713ca2cd6510ee6bd83bf1c240..33aa0a6e454fb2d43b8ccc07395abf0864d47b66:/app/assets/javascripts/map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index a7e9f6f50..70801306b 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -15,38 +15,6 @@ L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
 var objectLayer;
 var objectLoader;
 
-function mapLayers() {
-  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) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
@@ -59,13 +27,8 @@ function getUserIcon(url) {
 }
 
 function addObjectToMap(object, map, options) {
-  if (objectLoader) {
-    objectLoader.abort();
-  }
-
-  if (objectLayer) {
-    map.removeLayer(objectLayer);
-  }
+  if (objectLoader) objectLoader.abort();
+  if (objectLayer) map.removeLayer(objectLayer);
 
   objectLoader = $.ajax({
     url: OSM.apiUrl(object),
@@ -93,15 +56,8 @@ function addObjectToMap(object, map, options) {
 
       objectLayer.addData(xml);
 
-      var bounds = objectLayer.getBounds();
-
-      if (options.zoom) {
-        map.fitBounds(bounds);
-      }
-
-      if (options.callback) {
-        options.callback(bounds);
-      }
+      if (options.zoom) map.fitBounds(objectLayer.getBounds());
+      if (options.callback) options.callback(objectLayer.getBounds());
 
       objectLayer.addTo(map);
     }