Refactor out 'globals' from more functions

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c908f1e3490353d72d53d067e2ad614ff8560aa7..753cf474013e2519e86104dc2b8450358b74f5d1 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,19 +1,87 @@
 //= require_self
 //= require_self

+//= require leaflet.layers
+//= require leaflet.share
+//= require leaflet.note
+//= require leaflet.locate
+//= require leaflet.customzoom

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

+//= require index/notes
+
+function allLayers() {
+  return [{
+    layer: new L.OSM.Mapnik({
+      attribution: '',
+      code: "M"
+    }),
+    keyid: "mapnik",
+    name: I18n.t("javascripts.map.base.standard")
+  }, {
+    layer: 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")
+  }, {
+    layer: 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")
+  }, {
+    layer: 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")
+  }];
+}

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

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

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

-  var map = createMap("map");

 
 

+  var map = L.map("map", {
+    zoomControl: false,
+    layerControl: false
+  });
+
+  map.attributionControl.setPrefix('');
+
+  var layers = allLayers();
+
+  layers[0].layer.addTo(map);
+
+  $("#map").on("resized", function () {
+    map.invalidateSize();
+  });
+
+  L.control.customZoom({position: 'topright'})
+    .addTo(map);
+
+  var uiPane = $('#map-ui')[0];
+
+  L.OSM.layers({
+    position: 'topright',
+    layers: layers,
+    uiPane: uiPane
+  }).addTo(map);
+
+  L.control.share({
+    getUrl: getShortUrl,
+    uiPane: uiPane
+  }).addTo(map);
+
+  L.control.note({ position: 'topright' }).addTo(map);
+  L.control.locate({ position: 'topright' }).addTo(map);

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

-  map.attributionControl.setPrefix(permalinks);
+  map.on('moveend layeradd layerremove', updateLocation);

 
 

-  map.on("moveend baselayerchange", updateLocation);
+  map.markerLayer = L.layerGroup().addTo(map);

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


@@ -23,7 +91,11 @@ $(document).ready(function () {
       map.fitBounds(bbox);
 
       if (params.box) {
       map.fitBounds(bbox);
 
       if (params.box) {

-        addBoxToMap(bbox);
+        L.rectangle(bbox, {
+          weight: 2,
+          color: '#e90',
+          fillOpacity: 0
+        }).addTo(map);

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


@@ -31,86 +103,119 @@ $(document).ready(function () {
   }
 
   if (params.layers) {
   }
 
   if (params.layers) {

-    setMapLayers(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);
+        foundLayer = true;
+      } else {
+        map.removeLayer(layers[i].layer);
+      }
+    }
+    if (!foundLayer) {
+      map.addLayer(layers[0].layer);
+    }

   }
 
   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) {
   }
 
   if (params.object) {

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

   }
 
   handleResize();
 
   }
 
   handleResize();
 

-  $("body").on("click", "a.set_position", function (e) {
-    e.preventDefault();
-
-    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);
-    }
+  $("body").on("click", "a.set_position", setPositionLink(map));

 
 

-    if (marker) {
-      map.removeLayer(marker);
-    }
-
-    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
+  $("a[data-editor=remote]").click(function(e) {
+      remoteEditHandler(map.getBounds());
+      e.preventDefault();

   });
 
   });
 

-  function updateLocation() {
-    var center = map.getCenter();
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    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);
-    $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
+  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
+    remoteEditHandler(map.getBounds());

   }
 
   }
 

-  function remoteEditHandler() {
-    var extent = map.getBounds();
-    var loaded = false;
+  $(window).resize(handleResize);

 
 

-    $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng()
-                                                                   + "&bottom=" + extent.getSouthLat()
-                                                                   + "&right=" + extent.getEastLng()
-                                                                   + "&top=" + extent.getNorthLat());
+  $("#search_form").submit(submitSearch(map));

 
 

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

 
 

-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
+// non-scoped utilities
+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;
+}
+
+// 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(),
+      getMapLayers(this),
+      this.getBounds().wrap(), {});
+
+  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);
+      }

 
 

-  $(window).resize(handleResize);
+      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);

 
 

-  $("#search_form").submit(function () {
+      return e.preventDefault();
+  };
+}
+
+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'));


@@ -122,10 +227,6 @@ $(document).ready(function () {
       maxlat: bounds.getNorthLat()
     }, openSidebar);
 
       maxlat: bounds.getNorthLat()
     }, openSidebar);
 

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