Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for ISO 19115 Part 3 XML #933

Merged
merged 43 commits into from
Sep 20, 2024
+26,197 −25
Merged

Support for ISO 19115 Part 3 XML #933

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9e01f78
Added initial code to ingest ISO 19115-3 XML
vjf Nov 3, 2023
149f2ef
Merge branch 'master' of https://github.com/geopython/pycsw into ISO1…
vjf Nov 3, 2023
5474b87
Add ISO 19115-3 XML plugin
vjf Nov 28, 2023
311d4ba
Remove old files
vjf Nov 28, 2023
41b5305
Rename profile
vjf Dec 2, 2023
a8cbd89
Add support for output of vertical extent and funder
vjf Dec 2, 2023
8453d14
Fix bugs in output code
vjf Dec 3, 2023
9e39aff
Fix incorrect namespace issue
vjf Dec 3, 2023
7b15880
Merge branch 'master' of https://github.com/geopython/pycsw into ISO1…
vjf Dec 3, 2023
2bf1050
Get address info from contacts when GetCapabilities not supplied
vjf Dec 9, 2023
122f035
Add funder parsing, fix vert extent path
vjf Dec 15, 2023
16072d9
Add initial tests
vjf Dec 17, 2023
fb04399
Fix numerous path bugs
vjf Dec 26, 2023
fdeba1a
Fix errors in constraints and spatial resolution
vjf Dec 27, 2023
9bb1f37
Allowed anchor tag for identifiers
vjf Dec 28, 2023
2c08d47
Updated processing of image description and bands
vjf Dec 28, 2023
95a1ca0
Add functional tests
vjf Dec 28, 2023
638080c
Add funder column to db
vjf Dec 28, 2023
a806bcd
Fix error im gml namespace path
vjf Dec 28, 2023
7128d4b
Merge branch 'master' of https://github.com/geopython/pycsw into ISO1…
vjf Dec 28, 2023
cd405a2
Add mdb unit test
vjf Dec 28, 2023
d29d66a
Cleaning up and adding comments
vjf Dec 29, 2023
bd01953
Add mdb function comments
vjf Dec 29, 2023
64029c6
Add db columns for vert extent
vjf Dec 30, 2023
580eb8a
Add function comments to profile code
vjf Dec 30, 2023
678d382
Fix vert extent and gml paths in tests
vjf Dec 30, 2023
cb9fcfc
Fix services bugs and add tests
vjf Dec 30, 2023
1ba47e1
Update functional tests for new mdb XML test record
vjf Dec 30, 2023
e15a22d
Update comments and readme for ISO 19115 Part 3 XML
vjf Dec 30, 2023
f1a8e89
Add mdb transaction tests
vjf Dec 31, 2023
3d7be63
Fixes:
vjf Dec 31, 2023
50bad2c
Update due to functionality moved to OWSLib
vjf Apr 13, 2024
e20ac93
Merge branch 'master' of https://github.com/geopython/pycsw into ISO1…
vjf Apr 13, 2024
83aed4e
Updated tests and modifications for changed config format
vjf Apr 14, 2024
2e9dfa8
Update expected test responses after OWSLib funder changes
vjf May 13, 2024
93069a3
Restore correct version of cite.db
vjf May 13, 2024
9b449c9
Remove cite.db from pull request
vjf Aug 12, 2024
cd73b8e
Remove unnecessary trailing comma in setup.py
vjf Aug 12, 2024
2126d73
Merge branch 'master' of https://github.com/geopython/pycsw into ISO1…
vjf Aug 12, 2024
30f6cc9
Renamed func. test suites from 'mdb' to 'iso19115p3'
vjf Aug 12, 2024
e2ebdbc
Remove 'Funder' field and tests
vjf Sep 19, 2024
932a339
Correct the profile name in the iso19115p3 test suite
vjf Sep 20, 2024
b85edd6
Update iso19115p3 func. tests for profile name change
vjf Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Update expected test responses after OWSLib funder changes
@vjf
vjf committed May 13, 2024
commit 2e9dfa8d2d5843732133442d44f5a162bfb93807
Binary file modified tests/functionaltests/suites/cite/data/cite.db
View file
Binary file not shown.
241 changes: 173 additions & 68 deletions tests/functionaltests/suites/mdb/data/auscope-3d-model.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1" xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/2.0" xmlns:mdt="http://standards.iso.org/iso/19115/-3/mdt/2.0" xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0" xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/2.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0" xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0" xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/2.0" xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0" xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/2.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:geonet="http://www.fao.org/geonetwork" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/2.0 http://standards.iso.org/iso/19115/-3/mds/2.0/mds.xsd">
<mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1" xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/2.0" xmlns:mdt="http://standards.iso.org/iso/19115/-3/mdt/2.0" xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0" xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/2.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0" xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0" xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/2.0" xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0" xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/2.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:geonet="http://www.fao.org/geonetwork" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/2.0 http://standards.iso.org/iso/19115/-3/mds/2.0/mds.xsd">
<mdb:metadataIdentifier>
<mcc:MD_Identifier>
<mcc:code>
@@ -143,6 +143,167 @@
</mcc:description>
</mcc:MD_Identifier>
</cit:identifier>
<cit:citedResponsibleParty>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="funder" />
</cit:role>
<cit:party>
<cit:CI_Organisation>
<cit:name>
<gco:CharacterString>AuScope</gco:CharacterString>
</cit:name>
<cit:contactInfo>
<cit:CI_Contact>
<cit:address>
<cit:CI_Address>
<cit:deliveryPoint>
<gco:CharacterString>Level 2, 700 Swanston Street</gco:CharacterString>
</cit:deliveryPoint>
<cit:city>
<gco:CharacterString>Carlton</gco:CharacterString>
</cit:city>
<cit:administrativeArea>
<gco:CharacterString>Victoria</gco:CharacterString>
</cit:administrativeArea>
<cit:postalCode>
<gco:CharacterString>3053</gco:CharacterString>
</cit:postalCode>
<cit:country>
<gco:CharacterString>Australia</gco:CharacterString>
</cit:country>
<cit:electronicMailAddress>
<gco:CharacterString>[email protected]</gco:CharacterString>
</cit:electronicMailAddress>
</cit:CI_Address>
</cit:address>
</cit:CI_Contact>
</cit:contactInfo>
<cit:partyIdentifier>
<mcc:MD_Identifier>
<mcc:authority />
<mcc:code>
<gco:CharacterString>https://ror.org/04s1m4564</gco:CharacterString>
</mcc:code>
<mcc:codeSpace>
<gco:CharacterString>ROR</gco:CharacterString>
</mcc:codeSpace>
<mcc:description>
<gco:CharacterString>Research Organization Registry (ROR) Entry</gco:CharacterString>
</mcc:description>
</mcc:MD_Identifier>
</cit:partyIdentifier>
</cit:CI_Organisation>
</cit:party>
</cit:CI_Responsibility>
</cit:citedResponsibleParty>
<cit:citedResponsibleParty>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="publisher" />
</cit:role>
<cit:party>
<cit:CI_Organisation>
<cit:name>
<gco:CharacterString>Earth Resources Victoria</gco:CharacterString>
</cit:name>
<cit:contactInfo>
<cit:CI_Contact>
<cit:phone>
<cit:CI_Telephone>
<cit:number>
<gco:CharacterString>1300 366 356</gco:CharacterString>
</cit:number>
<cit:numberType>
<cit:CI_TelephoneTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_TelephoneTypeCode" codeListValue="voice" />
</cit:numberType>
</cit:CI_Telephone>
</cit:phone>
<cit:address>
<cit:CI_Address>
<cit:deliveryPoint>
<gco:CharacterString>GPO Box 2392</gco:CharacterString>
</cit:deliveryPoint>
<cit:city>
<gco:CharacterString>Melbourne</gco:CharacterString>
</cit:city>
<cit:administrativeArea>
<gco:CharacterString>Victoria</gco:CharacterString>
</cit:administrativeArea>
<cit:postalCode>
<gco:CharacterString>3001</gco:CharacterString>
</cit:postalCode>
<cit:country>
<gco:CharacterString>Australia</gco:CharacterString>
</cit:country>
<cit:electronicMailAddress>
<gco:CharacterString>[email protected]</gco:CharacterString>
</cit:electronicMailAddress>
</cit:CI_Address>
</cit:address>
</cit:CI_Contact>
</cit:contactInfo>
</cit:CI_Organisation>
</cit:party>
</cit:CI_Responsibility>
</cit:citedResponsibleParty>
<cit:citedResponsibleParty>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="author" />
</cit:role>
<cit:party>
<cit:CI_Individual>
<cit:name>
<gco:CharacterString>P.B. SKLADZIEN</gco:CharacterString>
</cit:name>
<cit:contactInfo />
</cit:CI_Individual>
</cit:party>
</cit:CI_Responsibility>
</cit:citedResponsibleParty>
<cit:citedResponsibleParty>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="coAuthor" />
</cit:role>
<cit:party>
<cit:CI_Individual>
<cit:name>
<gco:CharacterString>C. Jorand</gco:CharacterString>
</cit:name>
</cit:CI_Individual>
</cit:party>
</cit:CI_Responsibility>
</cit:citedResponsibleParty>
<cit:citedResponsibleParty>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="collaborator" />
</cit:role>
<cit:party>
<cit:CI_Individual>
<cit:name>
<gco:CharacterString>A. Krassay</gco:CharacterString>
</cit:name>
</cit:CI_Individual>
</cit:party>
</cit:CI_Responsibility>
</cit:citedResponsibleParty>
<cit:citedResponsibleParty>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="contributor" />
</cit:role>
<cit:party>
<cit:CI_Individual>
<cit:name>
<gco:CharacterString>L. Hall</gco:CharacterString>
</cit:name>
</cit:CI_Individual>
</cit:party>
</cit:CI_Responsibility>
</cit:citedResponsibleParty>
</cit:CI_Citation>
</mri:citation>
<mri:abstract>
@@ -168,16 +329,16 @@ The construction and integration of the basin model has involved both the interp
</gex:northBoundLatitude>
</gex:EX_GeographicBoundingBox>
</gex:geographicElement>
<gex:verticalElement>
<gex:EX_VerticalExtent>
<gex:minimumValue>
<gco:Real>-400</gco:Real>
</gex:minimumValue>
<gex:maximumValue>
<gco:Real>300</gco:Real>
</gex:maximumValue>
</gex:EX_VerticalExtent>
</gex:verticalElement>
<gex:verticalElement>
<gex:EX_VerticalExtent>
<gex:minimumValue>
<gco:Real>-400</gco:Real>
</gex:minimumValue>
<gex:maximumValue>
<gco:Real>300</gco:Real>
</gex:maximumValue>
</gex:EX_VerticalExtent>
</gex:verticalElement>
</gex:EX_Extent>
</mri:extent>
<mri:descriptiveKeywords>
@@ -226,62 +387,6 @@ The construction and integration of the basin model has involved both the interp
</mco:classification>
</mco:MD_SecurityConstraints>
</mri:resourceConstraints>
<mri:pointOfContact>
<cit:CI_Responsibility>
<cit:role>
<cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="funder"/>
</cit:role>
<cit:party>
<cit:CI_Organisation>
<cit:name>
<gco:CharacterString>
AuScope
</gco:CharacterString>
</cit:name>
<cit:contactInfo>
<cit:CI_Contact>
<cit:address>
<cit:CI_Address>
<cit:deliveryPoint>
<gco:CharacterString>
Level 2, 700 Swanston Street
</gco:CharacterString>
</cit:deliveryPoint>
<cit:city>
<gco:CharacterString>Carlton</gco:CharacterString>
</cit:city>
<cit:administrativeArea>
<gco:CharacterString>Victoria</gco:CharacterString>
</cit:administrativeArea>
<cit:postalCode>
<gco:CharacterString>3053</gco:CharacterString>
</cit:postalCode>
<cit:country>
<gco:CharacterString>Australia</gco:CharacterString>
</cit:country>
<cit:electronicMailAddress>
<gco:CharacterString>[email protected]</gco:CharacterString>
</cit:electronicMailAddress>
</cit:CI_Address>
</cit:address>
</cit:CI_Contact>
</cit:contactInfo>
<cit:partyIdentifier>
<mcc:MD_Identifier>
<mcc:code>
<gcx:anchor>https://ror.org/04s1m4564</gcx:anchor>
</mcc:code>
<mcc:description>
<gco:CharacterString>
Research Organization Registry (ROR) Entry
</gco:CharacterString>
</mcc:description>
</mcc:MD_Identifier>
</cit:partyIdentifier>
</cit:CI_Organisation>
</cit:party>
</cit:CI_Responsibility>
</mri:pointOfContact>
</mri:MD_DataIdentification>
</mdb:identificationInfo>
<mdb:distributionInfo>
@@ -338,4 +443,4 @@ The construction and integration of the basin model has involved both the interp
</mrd:transferOptions>
</mrd:MD_Distribution>
</mdb:distributionInfo>
</mdb:MD_Metadata>
</mdb:MD_Metadata>
2 changes: 1 addition & 1 deletion tests/functionaltests/suites/mdb/expected/post_DescribeRecord.xml
View file
Original file line number Diff line number Diff line change
@@ -294,4 +294,4 @@
</xs:complexType>
</xs:schema>
</csw:SchemaComponent>
</csw:DescribeRecordResponse>
</csw:DescribeRecordResponse>
3 changes: 2 additions & 1 deletion tests/functionaltests/suites/mdb/expected/post_GetRecordById-full-dc.xml
View file
Original file line number Diff line number Diff line change
@@ -17,11 +17,12 @@
<dct:abstract>A 3D model of the Otway and Torquay basins has been produced at 1:250 000 scale as part of GeoScience Victorias state-wide 3D geological model. To date there has been a “knowledge gap” in the transition between the basement and basin environments. This regional scale integration of the basement and basin models addresses this gap and provides a regional framework within which more detailed work can be carried out in the future.

The construction and integration of the basin model has involved both the interpretation and building of new faults and stratigraphic surfaces, as well as utilising existing stratigraphic surfaces and structural interpretations from previous studies, predominantly the Otway Basin HSA SEEBASE project by FrOG Tech (Jorand et. al., 2010).</dct:abstract>
<dc:publisher>Earth Resources Victoria</dc:publisher>
<dc:language>eng</dc:language>
<dc:rights>license</dc:rights>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>-39.4 143.0</ows:LowerCorner>
<ows:UpperCorner>-38.4 144.0</ows:UpperCorner>
</ows:BoundingBox>
</csw:Record>
</csw:GetRecordByIdResponse>
</csw:GetRecordByIdResponse>
Loading