X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5e9ab5bc5edb63b7ab7719fa989a18f52e3637a2..3bea64f4ccf465fc755b81e7badc06d182a275b7:/app/assets/javascripts/index.js?ds=inline
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index fed4c1d8a..49266f919 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,231 +1,409 @@
//= require_self
+//= require leaflet.sidebar
+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/src/L.Control.Locate
+//= require leaflet.locate
//= require leaflet.layers
-//= require leaflet.share
+//= require leaflet.key
//= require leaflet.note
-//= require leaflet.locate
-//= require leaflet.customzoom
+//= 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/key
//= require index/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;
- var layers = [
- new L.OSM.Mapnik({
- attribution: '',
- code: "M",
- keyid: "mapnik",
- name: I18n.t("javascripts.map.base.standard")
- }),
- new L.OSM.CycleMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "C",
- keyid: "cyclemap",
- name: I18n.t("javascripts.map.base.cycle_map")
- }),
- new L.OSM.TransportMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "T",
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }),
- new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest ",
- code: "Q",
- keyid: "mapquest",
- name: I18n.t("javascripts.map.base.mapquest")
- })
- ];
+ map.setSidebarOverlaid(false);
- layers[0].addTo(map);
+ clearTimeout(loaderTimeout);
- map.noteLayer = new L.LayerGroup({code: 'N'});
- map.dataLayer = new L.OSM.DataLayer(null);
+ loaderTimeout = setTimeout(function () {
+ $("#sidebar_loader").show();
+ }, 200);
- $("#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();
- var uiPane = $('#map-ui')[0];
+ $.ajax({
+ url: content_path,
+ dataType: "html",
+ complete: function (xhr) {
+ clearTimeout(loaderTimeout);
+ $("#flash").empty();
+ $("#sidebar_loader").hide();
- L.OSM.layers({
- position: 'topright',
- layers: layers,
- uiPane: uiPane
- }).addTo(map);
+ var content = $(xhr.responseText);
- L.control.share({
- getUrl: getShortUrl,
- uiPane: uiPane
- }).addTo(map);
+ if (xhr.getResponseHeader("X-Page-Title")) {
+ var title = xhr.getResponseHeader("X-Page-Title");
+ document.title = decodeURIComponent(title);
+ }
- L.control.note({ position: 'topright' }).addTo(map);
- L.control.locate({ position: 'topright' }).addTo(map);
- L.control.scale().addTo(map);
+ $("head")
+ .find("link[type=\"application/atom+xml\"]")
+ .remove();
- map.on('moveend layeradd layerremove', updateLocation);
+ $("head")
+ .append(content.filter("link[type=\"application/atom+xml\"]"));
- map.markerLayer = L.layerGroup().addTo(map);
+ $("#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("");
+
+ 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 });
}
+ });
+
+ var sidebar = L.OSM.sidebar("#map-ui")
+ .addTo(map);
+
+ var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
+
+ 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");
}
- if (params.layers) {
- var foundLayer = false;
- for (var i = 0; i < layers.length; i++) {
- if (params.layers.indexOf(layers[i].options.code) >= 0) {
- map.addLayer(layers[i]);
- foundLayer = true;
- } else {
- map.removeLayer(layers[i]);
- }
+ addControlGroup([
+ L.OSM.zoom({ position: position }),
+ L.OSM.locate({ position: position })
+ ]);
+
+ 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);
+
+ 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);
}
- if (!foundLayer) {
- map.addLayer(layers[0]);
+
+ OSM.initializeBrowse(map);
+ if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+ map.addLayer(map.dataLayer);
}
- }
- if (params.marker) {
- L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer);
+ if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+ map.addLayer(map.gpsLayer);
+ }
}
- if (params.object) {
- addObjectToMap(params.object, map, { zoom: params.object_zoom });
- }
+ var placement = $("html").attr("dir") === "rtl" ? "right" : "left";
+ $(".leaflet-control .control-button").tooltip({ placement: placement, container: "body" });
- handleResize();
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
- $("body").on("click", "a.set_position", setPositionLink(map));
+ map.on("moveend layeradd layerremove", function () {
+ updateLinks(
+ map.getCenter().wrap(),
+ map.getZoom(),
+ map.getLayersCode(),
+ map._object);
- $("a[data-editor=remote]").click(function(e) {
- remoteEditHandler(map.getBounds());
- e.preventDefault();
+ Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" });
});
- if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
- remoteEditHandler(map.getBounds());
+ if (Cookies.get("_osm_welcome") !== "hide") {
+ $(".welcome").addClass("visible");
}
- $(window).resize(handleResize);
+ $(".welcome .btn-close").on("click", function () {
+ $(".welcome").removeClass("visible");
+ Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
+ });
+
+ 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" });
+ }
+ });
- $("#search_form").submit(submitSearch(map));
+ if (OSM.MATOMO) {
+ map.on("layeradd", function (e) {
+ if (e.layer.options) {
+ var goal = OSM.MATOMO.goals[e.layer.options.keyid];
+ if (goal) {
+ $("body").trigger("matomogoal", goal);
+ }
+ }
+ });
+ }
- if ($("#query").val()) {
- $("#search_form").submit();
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
+ } else {
+ map.setView([params.lat, params.lon], params.zoom);
}
- // Focus the search field for browsers that don't support
- // the HTML5 'autofocus' attribute
- if (!("autofocus" in document.createElement("input"))) {
- $("#query").focus();
+ if (params.marker) {
+ L.marker([params.mlat, params.mlon]).addTo(map);
}
- initializeBrowse(map);
- initializeNotes(map);
-});
+ $("#homeanchor").on("click", function (e) {
+ e.preventDefault();
-function getMapBaseLayerId(map) {
- for (var i in map._layers) { // TODO: map.eachLayer
- var layer = map._layers[i];
- if (layer.options && layer.options.keyid) {
- return layer.options.keyid;
+ var data = $(this).data(),
+ center = L.latLng(data.lat, data.lon);
+
+ map.setView(center, data.zoom);
+ L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);
+ });
+
+ 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 = $("