X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d5b81094c69a02782faead1528ef32ffcc48aea..6adcce4e5d75fa21dea85742fa36ee3b97247b01:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 7988541a6..d84b8ae24 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,11 +1,11 @@ //= require_self //= require leaflet.sidebar -//= require leaflet.customzoom //= require leaflet.locate //= require leaflet.layers //= require leaflet.key //= require leaflet.note //= require leaflet.share +//= require index/search //= require index/browse //= require index/export //= require index/notes @@ -20,125 +20,173 @@ $(document).ready(function () { 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: '', + attribution: copyright, code: "M", keyid: "mapnik", name: I18n.t("javascripts.map.base.standard") }), new L.OSM.CycleMap({ - attribution: "Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", code: "C", keyid: "cyclemap", name: I18n.t("javascripts.map.base.cycle_map") }), new L.OSM.TransportMap({ - attribution: "Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", code: "T", keyid: "transportmap", name: I18n.t("javascripts.map.base.transport_map") }), new L.OSM.MapQuestOpen({ - attribution: "Tiles courtesy of MapQuest ", + 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") }) ]; - layers[0].addTo(map); + 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.on("baselayerchange", function (e) { + if (map.getZoom() > e.layer.options.maxZoom) { + map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true }); + } + }); + + map.noteLayer = new L.LayerGroup(); + map.noteLayer.options = {code: 'N'}; - map.noteLayer = new L.LayerGroup({code: 'N'}); map.dataLayer = new L.OSM.DataLayer(null); + map.dataLayer.options.code = 'D'; - $("#map").on("resized", function () { + $("#sidebar").on("opened closed", function () { map.invalidateSize(); }); - L.control.customZoom({position: 'topright'}) - .addTo(map); + var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; - L.control.locate({position: 'topright'}) + L.OSM.zoom({position: position}) .addTo(map); - var sidebar = L.OSM.sidebar('#map-ui'); + L.control.locate({ + position: position, + strings: { + title: I18n.t('javascripts.map.locate.title'), + popup: I18n.t('javascripts.map.locate.popup') + } + }).addTo(map); + + var sidebar = L.OSM.sidebar('#map-ui') + .addTo(map); L.OSM.layers({ - position: 'topright', + position: position, layers: layers, sidebar: sidebar }).addTo(map); L.OSM.key({ - position: 'topright', + position: position, sidebar: sidebar }).addTo(map); L.OSM.share({ - getShortUrl: getShortUrl, - getUrl: getUrl, + position: position, sidebar: sidebar, short: true }).addTo(map); L.OSM.note({ - position: 'topright', + position: position, sidebar: sidebar }).addTo(map); L.control.scale() .addTo(map); + $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'}); + map.on('moveend layeradd layerremove', updateLocation); - map.markerLayer = L.layerGroup().addTo(map); + if (OSM.PIWIK) { + map.on('layeradd', function (e) { + if (e.layer.options) { + var goal = OSM.PIWIK.goals[e.layer.options.keyid]; - if (!params.object_zoom) { - if (params.bbox) { - var bbox = L.latLngBounds([params.minlat, params.minlon], - [params.maxlat, params.maxlon]); - - map.fitBounds(bbox); - - if (params.box) { - L.rectangle(bbox, { - weight: 2, - color: '#e90', - fillOpacity: 0 - }).addTo(map); + if (goal) { + $('body').trigger('piwikgoal', goal); + } } + }); + } + + 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.layers) { - var foundLayer = false; - for (var i = 0; i < layers.length; i++) { - if (params.layers.indexOf(layers[i].options.code) >= 0) { - map.addLayer(layers[i]); - foundLayer = true; - } else { - map.removeLayer(layers[i]); - } - } - if (!foundLayer) { - map.addLayer(layers[0]); - } + if (params.box) { + L.rectangle(params.box, { + weight: 2, + color: '#e90', + fillOpacity: 0 + }).addTo(map); } if (params.marker) { - L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer); + marker.setLatLng([params.mlat, params.mlon]).addTo(map); } if (params.object) { - addObjectToMap(params.object, map, { zoom: params.object_zoom }); + map.addObject(params.object, { zoom: params.object_zoom }); } - handleResize(); + $("#homeanchor").on("click", function(e) { + e.preventDefault(); + + var data = $(this).data(), + center = L.latLng(data.lat, data.lon); - $("body").on("click", "a.set_position", setPositionLink(map)); + map.setView(center, data.zoom); + marker.setLatLng(center).addTo(map); + }); $("a[data-editor=remote]").click(function(e) { remoteEditHandler(map.getBounds()); @@ -149,73 +197,36 @@ $(document).ready(function () { remoteEditHandler(map.getBounds()); } - $(window).resize(handleResize); - - $("#search_form").submit(submitSearch(map)); - - - if ($("#query").val()) { - $("#search_form").submit(); - } - - // Focus the search field for browsers that don't support - // the HTML5 'autofocus' attribute - if (!("autofocus" in document.createElement("input"))) { - $("#query").focus(); + if (OSM.params().edit_help) { + $('#editanchor') + .removeAttr('title') + .tooltip({ + placement: 'bottom', + title: I18n.t('javascripts.edit_help') + }) + .tooltip('show'); + + $('body').one('click', function() { + $('#editanchor').tooltip('hide'); + }); } + initializeSearch(map); initializeExport(map); - initializeBrowse(map); - initializeNotes(map); + initializeBrowse(map, params); + initializeNotes(map, params); }); function updateLocation() { updatelinks(this.getCenter().wrap(), this.getZoom(), this.getLayersCode(), - this.getBounds().wrap(), {}); + this.getBounds().wrap()); var expiry = new Date(); expiry.setYear(expiry.getFullYear() + 10); $.cookie("_osm_location", cookieContent(this), { expires: expiry }); -} - -function setPositionLink(map) { - return function(e) { - var data = $(this).data(), - center = L.latLng(data.lat, data.lon); - - if (data.minLon && data.minLat && data.maxLon && data.maxLat) { - map.fitBounds([[data.minLat, data.minLon], - [data.maxLat, data.maxLon]]); - } else { - map.setView(center, data.zoom); - } - - if (data.type && data.id) { - addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } }); - } - - map.markerLayer.clearLayers(); - L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer); - - return e.preventDefault(); - }; -} -function submitSearch(map) { - return function(e) { - var bounds = map.getBounds(); - - $("#sidebar_title").html(I18n.t('site.sidebar.search_results')); - $("#sidebar_content").load($(this).attr("action"), { - query: $("#query").val(), - minlon: bounds.getWestLng(), - minlat: bounds.getSouthLat(), - maxlon: bounds.getEastLng(), - maxlat: bounds.getNorthLat() - }, openSidebar); - - return e.preventDefault(); - }; + // Trigger hash update on layer changes. + this.hash.onMapMove(); }