Skip to content

Commit

Permalink
Merge pull request #242 from NeTEx-CEN/master
Browse files Browse the repository at this point in the history
Update new-modes with master
  • Loading branch information
skinkie authored Oct 12, 2021
2 parents b31fa5a + c997b0e commit 127f6c5
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 61 deletions.
43 changes: 0 additions & 43 deletions .circleci/config.yml

This file was deleted.

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
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,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 @@ -234,7 +234,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 @@ -396,7 +396,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
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,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
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
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,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
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,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
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,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
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

0 comments on commit 127f6c5

Please sign in to comment.