X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d84b81fd953e7a9965330c67f3e42701000fb19..483854f411ce7106144883824adb7e49060424c2:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 8d3a043d6..e4dbb84d0 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,15 +5,24 @@
 //= 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();
+
+  layers[0].layer.addTo(map);
+
+  $("#map").on("resized", function () {
+    map.invalidateSize();
   });
 
   L.control.zoom({position: 'topright'})
@@ -30,14 +39,16 @@ $(document).ready(function () {
       }
   }).addTo(map);
 
+  L.control.note({
+      position: 'topright'
+  }).addTo(map);
+
   L.control.locate({
       position: 'topright'
   }).addTo(map);
 
   L.control.scale().addTo(map);
 
-  map.attributionControl.setPrefix(permalinks);
-
   map.on("moveend layeradd layerremove", updateLocation);
 
   if (!params.object_zoom) {
@@ -68,7 +79,7 @@ $(document).ready(function () {
   }
 
   if (params.object) {
-    addObjectToMap(params.object, { zoom: params.object_zoom });
+    addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 
   handleResize();
@@ -87,7 +98,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) {
@@ -103,8 +114,7 @@ $(document).ready(function () {
     var layers = getMapLayers();
     var extents = map.getBounds().wrap();
 
-    updatelinks(center.lng,
-                center.lat,
+    updatelinks(center,
                 zoom,
                 layers,
                 extents.getWest(),
@@ -168,3 +178,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);
+  }
+}