From 9ca0c91f5a4afb91d5d397910f775e06a922244a Mon Sep 17 00:00:00 2001 From: pcain-usgs <pcain@usgs.gov> Date: Wed, 23 Jun 2021 16:19:59 -0600 Subject: [PATCH] get factory location by default --- geomagio/edge/EdgeFactory.py | 6 +++--- geomagio/edge/MiniSeedFactory.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py index 1190dbb16..2ce1685ae 100644 --- a/geomagio/edge/EdgeFactory.py +++ b/geomagio/edge/EdgeFactory.py @@ -311,7 +311,7 @@ class EdgeFactory(TimeseriesFactory): data = self.client.get_waveforms( sncl.network, sncl.station, - sncl.location, + self.locationCode or sncl.location, sncl.channel, starttime, endtime, @@ -334,7 +334,7 @@ class EdgeFactory(TimeseriesFactory): interval, sncl.network, sncl.station, - sncl.location, + self.locationCode or sncl.location, ) self._set_metadata(data, observatory, channel, type, interval) return data @@ -423,7 +423,7 @@ class EdgeFactory(TimeseriesFactory): port, sncl.station, sncl.channel, - sncl.location, + self.locationCode or sncl.location, sncl.network, ) diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py index ec8b54692..8d1779fc6 100644 --- a/geomagio/edge/MiniSeedFactory.py +++ b/geomagio/edge/MiniSeedFactory.py @@ -336,7 +336,7 @@ class MiniSeedFactory(TimeseriesFactory): interval, sncl.network, sncl.station, - sncl.location, + self.locationCode or sncl.location, ) self._set_metadata(data, observatory, channel, type, interval) return data @@ -468,7 +468,7 @@ class MiniSeedFactory(TimeseriesFactory): ) for trace in to_write: trace.stats.station = sncl.station - trace.stats.location = sncl.location + trace.stats.location = self.locationCode or sncl.location trace.stats.network = sncl.network trace.stats.channel = sncl.channel # finally, send to edge -- GitLab