Commit 03d6f99d authored by kelvinrr's avatar kelvinrr
Browse files

Merge branch 'main' of github.com:DOI-USGS/SpiceQL

parents 5886be55 bd9da63a

.github/workflows/ci_testing.yml

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ jobs: 
        run: |

          mkdir -p build

          cd build

          cmake -DCMAKE_BUILD_TYPE=RELEASE -DSPICEQL_BUILD_DOCS=OFF -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..

          cmake -DCMAKE_BUILD_TYPE=RELEASE -DSPICEQL_BUILD_DOCS=OFF -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPython3_EXECUTABLE=`which python` -DPYTHON_LIBRARY=$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))") ..

          cmake --build .

      

      - name: Test
@@ -48,7 +48,7 @@ jobs: 
        # Execute tests defined by the CMake configuration.

        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

        run: | 

          ctest -VV  

          ctest -j6 --output-on-failure  

  

      - name: Install

        working-directory: ${{github.workspace}}/build

CHANGELOG.md

+29 −4
Original line number Diff line number Diff line
@@ -35,7 +35,15 @@ release. 


## [Unreleased]



## 1.0

## 1.0.1



### Changed

- Changes to support integration with ISIS [#48](https://github.com/DOI-USGS/SpiceQL/pull/48)



### Fixed

- Fixed getLatestKernels bug [#49](https://github.com/DOI-USGS/SpiceQL/pull/49)



## 1.0.0



### Added
@@ -46,9 +54,26 @@ release. 
- Adds support for LROC MiniRF [#10](https://github.com/DOI-USGS/SpiceQL/issues/10)

- Adds support for MSL [#15](https://github.com/DOI-USGS/SpiceQL/issues/15)

- Adds support for MER [#14](https://github.com/DOI-USGS/SpiceQL/issues/14)

- Add github workflows [#20](https://github.com/DOI-USGS/SpiceQL/pull/20)

- Added PR template with licensing [#5](https://github.com/DOI-USGS/SpiceQL/pull/5)



### Changed



- Mkdocs update [#26](https://github.com/DOI-USGS/SpiceQL/pull/26)

- FastAPI app [#27](https://github.com/DOI-USGS/SpiceQL/pull/27)

- Clean up any mention of Sphinx [#32](https://github.com/DOI-USGS/SpiceQL/pull/32)

- Supporting ALE's ISD to Kernel functionality [#33](https://github.com/DOI-USGS/SpiceQL/pull/33)

- New inventory class [#31](https://github.com/DOI-USGS/SpiceQL/pull/31)

- Ale changes [#36](https://github.com/DOI-USGS/SpiceQL/pull/36)

- Accept string for ets param [#34](https://github.com/DOI-USGS/SpiceQL/pull/34)

- Dockerize FastAPI [#35](https://github.com/DOI-USGS/SpiceQL/pull/35)

- Validates quality param [#40](https://github.com/DOI-USGS/SpiceQL/pull/40)

- Planetary body search [#42](https://github.com/DOI-USGS/SpiceQL/pull/42)



### Fixed

- Bug fixes + tests [#38](https://github.com/DOI-USGS/SpiceQL/pull/38)

- Bugfixes [#39](https://github.com/DOI-USGS/SpiceQL/pull/39)

- Fixing bugs in the time search [#41](https://github.com/DOI-USGS/SpiceQL/pull/41)

- Fixed bug where cks were using interval scope [#43](https://github.com/DOI-USGS/SpiceQL/pull/43)

- SCLK Bug fixes [#44](https://github.com/DOI-USGS/SpiceQL/pull/44)

### Changed

- SpiceQL source code

- Required administrative files

CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -88,8 +88,10 @@ if(SPICEQL_BUILD_LIB) 
                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/apollo17.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/base.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/cassini.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/chandrayaan1.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/clem1.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/galileo.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/hayabusa.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/hayabusa2.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/juno.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kaguya.json
@@ -102,6 +104,7 @@ if(SPICEQL_BUILD_LIB) 
                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mgs.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mro.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/msl.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/newhorizons.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/odyssey.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/smart1.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/tgo.json

SpiceQL/src/query.cpp

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ namespace SpiceQL { 


    for (json::json_pointer &ptr : kptrs) {

      SPDLOG_TRACE("Getting Latest Kernels from: {}", ptr.to_string());

      SPDLOG_TRACE("JSON: {}", kernels[ptr]);

      SPDLOG_TRACE("JSON: {}", kernels[ptr].dump());

      vector<vector<string>> kvect = json2DArrayTo2DVector(kernels[ptr]);

      vector<vector<string>> newLatest;

SpiceQL/src/spice_types.cpp

+4 −1
Original line number Diff line number Diff line
@@ -279,12 +279,15 @@ namespace SpiceQL { 


  string doubleEtToSclk(int frameCode, double et, string mission, bool searchKernels) {

      Config missionConf;

      json lsks;

      json sclks;



      if (searchKernels) {

        sclks = Inventory::search_for_kernelset(mission, {"lsk", "fk", "sclk"});

        lsks = Inventory::search_for_kernelset("base", {"lsk"}); 

        sclks = Inventory::search_for_kernelset(mission, {"fk", "sclk"});

      }



      KernelSet lskSet(lsks);

      KernelSet sclkSet(sclks);



      SpiceChar sclk[100];