X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9dcccdc90a91e8b78861a5bfb9c967270379847..90e43e714fbc0e0b50e7403983a53d65fb9f44b6:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 59335ff84..5c7b2d26e 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,85 +1,97 @@
 //= require_self
 //= require leaflet.sidebar
+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/src/L.Control.Locate
 //= require leaflet.locate
 //= require leaflet.layers
 //= 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/layers/data
 //= require index/export
-//= require index/notes
+//= require index/layers/notes
+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require index/directions
 //= require index/changeset
+//= require index/query
 //= require router
+//= require qs/dist/qs
 
 $(document).ready(function () {
-  var params = OSM.mapParams();
+  var loaderTimeout;
 
-  var map = L.map("map", {
+  var map = new L.OSM.Map("map", {
     zoomControl: false,
-    layerControl: false
+    layerControl: false,
+    contextmenu: true,
+    worldCopyJump: true
   });
 
-  map.attributionControl.setPrefix('');
+  OSM.loadSidebarContent = function (path, callback) {
+    var content_path = path;
 
-  map.hash = L.hash(map);
+    map.setSidebarOverlaid(false);
 
-  var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
+    clearTimeout(loaderTimeout);
 
-  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 (content_path.indexOf("?") >= 0) {
+      content_path += "&xhr=1";
+    } else {
+      content_path += "?xhr=1";
     }
-  }
 
-  updateLayers(params);
+    $("#sidebar_content")
+      .empty();
 
-  $(window).on("hashchange", function () {
-    updateLayers(OSM.mapParams());
-  });
+    $.ajax({
+      url: content_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);
+        }
+
+        $("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();
+
+  map.attributionControl.setPrefix("");
+
+  map.updateLayers(params.layers);
 
   map.on("baselayerchange", function (e) {
     if (map.getZoom() > e.layer.options.maxZoom) {
@@ -87,87 +99,125 @@ $(document).ready(function () {
     }
   });
 
-  map.noteLayer = new L.LayerGroup();
-  map.noteLayer.options = {code: 'N'};
+  var sidebar = L.OSM.sidebar("#map-ui")
+    .addTo(map);
+
+  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
-  map.dataLayer = new L.OSM.DataLayer(null);
-  map.dataLayer.options.code = 'D';
+  function addControlGroup(controls) {
+    controls.forEach(function (control) {
+      control.addTo(map);
+    });
 
-  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
-      map.addLayer(map.noteLayer);
-    }
+    var firstContainer = controls[0].getContainer();
+    $(firstContainer).find(".control-button").first()
+      .addClass("control-button-first");
 
-    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
-      map.addLayer(map.dataLayer);
-    }
+    var lastContainer = controls[controls.length - 1].getContainer();
+    $(lastContainer).find(".control-button").last()
+      .addClass("control-button-last");
   }
 
-  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+  addControlGroup([
+    L.OSM.zoom({ position: position }),
+    L.OSM.locate({ position: position })
+  ]);
 
-  L.OSM.zoom({position: position})
-    .addTo(map);
+  addControlGroup([
+    L.OSM.layers({
+      position: position,
+      layers: map.baseLayers,
+      sidebar: sidebar
+    }),
+    L.OSM.key({
+      position: position,
+      sidebar: sidebar
+    }),
+    L.OSM.share({
+      "position": position,
+      "sidebar": sidebar,
+      "short": true
+    })
+  ]);
 
-  L.control.locate({
-    position: position,
-    strings: {
-      title: I18n.t('javascripts.map.locate.title'),
-      popup: I18n.t('javascripts.map.locate.popup')
-    }
-  }).addTo(map);
+  addControlGroup([
+    L.OSM.note({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.query({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);
 
-  var sidebar = L.OSM.sidebar('#map-ui')
+  L.control.scale()
     .addTo(map);
 
-  L.OSM.layers({
-    position: position,
-    layers: layers,
-    sidebar: sidebar
-  }).addTo(map);
+  OSM.initializeContextMenu(map);
 
-  L.OSM.key({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
+  if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
+    OSM.initializeNotesLayer(map);
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
 
-  L.OSM.share({
-    position: position,
-    sidebar: sidebar,
-    short: true
-  }).addTo(map);
+    OSM.initializeDataLayer(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
 
-  L.OSM.note({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);
+    }
+  }
 
-  L.control.scale()
-    .addTo(map);
+  $(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });
 
-  $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);
 
-  map.on('moveend layeradd layerremove', function() {
-    updatelinks(
+  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", cookieContent(map), { expires: expiry });
+    Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" });
+  });
+
+  if (Cookies.get("_osm_welcome") !== "hide") {
+    $(".welcome").removeAttr("hidden");
+  }
 
-    // Trigger hash update on layer changes.
-    map.hash.onMapMove();
+  $(".welcome .btn-close").on("click", function () {
+    $(".welcome").hide();
+    Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });
 
-  if (OSM.PIWIK) {
-    map.on('layeradd', function (e) {
+  var bannerExpiry = new Date();
+  bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+
+  $("#banner .btn-close").on("click", function (e) {
+    var cookieId = e.target.id;
+    $("#banner").hide();
+    e.preventDefault();
+    if (cookieId) {
+      Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" });
+    }
+  });
+
+  if (OSM.MATOMO) {
+    map.on("layeradd", function (e) {
       if (e.layer.options) {
-        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.keyid];
 
         if (goal) {
-          $('body').trigger('piwikgoal', goal);
+          $("body").trigger("matomogoal", goal);
         }
       }
     });
@@ -179,121 +229,193 @@ $(document).ready(function () {
     map.setView([params.lat, params.lon], params.zoom);
   }
 
-  var marker = L.marker([0, 0], {icon: getUserIcon()});
-
   if (params.marker) {
-    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+    L.marker([params.mlat, params.mlon]).addTo(map);
   }
 
-  $("#homeanchor").on("click", function(e) {
+  $("#homeanchor").on("click", function (e) {
     e.preventDefault();
 
     var data = $(this).data(),
-      center = L.latLng(data.lat, data.lon);
+        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 remoteEditHost = "http://127.0.0.1:8111",
+        osmHost = location.protocol + "//" + location.host,
+        query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 0.0001,
+          bottom: bbox.getSouth() - 0.0001
+        };
+
+    if (object && object.type !== "note") query.select = object.type + object.id; // can't select notes
+    sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + Qs.stringify(query), function () {
+      if (object && object.type === "note") {
+        var noteQuery = { url: osmHost + OSM.apiUrl(object) };
+        sendRemoteEditCommand(remoteEditHost + "/import?" + Qs.stringify(noteQuery));
+      }
+    });
+
+    function sendRemoteEditCommand(url, callback) {
+      var iframe = $("<iframe>");
+      var timeoutId = setTimeout(function () {
+        alert(I18n.t("site.index.remote_failed"));
+        iframe.remove();
+      }, 5000);
+
+      iframe
+        .hide()
+        .appendTo("body")
+        .attr("src", url)
+        .on("load", function () {
+          clearTimeout(timeoutId);
+          iframe.remove();
+          if (callback) callback();
+        });
+    }
 
-  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')
+    $("#editanchor")
+      .removeAttr("title")
       .tooltip({
-        placement: 'bottom',
-        title: I18n.t('javascripts.edit_help')
+        placement: "bottom",
+        title: I18n.t("javascripts.edit_help")
       })
-      .tooltip('show');
+      .tooltip("show");
 
-    $('body').one('click', function() {
-      $('#editanchor').tooltip('hide');
+    $("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);
-    };
+  OSM.Index = function (map) {
+    var page = {};
 
-    page.unload = function() {
-      $("#view_tab").removeClass("current");
+    page.pushstate = page.popstate = function () {
+      map.setSidebarOverlaid(true);
+      document.title = I18n.t("layouts.project_name.title");
     };
 
-    page.minimizeSidebar = function() {
-      $("#sidebar").addClass("minimized");
-      map.invalidateSize();
-      minimized = true;
+    page.load = function () {
+      var params = Qs.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();
     };
 
-    $(document).on("click", "#sidebar_content .close", page.minimizeSidebar);
-
     return page;
   };
 
-  OSM.Browse = function(map) {
+  OSM.Browse = function (map, type) {
     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.pushstate = page.popstate = function (path, id) {
+      OSM.loadSidebarContent(path, function () {
+        addObject(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.load = function (path, id) {
+      addObject(type, id, true);
     };
 
-    page.unload = function() {
+    function addObject(type, id, center) {
+      map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {
+        if (!window.location.hash && bounds.isValid() &&
+            (center || !map.getBounds().contains(bounds))) {
+          OSM.router.withoutMoveListener(function () {
+            map.fitBounds(bounds);
+          });
+        }
+      });
+    }
+
+    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)
-  });
+  OSM.OldBrowse = function () {
+    var page = {};
+
+    page.pushstate = page.popstate = function (path) {
+      OSM.loadSidebarContent(path);
+    };
+
+    return page;
+  };
 
-  $(document).on("click", "a", function(e) {
-    if (e.isPropagationStopped()) return;
-    if (router(this.pathname + this.search + this.hash)) e.preventDefault();
+  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"),
+    "/node/:id/history/:version": OSM.OldBrowse(),
+    "/way/:id(/history)": OSM.Browse(map, "way"),
+    "/way/:id/history/:version": OSM.OldBrowse(),
+    "/relation/:id(/history)": OSM.Browse(map, "relation"),
+    "/relation/:id/history/:version": OSM.OldBrowse(),
+    "/changeset/:id": OSM.Changeset(map),
+    "/query": OSM.Query(map)
   });
 
-  $("#search_form").on("submit", function(e) {
-    e.preventDefault();
-    router("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(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();
+    }
   });
 
-  $("#describe_location").on("click", function(e) {
-    e.preventDefault();
-    router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+  $(document).on("click", "#sidebar_content .btn-close", function () {
+    OSM.router.route("/" + OSM.formatHash(map));
   });
 });