X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75a776a574cd6a711c0b4bf854701646c37c391c..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/app/assets/javascripts/index.js?ds=sidebyside

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 404119134..56495b31a 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,235 +1,407 @@
 //= require_self
+//= require leaflet.sidebar
+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+//= require leaflet.locate
 //= require leaflet.layers
-//= require leaflet.share
+//= require leaflet.key
 //= require leaflet.note
-//= require leaflet.locate
-//= require leaflet.customzoom
-//= require index/browse
+//= require leaflet.share
+//= require leaflet.polyline
+//= require leaflet.query
+//= require leaflet.contextmenu
+//= require index/contextmenu
+//= require index/search
+//= require index/layers/data
 //= require index/export
-//= require index/key
-//= require index/notes
-
-var map, layers; // TODO: remove globals
+//= 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 marker;
-  var params = OSM.mapParams();
-
-  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;
 
-  layers = [{
-    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")
-  }];
+    map.setSidebarOverlaid(false);
 
-  layers[0].layer.addTo(map);
+    $("#sidebar_loader").show().addClass("delayed-fade-in");
 
-  $("#map").on("resized", function () {
-    map.invalidateSize();
-  });
+    // 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";
+    }
 
-  L.control.customZoom({position: 'topright'})
-    .addTo(map);
+    $("#sidebar_content")
+      .empty();
 
-  L.OSM.layers({position: 'topright', layers: layers})
-    .addTo(map);
+    $.ajax({
+      url: content_path,
+      dataType: "html",
+      complete: function (xhr) {
+        $("#flash").empty();
+        $("#sidebar_loader").removeClass("delayed-fade-in").hide();
 
-  L.control.share({
-      getUrl: getShortUrl
-  }).addTo(map);
+        var content = $(xhr.responseText);
 
-  L.control.note({
-      position: 'topright'
-  }).addTo(map);
+        if (xhr.getResponseHeader("X-Page-Title")) {
+          var title = xhr.getResponseHeader("X-Page-Title");
+          document.title = decodeURIComponent(title);
+        }
 
-  L.control.locate({
-      position: 'topright'
-  }).addTo(map);
+        $("head")
+          .find("link[type=\"application/atom+xml\"]")
+          .remove();
 
-  L.control.scale().addTo(map);
+        $("head")
+          .append(content.filter("link[type=\"application/atom+xml\"]"));
 
-  map.on("moveend layeradd layerremove", updateLocation);
+        $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]"));
 
-  if (!params.object_zoom) {
-    if (params.bbox) {
-      var bbox = L.latLngBounds([params.minlat, params.minlon],
-                                [params.maxlat, params.maxlon]);
+        if (callback) {
+          callback();
+        }
+      }
+    });
+  };
 
-      map.fitBounds(bbox);
+  var params = OSM.mapParams();
 
-      if (params.box) {
-        L.rectangle(bbox, {
-          weight: 2,
-          color: '#e90',
-          fillOpacity: 0
-        }).addTo(map);
-      }
-    } else {
-      map.setView([params.lat, params.lon], params.zoom);
-    }
-  }
+  map.attributionControl.setPrefix("");
 
-  if (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);
+  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 });
     }
-  }
+  });
 
-  if (params.marker) {
-    marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
-  }
+  var sidebar = L.OSM.sidebar("#map-ui")
+    .addTo(map);
+
+  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
-  if (params.object) {
-    addObjectToMap(params.object, map, { zoom: params.object_zoom });
+  function addControlGroup(controls) {
+    controls.forEach(function (control) {
+      control.addTo(map);
+    });
+
+    var firstContainer = controls[0].getContainer();
+    $(firstContainer).find(".control-button").first()
+      .addClass("control-button-first");
+
+    var lastContainer = controls[controls.length - 1].getContainer();
+    $(lastContainer).find(".control-button").last()
+      .addClass("control-button-last");
   }
 
-  handleResize();
+  addControlGroup([
+    L.OSM.zoom({ position: position }),
+    L.OSM.locate({ position: position })
+  ]);
 
-  $("body").on("click", "a.set_position", function (e) {
-    e.preventDefault();
+  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
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.note({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.query({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);
+
+  L.control.scale()
+    .addTo(map);
 
-    var data = $(this).data();
-    var centre = L.latLng(data.lat, data.lon);
+  OSM.initializeContextMenu(map);
 
-    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);
+  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);
     }
 
-    if (data.type && data.id) {
-      addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
+    OSM.initializeDataLayer(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
     }
 
-    if (marker) {
-      map.removeLayer(marker);
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);
     }
+  }
 
-    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
-  });
+  $(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });
 
