From c2da7f012f8c38a1eaa8bd07ce4fbdd270c33adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 26 Jan 2024 17:44:00 +0100 Subject: [PATCH 01/14] first draft --- examples/functions/basic/ClassInFrame.xml | 134 ++++++++++++++++++ .../netex_entity_support.xsd | 24 ++-- 2 files changed, 148 insertions(+), 10 deletions(-) create mode 100644 examples/functions/basic/ClassInFrame.xml diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml new file mode 100644 index 000000000..9c8c83f33 --- /dev/null +++ b/examples/functions/basic/ClassInFrame.xml @@ -0,0 +1,134 @@ + + + + 2001-12-17T09:30:47.0Z + SYS001 + + + NEPTUNE Mapping Frame + + + + RATP_PIVI + http://www.ratp.fr/ratp + RATP datas + + + + + + -1 + -2 + fr + + EPSG:4326 + + + + RATP--Neptune-Line Profile + + + Neptune + http://www.Neptune.fr/Neptune + Neptune data + + + + + + + + Weekley export of Neptune Planned data + P7D + planned + + + Neptune Profile: Composite Frame + RATP--Neptune-Line-xxxxxx frames will be composite frame containing Service, Timetable (and Service Calendar) and Resource frames with all the usual NEPTUNE attributes filled in, for a given line xxxxx. + + + + + + + + Neptune Profile:ServiceCalendar Frame + + + + + + + + + + + + Neptune Profile: Service Frame + + + + + + + + + required + + + required + + + + + + + + + + + + + + Neptune Profile: Site Frame + + + + + + + Neptune Profile:ServceCalendar Frame + + + + + + + + + Neptune Profile: Resource Frame + + + + + + + + + + + + + + + + 100 + + RATP + + + + + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 8016b713f..ba51f4400 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -122,15 +122,19 @@ Rail transport, Roads and Road transport Type for a reference to the Class of a ENTITY. - - - - - Name of referenced Class. - - - - + + + + + + Name of referenced Class. + + + + + Whether the member is mandatory, optional or prohibited. + + @@ -196,4 +200,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From e6f08cfe1b50c905d8fb3e73e8f157ebc13c24ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 31 Jan 2024 16:32:16 +0100 Subject: [PATCH 02/14] Update examples/functions/basic/ClassInFrame.xml Co-authored-by: Stefan de Konink --- examples/functions/basic/ClassInFrame.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml index 9c8c83f33..4a035d3bf 100644 --- a/examples/functions/basic/ClassInFrame.xml +++ b/examples/functions/basic/ClassInFrame.xml @@ -57,7 +57,7 @@ - + From 56cbf5b44f4232d103cf44a37675191ad6af591f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 2 Feb 2024 11:55:56 +0100 Subject: [PATCH 03/14] fixing problem with epip and remove use in example --- examples/functions/basic/ClassInFrame.xml | 2 +- .../netex_responsibility/netex_entity_support.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml index 4a035d3bf..9c8c83f33 100644 --- a/examples/functions/basic/ClassInFrame.xml +++ b/examples/functions/basic/ClassInFrame.xml @@ -57,7 +57,7 @@ - + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index ba51f4400..1abdf595a 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -118,7 +118,7 @@ Rail transport, Roads and Road transport Reference to a Type of an ENTITY. - + Type for a reference to the Class of a ENTITY. From ca8c80eda12acfecc9348432f4a2e957741cf8dc Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:57:20 +0000 Subject: [PATCH 04/14] Lint and update documentation tables --- examples/functions/basic/ClassInFrame.xml | 1 - .../netex_responsibility/netex_entity_support.xsd | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml index 9c8c83f33..583467d10 100644 --- a/examples/functions/basic/ClassInFrame.xml +++ b/examples/functions/basic/ClassInFrame.xml @@ -1,5 +1,4 @@ - 2001-12-17T09:30:47.0Z SYS001 diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 1abdf595a..e8c489ec5 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -130,11 +130,11 @@ Rail transport, Roads and Road transport Name of referenced Class. - + Whether the member is mandatory, optional or prohibited. - + @@ -200,4 +200,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From e570e2700e559fc6ad55096f22fa23c7beecb068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 28 Feb 2024 15:33:39 +0100 Subject: [PATCH 05/14] Update xsd/netex_framework/netex_responsibility/netex_entity_support.xsd Co-authored-by: Stefan de Konink --- .../netex_responsibility/netex_entity_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index e8c489ec5..e6e961458 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -130,7 +130,7 @@ Rail transport, Roads and Road transport Name of referenced Class. - + Whether the member is mandatory, optional or prohibited. From 2ea64181906960b48802a9c0b52ba111f23e2912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 28 Feb 2024 15:41:09 +0100 Subject: [PATCH 06/14] fix validity --- .../netex_responsibility/netex_entity_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index e6e961458..41035565c 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -130,7 +130,7 @@ Rail transport, Roads and Road transport Name of referenced Class. - + Whether the member is mandatory, optional or prohibited. From eda0231dceb408cbabfa2e38cf25739b4695def0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 28 Feb 2024 15:42:30 +0100 Subject: [PATCH 07/14] and docu --- .../netex_responsibility/netex_entity_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 41035565c..2b4b105dd 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - Whether the member is mandatory, optional or prohibited. + Whether the member is required, optional or notAllowed. From cb5d8a9bb47a688bd8db4bd0a9a64730f624fb38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 28 Feb 2024 15:43:46 +0100 Subject: [PATCH 08/14] and example --- examples/functions/basic/ClassInFrame.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml index 583467d10..633220a38 100644 --- a/examples/functions/basic/ClassInFrame.xml +++ b/examples/functions/basic/ClassInFrame.xml @@ -55,8 +55,8 @@ - - + + From a66aab5427d8abf8e93785a0690eb1ecefb07b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 28 Feb 2024 16:19:21 +0100 Subject: [PATCH 09/14] update according to Stefan --- examples/functions/basic/ClassInFrame.xml | 2 +- .../netex_responsibility/netex_entity_support.xsd | 10 +++++----- .../netex_versionFrame_version.xsd | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml index 633220a38..8d2c3c52b 100644 --- a/examples/functions/basic/ClassInFrame.xml +++ b/examples/functions/basic/ClassInFrame.xml @@ -56,7 +56,7 @@ - + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 2b4b105dd..1c96771e4 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -132,7 +132,7 @@ Rail transport, Roads and Road transport - Whether the member is required, optional or notAllowed. + Whether the member is required, optional or prohibited. @@ -185,17 +185,17 @@ Rail transport, Roads and Road transport - Include elements that meet selection criteria (e.g. validity condition). + Required. - Include elements that are referenced by primary element. E.g. TYPES OF VALUE, OPERATOR etc. + Optional. - + - Include all elements. + Not allowed. diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd index 8141be879..76fdf0870 100644 --- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd @@ -493,7 +493,7 @@ Rail transport, Roads and Road transport - Whether element is required, optional or not allowed. + Whether element is required, optional or prohibited. @@ -549,7 +549,7 @@ Rail transport, Roads and Road transport - Whether element is required, optional or not allowed. + Whether element is required, optional or prohibited. @@ -573,7 +573,7 @@ Rail transport, Roads and Road transport - Whether relationship is required, optional or not allowed. + Whether relationship is required, optional or prohibited. From 895221c7a19124e123d43cd80a3ca4fc748e749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 19 Apr 2024 10:10:51 +0200 Subject: [PATCH 10/14] Update xsd/netex_framework/netex_responsibility/netex_entity_support.xsd --- .../netex_responsibility/netex_entity_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 1c96771e4..461878d9c 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -118,7 +118,7 @@ Rail transport, Roads and Road transport Reference to a Type of an ENTITY. - + Type for a reference to the Class of a ENTITY. From 67d98275aaa9765900393a805e26632322a8cfc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 19 Apr 2024 10:20:58 +0200 Subject: [PATCH 11/14] removed mixed content from epip --- .../standards/epip/epip_common_profile.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/standards/epip/epip_common_profile.xml b/examples/standards/epip/epip_common_profile.xml index 8846c5f90..ebbc3876e 100644 --- a/examples/standards/epip/epip_common_profile.xml +++ b/examples/standards/epip/epip_common_profile.xml @@ -878,9 +878,9 @@ Network and schedule data for a single line. - Use Common definitions - Use Common definitions - Use Common definitions + + + all @@ -918,14 +918,14 @@ - Use Common definitions - Use Common definitions + + - epip:EU_PI_COMMON - epip:EU_PI_STOP - epip:EU_PI_NETWORK - epip:EU_PI_TIMETABLE - epip:EU_PI_CALENDAR + + + + + @@ -943,8 +943,8 @@ - Use Common definitions - Use Common definitions + + From 6b9547a1eecaf2d8b830897ce96e56e2d53fabf1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 08:22:35 +0000 Subject: [PATCH 12/14] Lint and update documentation tables --- .../standards/epip/epip_common_profile.xml | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/examples/standards/epip/epip_common_profile.xml b/examples/standards/epip/epip_common_profile.xml index ebbc3876e..a67199193 100644 --- a/examples/standards/epip/epip_common_profile.xml +++ b/examples/standards/epip/epip_common_profile.xml @@ -878,9 +878,12 @@ Network and schedule data for a single line. - - - + + + + + + all @@ -918,14 +921,21 @@ - - + + + + - - - - - + + + + + + + + + + @@ -943,8 +953,10 @@ - - + + + + From 94f907e34ad6f27592d561b74cdb7ce930485232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 22 Jun 2024 21:58:28 +0200 Subject: [PATCH 13/14] updated an no recursiion anymore --- examples/functions/basic/ClassInFrame.xml | 8 +++--- .../netex_entity_support.xsd | 25 +++++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml index 8d2c3c52b..e20f32feb 100644 --- a/examples/functions/basic/ClassInFrame.xml +++ b/examples/functions/basic/ClassInFrame.xml @@ -55,8 +55,8 @@ - - + + @@ -85,7 +85,9 @@ - + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 461878d9c..df8c6b7cb 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -123,11 +123,26 @@ Rail transport, Roads and Road transport Type for a reference to the Class of a ENTITY. - + - Name of referenced Class. + Name of referenced class. + + + + + Whether the member is required, optional or prohibited. + + + + + + An element in an ENTITY. + + + + Name of referenced class. @@ -163,17 +178,17 @@ Rail transport, Roads and Road transport - Include elements that meet selection criteria (e.g. validity condition). + Include elements that meet selection criteria (e.g. validity condition). - Include elements that are referenced by primary element. E.g. TYPES OF VALUE, OPERATOR etc. + Include elements that are referenced by primary element. E.g. TYPES OF VALUE, OPERATOR etc. - Include all elements. + Include all elements. From f8f28449abcd208d25cadc463ab9c53fb7faf3e7 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:59:58 +0000 Subject: [PATCH 14/14] Lint and update documentation tables --- .../netex_responsibility/netex_entity_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index df8c6b7cb..1bb088e91 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -135,7 +135,7 @@ Rail transport, Roads and Road transport Whether the member is required, optional or prohibited. - + An element in an ENTITY.