From 7ea502f950b3caa7d1ebe094b13e4147be348ec6 Mon Sep 17 00:00:00 2001
From: David Blodgett <dblodgett@usgs.gov>
Date: Mon, 7 Oct 2024 09:15:00 -0500
Subject: [PATCH] update nldi service urls (#167)

---
 dataretrieval/nldi.py                         |  2 +-
 tests/data/nldi_get_features_by_comid.json    | 90 +++++++++----------
 ...tures_by_feature_source_with_nav_mode.json | 18 ++--
 ...es_by_feature_source_without_nav_mode.json |  2 +-
 tests/data/nldi_get_features_by_lat_long.json |  2 +-
 5 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/dataretrieval/nldi.py b/dataretrieval/nldi.py
index 157f0475..a3825704 100644
--- a/dataretrieval/nldi.py
+++ b/dataretrieval/nldi.py
@@ -8,7 +8,7 @@
 except ImportError:
     raise ImportError("Install geopandas to use the NLDI module.")
 
-NLDI_API_BASE_URL = "https://labs.waterdata.usgs.gov/api/nldi/linked-data"
+NLDI_API_BASE_URL = "https://api.water.usgs.gov/nldi/linked-data"
 _AVAILABLE_DATA_SOURCES = None
 _CRS = "EPSG:4326"
 
diff --git a/tests/data/nldi_get_features_by_comid.json b/tests/data/nldi_get_features_by_comid.json
index bd86d214..85ce3792 100644
--- a/tests/data/nldi_get_features_by_comid.json
+++ b/tests/data/nldi_get_features_by_comid.json
@@ -15,7 +15,7 @@
         "name": "STRICKER'S POND AT MIDDLETON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-054279485/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-054279485/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-054279485/navigation"
       }
     },
     {
@@ -32,7 +32,7 @@
         "name": "UN LAKE - UN LAKE",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10001231/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10001231/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10001231/navigation"
       }
     },
     {
@@ -49,7 +49,7 @@
         "name": "South Kenosha Drive Storm Sewer in Madison (USGS 430402089282000)",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10034975/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10034975/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10034975/navigation"
       }
     },
     {
@@ -66,7 +66,7 @@
         "name": "Lake Mendota - Marshall Park Beach",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10037966/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10037966/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10037966/navigation"
       }
     },
     {
@@ -83,7 +83,7 @@
         "name": "Lake Mendota at Upham Ct",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10043400/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10043400/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10043400/navigation"
       }
     },
     {
@@ -100,7 +100,7 @@
         "name": "Stricker Pond - Deep Hole",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133461/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133461/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133461/navigation"
       }
     },
     {
@@ -117,7 +117,7 @@
         "name": "Tiedeman Pond - E Side Gammon Rd",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133524/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133524/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133524/navigation"
       }
     },
     {
@@ -134,7 +134,7 @@
         "name": "Lake Mendota -- Middleton Boat Ramp",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133464/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133464/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133464/navigation"
       }
     },
     {
@@ -151,7 +151,7 @@
         "name": "Lake Mendota -- Marshall Park Boat Park",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10017941/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10017941/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10017941/navigation"
       }
     },
     {
@@ -168,7 +168,7 @@
         "name": "Lake Mendota - Pheasant Branch Deep Area",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10031991/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10031991/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10031991/navigation"
       }
     },
     {
@@ -185,7 +185,7 @@
         "name": "Lake Mendota - Lake Mendota Beach",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10033468/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10033468/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10033468/navigation"
       }
     },
     {
@@ -202,7 +202,7 @@
         "name": "SPRING HARBOR STORM SEWER AT MADISON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-05427965/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-05427965/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-05427965/navigation"
       }
     },
     {
@@ -219,7 +219,7 @@
         "name": "Lake Mendota -- Mendota County Park Boat Launch",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10017575/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10017575/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10017575/navigation"
       }
     },
     {
@@ -236,7 +236,7 @@
         "name": "Lake Mendota - east end St. Cyr Rd",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10043399/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10043399/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10043399/navigation"
       }
     },
     {
@@ -253,7 +253,7 @@
         "name": "Stonefield Infilitration Pond At Middleton WI",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133532/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133532/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133532/navigation"
       }
     },
     {
@@ -270,7 +270,7 @@
         "name": "OWEN PARK RAIN GARDEN AT MADISON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430423089291401/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430423089291401/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430423089291401/navigation"
       }
     },
     {
@@ -287,7 +287,7 @@
         "name": "Lake Mendota - Picnic Point Beach",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10039736/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10039736/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10039736/navigation"
       }
     },
     {
@@ -304,7 +304,7 @@
         "name": "SOUTH KENOSHA DRIVE STORM SEWER AT MADISON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430402089282000/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430402089282000/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430402089282000/navigation"
       }
     },
     {
@@ -321,7 +321,7 @@
         "name": "TIEDEMAN'S POND AT MIDDLETON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-05427949/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-05427949/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-05427949/navigation"
       }
     },
     {
@@ -338,7 +338,7 @@
         "name": "SOUTH YELLOWSTONE DRIVE STORM SEWER AT MADISON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430356089293601/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430356089293601/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430356089293601/navigation"
       }
     },
     {
@@ -355,7 +355,7 @@
         "name": "DN-07/09E/16-0303",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430519089263001/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430519089263001/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430519089263001/navigation"
       }
     },
     {
@@ -372,7 +372,7 @@
         "name": "South Kenosha Drive (East) Storm Sewer at Madison WI",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10040786/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10040786/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10040786/navigation"
       }
     },
     {
@@ -389,7 +389,7 @@
         "name": "STONEFIELD INFILTRATION POND AT MIDDLETON",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430515089300601/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430515089300601/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430515089300601/navigation"
       }
     },
     {
@@ -406,7 +406,7 @@
         "name": "DN-07/09E/18-0003SP",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430453089280001/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430453089280001/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430453089280001/navigation"
       }
     },
     {
@@ -423,7 +423,7 @@
         "name": "LAKE MENDOTA - SPRING HARBOR BEACH",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133542/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133542/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133542/navigation"
       }
     },
     {
@@ -440,7 +440,7 @@
         "name": "Lake Mendota - West Side",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133536/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133536/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133536/navigation"
       }
     },
     {
@@ -457,7 +457,7 @@
         "name": "LAKE MENDOTA, WEST BAY, AT MADISON, WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430600089272001/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430600089272001/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430600089272001/navigation"
       }
     },
     {
@@ -474,7 +474,7 @@
         "name": "Tiedman Pond - Deep Hole",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133460/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133460/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133460/navigation"
       }
     },
     {
@@ -491,7 +491,7 @@
         "name": "SALERNO CT. MIDDLETON - ARBOR LAKES",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133515/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133515/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133515/navigation"
       }
     },
     {
@@ -508,7 +508,7 @@
         "name": "TIEDMAN POND AT MIDDLETON",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430524089301901/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430524089301901/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430524089301901/navigation"
       }
     },
     {
@@ -525,7 +525,7 @@
         "name": "DN-07/08E/12-0921",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430540089294001/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430540089294001/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430540089294001/navigation"
       }
     },
     {
@@ -542,7 +542,7 @@
         "name": "South Yellowstone Drive Storm Sewer at Madison WI",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10040785/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10040785/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10040785/navigation"
       }
     },
     {
@@ -559,7 +559,7 @@
         "name": "Lake Mendota - Madison Water Dist",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133221/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133221/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133221/navigation"
       }
     },
     {
@@ -576,7 +576,7 @@
         "name": "Lake Mendota -- Spring Harbor",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10017443/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10017443/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10017443/navigation"
       }
     },
     {
@@ -593,7 +593,7 @@
         "name": "Storm Sewer at Kenosha Dr in Madison [KENARM-1]",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10033592/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10033592/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10033592/navigation"
       }
     },
     {
@@ -610,7 +610,7 @@
         "name": "Tiedemans Pond, Dane County, WI, USA",
         "uri": "https://www.waterqualitydata.us/provider/STORET/NALMS/NALMS-F1842718/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/NALMS-F1842718/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/NALMS-F1842718/navigation"
       }
     },
     {
@@ -627,7 +627,7 @@
         "name": "DN-07/08E/01-0214",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430615089285701/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430615089285701/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430615089285701/navigation"
       }
     },
     {
@@ -644,7 +644,7 @@
         "name": "Stricker Pond  Nw Corner",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10022809/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10022809/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10022809/navigation"
       }
     },
     {
@@ -661,7 +661,7 @@
         "name": "University Ave storm sewer at Spring Harbor",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10032770/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10032770/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10032770/navigation"
       }
     },
     {
@@ -678,7 +678,7 @@
         "name": "DN-07/09E/19-0064",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430427089284901/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430427089284901/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430427089284901/navigation"
       }
     },
     {
@@ -695,7 +695,7 @@
         "name": "Strickers Pond",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-10001232/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-10001232/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-10001232/navigation"
       }
     },
     {
@@ -712,7 +712,7 @@
         "name": "Lake Mendota - Central Deep Hole",
         "uri": "https://www.waterqualitydata.us/provider/STORET/WIDNR_WQX/WIDNR_WQX-133318/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/WIDNR_WQX-133318/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/WIDNR_WQX-133318/navigation"
       }
     },
     {
@@ -729,7 +729,7 @@
         "name": "SOUTH KENOSHA DRIVE (EAST) STORM SEWR @ MADISON,WI",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430358089281901/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430358089281901/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430358089281901/navigation"
       }
     },
     {
@@ -746,7 +746,7 @@
         "name": "DN-07/09E/18-0715",
         "uri": "https://www.waterqualitydata.us/provider/NWIS/USGS-WI/USGS-430440089281001/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/USGS-430440089281001/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/USGS-430440089281001/navigation"
       }
     },
     {
@@ -763,7 +763,7 @@
         "name": "Lake Mendota, Dane County, WI, USA",
         "uri": "https://www.waterqualitydata.us/provider/STORET/NALMS/NALMS-F1569337/",
         "comid": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/wqp/NALMS-F1569337/navigation"
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/wqp/NALMS-F1569337/navigation"
       }
     }
   ]
