X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/35458c009652645972a9167d80aba1c4fdce82cf..bd19e75214a05c2cc4cd36dd63d30cace2ab1f8e:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 91855f823..e0ca66766 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -9,77 +9,22 @@ //= require index/browse //= require index/export //= require index/notes -//= require index/changeset +//= require index/history +//= require index/note +//= require index/new_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 }); 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) { @@ -87,12 +32,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'; - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; L.OSM.zoom({position: position}) @@ -111,7 +50,7 @@ $(document).ready(function () { L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -134,6 +73,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() { @@ -146,9 +97,6 @@ $(document).ready(function () { 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(); }); if (OSM.PIWIK) { @@ -163,16 +111,14 @@ $(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); } @@ -210,19 +156,34 @@ $(document).ready(function () { }); } - initializeBrowse(map, params); - initializeNotes(map, params); - OSM.Index = function(map) { var page = {}; - page.pushstate = page.popstate = function(path) { - $("#view_tab").addClass("current"); - $('#sidebar_content').load(path); + function loadContent(path) { + $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) { + if (xhr.getResponseHeader('X-Page-Title')) { + document.title = xhr.getResponseHeader('X-Page-Title'); + } + }); + } + + page.pushstate = function(path) { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize({pan: false}) + .panBy([-300, 0], {animate: false}); + loadContent(path); + }; + + page.popstate = function(path) { + $("#content").addClass("overlay-sidebar"); + map.invalidateSize({pan: false}); + loadContent(path); }; page.unload = function() { - $("#view_tab").removeClass("current"); + map.panBy([300, 0], {animate: false}); + $("#content").removeClass("overlay-sidebar"); + map.invalidateSize({pan: false}); }; return page; @@ -231,12 +192,19 @@ $(document).ready(function () { OSM.Browse = function(map) { var page = {}; - page.pushstate = page.popstate = function(path) { - $('#sidebar_content').load(path, page.load); + 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); + }); }; - page.load = function() { - map.addObject(OSM.mapParams().object, {zoom: true}); + page.load = function(path, type, id) { + if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return; + + map.addObject({type: type, id: parseInt(id)}, {zoom: true}); }; page.unload = function() { @@ -246,25 +214,38 @@ $(document).ready(function () { return page; }; - var router = OSM.Router({ + var history = OSM.History(map), + note = OSM.Note(map); + + OSM.route = OSM.Router(map, { "/": OSM.Index(map), "/search": OSM.Search(map), "/export": OSM.Export(map), - "/browse/changesets": OSM.ChangesetList(map), + "/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) }); $(document).on("click", "a", function(e) { - if (router(this.pathname + this.search + this.hash)) e.preventDefault(); + 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) { + $(".search_form").on("submit", function(e) { e.preventDefault(); - router("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map)); + $("header").addClass("closed"); + OSM.route("/search?query=" + encodeURIComponent($(this).find("input[name=query]").val()) + OSM.formatHash(map)); }); - $("#describe_location").on("click", function(e) { + $(".describe_location").on("click", function(e) { e.preventDefault(); - router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng)); + var precision = zoomPrecision(map.getZoom()); + OSM.route("/search?query=" + encodeURIComponent( + map.getCenter().lat.toFixed(precision) + "," + + map.getCenter().lng.toFixed(precision))); }); });