Fix the "Where am I?" link

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index ffe12ecc6a6169783a10cf698e1e258a0dab7b5b..5d135696e60b9d5ded5f099845ffb8339f9a2f4b 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,11 +1,11 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

-//= require leaflet.customzoom

 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share

+//= require index/search

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


@@ -20,6 +20,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: '',


@@ -47,41 +49,53 @@ $(document).ready(function () {
     })
   ];
 
     })
   ];
 

-  layers[0].addTo(map);
+  for (var i = layers.length - 1; i >= 0; i--) {
+    if (i === 0 || params.layers.indexOf(layers[i].options.code) >= 0) {
+      map.addLayer(layers[i]);
+      break;
+    }
+  }
+
+  map.noteLayer = new L.LayerGroup();
+  map.noteLayer.options = {code: 'N'};

 
 

-  map.noteLayer = new L.LayerGroup({code: 'N'});

   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer = new L.OSM.DataLayer(null);

+  map.dataLayer.options.code = 'D';

 
 

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

-  L.control.locate({position: 'topright'})
+  L.control.locate({position: position})

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

-  var sidebar = L.OSM.sidebar('#map-ui');
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);

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

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

     layers: layers,
     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.key({
     layers: layers,
     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.key({

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

     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 

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

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

-  L.OSM.share({
-    getUrl: getShortUrl,
+  L.OSM.note({
+    position: position,

     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 


@@ -90,53 +104,41 @@ $(document).ready(function () {
 
   map.on('moveend layeradd layerremove', updateLocation);
 
 
   map.on('moveend layeradd layerremove', updateLocation);
 

-  map.markerLayer = L.layerGroup().addTo(map);
+  var marker = L.marker([0, 0], {icon: getUserIcon()});

 
   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.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]);
-    }
+  if (params.box) {
+    L.rectangle(params.box, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);

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

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

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

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

   }
 
   }
 

-  handleResize();
+  $("#homeanchor").on("click", function(e) {
+    e.preventDefault();

 
 

-  $("body").on("click", "a.set_position", setPositionLink(map));
+    var data = $(this).data(),
+      center = L.latLng(data.lat, data.lon);
+
+    map.setView(center, data.zoom);
+    marker.setLatLng(center).addTo(map);
+  });

 
   $("a[data-editor=remote]").click(function(e) {
       remoteEditHandler(map.getBounds());
 
   $("a[data-editor=remote]").click(function(e) {
       remoteEditHandler(map.getBounds());


@@ -147,99 +149,22 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
     remoteEditHandler(map.getBounds());
   }
 

-  $(window).resize(handleResize);
-
-  $("#search_form").submit(submitSearch(map));
-
-
-  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();
-  }
-
+  initializeSearch(map);

   initializeExport(map);
   initializeExport(map);

-  initializeBrowse(map);
-  initializeNotes(map);
+  initializeBrowse(map, params);
+  initializeNotes(map, params);

 });
 
 });
 

-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('|');
-}
-

 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 });

-}
-
-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);
-      }
-
-      if (data.type && data.id) {
-        addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
-      }
-
-      map.markerLayer.clearLayers();
-      L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);
-
-      return e.preventDefault();
-  };
-}

 
 

-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(),
-      minlon: bounds.getWestLng(),
-      minlat: bounds.getSouthLat(),
-      maxlon: bounds.getEastLng(),
-      maxlat: bounds.getNorthLat()
-    }, openSidebar);
-
-    return e.preventDefault();
-  };
+  // Trigger hash update on layer changes.
+  this.hash.onMapMove();

 }
 }