X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b756c5fd6ea4a982a654e07f42c8250c7f7d85fc..8db05481193bfb105c76cda40ea0617b5f10545e:/app/assets/javascripts/index.js?ds=sidebyside

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d84b8ae24..b30564a1a 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,115 +5,124 @@
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
+//= require leaflet.polyline
+//= require leaflet.query
+//= require leaflet.contextmenu
+//= require index/contextmenu
 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/notes
+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require index/directions
+//= require index/changeset
+//= require index/query
+//= require router
 
 $(document).ready(function () {
-  var params = OSM.mapParams();
+  var loaderTimeout;
 
-  var map = L.map("map", {
-    zoomControl: false,
-    layerControl: false
-  });
+  OSM.loadSidebarContent = function(path, callback) {
+    map.setSidebarOverlaid(false);
 
-  map.attributionControl.setPrefix('');
+    clearTimeout(loaderTimeout);
 
-  map.hash = L.hash(map);
-
-  var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
-
-  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")
-    })
-  ];
-
-  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]);
-      }
+    loaderTimeout = setTimeout(function() {
+      $('#sidebar_loader').show();
+    }, 200);
+
+    // IE<10 doesn't respect Vary: X-Requested-With header, so
+    // prevent caching the XHR response as a full-page URL.
+    if (path.indexOf('?') >= 0) {
+      path += '&xhr=1';
+    } else {
+      path += '?xhr=1';
     }
-  }
 
-  updateLayers(params);
+    $('#sidebar_content')
+      .empty();
+
+    $.ajax({
+      url: path,
+      dataType: "html",
+      complete: function(xhr) {
+        clearTimeout(loaderTimeout);
+        $('#flash').empty();
+        $('#sidebar_loader').hide();
+
+        var content = $(xhr.responseText);
+
+        if (xhr.getResponseHeader('X-Page-Title')) {
+          var title = xhr.getResponseHeader('X-Page-Title');
+          document.title = decodeURIComponent(title);
+        }
 
-  $(window).on("hashchange", function () {
-    updateLayers(OSM.mapParams());
+        $('head')
+          .find('link[type="application/atom+xml"]')
+          .remove();
+
+        $('head')
+          .append(content.filter('link[type="application/atom+xml"]'));
+
+        $('#sidebar_content').html(content.not('link[type="application/atom+xml"]'));
+
+        if (callback) {
+          callback();
+        }
+      }
+    });
+  };
+
+  var params = OSM.mapParams();
+
+  var map = new L.OSM.Map("map", {
+    zoomControl: false,
+    layerControl: false,
+    contextmenu: true
   });
 
+  map.attributionControl.setPrefix('');
+
+  map.updateLayers(params.layers);
+
   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();
-  });
-
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
     .addTo(map);
 
