Skip to content

Issue #121 Norway Wheelchair equipment fix3 - rebased on Master #123

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

Closed
nick-knowles wants to merge 9 commits into from
Closed

Issue #121 Norway Wheelchair equipment fix3 - rebased on Master #123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ca92fcd
Update README.md
nick-knowles Jun 21, 2020
76417fc
Update README.md
nick-knowles Aug 11, 2020
6a41269
Update README.md
nick-knowles Aug 11, 2020
705ff91
Add 1.2 and 1.1 release numbers
nick-knowles Aug 12, 2020
dfe17c7
Chaneg to use ther point semantic version style numbering
nick-knowles Aug 12, 2020
d6d5db2
Merge branch 'master' into WheelChairEquipmentFix3
nick-knowles Oct 28, 2020
21f30bd
Issue121 Fix to ActualVehicleEquipment , WheelchairVehilclequipment …
nick-knowles Oct 28, 2020
5c33617
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 Dec 18, 2023
3293874
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 Dec 18, 2023
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
13 changes: 1 addition & 12 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,18 +577,7 @@
<File FilePath="examples\functions\fares\Netex_91.1_Rail_RailCard_MultipleProduct.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="bus">
<Folder FolderName="uk">
Copy link
Contributor

@ue71603 ue71603 Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest not to update NeTEx.spp

<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01..xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-26-trip-(stages-Z2Z)-20181101.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_20170101.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\uk_fxc_addon_HSP_plusbus.xml" HomeFolder="Yes"/>
<File FilePath="examples\standards\fxc\uk_fxc_common_profile.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="uk"/>
</Folder>
</Folder>
</Folder>
Expand Down
42 changes: 30 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,34 @@ There is also an _Oxygen_ project file:
----
# Change Log

=======
Version 1.1.2 - Base version plus further minor fixes comprising##

### 2020.10.28 FIX Issue 121 Errors in VehicleType / ActualVehicleEquipment, WheelchairVehicleEquipment , AccessVehicleEquipment
* WWheelchairEquipmentRef renamed to WheelchairVehicleEquipmentRef
* Supertypes corrected
* ActualVehicleEquipment revised.
* _Updates to examples_:
* \examples\standards\norway\vehicles\submodel-Vehicle.xml
* \examples\functions\stopPlace\Netex_10_StopPlace_withParking_1.xml
* _Updates to examples_:
* netex_framework\netex_reusableComponents\netex_equipmentVehicle_support.xsd
* netex_framework\netex_reusableComponents\netex_equipmentVehicle_version.xsd
* netex_framework\netex_reusableComponents\netex_vehicleTypes_support.xsd
* netex_framework\netex_reusableComponents\netex_vehicleTypes_version.xsd
#121 Fix Add ACTUAL VEHICLE EQUIPMENT :

### 2020.08.11 Update oxygen project to include new examples
* _Other updates_:
* netex.xpr
* _Updates to examples_:
* \examples\standards\era_uic\Netex_Eurostar mapping_era_1.xml
* \examples\standards\era_uic\Netex_Eurostar mapping_era_2.xml
* \examples\standards\era_uic\Netex_era_uic_joiningsplitting.xml
* \examples\standards\era_uic\Netex_era_uic_timetable_hack_01.xml
* \examples\standards\norway\stops\BasicStopPlace_example.xml

### 2020.08.11 FIX Issue #110 Add missing fuel types to __VehicleType__ / __FuelType__
* netex.xpr
* _Updates to examples_:
* \examples\standards\era_uic\Netex_Eurostar mapping_era_1.xml
* \examples\standards\era_uic\Netex_Eurostar mapping_era_2.xml
* \examples\standards\era_uic\Netex_era_uic_joiningsplitting.xml
* \examples\standards\era_uic\Netex_era_uic_timetable_hack_01.xml
* \examples\standards\norway\stops\BasicStopPlace_example.xml

### 2020.08.11 FIX Issue #110 Add missing fuel types to __VehicleType__ / __FuelType__
additional values: _electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol_.
* _Updates to xml schema_:
* netex_framework\netex_reusableComponents\netex_vehicleType_support.xsd
Expand All @@ -71,8 +86,11 @@ additional values: _electricContact, battery, dieselBatteryHybrid, petrolBatter
### 2020.07.29 FIX Issue #97 *Part2*: Add __NormalDatedJourney__ and __DatedVehicleJourney__ to journeys in __TimetableFrame__
* _Updates to xml schema_:
* netex_part2\netex_journeyTimes\netex_datedVehicleJourney_version.xsd