diff --git a/tests/data/nldi_get_features_by_feature_source_with_nav_mode.json b/tests/data/nldi_get_features_by_feature_source_with_nav_mode.json
index 593425ad..1ceb6dbd 100644
--- a/tests/data/nldi_get_features_by_feature_source_with_nav_mode.json
+++ b/tests/data/nldi_get_features_by_feature_source_with_nav_mode.json
@@ -8,7 +8,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-05427943",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-05427943/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-05427943/navigation",
         "measure": 0,
         "reachcode": "07090002007651",
         "name": "PHEASANT BRANCH AT AIRPORT ROAD NEAR MIDDLETON, WI",
@@ -28,7 +28,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-430600089272001",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-430600089272001/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-430600089272001/navigation",
         "measure": 59.3341,
         "reachcode": "07090002008384",
         "name": "LAKE MENDOTA, WEST BAY, AT MADISON, WI",
@@ -48,7 +48,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-054279465",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-054279465/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-054279465/navigation",
         "measure": 53.7958,
         "reachcode": "07090002007650",
         "name": "S FORK PHEASANT BRANCH @ DEMING WAY @ MIDDLETON,WI",
@@ -68,7 +68,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-05427950",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-05427950/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-05427950/navigation",
         "measure": 2.32298,
         "reachcode": "07090002007650",
         "name": "PHEASANT BRANCH AT CENTURY AVE AT MIDDLETON, WI",
