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

Jump to bottom

Correct df7_10 road alignments according the changes to the EEA template #13

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Correct df7_10 road alignments according the changes to the EEA template #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5503a52
refactor(df7_10): update Major Roads template schema
annat2022 Aug 13, 2024
a0228fa
feat(df7_10): implement check for max URL length
annat2022 Aug 14, 2024
08c7285
feat(df7_10): set freetext length limit to new value
annat2022 Aug 14, 2024
8ae7bc6
feat(df7_10): implement changes to Major Roads alignments
annat2022 Aug 15, 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
5 changes: 4 additions & 1 deletion Aggregation/Agglomerations/DF7_10_Agglomerations_Aggregations.halex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@
<core:value value="aggregation"/>
</core:property>
<core:property name="MAX_FREETEXT_LENGTH">
<core:value value="10000"/>
<core:value value="4000"/>
</core:property>
<core:property name="MAX_URL_LENGTH">
<core:value value="2100"/>
</core:property>
</core:properties>
</complex-property>
Expand Down
5 changes: 4 additions & 1 deletion Aggregation/MajorRailways/DF7_10_Railway_Aggregations.halex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@
<core:value value="aggregation"/>
</core:property>
<core:property name="MAX_FREETEXT_LENGTH">
<core:value value="10000"/>
<core:value value="4000"/>
</core:property>
<core:property name="MAX_URL_LENGTH">
<core:value value="2100"/>
</core:property>
</core:properties>
</complex-property>
Expand Down
11 changes: 7 additions & 4 deletions Aggregation/MajorRoads/DF7_10_Roads_Aggregations.halex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<hale-project version="5.1.0.SNAPSHOT">
<hale-project version="5.3.0.release">
<name>UBA END DF7_10 Roads Aggregation</name>
<author>Anna Tamm (wetransform GmbH)</author>
<created>2023-12-01T14:09:27.647+01:00</created>
<modified>2023-12-20T12:04:47.053+01:00</modified>
<modified>2024-08-15T15:57:56.402+02:00</modified>
<save-config action-id="project.save" provider-id="eu.esdihumboldt.hale.io.project.hale25.xml.writer">
<setting name="charset">UTF-8</setting>
<setting name="projectFiles.separate">false</setting>
Expand Down Expand Up @@ -35,7 +35,7 @@
<setting name="charset">UTF-8</setting>
<setting name="meta.description"></setting>
<setting name="useSchema">true</setting>
<setting name="selectedExportType">NoiseActionPlanMajorRoad,NAP_MajorRoad,NAP_MajorRoadCompetentAuthority,NAP_MajorRoadLimitValues,NAP_RoadMappingResultDetail,NAP_RoadReductionMeasure,NAP_RoadReductionHealthImpact_1,NAP_RoadReductionHealthImpact_2,NAP_RoadReductionHealthImpact_3,ESTATUnitReference,DatasetDefaultProperties,CodelistProperties</setting>
<setting name="selectedExportType">NoiseActionPlanMajorRoad,NAP_MajorRoad_LAU,NAP_MajorRoad_NUTS,NAP_MajorRoad_Country,NAP_MajorRoadCompetentAuthority,NAP_MajorRoadLimitValues,NAP_RoadMappingResultDetail,NAP_RoadReductionMeasure,NAP_RoadReductionHealthImpact_1,NAP_RoadReductionHealthImpact_2,NAP_RoadReductionHealthImpact_3,ESTATUnitReference,DatasetDefaultProperties,CodelistProperties</setting>
<setting name="contentType">eu.esdihumboldt.hale.io.xls.xlsx</setting>
<setting name="solveNestedProperties">true</setting>
</configuration>
Expand All @@ -51,7 +51,10 @@
<core:value value="aggregation"/>
</core:property>
<core:property name="MAX_FREETEXT_LENGTH">
<core:value value="10000"/>
<core:value value="4000"/>
</core:property>
<core:property name="MAX_URL_LENGTH">
<core:value value="2100"/>
</core:property>
</core:properties>
</complex-property>
Expand Down
139 changes: 95 additions & 44 deletions Aggregation/MajorRoads/DF7_10_Roads_Aggregations.halex.alignment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ codelistProperty('NAP_RoadMappingResultDetail', 'situationForImprovementPrioriti
codelistProperty('NAP_RoadReductionMeasure', 'existingMeasure', 'http://dd.eionet.europa.eu/vocabulary/noise/RoadMeasureValue/')&#13;
codelistProperty('NAP_RoadReductionMeasure', 'plannedMeasureDetail_plannedMeasure', 'http://dd.eionet.europa.eu/vocabulary/noise/RoadMeasureValue/')&#13;
codelistProperty('NAP_RoadReductionMeasure', 'plannedMeasureDetail_measuresInCost', 'http://dd.eionet.europa.eu/vocabulary/noise/RoadMeasureValue/')&#13;
codelistProperty('NAP_MajorRoad_NUTS', 'NUTSLevel', 'http://dd.eionet.europa.eu/vocabulary/noise/ReportingLevelValue/')&#13;

</core:text>
</complexParameter>
Expand All @@ -39,7 +40,6 @@ codelistProperty('NAP_RoadReductionMeasure', 'plannedMeasureDetail_measuresInCos
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
// Check if any tables were present that are mandatory&#13;
def expectedTypes = [&#13;
'NAP_MajorRoad':'TB53',&#13;
'NAP_MajorRoadCompetentAuthority':'TB59',&#13;
'NAP_MajorRoadLimitValues':'TB135',&#13;
'NAP_RoadMappingResultDetail':'TB65',&#13;
Expand Down Expand Up @@ -92,131 +92,182 @@ _target {&#13;
</core:text>
</complexParameter>
</cell>
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="C750be061-3ef0-4afd-bed2-2724bd1e2814" priority="normal">
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="Cc0f95c47-b424-4380-9935-e67a2d994ee8" priority="normal">
<source>
<class>
<type name="NAP_MajorRoad"/>
<type name="NAP_MajorRoadCompetentAuthority"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoad"/>
<type name="NAP_MajorRoadCompetentAuthority"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
&#13;
def SHEET = 'NAP_MajorRoad'&#13;
def SHEET = 'NAP_MajorRoadCompetentAuthority'&#13;
&#13;
_snippets.end_Checks {&#13;
registerType(SHEET)&#13;
&#13;
uniqueCheck('TU104', SHEET, ['actionPlanId_identifier', 'roadIdIdentifier', 'allInLAUCode', 'allInNUTSCode', 'allInCountry'])&#13;
freetextCheck('LEN', 'FC96', SHEET, 'actionPlanId_identifier')&#13;
&#13;
codelistCheck('END_RT37', null, SHEET, 'allInLAUCode', CODELIST_LauIdValue(), true)&#13;
codelistCheck('END_RT38', null, SHEET, 'allInNUTSCode', CODELIST_NutsIdValue(), true)&#13;
&#13;
xorCheck('END_RC14', SHEET, ['allInCountry','allInLAUCode','allInNUTSCode','roadIdIdentifier'], 'Only one reference level is expected to be provided for each actionPlan: roadIdIdentifier, allInLAUCode, allInNUTSCode or allInCountry', exists())&#13;
}&#13;
&#13;

uniqueCheck('TU104', SHEET, ['actionPlanId_identifier', 'competentAuthorityIdIdentifier'])&#13;
freetextCheck('LEN', 'FC101', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC64', SHEET, 'competentAuthorityIdIdentifier')&#13;
}
</core:text>
</complexParameter>
</cell>
<cell relation="eu.esdihumboldt.hale.align.retype" id="C7c6d69cd-f1e5-4a3c-bd65-d8feb7ad7111" priority="normal">
<cell relation="eu.esdihumboldt.hale.align.retype" id="C5f0dc3cb-4cb7-4f0d-9da5-a845dcfe3288" priority="normal">
<source>
<class>
<type name="NAP_MajorRoad"/>
<type name="NAP_MajorRoadCompetentAuthority"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoad"/>
<type name="NAP_MajorRoadCompetentAuthority"/>
</class>
</target>
<parameter value="true" name="ignoreNamespaces"/>
<parameter value="true" name="structuralRename"/>
</cell>
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="Cc0f95c47-b424-4380-9935-e67a2d994ee8" priority="normal">
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="Cb0805fa1-57c6-426e-9239-a1413f4f3bc4" priority="normal">
<source>
<class>
<type name="NAP_MajorRoadCompetentAuthority"/>
<type name="NAP_MajorRoadLimitValues"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoadCompetentAuthority"/>
<type name="NAP_MajorRoadLimitValues"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
&#13;
def SHEET = 'NAP_MajorRoadCompetentAuthority'&#13;
def SHEET = 'NAP_MajorRoadLimitValues'&#13;
&#13;
_snippets.end_Checks {&#13;
registerType(SHEET)&#13;
&#13;
uniqueCheck('TU104', SHEET, ['actionPlanId_identifier', 'competentAuthorityIdIdentifier'])&#13;
freetextCheck('LEN', 'FC101', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC64', SHEET, 'competentAuthorityIdIdentifier')&#13;
uniqueCheck('TU104', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC105', SHEET, 'actionPlanId_identifier')&#13;
&#13;
conditionalCheck('END_CT42', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_otherCriteriaDescription')&#13;
conditionalCheck('END_CT44', SHEET, 'limitValues_otherCriteriaDescription', 'limitValues_otherCriteriaLimitDetail')&#13;
&#13;
conditionalCheck('END_CT38', SHEET, 'limitValues_noiseLimitReportIdIdentifier', 'limitValues_otherCriteriaLimitDetail', "If limitValues_noiseLimitReportIdIdentifier is not reported, limitValues_otherCriteriaLimitDetail has to be provided", isEmpty(), exists())&#13;
conditionalCheck('END_CT40', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_noiseLimitReportIdIdentifier', "If limitValues_otherCriteriaLimitDetail is not reported, limitValues_noiseLimitReportIdIdentifier has to be provided", isEmpty(), exists())&#13;
}
</core:text>
</complexParameter>
</cell>
<cell relation="eu.esdihumboldt.hale.align.retype" id="C5f0dc3cb-4cb7-4f0d-9da5-a845dcfe3288" priority="normal">
<cell relation="eu.esdihumboldt.hale.align.retype" id="C914482a1-8d68-4ff2-8fb3-6fb95f90ed7b" priority="normal">
<source>
<class>
<type name="NAP_MajorRoadCompetentAuthority"/>
<type name="NAP_MajorRoadLimitValues"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoadCompetentAuthority"/>
<type name="NAP_MajorRoadLimitValues"/>
</class>
</target>
<parameter value="true" name="ignoreNamespaces"/>
<parameter value="true" name="structuralRename"/>
</cell>
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="Cb0805fa1-57c6-426e-9239-a1413f4f3bc4" priority="normal">
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="C750be061-3ef0-4afd-bed2-2724bd1e2814" priority="normal">
<source>
<class>
<type name="NAP_MajorRoadLimitValues"/>
<type name="NAP_MajorRoad_LAU"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoadLimitValues"/>
<type name="NAP_MajorRoad_LAU"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
def SHEET = 'NAP_MajorRoadLimitValues'&#13;
def SHEET = 'NAP_MajorRoad_LAU'&#13;
&#13;
_snippets.end_Checks {&#13;
registerType(SHEET)&#13;
&#13;
uniqueCheck('TU104', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC105', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC184', SHEET, 'actionPlanId_identifier')&#13;
&#13;
conditionalCheck('END_CT42', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_otherCriteriaDescription')&#13;
conditionalCheck('END_CT44', SHEET, 'limitValues_otherCriteriaDescription', 'limitValues_otherCriteriaLimitDetail')&#13;
codelistCheck('FT226', 'FC225', SHEET, 'allInLAUCode', CODELIST_Boolean())&#13;
codelistCheck('END_FS_70', 'FC204', SHEET, 'LAUCode', CODELIST_LauIdValue())&#13;
&#13;
conditionalCheck('END_CT38', SHEET, 'limitValues_noiseLimitReportIdIdentifier', 'limitValues_otherCriteriaLimitDetail', "If limitValues_noiseLimitReportIdIdentifier is not reported, limitValues_otherCriteriaLimitDetail has to be provided", isEmpty(), exists())&#13;
conditionalCheck('END_CT40', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_noiseLimitReportIdIdentifier', "If limitValues_otherCriteriaLimitDetail is not reported, limitValues_noiseLimitReportIdIdentifier has to be provided", isEmpty(), exists())&#13;
}
freetextCheck('END_FS_71', null, SHEET, 'roadIdIdentifier')&#13;
&#13;
conditionalCheck('END_CT72', SHEET, 'allInLAUCode', 'roadIdIdentifier', ['No'])&#13;
}&#13;

</core:text>
</complexParameter>
<annotation type="message">
<core:message xmlns:core="http://www.esdi-humboldt.eu/hale/core" category="migration" dismissed="true">
<core:content>
<core:text xml:space="preserve">The cell's entities have been replaced, the new entities may have a different structure and/or names and may require updating the Groovy script accordingly</core:text>
</core:content>
</core:message>
</annotation>
</cell>
<cell relation="eu.esdihumboldt.hale.align.retype" id="C914482a1-8d68-4ff2-8fb3-6fb95f90ed7b" priority="normal">
<cell relation="eu.esdihumboldt.hale.align.retype" id="C7c6d69cd-f1e5-4a3c-bd65-d8feb7ad7111" priority="normal">
<source>
<class>
<type name="NAP_MajorRoadLimitValues"/>
<type name="NAP_MajorRoad_LAU"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoadLimitValues"/>
<type name="NAP_MajorRoad_LAU"/>
</class>
</target>
<parameter value="true" name="ignoreNamespaces"/>
<parameter value="true" name="structuralRename"/>
</cell>
<cell relation="eu.esdihumboldt.cst.functions.groovy.retype" id="C1f83f75a-f4dc-4891-81c3-b6cb51e2c539" priority="normal">
<source>
<class>
<type name="NAP_MajorRoad_NUTS"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoad_NUTS"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
&#13;
def SHEET = 'NAP_MajorRoad_NUTS'&#13;
&#13;
_snippets.end_Checks {&#13;
&#13;
freetextCheck('LEN', 'FC163', SHEET, 'actionPlanId_identifier')&#13;
&#13;
codelistCheck('FT220', 'FC219', SHEET, 'allInNUTSCode', CODELIST_Boolean())&#13;
codelistCheck('END_FS_68', 'FC194', SHEET, 'NUTSCode', CODELIST_NutsIdValue())&#13;
codelistCheck('TC234', 'FC233', SHEET, 'NUTSLevel', CODELIST_NutsLevelValue())&#13;
&#13;
freetextCheck('END_FS_69', null, SHEET, 'roadIdIdentifier')&#13;
&#13;
conditionalCheck('END_CT73', SHEET, 'allInNUTSCode', 'roadIdIdentifier', ['No'])&#13;
}&#13;

</core:text>
</complexParameter>
</cell>
<cell relation="eu.esdihumboldt.hale.align.retype" id="Ca1284eb7-693c-4c1b-a7bd-ca55deefd008" priority="normal">
<source>
<class>
<type name="NAP_MajorRoad_NUTS"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRoad_NUTS"/>
</class>
</target>
<parameter value="true" name="ignoreNamespaces"/>
Expand Down
Loading
Loading