Update minimum ruby version to 3.2

[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 80df594c82b0b34250a8f4a84fff2e907aa11a64..ee9d3f41560c9a6ef9441b9fcac2d36dc1c13154 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,8 +1,17 @@
-OSM.Query = function(map) {
-  var queryButton = $(".control-query .control-button"),
-    uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
-    searchRadius = 10,
-    marker;
+OSM.Query = function (map) {
+  const url = OSM.OVERPASS_URL,
+        credentials = OSM.OVERPASS_CREDENTIALS,
+        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"];
+  let marker;
+
+  const featureStyle = {
+    color: "#FF6200",
+    weight: 4,
+    opacity: 1,
+    fillOpacity: 0.5,
+    interactive: false
+  };

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


@@ -10,33 +19,42 @@ OSM.Query = function(map) {
 
     if (queryButton.hasClass("active")) {
       disableQueryMode();
 
     if (queryButton.hasClass("active")) {
       disableQueryMode();

-
-      OSM.router.route("/");
-    } else {
+    } else if (!queryButton.hasClass("disabled")) {

       enableQueryMode();
     }
       enableQueryMode();
     }

+  }).on("disabled", function () {
+    if (queryButton.hasClass("active")) {
+      map.off("click", clickHandler);
+      $(map.getContainer()).removeClass("query-active").addClass("query-disabled");
+      $(this).tooltip("show");
+    }
+  }).on("enabled", function () {
+    if (queryButton.hasClass("active")) {
+      map.on("click", clickHandler);
+      $(map.getContainer()).removeClass("query-disabled").addClass("query-active");
+      $(this).tooltip("hide");
+    }

   });
 
   });
 

+  function showResultGeometry() {
+    const geometry = $(this).data("geometry");
+    if (geometry) map.addLayer(geometry);
+    $(this).addClass("selected");
+  }
+
+  function hideResultGeometry() {
+    const geometry = $(this).data("geometry");
+    if (geometry) map.removeLayer(geometry);
+    $(this).removeClass("selected");
+  }
+

   $("#sidebar_content")
   $("#sidebar_content")

-    .on("mouseover", ".query-results li", function () {
-      var geometry = $(this).data("geometry")
-      if (geometry) map.addLayer(geometry);
-      $(this).addClass("selected");
-    })
-    .on("mouseout", ".query-results li", function () {
-      var geometry = $(this).data("geometry")
-      if (geometry) map.removeLayer(geometry);
-      $(this).removeClass("selected");
-    });
+    .on("mouseover", ".query-results a", showResultGeometry)
+    .on("mouseout", ".query-results a", hideResultGeometry);

 
 

-  function interestingFeature(feature, origin) {
+  function interestingFeature(feature) {

     if (feature.tags) {
     if (feature.tags) {

-      if (feature.type === "node" &&
-          OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > searchRadius) {
-        return false;
-      }
-
-      for (var key in feature.tags) {
+      for (const key in feature.tags) {

         if (uninterestingTags.indexOf(key) < 0) {
           return true;
         }
         if (uninterestingTags.indexOf(key) < 0) {
           return true;
         }


@@ -47,28 +65,36 @@ OSM.Query = function(map) {
   }
 
   function featurePrefix(feature) {
   }
 
   function featurePrefix(feature) {

-    var tags = feature.tags;
-    var prefix = "";
+    const tags = feature.tags;
+    let prefix = "";

 
 

-    if (tags.boundary === "administrative") {
-      prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level)
+    if (tags.boundary === "administrative" && tags.admin_level) {
+      prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, {
+        defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative")
+      });

     } else {
     } else {

-      var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");
+      const prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");

 
 

-      for (var key in tags) {
-        var value = tags[key];
+      for (const key in tags) {
+        const value = tags[key];

 
         if (prefixes[key]) {
           if (prefixes[key][value]) {
             return prefixes[key][value];
 
         if (prefixes[key]) {
           if (prefixes[key][value]) {
             return prefixes[key][value];

-          } else {
-            var first = value.substr(0, 1).toUpperCase(),
-              rest = value.substr(1).replace(/_/g, " ");
-
-            return first + rest;

           }
         }
       }
           }
         }
       }

+
+      for (const key in tags) {
+        const value = tags[key];
+
+        if (prefixes[key]) {
+          const first = value.slice(0, 1).toUpperCase(),
+                rest = value.slice(1).replace(/_/g, " ");
+
+          return first + rest;
+        }
+      }

     }
 
     if (!prefix) {
     }
 
     if (!prefix) {


@@ -79,137 +105,200 @@ OSM.Query = function(map) {
   }
 
   function featureName(feature) {
   }
 
   function featureName(feature) {

-    var tags = feature.tags;
+    const tags = feature.tags,
+          locales = OSM.preferred_languages;

 
 

-    if (tags["name"]) {
-      return tags["name"];
-    } else if (tags["ref"]) {
-      return tags["ref"];
-    } else if (tags["addr:housenumber"] && tags["addr:street"]) {
-      return tags["addr:housenumber"] + " " + tags["addr:street"];
-    } else {
-      return "#" + feature.id;
+    for (const locale of locales) {
+      if (tags["name:" + locale]) {
+        return tags["name:" + locale];
+      }

     }
     }

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

       }
       }

-    } else {
-      return "/browse/" + feature.type + "/" + feature.id;

     }
     }

-  }

 
 

-  function featureGeometry(feature, nodes) {
-    var geometry;
+    if (tags["addr:housenumber"] && tags["addr:street"]) {
+      return tags["addr:housenumber"] + " " + tags["addr:street"];
+    }
+    return "#" + feature.id;
+  }

 
 

-    if (feature.type === "node") {
-      geometry = L.circleMarker([feature.lat, feature.lon]);
-    } else if (feature.type === "way") {
-      geometry = L.polyline(feature.nodes.map(function (node) {
-        return nodes[node];
+  function featureGeometry(feature) {
+    let geometry;
+
+    if (feature.type === "node" && feature.lat && feature.lon) {
+      geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
+    } 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) {
+        return [point.lat, point.lon];
+      }), featureStyle);
+    } else if (feature.type === "relation" && feature.members) {
+      geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) {
+        return typeof geometry !== "undefined";

       }));
     }
 
     return geometry;
   }
 
       }));
     }
 
     return geometry;
   }
 

