X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/feeb135760abdbfef0eea193318566d9d96f2523..4cf32e0f0043ad73bf8ecd5320ce1ab55e81e386:/app/assets/javascripts/index.js?ds=sidebyside

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index bae80cac5..77b247c10 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,9 +5,12 @@
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
+//= require index/search
 //= require index/browse
 //= require index/export
 //= require index/notes
+//= require index/history
+//= require router
 
 $(document).ready(function () {
   var params = OSM.mapParams();
@@ -21,57 +24,101 @@ $(document).ready(function () {
 
   map.hash = L.hash(map);
 
+  $(window).on('popstate', function() {
+    map.hash.update();
+  });
+
+  var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
+
   var layers = [
     new L.OSM.Mapnik({
-      attribution: '',
+      attribution: copyright,
       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>",
+      attribution: copyright + ". 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>",
+      attribution: copyright + ". 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'>",
+      attribution: copyright + ". 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")
+    }),
+    new L.OSM.HOT({
+      attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
+      code: "H",
+      keyid: "hot",
+      name: I18n.t("javascripts.map.base.hot")
     })
   ];
 
-  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;
+  function updateLayers(params) {
+    var layerParam = params.layers || "M";
+    var layersAdded = "";
+
+    for (var i = layers.length - 1; i >= 0; i--) {
+      if (layerParam.indexOf(layers[i].options.code) >= 0) {
+        map.addLayer(layers[i]);
+        layersAdded = layersAdded + layers[i].options.code;
+      } else if (i == 0 && layersAdded == "") {
+        map.addLayer(layers[i]);
+      } else {
+        map.removeLayer(layers[i]);
+      }
     }
   }
 
+  updateLayers(params);
+
+  $(window).on("hashchange", function () {
+    updateLayers(OSM.mapParams());
+  });
+
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }
+  });
+
   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();
-  });
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
+
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }
 
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
     .addTo(map);
 
-  L.control.locate({position: position})
-    .addTo(map);
+  L.control.locate({
+    position: position,
+    strings: {
+      title: I18n.t('javascripts.map.locate.title'),
+      popup: I18n.t('javascripts.map.locate.popup')
+    }
+  }).addTo(map);
 
   var sidebar = L.OSM.sidebar('#map-ui')
     .addTo(map);
@@ -101,35 +148,56 @@ $(document).ready(function () {
   L.control.scale()
     .addTo(map);
 
-  map.on('moveend layeradd layerremove', updateLocation);
+  $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
-  map.markerLayer = L.layerGroup().addTo(map);
+  map.on('moveend layeradd layerremove', function() {
+    updatelinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
 
-  if (!params.object_zoom) {
-    if (params.bounds) {
-      map.fitBounds(params.bounds);
-    } else {
-      map.setView([params.lat, params.lon], params.zoom);
-    }
+    var expiry = new Date();
+    expiry.setYear(expiry.getFullYear() + 10);
+    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+
+    // Trigger hash update on layer changes.
+    map.hash.onMapMove();
+  });
+
+  if (OSM.PIWIK) {
+    map.on('layeradd', function (e) {
+      if (e.layer.options) {
+        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+
+        if (goal) {
+          $('body').trigger('piwikgoal', goal);
+        }
+      }
+    });
   }
 
-  if (params.box) {
-    L.rectangle(params.box, {
-      weight: 2,
-      color: '#e90',
-      fillOpacity: 0
-    }).addTo(map);
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);
   }
 
+  var marker = L.marker([0, 0], {icon: getUserIcon()});
+
   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) {
-    map.addObject(params.object, { zoom: params.object_zoom });
-  }
+  $("#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());
@@ -140,74 +208,101 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
-  $("#search_form").submit(submitSearch(map));
+  if (OSM.params().edit_help) {
+    $('#editanchor')
+      .removeAttr('title')
+      .tooltip({
+        placement: 'bottom',
+        title: I18n.t('javascripts.edit_help')
+      })
+      .tooltip('show');
+
+    $('body').one('click', function() {
+      $('#editanchor').tooltip('hide');
+    });
+  }
 
+  initializeBrowse(map);
+  initializeNotes(map);
 
-  if ($("#query").val()) {
-    $("#search_form").submit();
-  }
+  OSM.Index = function(map) {
+    var page = {}, minimized = false;
 
-  // Focus the search field for browsers that don't support
-  // the HTML5 'autofocus' attribute
-  if (!("autofocus" in document.createElement("input"))) {
-    $("#query").focus();
-  }
+    page.pushstate = page.popstate = function(path) {
+      if (minimized) $("#sidebar").addClass("minimized");
+      map.invalidateSize();
+      $("#view_tab").addClass("current");
+      $('#sidebar_content').load(path);
+    };
 
-  initializeExport(map);
-  initializeBrowse(map, params);
-  initializeNotes(map, params);
-});
+    page.unload = function() {
+      $("#view_tab").removeClass("current");
+    };
 
-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap());
+    page.minimizeSidebar = function() {
+      $("#sidebar").addClass("minimized");
+      map.invalidateSize();
+      minimized = true;
+    };
 
-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+    $(document).on("click", "#sidebar_content .close", page.minimizeSidebar);
 
-  // Trigger hash update on layer changes.
-  this.hash.onMapMove();
-}
+    return page;
+  };
 
-function setPositionLink(map) {
-  return function(e) {
-      var data = $(this).data(),
-          center = L.latLng(data.lat, data.lon);
+  OSM.Browse = function(map) {
+    var page = {};
 
-      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);
-      }
+    page.pushstate = page.popstate = function(path, type, id) {
+      $("#sidebar").removeClass("minimized");
+      map.invalidateSize();
+      $('#sidebar_content').load(path, function() {
+        page.load(path, type, id);
+      });
+    };
 
-      if (data.type && data.id) {
-        map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
+    page.load = function(path, type, id) {
+      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
+
+      if (type === 'note') {
+        map.noteLayer.showNote(parseInt(id));
+      } else {
+        map.addObject({type: type, id: parseInt(id)}, {zoom: true});
       }
+    };
 
-      map.markerLayer.clearLayers();
-      L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);
+    page.unload = function() {
+      map.removeObject();
+    };
 
-      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.getWest(),
-      minlat: bounds.getSouth(),
-      maxlon: bounds.getEast(),
-      maxlat: bounds.getNorth()
-    }, openSidebar);
-
-    return e.preventDefault();
+    return page;
   };
-}
+
+  var history = OSM.History(map);
+
+  OSM.route = OSM.Router({
+    "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
+    "/export":                     OSM.Export(map),
+    "/history":                    history,
+    "/user/:display_name/edits":   history,
+    "/browse/friends":             history,
+    "/browse/nearby":              history,
+    "/browse/:type/:id(/history)": OSM.Browse(map)
+  });
+
+  $(document).on("click", "a", function(e) {
+    if (e.isPropagationStopped()) return;
+    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();
+  });
+
+  $("#search_form").on("submit", function(e) {
+    e.preventDefault();
+    OSM.route("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
+  });
+
+  $("#describe_location").on("click", function(e) {
+    e.preventDefault();
+    OSM.route("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+  });
+});