@atmosx/event-product-parser 3.0.63 → 3.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atmosx/event-product-parser",
-	"version": "3.0.63",
+	"version": "3.0.75",
 	"description": "NOAA Weather Wire & NWS API Parser - Built for standalone and Project AtmosphericX Integration.",
 	"main": "dist/cjs/index.cjs",
 	"module": "dist/esm/index.mjs",
@@ -36,14 +36,21 @@
 		"@xmpp/client": "0.14.0",
 		"better-sqlite3": "12.9.0",
 		"croner": "10.0.1",
-		"esbuild": "^0.28.1",
-		"fast-glob": "^3.3.3",
+		"d3-geo": "3.1.1",
+		"esbuild": "0.28.1",
 		"jszip": "3.10.1",
 		"polygon-clipping": "0.15.7",
 		"shapefile": "0.6.6",
+		"sharp": "0.35.3",
+		"topojson-client": "3.1.0",
 		"typescript": "5.9.3"
 	},
 	"devDependencies": {
-		"@types/node": "25.2.0"
+		"@types/better-sqlite3": "7.6.13",
+		"@types/d3-geo": "3.1.0",
+		"@types/node": "25.2.0",
+		"@types/shapefile": "0.6.4",
+		"@types/topojson-client": "3.1.5",
+		"@types/xmpp__client": "0.14.1"
 	}
 }

package/src/bootstrap.ts

@@ -11,22 +11,29 @@
     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 path from "path"
+import { TypeEvent } from "StaticTypes/Event"
+import { TypeHash } from "Types/Hash"
+import { TypeActions } from "Types/Actions"
+import { TypeNode } from "Types/Nodes"
+import { EnumThemes } from "@Enums/Themes"
 import { EventEmitter } from "node:events"
