X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ca781ac75e7b4627a2c2ccdf7aee84c4771b759..7a81258ddc7ece9e9f641083acfbc555bdedc009:/app/assets/javascripts/index.js
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2a704f724..6584864d5 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,88 +5,132 @@
//= require leaflet.key
//= require leaflet.note
//= require leaflet.share
+//= require leaflet.polyline
+//= require leaflet.query
+//= require leaflet.contextmenu
+//= require index/contextmenu
//= 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
+//= require querystring
$(document).ready(function () {
- var params = OSM.mapParams();
+ var querystring = require("querystring-component");
+
+ var loaderTimeout;
- var map = L.map("map", {
+ var map = new L.OSM.Map("map", {
zoomControl: false,
- layerControl: false
+ layerControl: false,
+ contextmenu: true
});
- 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;
+ OSM.loadSidebarContent = function (path, callback) {
+ var content_path = path;
+
+ 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 (content_path.indexOf("?") >= 0) {
+ content_path += "&xhr=1";
+ } else {
+ content_path += "?xhr=1";
}
- }
- map.noteLayer = new L.LayerGroup();
- map.noteLayer.options = {code: 'N'};
+ $("#sidebar_content")
+ .empty();
+
+ $.ajax({
+ url: content_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.attributionControl.setPrefix("");
- map.dataLayer = new L.OSM.DataLayer(null);
- map.dataLayer.options.code = 'D';
+ map.updateLayers(params.layers);
- $("#sidebar").on("opened closed", function () {
- map.invalidateSize();
+ 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';
+ var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
- L.OSM.zoom({position: position})
+ L.OSM.zoom({ position: position })
.addTo(map);
- L.control.locate({
+ var locate = L.control.locate({
position: position,
+ icon: "icon geolocate",
+ iconLoading: "icon geolocate",
strings: {
- title: I18n.t('javascripts.map.locate.title'),
- popup: I18n.t('javascripts.map.locate.popup')
+ title: I18n.t("javascripts.map.locate.title"),
+ metersUnit: I18n.t("javascripts.map.locate.metersUnit"),
+ feetUnit: I18n.t("javascripts.map.locate.feetUnit"),
+ popup: I18n.t("javascripts.map.locate.popup")
}
}).addTo(map);
- var sidebar = L.OSM.sidebar('#map-ui')
+ var locateContainer = locate.getContainer();
+
+ $(locateContainer)
+ .removeClass("leaflet-control-locate leaflet-bar")
+ .addClass("control-locate")
+ .children("a")
+ .attr("href", "#")
+ .removeClass("leaflet-bar-part leaflet-bar-part-single")
+ .addClass("control-button");
+
+ var sidebar = L.OSM.sidebar("#map-ui")
.addTo(map);
L.OSM.layers({
position: position,
- layers: layers,
+ layers: map.baseLayers,
sidebar: sidebar
}).addTo(map);
@@ -96,9 +140,9 @@ $(document).ready(function () {
}).addTo(map);
L.OSM.share({
- position: position,
- sidebar: sidebar,
- short: true
+ "position": position,
+ "sidebar": sidebar,
+ "short": true
}).addTo(map);
L.OSM.note({
@@ -106,88 +150,256 @@ $(document).ready(function () {
sidebar: sidebar
}).addTo(map);
+ L.OSM.query({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
+
L.control.scale()
.addTo(map);
- $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
+ OSM.initializeContextMenu(map);
- map.on('moveend layeradd layerremove', updateLocation);
+ 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);
+ }
- var marker = L.marker([0, 0], {icon: getUserIcon()});
+ OSM.initializeBrowse(map);
+ if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+ map.addLayer(map.dataLayer);
+ }
- if (!params.object_zoom) {
- if (params.bounds) {
- map.fitBounds(params.bounds);
- } else {
- map.setView([params.lat, params.lon], params.zoom);
+ if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+ map.addLayer(map.gpsLayer);
}
}
- 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").addClass("visible");
}
- if (params.marker) {
- marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+ $(".welcome .close-wrap").on("click", function () {
+ $(".welcome").removeClass("visible");
+ $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+ });
+
+ var bannerExpiry = new Date();
+ bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+
+ $("#banner .close-wrap").on("click", function (e) {
+ var cookieId = e.target.id;
+ $("#banner").hide();
+ e.preventDefault();
+ if (cookieId) {
+ $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+ }
+ });
+
+ 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 (params.object) {
- map.addObject(params.object, { zoom: params.object_zoom });
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
+ } else {
+ map.setView([params.lat, params.lon], params.zoom);
}
- $("#homeanchor").on("click", function(e) {
+ if (params.marker) {
+ L.marker([params.mlat, params.mlon]).addTo(map);
+ }
+
+ $("#homeanchor").on("click", function (e) {
e.preventDefault();
var data = $(this).data(),
- center = L.latLng(data.lat, data.lon);
+ center = L.latLng(data.lat, data.lon);
map.setView(center, data.zoom);
- marker.setLatLng(center).addTo(map);
+ L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);
});
- $("a[data-editor=remote]").click(function(e) {
- remoteEditHandler(map.getBounds());
- e.preventDefault();
- });
-
- if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
- remoteEditHandler(map.getBounds());
+ function remoteEditHandler(bbox, object) {
+ var loaded = false,
+ url,
+ query = {
+ left: bbox.getWest() - 0.0001,
+ top: bbox.getNorth() + 0.0001,
+ right: bbox.getEast() + 0.0001,
+ bottom: bbox.getSouth() - 0.0001
+ };
+
+ url = "http://127.0.0.1:8111/load_and_zoom?";
+
+ if (object) query.select = object.type + object.id;
+
+ var iframe = $("