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 9a05ae1ddf0accf67dbd83e1272336ad7cbf1383..19e1f16de8ebd3b3a596fd5bbc95a7eb4b92c24a 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,146 +1,223 @@
+//= require_self
+//= require leaflet.sidebar
+//= require leaflet.locate
+//= require leaflet.layers
+//= require leaflet.key
+//= require leaflet.note
+//= require leaflet.share

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

-//= require index/key
+//= require index/notes

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

-  var marker;

   var params = OSM.mapParams();
   var params = OSM.mapParams();

-  var map = createMap("map");

 
 

-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
+  var map = L.map("map", {
+    zoomControl: false,
+    layerControl: false
+  });

 
 

-  if (!params.object_zoom) {
-    if (params.bbox) {
-      var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
+  map.attributionControl.setPrefix('');
+
+  map.hash = L.hash(map);
+
+  var layers = [
+    new L.OSM.Mapnik({
+      attribution: '',
+      code: "M",
+      keyid: "mapnik",
+      name: I18n.t("javascripts.map.base.standard")
+    }),
+    new L.OSM.CycleMap({
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      code: "C",
+      keyid: "cyclemap",
+      name: I18n.t("javascripts.map.base.cycle_map")
+    }),
+    new L.OSM.TransportMap({
+      attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+      code: "T",
+      keyid: "transportmap",
+      name: I18n.t("javascripts.map.base.transport_map")
+    }),
+    new L.OSM.MapQuestOpen({
+      attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+      code: "Q",
+      keyid: "mapquest",
+      name: I18n.t("javascripts.map.base.mapquest")
+    })
+  ];
+
+  layers[0].addTo(map);
+
+  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.zoomToExtent(proj(bbox));
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';

 
 

-      if (params.box) {
-        $(window).load(function() { addBoxToMap(bbox) });
-      }
-    } else {
-      setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
-    }
-  }
+  L.OSM.zoom({position: position})
+    .addTo(map);

 
 

-  if (params.layers) {
-    setMapLayers(params.layers);
-  }
+  L.control.locate({position: position})
+    .addTo(map);

 
 

-  if (params.marker) {
-    marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
-  }
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);

 
 

-  if (params.object) {
-    var url = "/api/" + OSM.API_VERSION + "/" + params.object_type + "/" + params.object_id;
+  L.OSM.layers({
+    position: position,
+    layers: layers,
+    sidebar: sidebar
+  }).addTo(map);

 
 

-    if (params.object_type != "node") {
-      url += "/full";
-    }
+  L.OSM.key({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);

 
 

-    $(window).load(function() { addObjectToMap(url, params.object_zoom) });
-  }
+  L.OSM.share({
+    position: position,
+    sidebar: sidebar,
+    short: true
+  }).addTo(map);

 
 

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

 
 

-  $("#show_data").click(function (e) {
-    $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
-      startBrowse(sidebarHtml);
-    }});
-    e.preventDefault();
-  });
+  L.control.scale()
+    .addTo(map);

 
 

-  $("body").on("click", "a.set_position", function () {
-    var data = $(this).data();
-    var centre = new OpenLayers.LonLat(data.lon, data.lat);
+  map.on('moveend layeradd layerremove', updateLocation);

 
 

-    if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
+  map.markerLayer = L.layerGroup().addTo(map);

 
 

-      map.zoomToExtent(proj(bbox));
+  if (!params.object_zoom) {
+    if (params.bounds) {
+      map.fitBounds(params.bounds);

     } else {
     } else {

-      setMapCenter(centre, data.zoom);
+      map.setView([params.lat, params.lon], params.zoom);

     }
     }

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

 
 

-    if (marker) {
-      removeMarkerFromMap(marker);
+  if (params.layers) {
+    var foundLayer = false;
+    for (var i = 0; i < layers.length; i++) {
+      if (params.layers.indexOf(layers[i].options.code) >= 0) {
+        map.addLayer(layers[i]);
+        foundLayer = true;
+      } else {
+        map.removeLayer(layers[i]);
+      }

     }
     }

+    if (!foundLayer) {
+      map.addLayer(layers[0]);
+    }
+  }

 
 

-    marker = addMarkerToMap(centre, getArrowIcon());
+  if (params.marker) {
+    L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer);
+  }

 
 

-    return false;
-  });
+  if (params.object) {
+    addObjectToMap(params.object, map, { zoom: params.object_zoom });
+  }

 
 

-  function updateLocation() {
-    var lonlat = unproj(map.getCenter());
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = unproj(map.getExtent());
-    var expiry = new Date();
+  $("body").on("click", "a.set_position", setPositionLink(map));

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
+  $("a[data-editor=remote]").click(function(e) {
+      remoteEditHandler(map.getBounds());
+      e.preventDefault();
+  });

 
 

-    expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
+  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
+    remoteEditHandler(map.getBounds());

   }
 
   }
 

-  function remoteEditHandler(event) {
-    var extent = unproj(map.getExtent());
-    var loaded = false;
+  $("#search_form").submit(submitSearch(map));

 
 

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

 
 

-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);
-
-    return false;
+  if ($("#query").val()) {
+    $("#search_form").submit();

   }
 
   }
 

-  $("a[data-editor=remote]").click(remoteEditHandler);
-
-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
+  // Focus the search field for browsers that don't support
+  // the HTML5 'autofocus' attribute
+  if (!("autofocus" in document.createElement("input"))) {
+    $("#query").focus();

   }
 
   }
 

-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
+  initializeExport(map);
+  initializeBrowse(map, params);
+  initializeNotes(map, params);
+});

 
 

-    handleResize();
+function updateLocation() {
+  updatelinks(this.getCenter().wrap(),
+      this.getZoom(),
+      this.getLayersCode(),
+      this.getBounds().wrap());
+
+  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) {
+  return function(e) {
+      var data = $(this).data(),
+          center = L.latLng(data.lat, data.lon);
+
+      if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
+        map.fitBounds([[data.minLat, data.minLon],
+                       [data.maxLat, data.maxLon]]);
+      } else {
+        map.setView(center, data.zoom);
+      }

 
 

-    map.setCenter(centre, zoom);
-  });
+      if (data.type && data.id) {
+        addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
+      }

 
 

-  $("#exportanchor").click(function (e) {
-    $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
-      startExport(sidebarHtml);
-    }});
-    e.preventDefault();
-  });
+      map.markerLayer.clearLayers();
+      L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);

 
 

-  if (window.location.pathname == "/export") {
-    $("#exportanchor").click();
-  }
+      return e.preventDefault();
+  };
+}

 
 

-  $("#search_form").submit(function () {
-    var extent = unproj(map.getExtent());
+function submitSearch(map) {
+  return function(e) {
+    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.getWest(),
+      minlat: bounds.getSouth(),
+      maxlon: bounds.getEast(),
+      maxlat: bounds.getNorth()

     }, openSidebar);
 
     }, openSidebar);
 

-    return false;
-  });
-
-  if ($("#query").val()) {
-    $("#search_form").submit();
-  }
-});
+    return e.preventDefault();
+  };
+}