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

Adjust rail alignments with updated EEA template and correct variables in Air alignments #14

Merged
merged 5 commits into from
Aug 29, 2024
Merged

Adjust rail alignments with updated EEA template and correct variables in Air alignments #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a7379e
refactor(df7_10): update Major Railways template schema
florianesser Aug 12, 2024
0ae0481
fix(df7_10): add ESTATUnitCode property to tables where required
florianesser Aug 12, 2024
0e0be9b
feat(df7_10): implement changes to Major Rail alignments
annat2022 Aug 16, 2024
e3c60a2
feat(df7_10): correct text length and add max URL length in air align
annat2022 Aug 28, 2024
8b78bb5
fix: avoid problem with urlCheck due to wrong operator position
florianesser Aug 29, 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/MajorAirports/DF7_10_Airports_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
6 changes: 3 additions & 3 deletions Aggregation/MajorRailways/DF7_10_Railway_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.2.0.SNAPSHOT">
<hale-project version="5.3.0.release">
<name>UBA END DF7_10 Railway Aggregation</name>
<author>Anna Tamm (wetransform GmbH)</author>
<created>2023-12-01T14:09:27.647+01:00</created>
<modified>2024-05-15T14:27:37.312+02:00</modified>
<modified>2024-08-16T13:41:06.460+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">NoiseActionPlanMajorRail,NAP_MajorRail,NAP_MajorRailCompetentAuthority,NAP_MajorRailLimitValues,NAP_RailMappingResultDetail,NAP_RailReductionMeasure,NAP_RailReductionHealthImpact_1,NAP_RailReductionHealthImpact_2,NAP_RailReductionHealthImpact_3,ESTATUnitReference,DatasetDefaultProperties,CodelistProperties</setting>
<setting name="selectedExportType">NoiseActionPlanMajorRail,NAP_MajorRail_LAU,NAP_MajorRail_NUTS,NAP_MajorRail_Country,NAP_MajorRailCompetentAuthority,NAP_MajorRailLimitValues,NAP_RailMappingResultDetail,NAP_RailReductionMeasure,NAP_RailReductionHealthImpact_1,NAP_RailReductionHealthImpact_2,NAP_RailReductionHealthImpact_3,ESTATUnitReference,DatasetDefaultProperties,CodelistProperties</setting>
<setting name="contentType">eu.esdihumboldt.hale.io.xls.xlsx</setting>
<setting name="solveNestedProperties">true</setting>
</configuration>
Expand Down
137 changes: 94 additions & 43 deletions Aggregation/MajorRailways/DF7_10_Railway_Aggregations.halex.alignment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ codelistProperty('NAP_RailReductionMeasure', '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_MajorRail':'TB53',&#13;
'NAP_MajorRailCompetentAuthority':'TB59',&#13;
'NAP_MajorRailLimitValues':'TB135',&#13;
'NAP_RailMappingResultDetail':'TB65',&#13;
Expand Down Expand Up @@ -92,131 +91,183 @@ _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_MajorRail"/>
<type name="NAP_MajorRailCompetentAuthority"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRail"/>
<type name="NAP_MajorRailCompetentAuthority"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
&#13;
def SHEET = 'NAP_MajorRail'&#13;
def SHEET = 'NAP_MajorRailCompetentAuthority'&#13;
&#13;
_snippets.end_Checks {&#13;
registerType(SHEET)&#13;
&#13;
uniqueCheck('TU96', SHEET, ['actionPlanId_identifier', 'railIdIdentifier', 'allInLAUCode', 'allInNUTSCode', 'allInCountry'])&#13;
freetextCheck('LEN', 'FC98', SHEET, 'actionPlanId_identifier')&#13;
uniqueCheck('TU97', 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="C5f0dc3cb-4cb7-4f0d-9da5-a845dcfe3288" priority="normal">
<source>
<class>
<type name="NAP_MajorRailCompetentAuthority"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRailCompetentAuthority"/>
</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">
<source>
<class>
<type name="NAP_MajorRailLimitValues"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRailLimitValues"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
def SHEET = 'NAP_MajorRailLimitValues'&#13;
&#13;
_snippets.end_Checks {&#13;
registerType(SHEET)&#13;
&#13;
codelistCheck('END_RT23', null, SHEET, 'allInLAUCode', CODELIST_LauIdValue(), true)&#13;
codelistCheck('END_RT24', null, SHEET, 'allInNUTSCode', CODELIST_NutsIdValue(), true)&#13;
uniqueCheck('TU104', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC105', SHEET, 'actionPlanId_identifier')&#13;
&#13;
xorCheck('END_RC13', SHEET, ['allInCountry','allInLAUCode','allInNUTSCode','railIdIdentifier'], 'Only one reference level is expected to be provided for each actionPlan: railIdIdentifier, allInLAUCode, allInNUTSCode or allInCountry', exists())&#13;
}&#13;
&#13;

conditionalCheck('END_CT41', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_otherCriteriaDescription')&#13;
conditionalCheck('END_CT43', SHEET, 'limitValues_otherCriteriaDescription', 'limitValues_otherCriteriaLimitDetail')&#13;
&#13;
conditionalCheck('END_CT37', SHEET, 'limitValues_noiseLimitReportIdIdentifier', 'limitValues_otherCriteriaLimitDetail', "If limitValues_noiseLimitReportIdIdentifier is not reported, limitValues_otherCriteriaLimitDetail has to be provided", isEmpty(), exists())&#13;
conditionalCheck('END_CT39', 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="C7c6d69cd-f1e5-4a3c-bd65-d8feb7ad7111" priority="normal">
<cell relation="eu.esdihumboldt.hale.align.retype" id="C914482a1-8d68-4ff2-8fb3-6fb95f90ed7b" priority="normal">
<source>
<class>
<type name="NAP_MajorRail"/>
<type name="NAP_MajorRailLimitValues"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRail"/>
<type name="NAP_MajorRailLimitValues"/>
</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="C750be061-3ef0-4afd-bed2-2724bd1e2814" priority="normal">
<source>
<class>
<type name="NAP_MajorRailCompetentAuthority"/>
<type name="NAP_MajorRail_LAU"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRailCompetentAuthority"/>
<type name="NAP_MajorRail_LAU"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
&#13;
def SHEET = 'NAP_MajorRailCompetentAuthority'&#13;
def SHEET = 'NAP_MajorRail_LAU'&#13;
&#13;
_snippets.end_Checks {&#13;
registerType(SHEET)&#13;
&#13;
uniqueCheck('TU97', SHEET, ['actionPlanId_identifier', 'competentAuthorityIdIdentifier'])&#13;
freetextCheck('LEN', 'FC101', SHEET, 'actionPlanId_identifier')&#13;
freetextCheck('LEN', 'FC64', SHEET, 'competentAuthorityIdIdentifier')&#13;
}
freetextCheck('LEN', 'FC192', SHEET, 'actionPlanId_identifier')&#13;
&#13;
codelistCheck('FT207', 'FC206', SHEET, 'allInLAUCode', CODELIST_Boolean())&#13;
codelistCheck('END_RT52', 'FC196', SHEET, 'LAUCode', CODELIST_LauIdValue())&#13;
&#13;
freetextCheck('END_FS_67', 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="C5f0dc3cb-4cb7-4f0d-9da5-a845dcfe3288" priority="normal">
<cell relation="eu.esdihumboldt.hale.align.retype" id="C7c6d69cd-f1e5-4a3c-bd65-d8feb7ad7111" priority="normal">
<source>
<class>
<type name="NAP_MajorRailCompetentAuthority"/>
<type name="NAP_MajorRail_LAU"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRailCompetentAuthority"/>
<type name="NAP_MajorRail_LAU"/>
</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="Ccda47f97-ece8-48ff-b518-e9f593570514" priority="normal">
<source>
<class>
<type name="NAP_MajorRailLimitValues"/>
<type name="NAP_MajorRail_NUTS"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRailLimitValues"/>
<type name="NAP_MajorRail_NUTS"/>
</class>
</target>
<complexParameter name="script">
<core:text xmlns:core="http://www.esdi-humboldt.eu/hale/core" xml:space="preserve">
def SHEET = 'NAP_MajorRailLimitValues'&#13;
def SHEET = 'NAP_MajorRail_NUTS'&#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', 'FC170', SHEET, 'actionPlanId_identifier')&#13;
&#13;
conditionalCheck('END_CT41', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_otherCriteriaDescription')&#13;
conditionalCheck('END_CT43', SHEET, 'limitValues_otherCriteriaDescription', 'limitValues_otherCriteriaLimitDetail')&#13;
codelistCheck('FT209', 'FC208', SHEET, 'allInNUTSCode', CODELIST_Boolean())&#13;
codelistCheck('END_RT54', 'FC175', SHEET, 'NUTSCode', CODELIST_NutsIdValue())&#13;
codelistCheck('TC215', 'FC214', SHEET, 'NUTSLevel', CODELIST_NutsLevelValue())&#13;
&#13;
conditionalCheck('END_CT37', SHEET, 'limitValues_noiseLimitReportIdIdentifier', 'limitValues_otherCriteriaLimitDetail', "If limitValues_noiseLimitReportIdIdentifier is not reported, limitValues_otherCriteriaLimitDetail has to be provided", isEmpty(), exists())&#13;
conditionalCheck('END_CT39', SHEET, 'limitValues_otherCriteriaLimitDetail', 'limitValues_noiseLimitReportIdIdentifier', "If limitValues_otherCriteriaLimitDetail is not reported, limitValues_noiseLimitReportIdIdentifier has to be provided", isEmpty(), exists())&#13;
}
freetextCheck('END_FS_69', null, SHEET, 'roadIdIdentifier')&#13;
&#13;
conditionalCheck('END_CT73', SHEET, 'allInNUTSCode', 'roadIdIdentifier', ['No'])&#13;
}&#13;
&#13;

</core:text>
</complexParameter>
</cell>
<cell relation="eu.esdihumboldt.hale.align.retype" id="C914482a1-8d68-4ff2-8fb3-6fb95f90ed7b" priority="normal">
<cell relation="eu.esdihumboldt.hale.align.retype" id="Cc6e731ed-2193-4c0b-96c1-e7400cba7020" priority="normal">
<source>
<class>
<type name="NAP_MajorRailLimitValues"/>
<type name="NAP_MajorRail_NUTS"/>
</class>
</source>
<target>
<class>
<type name="NAP_MajorRailLimitValues"/>
<type name="NAP_MajorRail_NUTS"/>
</class>
</target>
<parameter value="true" name="ignoreNamespaces"/>
Expand Down
Loading
Loading