X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b756c5fd6ea4a982a654e07f42c8250c7f7d85fc..be931d0955fbd2379b1ffedb9abd32b1e8cb5915:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d84b8ae24..273ce581a 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -9,75 +9,75 @@ //= require index/browse //= require index/export //= require index/notes +//= require index/history +//= require index/note +//= require index/new_note +//= require router + +(function() { + var loaderTimeout; + + OSM.loadSidebarContent = function(path, callback) { + 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(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(); + } + } + }); + }; +})(); $(document).ready(function () { var params = OSM.mapParams(); - var map = L.map("map", { + var map = new L.OSM.Map("map", { zoomControl: false, layerControl: false }); map.attributionControl.setPrefix(''); - map.hash = L.hash(map); - - var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); - - var layers = [ - new L.OSM.Mapnik({ - attribution: copyright, - 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]); - } - } - } - - updateLayers(params); - - $(window).on("hashchange", function () { - updateLayers(OSM.mapParams()); - }); + map.updateLayers(params.layers); map.on("baselayerchange", function (e) { if (map.getZoom() > e.layer.options.maxZoom) { @@ -85,16 +85,6 @@ $(document).ready(function () { } }); - map.noteLayer = new L.LayerGroup(); - map.noteLayer.options = {code: 'N'}; - - map.dataLayer = new L.OSM.DataLayer(null); - map.dataLayer.options.code = 'D'; - - $("#sidebar").on("opened closed", function () { - map.invalidateSize(); - }); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; L.OSM.zoom({position: position}) @@ -113,7 +103,7 @@ $(document).ready(function () { L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -136,9 +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'}); - map.on('moveend layeradd layerremove', updateLocation); + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + + map.on('moveend layeradd layerremove', function() { + updateLinks( + map.getCenter().wrap(), + map.getZoom(), + map.getLayersCode(), + map._object); + + $.cookie("_osm_location", cookieContent(map), { expires: expiry }); + }); + + if ($.cookie('_osm_welcome') == 'hide') { + $('.welcome').hide(); + } + + $('.welcome .close').on('click', function() { + $('.welcome').hide(); + $.cookie("_osm_welcome", 'hide', { expires: expiry }); + }); if (OSM.PIWIK) { map.on('layeradd', function (e) { @@ -152,32 +174,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); } - if (params.box) { - L.rectangle(params.box, { - weight: 2, - color: '#e90', - fillOpacity: 0 - }).addTo(map); - } + 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(); @@ -211,22 +219,94 @@ $(document).ready(function () { }); } - initializeSearch(map); - initializeExport(map); - initializeBrowse(map, params); - initializeNotes(map, params); -}); + OSM.Index = function(map) { + var page = {}; + + page.pushstate = function() { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize({pan: false}) + .panBy([-350, 0], {animate: false}); + }; + + page.load = function() { + return map.getState(); + }; + + page.popstate = function() { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize({pan: false}); + }; + + page.unload = function() { + map.panBy([350, 0], {animate: false}); + $("#content").removeClass("overlay-sidebar"); + map.invalidateSize({pan: false}); + }; + + return page; + }; + + OSM.Browse = function(map, type) { + var page = {}; + + page.pushstate = page.popstate = function(path, id) { + OSM.loadSidebarContent(path, function() { + page.load(path, id); + }); + }; + + page.load = function(path, id) { + map.addObject({type: type, id: parseInt(id)}); + }; + + page.unload = function() { + map.removeObject(); + }; + + return page; + }; + + var history = OSM.History(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, + "/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') + }); -function updateLocation() { - updatelinks(this.getCenter().wrap(), - this.getZoom(), - this.getLayersCode(), - this.getBounds().wrap()); + OSM.router.load(); - var expiry = new Date(); - expiry.setYear(expiry.getFullYear() + 10); - $.cookie("_osm_location", cookieContent(this), { expires: expiry }); + $(document).on("click", "a", function(e) { + if (e.isDefaultPrevented() || e.isPropagationStopped()) return; + if (this.host === window.location.host && OSM.router.route(this.pathname + this.search + this.hash)) e.preventDefault(); + }); - // Trigger hash update on layer changes. - this.hash.onMapMove(); -} + $(".search_form").on("submit", function(e) { + e.preventDefault(); + $("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) { + e.preventDefault(); + var precision = zoomPrecision(map.getZoom()); + OSM.router.route("/search?query=" + encodeURIComponent( + map.getCenter().lat.toFixed(precision) + "," + + map.getCenter().lng.toFixed(precision))); + }); +});