Prefer hash to other methods of determining location

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 10f9f86f065d6fd78ffd3ff59d4744921f739e0a..2f0c1609750d9321ff4bc1b18a76c1f3e440d7e7 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,18 +1,15 @@
 //= 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
 
 //= require index/notes
 

-var map, layers; // TODO: remove globals
-

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

-  var marker;

   var params = OSM.mapParams();
 
   var map = L.map("map", {
   var params = OSM.mapParams();
 
   var map = L.map("map", {


@@ -22,185 +19,190 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix('');
 
 
   map.attributionControl.setPrefix('');
 

-  layers = [{
-    layer: new L.OSM.Mapnik({
+  new L.Hash(map);
+
+  var layers = [
+    new L.OSM.Mapnik({

       attribution: '',
       attribution: '',

-      code: "M"
+      code: "M",
+      keyid: "mapnik",
+      name: I18n.t("javascripts.map.base.standard")

     }),
     }),

-    keyid: "mapnik",
-    name: I18n.t("javascripts.map.base.standard")
-  }, {
-    layer: new L.OSM.CycleMap({
+    new L.OSM.CycleMap({

       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",

-      code: "C"
+      code: "C",
+      keyid: "cyclemap",
+      name: I18n.t("javascripts.map.base.cycle_map")

     }),
     }),

-    keyid: "cyclemap",
-    name: I18n.t("javascripts.map.base.cycle_map")
-  }, {
-    layer: new L.OSM.TransportMap({
+    new L.OSM.TransportMap({

       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",

-      code: "T"
+      code: "T",
+      keyid: "transportmap",
+      name: I18n.t("javascripts.map.base.transport_map")

     }),
     }),

-    keyid: "transportmap",
-    name: I18n.t("javascripts.map.base.transport_map")
-  }, {
-    layer: new L.OSM.MapQuestOpen({
+    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'>",
       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")
-  }];
+      code: "Q",
+      keyid: "mapquest",
+      name: I18n.t("javascripts.map.base.mapquest")
+    })
+  ];
+
+  layers[0].addTo(map);

 
 

-  layers[0].layer.addTo(map);
+  map.noteLayer = new L.LayerGroup({code: 'N'});
+  map.dataLayer = new L.OSM.DataLayer(null);

 
 

-  $("#map").on("resized", function () {
+  $("#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);
+
+  L.control.locate({position: position})

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

-  var uiPane = $('#map-ui')[0];
+  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);
 
   }).addTo(map);
 

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

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

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

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

-  L.control.locate({
-    position: 'topright'
+  L.OSM.note({
+    position: position,
+    sidebar: sidebar

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

-  L.control.scale().addTo(map);
+  L.control.scale()
+    .addTo(map);

 
   map.on('moveend layeradd layerremove', updateLocation);
 
 
   map.on('moveend layeradd layerremove', updateLocation);
 

+  map.markerLayer = L.layerGroup().addTo(map);
+

   if (!params.object_zoom) {
   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++) {

-      if (params.layers.indexOf(layers[i].layer.options.code) >= 0) {
-        map.addLayer(layers[i].layer);
+      if (params.layers.indexOf(layers[i].options.code) >= 0) {
+        map.addLayer(layers[i]);

         foundLayer = true;
       } else {
         foundLayer = true;
       } else {

-        map.removeLayer(layers[i].layer);
+        map.removeLayer(layers[i]);

       }
     }
     if (!foundLayer) {
       }
     }
     if (!foundLayer) {

-      map.addLayer(layers[0].layer);
+      map.addLayer(layers[0]);

     }
   }
 
   if (params.marker) {
     }
   }
 
   if (params.marker) {

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

   }
 
   if (params.object) {
     addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 
   }
 
   if (params.object) {
     addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 

-  handleResize();
-
-  $("body").on("click", "a.set_position", function (e) {
-    e.preventDefault();
+  $("body").on("click", "a.set_position", setPositionLink(map));

 
 

-    var data = $(this).data();
-    var centre = 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(centre, data.zoom);
-    }
+  $("a[data-editor=remote]").click(function(e) {
+      remoteEditHandler(map.getBounds());
+      e.preventDefault();
+  });

 
 

-    if (data.type && data.id) {
-      addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
-    }
+  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
+    remoteEditHandler(map.getBounds());
+  }

 
 

-    if (marker) {
-      map.removeLayer(marker);
-    }
+  $("#search_form").submit(submitSearch(map));

 
 

-    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
-  });

 
 

-  // 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('|');
+  if ($("#query").val()) {
+    $("#search_form").submit();

   }
 
   }
 

-  function updateLocation() {
-    updatelinks(map.getCenter().wrap(),
-        map.getZoom(),
-        getMapLayers(this),
-        map.getBounds().wrap(),
-        params.object);
-
-    var expiry = new Date();
-    expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+  // Focus the search field for browsers that don't support
+  // the HTML5 'autofocus' attribute
+  if (!("autofocus" in document.createElement("input"))) {
+    $("#query").focus();

   }
 
   }
 

-  function remoteEditHandler() {
-    var extent = map.getBounds();
-    var loaded = false;
+  initializeExport(map);
+  initializeBrowse(map);
+  initializeNotes(map);
+});

 
 

-    $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" +
-         querystring.stringify({
-            left: extent.getWest(),
-            bottom: extent.getSouth(),
-            right: extent.getEast(),
-            top: extent.getNorth()
-         }));
+function updateLocation() {
+  updatelinks(this.getCenter().wrap(),
+      this.getZoom(),
+      this.getLayersCode(),
+      this.getBounds().wrap());

 
 

-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);
+  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+}

 
 

-    return false;
-  }
+function setPositionLink(map) {
+  return function(e) {
+      var data = $(this).data(),
+          center = L.latLng(data.lat, data.lon);

 
 

-  $("a[data-editor=remote]").click(remoteEditHandler);
+      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);
+      }

 
 

-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
-  }
+      if (data.type && data.id) {
+        addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
+      }

 
 

-  $(window).resize(handleResize);
+      map.markerLayer.clearLayers();
+      L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);
+
+      return e.preventDefault();
+  };
+}

 
 

-  $("#search_form").submit(function () {
+function submitSearch(map) {
+  return function(e) {

     var bounds = map.getBounds();
 
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     var bounds = map.getBounds();
 
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));


@@ -212,35 +214,6 @@ $(document).ready(function () {
       maxlat: bounds.getNorth()
     }, openSidebar);
 
       maxlat: bounds.getNorth()
     }, openSidebar);
 

-    return false;
-  });
-
-  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();
-  }
-});
-
-function getMapBaseLayer() {
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      return layers[i];
-    }
-  }
-}
-
-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;
+    return e.preventDefault();
+  };

 }
 }