X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f076d8f349837751e701d9c948414abc7ddeeaf..14136b27c2e242ae3913b427113f5294be4b76e0:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d57b76b28..e01ff3cb9 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -9,11 +9,14 @@ //= require index/browse //= require index/export //= require index/notes +//= require index/history +//= require index/note +//= require router $(document).ready(function () { var params = OSM.mapParams(); - var map = L.map("map", { + var map = new L.OSM.Map("map", { zoomControl: false, layerControl: false }); @@ -22,11 +25,20 @@ $(document).ready(function () { map.hash = L.hash(map); + $(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(); + } + }); + 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, + attribution: copyright + " ♥ " + donate, code: "M", keyid: "mapnik", name: I18n.t("javascripts.map.base.standard") @@ -132,6 +144,18 @@ $(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'}); map.on('moveend layeradd layerremove', function() { @@ -139,15 +163,14 @@ $(document).ready(function () { map.getCenter().wrap(), map.getZoom(), map.getLayersCode(), - map.getBounds().wrap(), map._object); - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", cookieContent(map), { expires: expiry }); + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + $.cookie("_osm_location", cookieContent(map), { expires: expiry }); - // Trigger hash update on layer changes. - map.hash.onMapMove(); + // Trigger hash update on layer changes. + map.hash.onMapMove(); }); if (OSM.PIWIK) { @@ -162,24 +185,18 @@ $(document).ready(function () { }); } - var marker = L.marker([0, 0], {icon: getUserIcon()}); - - if (!params.object_zoom) { - if (params.bounds) { - map.fitBounds(params.bounds); - } else { - map.setView([params.lat, params.lon], params.zoom); - } + if (params.bounds) { + map.fitBounds(params.bounds); + } else { + map.setView([params.lat, params.lon], params.zoom); } + var marker = L.marker([0, 0], {icon: getUserIcon()}); + if (params.marker) { marker.setLatLng([params.mlat, params.mlon]).addTo(map); } - if (params.object) { - map.addObject(params.object, { zoom: params.object_zoom }); - } - $("#homeanchor").on("click", function(e) { e.preventDefault(); @@ -213,10 +230,87 @@ $(document).ready(function () { }); } - initializeSearch(map); - initializeExport(map); - initializeBrowse(map, params); - initializeNotes(map, params); + OSM.Index = function(map) { + var page = {}; + + page.pushstate = page.popstate = function(path) { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize(); + $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) { + if (xhr.getResponseHeader('X-Page-Title')) { + document.title = xhr.getResponseHeader('X-Page-Title'); + } + }); + }; + + page.unload = function() { + $("#content").removeClass("overlay-sidebar"); + map.invalidateSize(); + }; + + return page; + }; + + OSM.Browse = function(map) { + var page = {}; + + page.pushstate = page.popstate = function(path, type, id) { + $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) { + if (xhr.getResponseHeader('X-Page-Title')) { + document.title = xhr.getResponseHeader('X-Page-Title'); + } + page.load(path, type, id); + }); + }; - if ('undefined' !== typeof initializeChangesets) initializeChangesets(map); + page.load = function(path, type, id) { + 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.unload = function() { + map.removeObject(); + }; + + return page; + }; + + var history = OSM.History(map), + note = OSM.Note(map); + + OSM.route = OSM.Router({ + "/": OSM.Index(map), + "/search": OSM.Search(map), + "/export": OSM.Export(map), + "/history": history, + "/user/:display_name/edits": history, + "/browse/friends": history, + "/browse/nearby": history, + "/browse/note/:id": note, + "/browse/:type/:id(/history)": OSM.Browse(map) + }); + + $(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(); + }); + + $(".search_form").on("submit", function(e) { + e.preventDefault(); + $("header").addClass("closed"); + OSM.route("/search?query=" + encodeURIComponent($(this).find("input[name=query]").val()) + OSM.formatHash(map)); + }); + + $(".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))); + }); });