Skip to content

Commit 7c0eae5

Browse files
mnhughesmnhughes
authored
Merge pull request #61 from pds-data-dictionaries/242_expose_classes
v1.9.10.0
2 parents 59a477c + 10bcda5 commit 7c0eae5

69 files changed

Lines changed: 3955 additions & 3616 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.17.0.0/PDS4_GEOM_1H00_19A0.JSON‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

build/development/a5d1db344545752189c876ad394e20ba808965a3/1.19.0.0/PDS4_GEOM_1J00_1990.csv renamed to build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.17.0.0/PDS4_GEOM_1H00_19A0.csv

Lines changed: 9 additions & 0 deletions
Large diffs are not rendered by default.

build/development/a5d1db344545752189c876ad394e20ba808965a3/1.17.0.0/PDS4_GEOM_1H00_1990.sch renamed to build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.17.0.0/PDS4_GEOM_1H00_19A0.sch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- PDS4 Schematron for Name Space Id:geom Version:1.9.9.0 - Wed Jan 08 18:10:23 UTC 2025 -->
2+
<!-- PDS4 Schematron for Name Space Id:geom Version:1.9.10.0 - Thu Jan 30 16:37:18 UTC 2025 -->
33
<!-- Generated from the PDS4 Information Model Version 1.17.0.0 - System Build 12.0 -->
44
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
55
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">

build/development/a5d1db344545752189c876ad394e20ba808965a3/1.17.0.0/PDS4_GEOM_1H00_1990.txt renamed to build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.17.0.0/PDS4_GEOM_1H00_19A0.txt

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ PDS4 Local Data Dictionary Processing Report
22

33
Configuration:
44
LDDTool Version 15.2.4
5-
LDD Version Id: 1.9.9.0
5+
LDD Version Id: 1.9.10.0
66
LDD Label Version Id: 1.23
77
LDD Discipline (T/F): true
88
LDD Namespace URL: http://pds.nasa.gov/pds4/
99
LDD URN Prefix: urn:nasa:pds:
10-
Time Wed Jan 08 18:10:23 UTC 2025
10+
Time Thu Jan 30 16:37:18 UTC 2025
1111
Common Schema [PDS4_PDS_1H00.xsd]
1212
Common Schematron [PDS4_PDS_1H00.sch]
1313
IM Version Id: 1.17.0.0
@@ -30,7 +30,7 @@ Parameters:
3030
Summary:
3131
Classes 148
3232
Attributes 217
33-
Associations 505
33+
Associations 507
3434
Error messages 0
3535
Warning messages 0
3636
Information messages 0
@@ -39,7 +39,7 @@ Detailed validation messages
3939

4040
Parsed Input - Header:
4141
LDD Name Geometry Dictionary Full
42-
LDD Version 1.9.9.0
42+
LDD Version 1.9.10.0
4343
Full Name Edward A. Guinness
4444
Steward geo
4545
Namespace Id geom
@@ -291,7 +291,12 @@ Parsed Input - Header:
291291
Version 1.9.8.0 2024-11-01
292292
- Added two enumerated values (SAM1 and SAM2) to coordinate_space_frame_type to support MSL.
293293
Version 1.9.9.0 2024-12-19
294-
- Updated the definition of the emission_angle attribute to match that of the Rings LDD.
294+
- Updated the definition of the emission_angle attribute to include valid ranges for ring observations
295+
Version 1.9.10.0 2025-01-29
296+
- Set element_flag = true in Body_Identification_Base, Reference_Frame_Identification, and
297+
Central_Body_Identification, so that other LDDs can use them (supports Rings LDD).
298+
- Corrected Frame_Identification_Base to have abstract_flag = true, since it is only used as a parent.
299+
- Added an optional local_identifier to Body_Identification_Base and Frame_Identification_Base.
295300

296301
Last Modification Time 2023-10-12
297302
PDS4 Merge Flag false
@@ -1720,6 +1725,11 @@ Parsed Input - Classes:
17201725

