Refactor layer persistence

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 24fe5171e50968d2b3f6e78e567974375d0e5843..9caaa3714516a9c38e7be80ca1b985e7d3a43035 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -8,11 +8,17 @@ $(document).ready(function () {
 
     $("#linkloader").load(function () { loaded = true; });
 
 
     $("#linkloader").load(function () { loaded = true; });
 

-    if (select) {
-      $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
-    } else {
-      $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
-    }
+    var query = {
+        left: left,
+        top: top,
+        right: right,
+        bottom: bottom,
+        select: select
+    };
+
+    if (select) query.select = select;
+    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" +
+      querystring.stringify(query));

 
     setTimeout(function () {
       if (!loaded) alert(I18n.t('site.index.remote_failed'));
 
     setTimeout(function () {
       if (!loaded) alert(I18n.t('site.index.remote_failed'));


@@ -21,19 +27,31 @@ $(document).ready(function () {
     return false;
   }
 
     return false;
   }
 

-  var map = createMap("small_map", {
-    layerControl: false,
-    panZoomControl: false,
-    attributionControl: false
+  var map = L.map("small_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#small_map").on("resized", function () {
+    map.invalidateSize();

   });
 
   var params = $("#small_map").data();
   });
 
   var params = $("#small_map").data();

+  var object, bbox;

   if (params.type == "changeset") {
   if (params.type == "changeset") {

-    var bbox = L.latLngBounds([params.minlat, params.minlon],
-                              [params.maxlat, params.maxlon]);
+    bbox = L.latLngBounds([params.minlat, params.minlon],
+        [params.maxlat, params.maxlon]);

 
     map.fitBounds(bbox);
 
     map.fitBounds(bbox);

-    addBoxToMap(bbox);
+
+    L.rectangle(bbox, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);

 
     $("#loading").hide();
     $("#browse_map .geolink").show();
 
     $("#loading").hide();
     $("#browse_map .geolink").show();


@@ -42,16 +60,16 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    var centre = bbox.getCenter();
-    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+    updatelinks(map.getCenter(), 16, null, [[params.minlat, params.minlon],
+        [params.maxlat, params.maxlon]]);

   } else if (params.type == "note") {
   } else if (params.type == "note") {

-    var object = {type: params.type, id: params.id};
+    object = {type: params.type, id: params.id};

 
     map.setView([params.lat, params.lon], 16);
 
     L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
 
 
     map.setView([params.lat, params.lon], 16);
 
     L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
 

-    var bbox = map.getBounds();
+    bbox = map.getBounds();

 
     $("#loading").hide();
     $("#browse_map .geolink").show();
 
     $("#loading").hide();
     $("#browse_map .geolink").show();


@@ -60,21 +78,20 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    updatelinks(params.lon, params.lat, 16, null,
+    updatelinks(params, 16, null,

                 bbox.getWest(), bbox.getSouth(),
                 bbox.getEast(), bbox.getNorth(),
                 object);
   } else {
                 bbox.getWest(), bbox.getSouth(),
                 bbox.getEast(), bbox.getNorth(),
                 object);
   } else {

-    $("#object_larger_map").hide();
-    $("#object_edit").hide();
+    $("#object_larger_map, #object_edit").hide();

 
 

-    var object = {type: params.type, id: params.id};
+    object = {type: params.type, id: params.id};

 
     if (!params.visible) {
       object.version = params.version - 1;
     }
 
 
     if (!params.visible) {
       object.version = params.version - 1;
     }
 

-    addObjectToMap(object, {
+    addObjectToMap(object, map, {

       zoom: true, 
       callback: function(extent) {
         $("#loading").hide();
       zoom: true, 
       callback: function(extent) {
         $("#loading").hide();


@@ -92,15 +109,7 @@ $(document).ready(function () {
           $("#object_larger_map").show();
           $("#object_edit").show();
 
           $("#object_larger_map").show();
           $("#object_edit").show();
 

-          var centre = extent.getCenter();
-          updatelinks(centre.lng,
-                      centre.lat,
-                      16, null,
-                      extent.getWest(),
-                      extent.getSouth(),
-                      extent.getEast(),
-                      extent.getNorth(),
-                      object);
+          updatelinks(map.getCenter(), 16, null, extent, object);

         } else {
           $("#small_map").hide();
         }
         } else {
           $("#small_map").hide();
         }