From 7f30642ce30d7ef77983a8774fd45827900581dd Mon Sep 17 00:00:00 2001 From: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Date: Tue, 19 Mar 2024 08:52:24 -0700 Subject: [PATCH] Update spiceinit URL (#5431) * Update spiceinit URL * added changelog --- CHANGELOG.md | 1 + isis/src/base/apps/spiceinit/spiceinit.cpp | 5 +++++ isis/src/base/apps/spiceinit/spiceinit.xml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43a359b615..f41568b5ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ release. ### Changed - Disabled option to use web=true when running spiceinit with HRSC images. [#5223](https://github.com/DOI-USGS/ISIS3/issues/5223) +- Changed the default spiceinit url to https://astrogeology.usgs.gov/apis/ale/v0.9.1/spiceserver/ and added deprecation warning for use of https://services.isis.astrogeology.usgs.gov/cgi-bin/spiceinit.cgi url. [#5327](https://github.com/USGS-Astrogeology/ISIS3/issues/5327) ## [8.0.2] - 2023-12-05 ### Changed diff --git a/isis/src/base/apps/spiceinit/spiceinit.cpp b/isis/src/base/apps/spiceinit/spiceinit.cpp index 2c10d872e1..5700c8df11 100644 --- a/isis/src/base/apps/spiceinit/spiceinit.cpp +++ b/isis/src/base/apps/spiceinit/spiceinit.cpp @@ -620,6 +620,11 @@ namespace Isis { throw IException(IException::User, msg, _FILEINFO_); } + if (ui.GetString("URL") == "https://services.isis.astrogeology.usgs.gov/cgi-bin/spiceinit.cgi"){ + QString msg = "USER WARNING: The URL you entered has been deprecated and no longer recommended for use."; + std::cerr << msg << std::endl; + } + QString url = ui.GetString("URL") + "?mission=" + missionName + "&instrument=" + instrumentId; int port = ui.GetInteger("PORT"); diff --git a/isis/src/base/apps/spiceinit/spiceinit.xml b/isis/src/base/apps/spiceinit/spiceinit.xml index 0971210278..4d3cc2b3df 100644 --- a/isis/src/base/apps/spiceinit/spiceinit.xml +++ b/isis/src/base/apps/spiceinit/spiceinit.xml @@ -868,7 +868,7 @@ This is where a request for SPICE data is sent. The default is the USGS SPICE server. - https://services.isis.astrogeology.usgs.gov/cgi-bin/spiceinit.cgi + https://astrogeology.usgs.gov/apis/ale/v0.9.1/spiceserver/ integer