17211726
Associations
17221727

1728+
local identifier pds.local_identifier
1729+
minimum occurrences 0
1730+
maximum occurrences 1
1731+
reference type attribute_of
1732+
17231733
local identifier geom:body_spice_name
17241734
minimum occurrences 0
17251735
maximum occurrences 1
@@ -1737,12 +1747,17 @@ Parsed Input - Classes:
17371747

17381748
name Frame_Identification_Base
17391749
description The Frame_Identification_Base class provides multiple attributes that can be used to identify a reference frame. At least one must be used.
1740-
is abstract false
1750+
is abstract true
17411751
is choice false
17421752
subclass of USER
17431753

17441754
Associations
17451755

1756+
local identifier pds.local_identifier
1757+
minimum occurrences 0
1758+
maximum occurrences 1
1759+
reference type attribute_of
1760+
17461761
local identifier geom:frame_spice_name
17471762
minimum occurrences 0
17481763
maximum occurrences 1

build/development/a5d1db344545752189c876ad394e20ba808965a3/1.17.0.0/PDS4_GEOM_1H00_1990.xml renamed to build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.17.0.0/PDS4_GEOM_1H00_19A0.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- PDS4 XML product label for PDS4 V1.17.0.0 Wed Jan 08 18:10:23 UTC 2025 -->
2+
<!-- PDS4 XML product label for PDS4 V1.17.0.0 Thu Jan 30 16:37:18 UTC 2025 -->
33
<!-- Generated from the PDS4 Information Model V1.17.0.0 - System Build 12.0 -->
44
<!-- *** This PDS4 XML product label is an operational deliverable. *** -->
55
<?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1H00.sch"
@@ -10,42 +10,42 @@
1010
xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1
1111
https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1H00.xsd">
1212
<Identification_Area>
13-
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:geom-xml_schema_1.17.0.0_1.9.9.0</logical_identifier>
13+
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:geom-xml_schema_1.17.0.0_1.9.10.0</logical_identifier>
1414
<version_id>1.23</version_id>
15-
<title>PDS4 XML Schema - GEOM V1.9.9.0</title>
15+
<title>PDS4 XML Schema - GEOM V1.9.10.0</title>
1616
<information_model_version>1.17.0.0</information_model_version>
1717
<product_class>Product_XML_Schema</product_class>
1818
<Modification_History>
1919
<Modification_Detail>
20-
<modification_date>2025-01-08</modification_date>
20+
<modification_date>2025-01-30</modification_date>
2121
<version_id>1.23</version_id>
2222
<description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
2323
</Modification_Detail>
2424
</Modification_History>
2525
</Identification_Area>
2626
<File_Area_XML_Schema>
2727
<File>
28-
<file_name>PDS4_GEOM_1H00_1990.xsd</file_name>
29-
<creation_date_time>2025-01-08T10:10:23</creation_date_time>
30-
<file_size unit="byte">384602</file_size>
31-
<records>7640</records>
28+
<file_name>PDS4_GEOM_1H00_19A0.xsd</file_name>
29+
<creation_date_time>2025-01-30T08:37:18</creation_date_time>
30+
<file_size unit="byte">385844</file_size>
31+
<records>7656</records>
3232
</File>
3333
<XML_Schema>
34-
<name>PDS4_GEOM_1H00_1990.xsd</name>
34+
<name>PDS4_GEOM_1H00_19A0.xsd</name>
3535
<offset unit="byte">0</offset>
3636
<parsing_standard_id>XML Schema Version 1.1</parsing_standard_id>
3737
<description>This is a PDS4 XML Schema file for the declared namespace.</description>
3838
</XML_Schema>
3939
</File_Area_XML_Schema>
4040
<File_Area_XML_Schema>
4141
<File>
42-
<file_name>PDS4_GEOM_1H00_1990.sch</file_name>
43-
<creation_date_time>2025-01-08T10:10:23</creation_date_time>
44-
<file_size unit="byte">165510</file_size>
42+
<file_name>PDS4_GEOM_1H00_19A0.sch</file_name>
43+
<creation_date_time>2025-01-30T08:37:18</creation_date_time>
44+
<file_size unit="byte">165511</file_size>
4545
<records>2056</records>
4646
</File>
4747
<XML_Schema>
48-
<name>PDS4_GEOM_1H00_1990.sch</name>
48+
<name>PDS4_GEOM_1H00_19A0.sch</name>
4949
<offset unit="byte">0</offset>
5050
<parsing_standard_id>Schematron ISO/IEC 19757-3:2006</parsing_standard_id>
5151
<description>This is the PDS4 Schematron file for the declared namespace. Schematron provides rule-based validation for XML Schema.</description>

