//= require jquery.simulate
OSM.Query = function(map) {
- var queryButton = $(".control-query .control-button"),
+ var protocol = document.location.protocol === "https:" ? "https:" : "http:",
+ url = protocol + OSM.OVERPASS_URL,
+ queryButton = $(".control-query .control-button"),
uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
marker;
if (queryButton.hasClass("disabled")) return;
if (queryButton.hasClass("active")) {
- disableQueryMode();
-
- OSM.router.route("/");
+ if ($("#content").hasClass("overlay-sidebar")) {
+ disableQueryMode();
+ }
} else {
enableQueryMode();
}
if (geometry) map.removeLayer(geometry);
$(this).removeClass("selected");
})
- .on("click", ".query-results li.query-result", function (e) {
- if (!$(e.target).is('a')) {
- $(this).find("a").simulate("click", e);
- }
+ .on("mousedown", ".query-results li.query-result", function (e) {
+ var moved = false;
+ $(this).one("click", function (e) {
+ if (!moved) {
+ var geometry = $(this).data("geometry")
+ if (geometry) map.removeLayer(geometry);
+
+ if (!$(e.target).is('a')) {
+ $(this).find("a").simulate("click", e);
+ }
+ }
+ }).one("mousemove", function () {
+ moved = true;
+ });
});
function interestingFeature(feature, origin, radius) {
}
$section.data("ajax", $.ajax({
- url: OSM.OVERPASS_URL,
+ url: url,
method: "POST",
data: {
data: "[timeout:5][out:json];" + query,
$section.find(".loader").stopTime("loading").hide();
$("<li>")
- .text(I18n.t("javascripts.query." + status, { server: OSM.OVERPASS_URL, error: error }))
+ .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
.appendTo($ul);
}
}));