db/nexrad.sql

@@ -4,7 +4,7 @@ select InitSpatialMetadata(1);
 begin transaction;
 
 create table nexrad_wfo (
-    code    TEXT PRIMARY KEY NOT NULL,
+    code    TEXT NOT NULL,
     city    TEXT NOT NULL,
     state   TEXT NOT NULL,
     address TEXT NOT NULL
@@ -15,9 +15,9 @@ select
     CreateSpatialIndex('nexrad_wfo', 'coord');
 
 create table nexrad_radar (
-    call           TEXT PRIMARY KEY NOT NULL,
-    name           TEXT NOT NULL,
     wban           INTEGER,
+    call           TEXT NOT NULL,
+    name           TEXT NOT NULL,
     site_elevation FLOAT NOT NULL,
     tower_height   FLOAT NOT NULL
 );

lib/nexrad/afos.py

@@ -217,6 +217,7 @@ class AFOSMessageParser():
             self.message.vtec_end   = vtec.timestamp_end
             self.message.vtec_type  = vtec.typeof
             self.message.actions    = vtec.actions
+            self.message.wfo        = vtec.wfo
             self.message.phenom     = vtec.phenom
             self.message.sig        = vtec.sig
             self.message.etn        = vtec.etn
@@ -249,7 +250,6 @@ class AFOSMessageParser():
 
         if match is not None:
             self.message.product = match['product']
-            self.message.wfo     = match['wfo']
             self.state = AFOSMessageParserState.BODY
 
     def parse_body(self, line: str):