X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cdfe2ac21ec01344b4b10d566582e7cc2b2eb7cb..16da03aacb264c1703d8bd4fab5c58c78745be00:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 2ed869905..9a05b62c2 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -5,113 +5,91 @@ //= require leaflet.key //= require leaflet.note //= require leaflet.share +//= require leaflet.polyline +//= require leaflet.query //= 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 params = OSM.mapParams(); + var loaderTimeout; - var map = L.map("map", { - zoomControl: false, - layerControl: false - }); + OSM.loadSidebarContent = function(path, callback) { + map.setSidebarOverlaid(false); - map.attributionControl.setPrefix(''); + clearTimeout(loaderTimeout); - map.hash = L.hash(map); + loaderTimeout = setTimeout(function() { + $('#sidebar_loader').show(); + }, 200); - $(window).on('popstate', function(e) { - // popstate is triggered when the hash changes as well as on actual navigation - // events. We want to update the hash on the latter and not the former. - if (e.originalEvent.state) { - map.hash.update(); + // 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'; } - }); - var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); - var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'}); - - var layers = [ - new L.OSM.Mapnik({ - attribution: copyright + " ♥ " + donate, - code: "M", - keyid: "mapnik", - name: I18n.t("javascripts.map.base.standard") - }), - new L.OSM.CycleMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", - code: "C", - keyid: "cyclemap", - name: I18n.t("javascripts.map.base.cycle_map") - }), - new L.OSM.TransportMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", - code: "T", - keyid: "transportmap", - name: I18n.t("javascripts.map.base.transport_map") - }), - new L.OSM.MapQuestOpen({ - attribution: copyright + ". Tiles courtesy of MapQuest ", - code: "Q", - keyid: "mapquest", - name: I18n.t("javascripts.map.base.mapquest") - }), - new L.OSM.HOT({ - attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", - code: "H", - keyid: "hot", - name: I18n.t("javascripts.map.base.hot") - }) - ]; - - function updateLayers(params) { - var layerParam = params.layers || "M"; - var layersAdded = ""; - - for (var i = layers.length - 1; i >= 0; i--) { - if (layerParam.indexOf(layers[i].options.code) >= 0) { - map.addLayer(layers[i]); - layersAdded = layersAdded + layers[i].options.code; - } else if (i == 0 && layersAdded == "") { - map.addLayer(layers[i]); - } else { - map.removeLayer(layers[i]); + $('#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(escape(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(); + } } - } - } + }); + }; - updateLayers(params); + var params = OSM.mapParams(); - $(window).on("hashchange", function () { - updateLayers(OSM.mapParams()); + var map = new L.OSM.Map("map", { + zoomControl: false, + layerControl: false }); + 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 }); } }); - map.noteLayer = new L.LayerGroup(); - map.noteLayer.options = {code: 'N'}; - - map.dataLayer = new L.OSM.DataLayer(null); - map.dataLayer.options.code = 'D'; - - if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { - if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { - map.addLayer(map.noteLayer); - } - - if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { - map.addLayer(map.dataLayer); - } - } - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; L.OSM.zoom({position: position}) @@ -130,7 +108,7 @@ $(document).ready(function () { L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -150,24 +128,49 @@ $(document).ready(function () { sidebar: sidebar }).addTo(map); + L.OSM.query({ + position: position, + sidebar: sidebar + }).addTo(map); + L.control.scale() .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); + } + + OSM.initializeBrowse(map); + if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { + map.addLayer(map.dataLayer); + } + } + $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'}); + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + map.on('moveend layeradd layerremove', function() { - updatelinks( + updateLinks( map.getCenter().wrap(), map.getZoom(), map.getLayersCode(), map._object); - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", cookieContent(map), { expires: expiry }); + $.removeCookie("_osm_location"); + $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); + }); + + if ($.cookie('_osm_welcome') === 'hide') { + $('.welcome').hide(); + } - // Trigger hash update on layer changes. - map.hash.onMapMove(); + $('.welcome .close').on('click', function() { + $('.welcome').hide(); + $.cookie("_osm_welcome", 'hide', { expires: expiry }); }); if (OSM.PIWIK) { @@ -188,7 +191,7 @@ $(document).ready(function () { map.setView([params.lat, params.lon], params.zoom); } - var marker = L.marker([0, 0], {icon: getUserIcon()}); + var marker = L.marker([0, 0], {icon: OSM.getUserIcon()}); if (params.marker) { marker.setLatLng([params.mlat, params.mlon]).addTo(map); @@ -204,15 +207,45 @@ $(document).ready(function () { marker.setLatLng(center).addTo(map); }); - $("a[data-editor=remote]").click(function(e) { - remoteEditHandler(map.getBounds()); - e.preventDefault(); - }); + 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?", + 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 = $('