X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15d148dbd4cb7497f7faae06e58d4227c530cd8a..7bcea3839da07f01258157ad204cd5b1fd4c76d8:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 760c95230..48207c43d 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", {
     zoomControl: false,
     layerControl: false
-  }, {
-    locateControl: true
+  });
+
+  map.attributionControl.setPrefix('');
+
+  layers = mapLayers();
+  layers[0].layer.addTo(map);
+
+  $("#map").on("resized", function () {
+    map.invalidateSize();
   });
 
   L.control.zoom({position: 'topright'})
@@ -21,9 +30,24 @@ $(document).ready(function () {
 
   OSM.mapUI().addTo(map);
 
-  L.control.scale().addTo(map);
+  L.control.share({
+      getUrl: function(map) {
+          return setArgs('http://osm.org/', {
+              lon: map.getCenter().lng,
+              lat: map.getCenter().lat
+          });
+      }
+  }).addTo(map);
+
+  L.control.note({
+      position: 'topright'
+  }).addTo(map);
 
-  map.attributionControl.setPrefix(permalinks);
+  L.control.locate({
+      position: 'topright'
+  }).addTo(map);
+
+  L.control.scale().addTo(map);
 
   map.on("moveend layeradd layerremove", updateLocation);
 
@@ -35,7 +59,11 @@ $(document).ready(function () {
       map.fitBounds(bbox);
 
       if (params.box) {
-        addBoxToMap(bbox);
+        L.rectangle(bbox, {
+          weight: 2,
+          color: '#e90',
+          fillOpacity: 0
+        }).addTo(map);
       }
     } else {
       map.setView([params.lat, params.lon], params.zoom);
@@ -51,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();
@@ -70,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) {
@@ -86,15 +114,7 @@ $(document).ready(function () {
     var layers = getMapLayers();
     var extents = map.getBounds().wrap();
 
-    updatelinks(center.lng,
-                center.lat,
-                zoom,
-                layers,
-                extents.getWest(),
-                extents.getSouth(),
-                extents.getEast(),
-                extents.getNorth(),
-                params.object);
+    updatelinks(center, zoom, layers, extents, params.object);
 
     var expiry = new Date();
     expiry.setYear(expiry.getFullYear() + 10);
@@ -151,3 +171,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);
+  }
+}