Skip to content

Update new-modes with master #242

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

Merged
skinkie merged 13 commits into from
Oct 12, 2021
Merged

Update new-modes with master #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a017cad
Remove .circleci as per request #98 (#227)
skinkie Sep 8, 2021
d5f21ad
Fix documentation of CrossingEquipmentGroup/VisualGuidanceBands (#230)
frodrigo Sep 8, 2021
2236cb6
Fix Id type for GeneralSign (#231)
frodrigo Sep 8, 2021
522f742
Fix doc of AssistanceFacilityList (#236)
frodrigo Sep 23, 2021
d27a440
Fix typo RightSideBorder (#238)
frodrigo Sep 23, 2021
915ab9d
Fix typo and doc of SharpsDisposal (#239)
frodrigo Sep 23, 2021
3939436
Fixed unique IDs failing due to constraint checks (#234)
syversenkr Sep 23, 2021
6b7ed77
Fix CounterService documentation (#240)
frodrigo Sep 23, 2021
61af5c1
Fix doc of LevelGroup Description (#241)
frodrigo Sep 23, 2021
a843257
Fix LuggageTrolleys documentation (#237)
frodrigo Sep 23, 2021
4a1f9b6
Fix doc of AccessSpaceType (#244)
frodrigo Sep 27, 2021
fcdbbc2
Fix documentation of ScopeOfTicketsAvailable (#232)
frodrigo Sep 27, 2021
c997b0e
Typo musicalInstrument (#245)
skinkie Oct 12, 2021
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
43 changes: 0 additions & 43 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3520,9 +3520,9 @@ Oyster_PayAsYouGo_right - PayAsYouGo_trip
<VehicleModes>metro</VehicleModes>
</validityParameters>
</GenericParameterAssignment>
<GenericParameterAssignment version="any" order="2" id="tfl:Prepaid_trip">
<GenericParameterAssignment version="any" order="2" id="tfl:Prepaid_trip@single">
<Name>Cant Break Metro journeys</Name>
<Description> Flat far simgle tripcase. </Description>
<Description>Flat fare single trip case.</Description>
<TypeOfAccessRightAssignmentRef version="any" ref="tfl:condition_of_use"/>
<limitations>
<InterchangingRef ref="tfl:no_interchange_cannot_break_journey" version="any"/>
Expand Down Expand Up @@ -13565,7 +13565,7 @@ All other journeys on this service
<GroupTicketRef version="any" ref="lrs:River_cruise"/>
</limitations>
</GenericParameterAssignment>
<GenericParameterAssignment version="any" order="2" id="lrs:London_Eye_River_tour@01@Freedom_passNot">
<GenericParameterAssignment version="any" order="2" id="lrs:London_Eye_River_tour@01@TravelCard_Freedom_passNot">
<Description>Travelcard and Freedom Pass discounts do not apply on this route.</Description>
<IsAllowed>false</IsAllowed>
<TypeOfAccessRightAssignmentRef version="any" ref="tfl:eligible"/>
Expand Down Expand Up @@ -14280,7 +14280,7 @@ Oyster card holders who want to travel on the Emirates Air Line as part of a 360
<VehicleModes>cableway</VehicleModes>
</validityParameters>
</GenericParameterAssignment>
<GenericParameterAssignment version="any" order="2" id="ea:360_cableway_trip">
<GenericParameterAssignment version="any" order="2" id="ea:360_cableway_trip@CannotBreakJourney">
<TypeOfAccessRightAssignmentRef version="any" ref="tfl:condition_of_use"/>
<ValidableElementRef version="any" ref="ea:cableway_trip"/>
<limitations>
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="AssistanceFacilityList" minOccurs="0">
<xsd:annotation>
<xsd:documentation>List of Couchette FACILITies.</xsd:documentation>
<xsd:documentation>List of ASSISTANCE FACILITies.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="AccessibilityToolList" minOccurs="0">
Expand Down Expand Up @@ -214,7 +214,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="AccessibilityInfoFacilityList" minOccurs="0"/>
<xsd:element ref="AssistanceFacilityList" minOccurs="0">
<xsd:annotation>
<xsd:documentation>List of Couchette FACILITies.</xsd:documentation>
<xsd:documentation>List of ASSISTANCE FACILITies.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="CateringFacilityList" minOccurs="0"/>
Expand Down Expand Up @@ -376,7 +376,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="AssistanceFacilityList">
<xsd:annotation>
<xsd:documentation>List of Couchette FACILITies.</xsd:documentation>
<xsd:documentation>List of ASSISTANCE FACILITies.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="FareClasses">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="VisualGuidanceBands" type="xsd:boolean" default="false" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether crossing has tactile guidance strips.</xsd:documentation>
<xsd:documentation>Whether crossing has visual guidance bands or guidance strips.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DroppedKerb" type="xsd:boolean" minOccurs="0">
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements for a RUBBISH DISPOSAL EQUIPMENT type.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="SharpsDispsal" type="xsd:boolean" minOccurs="0">
<xsd:element name="SharpsDisposal" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether there is CCTV.</xsd:documentation>
<xsd:documentation>Whether there are disposal facilities for needles or medical sharps.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Recycling" type="xsd:boolean" minOccurs="0">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ Rail transport, Roads and Road transport
<xsd:group ref="GeneralSignGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="HeadingSignIdType" use="optional">
<xsd:attribute name="id" type="GeneralSignIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of ENTITY.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="ScopeOfTicketsAvailable" type="ScopeOfTicketListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Types of Ticket available.</xsd:documentation>
<xsd:documentation>Scope of Ticket available.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="LuggageTrolleys" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether there are wheel chair trolleys.</xsd:documentation>
<xsd:documentation>Whether there are trolleys.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="WheelchairLuggageTrolleys" type="xsd:boolean" minOccurs="0">
Expand Down Expand Up @@ -508,7 +508,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="CounterService" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether there are wheel chair trolleys.</xsd:documentation>
<xsd:documentation>Whether left luggage is a counter service.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="SelfServiceLockers" type="xsd:boolean" minOccurs="0">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="RightSideBorder" type="BorderTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of border on the right side (n the direction of the PATH LINK).+v1.1</xsd:documentation>
<xsd:documentation>Type of border on the right side (in the direction of the PATH LINK).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="LeftSideBorder" type="BorderTypeEnumeration" minOccurs="0">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Description" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Name of LEVEL.</xsd:documentation>
<xsd:documentation>Description of LEVEL.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ contained within its parent QUAY.</xsd:documentation>
</xsd:element>
<xsd:element name="PassageType" type="PassageTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of ACCESS SPACE.</xsd:documentation>
<xsd:documentation>Type of passage associated with ACCESS SPACE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="motorcycle"/>
<xsd:enumeration value="sportingEquipment"/>
<xsd:enumeration value="skis"/>
<xsd:enumeration value="musicalnstrument"/>
<xsd:enumeration value="musicalInstrument"/>
<xsd:enumeration value="pushChair"/>
<xsd:enumeration value="wheelchair"/>
<xsd:enumeration value="motorizedWheelchair"/>
Expand Down