build/development/a5d1db344545752189c876ad394e20ba808965a3/1.17.0.0/PDS4_GEOM_1H00_1990.xsd renamed to build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.17.0.0/PDS4_GEOM_1H00_19A0.xsd

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- PDS4 XML/Schema for Name Space Id:geom Version:1.9.9.0 - Wed Jan 08 18:10:23 UTC 2025 -->
2+
<!-- PDS4 XML/Schema for Name Space Id:geom Version:1.9.10.0 - Thu Jan 30 16:37:18 UTC 2025 -->
33
<!-- Generated from the PDS4 Information Model Version 1.17.0.0 - System Build 12.0 -->
44
<!-- *** This PDS4 product schema is an operational deliverable. *** -->
55
<!-- -->
66
<!-- Dictionary Stack -->
77
<!-- 1.17.0.0 - pds: - Common Dictionary -->
8-
<!-- 1.9.9.0 - geom: - Geometry Dictionary Full -->
8+
<!-- 1.9.10.0 - geom: - Geometry Dictionary Full -->
99
<!-- -->
1010
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
1111
targetNamespace="http://pds.nasa.gov/pds4/geom/v1"
1212
xmlns:geom="http://pds.nasa.gov/pds4/geom/v1"
1313
xmlns:pds="http://pds.nasa.gov/pds4/pds/v1"
1414
elementFormDefault="qualified"
1515
attributeFormDefault="unqualified"
16-
version="1.9.9.0">
16+
version="1.9.10.0">
1717

1818
<xs:import namespace="http://pds.nasa.gov/pds4/pds/v1" schemaLocation="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1H00.xsd"/>
1919

@@ -267,13 +267,20 @@
267267
Version 1.9.8.0 2024-11-01
268268
- Added two enumerated values (SAM1 and SAM2) to coordinate_space_frame_type to support MSL.
269269
Version 1.9.9.0 2024-12-19
270-
- Updated the definition of the emission_angle attribute to match that of the Rings LDD.
270+
- Updated the definition of the emission_angle attribute to include valid ranges for ring observations
271+
Version 1.9.10.0 2025-01-29
272+
- Set element_flag = true in Body_Identification_Base, Reference_Frame_Identification, and
273+
Central_Body_Identification, so that other LDDs can use them (supports Rings LDD).
274+
- Corrected Frame_Identification_Base to have abstract_flag = true, since it is only used as a parent.
275+
- Added an optional local_identifier to Body_Identification_Base and Frame_Identification_Base.
271276

272277
</xs:documentation>
273278
</xs:annotation>
274279

280+
<xs:element name="Central_Body_Identification" type="geom:Central_Body_Identification"> </xs:element>
275281
<xs:element name="Coordinate_Space_Reference" type="geom:Coordinate_Space_Reference"> </xs:element>
276282
<xs:element name="Geometry" type="geom:Geometry"> </xs:element>
283+
<xs:element name="Reference_Frame_Identification" type="geom:Reference_Frame_Identification"> </xs:element>
277284

