X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a2cf9b5b9f568c614ad8bbf8a477326b01cefb57..8030e7b5d6a019618da5874646fc30ee2e15e14b:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 6f081c617..cce07f324 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -8,6 +8,7 @@ //= require leaflet.polyline //= require leaflet.query //= require leaflet.contextmenu +//= require index/contextmenu //= require index/search //= require index/browse //= require index/export @@ -19,28 +20,35 @@ //= require index/changeset //= require index/query //= require router +//= require bowser $(document).ready(function () { var loaderTimeout; + var map = new L.OSM.Map("map", { + zoomControl: false, + layerControl: false, + contextmenu: true + }); + OSM.loadSidebarContent = function(path, callback) { map.setSidebarOverlaid(false); clearTimeout(loaderTimeout); loaderTimeout = setTimeout(function() { - $('#sidebar_loader').show(); + $("#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'; + if (path.indexOf("?") >= 0) { + path += "&xhr=1"; } else { - path += '?xhr=1'; + path += "?xhr=1"; } - $('#sidebar_content') + $("#sidebar_content") .empty(); $.ajax({ @@ -48,24 +56,24 @@ $(document).ready(function () { dataType: "html", complete: function(xhr) { clearTimeout(loaderTimeout); - $('#flash').empty(); - $('#sidebar_loader').hide(); + $("#flash").empty(); + $("#sidebar_loader").hide(); var content = $(xhr.responseText); - if (xhr.getResponseHeader('X-Page-Title')) { - var title = xhr.getResponseHeader('X-Page-Title'); + if (xhr.getResponseHeader("X-Page-Title")) { + var title = xhr.getResponseHeader("X-Page-Title"); document.title = decodeURIComponent(title); } - $('head') - .find('link[type="application/atom+xml"]') + $("head") + .find("link[type=\"application/atom+xml\"]") .remove(); - $('head') - .append(content.filter('link[type="application/atom+xml"]')); + $("head") + .append(content.filter("link[type=\"application/atom+xml\"]")); - $('#sidebar_content').html(content.not('link[type="application/atom+xml"]')); + $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]")); if (callback) { callback(); @@ -76,86 +84,7 @@ $(document).ready(function () { var params = OSM.mapParams(); - // TODO consider using a separate js file for the context menu additions - var context_describe = function(e){ - var precision = OSM.zoomPrecision(map.getZoom()); - OSM.router.route("/search?query=" + encodeURIComponent( - e.latlng.lat.toFixed(precision) + "," + e.latlng.lng.toFixed(precision) - )); - }; - - var context_directionsfrom = function(e){ - var precision = OSM.zoomPrecision(map.getZoom()); - OSM.router.route("/directions?" + querystring.stringify({ - route: e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision) + ';' + $('#route_to').val() - })); - } - - var context_directionsto = function(e){ - var precision = OSM.zoomPrecision(map.getZoom()); - OSM.router.route("/directions?" + querystring.stringify({ - route: $('#route_from').val() + ';' + e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision) - })); - } - - var context_addnote = function(e){ - // I'd like this, instead of panning, to pass a query parameter about where to place the marker - map.panTo(e.latlng, {animate: false}); - OSM.router.route('/note/new'); - } - - var context_centrehere = function(e){ - map.panTo(e.latlng); - } - - var context_queryhere = function(e) { - var precision = OSM.zoomPrecision(map.getZoom()), - latlng = e.latlng.wrap(), - lat = latlng.lat.toFixed(precision), - lng = latlng.lng.toFixed(precision); - - OSM.router.route("/query?lat=" + lat + "&lon=" + lng); - } - - // TODO internationalisation of the context menu strings - var map = new L.OSM.Map("map", { - zoomControl: false, - layerControl: false, - contextmenu: true, - contextmenuWidth: 140, - contextmenuItems: [{ - text: 'Directions from here', - callback: context_directionsfrom - }, { - text: 'Directions to here', - callback: context_directionsto - }, '-', { - text: 'Add a note here', - callback: context_addnote - }, { - text: 'Show address', - callback: context_describe - }, { - text: 'Query features', - callback: context_queryhere - }, { - text: 'Centre map here', - callback: context_centrehere - }] - }); - - $(document).on('mousedown', function(e){ - if(e.shiftKey){ - map.contextmenu.disable(); // on firefox, shift disables our contextmenu. we explicitly do this for all browsers. - }else{ - map.contextmenu.enable(); - // we also decide whether to disable some options that only like high zoom - map.contextmenu.setDisabled(3, map.getZoom() < 12); - map.contextmenu.setDisabled(5, map.getZoom() < 14); - } - }); - - map.attributionControl.setPrefix(''); + map.attributionControl.setPrefix(""); map.updateLayers(params.layers); @@ -165,20 +94,32 @@ $(document).ready(function () { } }); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + 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') + title: I18n.t("javascripts.map.locate.title"), + popup: I18n.t("javascripts.map.locate.popup") } }).addTo(map); - var sidebar = L.OSM.sidebar('#map-ui') + 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") .addTo(map); L.OSM.layers({ @@ -211,7 +152,9 @@ $(document).ready(function () { L.control.scale() .addTo(map); - if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') { + 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); @@ -221,15 +164,19 @@ $(document).ready(function () { 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 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() { + map.on("moveend layeradd layerremove", function() { updateLinks( map.getCenter().wrap(), map.getZoom(), @@ -240,22 +187,34 @@ $(document).ready(function () { $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); - if ($.cookie('_osm_welcome') === 'hide') { - $('.welcome').hide(); + if ($.cookie("_osm_welcome") !== "hide") { + $(".welcome").addClass("visible"); } - $('.welcome .close').on('click', function() { - $('.welcome').hide(); - $.cookie("_osm_welcome", 'hide', { expires: expiry }); + $(".welcome .close-wrap").on("click", function() { + $(".welcome").removeClass("visible"); + $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" }); + }); + + 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) { + $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" }); + } }); if (OSM.PIWIK) { - map.on('layeradd', function (e) { + map.on("layeradd", function (e) { if (e.layer.options) { var goal = OSM.PIWIK.goals[e.layer.options.keyid]; if (goal) { - $('body').trigger('piwikgoal', goal); + $("body").trigger("piwikgoal", goal); } } }); @@ -267,10 +226,8 @@ $(document).ready(function () { map.setView([params.lat, params.lon], params.zoom); } - var marker = L.marker([0, 0], {icon: OSM.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) { @@ -280,14 +237,12 @@ $(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); }); 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?", + url, query = { left: bbox.getWest() - 0.0001, top: bbox.getNorth() + 0.0001, @@ -295,20 +250,27 @@ $(document).ready(function () { bottom: bbox.getSouth() - 0.0001 }; + if (location.protocol === "http" || + bowser.check({chrome: "53", firefox: "55"})) { + url = "http://127.0.0.1:8111/load_and_zoom?"; + } else { + url = "https://127.0.0.1:8112/load_and_zoom?"; + } + if (object) query.select = object.type + object.id; - var iframe = $('