Working ISISDATA-less web spice

isis/src/apollo/apps/apollopaninit/main.cpp

@@ -241,7 +241,7 @@ void IsisMain() {
 
 
   //////////////////////////////////////////attach a target rotation table
-  bool useWeb = QString(Preference::Preferences().findGroup("SpiceQL")["UseSpiceQL"]).toUpper() == "TRUE";
+  bool useWeb = Preference::Preferences().useWebSpice();
   std::string frameName;
    SpiceInt frameCode = 0;
    try {

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

@@ -77,7 +77,7 @@ namespace Isis {
         userKernels = true;
       }
 
-      bool useWeb = QString(Preference::Preferences().findGroup("SpiceQL")["UseSpiceQL"]).toUpper() == "TRUE";
+      bool useWeb = Preference::Preferences().useWebSpice();
 
       if (userKernels) {
         auto [output, kernels] = SpiceQL::getTargetStates(etStart, "sun", observer, bff, "NONE", "base", {"reconstructed"}, {"reconstructed"}, useWeb, true);

isis/src/base/apps/spiceinit/spiceinit.cpp

@@ -22,20 +22,23 @@
 #include "Table.h"
 #include "UserInterface.h"
 #include "spiceinit.h"
+#include <ale/Load.h>
+#include <nlohmann/json.hpp>
 
+using json = nlohmann::json;
 using namespace std;
 
 namespace Isis {
 
   void getUserEnteredKernel(UserInterface &ui, const QString &param, Kernel &kernel);
-  bool tryKernels(Cube *icube, Process &p, UserInterface &ui, Pvl *log,
-                  Kernel lk, Kernel pck,
-                  Kernel targetSpk, Kernel ck,
-                  Kernel fk, Kernel ik,
-                  Kernel sclk, Kernel spk,
-                  Kernel iak, Kernel dem,
-                  Kernel exk);
-
+  PvlGroup createKernelGroup(const PvlGroup &currentKernels, UserInterface &ui,
+                             Kernel lk, Kernel pck,
+                             Kernel targetSpk, Kernel ck,
+                             Kernel fk, Kernel ik,
+                             Kernel sclk, Kernel spk,
+                             Kernel iak, Kernel dem,
+                             Kernel exk);
+  bool tryKernels(Cube *icube, UserInterface &ui, Pvl *log, PvlGroup &currentKernels);
   void requestSpice(Cube *icube, UserInterface &ui, Pvl *log, Pvl &labels, QString missionName);
 
   /**
@@ -111,6 +114,66 @@ namespace Isis {
     if (ui.GetBoolean("WEB")) {
       requestSpice(icube, ui, log, *icube->label(), mission);
     }
+    else if (Preference::Preferences().useWebSpice()) { 
+      PvlGroup currentKernels = icube->group("Kernels");
+      std::vector<QString> keywordsToRemove = {"CameraVersion",
+                                               "ShapeModel",
+                                               "Source",
+                                               "LeapSecond",
+                                               "TargetAttitudeShape",
+                                               "TargetPosition",
+                                               "InstrumentPointing",
+                                               "Instrument",
+                                               "SpacecraftClock",
+                                               "InstrumentPosition",
+                                               "InstrumentAddendum",
+                                               "ShapeModel",
+                                               "InstrumentPositionQuality",
+                                               "InstrumentPointingQuality",
+                                               "Extra"};
+      for (QString keyword : keywordsToRemove) {
+        if (currentKernels.hasKeyword(keyword))
+          currentKernels.deleteKeyword(keyword);
+      }
+
+      if (ui.GetBoolean("CKNADIR")) {
+        PvlKeyword instPointing("InstrumentPointing");
+        instPointing.addValue("Nadir");
+        currentKernels += instPointing;
+      }
+
+      // Get shape kernel
+      Kernel dem;
+      if (ui.GetString("SHAPE") == "USER") {
+        getUserEnteredKernel(ui, "MODEL", dem);
+      }
+      else if (ui.GetString("SHAPE") == "SYSTEM") {
+        KernelDb baseKernels(0);
+
+        // Get the base DataDirectory
+        PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory");
+        QString baseDir = dataDir["Base"];
+        baseKernels.loadKernelDbFiles(dataDir, baseDir + "/dems", lab);
+        baseKernels.readKernelDbFiles();
+        dem = baseKernels.dem(lab);
+      }
+      PvlKeyword demKeyword("ShapeModel");
+      if (ui.GetString("SHAPE") == "RINGPLANE") {
+          demKeyword.addValue("RingPlane");
+      }
+      else {
+        for (int i = 0; i < dem.size(); i++) {
+          demKeyword.addValue(dem[i]);
+        }
+      }
+      currentKernels += demKeyword;
+      bool kernelSuccess = tryKernels(icube, ui, log, currentKernels);
+      if (!kernelSuccess) {
+        throw IException(IException::Unknown,
+                  "Unable to initialize camera model",
+                  _FILEINFO_);
+      }
+    }
     else {
       // Get system base kernels
       unsigned int allowed = 0;
@@ -253,8 +316,11 @@ namespace Isis {
 
         realCkKernel.setKernels(ckKernelList);
 
-        kernelSuccess = tryKernels(icube, p, ui, log, lk, pck, targetSpk,
+        PvlGroup currentKernels = createKernelGroup(icube->group("kernels"), ui,
+                                   lk, pck, targetSpk,
                                    realCkKernel, fk, ik, sclk, spk, iak, dem, exk);
+
+        kernelSuccess = tryKernels(icube, ui, log, currentKernels);
       }
       if (!kernelSuccess) {
         throw IException(IException::Unknown,
@@ -293,9 +359,8 @@ namespace Isis {
    * @param(in/out) icube The Cube to create the camera from. If attach is true
    *                      in the options, then the SPICE data will be written
    *                      to the Cube's file.
-   * @param p The process object that the Cube belongs to
-   * @param options The spiceinit options
-   * @param(out) log The Application log
+   * @param originalKernels The cubes kernels group to use as a base for the output kernels group
+   * @param ui Userinterface from the spiceinit app
    * @param lk The leap second kernels
    * @param pck The planetary constant kernels
    * @param targetspk The target state kernels
@@ -308,14 +373,22 @@ namespace Isis {
    * @param dem The digital elevation model
    * @param exk The extra kernels
    *
-   * @return If a camera model was successfully created
+   * @return New kernels group with updated kernels from input
    */
-  bool tryKernels(Cube *icube, Process &p, UserInterface &ui, Pvl *log,
-                  Kernel lk, Kernel pck,
-                  Kernel targetSpk, Kernel ck,
-                  Kernel fk, Kernel ik, Kernel sclk,
-                  Kernel spk, Kernel iak,
-                  Kernel dem, Kernel exk) {
+  PvlGroup createKernelGroup(const PvlGroup &originalKernels,
+                             UserInterface &ui,
+                             Kernel lk, 
+                             Kernel pck,
+                             Kernel targetSpk, 
+                             Kernel ck,
+                             Kernel fk,
+                             Kernel ik,
+                             Kernel sclk,
+                             Kernel spk,
+                             Kernel iak,
+                             Kernel dem,
+                             Kernel exk) 
+  {
     // Add the new kernel files to the existing kernels group
     PvlKeyword lkKeyword("LeapSecond");
     PvlKeyword pckKeyword("TargetAttitudeShape");
@@ -365,7 +438,6 @@ namespace Isis {
       exkKeyword.addValue(exk[i]);
     }
 
-    PvlGroup originalKernels = icube->group("Kernels");
     PvlGroup currentKernels = originalKernels;
     currentKernels.addKeyword(lkKeyword, Pvl::Replace);
     currentKernels.addKeyword(pckKeyword, Pvl::Replace);
@@ -377,15 +449,6 @@ namespace Isis {
     currentKernels.addKeyword(iakKeyword, Pvl::Replace);
     currentKernels.addKeyword(demKeyword, Pvl::Replace);
 
-    // Save off the CSM State so it can be restored if spiceinit fails
-    Blob csmState("CSMState", "String");
-    if (icube->hasBlob("CSMState", "String")) {
-      icube->read(csmState);
-    }
-
-    // Delete the CSM State blob so that CameraFactory doesn't try to instantiate a CSMCamera
-    icube->deleteBlob("CSMState", "String");
-
     // report qualities
     PvlKeyword spkQuality("InstrumentPositionQuality");
     spkQuality.addValue(Kernel::typeEnum(spk.type()));
@@ -402,6 +465,24 @@ namespace Isis {
       currentKernels.deleteKeyword("EXTRA");
     }
 
+    return currentKernels;
+  }
+
+  /**
+   * Attempt to create a camera model from a set of kernels.
+   *
+   * @param(in/out) icube The Cube to create the camera from. If attach is true
+   *                      in the options, then the SPICE data will be written
+   *                      to the Cube's file.
+   * @param icube The process object that the Cube belongs to
+   * @param ui The spiceinit options
+   * @param log(out) log The Application log
+   * @param currentKernels kernel set to attempt to load
+   *
+   * @return If a camera model was successfully created
+   */
+  bool tryKernels(Cube *icube, UserInterface &ui, Pvl *log, PvlGroup &currentKernels) {
+
     // Get rid of old keywords from previously inited cubes
     if (currentKernels.hasKeyword("Source"))
       currentKernels.deleteKeyword("Source");
@@ -451,14 +532,26 @@ namespace Isis {
         PvlKeyword("CameraVersion", toString(CameraFactory::CameraVersion(*icube))),
         Pvl::Replace);
 
+    // Save off the old kernels group so it can be restored if spiceinit fails
+    PvlGroup originalKernels = icube->group("Kernels");
+
+    // Save off the CSM State so it can be restored if spiceinit fails
+    Blob csmState("CSMState", "String");
+    if (icube->hasBlob("CSMState", "String")) {
+      icube->read(csmState);
+    }
+
     // Add the modified Kernels group to the input cube labels
     icube->putGroup(currentKernels);
 
+    // Delete the CSM State blob so that CameraFactory doesn't try to instantiate a CSMCamera
+    icube->deleteBlob("CSMState", "String");
+
     // Create the camera so we can get blobs if necessary
     try {
       Camera *cam;
       try {
-        cam = icube->camera();
+        cam = CameraFactory::Create(*icube);
         currentKernels = icube->group("Kernels");
 
         PvlKeyword source("Source");
@@ -484,7 +577,9 @@ namespace Isis {
         icube->putGroup(originalKernels);
 
         // restore CSM State blob if spiceinit failed
-        icube->write(csmState);
+        if (csmState.Size() > 0) {
+          icube->write(csmState);
+        }
 
         throw IException(e);
       }
@@ -494,6 +589,11 @@ namespace Isis {
         ckTable.Label() += PvlKeyword("Description", "Created by spiceinit");
         ckTable.Label() += PvlKeyword("Kernels");
 
+        const PvlKeyword &ckKeyword = currentKernels.findKeyword("InstrumentPointing");
+        const PvlKeyword &spkKeyword = currentKernels.findKeyword("InstrumentPosition");
+        const PvlKeyword &pckKeyword = currentKernels.findKeyword("TargetAttitudeShape");
+        const PvlKeyword &targetSpkKeyword = currentKernels.findKeyword("TargetPosition");
+
         for (int i = 0; i < ckKeyword.size(); i++)
           ckTable.Label()["Kernels"].addValue(ckKeyword[i]);
 
@@ -587,7 +687,7 @@ namespace Isis {
         }
       }
     }
-    catch(IException &) {
+    catch(IException &e) {
       icube->putGroup(originalKernels);
       return false;
     }
@@ -718,4 +818,4 @@ namespace Isis {
     delete sunPosTable;
     sunPosTable = NULL;
   }
-}
+}

isis/src/base/objs/Cube/Cube.cpp

@@ -1724,14 +1724,12 @@ namespace Isis {
       ckTable.Label()["Kernels"].addValue(ckKeyword[i]);
 
     this->write(ckTable);
-
     Table spkTable = spice.instrumentPosition()->Cache("InstrumentPosition");
     spkTable.Label() += PvlKeyword("Kernels");
     for (int i = 0; i < spkKeyword.size(); i++)
       spkTable.Label()["Kernels"].addValue(spkKeyword[i]);
 
     this->write(spkTable);
-
     Table bodyTable = spice.bodyRotation()->Cache("BodyRotation");
     bodyTable.Label() += PvlKeyword("Kernels");
     for (int i = 0; i < targetSpkKeyword.size(); i++)
@@ -1743,7 +1741,6 @@ namespace Isis {
     bodyTable.Label() += PvlKeyword("SolarLongitude",
         toString(spice.solarLongitude().degrees()));
     this->write(bodyTable);
-
     Table sunTable = spice.sunPosition()->Cache("SunPosition");
     sunTable.Label() += PvlKeyword("Kernels");
     for (int i = 0; i < targetSpkKeyword.size(); i++)

isis/src/base/objs/Isis/Isis.h

@@ -13,6 +13,8 @@ find files of those names at the top level of this repository. **/
 
 #include <QCoreApplication>
 
+#include <spiceql.h>
+
 #include "Application.h"
 
 #ifndef APPLICATION
@@ -97,7 +99,12 @@ int main(int argc, char *argv[]) {
   }
 
   Isis::Application::p_applicationForceGuiApp  = false;
+  if (getenv("ISISDATA") != NULL && QString(getenv("ISISDATA")) != "") {
+    SpiceQL::Inventory::setDbFilePath(std::string(getenv("ISISDATA")) + "/base/", true);
+  }
+
 
+  SpiceQL::addAliasKey("Mars_Reconnaissance_Orbiter", "MRO");
 #ifdef USE_GUI_QAPP
   Isis::Application::p_applicationForceGuiApp = true;
 #endif