@atmosx/event-product-parser 3.0.63 → 3.0.75

package/src/{@manager → manager}/MakeEvents.ts

@@ -11,33 +11,33 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeEvent } from "types-lower/Event"
-import { TypeSettings } from "types/Settings"
-import { EnumGlobalFilter } from "@enums/GlobalFilter"
-import { Bootstrap } from "@bootstrap"
-import { CreateTasks } from "@tasks/CreateTasks"
-import { SetHash } from "@manager/SetHash"
-import { UpdateNode } from "@manager/UpdateNode"
-import { SetEventEmit } from "@utilities/SetEventEmit"
-import { SetTimeoutAction } from "@utilities/SetTimeoutAction"
-
+import { TypeEvent } from "StaticTypes/Event"
+import { TypeSettings } from "Types/Settings"
+import { EnumGlobalFilter } from "@Enums/GlobalFilter"
+import { Bootstrap } from "@Bootstrap"
+import { CreateTasks } from "@Tasks/CreateTasks"
+import { SetHash } from "@Manager/SetHash"
+import { UpdateNode } from "@Manager/UpdateNode"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
+import { SetTimeoutAction } from "@Utilities/SetTimeoutAction"
+import { GetStringText } from "@Utilities/GetStringText"
 
 export const MakeEvents = async (events: TypeEvent[]): Promise<void> => {
-    let tasked = [];
+    let tasked = [] as TypeEvent[];
     const settings = Bootstrap.Settings as TypeSettings;
     if (events.length === 0) return
     await Promise.all(events.map(async event => {
         const features = Bootstrap.Cache.Events.features;
         const getHash = event.properties.metadata.hash;
         const getTracking = event.properties.metadata.tracking;
-        const isEntry = Bootstrap.Cache.Hashes?.find(hash => hash.tracking === getTracking)
-        const isHashed = isEntry?.hashes?.includes(getHash) ?? false;
+        const isEntry = Bootstrap.Cache.Hashes?.find(hash => hash.Tracking === getTracking)
+        const isHashed = isEntry?.Hashes?.includes(getHash) ?? false;
         const isNodeFiltering = settings.GlobalSettings.EventFiltering.NodeLocationFiltering
         const getNodes = Bootstrap.Cache.Nodes.features;
         const getFeature = features.find(feature => feature.properties.metadata.tracking === getTracking);    
@@ -60,6 +60,7 @@ export const MakeEvents = async (events: TypeEvent[]): Promise<void> => {
                     Type: getFeature ? `Updated` : `New`,
                     Event: event
                 },
+                Tree: Bootstrap.Settings.EnhancedEventJournaling ? GetStringText(event).split('\n').filter(line => line.trim() !== '') : [],
                 Message: `${isLocal}[${getFeature ? 'Updated' : 'New'}] ${event.properties.event} (${event.properties.status}) (${event.properties.metadata.tracking})`
             })
         }
@@ -69,16 +70,8 @@ export const MakeEvents = async (events: TypeEvent[]): Promise<void> => {
                 if (getFeature) { 
                     const getIndex = features.indexOf(getFeature);
                     const cHistory = getFeature?.properties?.metadata?.history ?? [];
-                    const cLocations = getFeature?.properties?.locations?.split(";").map((l: string) => l.trim()) ?? [];
-                    const cUgc = getFeature?.properties?.geocode?.ugc ?? [];
-        
                     const iHistory = event.properties?.metadata?.history ?? [];
-                    const iLocations = event.properties?.locations?.split(";").map((l: string) => l.trim()) ?? [];
-                    const iUgc = event.properties?.geocode?.ugc ?? [];
-        
                     const mHistory = [...cHistory, ...iHistory].filter((v, i, a) => a.indexOf(v) === i).filter((v, i, a) => a.findIndex(h => h.description === v.description && h.issued === v.issued) === i);
-                    const mLocations = [...cLocations, ...iLocations].filter((v, i, a) => a.indexOf(v) === i).join('; ');
-                    const mUgc = [...cUgc, ...iUgc].filter((v, i, a) => a.indexOf(v) === i);
         
                     Bootstrap.Cache.Events.features[getIndex] = {
                         ...event,
@@ -88,11 +81,6 @@ export const MakeEvents = async (events: TypeEvent[]): Promise<void> => {
                                 ...event?.properties?.metadata,
                                 history: mHistory
                             },
-                            locations: mLocations,
-                            geocode: {
-                                ...event?.properties?.geocode,  
-                                ugc: mUgc
-                            },
                         }
                     };
 

package/src/{@manager → manager}/RemoveEvent.ts

@@ -11,18 +11,18 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeEvent } from "types-lower/Event"
-import { EnumStrings } from "@enums/Strings"
-import { Bootstrap } from "@bootstrap"
-import { SetEventEmit } from "@utilities/SetEventEmit"
-import { SetTimeoutAction } from "@utilities/SetTimeoutAction"
-import { CreateTasks } from "@tasks/CreateTasks"
+import { TypeEvent } from "StaticTypes/Event"
+import { EnumStrings } from "@Enums/Strings"
+import { Bootstrap } from "@Bootstrap"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
+import { SetTimeoutAction } from "@Utilities/SetTimeoutAction"
+import { CreateTasks } from "@Tasks/CreateTasks"
 
 interface RemoveEventOptions {
     Event: TypeEvent
@@ -54,7 +54,7 @@ export const RemoveEvent = async ({ Event, IsTimeBasedExpiration }: RemoveEventO
         Bootstrap.Cache.Events.features
             .splice(Bootstrap.Cache.Events.features.indexOf(isTrackingEventLogged), 1);
         Bootstrap.Cache.Hashes = Bootstrap.Cache.Hashes
-            .filter(hash => hash.tracking !== gTracking);
+            .filter(hash => hash.Tracking !== gTracking);
 
         if (!isStatement) { 
             SetEventEmit({

package/src/{@manager → manager}/SetHash.ts

@@ -11,15 +11,15 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeEvent } from "types-lower/Event"
-import { TypeHash } from "types/Hash"
-import { Bootstrap } from "@bootstrap"
+import { TypeEvent } from "StaticTypes/Event"
+import { TypeHash } from "Types/Hash"
+import { Bootstrap } from "@Bootstrap"
 
 interface SetHashOptions {
     Event: TypeEvent

package/src/{@manager → manager}/UpdateEvents.ts

@@ -11,16 +11,16 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeEvent } from "types-lower/Event"
-import { Bootstrap } from "@bootstrap"
-import { SetEventEmit } from "@utilities/SetEventEmit"
-import { RemoveEvent } from "@manager/RemoveEvent"
+import { TypeEvent } from "StaticTypes/Event"
+import { Bootstrap } from "@Bootstrap"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
+import { RemoveEvent } from "@Manager/RemoveEvent"
 
 export const UpdateEvents = async (selected?: TypeEvent): Promise<void> => {
     const events = Bootstrap.Cache.Events.features;

package/src/{@manager → manager}/UpdateNode.ts

@@ -11,16 +11,16 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeEvent } from "types-lower/Event"
-import { Bootstrap } from "@bootstrap"
-import { GetEventNodes } from "@building/GetEventNodes"
-import { SetEventEmit } from "@utilities/SetEventEmit"
+import { TypeEvent } from "StaticTypes/Event"
+import { Bootstrap } from "@Bootstrap"
+import { GetEventNodes } from "@Building/GetEventNodes"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
 
 export const UpdateNode = async (selected?: TypeEvent): Promise<void> => {
     const events = Bootstrap.Cache.Events.features;

package/src/{@manager → manager}/ValidateEvents.ts

@@ -11,24 +11,25 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeEvent } from "types-lower/Event"
-import { TypeSettings } from "types/Settings"
-import { Bootstrap } from "@bootstrap"
-import { GetEventEnhancedName } from "@building/GetEventEnhancedName"
-import { GetEventSignature } from "@building/GetEventSignature"
-import { MakeEvents } from "@manager/MakeEvents"
-import { RemoveEvent } from "@manager/RemoveEvent"
-import { GetEventAttachments } from "@building/GetEventAttachments"
-import { SetEventEmit } from "@utilities/SetEventEmit"
-import { SetDebug } from "@utilities/SetDebug"
-import { GetMatched } from "@utilities/GetMatched"
-import { GetEventGeometry } from "@building/GetEventGeometry"
+import { TypeEvent } from "StaticTypes/Event"
+import { TypeSettings } from "Types/Settings"
+import { Bootstrap } from "@Bootstrap"
+import { GetEventEnhancedName } from "@Building/GetEventEnhancedName"
+import { GetEventSignature } from "@Building/GetEventSignature"
+import { MakeEvents } from "@Manager/MakeEvents"
+import { RemoveEvent } from "@Manager/RemoveEvent"
+import { GetEventAttachments } from "@Building/GetEventAttachments"
+import { SetEventEmit } from "@Utilities/SetEventEmit"
+import { SetDebug } from "@Utilities/SetDebug"
+import { GetMatched } from "@Utilities/GetMatched"
+import { GetEventPopulation } from "@Building/GetEventPopulation"
+import { GetEventGeometry } from "@Building/GetEventGeometry"
 import { createHash } from "crypto"
 
 export const ValidateEvents = async (events: TypeEvent[]): Promise<void> => {
@@ -39,11 +40,14 @@ export const ValidateEvents = async (events: TypeEvent[]): Promise<void> => {
     const bools = {} as Record<string, boolean>;
     const megered = {...configurations.GlobalSettings, ...configurations.GlobalSettings.EventFiltering}
     for (const key in megered) {
-        const setting = megered[key];
-        if (Array.isArray(setting)) { sets[key] = new Set(setting.map(item => item.toLowerCase())); }
-        if (typeof setting === 'boolean') { bools[key] = setting; }
+        const setting = megered[key as keyof typeof megered]
+        if (Array.isArray(setting)) { 
+            (sets as Record<string, any>)[key] = new Set(setting.map(item => String(item).toLowerCase())); 
+        }
+        if (typeof setting === 'boolean') { 
+            (bools as Record<string, any>)[key] = setting; 
+        }
     }
-
     const isFiltered = (define: TypeEvent): boolean => {
         const properties = define.properties;
         const zones = properties.geocode.ugc;
@@ -128,8 +132,15 @@ export const ValidateEvents = async (events: TypeEvent[]): Promise<void> => {
         const enhanced = properties.event = GetEventEnhancedName(event)
         const filtered = isFiltered(define)
         if (!filtered) {
-            event.geometry = !bools?.DisableGeometryParsing ? GetEventGeometry(event) : null;
-            properties.metadata.attachments = GetEventAttachments(event)
+            const tick2 = performance.now();
+            const geometry = !bools?.DisableGeometryParsing ? GetEventGeometry({ Event: event }) : null;
+            const population = GetEventPopulation(geometry)
+            const attachments = GetEventAttachments(event)
+            event.geometry = geometry;
+            event.properties.geocode.census.population = population.population;
+            event.properties.geocode.census.cities = population.cities;
+            properties.metadata.attachments = attachments;
+            SetDebug({ Title: `Filtered`, Message: `${Math.round(performance.now() - tick2)}ms` })
         }
         properties.metadata.hash = createHash("sha256").update(JSON.stringify(pre)).digest("hex")  
         SetEventEmit({ Event: `onProductType${enhanced.replace(/\s+/g, '')}`, Metadata: define });

package/src/{@parsers/@hvtec → parsers/hvtec}/HVExtract.ts

@@ -11,17 +11,17 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeHVTEC } from "types/HVTEC"
-import { EnumCauses } from "@enums/Causes"
-import { EnumRecords } from "@enums/Records"
-import { EnumExpressions } from "@enums/Expressions"
-import { EnumSeverity } from "@enums/Severity"
+import { TypeHVTEC } from "Types/HVTEC"
+import { EnumCauses } from "@Enums/Causes"
+import { EnumRecords } from "@Enums/Records"
+import { EnumExpressions } from "@Enums/Expressions"
+import { EnumSeverity } from "@Enums/Severity"
 
 export const HVExtract = (message: string): TypeHVTEC[] | null => {
     const getHVTECs = message.match(EnumExpressions.hvtec) ?? [];

package/src/{@parsers/@text → parsers/text}/GetDescriptionFromProduct.ts

@@ -11,13 +11,13 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { EnumExpressions } from "@enums/Expressions"
+import { EnumExpressions } from "@Enums/Expressions"
 
 interface GetDescriptionFromProductOptions { 
     Message: string

package/src/parsers/text/GetPolygonFromProduct.ts

@@ -0,0 +1,71 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ V / 
+       / /\ \| __| '_ ` _ \ / _ \/ __| '_ \| '_ \ / _ \ '__| |/ __| > <  
+      / ____ \ |_| | | | | | (_) \__ \ |_) | | | |  __/ |  | | (__ / . \ 
+     /_/    \_\__|_| |_| |_|\___/|___/ .__/|_| |_|\___|_|  |_|\___/_/ \_\
+                                     | |                            
+                                     |_|                                                                                                                
+
+    Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
+    Discord: https://atmosphericx-discord.scriptkitty.cafe
+    Ko-Fi: https://ko-fi.com/k3yomi
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
+
+    Independent Package: @atmosx/event-product-parser
+
+*/
+
+export const GetPolygonFromProduct = (message: string): number[][] => {
+    const coordinates: number[][] = [];
+    const match = message.match(
+        /LAT\.\.\.LON\s+([\s\S]*?)(?=\n\s*(?:TIME\.\.\.MOT\.\.\.LOC|\$\$|[A-Za-z]|$))/i
+    );
+    if (!match) return coordinates;
+    const text = match[1]
+        .split(/\r?\n/).map(l => l.trim())
+        .filter(l => l && !/[A-Za-z]/.test(l))
+        .join(' ').trim();
+    if (!text) return coordinates;
+    const values = text.match(/\d{4,8}/g);
+    if (!values || values.length === 0) return coordinates;
+    const points: { lat: number; lon: number }[] = [];
+    if (values.every(v => v.length === 8)) {
+        for (const value of values) {
+            const lat = parseInt(value.slice(0, 4), 10) / 100;
+            let lon = parseInt(value.slice(4, 8), 10) / 100;
+            if (lon < 20) lon += 100;
+            points.push({ lat, lon });
+        }
+    } else if (values.every(v => v.length === 4)) {
+        for (let i = 0; i + 1 < values.length; i += 2) {
+            const lat = parseInt(values[i], 10) / 100;
+            const lon = parseInt(values[i + 1], 10) / 100;
+            points.push({ lat, lon });
+        }
+    } else {
+        for (let i = 0; i + 1 < values.length; i += 2) {
+            const latStr = values[i];
+            const lonStr = values[i + 1];
+            if (latStr.length !== 4) continue;
+            if (lonStr.length < 4 || lonStr.length > 5) continue;
+            const lat = parseInt(latStr, 10) / 100;
+            let lon = parseInt(lonStr, 10) / 100;
+            points.push({ lat, lon });
+        }
+    }
+    if (points.length === 0) return coordinates;
+    const isEast = points.some(p => p.lon > 130 && p.lon < 180);
+    for (const p of points) {
+        const lon = isEast ? p.lon : -p.lon;
+        if (Number.isFinite(p.lat) && Number.isFinite(lon) && p.lat >= -90 && p.lat <= 90 && lon >= -180 && lon <= 180) {
+            coordinates.push([lon, p.lat]);
+        }
+    }
+    if (coordinates.length > 2 && (coordinates[0][0] !== coordinates[coordinates.length - 1][0] ||  coordinates[0][1] !== coordinates[coordinates.length - 1][1])) {
+        coordinates.push([...coordinates[0]]);
+    }
+    
+    return coordinates;
+};

package/src/{@parsers/@text → parsers/text}/GetTextFromProduct.ts

@@ -11,9 +11,9 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 

package/src/{@parsers/@ugc → parsers/ugc}/GetCache.ts

@@ -11,14 +11,14 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { Bootstrap } from "@bootstrap"
+import { Bootstrap } from "@Bootstrap"
 
-export const getCache = (key: string) => {
+export const GetCache = (key: string) => {
     return Bootstrap.Cache.UGC.get(key);
 };

package/src/{@parsers/@ugc → parsers/ugc}/GetExpiry.ts

@@ -11,9 +11,9 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 

package/src/{@parsers/@ugc → parsers/ugc}/GetHeader.ts

@@ -11,13 +11,13 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { EnumExpressions } from "@enums/Expressions"
+import { EnumExpressions } from "@Enums/Expressions"
 
 export const GetHeader = (message: string): string | null => {
     const start = message.search(EnumExpressions.ugc1)

package/src/{@parsers/@ugc → parsers/ugc}/GetLocations.ts

@@ -11,17 +11,17 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { Bootstrap } from "@bootstrap"
-import { getCache } from "@parsers/ugc/GetCache"
-import { setCache } from "@parsers/ugc/SetCache"
+import { Bootstrap } from "@Bootstrap"
+import { GetCache } from "@ParsingUGC/GetCache"
+import { SetCache } from "@ParsingUGC/SetCache"
 
-export const getLocations = async (zones: string[]): Promise<string[]> => {
+export const GetLocations = async (zones: string[]): Promise<string[]> => {
     const uniqueZones = Array.from(new Set(zones));
 
     const results: string[] = [];
@@ -29,7 +29,7 @@ export const getLocations = async (zones: string[]): Promise<string[]> => {
 
     for (let i = 0; i < uniqueZones.length; i++) {
         const zone = uniqueZones[i];
-        const cached = getCache(zone);
+        const cached = GetCache(zone);
 
         if (cached) {
             for (let j = 0; j < cached.length; j++) {
@@ -49,9 +49,9 @@ export const getLocations = async (zones: string[]): Promise<string[]> => {
 
         for (let i = 0; i < rows.length; i++) {
             const r = rows[i] as any;
-            setCache({ Key: r.id, Value: [r.location] });
+            SetCache({ Key: r.id, Value: [r.location] });
             results.push(r.location);
         }
     }
-    return results;
+    return Array.from(new Set(results));
 };

package/src/parsers/ugc/GetZonePolygon.ts

@@ -0,0 +1,73 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ V / 
+       / /\ \| __| '_ ` _ \ / _ \/ __| '_ \| '_ \ / _ \ '__| |/ __| > <  
+      / ____ \ |_| | | | | | (_) \__ \ |_) | | | |  __/ |  | | (__ / . \ 
+     /_/    \_\__|_| |_| |_|\___/|___/ .__/|_| |_|\___|_|  |_|\___/_/ \_\
+                                     | |                            
+                                     |_|                                                                                                                
+
+    Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
+    Discord: https://atmosphericx-discord.scriptkitty.cafe
+    Ko-Fi: https://ko-fi.com/k3yomi
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
+
+    Independent Package: @atmosx/event-product-parser
+
+*/
+
+import { CreateQuery } from "@Database/CreateQuery"
+import { GetUnionPolygon } from "@Utilities/GetUnionPolygon"
+import { createHash } from "crypto";
+
+interface CoordinatesOptions {
+    Zones: string[]
+    Union: boolean
+}
+
+interface CoordinatesResponse { 
+    type: `Polygon` | `MultiPolygon`
+    coordinates: any[]
+}
+
+export const GetZonePolygon = ({ Zones, Union }: CoordinatesOptions): CoordinatesResponse | null => {
+    const list = [...new Set(Zones.map(z => z.trim()))].filter(z => z === 'XX000' ? false : true);
+    if (list.length === 0) return null;
+
+    const placeholders = list.map(() => "?").join(",");
+    const rows = CreateQuery({
+        Query: `SELECT geometry FROM shapefiles WHERE id IN (${placeholders})`,
+        Parameters: list
+    });
+    const polygons: any[] = [];
+    const geometryHashes = new Set<string>();
+    for (const row of rows) {
+        if (!row?.geometry) continue;
+        const geometryHash = createHash("sha256").update(row.geometry).digest("hex");
+        if (geometryHashes.has(geometryHash)) continue;
+        geometryHashes.add(geometryHash);
+        const geom = JSON.parse(row.geometry);
+        if (geom?.type === "Polygon") {
+            polygons.push(geom.coordinates);
+        }
+        if (geom?.type === "MultiPolygon") {
+            for (const poly of geom.coordinates) {
+                polygons.push(poly);
+            }
+        }
+    }
+    if (polygons.length === 0) return null;
+    if (Union) {
+        return GetUnionPolygon({ Polygons: polygons });
+    } else {
+        const multi: any[] = [];
+        for (const polyCoords of polygons) {
+            if (Array.isArray(polyCoords) && Array.isArray(polyCoords[0])) {
+                multi.push(polyCoords);
+            }
+        }
+        if (multi.length === 0) return null;
+        return {type: "MultiPolygon", coordinates: multi};
+    }
+}

package/src/{@parsers/@ugc → parsers/ugc}/GetZones.ts

@@ -11,9 +11,9 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 

package/src/{@parsers/@ugc → parsers/ugc}/SetCache.ts

@@ -11,20 +11,20 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { Bootstrap } from "@bootstrap"
+import { Bootstrap } from "@Bootstrap"
 
 interface SetCacheOptions {
     Key: string
     Value: string[]
 }
 
-export const setCache = ({ Key, Value }: SetCacheOptions) => {
+export const SetCache = ({ Key, Value }: SetCacheOptions) => {
 	if (Bootstrap.Cache.UGC.size >= 5000) {
         const firstKey = Bootstrap.Cache.UGC.keys().next().value;
         Bootstrap.Cache.UGC.delete(firstKey);

package/src/{@parsers/@ugc → parsers/ugc}/UGCExtract.ts

@@ -11,23 +11,23 @@
     Created with ♥ by the AtmosphericX Team (KiyoWx, StarflightWx, & CJ Ziegler)
     Discord: https://atmosphericx-discord.scriptkitty.cafe
     Ko-Fi: https://ko-fi.com/k3yomi
-    Documentation: http://localhost/documentation | https://atmosphericx.scriptkitty.cafe/documentation
+    Documentation: https://atmosphericx.scriptkitty.cafe/documentation
 
-    Internal Package: @atmosx/event-product-parser
+    Independent Package: @atmosx/event-product-parser
 
 */
 
-import { TypeUGC } from "types/UGC"
-import { GetHeader } from "@parsers/ugc/GetHeader"
-import { GetZones } from "@parsers/ugc/GetZones"
-import { GetExpiry } from "@parsers/ugc/GetExpiry"
-import { getLocations } from "@parsers/ugc/GetLocations"
+import { TypeUGC } from "Types/UGC"
+import { GetHeader } from "@ParsingUGC/GetHeader"
+import { GetZones } from "@ParsingUGC/GetZones"
+import { GetExpiry } from "@ParsingUGC/GetExpiry"
+import { GetLocations } from "@ParsingUGC/GetLocations"
 
-export const ugcExtract = async (message: string): Promise<TypeUGC> => {
+export const UGCExtract = async (message: string): Promise<TypeUGC> => {
     const expires = GetExpiry(message)
     const head = GetHeader(message);
     const ugcs = GetZones(head);
-    const areas = await getLocations(ugcs)
+    const areas = await GetLocations(ugcs)
     if (!head || ugcs?.length == 0) return;
     return { 
         Zones: ugcs,