278285
<xs:complexType name="Articulation_Device_Parameters">
279286
<xs:annotation>
@@ -314,6 +321,7 @@
314321
barycenter, etc.). At least one must be used. </xs:documentation>
315322
</xs:annotation>
316323
<xs:sequence>
324+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
317325
<xs:element name="body_spice_name" type="geom:body_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
318326
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
319327
<xs:element ref="pds:Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -409,7 +417,7 @@
409417
<xs:element name="PSPH_Model" type="geom:PSPH_Model"> </xs:element>
410418
</xs:choice>
411419
<xs:choice minOccurs="1" maxOccurs="1">
412-
<xs:element name="Reference_Frame_Identification" type="geom:Reference_Frame_Identification"> </xs:element>
420+
<xs:element ref="geom:Reference_Frame_Identification"> </xs:element>
413421
<xs:element ref="geom:Coordinate_Space_Reference"> </xs:element>
414422
</xs:choice>
415423
<xs:element name="Quaternion_Model_Transform" type="geom:Quaternion_Model_Transform" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -431,6 +439,7 @@
431439
<xs:complexContent>
432440
<xs:restriction base="geom:Body_Identification_Base">
433441
<xs:sequence>
442+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
434443
<xs:element name="body_spice_name" type="geom:body_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
435444
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
436445
<xs:element ref="pds:Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -639,7 +648,7 @@
639648
<xs:element name="coordinate_system_time_utc" type="geom:coordinate_system_time_utc" minOccurs="0" maxOccurs="1"> </xs:element>
640649
<xs:element name="comment" type="pds:comment" minOccurs="0" maxOccurs="1"> </xs:element>
641650
<xs:element name="Coordinate_System_Origin_Identification" type="geom:Coordinate_System_Origin_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
642-
<xs:element name="Reference_Frame_Identification" type="geom:Reference_Frame_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
651+
<xs:element ref="geom:Reference_Frame_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
643652
</xs:sequence>
644653
<!-- Begin assert statements for schematron - Enumerated Values -->
645654
<!-- <xs:assert test="geom:coordinate_system_type = ('Azimuth-Elevation', 'Cartesian', 'Planetocentric', 'Planetodetic', 'Planetographic', 'Spherical')"/> -->
@@ -660,6 +669,7 @@
660669
<xs:complexContent>
661670
<xs:restriction base="geom:Body_Identification_Base">
662671
<xs:sequence>
672+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
663673
<xs:element name="body_spice_name" type="geom:body_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
664674
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
665675
<xs:element ref="pds:Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -1030,6 +1040,7 @@
10301040
frame. At least one must be used. </xs:documentation>
10311041
</xs:annotation>
10321042
<xs:sequence>
1043+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
10331044
<xs:element name="frame_spice_name" type="geom:frame_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
10341045
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
10351046
<xs:element name="comment" type="pds:comment" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -1140,6 +1151,7 @@
11401151
<xs:complexContent>
11411152
<xs:restriction base="geom:Body_Identification_Base">
11421153
<xs:sequence>
1154+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
11431155
<xs:element name="body_spice_name" type="geom:body_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
11441156
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
11451157
<xs:element ref="pds:Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -1284,7 +1296,7 @@
12841296
<xs:sequence>
12851297
<xs:element ref="pds:Local_Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
12861298
<xs:element name="Display_Direction" type="geom:Display_Direction" minOccurs="0" maxOccurs="1"> </xs:element>
1287-
<xs:element name="Central_Body_Identification" type="geom:Central_Body_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
1299+
<xs:element ref="geom:Central_Body_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
12881300
<xs:element name="Geometry_Target_Identification" type="geom:Geometry_Target_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
12891301
<xs:choice minOccurs="1" maxOccurs="unbounded">
12901302
<xs:element name="Object_Orientation_North_East" type="geom:Object_Orientation_North_East"> </xs:element>
@@ -1478,7 +1490,7 @@
14781490
<xs:sequence>
14791491
<xs:element name="north_azimuth" type="geom:north_azimuth" minOccurs="1" maxOccurs="1"> </xs:element>
14801492
<xs:element name="east_azimuth" type="geom:east_azimuth" minOccurs="1" maxOccurs="1"> </xs:element>
1481-
<xs:element name="Reference_Frame_Identification" type="geom:Reference_Frame_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
1493+
<xs:element ref="geom:Reference_Frame_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
14821494
</xs:sequence>
14831495
</xs:complexType>
14841496

