X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2b4f8e92c969a5508b73ae7af45811a118fda6b1..d423ae91370b08dcad6ccba041c2e234659531ec:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index f1644c06f..df975db48 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -5,6 +5,7 @@ //= require leaflet.key //= require leaflet.note //= require leaflet.share +//= require leaflet.query //= require index/search //= require index/browse //= require index/export @@ -12,6 +13,8 @@ //= require index/history //= require index/note //= require index/new_note +//= require index/changeset +//= require index/query //= require router (function() { @@ -40,11 +43,25 @@ dataType: "html", complete: function(xhr) { clearTimeout(loaderTimeout); + $('#flash').empty(); $('#sidebar_loader').hide(); - $('#sidebar_content').html(xhr.responseText); + + var content = $(xhr.responseText); + if (xhr.getResponseHeader('X-Page-Title')) { - document.title = 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(); } @@ -109,6 +126,11 @@ $(document).ready(function () { sidebar: sidebar }).addTo(map); + L.OSM.query({ + position: position, + sidebar: sidebar + }).addTo(map); + L.control.scale() .addTo(map); @@ -126,16 +148,27 @@ $(document).ready(function () { $('.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(); + } + + $('.welcome .close').on('click', function() { + $('.welcome').hide(); + $.cookie("_osm_welcome", 'hide', { expires: expiry }); }); if (OSM.PIWIK) { @@ -173,14 +206,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') @@ -198,26 +228,28 @@ $(document).ready(function () { OSM.Index = function(map) { var page = {}; - page.pushstate = function(path) { + page.pushstate = function() { $("#content").addClass("overlay-sidebar"); map.invalidateSize({pan: false}) - .panBy([-300, 0], {animate: false}); - OSM.loadSidebarContent(path); - page.load(); + .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(path) { + page.popstate = function() { $("#content").addClass("overlay-sidebar"); map.invalidateSize({pan: false}); - OSM.loadSidebarContent(path); + document.title = I18n.t('layouts.project_name.title'); }; page.unload = function() { - map.panBy([300, 0], {animate: false}); + map.panBy([350, 0], {animate: false}); $("#content").removeClass("overlay-sidebar"); map.invalidateSize({pan: false}); }; @@ -225,19 +257,30 @@ $(document).ready(function () { return page; }; - OSM.Browse = function(map) { + OSM.Browse = function(map, type) { var page = {}; - page.pushstate = page.popstate = function(path, type, id) { + page.pushstate = page.popstate = function(path, id) { OSM.loadSidebarContent(path, function() { - page.load(path, type, id); + addObject(type, id); }); }; - page.load = function(path, type, id) { - map.addObject({type: type, id: parseInt(id)}); + 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() && + (center || !map.getBounds().contains(bounds))) { + OSM.router.withoutMoveListener(function () { + map.fitBounds(bounds); + }); + } + }); + } + page.unload = function() { map.removeObject(); }; @@ -245,27 +288,46 @@ $(document).ready(function () { return page; }; - var history = OSM.History(map), - note = OSM.Note(map); + var history = OSM.History(map); - OSM.route = OSM.Router(map, { + 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, - "/new_note": OSM.NewNote(map), - "/user/:display_name/edits": history, - "/browse/friends": history, - "/browse/nearby": history, - "/browse/note/:id": note, - "/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.Changeset(map), + "/query": OSM.Query(map) }); - OSM.route.load(); + 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) { @@ -273,17 +335,18 @@ $(document).ready(function () { $("header").addClass("closed"); var query = $(this).find("input[name=query]").val(); if (query) { - OSM.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); + OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); } else { - OSM.route("/" + OSM.formatHash(map)); + OSM.router.route("/"); } }); $(".describe_location").on("click", function(e) { e.preventDefault(); - var precision = zoomPrecision(map.getZoom()); - OSM.route("/search?query=" + encodeURIComponent( - map.getCenter().lat.toFixed(precision) + "," + - map.getCenter().lng.toFixed(precision))); + var center = map.getCenter().wrap(), + precision = OSM.zoomPrecision(map.getZoom()); + OSM.router.route("/search?query=" + encodeURIComponent( + center.lat.toFixed(precision) + "," + center.lng.toFixed(precision) + )); }); });