X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f9d714dfd36fa56ced4c0a99a6e59c945ff89cca..76d365ce71b942466d07480ded13098860d4f1b3:/app/assets/javascripts/index.js
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 19e1f16de..085b615c7 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,59 +5,89 @@
//= require leaflet.key
//= require leaflet.note
//= require leaflet.share
+//= require leaflet.polyline
+//= require leaflet.query
+//= require index/search
//= require index/browse
//= require index/export
//= require index/notes
+//= 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 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();
- 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 layers = [
- new L.OSM.Mapnik({
- attribution: '',
- code: "M",
- keyid: "mapnik",
- name: I18n.t("javascripts.map.base.standard")
- }),
- new L.OSM.CycleMap({
- attribution: "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",
- code: "T",
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }),
- new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest ",
- code: "Q",
- keyid: "mapquest",
- name: I18n.t("javascripts.map.base.mapquest")
- })
- ];
-
- layers[0].addTo(map);
-
- map.noteLayer = new L.LayerGroup();
- map.noteLayer.options = {code: 'N'};
-
- map.dataLayer = new L.OSM.DataLayer(null);
- map.dataLayer.options.code = 'D';
-
- $("#sidebar").on("opened closed", 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 });
+ }
});
var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
@@ -65,15 +95,20 @@ $(document).ready(function () {
L.OSM.zoom({position: position})
.addTo(map);
- L.control.locate({position: position})
- .addTo(map);
+ 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: position,
- layers: layers,
+ layers: map.baseLayers,
sidebar: sidebar
}).addTo(map);
@@ -93,131 +128,232 @@ $(document).ready(function () {
sidebar: sidebar
}).addTo(map);
+ L.OSM.query({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
+
L.control.scale()
.addTo(map);
- map.on('moveend layeradd layerremove', updateLocation);
-
- map.markerLayer = L.layerGroup().addTo(map);
+ 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.object_zoom) {
- if (params.bounds) {
- map.fitBounds(params.bounds);
- } 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.box) {
- L.rectangle(params.box, {
- weight: 2,
- color: '#e90',
- fillOpacity: 0
- }).addTo(map);
+ var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
+ $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'});
+
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
+
+ map.on('moveend layeradd layerremove', function() {
+ updateLinks(
+ map.getCenter().wrap(),
+ map.getZoom(),
+ map.getLayersCode(),
+ map._object);
+
+ $.removeCookie("_osm_location");
+ $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+ });
+
+ if ($.cookie('_osm_welcome') === 'hide') {
+ $('.welcome').hide();
}
- 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]);
+ $('.welcome .close').on('click', function() {
+ $('.welcome').hide();
+ $.cookie("_osm_welcome", 'hide', { expires: expiry });
+ });
+
+ if (OSM.PIWIK) {
+ map.on('layeradd', function (e) {
+ if (e.layer.options) {
+ var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+
+ if (goal) {
+ $('body').trigger('piwikgoal', goal);
+ }
}
- }
- if (!foundLayer) {
- map.addLayer(layers[0]);
- }
+ });
}
- if (params.marker) {
- L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer);
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
+ } else {
+ map.setView([params.lat, params.lon], params.zoom);
}
- if (params.object) {
- addObjectToMap(params.object, map, { zoom: params.object_zoom });
+ var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
+
+ if (params.marker) {
+ marker.setLatLng([params.mlat, params.mlon]).addTo(map);
}
- $("body").on("click", "a.set_position", setPositionLink(map));
+ $("#homeanchor").on("click", function(e) {
+ e.preventDefault();
- $("a[data-editor=remote]").click(function(e) {
- remoteEditHandler(map.getBounds());
- e.preventDefault();
- });
+ var data = $(this).data(),
+ center = L.latLng(data.lat, data.lon);
- if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
- remoteEditHandler(map.getBounds());
- }
-
- $("#search_form").submit(submitSearch(map));
+ map.setView(center, data.zoom);
+ marker.setLatLng(center).addTo(map);
+ });
+ 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 = $('