Updated keywords to match gdal

environment.yml

@@ -3,11 +3,9 @@ channels:
   - usgs-astrogeology
 
 dependencies:
-  - ale =0.11.0,<1
+  - ale >=1.0.2*_1,<2
   - aom
   - armadillo
-  - boost >=1.76.0,<1.82
-  - boost-cpp >=1.76.0,<1.82
   - blas
   - bullet >=3.25
   - bz2file
@@ -16,15 +14,15 @@ dependencies:
   - cspice =67
   - csm >=3.0.3,<3.0.4
   - curl >=8.14.1,<9
-  - cxx-compiler=1.7
+  - cxx-compiler=1.9
   - doxygen
   - eigen >=3, <4
   - embree >=3, <4
   - ffmpeg
   - gcovr
-  - geos >=3.12,<3.13
+  - geos >=3.14,<3.15
   - geotiff
-  - gdal >=3.7,<3.9
+  - gdal >=3.12,<4
   - gmp
   - graphviz
   - conda-forge::gsl >=2.6, <2.7
@@ -36,10 +34,11 @@ dependencies:
   - usgs-astrogeology::kakadu==1
   - kalasiris
   - krb5
-  - libgdal >=3.7,<3.9
-  - libopencv >=4.5,<4.10
+  - libboost >=1.88.0,<1.89
+  - libgdal >=3.12,<4
+  - libopencv >=4.12,<5
   - libpng >=1.6.34,<1.7
-  - libprotobuf >=4,<5
+  - libprotobuf >=6,<7
   - libtiff >=4.5,<4.8
   - libxml2
   - make
@@ -51,21 +50,22 @@ dependencies:
   - nlohmann_json=3.11.2
   - ninja >=1.10,<1.11
   - nn
-  - opencv >=4.5,<4.10
+  - opencv >=4.12,<5
   - openssl >=3.5,<4
-  - pcl >=1.13,<1.14
-  - pdal=2.6
+  - pcl >=1.15.1,<1.16
+  - pdal >=2.8.4,<3
   - plio=1.5.3
-  - protobuf >=4,<5
+  - protobuf >=6,<7
   - python >=3.9
   - python_abi >=3.9
   - pytest
   - rclone
   - qhull
-  - qt-main>=5.15, <5.16
+  - qt6-main >=6,<7
+  - qt6-multimedia
   - qwt <6.3.0
-  - spiceql =1.2.0
-  - sqlite >=3.46.0,<3.47
+  - spiceql >=1.2.4*_5,<2
+  - sqlite >=3.46.0,<4
   - suitesparse <7.7.0
   - superlu
   - swig
@@ -74,10 +74,10 @@ dependencies:
   - usgscsm
   - x264
   - xalan-c
-  - xerces-c >=3.2.4,<3.3.0a0
+  - xerces-c >=3.3.0,<3.4
   - xorg-kbproto
   - xorg-libice
   - xorg-libsm
   - xorg-libx11
   - xorg-libxi
-  - zlib >=1.3,<1.4.0a0
+  - zlib

environment_arm.yml

@@ -3,11 +3,9 @@ channels:
   - usgs-astrogeology
 
 dependencies:
-  - ale =0.11.0,<1
+  - ale >=1.0.2*_1,<2
   - aom
   - armadillo
-  - boost >=1.76.0,<1.82
-  - boost-cpp >=1.76.0,<1.82
   - blas
   - bullet >=3.25
   - bz2file
@@ -16,14 +14,14 @@ dependencies:
   - cspice =67
   - csm >=3.0.3,<3.0.4
   - curl >=8.4.0,<8.5
-  - cxx-compiler=1.7
+  - cxx-compiler=1.9
   - doxygen
   - eigen >=3, <4
   - embree >=3, <4
   - ffmpeg
-  - geos >=3.12,<3.13
+  - geos >=3.14,<3.15
   - geotiff
-  - gdal >=3.7,<3.9
+  - gdal >=3.12,<4
   - gmp
   - gcovr
   - graphviz
