From 7b849ab7f8a8ad6cf42bda22e6fd641ef3528485 Mon Sep 17 00:00:00 2001 From: Johanna Ott Date: Fri, 4 Oct 2024 16:25:50 +0200 Subject: [PATCH] feat: use codelists instead of enumerations According to [this schema release](https://github.com/INSPIRE-MIF/application-schemas/releases/tag/2024.1), the enumerations used in the INSPIRE schemas are replaced by codelists. The alignments using enumerations so far are adapted accordingly including import of the codelists into the alignment, assigning them to the respective elements and assigning the matching value. SVC-1946 --- .../RailroadTransportNetwork/aaa-tn-ra-01.halex | 6 ++++++ .../aaa-tn-ra-01.halex.alignment.xml | 6 ++++-- .../RoadTransportNetwork/aaa-tn-ro-01.halex | 13 +++++++++++++ .../aaa-tn-ro-01.halex.alignment.xml | 6 ++++-- .../WaterTransportNetwork/aaa-tn-w-01.halex | 6 ++++++ .../aaa-tn-w-01.halex.alignment.xml | 2 +- annex-1/mappings/base-tn.halex.alignment.xml | 4 +++- 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex b/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex index 3813896..35514a1 100644 --- a/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex +++ b/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex @@ -48,6 +48,12 @@ Im Alignment wird ein *TransportProperty*-Objekt erstellt zusammenfassend für a http://inspire.ec.europa.eu/codelist/FormOfRailwayNodeValue eu.esdihumboldt.hale.io.codelist.inspire + + UTF-8 + 0f029f28-a226-4f19-8c2f-65a17b69321c + http://inspire.ec.europa.eu/codelist/TransportTypeValue + eu.esdihumboldt.hale.io.codelist.inspire + UTF-8 diff --git a/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex.alignment.xml b/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex.alignment.xml index 07fb3e4..fab0b08 100644 --- a/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex.alignment.xml +++ b/annex-1/mappings/RailroadTransportNetwork/aaa-tn-ra-01.halex.alignment.xml @@ -69,7 +69,9 @@ collect.nominalTrackGauge.consume { key, values -> uom( 'mm' ) } } - nominalGaugeCategory( key ) + nominalGaugeCategory{ + href( 'http://inspire.ec.europa.eu/codelist/TrackGaugeCategoryValue/' + key ) + } id( _id ) inspireId { Identifier { @@ -1793,7 +1795,7 @@ Es werden Referenzen (NetworkReference) zu allen Netzwerk-Elementen (z.B. `Rail - + diff --git a/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex b/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex index 457a2ab..fd8aa8b 100644 --- a/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex +++ b/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex @@ -62,6 +62,12 @@ Im Projekt gibt es drei verschiedene Herangehensweisen zur Bildung von *Transpor http://inspire.ec.europa.eu/codelist/ServiceFacilityValue eu.esdihumboldt.hale.io.codelist.inspire + + UTF-8 + 75908d5d-d4f3-4efc-a6b6-089d47524efe + http://inspire.ec.europa.eu/codelist/TransportTypeValue + eu.esdihumboldt.hale.io.codelist.inspire + UTF-8 @@ -79,6 +85,13 @@ Im Projekt gibt es drei verschiedene Herangehensweisen zur Bildung von *Transpor + + + + + + + diff --git a/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex.alignment.xml b/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex.alignment.xml index 686d7d4..7444a78 100644 --- a/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex.alignment.xml +++ b/annex-1/mappings/RoadTransportNetwork/aaa-tn-ro-01.halex.alignment.xml @@ -313,7 +313,9 @@ collect.functionalClass.consume { key, values -> def _ns = _project.vars.INSPIRE_NAMESPACE _target { - functionalClass( key ) + functionalClass { + href( 'http://inspire.ec.europa.eu/codelist/FunctionalRoadClassValue/' + key ) + } id( _id ) inspireId { Identifier { @@ -4604,7 +4606,7 @@ collect.trafficFlowDirection.consume { key, values -> - + diff --git a/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex b/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex index 950fb58..a51fc4b 100644 --- a/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex +++ b/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex @@ -42,6 +42,12 @@ Ein *TransportProperty*-Objekt wird erstellt für alle Features die über die gl https://inspire.ec.europa.eu/schemas/tn-w/5.0/WaterTransportNetwork.xsd eu.esdihumboldt.hale.io.xsd + + UTF-8 + c2e10a31-6368-4ff2-812a-aa247dd18c8d + http://inspire.ec.europa.eu/codelist/TransportTypeValue + eu.esdihumboldt.hale.io.codelist.inspire + UTF-8 diff --git a/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex.alignment.xml b/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex.alignment.xml index 2703cf5..990dd87 100644 --- a/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex.alignment.xml +++ b/annex-1/mappings/WaterTransportNetwork/aaa-tn-w-01.halex.alignment.xml @@ -1772,7 +1772,7 @@ Für alle anderen `bauwerksfunktion`en, Referenzen auf andere Objekte oder auch - + diff --git a/annex-1/mappings/base-tn.halex.alignment.xml b/annex-1/mappings/base-tn.halex.alignment.xml index 098c2ed..31f8f01 100644 --- a/annex-1/mappings/base-tn.halex.alignment.xml +++ b/annex-1/mappings/base-tn.halex.alignment.xml @@ -384,7 +384,9 @@ collect.verticalPosition.consume { key, values -> def _ns = _project.vars.INSPIRE_NAMESPACE _target { - verticalPosition( key ) + verticalPosition { + href( 'http://inspire.ec.europa.eu/codelist/VerticalPositionValue/' + key ) + } id( _id ) inspireId { Identifier {