Merge pull request #105 from jlewis1778/additional_locations_in_query

Updating findPlacesInZone query to include additional locations

Author: taibeled

src/maps/api.ts

@@ -1,7 +1,11 @@
 import type { LatLngTuple } from "leaflet";
 import osmtogeojson from "osmtogeojson";
 import * as turf from "@turf/turf";
-import { mapGeoLocation, polyGeoJSON } from "@/lib/context";
+import {
+    additionalMapGeoLocations,
+    mapGeoLocation,
+    polyGeoJSON,
+} from "@/lib/context";
 import type {
     EncompassingTentacleQuestionSchema,
     Question,
@@ -374,20 +378,89 @@ ${
 out ${outType};
 `;
     } else {
-        const geoLocation = mapGeoLocation.get();
+        const primaryLocation = mapGeoLocation.get();
+
+        const additionalLocations = additionalMapGeoLocations
+            .get()
+            .filter((entry) => entry.added)
+            .map((entry) => entry.location);
+
+        const allLocations = [primaryLocation, ...additionalLocations];
+
+        const relationToAreaBlocks = allLocations
+            .map((loc, idx) => {
+                const regionVar = `.region${idx}`;
+                return `relation(${loc.properties.osm_id});map_to_area->${regionVar};`;
+            })
+            .join("\n");
+
+        const searchBlocks = allLocations
+            .map((_, idx) => {
+                const regionVar = `area.region${idx}`;
+                const altQueries =
+                    alternatives.length > 0
+                        ? alternatives
+                              .map(
+                                  (alt) => `${searchType}${alt}(${regionVar});`,
+                              )
+                              .join("\n")
+                        : "";
+
+                return `
+            ${searchType}${filter}(${regionVar});
+            ${altQueries}
+          `;
+            })
+            .join("\n");
 
         query = `
-[out:json]${timeoutDuration != 0 ? `[timeout:${timeoutDuration}]` : ""};
-relation(${geoLocation.properties.osm_id});map_to_area->.region;
-(
-${searchType}${filter}(area.region);
-${alternatives.length > 0 ? alternatives.map((alternative) => `${searchType}${alternative}(area.region);`).join("\n") : ""}
-);
-out ${outType};
-`;
+        [out:json]${timeoutDuration !== 0 ? `[timeout:${timeoutDuration}]` : ""};
+        ${relationToAreaBlocks}
+        (
+        ${searchBlocks}
+        );
+        out ${outType};
+        `;
+    }
+
+    const data = await getOverpassData(
+        query,
+        loadingText,
+        CacheType.ZONE_CACHE,
+    );
+
+    const subtractedEntries = additionalMapGeoLocations
+        .get()
+        .filter((e) => !e.added);
+    const subtractedPolygons = subtractedEntries.map((entry) => entry.location);
+
+    if (subtractedPolygons.length > 0 && data && data.elements) {
+        const turfPolys = await Promise.all(
+            subtractedPolygons.map(
+                async (location) =>
+                    turf.combine(
+                        await determineGeoJSON(
+                            location.properties.osm_id.toString(),
+                            location.properties.osm_type,
+                        ),
+                    ).features[0],
+            ),
+        );
+
+        data.elements = data.elements.filter((el: any) => {
+            const lon = el.center ? el.center.lon : el.lon;
+            const lat = el.center ? el.center.lat : el.lat;
+            if (typeof lon !== "number" || typeof lat !== "number")
+                return false;
+            const pt = turf.point([lon, lat]);
+
+            return !turfPolys.some((poly) =>
+                turf.booleanPointInPolygon(pt, poly as any),
+            );
+        });
     }
 
-    return await getOverpassData(query, loadingText, CacheType.ZONE_CACHE);
+    return data;
 };
 
 export const findPlacesSpecificInZone = async (