+import { client } from "@xmpp/client"
+import { Database } from "better-sqlite3"
+import { join } from "path"
 
 export const Bootstrap = {
-    Version: `3.0.63`,
+    Version: `3.0.75`,
     Ready: true,
-    Ratelimits: {},
-    Session: null,
-    Database: null,
-    Job: null,
+    Ratelimits: {} as Record<string, number[]>,
+    Session: null as ReturnType<typeof client>,
+    Database: null as Database,
+    Job: null as unknown,
     Listener: new EventEmitter(),
     Colors: {
         Red: `\x1b[31m`, Green: `\x1b[32m`, Yellow: `\x1b[33m`,
@@ -34,30 +41,33 @@ export const Bootstrap = {
         White: `\x1b[37m`, Reset: `\x1b[0m`
     },
     Cache: {
-        LastStanzaTime: null,
+        LastStanzaTime: null as number,
         Connected: false,
         Reconnecting: false,
         TotalReconnects: 0,
         Hault: false,
-        Events: {type: "FeatureCollection", features: []},
-        Nodes: {type: "FeatureCollection", features: []},
-        Hashes: [],
-        Parsed: [],
+        Events: {type: "FeatureCollection", features: [] as TypeEvent[]},
+        Nodes: {type: "FeatureCollection", features: [] as TypeNode[]},
+        Hashes: [] as TypeHash[],
+        Parsed: [] as TypeEvent[],
         UGC: new Map<string, string[]>()
     },
     Settings: {
-        Database: path.join(process.cwd(), 'shapefiles.db'),
+        Timezone: "UTC",
+        Database: join(process.cwd(), 'shapefiles.db'),
+        DebugDisableAllEvents: false,
         EnableWireService: false,
         EnableDebugging: false,
         EnableJournal: true,
+        EnhancedEventJournaling: false,
         NOAAWeatherWireServiceSettings: {
             ReconnectionSettings: {
                 Enabled: true,
                 ReconnectionInterval: 60,
             },
             CredentialSettings: {
-                Username: null,
-                Password: null,
+                Username: null as string,
+                Password: null as string,
                 Nickname: "@atmosx/event-product-parser/3.0",
             },   
             CacheSettings: {
@@ -80,45 +90,52 @@ export const Bootstrap = {
             BroadcastifyDatabase: `https://scriptkitty.cafe/ftp/@atmosphericx/assets/broadcastify.json`,
             BroadcastifyTags: [`Ham`, `Air`, `Fire`, `Public Safety`, `Weather`, `EMS`, `Police`, `Rail`]
         },
+        BoundarySettings: {
+            BoundaryDatabase: `https://scriptkitty.cafe/ftp/@atmosphericx/assets/counties-10m.json`,
+            CityDatabase: `https://scriptkitty.cafe/ftp/@atmosphericx/assets/cities500.json`
+        },
         NotifyServer: {
             Enabled: false,
             Server: `https://ntfy.sh`,
-            Timezone: "UTC",
             MediaStorage: {
-                EAS: null,
-                TEXT: null,
-                JSON: null,
+                AUDIO: null as string,
+                TEXT: null as string,
+                JSON: null as string,
+                IMAGE: null as string
             },
             Credentials: {
-                Username: null,
-                Password: null
+                Username: null as string,
+                Password: null as string
             }
         },
-        ActionSettings: [],
+        ActionSettings: [] as TypeActions[],
         GlobalSettings: {
             EventManagement: true,
             DisableGeometryParsing: false,
             UseShapefileCoordinates: true,
             SPCWatchesOnly: true,
-            ShapefileSkipPoints: 15,
+            CensusPopulationData: true,
             NodeTTL: 60,
             NodeMaxDistance: 120,
             EventFiltering: {
-                ListeningEvents: [],
-                ListeningICAO: [],
-                ListeningUGC: [],
-                ListeningStates: [],
-                IgnoredICAO: [],
+                ListeningEvents: [] as string[],
+                ListeningICAO: [] as string[],
+                ListeningUGC: [] as string[],
+                ListeningStates: [] as string[],
+                IgnoredICAO: [] as string[],
                 IgnoredEvents: [`Test Message`],
                 NodeLocationFiltering: false,
                 IgnoreTestProducts: true,
             },
+            Themes: EnumThemes,
             ArchiveSettings: {
                 TTL: 60,
-                JSONDirectory: null,
-                TextDirectory: null,
-                EasDirectory: null,
-                EasToneout: null
+                ImageDirectory: `Archive/Images` as string,
+                JSONDirectory: `Archive/Products` as string,
+                TextDirectory: `Archive/Text` as string,
+                AudioDirectory: `Archive/Audio` as string,
+                Logo: null as string,
+                AudioToneout: null as string
             }
         }
     },

package/src/{@building → building}/CreateEvent.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 { TypeStanzaCompiled } from "types/StanzaCompiled"
-import { TypeSettings } from "types/Settings"
-import { Bootstrap } from "@bootstrap"
-import { ParseText } from "@events/ParseText"
-import { ParseUGC } from "@events/ParseUGC"
-import { ParseVTEC } from "@events/ParseVTEC"
-import { ParseAPI } from "@events/ParseAPI"
-import { ValidateEvents } from "@manager/ValidateEvents"
+import { TypeStanzaCompiled } from "Types/StanzaCompiled"
+import { TypeSettings } from "Types/Settings"
+import { Bootstrap } from "@Bootstrap"
+import { ParseText } from "@Events/ParseText"
+import { ParseUGC } from "@Events/ParseUGC"
+import { ParseVTEC } from "@Events/ParseVTEC"
+import { ParseAPI } from "@Events/ParseAPI"
+import { ValidateEvents } from "@Manager/ValidateEvents"
 
 export const CreateEvent = async (Stanza: TypeStanzaCompiled): Promise<void | string> => {
     const settings = Bootstrap.Settings as TypeSettings

package/src/{@building → building}/GetCleanedEvent.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/{@building → building}/GetEventAttachments.ts

@@ -11,17 +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 { Bootstrap } from "@bootstrap"
-import { EnumStates } from "@enums/States"
-import { EnumExpressions } from "@enums/Expressions"
-import { GetLatestIssuance } from "@utilities/GetLatestIssuance"
+import { TypeEvent } from "StaticTypes/Event"
+import { EnumStates } from "@Enums/States"
+import { Bootstrap } from "@Bootstrap"
+import { EnumExpressions } from "@Enums/Expressions"
+import { GetLatestIssuance } from "@Utilities/GetLatestIssuance"
+import { CreateQuery } from "@Database/CreateQuery"
 
 interface GetEventAttachmentsResponse { 
     name: string
@@ -64,14 +65,15 @@ export const GetEventAttachments = (event: TypeEvent): GetEventAttachmentsRespon
                 const lines = [`Northern`, `Southern`, `Eastern`, `Western`, `Inland`, `Costal`, `County`]
                 const county = location?.split(',')[0]?.trim().replace(new RegExp(`^(${lines.join('|')}) `), '')
                 const state = EnumStates[location?.split(',')[1]?.trim()]
-                const feeds = Bootstrap.Database.prepare(`SELECT * FROM broadcastify WHERE state = ? AND county = ?`).all(state, county).sort((a, b) => {
+                const feeds = CreateQuery({ Query: `SELECT * FROM broadcastify WHERE state = ? AND county = ?`, Parameters: [state, county] }) as BroadcastifyResponse[];
+                const so = feeds.sort((a: BroadcastifyResponse, b: BroadcastifyResponse) => {
                     const typeOrder = ['Other', 'Public Safety'];
                     const indexA = typeOrder.indexOf(a.type);
                     const indexB = typeOrder.indexOf(b.type);
                     return indexA - indexB;
-                })
+                });
                 const tags = Bootstrap.Settings.BroadcastifySettings.BroadcastifyTags;
-                const filtered = feeds.filter((feed: BroadcastifyResponse) => tags.includes(feed.type));
+                const filtered = so.filter((feed: BroadcastifyResponse) => tags.includes(feed.type));
                 if (filtered.length > 0) {
                     filtered.map((filtered: BroadcastifyResponse) => {
                         if (!attachments.some((a) => a.link === filtered.link)) {

package/src/building/GetEventDirection.ts

@@ -0,0 +1,28 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 GetEventDirection = (message: string): string | null => {
+    const direction = message
+        .replace(/\s+/g, ' ')
+        .match(/moving\s+(north|south|east|west|northeast|northwest|southeast|southwest)\s+at\s+(\d+)\s+mph/i);
+    if (direction) {
+        return direction[1].charAt(0).toUpperCase() + direction[1].slice(1).toLowerCase() + ` @ ${direction[2]} MPH`;   
+    }
+    return null;
+};

package/src/{@building → building}/GetEventEnhancedName.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-lower/Event"
-import { EnumEnhanced } from "@enums/Enhanced"
+import { TypeEvent } from "StaticTypes/Event"
+import { EnumEnhanced } from "@Enums/Enhanced"
 
 export const GetEventEnhancedName = (event: TypeEvent): string => {
     let name = event?.properties?.event;
-
-    const damage = event?.properties?.parameters?.damage_threat
+    const damage = event?.properties?.parameters?.damage_threat ?? event?.properties?.parameters?.flood_threat
     const tornado = event?.properties?.parameters?.tornado_threat;
     const pdswatch = event?.properties?.watch_parameters?.pds_watch;
     const description = event?.properties?.description?.toLowerCase()

package/src/{@building → building}/GetEventGeometry.ts

@@ -11,32 +11,38 @@
     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 { TypeSettings } from "types/Settings"
-import { TypeEvent } from "types-lower/Event"
-import { GetSettings } from "@utilities/GetSettings"
-import { getZonePolygon } from "@parsers/ugc/GetZonePolygon"
+import { TypeSettings } from "Types/Settings"
+import { TypeEvent } from "StaticTypes/Event"
+import { Bootstrap } from "@Bootstrap"
+import { GetZonePolygon } from "@ParsingUGC/GetZonePolygon"
 
-interface GetGeometryResponse { 
+interface GetEventGeometryOptions {
+    Event: TypeEvent
+    Union?: boolean
+}
+
+interface GetEventGeometryResponse { 
     type: `Polygon` | `MultiPolygon`
     coordinates: any[]
 }
 
-export const GetEventGeometry = (event: TypeEvent): GetGeometryResponse  => {
-    const settings = GetSettings() as TypeSettings
-    const generated = event?.properties?.geocode?.polygon ?? null;
-    const ugc = event?.properties?.geocode?.ugc ?? null;
-    let geo: GetGeometryResponse = {
+export const GetEventGeometry = ({ Event, Union }: GetEventGeometryOptions): GetEventGeometryResponse  => {
+    const { properties } = Event;
+    const settings = Bootstrap.Settings as TypeSettings
+    const generated = properties?.geocode?.polygon ?? null;
+    const ugc = properties?.geocode?.ugc ?? null;
+    let geo: GetEventGeometryResponse = {
         type: `Polygon`,
         coordinates: generated != null ? JSON.parse(Buffer.from(generated, 'base64').toString('utf-8')) : null
     }
     if (settings.GlobalSettings.UseShapefileCoordinates && generated == null && ugc != null) { 
-        geo = getZonePolygon({Zones: ugc, Union: false})
+        geo = GetZonePolygon({Zones: ugc, Union: Union ?? false});
         if (geo == null) {
             geo = {
                 type: `Polygon`,

package/src/{@building → building}/GetEventHeader.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 { TypeVTEC } from "types/VTEC"
-import { TypeEventProperties } from "types-lower/Properties"
+import { TypeVTEC } from "Types/VTEC"
+import { TypeEventProperties } from "StaticTypes/Properties"
 
 interface GetHeaderOptions {
     Properties: TypeEventProperties

package/src/{@building → building}/GetEventNodes.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 { GetEventGeometry } from "@building/GetEventGeometry"
-import { GetShapeNearestPoint } from "@utilities/GetShapeNearestPoint"
+import { TypeEvent } from "StaticTypes/Event"
+import { Bootstrap } from "@Bootstrap"
+import { GetEventGeometry } from "@Building/GetEventGeometry"
+import { GetShapeNearestPoint } from "@Utilities/GetShapeNearestPoint"
 
 interface GetEventNodesResponse { 
     nodes: {
@@ -40,30 +40,32 @@ export const GetEventNodes = async (event: TypeEvent): Promise<GetEventNodesResp
     if (!nodes || nodes.length === 0) {
         return { nodes: [], filtered: false, updated: Date.now() };
     }
-    const metadata = { nodes: [], proximity: false, filtered: false };
-    const geometry = await GetEventGeometry(event);
+    const metadata = { nodes: [] as GetEventNodesResponse['nodes'], proximity: false, filtered: false };
+    const geometry = await GetEventGeometry({ Event: event });;
     if (!geometry || !geometry.coordinates) {
         return { nodes: [], filtered: false, updated: Date.now() }
     }
     for (const node of nodes) {
-        const [longitude, latitude] = node.geometry.coordinates;
+        const [longitude, latitude] = (node?.geometry?.coordinates ?? []) as [number, number];
+        
         const getPoint = GetShapeNearestPoint({ Coordinates: geometry.coordinates, Point: [longitude, latitude] });
         const miles = getPoint.Distance ?? null;
-        const kilometers = Number((miles * 1.609344).toFixed(3));
+        const kilometers = miles != null ? Number((miles * 1.609344).toFixed(3)) : null;
 
         const info = {
             id: node.properties?.identifier,
-            coordinates: [longitude, latitude],
-            nearest: getPoint.Point,
+            coordinates: [longitude, latitude] as [number, number],
+            nearest: getPoint.Point as [number, number],
             miles,
             kilometers,
             proximity: false
-        }
+        };
+        
         if (miles != null && (miles < Bootstrap.Settings.GlobalSettings.NodeMaxDistance)) {
             info.proximity = true;
             metadata.proximity = true;
         }
-        metadata.nodes.push(info)
+        metadata.nodes.push(info);
     }
     return {
         nodes: metadata.nodes,

package/src/{@building → building}/GetEventOffice.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 { TypeAttributes } from "types-lower/Attributes"
-import { TypeVTEC } from "types/VTEC"
-import { EnumICAO } from "@enums/ICAO"
+import { TypeAttributes } from "StaticTypes/Attributes"
+import { TypeVTEC } from "Types/VTEC"
+import { EnumICAO } from "@Enums/ICAO"
 
 interface GetOfficeOptions { 
     Attributes: TypeAttributes

package/src/building/GetEventPopulation.ts

@@ -0,0 +1,58 @@
+/*
+              _                             _               _     __   __
+         /\  | |                           | |             (_)    \ \ / /
+        /  \ | |_ _ __ ___   ___  ___ _ __ | |__   ___ _ __ _  ___ \ 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 { TypeCities } from "StaticTypes/Properties"
+import { Bootstrap } from "@Bootstrap"
+import { CreateQuery } from "@Database/CreateQuery"
+import { NormalizePolygon } from "@ImageModules/NormalizePolygon"
+
+interface GetEventPopulationResponse { 
+    population: number
+    cities: TypeCities[]
+}
+
+export const GetEventPopulation = (geometry: GeoJSON.Polygon | GeoJSON.MultiPolygon | null): GetEventPopulationResponse => {
+    const coordinates = geometry?.coordinates;
+    if (!coordinates || !Array.isArray(coordinates) || coordinates.length === 0 || !Bootstrap.Settings.GlobalSettings.CensusPopulationData) {
+        return { population: 0, cities: [] };
+    }
+    const normalized = NormalizePolygon(geometry) as GeoJSON.Polygon | GeoJSON.MultiPolygon;
+    const points = normalized.type === `Polygon` ? normalized.coordinates[0] : normalized.coordinates.flatMap(polygon => polygon[0]);
+    const latitudes = points.map(([lon, lat]) => lat);
+    const longitudes = points.map(([lon, lat]) => lon);
+    const minLat = Math.min(...latitudes);
+    const maxLat = Math.max(...latitudes);
+    const minLon = Math.min(...longitudes);
+    const maxLon = Math.max(...longitudes);
+    const A = CreateQuery({
+        Query: `SELECT * FROM cities WHERE LAT BETWEEN ? AND ? AND LON BETWEEN ? AND ?`,
+        Parameters: [ minLat, maxLat, minLon, maxLon ]
+    });
+    const population = A.reduce((acc: number, city: any) => {
+        const census = Number(city.population);
+        return acc + (isNaN(census) ? 0 : census);
+    }, 0);
+    const cities = A.map((city: any) => ({
+        name: city.name,
+        state: city.state,
+        county: city.county.replace(/ County$/i, ``),
+        population: Number(city.population)
+    }));
+    return { population, cities };
+}

package/src/{@building → building}/GetEventProperties.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 { TypeEventProperties } from "types-lower/Properties"
-import { TypeAttributes } from "types-lower/Attributes"
-import { TypeUGC } from "types/UGC"
-import { TypeVTEC } from "types/VTEC"
-import { TypeHVTEC } from "types/HVTEC"
-import { EnumExpressions } from "@enums/Expressions"
-import { GetDescriptionFromProduct } from "@parsers/text/GetDescriptionFromProduct"
-import { getPolygonFromProduct } from "@parsers/text/GetPolygonFromProduct"
-import { GetTextFromProduct } from "@parsers/text/GetTextFromProduct"
-import { GetEventOffice } from "@building/GetEventOffice"
-import { GetEventTags } from "@building/GetEventTags"
+import { TypeEventProperties } from "StaticTypes/Properties"
+import { TypeAttributes } from "StaticTypes/Attributes"
+import { TypeUGC } from "Types/UGC"
+import { TypeVTEC } from "Types/VTEC"
+import { EnumExpressions } from "@Enums/Expressions"
+import { GetDescriptionFromProduct } from "@ParsingText/GetDescriptionFromProduct"
+import { GetPolygonFromProduct } from "@ParsingText/GetPolygonFromProduct"
+import { GetTextFromProduct } from "@ParsingText/GetTextFromProduct"
+import { GetEventOffice } from "@Building/GetEventOffice"
+import { GetEventTags } from "@Building/GetEventTags"
+import { GetEventDirection } from "@Building/GetEventDirection"
 
 interface GetEventPropertiesOptions { 
     Message: string
@@ -36,24 +36,28 @@ interface GetEventPropertiesOptions {
     VTEC?: TypeVTEC
 }
 
-
 export const GetEventProperties = ({ Message, Attributes, UGC, VTEC }: GetEventPropertiesOptions): TypeEventProperties => {
     const organization = Message.match(EnumExpressions.wmo)?.[0] ?? null
-    const polygons = getPolygonFromProduct(Message)
+    const polygons = GetPolygonFromProduct(Message)
     const properties = {
         locations: UGC?.Locations?.join(`; `) ?? null,
         locations_array: UGC?.Locations ?? [],
-        location_states: [...new Set(
-            UGC?.Locations
-            ?.map((location: string) => location.match(/,\s*([A-Z]{2})\b/)?.[1])
+        regions: [...new Set(
+            UGC?.Zones
+            ?.map((location: string) => location.match(/^([A-Z]{2})[CZ](\d{3})$/)?.[1])
             .filter(Boolean) ?? []
         )],
+        regions_string: (() => {
+            const abbrs = [...new Set(UGC?.Zones?.map((l: string) => l.match(/^([A-Z]{2})[CZ](\d{3})$/)?.[1]).filter(Boolean) ?? [])];
+            return abbrs.length ? abbrs.join(`-`) : null;
+        })(),
         description: GetDescriptionFromProduct({ Message: Message, Handle: VTEC?.Raw ?? null }),
         attributes: Attributes,
         geocode: {
             office: GetEventOffice({ Attributes: Attributes, Organization: organization, VTEC: VTEC }),
             organization: organization,
             ugc: UGC?.Zones ?? [],
+            census: {},
             polygon: polygons.length > 0 ? Buffer.from(JSON.stringify([polygons])).toString('base64') : null,
             polygon_generated: polygons.length > 0 ? true : false
         },
@@ -65,6 +69,7 @@ export const GetEventProperties = ({ Message, Attributes, UGC, VTEC }: GetEventP
             impacts: GetTextFromProduct({ Message: Message, Find: [`IMPACT...`], Removal: [`.`]}) ?? null,
             estimated_hail_size: GetTextFromProduct({ Message: Message, Find: [`MAX HAIL SIZE...`, `HAIL...`], Removal: ['in']}) ?? null,
             estimated_wind_gusts: GetTextFromProduct({ Message: Message, Find: [`MAX WIND GUST...`, `WIND...`]}) ?? null,
+            direction: GetEventDirection(Message) ?? null,
             damage_threat: GetTextFromProduct({ Message: Message, Find: [`DAMAGE THREAT...`], Removal: []}) ?? null,
             tornado_threat: GetTextFromProduct({ Message: Message, Find: [`TORNADO...`, `WATERSPOUT...`] }) ?? null,
             flood_threat: GetTextFromProduct({ Message: Message, Find: [`FLASH FLOOD...`]}) ?? null,