Further document NMOSE POD & Update README/CHANGELOG

Author: jacob-a-brown

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - `earliest_date`, `earliest_time`, `earliest_value`, and `earliest_units` to the summary table
 - `die wells` to get all wells for which the DIE reports observations
 - `die source {parameter}` to list sources that report a particular parameter
+- NM OSE PODs, though its information is only currently available for the invocation of `die wells`
 
 ### Changed
 - NM OSE Roswell data is now pulled from ST2 and not CKAN

README.md

@@ -30,6 +30,8 @@ Data comes from the following sources. We are continuously adding new sources as
   - Available data: `water levels`, `water quality`
 - [New Mexico Environment Department Drinking Water Bureau (NMED DWB)](https://nmenv.newmexicowaterdata.org/FROST-Server/v1.1/)
   - Available data: `water quality`
+- [New Mexico Office of the State Engineer Points of Diversions (NMOSEPODs)](https://services2.arcgis.com/qXZbWTdPDbTjl7Dy/ArcGIS/rest/services/OSE_PODs/FeatureServer/0)
+  - Available data: `None`
 - [New Mexico Office of the State Engineer ISC Seven Rivers (NMOSE ISC Seven Rivers)](https://nmisc-wf.gladata.com/api/getMonitoringPoints.ashx)
   - Available data: `water levels`, `water quality`
 - [New Mexico Office of the State Engineer Roswell District Office (NMOSE Roswell)](https://catalog.newmexicowaterdata.org/dataset/pecos_region_manual_groundwater_levels)
@@ -63,6 +65,7 @@ where `{parameter}` is the name of the parameter whose data is to be retrieved,
 | **nmbgmr-amp**             | X           | X       | X           | X       | X         | X        | X        | X         | X       | X   | X         | X      | X      | X       | X   | X       |
 | **nmed-dwb**               | -           | X       | X           | X       | -         | X        | X        | X         | X       | X   | X         | X      | X      | X       | X   | X       |
 | **nmose-isc-seven-rivers** | X           | -       | X           | X       | -         | X        | X        | X         | X       | X   | X         | X      | X      | X       | X   | -       |
+| **nmose-pod**              | -           | -       | -           | -       | -         | -        | -        | -         | -       | -   | -         | -      | -      | -       | -   | -       |
 | **nmose-roswell**          | X           | -       | -           | -       | -         | -        | -        | -         | -       | -   | -         | -      | -      | -       | -   | -       |
 | **nwis**                   | X           | -       | -           | -       | -         | -        | -        | -         | -       | -   | -         | -      | -      | -       | -   | -       |
 | **pvacd**                  | X           | -       | -           | -       | -         | -        | -        | -         | -       | -   | -         | -      | -      | -       | -   | -       |
@@ -171,6 +174,7 @@ The Data Integration Engine enables the user to obtain groundwater level and gro
 - `--no-nmbgmr-amp` to exclude New Mexico Bureau of Geology and Mineral Resources (NMBGMR) Aquifer Mapping Program (AMP) data
 - `--no-nmed-dwb` to exclude New Mexico Environment Department (NMED) Drinking Water Bureau (DWB) data
 - `--no-nmose-isc-seven-rivers` to exclude New Mexico Office of State Engineer (NMOSE) Interstate Stream Commission (ISC) Seven Rivers data
+- `--no-nmose-pod` to exclude New Mexico Office of State Engineer (NMOSE) Point of Diversion (POD) data (though none except for well information is currently available)
 - `--no-nmose-roswell` to exclude New Mexico Office of State Engineer (NMOSE) Roswell data
 - `--no-nwis` to exclude USGS NWIS data
 - `--no-pvacd` to exclude Pecos Valley Artesian Convservancy District (PVACD) data

backend/config.py

@@ -91,11 +91,11 @@
     "nmbgmr_amp": NMBGMRSiteSource,
     "nmed_dwb": DWBSiteSource,
     "nmose_isc_seven_rivers": ISCSevenRiversSiteSource,
+    "nmose_pod": NMOSEPODSiteSource,
     "nmose_roswell": NMOSERoswellSiteSource,
     "nwis": NWISSiteSource,
     "pvacd": PVACDSiteSource,
     "wqp": WQPSiteSource,
-    "nmose_pod": NMOSEPODSiteSource,
 }
 
 SOURCE_KEYS = sorted(list(SOURCE_DICT.keys()))
@@ -134,11 +134,11 @@ class Config(Loggable):
     use_source_nmbgmr_amp: bool = True
     use_source_nmed_dwb: bool = True
     use_source_nmose_isc_seven_rivers: bool = True
+    use_source_nmose_pod: bool = True
     use_source_nmose_roswell: bool = True
     use_source_nwis: bool = True
     use_source_pvacd: bool = True
     use_source_wqp: bool = True
-    use_source_nmose_pod: bool = True
 
     # parameter
     parameter: str = ""
@@ -205,12 +205,13 @@ def get_config_and_false_agencies(self):
                 "ebid",
                 "nmbgmr_amp",
                 "nmose_isc_seven_rivers",
+                "nmose_pod",
                 "nmose_roswell",
                 "nwis",
                 "pvacd",
                 "wqp",
             ]
-            false_agencies = ["bor", "nmed_dwb"]
+            false_agencies = ["bor", "nmose_pod", "nmed_dwb"]
         elif self.parameter == CARBONATE:
             config_agencies = ["nmbgmr_amp", "wqp"]
             false_agencies = [
@@ -220,6 +221,7 @@ def get_config_and_false_agencies(self):
                 "ebid",
                 "nmed_dwb",
                 "nmose_isc_seven_rivers",
+                "nmose_pod",
                 "nmose_roswell",
                 "nwis",
                 "pvacd",
@@ -232,6 +234,7 @@ def get_config_and_false_agencies(self):
                 "ebid",
                 "nmose_isc_seven_rivers",
                 "nmose_roswell",
+                "nmose_pod",
                 "nwis",
                 "pvacd",
             ]
@@ -261,6 +264,7 @@ def get_config_and_false_agencies(self):
                 "cabq",
                 "ebid",
                 "nmose_roswell",
+                "nmose_pod",
                 "nwis",
                 "pvacd",
             ]

frontend/cli.py

@@ -82,6 +82,13 @@ def cli():
         show_default=True,
         help="Exclude NMOSE ISC Seven Rivers data. Default is to include",
     ),
+    click.option(
+        "--no-nmose-pod",
+        is_flag=True,
+        default=True,
+        show_default=True,
+        help="Exclude NMOSE POD data. Default is to include",
+    ),
     click.option(
         "--no-nmose-roswell",
         is_flag=True,
@@ -228,6 +235,7 @@ def weave(
     no_nmbgmr_amp,
     no_nmed_dwb,
     no_nmose_isc_seven_rivers,
+    no_nmose_pod,
     no_nmose_roswell,
     no_nwis,
     no_pvacd,
@@ -309,6 +317,7 @@ def wells(
     no_nmbgmr_amp,
     no_nmed_dwb,
     no_nmose_isc_seven_rivers,
+    no_nmose_pod,
     no_nmose_roswell,
     no_nwis,
     no_pvacd,

setup.py

@@ -21,7 +21,7 @@
 
 setup(
     name="nmuwd",
-    version="0.8.0",
+    version="0.8.1",
     author="Jake Ross",
     description="New Mexico Water Data Integration Engine",
     long_description=long_description,