@@ -35,10 +33,11 @@ dependencies:
   - jama
   - kalasiris
   - krb5
-  - libgdal >=3.7,<3.9
-  - libopencv >=4.5,<4.10
+  - libboost >=1.88.0,<1.89
+  - libgdal >=3.12,<4
+  - ibopencv >=4.12,<5
   - libpng >=1.6.34,<1.7
-  - libprotobuf >=4,<5
+  - libprotobuf >=6,<7
   - libtiff >=4.5,<4.8
   - libxml2
   - make
@@ -48,21 +47,22 @@ dependencies:
   - nlohmann_json=3.11.2
   - ninja >=1.10,<1.11
   - nn
-  - opencv >=4.5,<4.10
+  - opencv >=4.12,<5
   - openssl >=3.1.2,<3.5
-  - pcl >=1.13,<1.14
-  - pdal=2.6
+  - pcl >=1.15.1,<1.16
+  - pdal >=2.8.4,<3
   - plio=1.5.3
-  - protobuf >=4,<5
+  - protobuf >=6,<7
   - python >=3.9
   - python_abi >=3.9
   - pytest
   - rclone
   - qhull
-  - qt-main>=5.15, <5.16
+  - qt6-main >=6,<7
+  - qt6-multimedia
   - qwt <6.3.0
-  - spiceql =1.2.0
-  - sqlite >=3.46.0,<3.47
+  - spiceql >=1.2.4*_5,<2
+  - sqlite >=3.46.0,<4
   - suitesparse <7.7.0
   - superlu
   - swig
@@ -71,10 +71,10 @@ dependencies:
   - usgscsm
   - x264
   - usgs-astrogeology::xalan-c
-  - xerces-c >=3.2.4,<3.3.0a0
+  - xerces-c >=3.3.0,<3.4
   - xorg-kbproto
   - xorg-libice
   - xorg-libsm
   - xorg-libx11
   - xorg-libxi
-  - zlib >=1.3,<1.4.0a0
+  - zlib

environment_arm_linux.yml

@@ -2,11 +2,9 @@ channels:
   - conda-forge
 
 dependencies:
-  - ale =0.11.0,<1
+  - ale >=1.0.2*_1,<2
   - aom
   - armadillo
-  - boost >=1.76.0,<1.82
-  - boost-cpp >=1.76.0,<1.82
   - blas
   - bullet >=3.25
   - bz2file
@@ -15,14 +13,14 @@ dependencies:
   - cspice =67
   #- csm >=3.0.3,<3.0.4
   - curl >=8.4.0,<8.5
-  - cxx-compiler=1.7
+  - cxx-compiler=1.9
   - doxygen
   - eigen >=3, <4
   - embree >=3, <4
   - ffmpeg
-  - geos >=3.12,<3.13
+  - geos >=3.14,<3.15
   - geotiff
-  - gdal >=3.7,<3.9
+  - gdal >=3.12,<4
   - gmp
   - gcovr
   - graphviz
@@ -34,10 +32,11 @@ dependencies:
   - jama
   - kalasiris
   - krb5
-  - libgdal >=3.7,<3.9
-  - libopencv >=4.5,<4.10
+  - libboost >=1.88.0,<1.89
+  - libgdal >=3.12,<4
+  - libopencv >=4.12,<5
   - libpng >=1.6.34,<1.7
-  - libprotobuf >=4,<5
+  - libprotobuf >=6,<7
   - libtiff >=4.5,<4.8
   - libxml2
   - make
@@ -47,21 +46,22 @@ dependencies:
   - nlohmann_json=3.11.2
   - ninja >=1.10,<1.11
   - nn
-  - opencv >=4.5,<4.10
+  - opencv >=4.12,<5
   - openssl >=3.1.2,<3.5
-  - pcl >=1.13,<1.14
-  - pdal=2.6
+  - pcl >=1.15.1,<1.16
+  - pdal >=2.8.4,<3
   - plio=1.5.3
