X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/feeb135760abdbfef0eea193318566d9d96f2523..76bc5eba0617e36ebb853d24212543d0e1d4904d:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index bae80cac5..4ea643b26 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -5,64 +5,92 @@ //= 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 $(document).ready(function () { + var loaderTimeout; + + OSM.loadSidebarContent = function(path, callback) { + 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 (path.indexOf('?') >= 0) { + path += '&xhr=1'; + } else { + path += '?xhr=1'; + } + + $('#sidebar_content') + .empty(); + + $.ajax({ + url: 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(); - var map = L.map("map", { + var map = new L.OSM.Map("map", { zoomControl: false, - layerControl: false + layerControl: false, + contextmenu: true }); map.attributionControl.setPrefix(''); - map.hash = L.hash(map); - - 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") - }) - ]; - - for (var i = layers.length - 1; i >= 0; i--) { - if (i === 0 || params.layers.indexOf(layers[i].options.code) >= 0) { - map.addLayer(layers[i]); - break; - } - } - - map.noteLayer = new L.LayerGroup(); - map.noteLayer.options = {code: 'N'}; - - map.dataLayer = new L.OSM.DataLayer(null); - map.dataLayer.options.code = 'D'; + map.updateLayers(params.layers); - $("#sidebar").on("opened closed", function () { - map.invalidateSize(); + 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'; @@ -70,15 +98,32 @@ $(document).ready(function () { 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: I18n.t('javascripts.map.locate.popup') + } + }).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') .addTo(map); L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -98,116 +143,246 @@ $(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); + OSM.initializeContextMenu(map); - map.markerLayer = L.layerGroup().addTo(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 (!params.object_zoom) { - if (params.bounds) { - map.fitBounds(params.bounds); - } else { - map.setView([params.lat, params.lon], params.zoom); + OSM.initializeBrowse(map); + if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { + map.addLayer(map.dataLayer); } - } - if (params.box) { - L.rectangle(params.box, { - weight: 2, - color: '#e90', - fillOpacity: 0 - }).addTo(map); + 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) { - map.addObject(params.object, { 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(); + $.removeCookie('_osm_location'); + $.cookie('_osm_location', OSM.locationCookie(map), { expires: expiry, path: '/' }); }); - if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { - remoteEditHandler(map.getBounds()); + if ($.cookie('_osm_welcome') === 'hide') { + $('.welcome').hide(); } - $("#search_form").submit(submitSearch(map)); + $('.welcome .close-wrap').on('click', function() { + $('.welcome').hide(); + $.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) { + 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, params); - initializeNotes(map, params); -}); + 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 }); - - // Trigger hash update on layer changes. - this.hash.onMapMove(); -} - -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); - if (data.type && data.id) { - map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } }); + map.setView(center, data.zoom); + L.marker(center, {icon: OSM.getUserIcon()}).addTo(map); + }); + + function remoteEditHandler(bbox, object) { + var loaded = false, + url = "http://127.0.0.1:8111/load_and_zoom?", + query = { + left: bbox.getWest() - 0.0001, + top: bbox.getNorth() + 0.0001, + right: bbox.getEast() + 0.0001, + bottom: bbox.getSouth() - 0.0001 + }; + + if (object) query.select = object.type + object.id; + + var iframe = $('