Adds PVL to JSON converters #4212
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Example output for a CaSSIS label https://gist.github.com/jessemapel/0ac4b1a69e84d02b84c5145e7f4ce9ef |
scsides
reviewed
Dec 21, 2020
| json testJson2 = pvlKeywordToJSON(testKey2); | ||
| json testJson3 = pvlKeywordToJSON(testKey3); | ||
|
|
||
| EXPECT_EQ(testJson1["Comment"], testKey1.comment(0).toStdString()); |
There was a problem hiding this comment.
Should "testJson1["Comment"][0]" be tested also? That is, does [0] still work when there is only one element.
There was a problem hiding this comment.
[0] does not work when there is only 1 value because it's not an array.
scsides
approved these changes
Dec 21, 2020
scsides
added a commit
that referenced
this pull request
Jan 12, 2021
* Removed compile and deprication warnings. Fixes #4110 * temp add of to pds 4 test * Initial topds4 app and cmake updates to include inja (#4207) * Removed compile and deprication warnings. Fixes #4110 * temp add of to pds 4 test * Inintal topds4 app and cmake updates to include inja * Delete extra headers * Fixed inja include Co-authored-by: ssides <ssides@usgs.gov> * Added conda-forge inja * add template file * Adds PVL to JSON converters (#4212) * Pvl to JSON conversion * Renamed file * Added repeated elements and examples * Topds4 real parameters (#4223) * now has some real parameters * removed inja files * Add full orex pds4 template (#4233) * now has some real parameters * removed inja files * full orex xml * add full orex template * Added callbacks and tests (#4226) * Adds Xml2Json capability to topds4 branch (#4228) * Inintal topds4 app and cmake updates to include inja * Delete extra headers * Fixed inja include * Added basic working XMLToJson functionality * Updated to work with many nested levels of different amounts of repeated tags * Add support for unsupported xml edge cases * Add tests that work to test mutliple nested repeated values conversion * cleanup * Update to include no-text value cases to work in repeated-value cases * Update test * Break up tests * Fix typoes in comments * Normalized topds4 and added tests (#4234) * Removed data source args and added app log * Added simple tests for topds4 * Moved line * Added more template elements and callback for file size (#4236) * now has some real parameters * removed inja files * full orex xml * add full orex template * More template elements, and file size callback * Added Extra data source parameters to topds4 (#4239) * Added extra parameters * Added duplicate warnings * Fixed warning * Add writing a cube out to topds4 (#4241) * Basic cubeatt conversion * Add more useful function signature * Removed hardcoded path * Update based on feedback * Add better band test * Updated to fix failing tests and remove old testfiles * Add copy of topds4 templates to CMakeLists.txt (#4242) * Fixed callbacks and doc updates (#4243) * Fixed callbacks and doc updates * added some extra docs * Added original xml label and tests * Update cubeattribute to include an option to supply CubeAttributeInput directly (#4244) * Update cubeatt to add cubeattributeinput option. Also add tests for all function signatures available * Remove unnecessary comments * Update to use explicit array conversion. * Remove commented out code * Update CHANGELOG to include topds4 addition * Delete osirisrex.xml.tpl Removed temporary file * Delete 20190612T090019S776_map_L0pan.xml.full Remove temporary file * Delete 20190612T090019S776_map_L0pan.xml.tpl Remove temp file * Added mis-deleted file (#4249) * Update XmlToJson.cpp * Update topds4.xml * Update topds4.xml * Update topds4.xml * Add setting of virtual bands to topds4 and remove unneeded header file includes Co-authored-by: ssides <ssides@usgs.gov> Co-authored-by: Kristin Berry <kberry@usgs.gov>
This was referenced Jul 8, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added functions to convert all Pvl classes to JSON storage. This does not handle repeated values gracefully, the last instance of a keyword, group, or object with a repeated name will be in the output. I'm working on the best way to handle this without making the functions harder to work with.
Related Issue
PDS4 work
Motivation and Context
Inja requires all of its data to be in JSON objects so we need to be able to convert Pvl labels into JSON
How Has This Been Tested?
Automated tests are included in the PR.
Screenshots (if appropriate):
Types of changes
Checklist:
Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words: