X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3fb931f9a86955faa39bec1fa4f2a731cbc74780..aa20398cea1c212f27d9004170bdc0aee4d8f854:/app/assets/javascripts/index.js?ds=sidebyside

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c0decd6a6..59335ff84 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,123 +1,299 @@
+//= require_self
+//= require leaflet.sidebar
+//= 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/key
 //= require index/notes
+//= require index/changeset
+//= require router
 
 $(document).ready(function () {
-  var marker;
   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
+  });
+
+  map.attributionControl.setPrefix('');
+
+  map.hash = L.hash(map);
+
+  var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
 
-  if (!params.object_zoom) {
-    if (params.bbox) {
-      var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
+  var layers = [
+    new L.OSM.Mapnik({
+      attribution: copyright,
+      code: "M",
+      keyid: "mapnik",
+      name: I18n.t("javascripts.map.base.standard")
+    }),
+    new L.OSM.CycleMap({
+      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: 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: 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")
+    })
+  ];
 
-      map.zoomToExtent(proj(bbox));
+  function updateLayers(params) {
+    var layerParam = params.layers || "M";
+    var layersAdded = "";
 
-      if (params.box) {
-        addBoxToMap(bbox);
+    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]);
       }
-    } else {
-      setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
     }
   }
 
-  if (params.layers) {
-    setMapLayers(params.layers);
-  }
+  updateLayers(params);
 
-  if (params.marker) {
-    marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
-  }
+  $(window).on("hashchange", function () {
+    updateLayers(OSM.mapParams());
+  });
 
-  if (params.object) {
-    addObjectToMap(params.object, params.object_zoom);
-  }
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }
+  });
 
-  handleResize();
+  map.noteLayer = new L.LayerGroup();
+  map.noteLayer.options = {code: 'N'};
 
-  $("body").on("click", "a.set_position", function () {
-    var data = $(this).data();
-    var centre = new OpenLayers.LonLat(data.lon, data.lat);
+  map.dataLayer = new L.OSM.DataLayer(null);
+  map.dataLayer.options.code = 'D';
 
-    if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
 
-      map.zoomToExtent(proj(bbox));
-    } else {
-      setMapCenter(centre, data.zoom);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
     }
+  }
+
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
-    if (marker) {
-      removeMarkerFromMap(marker);
+  L.OSM.zoom({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);
 
-    marker = addMarkerToMap(centre, getArrowIcon());
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);
 
-    return false;
-  });
+  L.OSM.layers({
+    position: position,
+    layers: layers,
+    sidebar: sidebar
+  }).addTo(map);
 
-  function updateLocation() {
-    var lonlat = unproj(map.getCenter());
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = unproj(map.getExtent());
-    var expiry = new Date();
+  L.OSM.key({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.share({
+    position: position,
+    sidebar: sidebar,
+    short: true
+  }).addTo(map);
+
+  L.OSM.note({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.control.scale()
+    .addTo(map);
+
+  $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object);
+  map.on('moveend layeradd layerremove', function() {
+    updatelinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
 
+    var expiry = new Date();
     expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
-  }
+    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
 
-  function remoteEditHandler(event) {
-    var extent = unproj(map.getExtent());
-    var loaded = false;
+    // Trigger hash update on layer changes.
+    map.hash.onMapMove();
+  });
 
-    $("#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);
+  if (OSM.PIWIK) {
+    map.on('layeradd', function (e) {
+      if (e.layer.options) {
+        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
 
-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);
+        if (goal) {
+          $('body').trigger('piwikgoal', goal);
+        }
+      }
+    });
+  }
 
-    return false;
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);
   }
 
-  $("a[data-editor=remote]").click(remoteEditHandler);
+  var marker = L.marker([0, 0], {icon: getUserIcon()});
 
-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
+  if (params.marker) {
+    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
   }
 
-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
+  $("#homeanchor").on("click", function(e) {
+    e.preventDefault();
 
-    handleResize();
+    var data = $(this).data(),
+      center = L.latLng(data.lat, data.lon);
 
-    map.setCenter(centre, zoom);
+    map.setView(center, data.zoom);
+    marker.setLatLng(center).addTo(map);
   });
 
-  $("#search_form").submit(function () {
-    var extent = unproj(map.getExtent());
+  $("a[data-editor=remote]").click(function(e) {
+      remoteEditHandler(map.getBounds());
+      e.preventDefault();
+  });
 
-    $("#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
-    }, openSidebar);
+  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
+    remoteEditHandler(map.getBounds());
+  }
 
-    return false;
-  });
+  if (OSM.params().edit_help) {
+    $('#editanchor')
+      .removeAttr('title')
+      .tooltip({
+        placement: 'bottom',
+        title: I18n.t('javascripts.edit_help')
+      })
+      .tooltip('show');
 
-  if ($("#query").val()) {
-    $("#search_form").submit();
+    $('body').one('click', function() {
+      $('#editanchor').tooltip('hide');
+    });
   }
+
+  initializeBrowse(map);
+  initializeNotes(map);
+
+  OSM.Index = function(map) {
+    var page = {}, minimized = false;
+
+    page.pushstate = page.popstate = function(path) {
+      if (minimized) $("#sidebar").addClass("minimized");
+      map.invalidateSize();
+      $("#view_tab").addClass("current");
+      $('#sidebar_content').load(path);
+    };
+
+    page.unload = function() {
+      $("#view_tab").removeClass("current");
+    };
+
+    page.minimizeSidebar = function() {
+      $("#sidebar").addClass("minimized");
+      map.invalidateSize();
+      minimized = true;
+    };
+
+    $(document).on("click", "#sidebar_content .close", page.minimizeSidebar);
+
+    return page;
+  };
+
+  OSM.Browse = function(map) {
+    var page = {};
+
+    page.pushstate = page.popstate = function(path, type, id) {
+      $("#sidebar").removeClass("minimized");
+      map.invalidateSize();
+      $('#sidebar_content').load(path, function() {
+        page.load(path, type, id);
+      });
+    };
+
+    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});
+      }
+    };
+
+    page.unload = function() {
+      map.removeObject();
+    };
+
+    return page;
+  };
+
+  var router = OSM.Router({
+    "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
+    "/export":                     OSM.Export(map),
+    "/browse/changesets":          OSM.ChangesetList(map),
+    "/browse/:type/:id(/history)": OSM.Browse(map)
+  });
+
+  $(document).on("click", "a", function(e) {
+    if (e.isPropagationStopped()) return;
+    if (router(this.pathname + this.search + this.hash)) e.preventDefault();
+  });
+
+  $("#search_form").on("submit", function(e) {
+    e.preventDefault();
+    router("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
+  });
+
+  $("#describe_location").on("click", function(e) {
+    e.preventDefault();
+    router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+  });
 });