X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/040804335d799bdcdff6005893c85daac3203f00..f2d13c075660efb9582d7fb600bd6798d7a382ca:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 5cc3a25b8..dc3c93277 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -10,108 +10,81 @@ //= require index/export //= require index/notes //= require index/history +//= require index/note +//= require index/new_note //= require router -$(document).ready(function () { - var params = OSM.mapParams(); - - var map = L.map("map", { - zoomControl: false, - layerControl: false - }); +(function() { + var loaderTimeout; - map.attributionControl.setPrefix(''); + OSM.loadSidebarContent = function(path, callback) { + 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); +$(document).ready(function () { + 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 +103,7 @@ $(document).ready(function () { L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -153,21 +126,41 @@ $(document).ready(function () { L.control.scale() .addTo(map); + if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { + initializeNotes(map); + if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { + map.addLayer(map.noteLayer); + } + + 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) { @@ -205,14 +198,11 @@ $(document).ready(function () { }); $("a[data-editor=remote]").click(function(e) { - remoteEditHandler(map.getBounds()); - e.preventDefault(); + var params = OSM.mapParams(this.search); + remoteEditHandler(map.getBounds(), params.object); + e.preventDefault(); }); - if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { - remoteEditHandler(map.getBounds()); - } - if (OSM.params().edit_help) { $('#editanchor') .removeAttr('title') @@ -227,44 +217,61 @@ $(document).ready(function () { }); } - initializeBrowse(map); - initializeNotes(map); - OSM.Index = function(map) { var page = {}; - page.pushstate = page.popstate = function(path) { - $("#sidebar").addClass("minimized"); - map.invalidateSize(); - $('#sidebar_content').load(path); + page.pushstate = function() { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize({pan: false}) + .panBy([-350, 0], {animate: false}); + document.title = I18n.t('layouts.project_name.title'); + }; + + page.load = function() { + if (!("autofocus" in document.createElement("input"))) { + $("#sidebar .search_form input[name=query]").focus(); + } + return map.getState(); + }; + + page.popstate = function() { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize({pan: false}); + document.title = I18n.t('layouts.project_name.title'); + }; + + page.unload = function() { + map.panBy([350, 0], {animate: false}); + $("#content").removeClass("overlay-sidebar"); + map.invalidateSize({pan: false}); }; return page; }; - OSM.Browse = function(map) { + OSM.Browse = function(map, type) { var page = {}; - page.pushstate = page.popstate = function(path, type, id) { - $("#sidebar").removeClass("minimized"); - map.invalidateSize(); - $('#sidebar_content').load(path, function() { - page.load(path, type, id); + page.pushstate = page.popstate = function(path, id) { + OSM.loadSidebarContent(path, function() { + addObject(type, id); }); }; - page.load = function(path, type, id) { - $("#sidebar").removeClass("minimized"); - - if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return; - - if (type === 'note') { - map.noteLayer.showNote(parseInt(id)); - } else { - map.addObject({type: type, id: parseInt(id)}, {zoom: true}); - } + page.load = function(path, id) { + addObject(type, id, true); }; + function addObject(type, id, center) { + var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) { + if (!window.location.hash && bounds.isValid()) { + OSM.router.moveListenerOff(); + map.once('moveend', OSM.router.moveListenerOn); + if (center || !map.getBounds().contains(bounds)) map.fitBounds(bounds); + } + }); + } + page.unload = function() { map.removeObject(); }; @@ -274,45 +281,61 @@ $(document).ready(function () { var history = OSM.History(map); - OSM.route = OSM.Router({ + OSM.router = OSM.Router(map, { "/": OSM.Index(map), "/search": OSM.Search(map), "/export": OSM.Export(map), + "/note/new": OSM.NewNote(map), + "/history/friends": history, + "/history/nearby": history, "/history": history, - "/user/:display_name/edits": history, - "/browse/friends": history, - "/browse/nearby": history, - "/browse/:type/:id(/history)": OSM.Browse(map) + "/user/:display_name/history": history, + "/note/:id": OSM.Note(map), + "/node/:id(/history)": OSM.Browse(map, 'node'), + "/way/:id(/history)": OSM.Browse(map, 'way'), + "/relation/:id(/history)": OSM.Browse(map, 'relation'), + "/changeset/:id": OSM.Browse(map, 'changeset') }); + if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") { + remoteEditHandler(map.getBounds(), params.object); + OSM.router.setCurrentPath("/"); + } + + OSM.router.load(); + $(document).on("click", "a", function(e) { - if (e.isDefaultPrevented() || e.isPropagationStopped()) return; - if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault(); + if (e.isDefaultPrevented() || e.isPropagationStopped()) + return; + + // Open links in a new tab as normal. + if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) + return; + + // Ignore cross-protocol and cross-origin links. + if (location.protocol !== this.protocol || location.host !== this.host) + return; + + if (OSM.router.route(this.pathname + this.search + this.hash)) + e.preventDefault(); }); - $("#search_form").on("submit", function(e) { + $(".search_form").on("submit", function(e) { e.preventDefault(); - OSM.route("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map)); + $("header").addClass("closed"); + var query = $(this).find("input[name=query]").val(); + if (query) { + OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); + } else { + OSM.router.route("/" + OSM.formatHash(map)); + } }); - $("#describe_location").on("click", function(e) { + $(".describe_location").on("click", function(e) { e.preventDefault(); - var precision = zoomPrecision(map.getZoom()); - OSM.route("/search?query=" + encodeURIComponent( + var precision = OSM.zoomPrecision(map.getZoom()); + OSM.router.route("/search?query=" + encodeURIComponent( map.getCenter().lat.toFixed(precision) + "," + map.getCenter().lng.toFixed(precision))); }); - - function removeSidebar() { - if ($(window).width() < 721) { - $('#sidebar').addClass("minimized"); - } - } - - $(window).resize(function() { - removeSidebar(); - }); - - removeSidebar(); - });