Simplify sidebar/resize

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6ea27623084a384d8c5c0122efe5937e234b06ea..ae5fdb9d61c80e0c2bb9da13e10f726e957dc0ac 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -51,7 +51,7 @@ $(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();
   });
 
@@ -61,7 +61,8 @@ $(document).ready(function () {
   L.control.locate({position: 'topright'})
     .addTo(map);
 
-  var sidebar = L.OSM.sidebar('#map-ui');
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);
 
   L.OSM.layers({
     position: 'topright',
@@ -135,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) {
@@ -148,8 +147,6 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
-  $(window).resize(handleResize);
-
   $("#search_form").submit(submitSearch(map));
 
 
@@ -172,7 +169,7 @@ function updateLocation() {
   updatelinks(this.getCenter().wrap(),
       this.getZoom(),
       this.getLayersCode(),
-      this.getBounds().wrap(), {});
+      this.getBounds().wrap());
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
@@ -209,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();