<<<<<<< HEAD
=======

Version 1.1.1 - Base version plus further minor fixes comprising##
>>>>>>> master

### 2020.07.28 EXAMPLES Revise fare examples
* _Updates to xml schema_:
Expand Down Expand Up @@ -105,15 +123,15 @@ Version 1.1.1 - Base version plus further minor fixes comprising##
### 2020.06.21 FIX Issue #92 *FRAMEWORK*:LinkProjection NJSK Expose the missing __EntityInVersion__ elements on the __LinkProjection__ derivation
* _Updates to xml schema_:
* netex_projectionVersion.xml

====
Version 1.10 - Base version plus minor fixes comprising
* Norway contributions,
* The approved 1.1 CRs 1-50
* Rollup of fixes and additional documentation on other fixes.
* Corrections to integration of NK 1.09.
* 51-55 CRSs from Meeting Feb 2019. Also CRs from NL, EURA, UK, Norway and SBB input.


### 2019.05.17 FIX *PART3:FARES*: NJSK __FarePointInPattern__ Fix case on __isFareStage__ and __isForbidden__
* _Updates to xml schema_:
Expand Down
1 change: 1 addition & 0 deletions examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,7 @@ Changes
<AccessVehicleEquipment version="any" id="nptg:AccessVehicleEquipment:9100WIMBLDN_LS3">
<AssistedBoardingLocation>boardAtAnyDoor</AssistedBoardingLocation>
<GuideDogsAllowed>true</GuideDogsAllowed>

</AccessVehicleEquipment>
</unlocalisedEquipments>
<servedPlaces>
Expand Down
44 changes: 42 additions & 2 deletions examples/standards/norway/vehicles/submodel-Vehicle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,47 @@
<OperatorRef ref="or:ruter">Ruter</OperatorRef>
<VehicleTypeRef ref="vtr:SL78">SL78</VehicleTypeRef>
<actualVehicleEquipments>
<AccessVehicleEquipmentRef ref="aver:tramSL78"/>
<PassengerEquipmentRef xsi:type="WheelchairVehicleRefStructure" ref="per:wheelchair"/>
<ActualVehicleEquipment version="any" id="aver:tramSL78@wheelchairAccess_ref">
<AccessVehicleEquipmentRef version="any" ref="aver:tramSL78@wheelchairAccess"/>
</ActualVehicleEquipment>
<ActualVehicleEquipment version="any" id="aver:tramSL78@wheelchairOnboard_ref">
<WheelchairVehicleEquipmentRef version="any" ref="aver:tramSL78@wheelchairOnboard_ref"/>
</ActualVehicleEquipment>
<ActualVehicleEquipment version="any" id="aver:tramSL78@wheelchairOnboard">
<AccessVehicleEquipment version="any" id="aver:tramSL78@wheelchairAccess">
<Name>Wheelchair access</Name>
<OutOfService>false</OutOfService>
<Fixed>false</Fixed>
<!-- -->
<LowFloor>false</LowFloor>
<HighFloor>true</HighFloor>
<Hoist>true</Hoist>
<HoistOperatingRadius>2.0</HoistOperatingRadius>
<Ramp>true</Ramp>
<RampBearingCapacity>500</RampBearingCapacity>
<NumberOfSteps>3</NumberOfSteps>
<BoardingHeight>0.5</BoardingHeight>
<GapToPlatform>.010</GapToPlatform>
<!-- -->
<WidthOfAccessArea>2</WidthOfAccessArea>
<HeightOfAccessArea>1.8</HeightOfAccessArea>
<AutomaticDoors>true</AutomaticDoors>
<!-- -->
<SuitableFor>assistedWheelchair</SuitableFor>
<AssistanceNeeded>rampRequired</AssistanceNeeded>
<AssistedBoardingLocation>boardOnlyAtSpecifiedPositions</AssistedBoardingLocation>
<GuideDogsAllowed>true</GuideDogsAllowed>
</AccessVehicleEquipment>
</ActualVehicleEquipment>
<ActualVehicleEquipment version="any" id="aver:tramSL78@wheelchair">
<WheelchairVehicleEquipment version="any" id="per:wheelchair">
<HasWheelChairSpaces>true</HasWheelChairSpaces>
<WidthOfAccessArea>2</WidthOfAccessArea>
<LengthOfAccessArea>3</LengthOfAccessArea>
<HeightOfAccessArea>2.0</HeightOfAccessArea>
<WheelchairTurningCircle>2.5</WheelchairTurningCircle>
<CompanionSeat>true</CompanionSeat>
</WheelchairVehicleEquipment>
</ActualVehicleEquipment>
</actualVehicleEquipments>
</Vehicle>
37 changes: 31 additions & 6 deletions xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentVehiclePassenger_support">
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.1" id="netex_equipmentVehiclePassenger_support">
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
<xsd:annotation>
<xsd:appinfo>
Expand All @@ -14,6 +14,13 @@
<Date>
<Modified>2007-06-12</Modified>
</Date>
<Date>
<Modified>2020-10-27</Modified>FIX Issue #121
Corerct name of WheelchairEquipmentRef to WHeelchairVehicleEquipmentRef
Correct type on WheelchairEquipmentRef to be WHeelchairVehicleEquipmentStructure
Correct type on WHeelchairVehicleEquipmentStructure to be subtype of VehicleEquipmentRefStructure
Correct type on WHeelchairVehicleEquipmentStructure to be subtype of VehicleEquipmentRefStructure
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines VEHICLE EQUIPMENT types for Place access.</p>
</Description>
Expand All @@ -26,7 +33,7 @@
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
<Copyright>CEN, Crown Copyright 2009-2020</Copyright>
</Rights>
<Source>
<ul>
Expand All @@ -53,6 +60,19 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<!-- ======================================================================= -->
<!-- ======================================================================= -->
<xsd:complexType name="vehicleEquipments_RelStructure">
Copy link
Contributor

