Cphd 1.1.0 fixes (#602)

* feature/SICD-1.3 branch appears to be messed up.

* provide a static "cast" method so clients don't have to know the name of the "enum"

* need 'std' dependency

* six::Enum::cast<T>() method instead of member-function

* use free-functions instead of member-functions

* Revert "use free-functions instead of member-functions"

This reverts commit 6f9b595aca703dcbe5076c286bf5f69a61f8286a.

* Keep the "old" ::cast() method around to make it easier to update other code

* Squashed commit of the following:

commit 255721896cf2137a730a5333b7f3e2247ef512ea
Author: Dan Smith <[email protected]>
Date:   Wed Jul 13 09:03:21 2022 -0400

    remove x86/Win32 configurations; we're 64-bit only

commit ad3d2e71194648b6fe43ee55301bd3e3eb46654b
Author: Dan Smith <[email protected]>
Date:   Wed Jul 13 09:00:51 2022 -0400

    add unittest files to project

commit 13000e4df7d5f8d4531da44d9414240a2d6cbbcc
Author: Dan Smith <[email protected]>
Date:   Wed Jul 13 08:52:38 2022 -0400

    Squashed commit of the following:

    commit fa1abed3e378e8d74a9bdf29c7d39eab2d6adef3
    Author: Dan Smith <[email protected]>
    Date:   Wed Jul 13 08:51:13 2022 -0400

        Keep the "old" ::cast() method around to make it easier to update other code

    commit 6a3666a41f9e53916b22091b7f9f79d0d548d1ed
    Author: Dan Smith <[email protected]>
    Date:   Wed Jul 13 08:31:17 2022 -0400

        Revert "use free-functions instead of member-functions"

        This reverts commit 6f9b595aca703dcbe5076c286bf5f69a61f8286a.

    commit 6f9b595aca703dcbe5076c286bf5f69a61f8286a
    Author: J. Daniel Smith <[email protected]>
    Date:   Tue Jul 12 21:09:11 2022 -0400

        use free-functions instead of member-functions

    commit 31e9b11cf2f7cd4e59c88763aa96a8d75ff52805
    Author: J. Daniel Smith <[email protected]>
    Date:   Tue Jul 12 20:23:52 2022 -0400

        six::Enum::cast<T>() method instead of member-function

    commit 11b0bd0c3ada86dbfdd9cb6dde4675570692d69e
    Author: Dan Smith <[email protected]>
    Date:   Mon Jul 11 08:58:59 2022 -0400

        provide a static "cast" method so clients don't have to know the name of the "enum"

    commit 9b62e29168af420a3b669aed6c0c60db52e918da
    Merge: 1f5e9afbf 0cadf711d
    Author: Dan Smith <[email protected]>
    Date:   Fri Jul 8 13:00:41 2022 -0400

        Merge branch 'master' into feature/SICD-1.3

    commit 1f5e9afbf9509ca4e334b10b6eb996b7df187e7a
    Author: Dan Smith <[email protected]>
    Date:   Fri Jul 8 12:11:21 2022 -0400

        feature/SICD-1.3 branch appears to be messed up.

commit bd7eb39df651ec8a27a86dc2b9d1be960dd4981e
Merge: 1930a9e81 706524af0
Author: Dan Smith <[email protected]>
Date:   Wed Jul 13 08:52:12 2022 -0400

    Merge branch 'master' into develop/VS-unittest

commit 706524af0766d1d88a49f5fda4caab65d30b5806
Author: J. Daniel Smith <[email protected]>
Date:   Mon Jul 11 10:00:19 2022 -0400

    provide an Enum::cast() method to create an Enum from int (#573)

    * feature/SICD-1.3 branch appears to be messed up.

    * provide a static "cast" method so clients don't have to know the name of the "enum"

commit 1930a9e810c78fa5b9fc13ede6a3275442740c62
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 16:02:31 2022 -0400

    use "testName" instead of literal string

commit a236b2a155102a5b8514f639ee63947c3e56e3d7
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 15:53:20 2022 -0400

    remove more SICD 1.3 stuff from this branch

commit 2f4c4a52dfd901c716fad37619d776a2bf250ba4
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 15:39:30 2022 -0400

    comment-out unit-tests needing SICD 1.3

commit 9e71be8affe9bb802599ffd57d71f8045e3ecca0
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 15:29:23 2022 -0400

    compile w/o SICD 1.3 changes

commit 6896f53d9b1844ebc9eabfc8a9c370b60f2c5968
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 14:24:13 2022 -0400

    remove SICD 1.3/SIDD 3.0 changes from this branch

commit 2aa497393a3c56f1d737cef93d053ab53e713a55
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 13:09:50 2022 -0400

    remove last remnants of GTest

commit f6ec3b418f233ce1a03a23ddcf161f96d2e858aa
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 12:56:35 2022 -0400

    all unit tests now working with VSTest! :-)

commit 7d9886aa63bbd99100153b9986a984aac9e9b3b3
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 12:03:15 2022 -0400

    and still more "testName"

commit fc518ea6744ca05d38f6a4dd57f3970f1abc3006
Author: J. Daniel Smith <[email protected]>
Date:   Thu Jun 16 09:45:47 2022 -0400

    be sure "testName" is properly passed around

commit fdaa9606db38f1434a0a50f95c7d6f7107bd6360
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 20:59:55 2022 -0400

    move remaining six.sicd unittests to Visual Studio

commit 0d98934dabb7ea362d9b5d45d61ceb87e8423f33
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 20:36:01 2022 -0400

    move more six.sicd unittests to visual studio

commit dc4ff54068265a485bab515725bc7d53d6fa1822
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 20:31:28 2022 -0400

    remove six.sicd unittests moved to Visual Studio

commit a7f3ab082471ba299a54e07e8dc7259d94094035
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 20:30:05 2022 -0400

    more "testName" passing

commit f20dbf4439fc12ac2e3351832d356d199a49ea17
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 20:24:08 2022 -0400

    move some SICD unittests to Visual Studio

commit 54a18885a725aa2e04c5f254d4c86561dc1b13c9
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 19:52:54 2022 -0400

    pass testName to other code

commit 8de6dbf3b47aa8412a9fa0bc65f256137bc19738
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 18:17:04 2022 -0400

    six.sidd unittests

commit 5f7c567d60fc062aabd7e205ff0544170d3e4ce0
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 15:10:23 2022 -0400

    hook up "six" unittests

commit e39a44d96efb5b06806519f9ff52d2f17d95a45b
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 14:39:18 2022 -0400

    remove chpd03 GTest unittests

commit bf85e47cc4b962ca11ae4985be38a196d60e6cb1
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 14:38:12 2022 -0400

    cphd unittests

commit 7fbc37afff6b2e48d1fc81342e2fa433542f79b3
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 14:29:08 2022 -0400

    some old compilers don't like raw strings

commit ef5ec0ee7443384d824c1dc132c6cafd6d1e7697
Author: J. Daniel Smith <[email protected]>
Date:   Wed Jun 15 14:26:14 2022 -0400

    toString(std::byte)

commit 2c0dd053d299db609ebfd6b4e61b876e51b29abf
Author: J. Daniel Smith <[email protected]>
Date:   Tue Jun 14 17:43:26 2022 -0400

    Squashed commit of the following:

    commit 8e32e438756dab247f2f07590887f9ce97e12e4a
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 13 11:56:23 2022 -0400

        build with GCC

    commit f1673b435769c9d0fdd5c919fa75906640d68946
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 13 10:51:24 2022 -0400

         operator==(const EnumBase& lhs, const std::string& rhs)  is only needed for unittests, don't expose it elsewhere

    commit 0803daec80fd40ea65f1402907f1cbc5cfb62bf1
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 13 10:38:28 2022 -0400

        simplify code with hew nitf::details routines

    commit 522f48c5abfe8773749e7385eec1be86b732f753
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 13 10:13:44 2022 -0400

        to_string()/from_string() changes from NITRO

    commit edeeab5981b9ae4028628309aafc0c6a5ff714b5
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 13 10:10:25 2022 -0400

        name the nested enum; remove implicit string conversions

    commit 3e694e6ffdbc2b05be28583a270e6a9a0037ecf4
    Author: J. Daniel Smith <[email protected]>
    Date:   Sun Jun 12 21:14:28 2022 -0400

        explicit (rather than implicit) to/from string conversion

    commit d647236e1df4ef43084013d0342df5151d528b59
    Author: J. Daniel Smith <[email protected]>
    Date:   Fri Jun 10 14:24:08 2022 -0400

        Another case where the wrong PolarizationType was used

    commit 8aa02d2ae580dd0af6228087cb2b9c29a4662e7f
    Author: J. Daniel Smith <[email protected]>
    Date:   Fri Jun 10 13:42:47 2022 -0400

        move "Enums" code to its own CPP file

    commit 2a6a1cc9a4a2eaf84b60d23d7b3a50002272223b
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 10 10:50:12 2022 -0400

        remove SIEnum.h

    commit f2fb057e3fee022896f8ca4207b28cda3c230d49
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 10 10:37:35 2022 -0400

        tweak toType() for another edge case

    commit 0a1dc08ba7041f41660847ea061c135543b98627
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 10 10:14:15 2022 -0400

        simplify equals_()

    commit 63f850ea02d4d8482eb470769867cac21b96ac32
    Author: J. Daniel Smith <[email protected]>
    Date:   Thu Jun 9 21:05:26 2022 -0400

        make some utility routines "static" so they can be used in other contexts

    commit ae5b517bb84e44fd50823db33a2319043f091461
    Author: J. Daniel Smith <[email protected]>
    Date:   Thu Jun 9 19:33:48 2022 -0400

        "spelling out" another Enum uncovered another tiny simplification

    commit 0eb55dc5831ef361ab8cbfa12b29de7402a2e18c
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 17:53:00 2022 -0400

        changing operator=(int) found two spots where incorrect types were being assigned

    commit c19560fcf145a262f57dc3ffa0c2e04194c58fc9
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 17:31:21 2022 -0400

        separate macro for creating all the =default functions

    commit 6b1482b6f2baa9feb2b29dffa823d11d3b349646
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 17:22:56 2022 -0400

        test more OTHER strings in the constructors

    commit 6a8db052bcbed602a0595a0294d618a7278113c3
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 13:53:04 2022 -0400

        hookup less_() so that != behaves correctly with OTHER.*

    commit 9d15eadf30f39189d2ba878ca9ba3f8eb7490487
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 12:36:47 2022 -0400

        simplify toType() handling

    commit 1127158857e6ee5591838c9c2f86f06fefc73158
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 11:44:38 2022 -0400

        default_to_int() can handle most toType conversion code

    commit 1acc7f721fed28f45878409f08d3da5be4567ae8
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 10:47:27 2022 -0400

        got most changes in place; back to Enum instead of EnumBase

    commit ca3099848e11064adae07d4ffa0cfee4aeedeba4
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 09:58:21 2022 -0400

        move still more code into base class

    commit a6749a4887ae244dd06ef807b4e250e85c5b3bf7
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 09:45:44 2022 -0400

        make a templateized version of EnumBase

    commit 8adb7f4d51a2af191506733e908328aa92d836e5
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 08:55:07 2022 -0400

        EnumDetails<T> code is now part of EnumBase

    commit b21723616d100d697cafdd6f264d6bfd64dadcc6
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 9 08:43:45 2022 -0400

        move more code into the base class

    commit ec031cf44333afa6cc2f83d6859c4c33c1ef1c97
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 17:01:35 2022 -0400

        provide two "toString()" extension points

    commit 54851f97e32f36ba1ece05c636b9305c43329508
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 16:49:50 2022 -0400

        more preparation for switching to new class

    commit c02c681718d701976a844c775d6682d09f85d0e9
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 16:35:13 2022 -0400

        remove default_toType() from Enum<T> class; it's now even smaller

    commit f9197ec17be6bc2aedd4efdb990e53ad60417031
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 16:30:25 2022 -0400

        directly call EnumDetails::.default_toString()

    commit ccb600ed4e3e7c51c3e0743f640247cc774ce5a9
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 15:57:24 2022 -0400

        equals_() virtual instead of eq_() static

    commit 7e9da587b696b31959398c36142174cc181d96bb
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 15:05:36 2022 -0400

        further reduce the size of the derived class

    commit cad2a73ee0069d32b21abf07e38e1adc974fb24e
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 14:30:37 2022 -0400

        instance methods rather than static

    commit f73e0da6524fc9847fcc21f88ca7c830d0350a63
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 14:18:43 2022 -0400

        start breaking apart Enum<T> base class

    commit 5c343ec411d7c01ce7ac85befb8e375255a9d355
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 13:34:58 2022 -0400

        begin work on reducing inheritance for six::detals::Enum

    commit 149c12a69b37e18eb98d8cba9042743ee1370de8
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 8 13:22:28 2022 -0400

        route all comparisons through operator<()

    commit 32990141eb5e6afc9103ca65b61d9f9b0cc1bfb3
    Author: Dan Smith <[email protected]>
    Date:   Tue Jun 7 12:02:44 2022 -0400

        more polarization tests

    commit 45fc1dd73fb176d324e1c15536ca1223eefca657
    Author: Dan Smith <[email protected]>
    Date:   Tue Jun 7 11:33:43 2022 -0400

        toType(std::nothrow_t) for DualPolarizationType

    commit ba1a0e3baba3c00bfa096008ac86713eceefeabd
    Author: Dan Smith <[email protected]>
    Date:   Tue Jun 7 10:21:25 2022 -0400

        test more == cases

    commit 66087bd8323c535f36618997c290b09603662f57
    Author: Dan Smith <[email protected]>
    Date:   Tue Jun 7 09:13:40 2022 -0400

        simplify eq_() implementation too

    commit 66681272b9de5d2f0bf3a3c72eb69baa663cacce
    Author: Dan Smith <[email protected]>
    Date:   Tue Jun 7 08:57:21 2022 -0400

        call T::toType() not toType()

    commit 42c2d257d5ee49714c52ad8f09402843c8400ec3
    Author: J. Daniel Smith <[email protected]>
    Date:   Mon Jun 6 21:26:27 2022 -0400

        simplify T::toType()

    commit ef81c29b48d178bc87648e42e276b48b3b8ea9d1
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 17:09:04 2022 -0400

        handle more OTHER cases for operator==

    commit fe1f7858991a634e69cfda0d1b07b6498b9efa12
    Merge: 6f62d7d71 560f1f8bd
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 16:09:48 2022 -0400

        Merge branch 'master' into feature/SIDD-3.0

    commit 6f62d7d714c8526d51ec8d415b64060ca1183c47
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 15:50:18 2022 -0400

        get ==() working better for DualPolarizationType, not quite there yet

    commit 68c0ccc36da60d395bf9b41640758eabd61a878f
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 14:35:59 2022 -0400

        test more OTHER.* configurations

    commit 665c295d61fe3d5faa57110c414f6bd09b86466f
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 12:24:12 2022 -0400

        test various toString() results for DualPolarization

    commit ddf88683e15bfa373da557cc183c706a31dcd844
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 11:42:10 2022 -0400

        get OTHER.*:OTHER.* working better

    commit e0a058dd436af37fb898d52c5377bf1f0a359022
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 09:54:03 2022 -0400

        want to use PolarizatonType in DualPolarizatonType

    commit a3e81b97925701a9af401490a6f36aaee95fe1e3
    Author: Dan Smith <[email protected]>
    Date:   Mon Jun 6 09:51:13 2022 -0400

        use int/long rather than void*/...

    commit b6f0f142e7fc3bbd6b5fbf0ae606980240baacb1
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 14:06:54 2022 -0400

        get more DualPolarization conversion working

    commit 62fc7d0b04a80066dd15744519b3e981107e78cd
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 13:19:32 2022 -0400

        easy DualPolarization w/o breaking anything else

    commit 55fb3e755cd680c39e09cfa1362207884441f9ac
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 12:12:59 2022 -0400

        reduce common toString_() and toType_imp_() code

    commit 6c1953a370e8e5a7a74753410896b99a40e72e1e
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 11:27:48 2022 -0400

        test toString() for "OTHER_abc"

    commit b9ebca1626cfe7b04234a02bc55bdf8d6e38fc1b
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 11:15:46 2022 -0400

        fix std::string constructor

    commit d5988fbc0d53ef59b64fb56a7610e63fffbadf93
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 11:01:26 2022 -0400

        hang onto the OTHER.* string for use in toString()

    commit e970887342ba3770f0dd830f867f915f1d142684
    Author: Dan Smith <[email protected]>
    Date:   Fri Jun 3 10:35:45 2022 -0400

        figured out "template magic" to call PolarizationType::toType_imp_()

    commit adf8c7b478d478513adf94bceb896c9afc2de382
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 2 14:05:19 2022 -0400

        more work on OTHER.*

    commit 7a2c9aa01dd6a7e51c990252000cac63b1169205
    Author: Dan Smith <[email protected]>
    Date:   Thu Jun 2 11:01:37 2022 -0400

        more infrastructure to support OTHER.*

    commit 19c06895d2bb818f6c151eae4e8f09a6ab1e2f2c
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 1 15:08:45 2022 -0400

        begin work on OTHER.* from SIDD 3.0/SICD 1.3

    commit cc49143fea6a3e07e00f46e48e2d9418802808fb
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 1 14:32:51 2022 -0400

        don't hard-code "UNKNOWN"

    commit 8e7dc816f8283c9945b905f173737ad695e17bfa
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 1 14:25:34 2022 -0400

        update Polarization2Type and DualPolarizationType to match SICD 1.3

    commit af3fa132546dc0c4ac4cbcab4bfb8ec0bd972733
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 1 12:56:24 2022 -0400

        SIDD 3.0 and SICD 1.3 have a lot in common

    commit 4e9c06fa390d9dd67438ec7544203be51e224329
    Author: Dan Smith <[email protected]>
    Date:   Wed Jun 1 12:49:27 2022 -0400

        update vcxproj files for VS2022 17.2

    commit 4179f05d8da2ab7b5c6f7b090618c2635e822161
    Author: Dan Smith <[email protected]>
    Date:   Thu May 26 14:06:31 2022 -0400

        try to use the UnmodeledError values if no errorStats->compositeSCP

    commit a5e18a2a2ce3146547d02b5fdb5f3c409ff573eb
    Author: Dan Smith <[email protected]>
    Date:   Thu May 26 12:03:55 2022 -0400

        found another spot with SIDD version stuff

    commit f1da6c194d49d5ad624d08c4ae455807b8c5f9c9
    Author: Dan Smith <[email protected]>
    Date:   Wed May 25 14:45:04 2022 -0400

        #undef min/max

    commit b8c4f30829d2ada18a21269060b534c08c12b6f2
    Author: Dan Smith <[email protected]>
    Date:   Wed May 25 14:18:07 2022 -0400

        be sure we always try to read values from the XML

    commit 559104b54fb844abf85dbc77ef983aa3889c6c63
    Author: Dan Smith <[email protected]>
    Date:   Wed May 25 13:46:28 2022 -0400

        simplify getSIXUnmodeledError() implementation

    commit d8f3dd2d8fb1b8daf9f635b1f3876bdb7c97c3bf
    Author: Dan Smith <[email protected]>
    Date:   Wed May 25 12:36:57 2022 -0400

        getUnmodeledError() now calls getSIXUnmodeledError() first

    commit a4f8f00cf4e6e022d9a81c002a681ce62aa01a25
    Author: Dan Smith <[email protected]>
    Date:   Tue May 24 09:35:04 2022 -0400

        fix build errors

    commit 2c69032c0c454169f638ae345916c379165407b6
    Author: Dan Smith <[email protected]>
    Date:   Mon May 23 17:16:13 2022 -0400

        new getSIXUnmodeledError() command to return six::ErrorStatistics::Unmodeled

    commit a6c7d62757a1c5223dcc3229a4686c63f77e1a7a
    Author: Dan Smith <[email protected]>
    Date:   Mon May 23 15:46:21 2022 -0400

        operator==() is better as a free function

    commit 9172963027a332eed8eea4b30e99b1ab11e887fb
    Merge: 0c7e23c85 bf89a82ea
    Author: Dan Smith <[email protected]>
    Date:   Thu May 19 13:30:03 2022 -0400

        Merge branch 'master' into feature/SIDD-3.0

    commit 0c7e23c8535ed316ddb2e0bcf91ba6fa299890f6
    Merge: fdede575f 44bcca532
    Author: Dan Smith <[email protected]>
    Date:   Thu Feb 24 09:06:20 2022 -0500

        Merge branch 'master' into feature/SIDD-3.0

    commit fdede575fc1a82ba083708c02ac3624d629b69f5
    Author: Dan Smith <[email protected]>
    Date:   Thu Feb 24 08:43:17 2022 -0500

        Squashed commit of the following:

        commit 043d37c664378bd523c86e23d81f594d7f165b62
        Author: Dan Smith <[email protected]>
        Date:   Thu Feb 24 08:26:22 2022 -0500

            unit tests that don't work in "externals"

        commit 2df69b20f74ac2b56e4e07c5e74a7c226230faf3
        Author: J. Daniel Smith <[email protected]>
        Date:   Wed Feb 23 21:30:32 2022 -0500

            imageCompression() now returns an "enum"

        commit b378acef90d1bcee7b3844ec830b5a10f68ff9a6
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 23 17:28:50 2022 -0500

            latest from "nitro"

        commit cc10dba53875a84f58f43321279fe67d3b12735c
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 23 17:23:35 2022 -0500

            latest from coda-oss

        commit c08a0cebb45496c10efc929e65f646f8ba3c182d
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 23 13:45:48 2022 -0500

            latest from coda-oss

        commit 4ee8337e5b0840065ba35fe85c3ee929593a1ece
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 9 11:44:59 2022 -0500

            latest from "nitro"

        commit c125ae262f13c98ee07ac9779574259e80bfb4a7
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 9 11:43:32 2022 -0500

            latest from coda-oss

        commit a0d7cb5355136cfce72749e97204cb1f33831ecc
        Merge: 77c8052c0 ab0e65226
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 9 11:06:09 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 77c8052c01c6d5b651b1e6f46548bd0b32440f13
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 10:25:58 2022 -0500

            our span now has iterators

        commit de654b9e62833d8662adf24294f0171beb371a93
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 10:18:22 2022 -0500

            tweak GSL from coda-oss

        commit e93b9e5bf73bb63b956bab762ad67b45b4da8c3c
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 09:37:52 2022 -0500

            latest from coda-oss

        commit 409adfa5af8f45fbb7849c8ce28628a371aa745f
        Merge: 76d0b20dc b0785b677
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 09:09:58 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 76d0b20dc2fedcc29a86624b2c9f4d21a448dc0b
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 13:28:59 2022 -0500

            fix compiler warning from xml.lite

        commit 9fde6d8d3322f63fb293b9a956107ceacb028396
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 13:05:19 2022 -0500

            not all unit-tests build in "externals"

        commit a75381dfe838dbe758be1ba1c67bd924944a2f50
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 13:01:04 2022 -0500

            Update StringStream.h

        commit 155632054b2d369ea2c1473784750efe29139e55
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 12:46:44 2022 -0500

            latest from NITRO

        commit 2da0bfca6e3f45777ba9041dd1bfc2551ee22cc4
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 12:44:35 2022 -0500

            latest from coda-oss

        commit 091a4632c2e83cca285bac315a2b17070b8dcfae
        Merge: 5de601b67 59640e1ba
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 12:42:52 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 5de601b676356a5ac474b71dc24bb7c0f74dfe71
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 15:32:11 2022 -0500

            latest from "nitro"

        commit adf928ad07d0fd696b62a2dae1e49cc9ac014ade
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 15:30:35 2022 -0500

            latest from coda-oss

        commit aee5e44e6b08be6c539bcfef629a2534fd60ad8a
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 10:57:47 2022 -0500

            std::filesystem instead of coda_oss::filesystem

        commit ec9d17ac55ca7c70e315200951930e0bd66307a7
        Merge: 833c031f4 cd06266e4
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 10:55:43 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 833c031f411d0ae6de11b14c2d9affcc3efad5fb
        Author: Dan Smith <[email protected]>
        Date:   Thu Jan 20 12:58:04 2022 -0500

            latest from coda-oss

        commit 2364ace449ee910356a98dde7f74a15c63aae761
        Merge: 25b34ab78 8b6bcf777
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 13:28:04 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 25b34ab784e78f98fa6aa4b0e9b04a53caf36779
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 12:33:44 2022 -0500

            minimize changes from "master"

        commit 0b4deaa12fade653e20ccb4460fc424bef89d4c6
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 10:23:38 2022 -0500

            turn off some code-analysis diagnostics

        commit 8797cd0b51617057496d9f89ea2a7602cabb13be
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 10:23:22 2022 -0500

            account for str:: changes in coda-oss

        commit 920d0b79f1b91a1196171deaa61a91626ad7c44d
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 09:54:08 2022 -0500

            latest from coda-oss

        commit 8e308afcf7b35945bdb3cb6c27cc94e63aa18b3b
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 15:26:32 2022 -0500

            construct a std::span directly, no make_span() utility (generates CA diagnostic)

        commit d81a4d1aaac1cdaec1d9dc6a3838343e201d2b81
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 14:06:58 2022 -0500

            latest from coda-oss

        commit 06716b781a3e6f0cf440b0f1bc5251bec415287e
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 13:24:46 2022 -0500

            finish renaming of sys/Filesystem.* to sys/filesystem.*

        commit b3d0b4b8f4ad15c64e9f000143e64da3df1b241e
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 13:24:07 2022 -0500

            rename sys/Filesystem

        commit c30ae278f01cc681c83a3a32afa3f3db174cfa06
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 12:30:21 2022 -0500

            no more gsl::make_span

        commit e61dca0022fc39fdb9f4b63353dc93476fdd98bb
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 11:19:07 2022 -0500

            sys/Bit.h -> std/bit

        commit bb67d052044cd1274d21b9b870f85da4b2040cf1
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 10:49:02 2022 -0500

            sys::Filesystem -> coda_oss::filesystem

        commit ef212eaf09f87ffec27e8c043217ffbd33b29d1f
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 10:02:46 2022 -0500

            tweaks to get coda-oss building w/o warnings

        commit 6f6bfaacc537067b7d36a363297e716e14e2e075
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 09:57:35 2022 -0500

            latest from "nitro"

        commit 90be0243a2d384bc6ee0d81967240ee1d802bdb4
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 09:54:33 2022 -0500

            update to account for coda-oss changes

        commit 28632726cc356524c5a3db5117ead37731342824
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 09:40:48 2022 -0500

            latest drop from coda-oss

        commit 92632ef45f7369c3b0ebfdab65f4cdfa3f79f9d1
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 11 09:59:47 2022 -0500

            Utf-8 -> Windows-1252

        commit 9b719935e8189bc3fbe57e4af4d221c3c49548c5
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 17:20:25 2022 -0500

            UTF-8 to native string conversion

        commit 38dbe6d88e800f360cc9ae388558b09e5b65d95a
        Merge: 74df9ee57 a11980f60
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 17:19:11 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 74df9ee570e4d62fb6c435b4b5e0cef84b57b9d9
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 13:48:13 2022 -0500

            noexcept(false)

        commit b5181bc210c3c2b0abc918842f6bd83b2a2d3907
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 12:01:40 2022 -0500

            remove comments with a backslash at the end

        commit 08f8f9c27f46e793d3bc3d9e65b38facc8293521
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 11:36:15 2022 -0500

            certain NITRO unittests don't work in externals/nitro

        commit dfc3ded9d3c52df1d038833afbdda94cf93e44ee
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:55:01 2022 -0500

            descriptor updates from "nitro"

        commit c989c7ec700533a7ce0c294c09a80d68ed0ad6a4
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:41:48 2022 -0500

            fix #ifdef

        commit 571ab4869aeb70f35dcfa046a36aed875c822739
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:27:53 2022 -0500

            latest from "nitro"

        commit 26ba1a99646ac6db8b38d09e183be4318597efdd
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:26:37 2022 -0500

            latest from coda-oss

        commit 28ab3500dc4c0f46ad61fd6356fdc76db8b4380e
        Merge: 2cd678b7e 28afa6552
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:25:33 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 2cd678b7e2d9fdd46906a6637903fd1325481ffc
        Author: Dan Smith <[email protected]>
        Date:   Thu Jan 6 15:39:49 2022 -0500

            more tweaks to remove compiler warnings

        commit 5d8907616e5bdbf011a9ded45a7cf20e525789d8
        Author: Dan Smith <[email protected]>
        Date:   Thu Jan 6 15:19:57 2022 -0500

            remove errors/warnings from coda-oss

        commit a535245afdd72ba24ad89f270d3012e12fd30c14
        Author: Dan Smith <[email protected]>
        Date:   Wed Jan 5 14:07:27 2022 -0500

            latest from nitro

        commit aff92f496d1f402929707a3cb949c5fb7f4e14ba
        Author: Dan Smith <[email protected]>
        Date:   Wed Jan 5 14:04:39 2022 -0500

            latest from coda-oss

        commit 41ba677e3418cb35ec636745ecb2a78fb7e1ac4e
        Merge: 21cc8ed1f e2e3defbb
        Author: Dan Smith <[email protected]>
        Date:   Wed Jan 5 14:03:26 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 21cc8ed1f01d74ab9d814fae97aa4f70c1e9ce34
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 3 16:43:08 2022 -0500

            use strongly-type TRE fields

        commit 79eb6c8df45ee9f9d296c3d2152971458b6d8def
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 3 16:41:54 2022 -0500

            str::strip from coda-oss

        commit faf20c7fbb3e3c1888215014b29a08c0b57f1caf
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 3 12:15:31 2022 -0500

            explicitly =delete move

        commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 3 11:12:43 2022 -0500

            latest from coda-oss

        commit 22df5a95a3cbc3128780c63114a90181b4af33f8
        Merge: db052a2d7 f1f19bdb6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 29 12:25:28 2021 -0500

            Merge branch 'master' into develop/update-externals

        commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 29 09:17:08 2021 -0500

            adjust for coda-oss changes

        commit 74ce242cf352a333684379cc9bd0278c0cf57571
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 29 09:01:34 2021 -0500

            latest from coda-oss

        commit dc960f74d430442cd3359b8218ad9d9a144bd070
        Author: Dan Smith <[email protected]>
        Date:   Tue Dec 28 10:37:48 2021 -0500

            latest from coda-oss

        commit c6a4bd5b900d83b3407f8793cc756f46965700f4
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 17 09:14:23 2021 -0500

            sanity-check a URI

        commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 15 09:38:14 2021 -0500

            create a "path" after splitting on ":"

        commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 15 08:50:17 2021 -0500

            simple URI validation

        commit 3610f8e6e0f11a643831280819efb0aff3bb373d
        Author: Dan Smith <[email protected]>
        Date:   Tue Dec 14 09:46:21 2021 -0500

            xml.lite tweaks from coda-oss

        commit 813be14c563d9f4829d342ec008b86da5ef77b27
        Merge: 873d4b9d6 9ed21bed3
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 17:25:22 2021 -0500

            Merge branch 'master' into develop/update-externals

        commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10
        Merge: 1c1a7222c ef191da2f
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 13:59:08 2021 -0500

            Merge branch 'master' into develop/update-externals

        commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 13:01:14 2021 -0500

            Squashed commit of the following:

            commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
            Author: Dan Smith <[email protected]>
            Date:   Mon Dec 13 13:00:02 2021 -0500

                xml.lite changes that need to get back to coda-oss

            commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
            Author: Dan Smith <[email protected]>
            Date:   Mon Dec 13 11:45:39 2021 -0500

                Squashed commit of the following:

                commit 33bd17059640d2a02f9766285f05dcdff5de50a8
                Author: Dan Smith <[email protected]>
                Date:   Mon Dec 13 11:44:54 2021 -0500

                    nitro release 2.10.7

                commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
                Author: Dan Smith <[email protected]>
                Date:   Mon Dec 13 11:42:09 2021 -0500

                    coda-oss release 2021-12-13

                commit 86c1856021a5a944c464f9d3cba397a918f68a81
                Author: Dan Smith <[email protected]>
                Date:   Fri Dec 10 11:57:26 2021 -0500

                    xml.lite tweaks from coda-oss

                commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 17:36:09 2021 -0500

                    test_xmlParser might be be running in coda-oss

                commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 16:09:17 2021 -0500

                    "private" is part of name mangling

                commit 351a45f61d63e26fbd379516f073876bf5558050
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 15:54:13 2021 -0500

                    more xml.lite updates from coda-oss

                commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 15:15:34 2021 -0500

                    trying to fine the right macro for SWIG

                commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:51:34 2021 -0500

                    need updates to Python bindings too

                commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:41:12 2021 -0500

                    xml.lite changes from coda-oss

                commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 14:32:37 2021 -0500

                    latest from coda-oss

            commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
            Author: Dan Smith <[email protected]>
            Date:   Fri Dec 10 12:26:10 2021 -0500

                more use of new xml.lite infrastructure

            commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
            Author: Dan Smith <[email protected]>
            Date:   Fri Dec 10 11:58:22 2021 -0500

                use new xml.lite APIs to simplify code

            commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
            Author: Dan Smith <[email protected]>
            Date:   Fri Dec 10 11:57:57 2021 -0500

                Squashed commit of the following:

                commit 86c1856021a5a944c464f9d3cba397a918f68a81
                Author: Dan Smith <[email protected]>
                Date:   Fri Dec 10 11:57:26 2021 -0500

                    xml.lite tweaks from coda-oss

                commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 17:36:09 2021 -0500

                    test_xmlParser might be be running in coda-oss

                commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 16:09:17 2021 -0500

                    "private" is part of name mangling

                commit 351a45f61d63e26fbd379516f073876bf5558050
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 15:54:13 2021 -0500

                    more xml.lite updates from coda-oss

                commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 15:15:34 2021 -0500

                    trying to fine the right macro for SWIG

                commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:51:34 2021 -0500

                    need updates to Python bindings too

                commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:41:12 2021 -0500

                    xml.lite changes from coda-oss

                commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 14:32:37 2021 -0500

                    latest from coda-oss

            commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
            Author: Dan Smith <[email protected]>
            Date:   Fri Dec 10 09:06:38 2021 -0500

                Squashed commit of the following:

                commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
                Author: Dan Smith <[email protected]>
                Date:   Fri Dec 10 08:44:54 2021 -0500

                    still can't get French XML working

                commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 17:37:11 2021 -0500

                    Squashed commit of the following:

                    commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 17:36:09 2021 -0500

                        test_xmlParser might be be running in coda-oss

                    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 16:09:17 2021 -0500

                        "private" is part of name mangling

                    commit 351a45f61d63e26fbd379516f073876bf5558050
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 15:54:13 2021 -0500

                        more xml.lite updates from coda-oss

                    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 15:15:34 2021 -0500

                        trying to fine the right macro for SWIG

                    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:51:34 2021 -0500

                        need updates to Python bindings too

                    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:41:12 2021 -0500

                        xml.lite changes from coda-oss

                    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 14:32:37 2021 -0500

                        latest from coda-oss

                commit f705be9129ea7c71d6bdc25899b53fd3f655b974
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 17:35:35 2021 -0500

                    add overloads for other code

                commit d61323431bea6e33c4f91b60cb83f3401b76671d
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 16:57:55 2021 -0500

                    option to disable XML validation for SICD too

                commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 16:09:44 2021 -0500

                    Squashed commit of the following:

                    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 16:09:17 2021 -0500

                        "private" is part of name mangling

                    commit 351a45f61d63e26fbd379516f073876bf5558050
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 15:54:13 2021 -0500

                        more xml.lite updates from coda-oss

                    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 15:15:34 2021 -0500

                        trying to fine the right macro for SWIG

                    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:51:34 2021 -0500

                        need updates to Python bindings too

                    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:41:12 2021 -0500

                        xml.lite changes from coda-oss

                    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 14:32:37 2021 -0500

                        latest from coda-oss

                commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 15:16:01 2021 -0500

                    Squashed commit of the following:

                    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 15:15:34 2021 -0500

                        trying to fine the right macro for SWIG

                    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:51:34 2021 -0500

                        need updates to Python bindings too

                    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:41:12 2021 -0500

                        xml.lite changes from coda-oss

                    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 14:32:37 2021 -0500

                        latest from coda-oss

                commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:51:53 2021 -0500

                    Squashed commit of the following:

                    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:51:34 2021 -0500

                        need updates to Python bindings too

                    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:41:12 2021 -0500

                        xml.lite changes from coda-oss

                    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 14:32:37 2021 -0500

                        latest from coda-oss

                commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:47:21 2021 -0500

                    trying to get the "french" SICD unit-test working

                commit d63e6eace772c8d02616f467d698da48a14568dd
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 14:42:55 2021 -0500

                    Squashed commit of the following:

                    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
                    Author: Dan Smith <[email protected]>
                    Date:   Thu Dec 9 14:41:12 2021 -0500

                        xml.lite changes from coda-oss

                    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 14:32:37 2021 -0500

                        latest from coda-oss

                commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 09:29:07 2021 -0500

                    test_valid_six unittests now working

                commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 17:45:26 2021 -0500

                    trying to re-enable more unittests

                commit c787e98a7f339740389e10f5c5cb3760617f3ed1
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 16:54:28 2021 -0500

                    unit-test breaks on Linux

                commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 15:25:31 2021 -0500

                    Squashed commit of the following:

                    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 15:23:00 2021 -0500

                        merge in develop/SIDD-3.0

                commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 15:08:04 2021 -0500

                    merge in develop/8AMPI_PHSI

            commit 67768ea901bbd983becc4790b478afe0f17828d5
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 10:02:19 2021 -0500

                Squashed commit of the following:

                commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
                Author: Dan Smith <[email protected]>
                Date:   Thu Dec 9 09:29:07 2021 -0500

                    test_valid_six unittests now working

                commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 17:45:26 2021 -0500

                    trying to re-enable more unittests

                commit c787e98a7f339740389e10f5c5cb3760617f3ed1
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 16:54:28 2021 -0500

                    unit-test breaks on Linux

                commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 15:25:31 2021 -0500

                    Squashed commit of the following:

                    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 15:23:00 2021 -0500

                        merge in develop/SIDD-3.0

                commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 15:08:04 2021 -0500

                    merge in develop/8AMPI_PHSI

            commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:26:24 2021 -0500

                Squashed commit of the following:

                commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 15:25:31 2021 -0500

                    Squashed commit of the following:

                    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
                    Author: Dan Smith <[email protected]>
                    Date:   Wed Dec 8 15:23:00 2021 -0500

                        merge in develop/SIDD-3.0

                commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
                Author: Dan Smith <[email protected]>
                Date:   Wed Dec 8 15:08:04 2021 -0500

                    merge in develop/8AMPI_PHSI

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit 33bd17059640d2a02f9766285f05dcdff5de50a8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:44:54 2021 -0500

            nitro release 2.10.7

        commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:42:09 2021 -0500

            coda-oss release 2021-12-13

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 365ae0c337e9fba44eb34792ab5ea107dae2b838
    Author: Dan Smith <[email protected]>
    Date:   Wed Feb 23 13:47:17 2022 -0500

        Squashed commit of the following:

        commit c08a0cebb45496c10efc929e65f646f8ba3c182d
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 23 13:45:48 2022 -0500

            latest from coda-oss

        commit 4ee8337e5b0840065ba35fe85c3ee929593a1ece
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 9 11:44:59 2022 -0500

            latest from "nitro"

        commit c125ae262f13c98ee07ac9779574259e80bfb4a7
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 9 11:43:32 2022 -0500

            latest from coda-oss

        commit a0d7cb5355136cfce72749e97204cb1f33831ecc
        Merge: 77c8052c0 ab0e65226
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 9 11:06:09 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 77c8052c01c6d5b651b1e6f46548bd0b32440f13
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 10:25:58 2022 -0500

            our span now has iterators

        commit de654b9e62833d8662adf24294f0171beb371a93
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 10:18:22 2022 -0500

            tweak GSL from coda-oss

        commit e93b9e5bf73bb63b956bab762ad67b45b4da8c3c
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 09:37:52 2022 -0500

            latest from coda-oss

        commit 409adfa5af8f45fbb7849c8ce28628a371aa745f
        Merge: 76d0b20dc b0785b677
        Author: Dan Smith <[email protected]>
        Date:   Fri Feb 4 09:09:58 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 76d0b20dc2fedcc29a86624b2c9f4d21a448dc0b
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 13:28:59 2022 -0500

            fix compiler warning from xml.lite

        commit 9fde6d8d3322f63fb293b9a956107ceacb028396
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 13:05:19 2022 -0500

            not all unit-tests build in "externals"

        commit a75381dfe838dbe758be1ba1c67bd924944a2f50
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 13:01:04 2022 -0500

            Update StringStream.h

        commit 155632054b2d369ea2c1473784750efe29139e55
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 12:46:44 2022 -0500

            latest from NITRO

        commit 2da0bfca6e3f45777ba9041dd1bfc2551ee22cc4
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 12:44:35 2022 -0500

            latest from coda-oss

        commit 091a4632c2e83cca285bac315a2b17070b8dcfae
        Merge: 5de601b67 59640e1ba
        Author: Dan Smith <[email protected]>
        Date:   Wed Feb 2 12:42:52 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 5de601b676356a5ac474b71dc24bb7c0f74dfe71
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 15:32:11 2022 -0500

            latest from "nitro"

        commit adf928ad07d0fd696b62a2dae1e49cc9ac014ade
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 15:30:35 2022 -0500

            latest from coda-oss

        commit aee5e44e6b08be6c539bcfef629a2534fd60ad8a
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 10:57:47 2022 -0500

            std::filesystem instead of coda_oss::filesystem

        commit ec9d17ac55ca7c70e315200951930e0bd66307a7
        Merge: 833c031f4 cd06266e4
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 25 10:55:43 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 833c031f411d0ae6de11b14c2d9affcc3efad5fb
        Author: Dan Smith <[email protected]>
        Date:   Thu Jan 20 12:58:04 2022 -0500

            latest from coda-oss

        commit 2364ace449ee910356a98dde7f74a15c63aae761
        Merge: 25b34ab78 8b6bcf777
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 13:28:04 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 25b34ab784e78f98fa6aa4b0e9b04a53caf36779
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 12:33:44 2022 -0500

            minimize changes from "master"

        commit 0b4deaa12fade653e20ccb4460fc424bef89d4c6
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 10:23:38 2022 -0500

            turn off some code-analysis diagnostics

        commit 8797cd0b51617057496d9f89ea2a7602cabb13be
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 10:23:22 2022 -0500

            account for str:: changes in coda-oss

        commit 920d0b79f1b91a1196171deaa61a91626ad7c44d
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 18 09:54:08 2022 -0500

            latest from coda-oss

        commit 8e308afcf7b35945bdb3cb6c27cc94e63aa18b3b
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 15:26:32 2022 -0500

            construct a std::span directly, no make_span() utility (generates CA diagnostic)

        commit d81a4d1aaac1cdaec1d9dc6a3838343e201d2b81
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 14:06:58 2022 -0500

            latest from coda-oss

        commit 06716b781a3e6f0cf440b0f1bc5251bec415287e
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 13:24:46 2022 -0500

            finish renaming of sys/Filesystem.* to sys/filesystem.*

        commit b3d0b4b8f4ad15c64e9f000143e64da3df1b241e
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 13:24:07 2022 -0500

            rename sys/Filesystem

        commit c30ae278f01cc681c83a3a32afa3f3db174cfa06
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 12:30:21 2022 -0500

            no more gsl::make_span

        commit e61dca0022fc39fdb9f4b63353dc93476fdd98bb
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 11:19:07 2022 -0500

            sys/Bit.h -> std/bit

        commit bb67d052044cd1274d21b9b870f85da4b2040cf1
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 10:49:02 2022 -0500

            sys::Filesystem -> coda_oss::filesystem

        commit ef212eaf09f87ffec27e8c043217ffbd33b29d1f
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 10:02:46 2022 -0500

            tweaks to get coda-oss building w/o warnings

        commit 6f6bfaacc537067b7d36a363297e716e14e2e075
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 09:57:35 2022 -0500

            latest from "nitro"

        commit 90be0243a2d384bc6ee0d81967240ee1d802bdb4
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 09:54:33 2022 -0500

            update to account for coda-oss changes

        commit 28632726cc356524c5a3db5117ead37731342824
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 17 09:40:48 2022 -0500

            latest drop from coda-oss

        commit 92632ef45f7369c3b0ebfdab65f4cdfa3f79f9d1
        Author: Dan Smith <[email protected]>
        Date:   Tue Jan 11 09:59:47 2022 -0500

            Utf-8 -> Windows-1252

        commit 9b719935e8189bc3fbe57e4af4d221c3c49548c5
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 17:20:25 2022 -0500

            UTF-8 to native string conversion

        commit 38dbe6d88e800f360cc9ae388558b09e5b65d95a
        Merge: 74df9ee57 a11980f60
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 17:19:11 2022 -0500

            Merge branch 'master' into develop/update-externals

        commit 74df9ee570e4d62fb6c435b4b5e0cef84b57b9d9
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 13:48:13 2022 -0500

            noexcept(false)

        commit b5181bc210c3c2b0abc918842f6bd83b2a2d3907
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 12:01:40 2022 -0500

            remove comments with a backslash at the end

        commit 08f8f9c27f46e793d3bc3d9e65b38facc8293521
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 11:36:15 2022 -0500

            certain NITRO unittests don't work in externals/nitro

        commit dfc3ded9d3c52df1d038833afbdda94cf93e44ee
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:55:01 2022 -0500

            descriptor updates from "nitro"

        commit c989c7ec700533a7ce0c294c09a80d68ed0ad6a4
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:41:48 2022 -0500

            fix #ifdef

        commit 571ab4869aeb70f35dcfa046a36aed875c822739
        Author: Dan Smith <[email protected]>
        Date:   Mon Jan 10 10:27:53 2022 -0500
…

ReleaseNotes.md

@@ -6,6 +6,7 @@
 * [coda-oss](https://github.com/mdaus/coda-oss) version [202?-??-??](https://github.com/mdaus/coda-oss/releases/tag/202?-??-??)
 * [nitro](https://github.com/mdaus/nitro) version [2.?.?](https://github.com/mdaus/nitro/releases/tag/NITRO-2.?.?)
 * cphd::PhaseSGN accepts both `1` and `+1`, toString() is now `"1"` instead of `"+1"`.
+* CPHD XML parser handles URI's for versions 1.0.0, 1.0.1, and 1.1.0; unit test updated to test metadata parsing extensions
 
 ## [Version 3.2.0](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.0); August 30, 2022
 * [coda-oss](https://github.com/mdaus/coda-oss) version [2022-08-30_cpp14](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30_cpp14)

six/modules/c++/cphd/include/cphd/CPHDXMLControl.h

@@ -143,16 +143,15 @@ class CPHDXMLControl
     virtual Metadata fromXML(const xml::lite::Document& doc,
         const std::vector<std::filesystem::path>& schemaPaths = std::vector<std::filesystem::path>());
 
+    //! \return Suported version to uri mapping
+    static std::unordered_map<std::string, xml::lite::Uri> getVersionUriMap();
 
 protected:
     logging::Logger *mLog = nullptr;
     bool mOwnLog = false;
     six::Logger mLogger;
 
 private:
-    //! \return Hardcoded version to uri mapping
-    static std::unordered_map<std::string, xml::lite::Uri> getVersionUriMap();
-
     /*!
      *  This function takes in a Metadata object and converts
      *  it to a new-allocated XML DOM.

six/modules/c++/cphd/source/CPHDXMLControl.cpp

@@ -72,9 +72,9 @@ std::u8string CPHDXMLControl::toXMLString(
     return ss.stream().str();
 }
 std::u8string CPHDXMLControl::toXMLString(
-    const Metadata& metadata,
-    const std::vector<std::string>& schemaPaths_,
-    bool prettyPrint)
+        const Metadata& metadata,
+        const std::vector<std::string>& schemaPaths_,
+        bool prettyPrint)
 {
     std::vector<std::filesystem::path> schemaPaths;
     std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths),
@@ -106,9 +106,9 @@ mem::auto_ptr<xml::lite::Document> CPHDXMLControl::toXML(
 std::unordered_map<std::string, xml::lite::Uri> CPHDXMLControl::getVersionUriMap()
 {
     return {
-        {"1.0.0", xml::lite::Uri("urn:CPHD:1.0.0")}
-        , {"1.0.1", xml::lite::Uri("http://api.nsgreg.nga.mil/schema/cphd/1.0.1")}
-        , {"1.1.0", xml::lite::Uri("http://api.nsgreg.nga.mil/schema/cphd/1.1.0")}
+        {"1.0.0", xml::lite::Uri("urn:CPHD:1.0.0")},
+        {"1.0.1", xml::lite::Uri("http://api.nsgreg.nga.mil/schema/cphd/1.0.1")},
+        {"1.1.0", xml::lite::Uri("http://api.nsgreg.nga.mil/schema/cphd/1.1.0")}
     };
 }
 

six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp

@@ -31,8 +31,9 @@
 #include <xml/lite/MinidomParser.h>
 #include "TestCase.h"
 
-const char* test_cphd_xml_control_XML =
-"<CPHD xmlns=\"urn:CPHD:1.0.0\">\n"
+static std::string testCPHDXMLBody()
+{
+    const char* xmlBody =
 "    <CollectionID>\n"
 "        <CollectorName>Collector</CollectorName>\n"
 "        <CoreName>Core</CoreName>\n"
@@ -48,7 +49,7 @@ const char* test_cphd_xml_control_XML =
 "    </CollectionID>\n"
 "    <Global>\n"
 "        <DomainType>FX</DomainType>\n"
-"        <SGN>+1</SGN>\n"
+"        <SGN>1</SGN>\n"
 "        <Timeline>\n"
 "            <CollectionStart>2013-04-10T08:52:09.000000Z</CollectionStart>\n"
 "            <RcvCollectionStart>2014-04-10T08:52:09.000000Z</RcvCollectionStart>\n"
@@ -875,13 +876,25 @@ const char* test_cphd_xml_control_XML =
 "                <Parameter name=\"param1\">Match1</Parameter>\n"
 "            </MatchCollection>\n"
 "        </MatchType>\n"
-"    </MatchInfo>\n"
-"</CPHD>\n";
+"    </MatchInfo>\n";
+    return std::string(xmlBody);
+}
 
-TEST_CASE(testReadXML)
+std::string testCPHDXML(const std::string& version)
 {
+    auto uri = cphd::CPHDXMLControl::getVersionUriMap().at(version);
+    return "<CPHD xmlns=\""
+        + uri.value
+        + "\">\n"
+        + testCPHDXMLBody()
+        + "</CPHD>\n";
+}
+
+void runTest(const std::string& testName, const std::string& version)
+{
+    auto xmlString = testCPHDXML(version);
     io::StringStream cphdStream;
-    cphdStream.write(test_cphd_xml_control_XML, strlen(test_cphd_xml_control_XML));
+    cphdStream.write(xmlString.c_str(), xmlString.size());
 
     xml::lite::MinidomParser xmlParser;
     xmlParser.preserveCharacterData(true);
@@ -1137,6 +1150,25 @@ TEST_CASE(testReadXML)
     TEST_ASSERT_EQ(ref.monostatic->dopplerConeAngle, 30.0);
 }
 
+TEST_CASE(testVersions)
+{
+    auto versionUriMap = cphd::CPHDXMLControl::getVersionUriMap();
+    for (auto version : {"1.0.0", "1.0.1", "1.1.0"})
+    {
+        TEST_ASSERT_TRUE(
+            versionUriMap.find(version) != versionUriMap.end());
+    }
+}
+
+TEST_CASE(testReadXML)
+{
+    for (auto pair : cphd::CPHDXMLControl::getVersionUriMap())
+    {
+        auto& version = pair.first;
+        runTest("testReadXML" + version, version);
+    }
+}
+
 TEST_CASE(testPhaseSGN)
 {
     auto v = cphd::PhaseSGN::toType("-1");
@@ -1156,7 +1188,7 @@ TEST_CASE(testPhaseSGN)
 }
 
 TEST_MAIN(
-        TEST_CHECK(testReadXML);
-        TEST_CHECK(testPhaseSGN);
-        // TEST_CHECK(testValidation);
-)
+    TEST_CHECK(testVersions);
+    TEST_CHECK(testReadXML);
+    TEST_CHECK(testPhaseSGN);
+)