Skip to content

Igrac updates #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meomancer merged 2 commits into from
May 26, 2024
Merged

Igrac updates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca177c
Update DescribeSensor response
meomancer May 24, 2024
9b529d8
Add new metadata to DescribeSensor
meomancer May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions istsoslib/renderers/DSresponseRender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ def render(DS,sosConfig):
if not (field["name_uom"]=="" or field["name_uom"]==None or field["name_uom"]=="NULL"):
uom = et.SubElement(quantity,"{%s}uom" % ns["swe"])
uom.attrib["code"] = field["name_uom"]

interval = et.SubElement(quantity, "{%s}interval" % ns['swe'])
begin = et.SubElement(interval, "{%s}begin" % ns['swe'])
begin.text = field['begin'].strftime("%Y-%m-%dT%H:%M:%S.%fZ")
end = et.SubElement(interval, "{%s}end" % ns['swe'])
end.text = field['end'].strftime("%Y-%m-%dT%H:%M:%S.%fZ")
"""
if not (field["desc_opr"]=="" or field["desc_opr"]==None or field["desc_opr"]=="NULL"):
description = et.SubElement(quantity,"{%s}description" % ns["swe"])
Expand Down Expand Up @@ -262,6 +268,37 @@ def render(DS,sosConfig):
for index, field in enumerate(DS.sensorProperties):
name = tree.find("{%s}member/{%s}System/{%s}name" % (ns['sml'], ns['sml'], ns['gml']))
name.text = field['name']

photo = et.Element("{%s}photo" % ns["gml"])
if field["photo"]:
photo.text = field["photo"]
name.addnext(photo)

org = et.Element("{%s}OriginatingOrganization" % ns["gml"])
if field["manager"]:
org.text = field["manager"]
photo.addnext(org)

# Hydrogeology
hydrogeology = et.Element("{%s}Hydrogeology" % ns["gml"])
aquifer = et.SubElement(hydrogeology, "{%s}Aquifer" % ns["gml"])
aquifer_name = et.SubElement(aquifer, "{%s}AquiferName" % ns["gml"])
if field["aquifer_name"]:
aquifer_name.text = field["aquifer_name"]
aquifer_material = et.SubElement(aquifer, "{%s}AquiferMaterial" % ns["gml"])
if field["aquifer_material"]:
aquifer_material.text = field["aquifer_material"]
aquifer_type = et.SubElement(aquifer, "{%s}AquiferType" % ns["gml"])
if field["aquifer_type"]:
aquifer_type.text = field["aquifer_type"]
aquifer_thickness = et.SubElement(aquifer, "{%s}AquiferThickness" % ns["gml"])
if field["aquifer_thickness"]:
aquifer_thickness.text = field["aquifer_thickness"]
confinement = et.SubElement(aquifer, "{%s}Confinement" % ns["gml"])
if field["confinement"]:
confinement.text = field["confinement"]
org.addnext(hydrogeology)

id = tree.find("{%s}member/{%s}System/{%s}identification/{%s}IdentifierList/{%s}identifier/{%s}Term/{%s}value" % (ns['sml'], ns['sml'], ns['sml'], ns['sml'], ns['sml'], ns['sml'], ns['sml']))
id.text = field['ggis_uid']
point = tree.find("{%s}member/{%s}System/{%s}location/{%s}Point" % (ns['sml'], ns['sml'], ns['sml'], ns['gml']))
Expand Down
10 changes: 7 additions & 3 deletions istsoslib/responders/DSresponse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ def __init__(self, filter, pgdb):
if not os.path.isfile(self.smlFile):
raise Exception("SensorML file for procedure '%s' not found!" % (filter.procedure))

sqlProc = "SELECT def_opr, name_opr, desc_opr, constr_pro, name_uom, id_pro"
# TODO:
# IGRAC specified
sqlProc = "SELECT def_opr, name_opr, desc_opr, constr_pro, name_uom, id_pro, po.begin_measurement as begin, po.end_measurement as end"
sqlProc += " FROM %s.observed_properties opr, %s.proc_obs po," % (filter.sosConfig.schema, filter.sosConfig.schema)
sqlProc += " %s.procedures pr, %s.uoms um" % (filter.sosConfig.schema, filter.sosConfig.schema)
sqlProc += " WHERE opr.id_opr=po.id_opr_fk AND pr.id_prc=po.id_prc_fk AND um.id_uom = po.id_uom_fk"
Expand All @@ -129,9 +131,11 @@ def __init__(self, filter, pgdb):

# SPECIFICALLY FOR IGRAC SENSOR
fields = [
'longitude', 'latitude', 'elevation_value', 'elevation_unit',
'longitude', 'photo', 'latitude', 'elevation_value', 'elevation_unit',
'original_id', 'ggis_uid', 'name', 'id', 'country', 'license',
'restriction_code_type', 'constraints_other', 'organisation'
'restriction_code_type', 'constraints_other', 'organisation',
'manager', 'aquifer_name', 'aquifer_material', 'aquifer_type',
'aquifer_thickness', 'confinement'
]

sqlProc = f"SELECT {','.join(fields)} from {filter.sosConfig.schema}.vw_istsos_sensor WHERE original_id='{filter.procedure}' LIMIT 1 "
Expand Down