//= require_self
//= require leaflet.sidebar
-//= require leaflet.locate
+//= require leaflet.locatecontrol/src/L.Control.Locate
//= require leaflet.layers
//= require leaflet.key
//= require leaflet.note
//= 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) {
iconLoading: "icon geolocate",
strings: {
title: I18n.t("javascripts.map.locate.title"),
- popup: I18n.t("javascripts.map.locate.popup")
+ popup: function (options) {
+ return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+ }
}
}).addTo(map);
map._object);
$.removeCookie("_osm_location");
- $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+ $.cookie("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/" });
});
if ($.cookie("_osm_welcome") !== "hide") {
$(".welcome").addClass("visible");
}
- $(".welcome .close-wrap").on("click", function () {
+ $(".welcome .close").on("click", function () {
$(".welcome").removeClass("visible");
- $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+ $.cookie("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/" });
});
var bannerExpiry = new Date();
$("#banner").hide();
e.preventDefault();
if (cookieId) {
- $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+ $.cookie(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/" });
}
});
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?";
- }
+ url = "http://127.0.0.1:8111/load_and_zoom?";
if (object) query.select = object.type + object.id;
var iframe = $("<iframe>")
.hide()
.appendTo("body")
- .attr("src", url + querystring.stringify(query))
+ .attr("src", url + Qs.stringify(query))
.on("load", function () {
$(this).remove();
loaded = true;
};
page.load = function () {
- var params = querystring.parse(location.search.substring(1));
+ var params = Qs.parse(location.search.substring(1));
if (params.query) {
$("#sidebar .search_form input[name=query]").value(params.query);
}
});
}
});
+
+ $(".colour-preview-box").each(function () {
+ $(this).css("background-color", $(this).data("colour"));
+ });
}
page.unload = function () {