Update short link integration tests for hash links

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 184b57419770a5d750bb5456d5be4b5bfec275ee..19e1f16de8ebd3b3a596fd5bbc95a7eb4b92c24a 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,12 +1,12 @@
 //= require_self
 //= require_self

+//= require leaflet.sidebar
+//= require leaflet.locate

 //= require leaflet.layers
 //= require leaflet.layers

-//= require leaflet.share
+//= require leaflet.key

 //= require leaflet.note
 //= require leaflet.note

-//= require leaflet.locate
-//= require leaflet.customzoom
+//= require leaflet.share

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

-//= require index/key

 //= require index/notes
 
 $(document).ready(function () {
 //= require index/notes
 
 $(document).ready(function () {


@@ -19,6 +19,8 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix('');
 
 
   map.attributionControl.setPrefix('');
 

+  map.hash = L.hash(map);
+

   var layers = [
     new L.OSM.Mapnik({
       attribution: '',
   var layers = [
     new L.OSM.Mapnik({
       attribution: '',


@@ -48,53 +50,72 @@ $(document).ready(function () {
 
   layers[0].addTo(map);
 
 
   layers[0].addTo(map);
 

-  $("#map").on("resized", function () {
+  map.noteLayer = new L.LayerGroup();
+  map.noteLayer.options = {code: 'N'};
+
+  map.dataLayer = new L.OSM.DataLayer(null);
+  map.dataLayer.options.code = 'D';
+
+  $("#sidebar").on("opened closed", function () {

     map.invalidateSize();
   });
 
     map.invalidateSize();
   });
 

-  L.control.customZoom({position: 'topright'})
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})

     .addTo(map);
 
     .addTo(map);
 

-  var uiPane = $('#map-ui')[0];
+  L.control.locate({position: position})
+    .addTo(map);
+
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);

 
   L.OSM.layers({
 
   L.OSM.layers({

-    position: 'topright',
+    position: position,

     layers: layers,
     layers: layers,

-    uiPane: uiPane
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.key({
+    position: position,
+    sidebar: sidebar

   }).addTo(map);
 
   }).addTo(map);
 

-  L.control.share({
-    getUrl: getShortUrl,
-    uiPane: uiPane
+  L.OSM.share({
+    position: position,
+    sidebar: sidebar,
+    short: true

   }).addTo(map);
 
   }).addTo(map);
 

-  L.control.note({ position: 'topright' }).addTo(map);
-  L.control.locate({ position: 'topright' }).addTo(map);
-  L.control.scale().addTo(map);
+  L.OSM.note({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.control.scale()
+    .addTo(map);

 
   map.on('moveend layeradd layerremove', updateLocation);
 
   map.markerLayer = L.layerGroup().addTo(map);
 
   if (!params.object_zoom) {
 
   map.on('moveend layeradd layerremove', updateLocation);
 
   map.markerLayer = L.layerGroup().addTo(map);
 
   if (!params.object_zoom) {

-    if (params.bbox) {
-      var bbox = L.latLngBounds([params.minlat, params.minlon],
-                                [params.maxlat, params.maxlon]);
-
-      map.fitBounds(bbox);
-
-      if (params.box) {
-        L.rectangle(bbox, {
-          weight: 2,
-          color: '#e90',
-          fillOpacity: 0
-        }).addTo(map);
-      }
+    if (params.bounds) {
+      map.fitBounds(params.bounds);

     } else {
       map.setView([params.lat, params.lon], params.zoom);
     }
   }
 
     } else {
       map.setView([params.lat, params.lon], params.zoom);
     }
   }
 

+  if (params.box) {
+    L.rectangle(params.box, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);
+  }
+

   if (params.layers) {
     var foundLayer = false;
     for (var i = 0; i < layers.length; i++) {
   if (params.layers) {
     var foundLayer = false;
     for (var i = 0; i < layers.length; i++) {


@@ -118,8 +139,6 @@ $(document).ready(function () {
     addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 
     addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 

-  handleResize();
-

   $("body").on("click", "a.set_position", setPositionLink(map));
 
   $("a[data-editor=remote]").click(function(e) {
   $("body").on("click", "a.set_position", setPositionLink(map));
 
   $("a[data-editor=remote]").click(function(e) {


@@ -131,8 +150,6 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
     remoteEditHandler(map.getBounds());
   }
 

-  $(window).resize(handleResize);
-

   $("#search_form").submit(submitSearch(map));
 
 
   $("#search_form").submit(submitSearch(map));
 
 


@@ -145,43 +162,24 @@ $(document).ready(function () {
   if (!("autofocus" in document.createElement("input"))) {
     $("#query").focus();
   }
   if (!("autofocus" in document.createElement("input"))) {
     $("#query").focus();
   }

-});
-
-function getMapBaseLayerId(map) {
-  for (var i in map._layers) { // TODO: map.eachLayer
-    var layer = map._layers[i];
-    if (layer.options && layer.options.keyid) {
-      return layer.options.keyid;
-    }
-  }
-}
-
-function getMapLayers(map) {
-  var layerConfig = '';
-  for (var i in map._layers) { // TODO: map.eachLayer
-    var layer = map._layers[i];
-    if (layer.options && layer.options.code) {
-      layerConfig += layer.options.code;
-    }
-  }
-  return layerConfig;
-}

 
 

-// generate a cookie-safe string of map state
-function cookieContent(map) {
-  var center = map.getCenter().wrap();
-  return [center.lng, center.lat, map.getZoom(), getMapLayers(map)].join('|');
-}
+  initializeExport(map);
+  initializeBrowse(map, params);
+  initializeNotes(map, params);
+});

 
 function updateLocation() {
   updatelinks(this.getCenter().wrap(),
       this.getZoom(),
 
 function updateLocation() {
   updatelinks(this.getCenter().wrap(),
       this.getZoom(),

-      getMapLayers(this),
-      this.getBounds().wrap(), {});
+      this.getLayersCode(),
+      this.getBounds().wrap());

 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
   $.cookie("_osm_location", cookieContent(this), { expires: expiry });
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
   $.cookie("_osm_location", cookieContent(this), { expires: expiry });

+
+  // Trigger hash update on layer changes.
+  this.hash.onMapMove();

 }
 
 function setPositionLink(map) {
 }
 
 function setPositionLink(map) {


@@ -214,10 +212,10 @@ function submitSearch(map) {
     $("#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: 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 e.preventDefault();
     }, openSidebar);
 
     return e.preventDefault();