-  function updateLocation() {
-    var center = map.getCenter().wrap();
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = map.getBounds().wrap();
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);
 
-    updatelinks(center, zoom, layers, extents, 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", [center.lng, center.lat, zoom, layers].join("|"), {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");
   }
 
-  function remoteEditHandler() {
-    var extent = map.getBounds();
-    var loaded = false;
+  $(".welcome .btn-close").on("click", function () {
+    $(".welcome").hide();
+    Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
+  });
+
+  var bannerExpiry = new Date();
+  bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 
-    $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" +
-         querystring.stringify({
-            left: extent.getWest(),
-            bottom: extent.getSouth(),
-            right: extent.getEast(),
-            top: extent.getNorth()
-         }));
+  $("#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" });
+    }
+  });
 
-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);
+  if (OSM.MATOMO) {
+    map.on("layeradd", function (e) {
+      if (e.layer.options) {
+        var goal = OSM.MATOMO.goals[e.layer.options.layerId];
 
-    return false;
+        if (goal) {
+          $("body").trigger("matomogoal", goal);
+        }
+      }
+    });
   }
 
-  $("a[data-editor=remote]").click(remoteEditHandler);
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);
+  }
 
-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
+  if (params.marker) {
+    L.marker([params.mlat, params.mlon]).addTo(map);
   }
 
-  $(window).resize(handleResize);
+  $("#homeanchor").on("click", function (e) {
+    e.preventDefault();
+
+    var data = $(this).data(),
+        center = L.latLng(data.lat, data.lon);
 
-  $("#search_form").submit(function () {
-    var bounds = map.getBounds();
+    map.setView(center, data.zoom);
+    L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);
+  });
 
-    $("#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);
+  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) {
+      fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) })
+        .then(callback)
+        .catch(function () {
+          alert(I18n.t("site.index.remote_failed"));
+        });
+    }
 
     return false;
+  }
+
+  $("a[data-editor=remote]").click(function (e) {
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);
+    e.preventDefault();
   });
 
-  if ($("#query").val()) {
-    $("#search_form").submit();
+  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");
+    });
   }
 
-  // Focus the search field for browsers that don't support
-  // the HTML5 'autofocus' attribute
-  if (!("autofocus" in document.createElement("input"))) {
-    $("#query").focus();
-  }
-});
+  OSM.Index = function (map) {
+    var page = {};
 
-function getMapBaseLayer() {
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      return layers[i];
+    page.pushstate = page.popstate = function () {
+      map.setSidebarOverlaid(true);
+      document.title = I18n.t("layouts.project_name.title");
+    };
+
+    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();
+    };
+
+    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, 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;
+  };
+
+  OSM.OldBrowse = function () {
+    var page = {};
+
+    page.pushstate = page.popstate = function (path) {
+      OSM.loadSidebarContent(path);
+    };
+
+    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"),
+    "/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)
+  });
+
+  if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
+    remoteEditHandler(map.getBounds(), params.object);
+    OSM.router.setCurrentPath("/");
   }
-}
-
-function getMapLayers() {
-  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;
+
+  OSM.router.load();
+
+  $(document).on("click", "a", function (e) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped() || $(e.target).data("turbo")) {
+      return;
     }
-  }
-  return layerConfig;
-}
+
+    // 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();
+      if (this.pathname !== "/directions") {
+        $("header").addClass("closed");
+      }
+    }
+  });
+
+  $(document).on("click", "#sidebar_content .btn-close", function () {
+    OSM.router.route("/" + OSM.formatHash(map));
+  });
+});