X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1df32b88e886994cc992da5fb0e37867cbd80283..aa45efc1b7dd87821178f7780e2e0b3129ac4529:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 8a1776714..6c1c1610f 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -10,12 +10,13 @@ //= 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 }); @@ -32,62 +33,10 @@ $(document).ready(function () { } }); - 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]); - } - } - } - - updateLayers(params); + map.updateLayers(params); $(window).on("hashchange", function () { - updateLayers(OSM.mapParams()); + map.updateLayers(OSM.mapParams()); }); map.on("baselayerchange", function (e) { @@ -96,22 +45,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'; - - 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 +63,7 @@ $(document).ready(function () { L.OSM.layers({ position: position, - layers: layers, + layers: map.baseLayers, sidebar: sidebar }).addTo(map); @@ -153,6 +86,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() { @@ -227,16 +172,22 @@ $(document).ready(function () { }); } - initializeBrowse(map); - initializeNotes(map); - OSM.Index = function(map) { - var page = {}, minimized = $('#sidebar').hasClass('minimized'); + var page = {}; page.pushstate = page.popstate = function(path) { - if (minimized) $("#sidebar").addClass("minimized"); + $("#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(); - $('#sidebar_content').load(path); }; return page; @@ -246,9 +197,10 @@ $(document).ready(function () { var page = {}; page.pushstate = page.popstate = function(path, type, id) { - $("#sidebar").removeClass("minimized"); - map.invalidateSize(); - $('#sidebar_content').load(path, function() { + $('#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); }); }; @@ -270,7 +222,8 @@ $(document).ready(function () { return page; }; - var history = OSM.History(map); + var history = OSM.History(map), + note = OSM.Note(map); OSM.route = OSM.Router({ "/": OSM.Index(map), @@ -280,6 +233,7 @@ $(document).ready(function () { "/user/:display_name/edits": history, "/browse/friends": history, "/browse/nearby": history, + "/browse/note/:id": note, "/browse/:type/:id(/history)": OSM.Browse(map) }); @@ -288,17 +242,17 @@ $(document).ready(function () { 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(); - OSM.route("/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(); var precision = zoomPrecision(map.getZoom()); OSM.route("/search?query=" + encodeURIComponent( map.getCenter().lat.toFixed(precision) + "," + map.getCenter().lng.toFixed(precision))); }); - });