//= require_self
//= require leaflet.sidebar
+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
//= require leaflet.locate
//= require leaflet.layers
//= require leaflet.key
//= require leaflet.polyline
//= require leaflet.query
//= require leaflet.contextmenu
+//= require index/contextmenu
//= require index/search
-//= require index/browse
+//= require index/layers/data
//= require index/export
-//= require index/notes
+//= require index/layers/notes
//= require index/history
//= require index/note
//= require index/new_note
//= require index/changeset
//= require index/query
//= require router
+//= require qs/dist/qs
$(document).ready(function () {
- var loaderTimeout;
+ var map = new L.OSM.Map("map", {
+ zoomControl: false,
+ layerControl: false,
+ contextmenu: true,
+ worldCopyJump: true
+ });
- OSM.loadSidebarContent = function(path, callback) {
- map.setSidebarOverlaid(false);
+ OSM.loadSidebarContent = function (path, callback) {
+ var content_path = path;
- clearTimeout(loaderTimeout);
+ map.setSidebarOverlaid(false);
- loaderTimeout = setTimeout(function() {
- $('#sidebar_loader').show();
- }, 200);
+ $("#sidebar_loader").show().addClass("delayed-fade-in");
// 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';
+ if (content_path.indexOf("?") >= 0) {
+ content_path += "&xhr=1";
} else {
- path += '?xhr=1';
+ content_path += "?xhr=1";
}
- $('#sidebar_content')
+ $("#sidebar_content")
.empty();
$.ajax({
- url: path,
+ url: content_path,
dataType: "html",
- complete: function(xhr) {
- clearTimeout(loaderTimeout);
- $('#flash').empty();
- $('#sidebar_loader').hide();
+ complete: function (xhr) {
+ $("#flash").empty();
+ $("#sidebar_loader").removeClass("delayed-fade-in").hide();
var content = $(xhr.responseText);
- if (xhr.getResponseHeader('X-Page-Title')) {
- var title = xhr.getResponseHeader('X-Page-Title');
+ if (xhr.getResponseHeader("X-Page-Title")) {
+ var title = xhr.getResponseHeader("X-Page-Title");
document.title = decodeURIComponent(title);
}
- $('head')
- .find('link[type="application/atom+xml"]')
+ $("head")
+ .find("link[type=\"application/atom+xml\"]")
.remove();
- $('head')
- .append(content.filter('link[type="application/atom+xml"]'));
+ $("head")
+ .append(content.filter("link[type=\"application/atom+xml\"]"));
- $('#sidebar_content').html(content.not('link[type="application/atom+xml"]'));
+ $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]"));
if (callback) {
callback();
var params = OSM.mapParams();
- // TODO consider using a separate js file for the context menu additions
- var context_describe = function(e){
- var precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.route("/search?query=" + encodeURIComponent(
- e.latlng.lat.toFixed(precision) + "," + e.latlng.lng.toFixed(precision)
- ));
- };
-
- var context_directionsfrom = function(e){
- var precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.route("/directions?" + querystring.stringify({
- route: e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision) + ';' + $('#route_to').val()
- }));
- }
-
- var context_directionsto = function(e){
- var precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.route("/directions?" + querystring.stringify({
- route: $('#route_from').val() + ';' + e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision)
- }));
- }
-
- var context_addnote = function(e){
- // TODO this currently doesn't work correctly - I think the "route" needs to be chained to ensure it comes once the pan has finished.
- map.panTo(e.latlng, {animate: false});
- OSM.router.route('/note/new');
- }
-
- var context_centrehere = function(e){
- map.panTo(e.latlng);
- }
-
- // TODO internationalisation of the context menu strings
- var map = new L.OSM.Map("map", {
- zoomControl: false,
- layerControl: false,
- contextmenu: true,
- contextmenuWidth: 140,
- contextmenuItems: [{
- text: 'Directions from here',
- callback: context_directionsfrom
- }, {
- text: 'Directions to here',
- callback: context_directionsto
- }, '-', {
- text: 'Add a note here',
- callback: context_addnote
- }, {
- text: 'Show address',
- callback: context_describe
- }, {
- text: 'Centre map here',
- callback: context_centrehere
- }]
- });
-
- map.attributionControl.setPrefix('');
+ map.attributionControl.setPrefix("");
map.updateLayers(params.layers);
}
});
- var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
-
- L.OSM.zoom({position: position})
+ var sidebar = L.OSM.sidebar("#map-ui")
.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 position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
- var sidebar = L.OSM.sidebar('#map-ui')
- .addTo(map);
+ function addControlGroup(controls) {
+ controls.forEach(function (control) {
+ control.addTo(map);
+ });
+
+ var firstContainer = controls[0].getContainer();
+ $(firstContainer).find(".control-button").first()
+ .addClass("control-button-first");
+
+ var lastContainer = controls[controls.length - 1].getContainer();
+ $(lastContainer).find(".control-button").last()
+ .addClass("control-button-last");
+ }
- L.OSM.layers({
- position: position,
- layers: map.baseLayers,
- sidebar: sidebar
- }).addTo(map);
-
- L.OSM.key({
- position: position,
- sidebar: sidebar
- }).addTo(map);
-
- L.OSM.share({
- position: position,
- sidebar: sidebar,
- short: true
- }).addTo(map);
-
- L.OSM.note({
- position: position,
- sidebar: sidebar
- }).addTo(map);
-
- L.OSM.query({
- position: position,
- sidebar: sidebar
- }).addTo(map);
+ addControlGroup([
+ L.OSM.zoom({ position: position }),
+ L.OSM.locate({ position: position })
+ ]);
+
+ addControlGroup([
+ L.OSM.layers({
+ position: position,
+ layers: map.baseLayers,
+ sidebar: sidebar
+ }),
+ L.OSM.key({
+ position: position,
+ sidebar: sidebar
+ }),
+ L.OSM.share({
+ "position": position,
+ "sidebar": sidebar,
+ "short": true
+ })
+ ]);
+
+ addControlGroup([
+ L.OSM.note({
+ position: position,
+ sidebar: sidebar
+ })
+ ]);
+
+ addControlGroup([
+ L.OSM.query({
+ position: position,
+ sidebar: sidebar
+ })
+ ]);
L.control.scale()
.addTo(map);
- if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
- OSM.initializeNotes(map);
+ OSM.initializeContextMenu(map);
+
+ if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
+ OSM.initializeNotesLayer(map);
if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
map.addLayer(map.noteLayer);
}
- OSM.initializeBrowse(map);
+ OSM.initializeDataLayer(map);
if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
map.addLayer(map.dataLayer);
}
+
+ if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+ map.addLayer(map.gpsLayer);
+ }
}
- var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
- $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'});
+ $(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
- map.on('moveend layeradd layerremove', function() {
+ 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: "/" });
+ Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" });
});
- if ($.cookie('_osm_welcome') === 'hide') {
- $('.welcome').hide();
+ if (Cookies.get("_osm_welcome") !== "hide") {
+ $(".welcome").removeAttr("hidden");
}
- $('.welcome .close').on('click', function() {
- $('.welcome').hide();
- $.cookie("_osm_welcome", 'hide', { expires: expiry });
+ $(".welcome .btn-close").on("click", function () {
+ $(".welcome").hide();
+ Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
});
- if (OSM.PIWIK) {
- map.on('layeradd', function (e) {
+ var bannerExpiry = new Date();
+ bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+
+ $("#banner .btn-close").on("click", function (e) {
+ var cookieId = e.target.id;
+ $("#banner").hide();
+ e.preventDefault();
+ if (cookieId) {
+ Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" });
+ }
+ });
+
+ if (OSM.MATOMO) {
+ map.on("layeradd", function (e) {
if (e.layer.options) {
- var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+ var goal = OSM.MATOMO.goals[e.layer.options.keyid];
if (goal) {
- $('body').trigger('piwikgoal', goal);
+ $("body").trigger("matomogoal", goal);
}
}
});
map.setView([params.lat, params.lon], params.zoom);
}
- var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
-
if (params.marker) {
- marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+ L.marker([params.mlat, params.mlon]).addTo(map);
}
- $("#homeanchor").on("click", function(e) {
+ $("#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);
});
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?",
+ var remoteEditHost = "http://127.0.0.1:8111",
+ osmHost = location.protocol + "//" + location.host,
query = {
left: bbox.getWest() - 0.0001,
top: bbox.getNorth() + 0.0001,
bottom: bbox.getSouth() - 0.0001
};
- if (object) query.select = object.type + object.id;
+ if (object && object.type !== "note") query.select = object.type + object.id; // can't select notes
+ sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + Qs.stringify(query), function () {
+ if (object && object.type === "note") {
+ var noteQuery = { url: osmHost + OSM.apiUrl(object) };
+ sendRemoteEditCommand(remoteEditHost + "/import?" + Qs.stringify(noteQuery));
+ }
+ });
- var iframe = $('<iframe>')
- .hide()
- .appendTo('body')
- .attr("src", url + querystring.stringify(query))
- .on('load', function() {
- $(this).remove();
- loaded = true;
+ function sendRemoteEditCommand(url, callback) {
+ fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) })
+ .then(callback)
+ .catch(function () {
+ alert(I18n.t("site.index.remote_failed"));
});
-
- setTimeout(function () {
- if (!loaded) {
- alert(I18n.t('site.index.remote_failed'));
- iframe.remove();
- }
- }, 1000);
+ }
return false;
}
- $("a[data-editor=remote]").click(function(e) {
+ $("a[data-editor=remote]").click(function (e) {
var params = OSM.mapParams(this.search);
remoteEditHandler(map.getBounds(), params.object);
e.preventDefault();
});
if (OSM.params().edit_help) {
- $('#editanchor')
- .removeAttr('title')
+ $("#editanchor")
+ .removeAttr("title")
.tooltip({
- placement: 'bottom',
- title: I18n.t('javascripts.edit_help')
+ placement: "bottom",
+ title: I18n.t("javascripts.edit_help")
})
- .tooltip('show');
+ .tooltip("show");
- $('body').one('click', function() {
- $('#editanchor').tooltip('hide');
+ $("body").one("click", function () {
+ $("#editanchor").tooltip("hide");
});
}
- OSM.Index = function(map) {
+ OSM.Index = function (map) {
var page = {};
- page.pushstate = page.popstate = function() {
+ page.pushstate = page.popstate = function () {
map.setSidebarOverlaid(true);
- document.title = I18n.t('layouts.project_name.title');
+ document.title = I18n.t("layouts.project_name.title");
};
- page.load = function() {
- var params = querystring.parse(location.search.substring(1));
+ page.load = function () {
+ var params = Qs.parse(location.search.substring(1));
if (params.query) {
$("#sidebar .search_form input[name=query]").value(params.query);
}
return page;
};
- OSM.Browse = function(map, type) {
+ OSM.Browse = function (map, type) {
var page = {};
- page.pushstate = page.popstate = function(path, id) {
- OSM.loadSidebarContent(path, function() {
+ page.pushstate = page.popstate = function (path, id) {
+ OSM.loadSidebarContent(path, function () {
addObject(type, id);
});
};
- page.load = function(path, id) {
+ page.load = function (path, id) {
addObject(type, id, true);
};
function addObject(type, id, center) {
- map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+ map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {
if (!window.location.hash && bounds.isValid() &&
(center || !map.getBounds().contains(bounds))) {
OSM.router.withoutMoveListener(function () {
});
}
- page.unload = function() {
+ page.unload = function () {
map.removeObject();
};
return page;
};
+ OSM.OldBrowse = function () {
+ var page = {};
+
+ page.pushstate = page.popstate = function (path) {
+ OSM.loadSidebarContent(path);
+ };
+
+ return page;
+ };
+
var history = OSM.History(map);
OSM.router = OSM.Router(map, {
- "/": OSM.Index(map),
- "/search": OSM.Search(map),
- "/directions": OSM.Directions(map),
- "/export": OSM.Export(map),
- "/note/new": OSM.NewNote(map),
- "/history/friends": history,
- "/history/nearby": history,
- "/history": history,
+ "/": OSM.Index(map),
+ "/search": OSM.Search(map),
+ "/directions": OSM.Directions(map),
+ "/export": OSM.Export(map),
+ "/note/new": OSM.NewNote(map),
+ "/history/friends": history,
+ "/history/nearby": history,
+ "/history": history,
"/user/:display_name/history": history,
- "/note/:id": OSM.Note(map),
- "/node/:id(/history)": OSM.Browse(map, 'node'),
- "/way/:id(/history)": OSM.Browse(map, 'way'),
- "/relation/:id(/history)": OSM.Browse(map, 'relation'),
- "/changeset/:id": OSM.Changeset(map),
- "/query": OSM.Query(map)
+ "/note/:id": OSM.Note(map),
+ "/node/:id(/history)": OSM.Browse(map, "node"),
+ "/node/:id/history/:version": OSM.OldBrowse(),
+ "/way/:id(/history)": OSM.Browse(map, "way"),
+ "/way/:id/history/:version": OSM.OldBrowse(),
+ "/relation/:id(/history)": OSM.Browse(map, "relation"),
+ "/relation/:id/history/:version": OSM.OldBrowse(),
+ "/changeset/:id": OSM.Changeset(map),
+ "/query": OSM.Query(map)
});
if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
OSM.router.load();
- $(document).on("click", "a", function(e) {
- if (e.isDefaultPrevented() || e.isPropagationStopped())
+ $(document).on("click", "a", function (e) {
+ if (e.isDefaultPrevented() || e.isPropagationStopped() || $(e.target).data("turbo")) {
return;
+ }
// Open links in a new tab as normal.
- if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+ if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) {
return;
+ }
// Ignore cross-protocol and cross-origin links.
- if (location.protocol !== this.protocol || location.host !== this.host)
+ if (location.protocol !== this.protocol || location.host !== this.host) {
return;
+ }
- if (OSM.router.route(this.pathname + this.search + this.hash))
+ if (OSM.router.route(this.pathname + this.search + this.hash)) {
e.preventDefault();
+ if (this.pathname !== "/directions") {
+ $("header").addClass("closed");
+ }
+ }
+ });
+
+ $(document).on("click", "#sidebar_content .btn-close", function () {
+ OSM.router.route("/" + OSM.formatHash(map));
});
});
projects / rails.git / blobdiff