Adds gdal 3.12

Author: amystamile-usgs

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/control/apps/sumspice/SumFinder.cpp

@@ -515,7 +515,7 @@ namespace Isis {
     // Compute start SCLK if present on labels
     if ( origStartClock.size() > 0 ) {
       NaifStatus::CheckErrors();
-      auto [newSCLK, kernels] = SpiceQL::doubleEtToSclk(camera->naifSclkCode(), newStartClock.Et(), SpiceQL::spiceql_mission_map[(camera->instrumentId()).toStdString()], useWeb);
+      auto [newSCLK, kernels] = SpiceQL::doubleEtToSclk(camera->naifSclkCode(), newStartClock.Et(), SpiceQL::getSpiceqlName((camera->instrumentId()).toStdString()), useWeb);
 
       NaifStatus::CheckErrors();
 
@@ -530,7 +530,7 @@ namespace Isis {
     // Compute end SCLK if present on labels
     if ( origStopClock.size() > 0 ) {
       NaifStatus::CheckErrors();
-      auto [newSCLK, kernels] = SpiceQL::doubleEtToSclk(camera->naifSclkCode(), newStopClock.Et(), SpiceQL::spiceql_mission_map[(camera->instrumentId()).toStdString()], useWeb);
+      auto [newSCLK, kernels] = SpiceQL::doubleEtToSclk(camera->naifSclkCode(), newStopClock.Et(), SpiceQL::getSpiceqlName((camera->instrumentId()).toStdString()), useWeb);
       NaifStatus::CheckErrors();
 
       sumtStopClock.addValue(origStopClock[0], origStopClock.unit());

isis/src/lro/apps/lrowaccal/lrowaccal.cpp

@@ -676,7 +676,7 @@ namespace Isis {
 
             std::vector<double> etStartVec = {etStart};
             std::vector<std::string> kernels_to_use = {"/moon/tspk/moon_pa_de421_1900-2050.bpc", "/lro/tspk/de421.bsp", "/base/pck/pck[0-9]{5}.tpc", "/moon/pck/moon_080317.tf", "/moon/pck/moon_assoc_me.tf"};
-            auto [sunLt, kernels] = SpiceQL::getTargetStates(etStartVec, "sun", "moon", "MOON_ME", "LT+S", "lroc", {"reconstructed"}, {"reconstructed"}, useWeb, true, false, true, kernels_to_use);
+            auto [sunLt, kernels] = SpiceQL::getTargetStates(etStartVec, "sun", "moon", "MOON_ME", "LT+S", "lroc", {"reconstructed"}, {"reconstructed"}, useWeb, true, false, true, true, kernels_to_use);
             std::copy(sunLt[0].begin(), sunLt[0].begin()+6, sunpos);
 
             g_solarDistance = vnorm_c(sunpos) / KM_PER_AU;

isis/src/mer/apps/mical/main.cpp

@@ -100,7 +100,7 @@ void IsisMain() {
   double sunpos[6];
   std::vector<double> etStart = {startTime.Et()};
   vector<string> kernel_list = {"/lro/tspk/de421.bsp", "/mars/tspk/mar[0-9]{3}", "/base/pck/pck[0-9]{5}"}; 
-  auto [sunLt, kernels] = SpiceQL::getTargetStates(etStart, "mars", "sun", "iau_mars", "LT+S", "mer1", {"reconstructed"}, {"reconstructed"}, useWeb, true, false, true, kernel_list);
+  auto [sunLt, kernels] = SpiceQL::getTargetStates(etStart, "mars", "sun", "iau_mars", "LT+S", "mer1", {"reconstructed"}, {"reconstructed"}, useWeb, true, false, true, true, kernel_list);
   std::copy(sunLt[0].begin(), sunLt[0].begin()+6, sunpos);
 
   double dist = vnorm_c(sunpos);