Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/functions/deckPlans/DeckPlans-Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@
<Description>Double decker bus with staircase. Wheelchair and luggage spaces on lower deck.</Description>
<ReversingDirection>false</ReversingDirection>
<SelfPropelled>true</SelfPropelled>
<PropulsionType>human</PropulsionType>
<FuelType>diesel</FuelType>
<PropulsionTypes>human</PropulsionTypes>
<FuelTypes>diesel</FuelTypes>
<TransportMode>bus</TransportMode>
<PassengerCapacity version="any" id="double_decker">
<SeatingCapacity>60</SeatingCapacity>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/deckPlans/DeckPlans-Example_bus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ Lower deck
<Description>Double decker bus with staircase. Wheelchair and luggage spaces on lower deck.</Description>
<ReversingDirection>false</ReversingDirection>
<SelfPropelled>true</SelfPropelled>
<PropulsionType>human</PropulsionType>
<FuelType>diesel</FuelType>
<PropulsionTypes>human</PropulsionTypes>
<FuelTypes>diesel</FuelTypes>
<TransportMode>bus</TransportMode>
<PassengerCapacity version="any" id="mb:PC-double_decker">
<SeatingCapacity>60</SeatingCapacity>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/deckPlans/DeckPlans-Example_train.xml
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ The train reverse in the station and departs, oriented backwards to the right
<Name> 4 carriage sleeper train with 2 Motorrail </Name>
<Description>[Vehicles2] [Velicles1] [Sleeper3] [Buffet1] [Sleeper1] [Sleeper1] [Engine]</Description>
<SelfPropelled> true</SelfPropelled>
<PropulsionType>electric</PropulsionType>
<PropulsionTypes>electric</PropulsionTypes>
<capacities>
<PassengerCapacity version="any" id="rco:PC-rst_rail_sleeper_train_1@passenger_capacity">
<!-- seated 62 x 3 carriages-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
<Name> 4 carriage train</Name>
<Description>[Seating car 3] [Seating car 3] [Seating car 2] [Seating car 1] [Engine]</Description>
<SelfPropelled> true</SelfPropelled>
<PropulsionType>electric</PropulsionType>
<PropulsionTypes>electric</PropulsionTypes>
<capacities>
<PassengerCapacity version="any" id="rco:PC-rst_rail_IC_train_1@passenger_capacity">
<!-- seated 100 x 4 carriages-->
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/rail/Netex_era_distance_ro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ c
<Name> 3 carriage train </Name>
<Description>[Wagon1] [Wagon2] [Wagon2] [Engine]</Description>
<SelfPropelled> true</SelfPropelled>
<PropulsionType>electric</PropulsionType>
<PropulsionTypes>electric</PropulsionTypes>
<capacities>
<PassengerCapacity version="any" id="tco:PC-rst_rail_train_1@passenger_capacity">
<TotalCapacity>204</TotalCapacity>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/newModes/IXSI Service 1 - Static Data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<SimpleVehicleType version="any" id="GE:SimpleVehicleType:1">
<EuroClass>3</EuroClass>
<!--instead of CO2Factor -->
<PropulsionType>combustion</PropulsionType>
<FuelType>diesel</FuelType>
<PropulsionTypes>combustion</PropulsionTypes>
<FuelTypes>diesel</FuelTypes>
<MaximumRange>845</MaximumRange>
<TransportMode>selfDrive</TransportMode>
<Length>4</Length>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/newModes/NewModes-CarClubExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@
<Name>Small car</Name>
<ReversingDirection>false</ReversingDirection>
<SelfPropelled>true</SelfPropelled>
<PropulsionType>electric</PropulsionType>
<FuelType>battery</FuelType>
<PropulsionTypes>electric</PropulsionTypes>
<FuelTypes>battery</FuelTypes>
<TransportMode>selfDrive</TransportMode>
<PassengerCapacity version="any" id="car_club">
<SeatingCapacity>4</SeatingCapacity>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/newModes/NewModes-CarPoolingExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,8 @@ This Shows sample Purchases
<vehicleTypes>
<SimpleVehicleType version="any" id="fast_car">
<SelfPropelled>true</SelfPropelled>
<PropulsionType>combustion</PropulsionType>
<FuelType>petrolUnleaded</FuelType>
<PropulsionTypes>combustion</PropulsionTypes>
<FuelTypes>petrolUnleaded</FuelTypes>
<MaximumRange>400</MaximumRange>
<LicenceRequirements>full</LicenceRequirements>
<VehicleCategory>mediumCar</VehicleCategory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@
<Name>Strech limo</Name>
<ReversingDirection>true</ReversingDirection>
<SelfPropelled>true</SelfPropelled>
<PropulsionType>combustion electric</PropulsionType>
<FuelType>petrol battery</FuelType>
<PropulsionTypes>combustion electric</PropulsionTypes>
<FuelTypes>petrol battery</FuelTypes>
<TransportMode>selfDrive</TransportMode>
<PassengerCapacity version="any" id="stretch_limo">
<SeatingCapacity>7</SeatingCapacity>
Expand Down
16 changes: 8 additions & 8 deletions examples/functions/newModes/NewModes-CycleSharingExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@
<Name>Pedal cycle</Name>
<ReversingDirection>false</ReversingDirection>
<SelfPropelled>false</SelfPropelled>
<PropulsionType>human</PropulsionType>
<FuelType>none</FuelType>
<PropulsionTypes>human</PropulsionTypes>
<FuelTypes>none</FuelTypes>
<TransportMode>selfDrive</TransportMode>
<PassengerCapacity version="any" id="pedal_cycle">
<SeatingCapacity>1</SeatingCapacity>
Expand All @@ -228,8 +228,8 @@
<Name>Electric cycle</Name>
<ReversingDirection>false</ReversingDirection>
<SelfPropelled>true</SelfPropelled>
<PropulsionType>electricAssist</PropulsionType>
<FuelType>battery</FuelType>
<PropulsionTypes>electricAssist</PropulsionTypes>
<FuelTypes>battery</FuelTypes>
<MaximumRange>15</MaximumRange>
<TransportMode>selfDrive</TransportMode>
<PassengerCapacity version="any" id="electric_cycle">
Expand Down Expand Up @@ -431,7 +431,7 @@
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_alpha_A1@09">
<FuelType>electricity</FuelType>
<FuelTypes>electricity</FuelTypes>
</RefuellingEquipment>
</placeEquipments>
<ParkingVehicleType>pedalCycle</ParkingVehicleType>
Expand All @@ -449,7 +449,7 @@
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_alpha_A1@10">
<FuelType>electricity</FuelType>
<FuelTypes>electricity</FuelTypes>
</RefuellingEquipment>
</placeEquipments>
<ParkingVehicleType>pedalCycle</ParkingVehicleType>
Expand Down Expand Up @@ -526,7 +526,7 @@
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_beta_B1@04">
<FuelType>electricity</FuelType>
<FuelTypes>electricity</FuelTypes>
</RefuellingEquipment>
</placeEquipments>
<ParkingVehicleType>pedalCycle</ParkingVehicleType>
Expand All @@ -540,7 +540,7 @@
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_beta_B1@05">
<FuelType>electricity</FuelType>
<FuelTypes>electricity</FuelTypes>
</RefuellingEquipment>
</placeEquipments>
<ParkingVehicleType>pedalCycle</ParkingVehicleType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11419,7 +11419,7 @@ Q.4. Public holiday - Services do not run on a christams day -
<Name>London Paris</Name>
<Description>18 Coach Train</Description>
<SelfPropelled>true</SelfPropelled>
<FuelType>electricity</FuelType>
<FuelTypes>electricity</FuelTypes>
<facilities>
<ServiceFacilitySetRef version="any" ref="es:sfs_general"/>
</facilities>
Expand Down
8 changes: 4 additions & 4 deletions examples/standards/gbfs/Netex_gbfs_exm1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ GBFS file: vehicle_types.json:
<!-- GBFS vehicle_type_id -->
<Name>Example Basic Bike</Name>
<!-- GBFS name -->
<PropulsionType>human</PropulsionType>
<PropulsionTypes>human</PropulsionTypes>
<!-- GBFS propulsion_type -->
<VehicleCategory>cycle</VehicleCategory>
<!-- GBFS form_factor -->
Expand All @@ -167,7 +167,7 @@ GBFS file: vehicle_types.json:
<!-- GBFS vehicle_type_id -->
<Name>E-scooter</Name>
<!-- GBFS name -->
<PropulsionType>electric</PropulsionType>
<PropulsionTypes>electric</PropulsionTypes>
<!-- GBFS propulsion_type -->
<MaximumRange>12345</MaximumRange>
<!-- GBFS max_range_meters -->
Expand All @@ -181,7 +181,7 @@ GBFS file: vehicle_types.json:
<!-- GBFS vehicle_type_id -->
<Name>Cargo bike</Name>
<!-- GBFS name -->
<PropulsionType>electric</PropulsionType>
<PropulsionTypes>electric</PropulsionTypes>
<!-- GBFS propulsion_type -->
<MaximumRange>12345</MaximumRange>
<!-- GBFS max_range_meters -->
Expand All @@ -195,7 +195,7 @@ GBFS file: vehicle_types.json:
<!-- GBFS vehicle_type_id -->
<Name>Foor-door Sedan</Name>
<!-- GBFS name -->
<PropulsionType>combustion</PropulsionType>
<PropulsionTypes>combustion</PropulsionTypes>
<!-- GBFS propulsion_type -->
<MaximumRange>523992</MaximumRange>
<!-- GBFS max_range_meters -->
Expand Down
8 changes: 4 additions & 4 deletions examples/standards/vdv452/timetable/NeTEx VDV Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
</privateCodes>
<Name>Strab GT 8 K</Name>
<ShortName>Überf1</ShortName>
<PropulsionType>electric</PropulsionType>
<FuelType>battery</FuelType>
<PropulsionTypes>electric</PropulsionTypes>
<FuelTypes>battery</FuelTypes>
<PassengerCapacity id="VT_3" version="1">
<SeatingCapacity>91</SeatingCapacity>
<StandingCapacity>112</StandingCapacity>
Expand All @@ -218,9 +218,9 @@
<Name>Solaris Gelenk-Elektro</Name>
<ShortName>SoGeE</ShortName>
<PrivateCode>52</PrivateCode>
<PropulsionType>electric</PropulsionType>
<PropulsionTypes>electric</PropulsionTypes>
<!--RCP RECHARGING PLAN ADDED -->
<FuelType>battery</FuelType>
<FuelTypes>battery</FuelTypes>
<!-- RCP RECHARGING PLAN ADDED -->
<PassengerCapacity id="PassengerCapacity:52" version="1">
<SeatingCapacity>46</SeatingCapacity>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements of a COMPLEX FEATURE PROJECTION.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="ProjectedFeartureRef" type="ComplexFeatureRefStructure">
<xsd:element name="ProjectedFeatureRef" type="ComplexFeatureRefStructure">
<xsd:annotation>
<xsd:documentation>COMPLEX FEATURE which is being projected.</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,9 @@
<xsd:documentation>Elements for a DECK SPACE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="Covered" type="xsd:boolean" default="true" minOccurs="0">
<xsd:element name="Covered" type="CoveredEnumeration" default="true" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether DECK SPACE is covered. Default is true.</xsd:documentation>
<xsd:documentation>Whether DECK SPACE is indoors, outdoors, or covered. Default is indoors.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AirConditioned" type="xsd:boolean" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,12 +451,12 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="true">
<xsd:annotation>
<xsd:documentation>Value to be used, if covered is used as a "boolean". Equals covered. Depreciated.+v2.0</xsd:documentation>
<xsd:documentation>Value to be used, if covered is used as a "boolean". Equals covered. Deprecated. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="false">
<xsd:annotation>
<xsd:documentation>Value to be used, if covered is used as a "boolean". Equals outdoors. Depreciated. +v2.0</xsd:documentation>
<xsd:documentation>Value to be used, if covered is used as a "boolean". Equals outdoors. Deprecated. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,14 @@ points cannot exceed this value.</xsd:documentation>
<xsd:documentation>Elements for REFUELLING EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="FuelTypes" type="FuelTypeListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The list of types of fuel used by a vehicle of the type.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="FuelType" type="FuelTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The type of fuel used by a vehicle of the type.</xsd:documentation>
<xsd:documentation>The type of fuel used by a vehicle of the type. DEPRECATED -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<xsd:sequence>
<xsd:element name="Label" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Name of SPOT COLUMN.</xsd:documentation>
<xsd:documentation>Label of SPOT COLUMN.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NumberingFromLeft" type="xsd:boolean" default="true" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,20 +203,30 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether vehicles of the type are self-propelled.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PropulsionType" type="PropulsionTypeListOfEnumerations" minOccurs="0">
<xsd:element name="PropulsionTypes" type="PropulsionTypeListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>List of types of power used +v1.2.2</xsd:documentation>
<xsd:documentation>List of types of power used +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PropulsionType" type="PropulsionTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of power used. DEPRECATED -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="FuelTypes" type="FuelTypeListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The list of types of fuel used by a vehicle of the type. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice>
<xsd:element name="FuelType" type="FuelTypeListOfEnumerations" minOccurs="0">
<xsd:element name="FuelType" type="FuelTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The list of types of fuel used by a vehicle of the type. +1.2.2</xsd:documentation>
<xsd:documentation>The type of fuel used by a vehicle of the type. DEPRECATED -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TypeOfFuel" type="FuelTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType.</xsd:documentation>
<xsd:documentation>The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Expand Down Expand Up @@ -830,9 +840,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements for a PASSENGER VEHICLE CAPACITY.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="VehicleCategory" type="AllRoadVehicleCategoriesListOfEnumerations" default="allPassengerVehicles" minOccurs="0">
<xsd:element name="VehicleCategories" type="AllRoadVehicleCategoriesListOfEnumerations" default="allPassengerVehicles" minOccurs="0">
<xsd:annotation>
<xsd:documentation>VEHicle categories for which capacity is specifyed. Default is allPAssengerVehicles i.e. capacity is for all VEHICLE CATEGORIES</xsd:documentation>
<xsd:documentation>Vehicle categories for which capacity is specified. Default is allPassengerVehicles i.e. capacity is for all VEHICLE CATEGORIES</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="VehicleCapacity" type="NumberOfVehicles" minOccurs="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Height of PARKING BAY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Weight" type="LengthType" minOccurs="0">
<xsd:element name="Weight" type="WeightType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Maximum Weight allowed in PARKING BAY. +v1.1</xsd:documentation>
</xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,6 @@ Rail transport, Roads and Road transport
<xsd:extension base="ReliefPoint_VersionStructure"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="ParkingPointGroup">
<xsd:annotation>
<xsd:documentation>Elements of a PARKING POINT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="GarageRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:complexType name="garagePoints_RelStructure">
<xsd:annotation>
Expand Down Expand Up @@ -344,14 +336,6 @@ Rail transport, Roads and Road transport
<xsd:extension base="ParkingPoint_VersionStructure"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="GaragePointGroup">
<xsd:annotation>
<xsd:documentation>Elements of a GARAGE POINT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="GarageRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="Garage" substitutionGroup="Place">
<xsd:annotation>
Expand Down