X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6619b777e353cbdfdcc6f7ac0e77f8bca9f78656..e2aef40437767e779f97a7447de69b4540839ff5:/app/assets/javascripts/index.js?ds=sidebyside
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d50253318..085b615c7 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,238 +1,359 @@
//= require_self
+//= require leaflet.sidebar
+//= require leaflet.locate
//= require leaflet.layers
-//= require leaflet.share
+//= require leaflet.key
//= require leaflet.note
-//= require leaflet.locate
-//= require leaflet.customzoom
+//= require leaflet.share
+//= require leaflet.polyline
+//= require leaflet.query
+//= require index/search
//= require index/browse
//= require index/export
-//= require index/key
//= require index/notes
-
-var map, layers; // TODO: remove globals
+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require index/directions
+//= require index/changeset
+//= require index/query
+//= require router
$(document).ready(function () {
- var marker;
+ var loaderTimeout;
+
+ OSM.loadSidebarContent = function(path, callback) {
+ map.setSidebarOverlaid(false);
+
+ 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(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();
+ }
+ }
+ });
+ };
+
var params = OSM.mapParams();
- map = L.map("map", {
+ var map = new L.OSM.Map("map", {
zoomControl: false,
layerControl: false
});
map.attributionControl.setPrefix('');
- layers = [{
- layer: new L.OSM.Mapnik({
- attribution: ''
- }),
- keyid: "mapnik",
- layerCode: "M",
- name: I18n.t("javascripts.map.base.standard")
- }, {
- layer: new L.OSM.CycleMap({
- attribution: "Tiles courtesy of Andy Allan",
- }),
- keyid: "cyclemap",
- layerCode: "C",
- name: I18n.t("javascripts.map.base.cycle_map")
- }, {
- layer: new L.OSM.TransportMap({
- attribution: "Tiles courtesy of Andy Allan",
- }),
- keyid: "transportmap",
- layerCode: "T",
- name: I18n.t("javascripts.map.base.transport_map")
- }, {
- layer: new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest ",
- }),
- keyid: "mapquest",
- layerCode: "Q",
- name: I18n.t("javascripts.map.base.mapquest")
- }];
-
- layers[0].layer.addTo(map);
-
- $("#map").on("resized", function () {
- map.invalidateSize();
+ map.updateLayers(params.layers);
+
+ map.on("baselayerchange", function (e) {
+ if (map.getZoom() > e.layer.options.maxZoom) {
+ map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+ }
});
- L.control.customZoom({position: 'topright'})
+ var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+ L.OSM.zoom({position: position})
.addTo(map);
- L.OSM.layers({position: 'topright', layers: layers})
+ 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.control.share({
- getUrl: getShortUrl
+ L.OSM.layers({
+ position: position,
+ layers: map.baseLayers,
+ sidebar: sidebar
}).addTo(map);
- L.control.note({
- position: 'topright'
+ L.OSM.key({
+ position: position,
+ sidebar: sidebar
}).addTo(map);
- L.control.locate({
- position: 'topright'
+ L.OSM.share({
+ position: position,
+ sidebar: sidebar,
+ short: true
}).addTo(map);
- L.control.scale().addTo(map);
+ L.OSM.note({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
- map.on("moveend layeradd layerremove", updateLocation);
+ L.OSM.query({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
- if (!params.object_zoom) {
- if (params.bbox) {
- var bbox = L.latLngBounds([params.minlat, params.minlon],
- [params.maxlat, params.maxlon]);
+ L.control.scale()
+ .addTo(map);
- map.fitBounds(bbox);
+ if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
+ OSM.initializeNotes(map);
+ if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+ map.addLayer(map.noteLayer);
+ }
- if (params.box) {
- L.rectangle(bbox, {
- weight: 2,
- color: '#e90',
- fillOpacity: 0
- }).addTo(map);
- }
- } else {
- map.setView([params.lat, params.lon], params.zoom);
+ OSM.initializeBrowse(map);
+ if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+ map.addLayer(map.dataLayer);
}
}
- if (params.layers) {
- setMapLayers(params.layers);
- }
+ var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
+ $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'});
- if (params.marker) {
- marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
- }
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
- if (params.object) {
- addObjectToMap(params.object, map, { zoom: params.object_zoom });
- }
+ map.on('moveend layeradd layerremove', function() {
+ updateLinks(
+ map.getCenter().wrap(),
+ map.getZoom(),
+ map.getLayersCode(),
+ map._object);
- handleResize();
+ $.removeCookie("_osm_location");
+ $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+ });
- $("body").on("click", "a.set_position", function (e) {
- e.preventDefault();
+ if ($.cookie('_osm_welcome') === 'hide') {
+ $('.welcome').hide();
+ }
- var data = $(this).data();
- var centre = L.latLng(data.lat, data.lon);
+ $('.welcome .close').on('click', function() {
+ $('.welcome').hide();
+ $.cookie("_osm_welcome", 'hide', { expires: expiry });
+ });
- 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);
- }
+ if (OSM.PIWIK) {
+ map.on('layeradd', function (e) {
+ if (e.layer.options) {
+ var goal = OSM.PIWIK.goals[e.layer.options.keyid];
- if (data.type && data.id) {
- addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
- }
+ if (goal) {
+ $('body').trigger('piwikgoal', goal);
+ }
+ }
+ });
+ }
- if (marker) {
- map.removeLayer(marker);
- }
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
+ } else {
+ map.setView([params.lat, params.lon], params.zoom);
+ }
- marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
- });
+ var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
- function updateLocation() {
- var center = map.getCenter().wrap();
- var zoom = map.getZoom();
- var layers = getMapLayers();
- var extents = map.getBounds().wrap();
+ if (params.marker) {
+ marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+ }
- updatelinks(center, zoom, layers, extents, params.object);
+ $("#homeanchor").on("click", function(e) {
+ e.preventDefault();
- var expiry = new Date();
- expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
- }
+ var data = $(this).data(),
+ center = L.latLng(data.lat, data.lon);
- function remoteEditHandler() {
- var extent = map.getBounds();
- var loaded = false;
+ map.setView(center, data.zoom);
+ marker.setLatLng(center).addTo(map);
+ });
- $("#linkloader").load(function () { loaded = true; });
- $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" +
- querystring.stringify({
- left: extent.getWest(),
- bottom: extent.getSouth(),
- right: extent.getEast(),
- top: extent.getNorth()
- }));
+ function remoteEditHandler(bbox, object) {
+ var loaded = false,
+ url = document.location.protocol === "https:" ?
+ "https://127.0.0.1:8112/load_and_zoom?" :
+ "http://127.0.0.1:8111/load_and_zoom?",
+ query = {
+ left: bbox.getWest() - 0.0001,
+ top: bbox.getNorth() + 0.0001,
+ right: bbox.getEast() + 0.0001,
+ bottom: bbox.getSouth() - 0.0001
+ };
+
+ if (object) query.select = object.type + object.id;
+
+ var iframe = $('