X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f598ab412674ce5a78da98c54aa2fe2e4a05792..78d6bde4850a09a7cd9cb5774f394fd64680d664:/app/assets/javascripts/index.js
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 7c80b0108..e46ca6d9d 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,138 +1,179 @@
//= require_self
+//= require leaflet.sidebar
+//= 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/key
//= require index/notes
$(document).ready(function () {
- var permalinks = $("#permalink").detach().html();
- var marker;
var params = OSM.mapParams();
- var map = createMap("map");
- L.control.scale().addTo(map);
+ var map = L.map("map", {
+ zoomControl: false,
+ layerControl: false
+ });
- map.attributionControl.setPrefix(permalinks);
+ 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")
+ })
+ ];
+
+ for (var i = layers.length - 1; i >= 0; i--) {
+ if (i === 0 || params.layers.indexOf(layers[i].options.code) >= 0) {
+ map.addLayer(layers[i]);
+ break;
+ }
+ }
- map.on("moveend baselayerchange", updateLocation);
+ map.noteLayer = new L.LayerGroup();
+ map.noteLayer.options = {code: 'N'};
- if (!params.object_zoom) {
- if (params.bbox) {
- var bbox = L.latLngBounds([params.minlat, params.minlon],
- [params.maxlat, params.maxlon]);
+ map.dataLayer = new L.OSM.DataLayer(null);
+ map.dataLayer.options.code = 'D';
- map.fitBounds(bbox);
+ $("#sidebar").on("opened closed", function () {
+ map.invalidateSize();
+ });
- if (params.box) {
- addBoxToMap(bbox);
- }
- } else {
- map.setView([params.lat, params.lon], params.zoom);
- }
- }
+ var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
- if (params.layers) {
- setMapLayers(params.layers);
- }
+ L.OSM.zoom({position: position})
+ .addTo(map);
- if (params.marker) {
- marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
- }
-
- if (params.object) {
- addObjectToMap(params.object, params.object_zoom);
- }
+ L.control.locate({
+ position: position,
+ strings: {
+ title: I18n.t('javascripts.map.locate.title'),
+ popup: I18n.t('javascripts.map.locate.popup')
+ }
+ }).addTo(map);
- handleResize();
+ var sidebar = L.OSM.sidebar('#map-ui')
+ .addTo(map);
- $("body").on("click", "a.set_position", function (e) {
- e.preventDefault();
+ L.OSM.layers({
+ position: position,
+ layers: layers,
+ sidebar: sidebar
+ }).addTo(map);
- var data = $(this).data();
- var centre = L.latLng(data.lat, data.lon);
+ L.OSM.key({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
- if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
- map.fitBounds([[data.minLat, data.minLon],
- [data.maxLat, data.maxLon]]);
- } else {
- map.setView(centre, data.zoom);
- }
+ L.OSM.share({
+ position: position,
+ sidebar: sidebar,
+ short: true
+ }).addTo(map);
- if (marker) {
- map.removeLayer(marker);
- }
+ L.OSM.note({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
- marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
- });
+ L.control.scale()
+ .addTo(map);
- function updateLocation() {
- var center = map.getCenter().wrap();
- var zoom = map.getZoom();
- var layers = getMapLayers();
- var extents = map.getBounds().wrap();
-
- updatelinks(center.lng,
- center.lat,
- zoom,
- layers,
- extents.getWestLng(),
- extents.getSouthLat(),
- extents.getEastLng(),
- extents.getNorthLat(),
- params.object);
-
- var expiry = new Date();
- expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
- }
+ $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
- function remoteEditHandler() {
- var extent = map.getBounds();
- var loaded = false;
+ map.on('moveend layeradd layerremove', updateLocation);
- $("#linkloader").load(function () { loaded = true; });
- $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng()
- + "&bottom=" + extent.getSouthLat()
- + "&right=" + extent.getEastLng()
- + "&top=" + extent.getNorthLat());
+ var marker = L.marker([0, 0], {icon: getUserIcon()});
- setTimeout(function () {
- if (!loaded) alert(I18n.t('site.index.remote_failed'));
- }, 1000);
+ if (!params.object_zoom) {
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
+ } else {
+ map.setView([params.lat, params.lon], params.zoom);
+ }
+ }
- return false;
+ if (params.box) {
+ L.rectangle(params.box, {
+ weight: 2,
+ color: '#e90',
+ fillOpacity: 0
+ }).addTo(map);
}
- $("a[data-editor=remote]").click(remoteEditHandler);
+ if (params.marker) {
+ marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+ }
- if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
- remoteEditHandler();
+ if (params.object) {
+ map.addObject(params.object, { zoom: params.object_zoom });
}
- $(window).resize(handleResize);
+ $("#homeanchor").on("click", function(e) {
+ e.preventDefault();
- $("#search_form").submit(function () {
- var bounds = map.getBounds();
+ var data = $(this).data(),
+ center = L.latLng(data.lat, data.lon);
- $("#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);
+ map.setView(center, data.zoom);
+ marker.setLatLng(center).addTo(map);
+ });
- return false;
+ $("a[data-editor=remote]").click(function(e) {
+ remoteEditHandler(map.getBounds());
+ e.preventDefault();
});
- if ($("#query").val()) {
- $("#search_form").submit();
+ if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
+ remoteEditHandler(map.getBounds());
}
- // Focus the search field for browsers that don't support
- // the HTML5 'autofocus' attribute
- if (!("autofocus" in document.createElement("input"))) {
- $("#query").focus();
- }
+ initializeSearch(map);
+ initializeExport(map);
+ initializeBrowse(map, params);
+ initializeNotes(map, params);
});
+
+function updateLocation() {
+ updatelinks(this.getCenter().wrap(),
+ this.getZoom(),
+ this.getLayersCode(),
+ this.getBounds().wrap());
+
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
+ $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+
+ // Trigger hash update on layer changes.
+ this.hash.onMapMove();
+}