Basic framework for map UI

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 5cf9c15ff0311a7d5763a72f95f160624125341a..7fad2ed239cc2317526cd334bbbf18aa8bc76fa6 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -2,18 +2,22 @@
 //= require index/browse
 //= require index/export
 //= require index/key
+//= require index/notes
+//= require index/map_ui
 
 $(document).ready(function () {
-  var permalinks = $("#permalink").html();
+  var permalinks = $("#permalink").detach().html();
   var marker;
   var params = OSM.mapParams();
-  var map = createMap("map");
+  var map = createMap("map", {layerControl: false});
+
+  OSM.mapUI().addTo(map);
 
   L.control.scale().addTo(map);
 
   map.attributionControl.setPrefix(permalinks);
 
-  map.on("moveend baselayerchange", updateLocation);
+  map.on("moveend layeradd layerremove", updateLocation);
 
   if (!params.object_zoom) {
     if (params.bbox) {
@@ -39,7 +43,7 @@ $(document).ready(function () {
   }
 
   if (params.object) {
-    addObjectToMap(params.object, params.object_zoom);
+    addObjectToMap(params.object, { zoom: params.object_zoom });
   }
 
   handleResize();
@@ -57,6 +61,10 @@ $(document).ready(function () {
       map.setView(centre, data.zoom);
     }
 
+    if (data.type && data.id) {
+      addObjectToMap(data, { zoom: true, style: { opacity: 0.2, fill: false } });
+    }
+
     if (marker) {
       map.removeLayer(marker);
     }
@@ -65,19 +73,19 @@ $(document).ready(function () {
   });
 
   function updateLocation() {
-    var center = map.getCenter();
+    var center = map.getCenter().wrap();
     var zoom = map.getZoom();
     var layers = getMapLayers();
-    var extents = map.getBounds();
+    var extents = map.getBounds().wrap();
 
     updatelinks(center.lng,
                 center.lat,
                 zoom,
                 layers,
-                extents.getWestLng(),
-                extents.getSouthLat(),
-                extents.getEastLng(),
-                extents.getNorthLat(),
+                extents.getWest(),
+                extents.getSouth(),
+                extents.getEast(),
+                extents.getNorth(),
                 params.object);
 
     var expiry = new Date();
@@ -90,10 +98,10 @@ $(document).ready(function () {
     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng()
-                                                                   + "&bottom=" + extent.getSouthLat()
-                                                                   + "&right=" + extent.getEastLng()
-                                                                   + "&top=" + extent.getNorthLat());
+    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWest()
+                                                                   + "&bottom=" + extent.getSouth()
+                                                                   + "&right=" + extent.getEast()
+                                                                   + "&top=" + extent.getNorth());
 
     setTimeout(function () {
       if (!loaded) alert(I18n.t('site.index.remote_failed'));
@@ -116,10 +124,10 @@ $(document).ready(function () {
     $("#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 false;