-  - protobuf >=4,<5
+  - protobuf >=6,<7
   - python >=3.9
   - python_abi >=3.9
   - pytest
   - rclone
   - qhull
-  - qt-main>=5.15, <5.16
+  - qt6-main >=6,<7
+  - qt6-multimedia
   - qwt <6.3.0
-  - spiceql =1.2.0
-  - sqlite >=3.46.0,<3.47
+  - spiceql >=1.2.4*_5,<2
+  - sqlite >=3.46.0,<4
   - suitesparse <7.7.0
   - superlu
   - swig
@@ -70,10 +70,10 @@ dependencies:
   - usgscsm
   - x264
   #- xalan-c
-  - xerces-c >=3.2.4,<3.3.0a0
+  - xerces-c >=3.3.0,<3.4
   - xorg-kbproto
   - xorg-libice
   - xorg-libsm
   - xorg-libx11
   - xorg-libxi
-  - zlib >=1.3,<1.4.0a0
+  - zlib

isis/cmake/FindPCL.cmake

@@ -7,7 +7,7 @@
 
 find_path(PCL_INCLUDE_DIR
   NAME pcl_base.h
-  PATH_SUFFIXES "pcl-1.8/pcl" "pcl-1.9/pcl" "pcl-1.11/pcl" "pcl-1.12/pcl" "pcl-1.13/pcl" "pcl-1.14/pcl"
+  PATH_SUFFIXES "pcl-1.8/pcl" "pcl-1.9/pcl" "pcl-1.11/pcl" "pcl-1.12/pcl" "pcl-1.13/pcl" "pcl-1.14/pcl" "pcl-1.15/pcl"
 )
 
 find_library(PCL_COMMON_LIBRARY NAMES pcl_common)

isis/src/base/apps/shadow/shadow.cpp

@@ -83,7 +83,7 @@ namespace Isis {
         auto [output, kernels] = SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", "base", {"reconstructed"}, {"reconstructed"}, useWeb, true);
         sunLt = output;
       } else {
-        auto [output, kernels] = SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", SpiceQL::spiceql_mission_map[observer], {"reconstructed"}, {"reconstructed"}, useWeb);
+        auto [output, kernels] = SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", SpiceQL::getSpiceqlName(observer), {"reconstructed"}, {"reconstructed"}, useWeb);
         sunLt = output; 
       }
 
@@ -97,7 +97,7 @@ namespace Isis {
         auto [output, kernels]  = SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", "base", {"reconstructed"}, {"reconstructed"}, useWeb, true);
         sunLt = output;
       }else{
-        auto [output, kernels]  =SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", SpiceQL::spiceql_mission_map[observer], {"reconstructed"}, {"reconstructed"}, useWeb);
+        auto [output, kernels]  =SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", SpiceQL::getSpiceqlName(observer), {"reconstructed"}, {"reconstructed"}, useWeb);
         sunLt = output;   
       }
 

isis/src/base/objs/Blob/Blob.cpp

