You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by sk...@apache.org on 2023/06/21 01:21:22 UTC
[incubator-sdap-nexus] branch tmp-aq-match-updates created (now 357e591)
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a change to branch tmp-aq-match-updates
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
at 357e591 temp updates to get matchup working on aq deployment
This branch includes the following new commits:
new 357e591 temp updates to get matchup working on aq deployment
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-sdap-nexus] 01/01: temp updates to get matchup working on aq deployment
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch tmp-aq-match-updates
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 357e5910d8990d45a1a9ce4b9b516354eb883233
Author: skorper <st...@gmail.com>
AuthorDate: Tue Jun 20 18:21:10 2023 -0700
temp updates to get matchup working on aq deployment
---
analysis/webservice/algorithms/doms/config.py | 91 +++++----------------------
analysis/webservice/algorithms/doms/insitu.py | 2 +-
2 files changed, 15 insertions(+), 78 deletions(-)
diff --git a/analysis/webservice/algorithms/doms/config.py b/analysis/webservice/algorithms/doms/config.py
index 34e317c..1927eb3 100644
--- a/analysis/webservice/algorithms/doms/config.py
+++ b/analysis/webservice/algorithms/doms/config.py
@@ -13,88 +13,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-INSITU_API_ENDPOINT = 'https://doms.jpl.nasa.gov/insitu/1.0/query_data_doms_custom_pagination'
-INSITU_API_SCHEMA_ENDPOINT = 'https://doms.jpl.nasa.gov/insitu/1.0/cdms_schema'
+INSITU_API_ENDPOINT = 'https://ideas-digitaltwin.jpl.nasa.gov/insitu/1.0/query_data_doms_custom_pagination'
+INSITU_API_SCHEMA_ENDPOINT = 'https://ideas-digitaltwin.jpl.nasa.gov/insitu/1.0/cdms_schema'
INSITU_PROVIDER_MAP = [
+ # {
+ # 'name': 'RAPID_LIS_1x_Garonne',
+ # 'projects': [
+ # {
+ # 'name': 'IDEAS',
+ # 'platforms': ['23023522', '23024062']
+ # }
+ # ]
+ # },
{
- 'name': 'NCAR',
- 'endpoint': 'https://cdms.ucar.edu/insitu/1.0/query_data_doms_custom_pagination',
+ 'name': 'RAPID_CLSM_Mississippi',
'projects': [
{
- 'short_name': 'ICOADS_NCAR',
- 'name': 'ICOADS Release 3.0',
- 'platforms': ['0', '16', '17', '30', '41', '42']
- }
- ]
- },
- {
- 'name': 'NCAR',
- 'projects': [
- {
- 'short_name': 'ICOADS_JPL',
- 'name': 'ICOADS Release 3.0',
- 'platforms': ['0', '16', '17', '30', '41', '42']
- }
- ]
- },
- {
- 'name': 'Florida State University, COAPS',
- 'projects': [
- {
- 'name': 'SAMOS',
- 'platforms': ['30']
- }
- ]
- },
- {
- 'name': 'Saildrone',
- 'endpoint': 'https://nasa-cdms.saildrone.com/1.0/query_data_doms_custom_pagination',
- 'projects': [
- {
- 'name': '1021_atlantic',
- 'platforms': ['3B']
- },
- {
- 'name': 'antarctic_circumnavigation_2019',
- 'platforms': ['3B']
- },
- {
- 'name': 'atlantic_to_med_2019_to_2020',
- 'platforms': ['3B']
- },
- {
- 'name': 'shark-2018',
- 'platforms': ['3B']
- },
- {
- 'name': 'baja_2018',
- 'platforms': ['3B']
- },
- {
- 'name': 'arctic_misst_2019',
- 'platforms': ['3B']
- },
- {
- 'name': 'arctic_misst_2021',
- 'platforms': ['3B']
- },
- {
- 'name': 'atomic_eurec4a_2020',
- 'platforms': ['3B']
- },
- {
- 'name': 'smode_2021',
- 'platforms': ['3B']
- }
- ]
- },
- {
- 'name': 'SPURS',
- 'projects': [
- {
- 'name': 'SPURS',
- 'platforms': ['3B', '6A', '23', '31', '42', '46', '48']
+ 'name': 'IDEAS',
+ 'platforms': ['74069827']
}
]
}
diff --git a/analysis/webservice/algorithms/doms/insitu.py b/analysis/webservice/algorithms/doms/insitu.py
index ae35b4a..b1a38b6 100644
--- a/analysis/webservice/algorithms/doms/insitu.py
+++ b/analysis/webservice/algorithms/doms/insitu.py
@@ -90,7 +90,7 @@ def query_insitu(dataset, variable, start_time, end_time, bbox, platform, depth_
else:
insitu_response['results'].extend(insitu_page_response['results'])
- next_page_url = insitu_page_response.get('next', None)
+ next_page_url = None#insitu_page_response.get('next', None)
params = {} # Remove params, they are already included in above URL
return insitu_response