@@ -88,7 +88,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-054279435",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-054279435/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-054279435/navigation",
         "measure": 72.0559,
         "reachcode": "07090002007650",
         "name": "PHEASANT BR W. OF CONFLUENCE POND @ MIDDLETON, WI",
@@ -108,7 +108,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-05427948",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-05427948/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-05427948/navigation",
         "measure": 40.6051151144,
         "reachcode": "07090002007650",
         "name": "PHEASANT BRANCH AT MIDDLETON, WI",
@@ -128,7 +128,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-054279475",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-054279475/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-054279475/navigation",
         "measure": 48.974,
         "reachcode": "07090002007650",
         "name": "PHEASANT BRANCH UPSTREAM OF HWY 12 @ MIDDLETON, WI",
@@ -148,7 +148,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-430628089305001",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-430628089305001/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-430628089305001/navigation",
         "measure": 43.532,
         "reachcode": "07090002007650",
         "name": "GW QUALITY ASSURANCE-NAWQA WAREHOUSE-MIDDLETON, WI",
@@ -168,7 +168,7 @@
       "type": "Feature",
       "properties": {
         "identifier": "USGS-05427952",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/nwissite/USGS-05427952/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/nwissite/USGS-05427952/navigation",
         "measure": 46.391,
         "reachcode": "07090002007647",
         "name": "PHEASANT BRANCH AT MOUTH AT MIDDLETON, WI",
diff --git a/tests/data/nldi_get_features_by_feature_source_without_nav_mode.json b/tests/data/nldi_get_features_by_feature_source_without_nav_mode.json
index f640e381..4285f6ad 100644
--- a/tests/data/nldi_get_features_by_feature_source_without_nav_mode.json
+++ b/tests/data/nldi_get_features_by_feature_source_without_nav_mode.json
@@ -9,7 +9,7 @@
       },
       "properties": {
         "identifier": "USGS-054279485",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/WQP/USGS-054279485/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/WQP/USGS-054279485/navigation",
         "name": "STRICKER'S POND AT MIDDLETON, WI",
         "source": "WQP",
         "sourceName": "Water Quality Portal",
diff --git a/tests/data/nldi_get_features_by_lat_long.json b/tests/data/nldi_get_features_by_lat_long.json
index 3bdc4759..e2cf9066 100644
--- a/tests/data/nldi_get_features_by_lat_long.json
+++ b/tests/data/nldi_get_features_by_lat_long.json
@@ -37,7 +37,7 @@
       },
       "properties": {
         "identifier": "13294314",
-        "navigation": "https://labs.waterdata.usgs.gov/api/nldi/linked-data/comid/13294314/navigation",
+        "navigation": "https://api.water.usgs.gov/nldi/linked-data/comid/13294314/navigation",
         "source": "comid",
         "sourceName": "NHDPlus comid",
         "comid": "13294314"