@@ -252,21 +252,27 @@ namespace Isis {
 
   void Blob::ReadGdal(GDALDataset *dataset) {
     try {
-      std::string key = QString(p_type + "_" + p_blobName).toStdString();
-      const char *jsonblobStr = dataset->GetMetadataItem(key.c_str(), "USGS");
-      if (jsonblobStr == nullptr) {
+      std::string key = p_type.toStdString() + "_" + p_blobName.toStdString();
+
+      CPLStringList metadata = CPLStringList(dataset->GetMetadata("json:ISIS3"), false);
+      const char *metadataJsonString = metadata[0];
+      ordered_json jsonblob = nlohmann::ordered_json::parse(metadataJsonString);
+
+      if (jsonblob.find(key) == jsonblob.end()) {
         QString msg = "The key [" + QString::fromStdString(key) + "] does not exist on the geodata set.";
-        throw IException( IException::Io, msg, _FILEINFO_);
+        throw IException(IException::Io, msg, _FILEINFO_);
       }
-      ordered_json jsonblob = ordered_json::parse(jsonblobStr);
-      std::string blobData = jsonblob[key]["Data"];
-      jsonblob[key].erase("Data");
+
+      std::string blobData = jsonblob[key]["_data"];
+      jsonblob[key].erase("_data");
 
       Pvl pvl;
       Pvl::readObject(pvl, jsonblob);
 
       p_blobName = QString::fromStdString(jsonblob[key]["Name"]);
-      p_type = QString::fromStdString(jsonblob[key]["_container_name"]);
+      if (jsonblob[key].contains("_container_name")) {
+        p_type = QString::fromStdString(jsonblob[key]["_container_name"]);
+      }
 
       Find(pvl);
       ReadData(blobData);
@@ -462,11 +468,11 @@ namespace Isis {
 
       blobObj["Bytes"] = toString(p_nbytes);
       blobObj["StartByte"] = toString(1);
-      if(blobObj.hasKeyword("Data")) { 
-        blobObj["Data"] = QString::fromStdString(stream.str()); 
+      if(blobObj.hasKeyword("_data")) { 
+        blobObj["_data"] = QString::fromStdString(stream.str()); 
       }
       else { 
-        blobObj += PvlKeyword("Data", QString::fromStdString(stream.str()));
+        blobObj += PvlKeyword("_data", QString::fromStdString(stream.str()));
       }
 
       if(blobObj.hasKeyword("Name")) { 
@@ -477,12 +483,25 @@ namespace Isis {
       }
 
       // update metadata
-      string jsonblobstr = pvl.toJson()["Root"].dump();
-      string key = this->Type().toStdString() + "_" + this->Name().toStdString();
-      dataset->SetMetadataItem(key.c_str(), jsonblobstr.c_str(), "USGS");
+      std::string key = this->Type().toStdString() + "_" + (this->Name().toStdString());
+
+      CPLStringList metadata = CPLStringList(dataset->GetMetadata("json:ISIS3"), false);
+      ordered_json jsonblob = {};
+      if (metadata[0] != nullptr) {
+        const char *metadataJsonString = metadata[0];
+        jsonblob = nlohmann::ordered_json::parse(metadataJsonString);
+      }
+      jsonblob[key] = pvl.toJson()["Root"][key];
+      string jsonblobstr = jsonblob.dump();
+
+      char **outputMetadata = new char*[1];
+      outputMetadata[0] = jsonblobstr.data();
+      dataset->SetMetadata(outputMetadata, "json:ISIS3");
+      delete []outputMetadata;
     }
     catch(exception &e) {
-      cout << "Failed to write blob [" + p_blobName + "]: " << e.what() << endl;
+      QString msg = "Failed to write blob [" + p_blobName + "]: " + QString(e.what());
+      throw IException(IException::Unknown, msg, _FILEINFO_);
     }
   }
 

isis/src/base/objs/Blob/Blob.h

@@ -72,8 +72,6 @@ namespace Isis {
                 const std::vector<PvlKeyword> keywords = std::vector<PvlKeyword>());
       virtual void Read(const Pvl &pvl, std::istream &is,
                         const std::vector<PvlKeyword> keywords = std::vector<PvlKeyword>());
-      void ReadData(std::string &hexdata);
-
       void Write(const QString &file);
       void Write(Pvl &pvl, std::fstream &stm,
                  const QString &detachedFileName = "", bool overwrite=true, bool inline_data=true);
@@ -88,9 +86,10 @@ namespace Isis {
       void Find(const Pvl &pvl, const std::vector<PvlKeyword> keywords = std::vector<PvlKeyword>());
       virtual void ReadInit();
       virtual void ReadData(std::istream &is);
+      void ReadData(std::string &hexdata);
       virtual void WriteInit();
       virtual void WriteData(std::fstream &os);
-      virtual void WriteData(std::stringstream &os);
+      void WriteData(std::stringstream &os);
 
       PvlObject p_blobPvl;     //!< Pvl Blob object
       QString p_blobName;  //!< Name of the Blob object