diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml new file mode 100644 index 000000000..e20f32feb --- /dev/null +++ b/examples/functions/basic/ClassInFrame.xml @@ -0,0 +1,135 @@ + + + 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/examples/standards/epip/epip_common_profile.xml b/examples/standards/epip/epip_common_profile.xml index 8846c5f90..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. - Use Common definitions - Use Common definitions - Use Common definitions + + + + + + all @@ -918,14 +921,21 @@ - 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 +953,10 @@ - Use Common definitions - Use Common definitions + + + + diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 8016b713f..1bb088e91 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -122,15 +122,34 @@ 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. + + + + + Whether the member is required, optional or prohibited. + + @@ -159,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. @@ -181,17 +200,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.