X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3792551f481dff6174eb7d5afeb86ae9b90d517a..4f63234e237d58b294ba98911eaf05670f2d3a98:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 029c0bfd1..f0b96f59f 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,74 +1,135 @@ //= require_self //= require leaflet.sidebar -//= require leaflet.locate +//= require leaflet.locatecontrol/src/L.Control.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/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 +//= 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(''); - - 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") - }) - ]; - - layers[0].addTo(map); - - map.noteLayer = new L.LayerGroup({code: 'N'}); - map.dataLayer = new L.OSM.DataLayer(null); - - $("#sidebar").on("opened closed", function () { - map.invalidateSize(); + OSM.loadSidebarContent = function (path, callback) { + var content_path = path; + + map.setSidebarOverlaid(false); + + clearTimeout(loaderTimeout); + + 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"; + } + + $("#sidebar_content") + .empty(); + + $.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) { + map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true }); + } }); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; - L.OSM.zoom({position: position}) + L.OSM.zoom({ position: position }) .addTo(map); - L.control.locate({position: position}) - .addTo(map); + var locate = L.control.locate({ + position: position, + icon: "icon geolocate", + iconLoading: "icon geolocate", + strings: { + title: I18n.t("javascripts.map.locate.title"), + popup: function (options) { + return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance }); + } + } + }).addTo(map); + + var locateContainer = locate.getContainer(); + + $(locateContainer) + .removeClass("leaflet-control-locate leaflet-bar") + .addClass("control-locate") + .children("a") + .attr("href", "#") + .removeClass("leaflet-bar-part leaflet-bar-part-single") + .addClass("control-button"); - var sidebar = L.OSM.sidebar('#map-ui') + var sidebar = L.OSM.sidebar("#map-ui") .addTo(map); L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -78,11 +139,9 @@ $(document).ready(function () { }).addTo(map); L.OSM.share({ - position: position, - getShortUrl: getShortUrl, - getUrl: getUrl, - sidebar: sidebar, - short: true + "position": position, + "sidebar": sidebar, + "short": true }).addTo(map); L.OSM.note({ @@ -90,131 +149,255 @@ $(document).ready(function () { sidebar: sidebar }).addTo(map); + L.OSM.query({ + position: position, + sidebar: sidebar + }).addTo(map); + L.control.scale() .addTo(map); - map.on('moveend layeradd layerremove', updateLocation); - - map.markerLayer = L.layerGroup().addTo(map); + OSM.initializeContextMenu(map); - if (!params.object_zoom) { - if (params.bbox) { - var bbox = L.latLngBounds([params.minlat, params.minlon], - [params.maxlat, params.maxlon]); - - map.fitBounds(bbox); - - if (params.box) { - L.rectangle(bbox, { - weight: 2, - color: '#e90', - fillOpacity: 0 - }).addTo(map); - } - } else { - map.setView([params.lat, params.lon], params.zoom); + 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 (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]); - } + OSM.initializeBrowse(map); + if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { + map.addLayer(map.dataLayer); } - if (!foundLayer) { - map.addLayer(layers[0]); + + if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) { + map.addLayer(map.gpsLayer); } } - if (params.marker) { - L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer); - } + var placement = $("html").attr("dir") === "rtl" ? "right" : "left"; + $(".leaflet-control .control-button").tooltip({ placement: placement, container: "body" }); - if (params.object) { - addObjectToMap(params.object, map, { zoom: params.object_zoom }); - } + 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"); } - $("#search_form").submit(submitSearch(map)); + $(".welcome .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 .close-wrap").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.PIWIK) { + map.on("layeradd", function (e) { + if (e.layer.options) { + var goal = OSM.PIWIK.goals[e.layer.options.keyid]; - if ($("#query").val()) { - $("#search_form").submit(); + if (goal) { + $("body").trigger("piwikgoal", goal); + } + } + }); } - // Focus the search field for browsers that don't support - // the HTML5 'autofocus' attribute - if (!("autofocus" in document.createElement("input"))) { - $("#query").focus(); + if (params.bounds) { + map.fitBounds(params.bounds); + } else { + map.setView([params.lat, params.lon], params.zoom); } - initializeExport(map); - initializeBrowse(map); - initializeNotes(map); -}); + if (params.marker) { + L.marker([params.mlat, params.mlon]).addTo(map); + } -function updateLocation() { - updatelinks(this.getCenter().wrap(), - this.getZoom(), - this.getLayersCode(), - this.getBounds().wrap()); + $("#homeanchor").on("click", function (e) { + e.preventDefault(); - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", cookieContent(this), { expires: expiry }); -} - -function setPositionLink(map) { - return function(e) { - var data = $(this).data(), - center = L.latLng(data.lat, data.lon); - - if (data.minLon && data.minLat && data.maxLon && data.maxLat) { - map.fitBounds([[data.minLat, data.minLon], - [data.maxLat, data.maxLon]]); - } else { - map.setView(center, data.zoom); - } + var data = $(this).data(), + center = L.latLng(data.lat, data.lon); + + map.setView(center, data.zoom); + L.marker(center, { icon: OSM.getUserIcon() }).addTo(map); + }); - if (data.type && data.id) { - addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } }); + function remoteEditHandler(bbox, object) { + var loaded = false, + url, + query = { + left: bbox.getWest() - 0.0001, + top: bbox.getNorth() + 0.0001, + right: bbox.getEast() + 0.0001, + bottom: bbox.getSouth() - 0.0001 + }; + + url = "http://127.0.0.1:8111/load_and_zoom?"; + + if (object) query.select = object.type + object.id; + + var iframe = $("