@ue71603 ue71603 Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already exists and even in an extended form:
<xsd:complexType name="vehicleEquipments_RelStructure">
xsd:annotation
xsd:documentationList of VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
xsd:complexContent
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="AccessVehicleEquipment"/>
<xsd:element ref="WheelchairVehicleEquipment"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ====ACCESS=====

<xsd:annotation>
<xsd:documentation>List of ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="VehicleEquipmentRef" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="VehicleEquipmentIdType">
<xsd:annotation>
<xsd:documentation>Type for identifier of a VEHICLE EQUIPMENT.</xsd:documentation>
Expand All @@ -61,12 +81,12 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:element name="VehicleEquipmentRef" type="InstalledEquipmentRefStructure" substitutionGroup="PassengerEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
Copy link
Contributor

@ue71603 ue71603 Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should stay in (if git can find it)

<xsd:documentation>Reference to a VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="VehicleEquipmentRefStructure" abstract="true">
<xsd:annotation>
<xsd:documentation>Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
Copy link
Contributor

@ue71603 ue71603 Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should stay in

<xsd:documentation>Type for a reference to a VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="PassengerEquipmentRefStructure">
Expand Down Expand Up @@ -111,12 +131,17 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="VehicleEquipmentIdType"/>
</xsd:simpleType>
<xsd:element name="WheelchairVehicleRef" type="InstalledEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef">
Copy link
Contributor

@ue71603 ue71603 Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is already done.

<xsd:element name="WheelchairVehicleEquipmentRef" type="WheelchairVehicleEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef">
<xsd:annotation>
<xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="WheelchairVehicleRefStructure" abstract="false">
Copy link
Contributor

@ue71603 ue71603 Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is in master, but differently (different type). Needs to be discussed.
<xsd:element name="WheelchairVehicleRef" type="InstalledEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef">
xsd:annotation
xsd:documentationReference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>

<xsd:element name="WheelchairVehicleRef" type="WheelchairVehicleEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef">
<xsd:annotation>
<xsd:documentation>.[DEPRECATED - INCONSISTENT NAME - Use WheelchairVehicleEquipmentRef]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="WheelchairVehicleEquipmentRefStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
Expand Down
Loading