-  function runQuery(latlng, query, $section) {
-    var $ul = $section.find("ul");
+  function runQuery(latlng, radius, query, $section, merge, compare) {
+    const $ul = $section.find("ul");

 
     $ul.empty();
     $section.show();
 
 
     $ul.empty();
     $section.show();
 

-    $section.find(".loader").oneTime(1000, "loading", function () {
-      $(this).show();
-    });
+    if ($section.data("ajax")) {
+      $section.data("ajax").abort();
+    }

 
 

-    $.ajax({
-      url: "http://overpass-api.de/api/interpreter",
-      method: "GET",
-      data: {
-        data: "[timeout:5][out:json];" + query,
-      },
-      success: function(results) {
-        var nodes = {};
+    $section.data("ajax", new AbortController());
+    fetch(url, {
+      method: "POST",
+      body: new URLSearchParams({
+        data: "[timeout:10][out:json];" + query
+      }),
+      credentials: credentials ? "include" : "same-origin",
+      signal: $section.data("ajax").signal
+    })
+      .then(response => response.json())
+      .then(function (results) {
+        let elements;
+
+        $section.find(".loader").hide();
+
+        if (merge) {
+          elements = results.elements.reduce(function (hash, element) {
+            const key = element.type + element.id;
+            if ("geometry" in element) {
+              delete element.bounds;
+            }
+            hash[key] = $.extend({}, hash[key], element);
+            return hash;
+          }, {});
+
+          elements = Object.keys(elements).map(function (key) {
+            return elements[key];
+          });
+        } else {
+          elements = results.elements;
+        }

 
 

-        $section.find(".loader").stopTime("loading").hide();
+        if (compare) {
+          elements = elements.sort(compare);
+        }

 
 

-        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];
-
-          if (interestingFeature(element, latlng)) {
-            var $li = $("<li>")
-              .data("geometry", featureGeometry(element, nodes))
-              .appendTo($ul);
-            var $p = $("<p>")
-              .addClass("inner12 search_results_entry clearfix")
-              .text(featurePrefix(element) + " ")
-              .appendTo($li);
-
-            $("<a>")
-              .attr("href", featureLink(element))
-              .text(featureName(element))
-              .appendTo($p);
-          }
+        for (const element of elements) {
+          if (!interestingFeature(element)) continue;
+
+          const $li = $("<li>")
+            .addClass("list-group-item list-group-item-action")
+            .text(featurePrefix(element) + " ")
+            .appendTo($ul);
+
+          $("<a>")
+            .addClass("stretched-link")
+            .attr("href", "/" + element.type + "/" + element.id)
+            .data("geometry", featureGeometry(element))
+            .text(featureName(element))
+            .appendTo($li);

         }
         }

-      }
-    });
+
+        if (results.remark) {
+          $("<li>")
+            .addClass("list-group-item")
+            .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
+            .appendTo($ul);
+        }
+
+        if ($ul.find("li").length === 0) {
+          $("<li>")
+            .addClass("list-group-item")
+            .text(I18n.t("javascripts.query.nothing_found"))
+            .appendTo($ul);
+        }
+      })
+      .catch(function (error) {
+        if (error.name === "AbortError") return;
+
+        $section.find(".loader").hide();
+
+        $("<li>")
+          .addClass("list-group-item")
+          .text(I18n.t("javascripts.query.error", { server: url, error: error.message }))
+          .appendTo($ul);
+      });
+  }
+
+  function compareSize(feature1, feature2) {
+    const width1 = feature1.bounds.maxlon - feature1.bounds.minlon,
+          height1 = feature1.bounds.maxlat - feature1.bounds.minlat,
+          area1 = width1 * height1,
+          width2 = feature2.bounds.maxlat - feature2.bounds.minlat,
+          height2 = feature2.bounds.maxlat - feature2.bounds.minlat,
+          area2 = width2 * height2;
+
+    return area1 - area2;

   }
 
   }
 

