Merge remote-tracking branch 'osmlab/user-display'

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 0a37627273a82067e41b55bfdf8e03a4f8ec1806..11818a1712c513421221455c2c3f209c488b7c01 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,83 +1,85 @@
 $(document).ready(function () {
 $(document).ready(function () {

-  function remoteEditHandler(bbox, select) {
-    var left = bbox.left - 0.0001;
-    var top = bbox.top + 0.0001;
-    var right = bbox.right + 0.0001;
-    var bottom = bbox.bottom - 0.0001;
-    var loaded = false;
-
-    $("#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);
-    }
-
-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);

 
 

-    return false;
-  }
+  var map = L.map("small_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());

 
 

-  var map = createMap("small_map", {
-    layerControl: false,
-    zoomControl: false,
-    attributionControl: false
-  });
+  L.OSM.zoom()
+    .addTo(map);

 
   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();
 
     $("#loading").hide();

-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();

 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
     });
 
 
     $("a[data-editor=remote]").click(function () {
       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") {
+    object = {type: params.type, id: params.id};
+
+    map.setView([params.lat, params.lon], 16);
+
+    L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
+
+    bbox = map.getBounds();
+
+    $("#loading").hide();
+    $("#browse_map .secondary-actions").show();
+
+    $("a[data-editor=remote]").click(function () {
+      return remoteEditHandler(bbox);
+    });
+
+    updatelinks(params, 16, null, bbox, object);

   } else {
   } 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, true, function(extent) {
-      $("#loading").hide();
-      $("#browse_map .geolink").show();
+    map.addObject(object, {
+      zoom: true,
+      callback: function(extent) {
+        $("#loading").hide();
+        $("#browse_map .secondary-actions").show();

 
 

-      if (extent) {
-        $("a.bbox[data-editor=remote]").click(function () {
-          return remoteEditHandler(extent);
-        });
+        if (extent) {
+          $("a.bbox[data-editor=remote]").click(function () {
+            return remoteEditHandler(extent);
+          });

 
 

-        $("a.object[data-editor=remote]").click(function () {
-          return remoteEditHandler(extent, params.type + params.id);
-        });
+          $("a.object[data-editor=remote]").click(function () {
+            return remoteEditHandler(extent, params.type + params.id);
+          });

 
 

-        $("#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.left, extent.bottom, extent.right, extent.top, object);
-      } else {
-        $("#small_map").hide();
+          updatelinks(map.getCenter(), 16, null, extent, object);
+        } else {
+          $("#small_map").hide();
+        }

       }
     });
   }
       }
     });
   }

-
-  createMenu("area_edit", "area_edit_menu", "right");
-  createMenu("object_edit", "object_edit_menu", "right");

 });
 });