X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5e9ab5bc5edb63b7ab7719fa989a18f52e3637a2..aff23d4b4bc9e9fecd5c1caa7e4d38087e002396:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index fed4c1d8a..ae5fdb9d6 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,12 +1,12 @@
 //= require_self
+//= require leaflet.sidebar
+//= require leaflet.locate
 //= require leaflet.layers
-//= require leaflet.share
+//= require leaflet.key
 //= require leaflet.note
-//= require leaflet.locate
-//= require leaflet.customzoom
+//= require leaflet.share
 //= require index/browse
 //= require index/export
-//= require index/key
 //= require index/notes
 
 $(document).ready(function () {
@@ -51,29 +51,44 @@ $(document).ready(function () {
   map.noteLayer = new L.LayerGroup({code: 'N'});
   map.dataLayer = new L.OSM.DataLayer(null);
 
-  $("#map").on("resized", function () {
+  $("#sidebar").on("opened closed", function () {
     map.invalidateSize();
   });
 
-  L.control.customZoom({position: 'topright'})
+  L.OSM.zoom({position: 'topright'})
     .addTo(map);
 
-  var uiPane = $('#map-ui')[0];
+  L.control.locate({position: 'topright'})
+    .addTo(map);
+
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);
 
   L.OSM.layers({
     position: 'topright',
     layers: layers,
-    uiPane: uiPane
+    sidebar: sidebar
   }).addTo(map);
 
-  L.control.share({
-    getUrl: getShortUrl,
-    uiPane: uiPane
+  L.OSM.key({
+    position: 'topright',
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.share({
+    getShortUrl: getShortUrl,
+    getUrl: getUrl,
+    sidebar: sidebar,
+    short: true
+  }).addTo(map);
+
+  L.OSM.note({
+    position: 'topright',
+    sidebar: sidebar
   }).addTo(map);
 
-  L.control.note({ position: 'topright' }).addTo(map);
-  L.control.locate({ position: 'topright' }).addTo(map);
-  L.control.scale().addTo(map);
+  L.control.scale()
+    .addTo(map);
 
   map.on('moveend layeradd layerremove', updateLocation);
 
@@ -121,8 +136,6 @@ $(document).ready(function () {
     addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 
-  handleResize();
-
   $("body").on("click", "a.set_position", setPositionLink(map));
 
   $("a[data-editor=remote]").click(function(e) {
@@ -134,8 +147,6 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
-  $(window).resize(handleResize);
-
   $("#search_form").submit(submitSearch(map));
 
 
@@ -149,41 +160,16 @@ $(document).ready(function () {
     $("#query").focus();
   }
 
+  initializeExport(map);
   initializeBrowse(map);
   initializeNotes(map);
 });
 
-function getMapBaseLayerId(map) {
-  for (var i in map._layers) { // TODO: map.eachLayer
-    var layer = map._layers[i];
-    if (layer.options && layer.options.keyid) {
-      return layer.options.keyid;
-    }
-  }
-}
-
-function getMapLayers(map) {
-  var layerConfig = '';
-  for (var i in map._layers) { // TODO: map.eachLayer
-    var layer = map._layers[i];
-    if (layer.options && layer.options.code) {
-      layerConfig += layer.options.code;
-    }
-  }
-  return layerConfig;
-}
-
-// generate a cookie-safe string of map state
-function cookieContent(map) {
-  var center = map.getCenter().wrap();
-  return [center.lng, center.lat, map.getZoom(), getMapLayers(map)].join('|');
-}
-
 function updateLocation() {
   updatelinks(this.getCenter().wrap(),
       this.getZoom(),
-      getMapLayers(this),
-      this.getBounds().wrap(), {});
+      this.getLayersCode(),
+      this.getBounds().wrap());
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
@@ -220,10 +206,10 @@ function submitSearch(map) {
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
-      minlon: bounds.getWestLng(),
-      minlat: bounds.getSouthLat(),
-      maxlon: bounds.getEastLng(),
-      maxlat: bounds.getNorthLat()
+      minlon: bounds.getWest(),
+      minlat: bounds.getSouth(),
+      maxlon: bounds.getEast(),
+      maxlat: bounds.getNorth()
     }, openSidebar);
 
     return e.preventDefault();