//= require_self
//= require leaflet.sidebar
+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/src/L.Control.Locate
//= require leaflet.locate
//= require leaflet.layers
//= require leaflet.key
//= require index/changeset
//= require index/query
//= require router
-//= require bowser
+//= require qs/dist/qs
$(document).ready(function () {
var loaderTimeout;
var map = new L.OSM.Map("map", {
zoomControl: false,
layerControl: false,
- contextmenu: true
+ contextmenu: true,
+ worldCopyJump: true
});
- OSM.loadSidebarContent = function(path, callback) {
+ OSM.loadSidebarContent = function (path, callback) {
+ var content_path = path;
+
map.setSidebarOverlaid(false);
clearTimeout(loaderTimeout);
- loaderTimeout = setTimeout(function() {
+ 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";
+ if (content_path.indexOf("?") >= 0) {
+ content_path += "&xhr=1";
} else {
- path += "?xhr=1";
+ content_path += "?xhr=1";
}
$("#sidebar_content")
.empty();
$.ajax({
- url: path,
+ url: content_path,
dataType: "html",
- complete: function(xhr) {
+ complete: function (xhr) {
clearTimeout(loaderTimeout);
$("#flash").empty();
$("#sidebar_loader").hide();
}
});
- var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
-
- L.OSM.zoom({position: position})
+ var sidebar = L.OSM.sidebar("#map-ui")
.addTo(map);
- 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")
- }
- }).addTo(map);
+ var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
- var locateContainer = locate.getContainer();
+ function addControlGroup(controls) {
+ controls.forEach(function (control) {
+ control.addTo(map);
+ });
- $(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 firstContainer = controls[0].getContainer();
+ $(firstContainer).find(".control-button").first()
+ .addClass("control-button-first");
- var sidebar = L.OSM.sidebar("#map-ui")
- .addTo(map);
+ 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);
}
var placement = $("html").attr("dir") === "rtl" ? "right" : "left";
- $(".leaflet-control .control-button").tooltip({placement: placement, container: "body"});
+ $(".leaflet-control .control-button").tooltip({ placement: placement, 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") {
+ if (Cookies.get("_osm_welcome") !== "hide") {
$(".welcome").addClass("visible");
}
- $(".welcome .close-wrap").on("click", function() {
+ $(".welcome .btn-close").on("click", function () {
$(".welcome").removeClass("visible");
- $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+ Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
});
var bannerExpiry = new Date();
bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
- $("#banner .close-wrap").on("click", function(e) {
+ $("#banner .btn-close").on("click", function (e) {
var cookieId = e.target.id;
$("#banner").hide();
e.preventDefault();
if (cookieId) {
- $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+ Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" });
}
});
- if (OSM.PIWIK) {
+ 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);
}
}
});
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);
- L.marker(center, {icon: OSM.getUserIcon()}).addTo(map);
+ L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);
});
function remoteEditHandler(bbox, object) {
- var loaded = false,
- url,
+ 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 (location.protocol === "http" ||
- bowser.check({chrome: "53", firefox: "55"})) {
- url = "http://127.0.0.1:8111/load_and_zoom?";
- } else {
- url = "https://127.0.0.1:8112/load_and_zoom?";
- }
+ 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));
+ }
+ });
- if (object) query.select = object.type + object.id;
+ function sendRemoteEditCommand(url, callback) {
+ var iframe = $("<iframe>");
+ var timeoutId = setTimeout(function () {
+ alert(I18n.t("site.index.remote_failed"));
+ iframe.remove();
+ }, 5000);
- var iframe = $("<iframe>")
+ iframe
.hide()
.appendTo("body")
- .attr("src", url + querystring.stringify(query))
- .on("load", function() {
- $(this).remove();
- loaded = true;
+ .attr("src", url)
+ .on("load", function () {
+ clearTimeout(timeoutId);
+ iframe.remove();
+ if (callback) callback();
});
-
- 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();
})
.tooltip("show");
- $("body").one("click", function() {
+ $("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");
};
- 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, 10)}, 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 () {
});
}
});
+
+ $(".colour-preview-box").each(function () {
+ $(this).css("background-color", $(this).data("colour"));
+ });
}
- page.unload = function() {
+ page.unload = function () {
map.removeObject();
};
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"),
+ "/way/:id(/history)": OSM.Browse(map, "way"),
+ "/relation/:id(/history)": OSM.Browse(map, "relation"),
+ "/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()) {
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();
+ }
+ });
+
+ $(document).on("click", "#sidebar_content .btn-close", function () {
+ OSM.router.route("/" + OSM.formatHash(map));
});
});
projects / rails.git / blobdiff