-  L.control.locate({
+  var locate = L.control.locate({
     position: position,
+    icon: 'icon geolocate',
+    iconLoading: 'icon geolocate',
     strings: {
       title: I18n.t('javascripts.map.locate.title'),
       popup: I18n.t('javascripts.map.locate.popup')
     }
   }).addTo(map);
 
+  var locateContainer = locate.getContainer();
+
+  $(locateContainer)
+    .removeClass('leaflet-control-locate leaflet-bar')
+    .addClass('control-locate')
+    .children("a")
+    .removeClass('leaflet-bar-part leaflet-bar-part-single')
+    .addClass('control-button');
+
   var sidebar = L.OSM.sidebar('#map-ui')
     .addTo(map);
 
   L.OSM.layers({
     position: position,
-    layers: layers,
+    layers: map.baseLayers,
     sidebar: sidebar
   }).addTo(map);
 
@@ -133,12 +142,69 @@ $(document).ready(function () {
     sidebar: sidebar
   }).addTo(map);
 
+  L.OSM.query({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
   L.control.scale()
     .addTo(map);
 
-  $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
+  OSM.initializeContextMenu(map);
+
+  if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
+    OSM.initializeNotes(map);
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
+
+    OSM.initializeBrowse(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);
+    }
+  }
+
+  var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
+  $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'});
+
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);
+
+  map.on('moveend layeradd layerremove', function() {
+    updateLinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
+
+    $.removeCookie('_osm_location');
+    $.cookie('_osm_location', OSM.locationCookie(map), { expires: expiry, path: '/' });
+  });
+
+  if ($.cookie('_osm_welcome') === 'hide') {
+    $('.welcome').hide();
+  }
+
+  $('.welcome .close-wrap').on('click', function() {
+    $('.welcome').hide();
+    $.cookie('_osm_welcome', 'hide', { expires: expiry, path: '/' });
+  });
+
+  var bannerExpiry = new Date();
+  bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 
-  map.on('moveend layeradd layerremove', updateLocation);
+  $('#banner .close-wrap').on('click', function(e) {
+    var cookieId = e.target.id;
+    $('#banner').hide();
+    e.preventDefault();
+    if (cookieId) {
+      $.cookie(cookieId, 'hide', { expires: bannerExpiry, path: '/' });
+    }
+  });
 
   if (OSM.PIWIK) {
     map.on('layeradd', function (e) {
@@ -152,30 +218,14 @@ $(document).ready(function () {
     });
   }
 
-  var marker = L.marker([0, 0], {icon: getUserIcon()});
-
-  if (!params.object_zoom) {
-    if (params.bounds) {
-      map.fitBounds(params.bounds);
-    } 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.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);
   }
 
   if (params.marker) {
-    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
-  }
-
-  if (params.object) {
-    map.addObject(params.object, { zoom: params.object_zoom });
+    L.marker([params.mlat, params.mlon]).addTo(map);
   }
 
   $("#homeanchor").on("click", function(e) {
@@ -185,18 +235,48 @@ $(document).ready(function () {
       center = L.latLng(data.lat, data.lon);
 
     map.setView(center, data.zoom);
-    marker.setLatLng(center).addTo(map);
+    L.marker(center, {icon: OSM.getUserIcon()}).addTo(map);
   });
 
-  $("a[data-editor=remote]").click(function(e) {
-      remoteEditHandler(map.getBounds());
-      e.preventDefault();
-  });
+  function remoteEditHandler(bbox, object) {
+    var loaded = false,
+        url = document.location.protocol === "https:" ?
+        "https://127.0.0.1:8112/load_and_zoom?" :
+        "http://127.0.0.1:8111/load_and_zoom?",
+        query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 0.0001,
+          bottom: bbox.getSouth() - 0.0001
+        };
+
+    if (object) query.select = object.type + object.id;
+
+    var iframe = $('<iframe>')
+        .hide()
+        .appendTo('body')
+        .attr("src", url + querystring.stringify(query))
+        .on('load', function() {
+          $(this).remove();
+          loaded = true;
+        });
+
+    setTimeout(function () {
+      if (!loaded) {
+        alert(I18n.t('site.index.remote_failed'));
+        iframe.remove();
+      }
+    }, 1000);
 
-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler(map.getBounds());
+    return false;
   }
 
+  $("a[data-editor=remote]").click(function(e) {
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);
+    e.preventDefault();
+  });
+
   if (OSM.params().edit_help) {
     $('#editanchor')
       .removeAttr('title')
@@ -211,22 +291,99 @@ $(document).ready(function () {
     });
   }
 
-  initializeSearch(map);
-  initializeExport(map);
-  initializeBrowse(map, params);
-  initializeNotes(map, params);
-});
+  OSM.Index = function(map) {
+    var page = {};
 
-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap());
+    page.pushstate = page.popstate = function() {
+      map.setSidebarOverlaid(true);
+      document.title = I18n.t('layouts.project_name.title');
+    };
 
-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+    page.load = function() {
+      var params = querystring.parse(location.search.substring(1));
+      if (params.query) {
+        $("#sidebar .search_form input[name=query]").value(params.query);
+      }
+      if (!("autofocus" in document.createElement("input"))) {
+        $("#sidebar .search_form input[name=query]").focus();
+      }
+      return map.getState();
+    };
+
+    return page;
+  };
+
+  OSM.Browse = function(map, type) {
+    var page = {};
+
+    page.pushstate = page.popstate = function(path, id) {
+      OSM.loadSidebarContent(path, function() {
+        addObject(type, id);
+      });
+    };
+
+    page.load = function(path, id) {
+      addObject(type, id, true);
+    };
+
+    function addObject(type, id, center) {
+      map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+        if (!window.location.hash && bounds.isValid() &&
+            (center || !map.getBounds().contains(bounds))) {
+          OSM.router.withoutMoveListener(function () {
+            map.fitBounds(bounds);
+          });
+        }
+      });
+    }
 
-  // Trigger hash update on layer changes.
-  this.hash.onMapMove();
-}
+    page.unload = function() {
+      map.removeObject();
+    };
+
+    return page;
+  };
+
+  var history = OSM.History(map);
+
+  OSM.router = OSM.Router(map, {
+    "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
+    "/directions":                 OSM.Directions(map),
+    "/export":                     OSM.Export(map),
+    "/note/new":                   OSM.NewNote(map),
+    "/history/friends":            history,
+    "/history/nearby":             history,
+    "/history":                    history,
+    "/user/:display_name/history": history,
+    "/note/:id":                   OSM.Note(map),
+    "/node/:id(/history)":         OSM.Browse(map, 'node'),
+    "/way/:id(/history)":          OSM.Browse(map, 'way'),
+    "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
+    "/changeset/:id":              OSM.Changeset(map),
+    "/query":                      OSM.Query(map)
+  });
+
+  if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
+    remoteEditHandler(map.getBounds(), params.object);
+    OSM.router.setCurrentPath("/");
+  }
+
+  OSM.router.load();
+
+  $(document).on("click", "a", function(e) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped())
+      return;
+
+    // Open links in a new tab as normal.
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+      return;
+
+    // Ignore cross-protocol and cross-origin links.
+    if (location.protocol !== this.protocol || location.host !== this.host)
+      return;
+
+    if (OSM.router.route(this.pathname + this.search + this.hash))
+      e.preventDefault();
+  });
+});