X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4b43396ede248f97560b059ef202c7fa26d63947..e8cb7ac8f16987788fb65889b14a7e1446a46da3:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 018aedf98..3da84c7d9 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,8 +1,7 @@ //= require jquery.simulate OSM.Query = function(map) { - var protocol = document.location.protocol === "https:" ? "https:" : "http:", - url = protocol + OSM.OVERPASS_URL, + var url = 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', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'], marker; @@ -146,7 +145,7 @@ OSM.Query = function(map) { if (feature.type === "node" && feature.lat && feature.lon) { geometry = L.circleMarker([feature.lat, feature.lon], featureStyle); - } else if (feature.type === "way" && feature.geometry) { + } else if (feature.type === "way" && feature.geometry && feature.geometry.length > 0) { geometry = L.polyline(feature.geometry.filter(function (point) { return point !== null; }).map(function (point) { @@ -288,7 +287,7 @@ OSM.Query = function(map) { nodes = "node(" + around + ")", ways = "way(" + around + ")", relations = "relation(" + around + ")", - nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");", + nearby = "(" + nodes + ";" + ways + ";);out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");", isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags bb;out ids geom(" + bbox + ");relation(pivot.a);out tags bb;"; $("#sidebar_content .query-intro")