Enable a few linting rules

[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 5c8ee88760ceb549adb01ed81efdfb2797bae47d..54d5e080fb0f5675a968bcd720f9a0373ae5e23c 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -115,17 +115,16 @@ OSM.Query = function (map) {
       }
     }
 
       }
     }
 

-    if (tags.name) {
-      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"]) {
+    for (const key of ["name", "ref", "addr:housename"]) {
+      if (tags[key]) {
+        return tags[key];
+      }
+    }
+
+    if (tags["addr:housenumber"] && tags["addr:street"]) {

       return tags["addr:housenumber"] + " " + tags["addr:street"];
       return tags["addr:housenumber"] + " " + tags["addr:street"];

-    } else {
-      return "#" + feature.id;

     }
     }

+    return "#" + feature.id;

   }
 
   function featureGeometry(feature) {
   }
 
   function featureGeometry(feature) {


@@ -285,10 +284,11 @@ OSM.Query = function (map) {
       .hide();
 
     if (marker) map.removeLayer(marker);
       .hide();
 
     if (marker) map.removeLayer(marker);

-    marker = L.circle(latlng, Object.assign({
+    marker = L.circle(latlng, {

       radius: radius,
       radius: radius,

-      className: "query-marker"
-    }, featureStyle)).addTo(map);
+      className: "query-marker",
+      ...featureStyle
+    }).addTo(map);

 
     runQuery(latlng, radius, nearby, $("#query-nearby"), false);
     runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);
 
     runQuery(latlng, radius, nearby, $("#query-nearby"), false);
     runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);