@atmosx/event-product-parser 3.0.6 → 3.0.7

package/src/{@parsers/@text → parsers/text}/GetEmbededText.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/Event"
+import { TypeEvent } from "StaticTypes/Event"
 
-export const GetEmebedText = (event: TypeEvent): string => {
+export const GetEmbededText = (event: TypeEvent): string => {
     const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
     const isStatement = event.properties.status_metadata.is_statement;
     const isExpired = event.properties.status_metadata.is_expired;
@@ -30,8 +30,9 @@ export const GetEmebedText = (event: TypeEvent): string => {
         line(`**Damage Threat:**`, event?.properties?.parameters?.damage_threat, !isExpired),
         line(`**Flood Threat:**`, event?.properties?.parameters?.flood_threat, !isExpired),
         line(`**Tornado Threat:**`, event?.properties?.parameters?.tornado_threat, !isExpired),
-        line(`**Estimated Wind Gusts:**`, `${event?.properties?.parameters?.estimated_wind_gusts} ${event?.properties?.parameters?.wind_threat ? ` (${event?.properties?.parameters?.wind_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_wind_gusts != null),
-        line(`**Estimated Hail Size:**`, `${event?.properties?.parameters?.estimated_hail_size} ${event?.properties?.parameters?.hail_threat ? ` (${event?.properties?.parameters?.hail_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_hail_size != null),
+        line(`**Wind Gusts:**`, `${event?.properties?.parameters?.estimated_wind_gusts} ${event?.properties?.parameters?.wind_threat ? ` (${event?.properties?.parameters?.wind_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_wind_gusts != null),
+        line(`**Hail Size:**`, `${event?.properties?.parameters?.estimated_hail_size} ${event?.properties?.parameters?.hail_threat ? ` (${event?.properties?.parameters?.hail_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_hail_size != null),
+        line(`**Direction:**`, event?.properties?.parameters?.direction, !isExpired && event?.properties?.parameters?.direction != null),
         line(`**Discussion:**`, event?.properties?.discussion_parameters?.discussion_number, !isExpired),
         line(`**Concern:**`, event?.properties?.discussion_parameters?.discussion_concerning, !isExpired),
         line(`**SPC Max Tornado Threat:**`, event?.properties?.discussion_parameters?.discussion_max_tornado, !isExpired),

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}/GetStringText.ts

@@ -11,19 +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/Event"
-import { TypeSettings } from "../../@types/Settings";
-import { bootstrap } from "../../bootstrap";
+import { TypeEvent } from "StaticTypes/Event"
+import { TypeSettings } from "Types/Settings"
+import { Bootstrap } from "@Bootstrap"
 
 export const GetStringText = (event: TypeEvent): string => {
-    const settings = bootstrap.settings as TypeSettings;
-    const timezone = settings.NotifyServer.Timezone ?? `UTC`;
+    const timezone = Bootstrap.Settings.Timezone ?? `UTC`;
     const line = (label: string, value: unknown, condition = true) => condition && value ? `${label} ${value}` : null;
     const isStatement = event.properties.status_metadata.is_statement;
     const isExpired = event.properties.status_metadata.is_expired;
@@ -34,8 +33,9 @@ export const GetStringText = (event: TypeEvent): string => {
         line(`Damage Threat:`, event?.properties?.parameters?.damage_threat, !isExpired),
         line(`Flood Threat:`, event?.properties?.parameters?.flood_threat, !isExpired),
         line(`Tornado Threat:`, event?.properties?.parameters?.tornado_threat, !isExpired),
-        line(`Estimated Wind Gusts:`, `${event?.properties?.parameters?.estimated_wind_gusts} ${event?.properties?.parameters?.wind_threat ? ` (${event?.properties?.parameters?.wind_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_wind_gusts != null),
-        line(`Estimated Hail Size:`, `${event?.properties?.parameters?.estimated_hail_size} ${event?.properties?.parameters?.hail_threat ? ` (${event?.properties?.parameters?.hail_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_hail_size != null),
+        line(`Wind Gusts:`, `${event?.properties?.parameters?.estimated_wind_gusts} ${event?.properties?.parameters?.wind_threat ? ` (${event?.properties?.parameters?.wind_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_wind_gusts != null),
+        line(`Hail Size:`, `${event?.properties?.parameters?.estimated_hail_size} ${event?.properties?.parameters?.hail_threat ? ` (${event?.properties?.parameters?.hail_threat})` : ''}`, !isExpired && event?.properties?.parameters?.estimated_hail_size != null),
+        line(`Direction:`, event?.properties?.parameters?.direction, !isExpired && event?.properties?.parameters?.direction != null),
         line(`Discussion:`, event?.properties?.discussion_parameters?.discussion_number, !isExpired),
         line(`Concern:`, event?.properties?.discussion_parameters?.discussion_concerning, !isExpired),
         line(`SPC Max Tornado Threat:`, event?.properties?.discussion_parameters?.discussion_max_tornado, !isExpired),

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

@@ -11,32 +11,32 @@
     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
 
 */
 
 interface GetTextFromProductOptions {
-    message: string
-    find: string[]
-    append?: string
-    removal?: string[]
+    Message: string
+    Find: string[]
+    Append?: string
+    Removal?: string[]
 }
 
-export const GetTextFromProduct = (options: GetTextFromProductOptions): string => {
-    const lines = options.message.split(`\n`);
+export const GetTextFromProduct = ({ Message, Find, Append, Removal }: GetTextFromProductOptions): string => {
+    const lines = Message.split(`\n`);
     for (const line of lines) {
-        const matchedFind = options.find.find((find) => line.includes(find));
+        const matchedFind = Find.find((find) => line.includes(find));
         if (matchedFind) {
             let result = line.slice(line.indexOf(matchedFind) + matchedFind.length).trim();
-            if (options.removal) {
-                for (const str of options.removal) {
+            if (Removal) {
+                for (const str of Removal) {
                     result = result.toLowerCase().split(str.toLowerCase()).join('');
                 }
                 result = result.replace(matchedFind, '').replace('<', '').trim();
             }
-            return result.toUpperCase() + (options?.append ?? ``);
+            return result.toUpperCase() + (Append ?? ``);
         }
     }
     return null;

package/src/parsers/ugc/GetCache.ts

@@ -0,0 +1,24 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { Bootstrap } from "@Bootstrap"
+
+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/GetUGCHeader.ts → parsers/ugc/GetHeader.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 { EnumExpressions } from "../../@enums/Expressions"
+import { EnumExpressions } from "@Enums/Expressions"
 
-export const getUGCHeader = (message: string): string | null => {
+export const GetHeader = (message: string): string | null => {
     const start = message.search(EnumExpressions.ugc1)
     const sub = message.substring(start)
     const end = sub.search(EnumExpressions.ugc2)

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 "./GetCache";
-import { setCache } from "./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++) {
@@ -41,7 +41,7 @@ export const getLocations = async (zones: string[]): Promise<string[]> => {
     }
 
     if (missing.length > 0) {
-        const rows = await bootstrap.database
+        const rows = await Bootstrap.Database
             .prepare(
                 `SELECT id, location FROM shapefiles WHERE id IN (${missing.map(() => '?').join(',')})`
             )
@@ -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(r.id, [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,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
 
 */
 
-export const getZones = (header: string): string[] => {
+export const GetZones = (header: string): string[] => {
     const splits = header.split('-');
     const zones: string[] = [];
     let state = splits[0].substring(0, 2);

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

@@ -11,18 +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 { bootstrap } from "../../bootstrap";
+import { Bootstrap } from "@Bootstrap"
 
-export const setCache = (key: string, value: string[]) => {
-	if (bootstrap.cache.ugc.size >= 5000) {
-        const firstKey = bootstrap.cache.ugc.keys().next().value;
-        bootstrap.cache.ugc.delete(firstKey);
+interface SetCacheOptions {
+    Key: string
+    Value: string[]
+}
+
+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);
     }
-    bootstrap.cache.ugc.set(key, value);
+    Bootstrap.Cache.UGC.set(Key, Value);
 };

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

@@ -11,27 +11,27 @@
     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 { getUGCHeader } from "./GetUGCHeader"
-import { getZones } from "./GetZones";
-import { GetExpiry } from './GetExpiry';
-import { getLocations } from "./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> => {
-    const head = getUGCHeader(message);
-    const ugcs = getZones(head)
+export const UGCExtract = async (message: string): Promise<TypeUGC> => {
     const expires = GetExpiry(message)
-    const areas = await getLocations(ugcs)
+    const head = GetHeader(message);
+    const ugcs = GetZones(head);
+    const areas = await GetLocations(ugcs)
     if (!head || ugcs?.length == 0) return;
     return { 
-        zones: ugcs,
-        locations: areas, 
-        expires: expires
+        Zones: ugcs,
+        Locations: areas, 
+        Expires: expires
     }
 }

package/src/{@parsers/@pvtec → parsers/vtec}/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/vtec/VTECExtract.ts

@@ -0,0 +1,49 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeVTEC } from "Types/VTEC"
+import { EnumExpressions } from "@Enums/Expressions"
+import { EnumProducts } from "@Enums/Products"
+import { EnumEvents } from "@Enums/Events"
+import { EnumActions } from "@Enums/Actions"
+import { EnumStatus } from "@Enums/Status"
+import { GetExpiry } from "@ParsingVTEC/GetExpiry"
+
+export const VTECExtract = (message: string): TypeVTEC[] | null => {
+    if (!message) return null;
+    const getVTECs = message.match(EnumExpressions.vtec) ?? [];
+    const vtecs: TypeVTEC[] = [];
+    for (const vtec of getVTECs) {
+        const sub = vtec.split(`.`);
+        if (sub?.length < 7) continue;
+        const dates = sub[6]?.split(`-`);
+        vtecs.push({
+            Raw: vtec,
+            ProductType: EnumProducts[sub[0]],
+            Tracking: `${sub[2]}.${sub[3]}.${sub[4]}.${sub[5]}`,
+            Event: `${EnumEvents[sub[3]]} ${EnumActions[sub[4]]}`,
+            Status: EnumStatus[sub[1]],
+            WMO: message.match(EnumExpressions.wmo)?.[0] ?? null,
+            Expires: GetExpiry(dates),
+            Watch: (sub[4] == `A` || sub[4] == `Y`) && (sub[3] == `TO` || sub[3] == `SV`),
+            PredictionCenter: sub[2] == `KWNS` ? true : false
+        })
+    }
+    return vtecs.length > 0 ? vtecs : null;
+}

package/src/{@types → static}/Attributes.ts

@@ -11,13 +11,12 @@
     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
 
 */
 
-
 export type TypeAttributes = {
     xmlns: string 
     id: string

package/src/{@types → static}/Event.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 { TypeEventProperties as BaseTypeEventProperties } from "./Properties";
-import { TypeHVTEC } from "./HVTEC";
-import { TypePVTEC } from "./VTEC";
+import { TypeEventProperties as BaseTypeEventProperties } from "StaticTypes/Properties"
+import { TypeHVTEC } from "Types/HVTEC"
+import { TypeVTEC } from "Types/VTEC"
 
 export type TypeEvent = {
     type: string
     geometry: {
-        type: string
+        type: "Polygon" | "MultiPolygon"
         coordinates: number[][]
     }
     properties: {
@@ -33,6 +33,7 @@ export type TypeEvent = {
         status: string
         issued: string
         expires: string
+        theme: string
         status_metadata?: {
             is_issued?: boolean
             is_updated?: boolean
@@ -46,7 +47,7 @@ export type TypeEvent = {
             tracking: string
             hash?: string
             header: string
-            vtec?: TypePVTEC | null
+            vtec?: TypeVTEC | null
             hvtec?: TypeHVTEC[] | null
             nodes?: {
                 id?: string | number

package/src/{@types → static}/Properties.ts

@@ -11,17 +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 { TypeAttributes } from "./Attributes";
+import { TypeAttributes } from "StaticTypes/Attributes"
     
+
 export type TypeEventProperties = {
     locations: string
     locations_array: string[]
+    regions: string[]
+    regions_string: string
     description: string
     attributes?: TypeAttributes
     geocode: {
@@ -42,6 +45,7 @@ export type TypeEventProperties = {
         impacts: string
         estimated_hail_size: string
         estimated_wind_gusts: string
+        direction: string
         damage_threat: string
         tornado_threat: string
         flood_threat: string

package/src/{@types → static}/Stanza.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
 
 */