Merge branch 'master' into notes

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6164028118c0ed693668d59d0d6529bcec4dd69b..dc5c40bf2eb5d8af589c7885fa7de25077714f97 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,26 +1,33 @@
+//= require_self

 //= require index/browse
 //= require index/export
 //= require index/key
 //= require index/browse
 //= require index/export
 //= require index/key

+//= require index/notes

 
 $(document).ready(function () {
 
 $(document).ready(function () {

+  var permalinks = $("#permalink").html();

   var marker;
   var params = OSM.mapParams();
   var map = createMap("map");
 
   var marker;
   var params = OSM.mapParams();
   var map = createMap("map");
 

-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
+  L.control.scale().addTo(map);
+
+  map.attributionControl.setPrefix(permalinks);
+
+  map.on("moveend baselayerchange", updateLocation);

 
   if (!params.object_zoom) {
     if (params.bbox) {
 
   if (!params.object_zoom) {
     if (params.bbox) {

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

 
 

-      map.zoomToExtent(proj(bbox));
+      map.fitBounds(bbox);

 
       if (params.box) {
         addBoxToMap(bbox);
       }
     } else {
 
       if (params.box) {
         addBoxToMap(bbox);
       }
     } else {

-      setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+      map.setView([params.lat, params.lon], params.zoom);

     }
   }
 
     }
   }
 


@@ -29,7 +36,7 @@ $(document).ready(function () {
   }
 
   if (params.marker) {
   }
 
   if (params.marker) {

-    marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
+    marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);

   }
 
   if (params.object) {
   }
 
   if (params.object) {


@@ -38,53 +45,56 @@ $(document).ready(function () {
 
   handleResize();
 
 
   handleResize();
 

-  $("#show_data").click(function (e) {
-    $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
-      startBrowse(sidebarHtml);
-    }});
+  $("body").on("click", "a.set_position", function (e) {

     e.preventDefault();
     e.preventDefault();

-  });

 
 

-  $("body").on("click", "a.set_position", function () {

     var data = $(this).data();
     var data = $(this).data();

-    var centre = new OpenLayers.LonLat(data.lon, data.lat);
+    var centre = L.latLng(data.lat, data.lon);

 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {

-      var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
-
-      map.zoomToExtent(proj(bbox));
+      map.fitBounds([[data.minLat, data.minLon],
+                     [data.maxLat, data.maxLon]]);

     } else {
     } else {

-      setMapCenter(centre, data.zoom);
+      map.setView(centre, data.zoom);

     }
 
     if (marker) {
     }
 
     if (marker) {

-      removeMarkerFromMap(marker);
+      map.removeLayer(marker);

     }
 
     }
 

-    marker = addMarkerToMap(centre, getArrowIcon());
-
-    return false;
+    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);

   });
 
   function updateLocation() {
   });
 
   function updateLocation() {

-    var lonlat = unproj(map.getCenter());
+    var center = map.getCenter();

     var zoom = map.getZoom();
     var layers = getMapLayers();
     var zoom = map.getZoom();
     var layers = getMapLayers();

-    var extents = unproj(map.getExtent());
-    var expiry = new Date();
-
-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object);
+    var extents = map.getBounds();
+
+    updatelinks(center.lng,
+                center.lat,
+                zoom,
+                layers,
+                extents.getWestLng(),
+                extents.getSouthLat(),
+                extents.getEastLng(),
+                extents.getNorthLat(),
+                params.object);

 
 

+    var expiry = new Date();

     expiry.setYear(expiry.getFullYear() + 10);
     expiry.setYear(expiry.getFullYear() + 10);

-    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
+    $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});

   }
 
   }
 

-  function remoteEditHandler(event) {
-    var extent = unproj(map.getExtent());
+  function remoteEditHandler() {
+    var extent = map.getBounds();

     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });
     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });

-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
+    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng()
+                                                                   + "&bottom=" + extent.getSouthLat()
+                                                                   + "&right=" + extent.getEastLng()
+                                                                   + "&top=" + extent.getNorthLat());

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


@@ -99,36 +109,18 @@ $(document).ready(function () {
     remoteEditHandler();
   }
 
     remoteEditHandler();
   }
 

-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
-
-    handleResize();
-
-    map.setCenter(centre, zoom);
-  });
-
-  $("#exportanchor").click(function (e) {
-    $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
-      startExport(sidebarHtml);
-    }});
-    e.preventDefault();
-  });
-
-  if (window.location.pathname == "/export") {
-    $("#exportanchor").click();
-  }
+  $(window).resize(handleResize);

 
   $("#search_form").submit(function () {
 
   $("#search_form").submit(function () {

-    var extent = unproj(map.getExtent());
+    var bounds = map.getBounds();

 
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
 
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),

-      minlon: extent.left,
-      minlat: extent.bottom,
-      maxlon: extent.right,
-      maxlat: extent.top
+      minlon: bounds.getWestLng(),
+      minlat: bounds.getSouthLat(),
+      maxlon: bounds.getEastLng(),
+      maxlat: bounds.getNorthLat()

     }, openSidebar);
 
     return false;
     }, openSidebar);
 
     return false;


@@ -137,4 +129,10 @@ $(document).ready(function () {
   if ($("#query").val()) {
     $("#search_form").submit();
   }
   if ($("#query").val()) {
     $("#search_form").submit();
   }

+
+  // Focus the search field for browsers that don't support
+  // the HTML5 'autofocus' attribute
+  if (!("autofocus" in document.createElement("input"))) {
+    $("#query").focus();
+  }

 });
 });