@@ -1501,7 +1513,7 @@
15011513
<xs:element name="celestial_north_clock_angle" nillable="true" type="geom:celestial_north_clock_angle"> </xs:element>
15021514
<xs:element name="ecliptic_north_clock_angle" nillable="true" type="geom:ecliptic_north_clock_angle"> </xs:element>
15031515
</xs:choice>
1504-
<xs:element name="Reference_Frame_Identification" type="geom:Reference_Frame_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
1516+
<xs:element ref="geom:Reference_Frame_Identification" minOccurs="1" maxOccurs="1"> </xs:element>
15051517
</xs:sequence>
15061518
<!-- Begin assert statements for schematron - Enumerated Values -->
15071519
<!-- <xs:assert test="geom:reference_pixel_location = ('Center', 'Lower Left Corner', 'Lower Right Corner', 'Upper Left Corner', 'Upper Right Corner')"/> -->
@@ -1517,6 +1529,7 @@
15171529
<xs:complexContent>
15181530
<xs:restriction base="geom:Body_Identification_Base">
15191531
<xs:sequence>
1532+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
15201533
<xs:element name="body_spice_name" type="geom:body_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
15211534
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
15221535
<xs:element ref="pds:Internal_Reference" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -1532,7 +1545,7 @@
15321545
Geometry_Orbiter class. </xs:documentation>
15331546
</xs:annotation>
15341547
<xs:sequence>
1535-
<xs:element name="Central_Body_Identification" type="geom:Central_Body_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
1548+
<xs:element ref="geom:Central_Body_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
15361549
<xs:element name="Geometry_Target_Identification" type="geom:Geometry_Target_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
15371550
<xs:element name="Coordinate_System_Identification" type="geom:Coordinate_System_Identification" minOccurs="0" maxOccurs="1"> </xs:element>
15381551
</xs:sequence>
@@ -1778,6 +1791,7 @@
17781791
<xs:complexContent>
17791792
<xs:restriction base="geom:Frame_Identification_Base">
17801793
<xs:sequence>
1794+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
17811795
<xs:element name="frame_spice_name" type="geom:frame_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
17821796
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
17831797
<xs:element name="comment" type="pds:comment" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -1816,6 +1830,7 @@
18161830
<xs:complexContent>
18171831
<xs:restriction base="geom:Frame_Identification_Base">
18181832
<xs:sequence>
1833+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
18191834
<xs:element name="frame_spice_name" type="geom:frame_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
18201835
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
18211836
<xs:element name="comment" type="pds:comment" minOccurs="0" maxOccurs="1"> </xs:element>
@@ -1834,6 +1849,7 @@
18341849
<xs:complexContent>
18351850
<xs:restriction base="geom:Frame_Identification_Base">
18361851
<xs:sequence>
1852+
<xs:element ref="pds:local_identifier" minOccurs="0" maxOccurs="1"> </xs:element>
18371853
<xs:element name="frame_spice_name" type="geom:frame_spice_name" minOccurs="0" maxOccurs="1"> </xs:element>
18381854
<xs:element name="name" type="pds:name" minOccurs="0" maxOccurs="1"> </xs:element>
18391855
<xs:element name="comment" type="pds:comment" minOccurs="0" maxOccurs="1"> </xs:element>

‎build/development/84565f7a5f4fc2bb4e98ae032c45683e9740fab8/1.18.0.0/PDS4_GEOM_1I00_19A0.JSON‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)