//= 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) {
return tags["name"];
} else if (tags["ref"]) {
return tags["ref"];
+ } else if (tags["addr:housename"]) {
+ return tags["addr:housename"];
} else if (tags["addr:housenumber"] && tags["addr:street"]) {
return tags["addr:housenumber"] + " " + tags["addr:street"];
} else {
}
}
- function featureLink(feature) {
- if (feature.type === "area") {
- if (feature.id >= 3600000000) {
- var id = feature.id - 3600000000;
-
- return "/browse/relation/" + id;
- } else if (feature.id >= 2400000000) {
- var id = feature.id - 2400000000;
-
- return "/browse/way/" + id;
- } else {
- return "/browse/node/" + feature.id;
- }
- } else {
- return "/browse/" + feature.type + "/" + feature.id;
- }
- }
-
- function featureGeometry(feature, nodes) {
+ function featureGeometry(feature, features) {
var geometry;
if (feature.type === "node") {
geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
} else if (feature.type === "way") {
geometry = L.polyline(feature.nodes.map(function (node) {
- return nodes[node];
+ return features["node" + node].getLatLng();
}), featureStyle);
+ } else if (feature.type === "relation") {
+ geometry = L.featureGroup();
+
+ feature.members.forEach(function (member) {
+ if (features[member.type + member.ref]) {
+ geometry.addLayer(features[member.type + member.ref]);
+ }
+ });
+ }
+
+ if (geometry) {
+ features[feature.type + feature.id] = geometry;
}
return geometry;
$(this).show();
});
- $.ajax({
- url: "http://overpass-api.de/api/interpreter",
- method: "GET",
+ if ($section.data("ajax")) {
+ $section.data("ajax").abort();
+ }
+
+ $section.data("ajax", $.ajax({
+ url: url,
+ method: "POST",
data: {
data: "[timeout:5][out:json];" + query,
},
success: function(results) {
- var nodes = {};
+ var features = {};
$section.find(".loader").stopTime("loading").hide();
- results.elements.forEach(function (element) {
- if (element.type === "node") {
- nodes[element.id] = [element.lat, element.lon];
- }
- });
-
for (var i = 0; i < results.elements.length; i++) {
- var element = results.elements[i];
+ var element = results.elements[i],
+ geometry = featureGeometry(element, features);
if (interestingFeature(element, latlng, radius)) {
var $li = $("<li>")
.addClass("query-result")
- .data("geometry", featureGeometry(element, nodes))
+ .data("geometry", geometry)
.appendTo($ul);
var $p = $("<p>")
.text(featurePrefix(element) + " ")
.appendTo($li);
$("<a>")
- .attr("href", featureLink(element))
+ .attr("href", "/" + element.type + "/" + element.id)
.text(featureName(element))
.appendTo($p);
}
.text(I18n.t("javascripts.query.nothing_found"))
.appendTo($ul);
}
+ },
+ error: function(xhr, status, error) {
+ $section.find(".loader").stopTime("loading").hide();
+
+ $("<li>")
+ .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
+ .appendTo($ul);
}
- });
+ }));
}
+ /*
+ * To find nearby objects we ask overpass for the union of the
+ * following sets:
+ *
+ * node(around:<radius>,<lat>,lng>)
+ * way(around:<radius>,<lat>,lng>)
+ * node(w)
+ * relation(around:<radius>,<lat>,lng>)
+ *
+ * to find enclosing objects we first find all the enclosing areas:
+ *
+ * is_in(<lat>,<lng>)->.a
+ *
+ * and then return the union of the following sets:
+ *
+ * relation(pivot.a)
+ * way(pivot.a)
+ * node(w)
+ *
+ * In order to avoid overly large responses we don't currently
+ * attempt to complete any relations and instead just show those
+ * ways and nodes which are returned for other reasons.
+ */
function queryOverpass(lat, lng) {
var latlng = L.latLng(lat, lng),
radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
around = "around:" + radius + "," + lat + "," + lng,
- features = "(node(" + around + ");way(" + around + ");relation(" + around + "))",
- nearby = "((" + features + ";way(bn));node(w));out;",
- isin = "(is_in(" + lat + "," + lng + ");>);out;";
+ nodes = "node(" + around + ")",
+ ways = "way(" + around + ");node(w)",
+ relations = "relation(" + around + ")",
+ nearby = "(" + nodes + ";" + ways + ";" + relations + ");out;",
+ isin = "is_in(" + lat + "," + lng + ")->.a;(relation(pivot.a);way(pivot.a);node(w));out;";
$("#sidebar_content .query-intro")
.hide();
page.pushstate = page.popstate = function(path) {
OSM.loadSidebarContent(path, function () {
- page.load(path);
+ page.load(path, true);
});
};
- page.load = function(path) {
- var params = querystring.parse(path.substring(path.indexOf('?') + 1));
+ page.load = function(path, noCentre) {
+ var params = querystring.parse(path.substring(path.indexOf('?') + 1)),
+ latlng = L.latLng(params.lat, params.lon);
+
+ if (!window.location.hash &&
+ (!noCentre || !map.getBounds().contains(latlng))) {
+ OSM.router.withoutMoveListener(function () {
+ map.setView(latlng, 15);
+ });
+ }
queryOverpass(params.lat, params.lon);
enableQueryMode();
-
- return map.getState();
};
page.unload = function() {
projects / rails.git / blobdiff