Tidy up

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e6e730903f49d40361567ae664fff9635f16b28e..8afd3269d61d2aabf6ba3b4822f480ef4bab4fbe 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -8,14 +8,11 @@ $(document).ready(function () {
   var params = OSM.mapParams();
   var map = createMap("map");
 
-  // https://github.com/CloudMade/Leaflet/issues/1063
-  map.on('load', function () {
-    L.control.scale().addTo(map);
-  });
+  L.control.scale().addTo(map);
 
   map.attributionControl.setPrefix(permalinks);
 
-  map.on("moveend layeradd layerremove", updateLocation);
+  map.on("moveend baselayerchange", updateLocation);
 
   if (!params.object_zoom) {
     if (params.bbox) {
@@ -37,7 +34,7 @@ $(document).ready(function () {
   }
 
   if (params.marker) {
-    marker = addMarkerToMap([params.mlat, params.mlon]);
+    marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
   }
 
   if (params.object) {
@@ -60,10 +57,10 @@ $(document).ready(function () {
     }
 
     if (marker) {
-      removeMarkerFromMap(marker);
+      map.removeLayer(marker);
     }
 
-    marker = addMarkerToMap(centre, getArrowIcon());
+    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
   });
 
   function updateLocation() {
@@ -110,14 +107,7 @@ $(document).ready(function () {
     remoteEditHandler();
   }
 
-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
-
-    handleResize();
-
-    map.setCenter(centre, zoom);
-  });
+  $(window).resize(handleResize);
 
   $("#search_form").submit(function () {
     var bounds = map.getBounds();
@@ -125,10 +115,10 @@ $(document).ready(function () {
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
-      minlon: bounds.getSouthWest().lng,
-      minlat: bounds.getSouthWest().lat,
-      maxlon: bounds.getNorthEast().lng,
-      maxlat: bounds.getNorthEast().lat
+      minlon: bounds.getWestLng(),
+      minlat: bounds.getSouthLat(),
+      maxlon: bounds.getEastLng(),
+      maxlat: bounds.getNorthLat()
     }, openSidebar);
 
     return false;