diff --git a/geomagio/ObservatoryMetadata.py b/geomagio/ObservatoryMetadata.py
index 5fa1efa585ae97e26ac46d56adddeb3c81fe2afc..735a232998d7deb57a7ed7a766c5c33b6e1b9528 100644
--- a/geomagio/ObservatoryMetadata.py
+++ b/geomagio/ObservatoryMetadata.py
@@ -32,6 +32,7 @@ DEFAULT_INTERVAL_SPECIFIC = {
DEFAULT_METADATA = {
"BDT": {
"metadata": {
+ "network": "NT",
"station_name": "Boulder Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "40.137",
@@ -50,6 +51,7 @@ DEFAULT_METADATA = {
},
"BOU": {
"metadata": {
+ "network": "NT",
"station_name": "Boulder",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "40.137",
@@ -68,6 +70,7 @@ DEFAULT_METADATA = {
},
"TST": {
"metadata": {
+ "network": "NT",
"station_name": "Boulder Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "40.137",
@@ -86,6 +89,7 @@ DEFAULT_METADATA = {
},
"BRW": {
"metadata": {
+ "network": "NT",
"station_name": "Barrow",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "71.322",
@@ -104,6 +108,7 @@ DEFAULT_METADATA = {
},
"BRT": {
"metadata": {
+ "network": "NT",
"station_name": "Barrow Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "71.322",
@@ -122,6 +127,7 @@ DEFAULT_METADATA = {
},
"BSL": {
"metadata": {
+ "network": "NT",
"station_name": "Stennis Space Center",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "30.350",
@@ -140,6 +146,7 @@ DEFAULT_METADATA = {
},
"CMO": {
"metadata": {
+ "network": "NT",
"station_name": "College",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "64.874",
@@ -158,6 +165,7 @@ DEFAULT_METADATA = {
},
"CMT": {
"metadata": {
+ "network": "NT",
"station_name": "College",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "64.874",
@@ -176,6 +184,7 @@ DEFAULT_METADATA = {
},
"DED": {
"metadata": {
+ "network": "NT",
"station_name": "Deadhorse",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "70.355",
@@ -194,6 +203,7 @@ DEFAULT_METADATA = {
},
"DHT": {
"metadata": {
+ "network": "NT",
"station_name": "Deadhorse Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "70.355",
@@ -212,6 +222,7 @@ DEFAULT_METADATA = {
},
"FRD": {
"metadata": {
+ "network": "NT",
"station_name": "Fredericksburg",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "38.205",
@@ -230,6 +241,7 @@ DEFAULT_METADATA = {
},
"FDT": {
"metadata": {
+ "network": "NT",
"station_name": "Fredericksburg Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "38.205",
@@ -248,6 +260,7 @@ DEFAULT_METADATA = {
},
"FRN": {
"metadata": {
+ "network": "NT",
"station_name": "Fresno",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "37.091",
@@ -266,6 +279,7 @@ DEFAULT_METADATA = {
},
"GUA": {
"metadata": {
+ "network": "NT",
"station_name": "Guam",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "13.588",
@@ -284,6 +298,7 @@ DEFAULT_METADATA = {
},
"GUT": {
"metadata": {
+ "network": "NT",
"station_name": "Guam Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "13.588",
@@ -302,6 +317,7 @@ DEFAULT_METADATA = {
},
"HON": {
"metadata": {
+ "network": "NT",
"station_name": "Honolulu",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "21.316",
@@ -320,6 +336,7 @@ DEFAULT_METADATA = {
},
"HOT": {
"metadata": {
+ "network": "NT",
"station_name": "Hot Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "21.316",
@@ -338,6 +355,7 @@ DEFAULT_METADATA = {
},
"KAK": {
"metadata": {
+ "network": "NT",
"station_name": "Kakioka",
"agency_name": "Japan Meteorological Agency",
"geodetic_latitude": "36.232",
@@ -357,6 +375,7 @@ DEFAULT_METADATA = {
},
"NEW": {
"metadata": {
+ "network": "NT",
"station_name": "Newport",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "48.265",
@@ -375,6 +394,7 @@ DEFAULT_METADATA = {
},
"SHU": {
"metadata": {
+ "network": "NT",
"station_name": "Shumagin",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "55.348",
@@ -393,6 +413,7 @@ DEFAULT_METADATA = {
},
"SIT": {
"metadata": {
+ "network": "NT",
"station_name": "Sitka",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "57.058",
@@ -411,6 +432,7 @@ DEFAULT_METADATA = {
},
"SJG": {
"metadata": {
+ "network": "NT",
"station_name": "San Juan",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "18.113",
@@ -429,6 +451,7 @@ DEFAULT_METADATA = {
},
"SJT": {
"metadata": {
+ "network": "NT",
"station_name": "SJT Test",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "18.113",
@@ -447,6 +470,7 @@ DEFAULT_METADATA = {
},
"TUC": {
"metadata": {
+ "network": "NT",
"station_name": "Tucson",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "32.174",
@@ -465,6 +489,7 @@ DEFAULT_METADATA = {
},
"USGS": {
"metadata": {
+ "network": "NT",
"station_name": "USGS",
"agency_name": "United States Geological Survey (USGS)",
"geodetic_latitude": "40.137",
@@ -483,6 +508,7 @@ DEFAULT_METADATA = {
},
"BLC": {
"metadata": {
+ "network": "NT",
"station_name": "Baker Lake",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "64.300",
@@ -502,6 +528,7 @@ DEFAULT_METADATA = {
},
"BRD": {
"metadata": {
+ "network": "NT",
"station_name": "Brandon",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "49.600",
@@ -521,6 +548,7 @@ DEFAULT_METADATA = {
},
"CBB": {
"metadata": {
+ "network": "NT",
"station_name": "Cambridge Bay",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "69.200",
@@ -540,6 +568,7 @@ DEFAULT_METADATA = {
},
"EUA": {
"metadata": {
+ "network": "NT",
"station_name": "Eureka",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "55.300",
@@ -559,6 +588,7 @@ DEFAULT_METADATA = {
},
"FCC": {
"metadata": {
+ "network": "NT",
"station_name": "Fort Churchill",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "58.800",
@@ -578,6 +608,7 @@ DEFAULT_METADATA = {
},
"HAD": {
"metadata": {
+ "network": "NT",
"station_name": "Hartland",
"agency_name": "British Geological Survey (BGS)",
"geodetic_latitude": "51.000",
@@ -597,6 +628,7 @@ DEFAULT_METADATA = {
},
"HER": {
"metadata": {
+ "network": "NT",
"station_name": "Hermanus",
"agency_name": "National Research Foundation",
"geodetic_latitude": "-34.400",
@@ -616,6 +648,7 @@ DEFAULT_METADATA = {
},
"IQA": {
"metadata": {
+ "network": "NT",
"station_name": "Iqaluit",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "63.800",
@@ -635,6 +668,7 @@ DEFAULT_METADATA = {
},
"MEA": {
"metadata": {
+ "network": "NT",
"station_name": "Meanook",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "54.600",
@@ -654,6 +688,7 @@ DEFAULT_METADATA = {
},
"OTT": {
"metadata": {
+ "network": "NT",
"station_name": "Ottowa",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "45.400",
@@ -673,6 +708,7 @@ DEFAULT_METADATA = {
},
"RES": {
"metadata": {
+ "network": "NT",
"station_name": "Resolute Bay",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "74.700",
@@ -692,6 +728,7 @@ DEFAULT_METADATA = {
},
"SNK": {
"metadata": {
+ "network": "NT",
"station_name": "Sanikiluaq",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "62.400",
@@ -711,6 +748,7 @@ DEFAULT_METADATA = {
},
"STJ": {
"metadata": {
+ "network": "NT",
"station_name": "St Johns",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "47.600",
@@ -730,6 +768,7 @@ DEFAULT_METADATA = {
},
"VIC": {
"metadata": {
+ "network": "NT",
"station_name": "Victoria",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "48.600",
@@ -749,6 +788,7 @@ DEFAULT_METADATA = {
},
"YKC": {
"metadata": {
+ "network": "NT",
"station_name": "Yellowknife",
"agency_name": "Geological Survey of Canada (GSC)",
"geodetic_latitude": "62.400",
diff --git a/geomagio/VariometerMetadata.py b/geomagio/VariometerMetadata.py
index 3dfab0e66edd465654df13ded59f119692429712..5e692a7ae075ccbc22f5245664bebe4141565e55 100644
--- a/geomagio/VariometerMetadata.py
+++ b/geomagio/VariometerMetadata.py
@@ -29,6 +29,7 @@ DEFAULT_INTERVAL_SPECIFIC = {
DEFAULT_ASL_METADATA = {
"ANMO": {
"metadata": {
+ "network": "IU",
"elevation": 1820,
"geodetic_latitude": 34.94591,
"geodetic_longitude": -106.4572,
@@ -40,6 +41,7 @@ DEFAULT_ASL_METADATA = {
},
"CASY": {
"metadata": {
+ "network": "IU",
"elevation": 10,
"geodetic_latitude": -66.2792,
"geodetic_longitude": 110.5354,
@@ -51,6 +53,7 @@ DEFAULT_ASL_METADATA = {
},
"COLA": {
"metadata": {
+ "network": "IU",
"elevation": 200,
"geodetic_latitude": 64.8736,
"geodetic_longitude": -147.8616,
@@ -62,6 +65,7 @@ DEFAULT_ASL_METADATA = {
},
"COR": {
"metadata": {
+ "network": "IU",
"elevation": 110,
"geodetic_latitude": 44.5855,
"geodetic_longitude": -123.3046,
@@ -73,6 +77,7 @@ DEFAULT_ASL_METADATA = {
},
"KBS": {
"metadata": {
+ "network": "IU",
"elevation": 90,
"geodetic_latitude": 78.9154,
"geodetic_longitude": 11.9385,
@@ -84,6 +89,7 @@ DEFAULT_ASL_METADATA = {
},
"KONO": {
"metadata": {
+ "network": "IU",
"elevation": 558,
"geodetic_latitude": 59.6521,
"geodetic_longitude": 9.5946,
@@ -95,6 +101,7 @@ DEFAULT_ASL_METADATA = {
},
"RSSD": {
"metadata": {
+ "network": "IU",
"elevation": 2090,
"geodetic_latitude": 44.1212,
"geodetic_longitude": -104.0359,
@@ -106,6 +113,7 @@ DEFAULT_ASL_METADATA = {
},
"SBA": {
"metadata": {
+ "network": "IU",
"elevation": 50,
"geodetic_latitude": -77.8492,
"geodetic_longitude": 166.7572,
@@ -117,6 +125,7 @@ DEFAULT_ASL_METADATA = {
},
"SFJD": {
"metadata": {
+ "network": "IU",
"elevation": 330,
"geodetic_latitude": 66.9961,
"geodetic_longitude": -50.6207,
@@ -128,6 +137,7 @@ DEFAULT_ASL_METADATA = {
},
"SSPA": {
"metadata": {
+ "network": "IU",
"elevation": 270,
"geodetic_latitude": 40.6358,
"geodetic_longitude": -77.8876,
@@ -139,6 +149,7 @@ DEFAULT_ASL_METADATA = {
},
"QSPA": {
"metadata": {
+ "network": "IU",
"elevation": 2850,
"geodetic_latitude": -89.9289,
"geodetic_longitude": 144.4382,
@@ -150,6 +161,7 @@ DEFAULT_ASL_METADATA = {
},
"E62A": {
"metadata": {
+ "network": "N4",
"elevation": 365,
"geodetic_latitude": 46.6201,
"geodetic_longitude": -69.5227,
@@ -161,6 +173,7 @@ DEFAULT_ASL_METADATA = {
},
"E46A": {
"metadata": {
+ "network": "N4",
"elevation": 269,
"geodetic_latitude": 46.3665,
"geodetic_longitude": -84.3062,
@@ -172,6 +185,7 @@ DEFAULT_ASL_METADATA = {
},
"PAB": {
"metadata": {
+ "network": "IU",
"elevation": 950,
"geodetic_latitude": 39.5446,
"geodetic_longitude": -4.3499,
@@ -183,6 +197,7 @@ DEFAULT_ASL_METADATA = {
},
"WCI": {
"metadata": {
+ "network": "IU",
"elevation": 210,
"geodetic_latitude": 38.2289,
"geodetic_longitude": -86.2939,
@@ -194,6 +209,7 @@ DEFAULT_ASL_METADATA = {
},
"KSU1": {
"metadata": {
+ "network": "US",
"elevation": 317,
"geodetic_latitude": 39.1009,
"geodetic_longitude": -96.6094,
@@ -205,6 +221,7 @@ DEFAULT_ASL_METADATA = {
},
"EYMN": {
"metadata": {
+ "network": "US",
"elevation": 475,
"geodetic_latitude": 47.9462,
"geodetic_longitude": -91.4953,
@@ -216,6 +233,7 @@ DEFAULT_ASL_METADATA = {
},
"GOGA": {
"metadata": {
+ "network": "US",
"elevation": 150,
"geodetic_latitude": 33.41476,
"geodetic_longitude": -83.47327,
@@ -227,6 +245,7 @@ DEFAULT_ASL_METADATA = {
},
"DGMT": {
"metadata": {
+ "network": "US",
"elevation": 646,
"geodetic_latitude": 48.4702,
"geodetic_longitude": -104.1959,
@@ -238,6 +257,7 @@ DEFAULT_ASL_METADATA = {
},
"DWPF": {
"metadata": {
+ "network": "IU",
"elevation": 30,
"geodetic_latitude": 28.1103,
"geodetic_longitude": -81.4327,
@@ -249,6 +269,7 @@ DEFAULT_ASL_METADATA = {
},
"ECSD": {
"metadata": {
+ "network": "US",
"elevation": 478,
"geodetic_latitude": 43.7337,
"geodetic_longitude": -96.6141,
@@ -260,6 +281,7 @@ DEFAULT_ASL_METADATA = {
},
"HRV": {
"metadata": {
+ "network": "IU",
"elevation": 200,
"geodetic_latitude": 42.5064,
"geodetic_longitude": -71.5583,
@@ -271,6 +293,7 @@ DEFAULT_ASL_METADATA = {
},
"O20A": {
"metadata": {
+ "network": "N4",
"elevation": 1915,
"geodetic_latitude": 40.1348,
"geodetic_longitude": -108.2416,
diff --git a/geomagio/api/ws/Observatory.py b/geomagio/api/ws/Observatory.py
index 85df1e58653fc5ed3327586a9bc0cde217ccb491..a2dcd672f6480c588d139f9f5abb0fd709b83353 100644
--- a/geomagio/api/ws/Observatory.py
+++ b/geomagio/api/ws/Observatory.py
@@ -6,6 +6,7 @@ from typing import Dict, Optional
class Observatory(BaseModel):
id: str
+ network: str
name: str
agency: str = None
agency_name: str
@@ -92,6 +93,7 @@ for observatory_code, observatory_data in DEFAULT_METADATA.items():
# print(f"Observatory Code: {observatory_code}, Metadata: {metadata}")
observatory = Observatory(
id=observatory_code,
+ network=metadata["network"],
elevation=int(metadata["elevation"]),
latitude=float(metadata["geodetic_latitude"]),
longitude=metadata["geodetic_longitude"],
@@ -110,6 +112,7 @@ ASL_OBSERVATORIES = []
for observatory_code, observatory_data in DEFAULT_ASL_METADATA.items():
ASL_metadata = observatory_data["metadata"]
observatory = Observatory(
+ network=ASL_metadata["network"],
id=observatory_code,
elevation=ASL_metadata["elevation"],
latitude=ASL_metadata["geodetic_latitude"],
@@ -119,7 +122,6 @@ for observatory_code, observatory_data in DEFAULT_ASL_METADATA.items():
sensor_orientation=ASL_metadata.get("sensor_orientation"),
declination_base=ASL_metadata.get("declination_base"),
)
-
ASL_OBSERVATORIES.append(observatory)
diff --git a/geomagio/api/ws/data.py b/geomagio/api/ws/data.py
index 40a09da6e79b235cb5a06e2b1fc217c54d9856ba..853a63e8dde1c359f9cd4ebebc67997d9be5ced2 100644
--- a/geomagio/api/ws/data.py
+++ b/geomagio/api/ws/data.py
@@ -33,7 +33,8 @@ def get_data_factory(
host = query.data_host or DataHost.DEFAULT
sampling_period = query.sampling_period
if query.id in ASL_OBSERVATORY_INDEX:
- factory = FDSNFactory(network="IU", locationCode="40")
+ observatory = ASL_OBSERVATORY_INDEX[query.id]
+ factory = FDSNFactory(network=observatory.network, locationCode="40")
elif sampling_period in [
SamplingPeriod.TEN_HERTZ,
SamplingPeriod.HOUR,