Discard empty ways from query result geometries

[rails.git] / app / assets / javascripts / index / query.js

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 86f24e0469603751af413aadf02e64be547960aa..7ac613d71ec1737e2d80088ad5f3c0e29d177868 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -12,7 +12,7 @@ OSM.Query = function(map) {
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,

-    clickable: false
+    interactive: false

   };
 
   queryButton.on("click", function (e) {
   };
 
   queryButton.on("click", function (e) {


@@ -146,7 +146,7 @@ OSM.Query = function(map) {
 
     if (feature.type === "node" && feature.lat && feature.lon) {
       geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
 
     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) {
       geometry = L.polyline(feature.geometry.filter(function (point) {
         return point !== null;
       }).map(function (point) {


@@ -179,7 +179,7 @@ OSM.Query = function(map) {
       url: url,
       method: "POST",
       data: {
       url: url,
       method: "POST",
       data: {

-        data: "[timeout:5][out:json];" + query,
+        data: "[timeout:10][out:json];" + query,

       },
       success: function(results) {
         var elements;
       },
       success: function(results) {
         var elements;


@@ -226,6 +226,12 @@ OSM.Query = function(map) {
           }
         }
 
           }
         }
 

+        if (results.remark) {
+          $("<li>")
+            .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
+            .appendTo($ul);
+        }
+

         if ($ul.find("li").length === 0) {
           $("<li>")
             .text(I18n.t("javascripts.query.nothing_found"))
         if ($ul.find("li").length === 0) {
           $("<li>")
             .text(I18n.t("javascripts.query.nothing_found"))