imerss-bioinfo 1.16.0 → 1.18.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "imerss-bioinfo",
     "description": "Working data of the IMERSS biodiversity informatics working group, together with algorithms",
-    "version": "1.16.0",
+    "version": "1.18.0",
     "author": "Antranig Basman",
     "scripts": {
         "lint": "fluid-lint-all",

package/src/client/js/i6/polygonDraw.js

@@ -72,8 +72,19 @@ hortis.libreMap.polygonFilter.summarise = function (filterState) {
     return hortis.countSummary(filterState.length, ["polygon", "polygons"]);
 };
 
+/**
+ * Filter observations to those lying within any of the polygons drawn. The polygons arrive as component material, read
+ * through a proxy which tracks each access - since every observation is tested against every vertex of the polygons,
+ * their bare values are read instead, which is many times faster.
+ * @param {Object[]} obsRows - The observations
+ * @param {Object[]} filterState - The polygons drawn, as GeoJSON features, possibly as a proxy
+ * @param {Map<Object, Object>} pointCache - Map of each observation to its point, possibly as a proxy
+ * @return {Object[]} The observations within any of the polygons
+ */
 hortis.libreMap.polygonFilter.doFilter = function (obsRows, filterState, pointCache) {
-    return filterState.length === 0 ? obsRows : obsRows.filter(row => hortis.intersectsAnyFeature(filterState, pointCache.get(row)));
+    const features = fluid.unwrapProxy(filterState);
+    const points = fluid.unwrapProxy(pointCache);
+    return features.length === 0 ? obsRows : obsRows.filter(row => hortis.intersectsAnyFeature(features, points.get(row)));
 };
 
 hortis.libreMap.polygonFilter.reset = function (that) {
@@ -104,7 +115,18 @@ hortis.libreMap.polygonFilter.makeDraw = function (that, map, mapboxDrawOptions,
         const modeChange = e => that.drawMode = e.mode;
         const listeners = {"draw.create": updateArea, "draw.delete": updateArea, "draw.update": updateArea, "draw.modechange": modeChange};
         Object.entries(listeners).forEach(([event, listener]) => map.on(event, listener));
-        togo = {map, draw, listeners};
+        // MapboxDraw's trash deletes only the polygons selected, and polygons restored from the URL are drawn unselected
+        // - so with none selected, the trash deletes them all. Heard before MapboxDraw's own handler, while the
+        // selection is still as the user left it
+        const trashButton = map.getContainer().querySelector(".mapbox-gl-draw_trash");
+        const trashAll = () => {
+            if (draw.getSelectedIds().length === 0 && draw.getAll().features.length > 0) {
+                draw.deleteAll();
+                updateArea();
+            }
+        };
+        trashButton?.addEventListener("click", trashAll, true);
+        togo = {map, draw, listeners, trashButton, trashAll};
     } else {
         togo = fluid.unavailable({message: "The MapboxDraw library is not loaded", variety: "config"});
     }
@@ -113,6 +135,7 @@ hortis.libreMap.polygonFilter.makeDraw = function (that, map, mapboxDrawOptions,
 
 hortis.libreMap.polygonFilter.removeDraw = function (record) {
     Object.entries(record.listeners).forEach(([event, listener]) => record.map.off(event, listener));
+    record.trashButton?.removeEventListener("click", record.trashAll, true);
     record.map.removeControl(record.draw);
 };