+  /*
+   * To find nearby objects we ask overpass for the union of the
+   * following sets:
+   *
+   *   node(around:<radius>,<lat>,<lng>)
+   *   way(around:<radius>,<lat>,<lng>)
+   *   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)
+   *
+   * In both cases we then ask to retrieve tags and the geometry
+   * for each object.
+   */

   function queryOverpass(lat, lng) {
   function queryOverpass(lat, lng) {

-    var latlng = L.latLng(lat, lng),
-      around = "around:" + searchRadius + "," + lat + "," + lng,
-      features = "(node(" + around + ");way(" + around + ");relation(" + around + "))",
-      nearby = "((" + features + ";way(bn));node(w));out;",
-      isin = "(is_in(" + lat + "," + lng + ");>);out;";
+    const latlng = L.latLng(lat, lng).wrap(),
+          bounds = map.getBounds().wrap(),
+          zoom = map.getZoom(),
+          bbox = [bounds.getSouthWest(), bounds.getNorthEast()]
+            .map(c => OSM.cropLocation(c, zoom))
+            .join(),
+          geombbox = "geom(" + bbox + ");",
+          radius = 10 * Math.pow(1.5, 19 - zoom),
+          around = "(around:" + radius + "," + lat + "," + lng + ")",
+          nodes = "node" + around,
+          ways = "way" + around,
+          relations = "relation" + around,
+          nearby = "(" + nodes + ";" + ways + ";);out tags " + geombbox + relations + ";out " + geombbox,
+          isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags bb;out ids " + geombbox + "relation(pivot.a);out tags bb;";

 
     $("#sidebar_content .query-intro")
       .hide();
 
 
     $("#sidebar_content .query-intro")
       .hide();
 

-    if (marker) {
-      marker.setLatLng(latlng).addTo(map);
-    } else {
-      marker = L.circle(latlng, searchRadius, { clickable: false }).addTo(map);
-    }
-
-    $(document).everyTime(75, "fadeQueryMarker", function (i) {
-      if (i == 10) {
-        map.removeLayer(marker);
-      } else {
-        marker.setStyle({
-          opacity: 0.5 - i * 0.05,
-          fillOpacity: 0.2 - i * 0.02
-        });
-      }
-    }, 10);
-
-    runQuery(latlng, nearby, $("#query-nearby"));
-    runQuery(latlng, isin, $("#query-isin"));
+    if (marker) map.removeLayer(marker);
+    marker = L.circle(latlng, {
+      radius: radius,
+      className: "query-marker",
+      ...featureStyle
+    }).addTo(map);
+
+    runQuery(latlng, radius, nearby, $("#query-nearby"), false);
+    runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);

   }
 
   function clickHandler(e) {
   }
 
   function clickHandler(e) {

-    var precision = OSM.zoomPrecision(map.getZoom()),
-      lat = e.latlng.lat.toFixed(precision),
-      lng = e.latlng.lng.toFixed(precision);
+    const [lat, lon] = OSM.cropLocation(e.latlng, map.getZoom());

 
 

-    OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
+    OSM.router.route("/query?" + new URLSearchParams({ lat, lon }));

   }
 
   function enableQueryMode() {
   }
 
   function enableQueryMode() {


@@ -220,30 +309,37 @@ OSM.Query = function(map) {
 
   function disableQueryMode() {
     if (marker) map.removeLayer(marker);
 
   function disableQueryMode() {
     if (marker) map.removeLayer(marker);

-    $(map.getContainer()).removeClass("query-active");
+    $(map.getContainer()).removeClass("query-active").removeClass("query-disabled");

     map.off("click", clickHandler);
     queryButton.removeClass("active");
   }
 
     map.off("click", clickHandler);
     queryButton.removeClass("active");
   }
 

-  var page = {};
+  const page = {};

 
 

-  page.pushstate = page.popstate = function(path) {
+  page.pushstate = page.popstate = function (path) {

     OSM.loadSidebarContent(path, function () {
     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) {
+    const params = new URLSearchParams(path.substring(path.indexOf("?"))),
+          latlng = L.latLng(params.get("lat"), params.get("lon"));

 
 

-    queryOverpass(params.lat, params.lon);
-    enableQueryMode();
+    if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) {
+      OSM.router.withoutMoveListener(function () {
+        map.setView(latlng, 15);
+      });
+    }

 
 

-    return map.getState();
+    queryOverpass(params.get("lat"), params.get("lon"));

   };
 
   };
 

-  page.unload = function() {
-    disableQueryMode();
+  page.unload = function (sameController) {
+    if (!sameController) {
+      disableQueryMode();
+      $("#sidebar_content .query-results a.selected").each(hideResultGeometry);
+    }

   };
 
   return page;
   };
 
   return page;