feat: added additional thing_types, PS, ES, M

Author: jirhiker

core/lexicon.json

@@ -31,6 +31,9 @@
 
   {"category": "thing_type", "term": "water well", "definition": "a hole drill into the ground to access groundwater"},
   {"category": "thing_type", "term": "spring", "definition": "a natural discharge of groundwater at the surface"},
+  {"category": "thing_type", "term": "perennial stream", "definition": "that has a continuous flow of water throughout the year, even during drier periods."},
+  {"category": "thing_type", "term": "ephemeral stream", "definition": "a stream that flows only briefly during and after precipitation events"},
+  {"category": "thing_type", "term": "meteorological station", "definition": "a station that measures the weather conditions at a particular location"},
 
   {"category": "level_status", "term": "dry", "definition": "well is dry"},
   {"category": "level_status", "term": "normal", "definition": "normal well water level status"},

transfers/transfer2.py

@@ -200,10 +200,9 @@ def transfer_water_levels(session):
 
 ADDED = []
 
-
-def transfer_springs(session, limit=None):
+def transfer_thing(session, site_type, make_payload, limit=None):
     ldf = pd.read_csv("./data/location.csv")
-    ldf = ldf[ldf["SiteType"] == "SP"]
+    ldf = ldf[ldf["SiteType"] == site_type]
     ldf = ldf[ldf["Easting"].notna() & ldf["Northing"].notna()]
     n = len(ldf)
     start_time = time.time()
@@ -223,11 +222,7 @@ def transfer_springs(session, limit=None):
 
         spring = add_thing(
             session,
-            {
-                "name": row.PointID,
-                "thing_type": "spring",
-                "release_status": "public" if row.PublicRelease else "private",
-            },
+            make_payload(row),
         )
         assoc = LocationThingAssociation()
 
@@ -236,6 +231,47 @@ def transfer_springs(session, limit=None):
         session.add(assoc)
 
 
+def transfer_springs(session, limit=None):
+    def make_payload(row):
+        return {
+            "name": row.PointID,
+            "thing_type": "spring",
+            "release_status": "public" if row.PublicRelease else "private",
+        }
+
+    transfer_thing(session, "SP", make_payload, limit)
+
+
+def transfer_perennial_stream(session, limit=None):
+    def make_payload(row):
+        return {
+            "name": row.PointID,
+            "thing_type": "perennial stream",
+            "release_status": "public" if row.PublicRelease else "private",
+        }
+    transfer_thing(session, "PS", make_payload, limit)
+
+
+def transfer_ephemeral_stream(session, limit=None):
+    def make_payload(row):
+        return {
+            "name": row.PointID,
+            "thing_type": "ephemeral stream",
+            "release_status": "public" if row.PublicRelease else "private",
+        }
+    transfer_thing(session, "ES", make_payload, limit)
+
+
+def transfer_met(session, limit=None):
+    def make_payload(row):
+        return {
+            "name": row.PointID,
+            "thing_type": "meteorological station",
+            "release_status": "public" if row.PublicRelease else "private",
+        }
+    transfer_thing(session, "M", make_payload, limit)
+
+
 def transfer_wells(session, limit=None):
     wdf = pd.read_csv("./data/welldata.csv")
     ldf = pd.read_csv("./data/location.csv")
@@ -356,7 +392,10 @@ def transfer_wellscreens(session, limit=None):
     with session_ctx() as sess:
         transfer_wells(sess, 1000)
         transfer_springs(sess, limit=1000)
+        transfer_perennial_stream(sess)
+        transfer_ephemeral_stream(sess)
+        transfer_met(sess)
         # transfer_wellscreens(sess)
-        transfer_water_levels(sess)
+        # transfer_water_levels(sess)
 
 # ============= EOF =============================================