xan/xmet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: xan:90993e08d1a01779af61641f8dc760f56f01c6d5
Branches Tags
xan:main
..
compare: xan:547545a665bee8313d3f6cd67d4b4007c42bb95c
Branches Tags
xan:main

No commits in common. "90993e08d1a01779af61641f8dc760f56f01c6d5" and "547545a665bee8313d3f6cd67d4b4007c42bb95c" have entirely different histories.
90993e08d1 ... 547545a665

2 changed files with 14 additions and 58 deletions
Show stats Expand all files Collapse all files

33
db/xmet.sql
View file

@ -140,37 +140,4 @@ create table xmet_sounding_sample (
create index xmet_sounding_sample_sounding_id_idx on xmet_sounding_sample (sounding_id); create index xmet_sounding_sample_sounding_id_idx on xmet_sounding_sample (sounding_id);
create table xmet_spc_outlook (
id INTEGER PRIMARY KEY NOT NULL,
timestamp_issued TIMESTAMP NOT NULL,
timestamp_start TIMESTAMP NOT NULL,
timestamp_end TIMESTAMP NOT NULL,
day INTEGER NOT NULL,
text_raw TEXT NOT NULL,
body TEXT NOT NULL
);
create table xmet_spc_outlook_probability_area (
id INTEGER PRIMARY KEY NOT NULL,
outlook_id INTEGER NOT NULL,
hazard TEXT NOT NULL,
probability INTEGER NOT NULL,
FOREIGN KEY (outlook_id) REFERENCES xmet_spc_outlook (id)
);
select AddGeometryColumn('xmet_spc_outlook_probability_area', 'poly', 4326, 'POLYGON'),
CreateSpatialIndex('xmet_spc_outlook_probability_area', 'poly');
create table xmet_spc_outlook_category_area (
id INTEGER PRIMARY KEY NOT NULL,
outlook_id INTEGER NOT NULL,
category TEXT NOT NULL,
FOREIGN KEY (outlook_id) REFERENCES xmet_spc_outlook (id)
);
select AddGeometryColumn('xmet_spc_outlook_category_area', 'poly', 4326, 'POLYGON'),
CreateSpatialIndex('xmet_spc_outlook_category_area', 'poly');
commit; commit;

21
lib/xmet/spc.py
View file

@ -48,7 +48,7 @@ RE_HAZARD = re.compile(r'''
RE_POINTS_START = re.compile(r''' RE_POINTS_START = re.compile(r'''
^(?P<category>[A-Z0-9\.]+) ^(?P<category>[A-Z0-9\.]+)
(?P<rest>(?:\s+\d{8}){1,6}) (?P<rest>\s+\d{8}){1,6}
''', re.X) ''', re.X)
RE_POINTS = re.compile(r'^(?:\s+\d{8}){1,6}$') RE_POINTS = re.compile(r'^(?:\s+\d{8}){1,6}$')
@ -68,18 +68,8 @@ def parse_coord(coord: str) -> tuple[float, float]:
0.01 * int(coord[0:4]) 0.01 * int(coord[0:4])
) )
def each_poly(parts: list[str]): def parse_poly(points: list[str]) -> shapely.Polygon:
points = list() return shapely.Polygon([parse_coord(p) for p in points])
for part in parts:
if part == '99999999':
yield shapely.Polygon(points)
points = list()
else:
points.append(parse_coord(part))
if len(points) > 0:
yield shapely.Polygon(points)
class SPCOutlookArea(DatabaseTable): class SPCOutlookArea(DatabaseTable):
__slots__ = ('id', 'outlook_id', 'poly') __slots__ = ('id', 'outlook_id', 'poly')
@ -286,18 +276,17 @@ class SPCOutlookParser():
self.state = SPCOutlookParserState.AREA_THREAT self.state = SPCOutlookParserState.AREA_THREAT
def handle_area(self): def handle_area(self):
for poly in each_poly(self.points):
if self.area_type == 'PROBABILISTIC': if self.area_type == 'PROBABILISTIC':
area = SPCOutlookProbabilityArea() area = SPCOutlookProbabilityArea()
area.hazard = self.hazard area.hazard = self.hazard
area.probability = self.category area.probability = self.category
area.poly = poly area.poly = parse_poly(self.points)
self.outlook.probabilities.append(area) self.outlook.probabilities.append(area)
elif self.area_type == 'CATEGORICAL': elif self.area_type == 'CATEGORICAL':
area = SPCOutlookCategoryArea() area = SPCOutlookCategoryArea()
area.category = self.category area.category = self.category
area.poly = poly area.poly = parse_poly(self.points)
self.outlook.categories.append(area) self.outlook.categories.append(area)