Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
380 changes: 380 additions & 0 deletions diff-v1.3.1-next/changelog-raw-wip.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions diff-v1.3.1-next/processed/ifopt.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
14c14
< <xsd:element ref="Organisation_" maxOccurs="unbounded"/>
---
> <xsd:element ref="Organisation_Dummy" maxOccurs="unbounded"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
2c2
< <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_generic">
---
> <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_all_objects_generic">
19a20
> <xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_support.xsd"/>
41a43,44
> <xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_path_support.xsd"/>
> <xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_path_version.xsd"/>
45a49
> <xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
11c11
< <Creator>Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles, Kizoom. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles, Kizoom.</Creator>
56c56
< <xsd:documentation>COMMON FRAME types for NeTEx</xsd:documentation>
---
> <xsd:documentation>COMMON FRAME types for NeTEx</xsd:documentation>
67c67
< <xsd:documentation>Type for a COMMON FRAME.</xsd:documentation>
---
> <xsd:documentation>Type for a COMMON FRAME.</xsd:documentation>
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
10c10
< <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
64c64
< <xsd:element name="CompositeFrameRef" type="CompositeFrameRefStructure" abstract="false" substitutionGroup="VersionFrameRef">
---
> <xsd:element name="CompositeFrameRef" type="CompositeFrameRefStructure" substitutionGroup="VersionFrameRef">
69c69
< <xsd:complexType name="CompositeFrameRefStructure" abstract="false">
---
> <xsd:complexType name="CompositeFrameRefStructure">
79a80,100
> <xsd:attribute name="nameOfRefClass" type="NameOfClassCompositeFrameRefStructureType" default="CompositeFrame">
> <xsd:annotation>
> <xsd:documentation>Automatic reference class for CompositeFrameRefStructure</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
> <xsd:annotation>
> <xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="versionRef" type="VersionIdType" use="optional">
> <xsd:annotation>
> <xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="uri" type="xsd:anyURI" use="optional">
> <xsd:annotation>
> <xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
96c117
< <xsd:element name="CompositeFrame" abstract="false" substitutionGroup="VersionFrame">
---
> <xsd:element name="CompositeFrame" substitutionGroup="VersionFrame">
117c138
< <xsd:attribute name="id" type="CompositeFrameIdType">
---
> <xsd:attribute name="id" type="CompositeFrameIdType" use="required">
126c147
< <xsd:complexType name="Composite_VersionFrameStructure" abstract="false">
---
> <xsd:complexType name="Composite_VersionFrameStructure">
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
12c12
< <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
110c110
< <xsd:element name="GeneralFrameRef" type="GeneralFrameRefStructure" abstract="false" substitutionGroup="VersionFrameRef">
---
> <xsd:element name="GeneralFrameRef" type="GeneralFrameRefStructure" substitutionGroup="VersionFrameRef">
115c115
< <xsd:complexType name="GeneralFrameRefStructure" abstract="false">
---
> <xsd:complexType name="GeneralFrameRefStructure">
125a126,146
> <xsd:attribute name="nameOfRefClass" type="NameOfClassGeneralFrameRefStructureType" default="GeneralFrame">
> <xsd:annotation>
> <xsd:documentation>Automatic reference class for GeneralFrameRefStructure</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
> <xsd:annotation>
> <xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="versionRef" type="VersionIdType" use="optional">
> <xsd:annotation>
> <xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="uri" type="xsd:anyURI" use="optional">
> <xsd:annotation>
> <xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
129c150
< <xsd:element name="GeneralFrame" abstract="false" substitutionGroup="CommonFrame">
---
> <xsd:element name="GeneralFrame" substitutionGroup="CommonFrame">
150c171
< <xsd:attribute name="id" type="GeneralFrameIdType"/>
---
> <xsd:attribute name="id" type="GeneralFrameIdType" use="required"/>
155c176
< <xsd:complexType name="General_VersionFrameStructure" abstract="false">
---
> <xsd:complexType name="General_VersionFrameStructure">
214,216c235,264
< <xsd:complexContent>
< <xsd:extension base="VersionOfObjectRefStructure"/>
< </xsd:complexContent>
---
> <xsd:simpleContent>
> <xsd:restriction base="VersionOfObjectRefStructure">
> <xsd:attribute name="nameOfRefClass" type="NameOfClassGeneralFrameMemberRefStructureType" default="GeneralFrameMember">
> <xsd:annotation>
> <xsd:documentation>Automatic reference class for GeneralFrameMemberRefStructure</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
> <xsd:annotation>
> <xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="ref" type="ObjectIdType" use="required">
> <xsd:annotation>
> <xsd:documentation>Identifier of referenced entity.</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="versionRef" type="VersionIdType" use="optional">
> <xsd:annotation>
> <xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="uri" type="xsd:anyURI" use="optional">
> <xsd:annotation>
> <xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
> </xsd:restriction>
> </xsd:simpleContent>
218c266
< <xsd:element name="GeneralFrameMember" type="GeneralFrameMemberStructure" abstract="false">
---
> <xsd:element name="GeneralFrameMember" type="GeneralFrameMemberStructure">
223c271
< <xsd:complexType name="GeneralFrameMemberStructure" abstract="false">
---
> <xsd:complexType name="GeneralFrameMemberStructure">
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
10c10
< <Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
63c63
< <xsd:element name="ResourceFrameRef" type="ResourceFrameRefStructure" abstract="false" substitutionGroup="VersionFrameRef">
---
> <xsd:element name="ResourceFrameRef" type="ResourceFrameRefStructure" substitutionGroup="VersionFrameRef">
68c68
< <xsd:complexType name="ResourceFrameRefStructure" abstract="false">
---
> <xsd:complexType name="ResourceFrameRefStructure">
78a79,99
> <xsd:attribute name="nameOfRefClass" type="NameOfClassResourceFrameRefStructureType" default="ResourceFrame">
> <xsd:annotation>
> <xsd:documentation>Automatic reference class for ResourceFrameRefStructure</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
> <xsd:annotation>
> <xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="versionRef" type="VersionIdType" use="optional">
> <xsd:annotation>
> <xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="uri" type="xsd:anyURI" use="optional">
> <xsd:annotation>
> <xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
2c2
< <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_resourceFrame_version">
---
> <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_resourceFrame_version">
13c13
< <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
20c20
< <Date><Modified>2017-03-28</Modified>CR031 Add Zones to RESOURCE FRAME
---
> <Date><Modified>2017-03-28</Modified>CR031 Add Zones to RESOURCE FRAME
27a28,31
> <Date><Modified>2023-02-02</Modified>Add DECK PLAN CHANGES.
> </Date>
> <Date><Modified>2023-11-06</Modified>Add contracts to RESOURCE FRAME.
> </Date>
87c91
< <xsd:attribute name="id" type="ResourceFrameIdType"/>
---
> <xsd:attribute name="id" type="ResourceFrameIdType" use="required"/>
114a119,120
> <xsd:group ref="VehicleTypeProfileInFrameGroup"/>
> <xsd:group ref="TrainElementTypesInFrameGroup"/>
115a122
> <xsd:group ref="DeckPlanInFrameGroup"/>
118a126
> <xsd:group ref="BookingArrangementInFrameGroup"/>
133c141
< <xsd:documentation>RESPONSIBILITY Roles used in frame.</xsd:documentation>
---
> <xsd:documentation>RESPONSIBILITY roles used in frame. +v2.0</xsd:documentation>
140a149,153
> <xsd:element name="contracts" type="contractsInFrame_RelStructure" minOccurs="0">
> <xsd:annotation>
> <xsd:documentation>CONTRACTs used in frame. +v2.0</xsd:documentation>
> </xsd:annotation>
> </xsd:element>
145c158
< <xsd:documentation>General Elements of a RESOURCE FRAME.</xsd:documentation>
---
> <xsd:documentation>General Elements of a RESOURCE FRAME.</xsd:documentation>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
10c10
< <Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
55c55
< <xsd:documentation>SERVICE CALENDAR FRAME identifier types for NeTEx.</xsd:documentation>
---
> <xsd:documentation>SERVICE CALENDAR FRAME identifier types for NeTEx.</xsd:documentation>
84a85,105
> <xsd:attribute name="nameOfRefClass" type="NameOfClassServiceCalendarFrameRefStructureType" default="ServiceCalendarFrame">
> <xsd:annotation>
> <xsd:documentation>Automatic reference class for ServiceCalendarFrameRefStructure</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
> <xsd:annotation>
> <xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="versionRef" type="VersionIdType" use="optional">
> <xsd:annotation>
> <xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attribute name="uri" type="xsd:anyURI" use="optional">
> <xsd:annotation>
> <xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
> </xsd:annotation>
> </xsd:attribute>
> <xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
12c12
< <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
62c62
< <xsd:documentation>A SERVICE CALENDAR. A coherent set of OPERATING DAYS and DAY TYPES comprising a Calendar. that may be used to state the temporal VALIDITY of other NeTEx entities such as Timetables, STOP PLACEs, etc. Covers a PERIOD with a collection of assignments of OPERATING DAYS to DAY TYPES.</xsd:documentation>
---
> <xsd:documentation>A SERVICE CALENDAR. A coherent set of OPERATING DAYS and DAY TYPES comprising a Calendar. That may be used to state the temporal VALIDITY of other NeTEx entities such as Timetables, STOP PLACEs, etc. Covers a PERIOD with a collection of assignments of OPERATING DAYS to DAY TYPES.</xsd:documentation>
81c81
< <xsd:attribute name="id" type="ServiceCalendarFrameIdType"/>
---
> <xsd:attribute name="id" type="ServiceCalendarFrameIdType" use="required"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
9c9
< <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
93d92
< <xsd:attribute name="id" type="LimitationIdType"/>
146c145
< <xsd:attribute name="id" type="AccessibilityAssessmentIdType"/>
---
> <xsd:attribute name="id" type="AccessibilityAssessmentIdType" use="required"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
9c9
< <Creator>Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles, Kizoom. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles, Kizoom.</Creator>
90c90
< <xsd:documentation>It is not known whether PLACE meets accessibility criteria.</xsd:documentation>
---
> <xsd:documentation>It is not known whether PLACE meets accessibility criteria.</xsd:documentation>
140c140
< <xsd:documentation>Whether a PLACE has stair free access, in comparison with step free access one single step in the route is allowed.</xsd:documentation>
---
> <xsd:documentation>Whether a PLACE has stair free access, in comparison with step free access one single step in the route is allowed. +v2.0</xsd:documentation>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
11c11
< <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
---
> <Creator>First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.</Creator>
60c60
< <xsd:documentation>A passenger's requirement for accessibility, comprising one or more USER NEEDs. For example, that he is unable to navigate stairs, or lifts, or has visual or auditory impairments. PASSENGER ACCESSIBILITY NEEDS can be used to derive an accessibility constraint for the passenger, allowing the computation of paths for passengers with specifically constrained mobility. Example: Wheelchair, No Lifts, No Stairs.</xsd:documentation>
---
> <xsd:documentation>A passenger's requirement for accessibility, comprising one or more USER NEEDs. For example, that he is unable to navigate stairs, or lifts, or has visual or auditory impairments. PASSENGER ACCESSIBILITY NEEDS can be used to derive an accessibility constraint for the passenger, allowing the computation of paths for passengers with specifically constrained mobility. Example: Wheelchair, No Lifts, No Stairs.</xsd:documentation>
125c125
< <xsd:attribute name="id" type="UserNeedIdType"/>
---
> <xsd:attribute name="id" type="UserNeedIdType" use="required"/>
297c297
< <xsd:attribute name="id" type="SuitabilityIdType"/>
---
> <xsd:attribute name="id" type="SuitabilityIdType" use="required"/>
Loading