diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml
deleted file mode 100644
index 4acc8943b..000000000
--- a/examples/functions/deckPlans/DeckPlans-Example.xml
+++ /dev/null
@@ -1,1776 +0,0 @@
-
-
-
- 2020-12-17T09:30:47.0Z
- SYS001
-
-
- 2020-12-17T09:30:46.0Z
- SYS002
- Request for Erebus 1 tariff
-
-
-
-
- 2020-01-01T00:00:00Z
-
-
-
-
-
-
-
-
-
-
- P1M
- Example of DeckPlans
-
-
-
-
- 2023-01-01T00:00:00
- 2023-12-31T12:00:00
-
- Deck Plan Example
- This is an example showing how one might encode a Deck plan for a double decker bus in NeTEx. It includes seats, an entrance and sensor equipment.
-
-
-
-
-
-
-
-
-
- EUR
-
-
-
-
- erebus Operator specific common resources
-
-
- mb
- http://www.erebus.eu/
- erebus data
-
-
-
-
- feedback@erebus.eu
-
-
-
-
-
- Operator data
-
-
- creates
- planning
- erebus
-
-
-
-
-
-
-
- Bike equipment
-
-
- Battery
-
-
- Charger
-
-
-
-
-
-
-
- MBK
- erebus
- erebus
- erebus SA
- operator
-
- Alpha1
- Metropolis
- RH10 9UA
- Metroland
-
- bus
-
-
-
-
-
- Bench seat
- 0.48
- 0.50
- 0.50
- false
-
-
- Pulldown seat
- 0.48
- 0.40
- 0.40
- true
-
-
- Bench seat
- 0.48
- 0.50
- 0.45
- false
-
-
- External Door sensor
- cable
-
-
- Internal sensor on bottom step
- cable
-
-
- Seat sensor
- cable
-
-
- true
- 1
- 2.00
- 1.80
- 2.00
- true
-
-
-
- true
- cashAndCard contactlessPaymentCard travelCard
-
-
- 1.00
- true
-
-
- true
- true
- true
-
-
- 12
- 0.10
- oneSide
- 1.00
- true
- true
- 1
-
-
-
-
- freeWifi
- purchase
- noCycles
-
-
-
-
- Double Decker Bus
- Double decker bus with staircase. Wheelchair and luggage spaces on lower deck.
- false
- true
- human
- diesel
- bus
-
- 60
- 20
- 2
- 1
-
- false
- 0.15
- 10
- 4
- 2000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Lower Deck
-
-
-
-
- Driver seat
-
-
- 1
-
-
-
- false
- 1
-
-
- Lower Deck seating area
-
- true
- standardClass
-
- true
-
-
- true
- false
- true
-
-
-
- true
- false
-
-
-
- Front Door
- 1.00
- 1.90
-
-
- 1
-
-
-
- 1
-
-
-
- external
-
- true
-
-
-
-
-
-
-
-
- Rear Door
- 0.95
- 1.90
-
-
- 1
-
-
-
-
-
-
-
-
-
- external
-
- true
-
-
-
-
-
-
-
-
- Entrance to stairs
- 0.80
- 1.90
-
-
-
-
-
- internal
-
-
-
-
-
-
-
-
-
- entry
-
-
- exit
-
-
- 43
-
-
- seat
- 22
-
-
- standingSpace
- 20
-
-
- wheelchairSpace
- 1
-
-
- pushchairSpace
- 2
-
-
-
-
-
-
- leftwards
-
-
-
-
-
-
-
- true
- true
-
-
-
- rightwards
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
- leftwards
-
-
-
-
-
-
-
- true
- true
-
-
-
- rightwards
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- leftwards
-
-
-
-
-
-
-
- true
- true
-
-
-
- rightwards
-
-
- 1
-
-
-
-
-
- true
- true
-
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- false
- true
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- false
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
- true
- false
-
-
-
-
-
-
- leftwards
-
-
-
-
-
-
-
- Stairwell to upper deck
-
-
-
- 1
-
-
-
- Stop button at top of stairs
-
-
-
- false
-
-
-
- Bottom of stairwell
- 1.00
- 1.90
- internal
- true
-
-
-
- Top of Stairwell
- 1.00
- 1.90
- internal
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- entryAndExit
-
-
- entryAndExit
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Upper Deck
-
-
-
-
- Upper Deck seating area
-
- false
-
-
- false
- false
- true
-
-
-
- true
- false
-
-
- Entrance to top of stairs
- 0.80
- 2.00
- internal
-
-
-
-
- seat
- 37
-
-
- standingSpace
- 12
-
-
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- false
- true
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- false
- false
- true
-
-
-
- forwards
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Basic Elements for map of bus
- http:erebus.eu/plans/double_decker_floor_plan
-
-
- Bottom Deck
-
-
-
- Forward Entrance
-
-
-
- Rear Entrance
-
-
-
- Stairs
-
-
-
- Top Deck
-
-
-
-
-
-
-
- Deck Plan Assignment Example
- This is an example showing how one might assign a Deck Entrance to a journey so as to state which entrance will be at which point on teh platform . More sense for a train of ferry .
-
-
- To a particalr stopt
-
-
-
-
-
-
- true
- false
- 1
-
- Board at front
-
-
-
-
-
-
-
- false
- true
- 1
-
- exit at rear
-
-
-
-
-
-
-
-
-
-
-
-
- Deck Plan Example
- This is an example showing how one might assign a deck plan to a journey.
-
-
-
- 10:10:00
-
-
-
-
-
-
-
- In to centre
-
-
-
- 10:10:00
- 10:30:00
-
-
- Across centre - doors open
-
-
-
- 10:31:00
- 10:50:00
-
-
-
-
-
-
-
- Assign double decker bus to Journey - doors shut
-
-
-
-
-
-
- Assign double decker bus to Journey - doors open
-
-
-
-
-
-
-
-
- Ties a STOP ASSIGNMENT to a specific VEHICLE JOURNEY
-
-
-
-
-
-
-
-
-
diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
index ea2294532..4253d200c 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
@@ -2,14 +2,14 @@
@@ -371,6 +371,105 @@ Lower deck
Lower Deck
+
+
+
+ Front Door
+ 1.00
+ 1.90
+
+
+ 1
+
+
+
+ true
+ leftSide
+ 1
+ 0.20
+ external
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+ Rear Door
+ 0.95
+ 1.90
+
+
+ 1
+
+
+
+
+
+
+ true
+ leftSide
+ 2
+ 0.20
+ external
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+ Downstairs Entrance to stairs
+ 0.80
+ 1.90
+
+
+
+
+
+ internal
+ internal
+ false
+
+
+
+
+
+
+
+
+
+ entry
+
+
+
+
+
+ With rear door set open so passengers can alight when stopped in town
+ exit
+ open
+
+
+
+
+
+ With rear door set shut
+ exit
+ shut
+ true
+
+
+ entryAndExit
+
+
Driver seat
@@ -405,101 +504,10 @@ Lower deck
true
false
-
-
- Front Door
- 1.00
- 1.90
-
-
- 1
-
-
-
- true
- leftSide
- 1
- 0.20
- external
- true
- true
- true
-
-
-
-
-
-
-
-
- Rear Door
- 0.95
- 1.90
-
-
- 1
-
-
-
-
-
-
- true
- leftSide
- 2
- 0.20
- external
- true
- true
- true
-
-
-
-
-
-
-
-
- Downstairs Entrance to stairs
- 0.80
- 1.90
-
-
-
-
-
- internal
- internal
- false
-
-
-
-
-
-
+
+
+
-
-
- entry
-
-
-
-
-
- With rear door set open so passengers can alight when stopped in town
- exit
- open
-
-
-
-
-
- With rear door set shut
- exit
- shut
- true
-
-
1.50
@@ -900,41 +908,9 @@ Lower deck
false
-
-
- Bottom of stairwell
- 1.00
- 1.90
- internal
- true
-
-
-
- Top of Stairwell
- 1.00
- 1.90
- internal
- true
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- entryAndExit
-
-
- entryAndExit
-
-
@@ -985,6 +961,19 @@ Lower deck
Upper Deck
+
+
+ Entrance to top of stairs
+ 0.80
+ 2.00
+ internal
+
+
+
+
+ entryAndExit
+
+
Upper Deck seating area
@@ -1001,12 +990,7 @@ Lower deck
true
false
-
- Entrance to top of stairs
- 0.80
- 2.00
- internal
-
+
diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml
index 02018193b..50a14a2b1 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_train.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml
@@ -842,6 +842,326 @@ The train reverse in the station and departs, oriented backwards to the right
Sleeper wagon Passenger deck
+
+
+
+
+ Left Front Door
+ 1.00
+ 1.90
+
+
+ 1
+
+
+
+ 1
+
+
+
+
+
+
+ true
+ leftSide
+ 1
+ 0.20
+ external
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+ Front Right External Door
+ 1.00
+ 1.90
+
+
+ 1
+
+
+
+ 1
+
+
+
+ true
+ rightSide
+ 1
+ 0.20
+ external
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+ Rear External Door
+ 0.95
+ 1.90
+
+
+ 1
+
+
+
+
+
+
+
+
+
+ true
+ leftSide
+ 2
+ 0.20
+ external
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+ Rear Right External Door
+ 0.95
+ 1.90
+
+
+ 1
+
+
+
+
+
+
+ true
+ rightSide
+ 2
+ 0.20
+ external
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+ Rear end door connecting to next carriage
+ 0.80
+ 1.90
+
+
+
+
+
+ true
+ frontEnd
+ communicating
+ false
+ true
+ true
+
+
+
+
+
+
+
+
+ Rear end door connecting to next carriage
+ 0.80
+ 1.90
+
+
+
+
+
+
+
+
+ true
+ backEnd
+ communicating
+ false
+ true
+ true
+
+
+
+
+
+
+
+
+ Toilet door
+ 0.80
+ 1.80
+
+
+
+
+
+ internal
+ true
+ false
+
+
+
+
+ Compartment 1 door
+ 0.80
+ 1.80
+
+
+
+
+
+ true
+ standardClass
+ internal
+ true
+ false
+
+
+
+ Compartment 2 door
+ 0.80
+ 1.80
+
+
+
+
+
+ standardClass
+ internal
+ true
+ false
+
+
+
+ Compartment 3 door
+ 0.80
+ 1.80
+
+
+
+
+
+ standardClass
+ internal
+ true
+ false
+
+
+
+ Compartment 4 door
+ 0.80
+ 1.80
+
+
+
+
+
+ standardClass
+ internal
+ true
+ false
+
+
+
+ Compartment 5 door
+ internal
+ true
+ false
+
+
+
+ Compartment 6 door
+ 0.80
+ 1.80
+
+
+
+
+
+ standardClass
+ internal
+ true
+ false
+
+
+
+
+ Access to seats 01-12
+ entryAndExit
+ shut
+ true
+
+
+ Seat 01
+
+
+ Seat 12
+
+
+
+ entryAndExit
+ shut
+ true
+
+
+ Seat 01
+
+
+ Seat 12
+
+
+
+ entryAndExit
+ shut
+ true
+
+
+ Seat 13
+
+
+ Seat 36
+
+
+
+ entryAndExit
+ shut
+ true
+
+
+ Seat 13
+
+
+ Seat 36
+
+
+
Corridor
@@ -849,288 +1169,43 @@ The train reverse in the station and departs, oriented backwards to the right
false
-
-
- Left Front Door
- 1.00
- 1.90
-
-
- 1
-
-
-
- 1
-
-
-
-
-
-
- true
- leftSide
- 1
- 0.20
- external
- true
- true
- true
-
-
-
-
-
-
-
-
- Front Right External Door
- 1.00
- 1.90
-
-
- 1
-
-
-
- 1
-
-
-
- true
- rightSide
- 1
- 0.20
- external
- true
- true
- true
-
-
-
-
-
-
-
-
- Rear External Door
- 0.95
- 1.90
-
-
- 1
-
-
-
-
-
-
-
-
-
- true
- leftSide
- 2
- 0.20
- external
- true
- true
- true
-
-
-
-
-
-
-
-
- Rear Right External Door
- 0.95
- 1.90
-
-
- 1
-
-
-
-
-
-
- true
- rightSide
- 2
- 0.20
- external
- true
- true
- true
-
-
-
-
-
-
+
+
+
+
-
-
- Rear end door connecting to next carriage
- 0.80
- 1.90
-
-
-
-
-
- true
- frontEnd
- communicating
- false
- true
- true
-
-
-
-
-
-
-
-
- Rear end door connecting to next carriage
- 0.80
- 1.90
-
-
-
-
-
-
-
-
- true
- backEnd
- communicating
- false
- true
- true
-
-
-
-
-
-
+
+
-
- Compartment 1 door
- 0.80
- 1.80
-
-
-
-
-
- internal
- true
- false
-
+
-
-
- Compartment 1 door
- 0.80
- 1.80
-
-
-
-
-
- internal
- true
- false
-
-
-
- Compartment 2 door
- internal
- true
- false
-
-
-
- Compartment 3 door
- internal
- true
- false
-
-
-
- Compartment 4 door
- internal
- true
- false
-
-
-
- Compartment 5 door
- internal
- true
- false
-
-
-
- Compartment 6 door
- internal
- true
- false
-
+
+
+
+
+
+
-
- Access to seats 01-12
+
entryAndExit
shut
- true
-
-
- Seat 01
-
-
- Seat 12
-
+
-
+
entryAndExit
shut
- true
-
-
- Seat 01
-
-
- Seat 12
-
+
-
+
entryAndExit
shut
- true
-
-
- Seat 13
-
-
- Seat 36
-
+
-
+
entryAndExit
shut
- true
-
-
- Seat 13
-
-
- Seat 36
-
+
@@ -1170,35 +1245,8 @@ The train reverse in the station and departs, oriented backwards to the right
true
false
-
-
- Toilet door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- true
- false
-
+
-
-
- Connected to corridor
-
-
-
-
-
-
- entryAndExit
- shut
-
-
-
1
@@ -1222,36 +1270,8 @@ The train reverse in the station and departs, oriented backwards to the right
true
false
-
-
- Compartment 1 door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- firstClass
- true
- false
-
+
-
-
- Connected to corridor
-
-
-
-
-
-
- entryAndExit
- shut
-
-
-
leftwards
@@ -1355,36 +1375,8 @@ The train reverse in the station and departs, oriented backwards to the right
true
false
-
-
- Compartment 1 door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- firstClass
- true
- false
-
+
-
-
- Connected to corridor
-
-
-
-
-
-
- entryAndExit
- shut
-
-
-
8
@@ -1469,29 +1461,8 @@ The train reverse in the station and departs, oriented backwards to the right
false
-
-
- Compartment 1 door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- standardClass
- true
- false
-
+
-
-
- entryAndExit
- shut
-
-
-
8
@@ -1706,29 +1677,9 @@ The train reverse in the station and departs, oriented backwards to the right
true
false
-
-
- Compartment 1 door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- standardClass
- true
- false
-
+
+
-
-
- entryAndExit
- shut
-
-
-
8
@@ -1940,29 +1891,9 @@ The train reverse in the station and departs, oriented backwards to the right
true
false
-
-
- Compartment 1 door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- standardClass
- true
- false
-
+
+
-
-
- entryAndExit
- shut
-
-
-
8
@@ -2174,29 +2105,9 @@ The train reverse in the station and departs, oriented backwards to the right
true
false
-
-
- Compartment 1 door connecting to corridor
- 0.80
- 1.80
-
-
-
-
-
- true
- standardClass
- true
- false
-
+
+
-
-
- entryAndExit
- shut
-
-
-
8
@@ -2500,8 +2411,7 @@ The train reverse in the station and departs, oriented backwards to the right
-
-
+
@@ -2509,52 +2419,44 @@ The train reverse in the station and departs, oriented backwards to the right
-
-
+
-
-
+
link to Compartment 1
-
-
+
-
-
+
- link to Compartment 1
+ link to Compartment 2
-
-
+
-
-
+
link to Compartment3
-
-
+
-
-
+
Seat in Compartment 3
-
+
@@ -2568,7 +2470,7 @@ The train reverse in the station and departs, oriented backwards to the right
-
+
wellLit
true
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd
index 9176a649e..f8e7da26a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd
@@ -242,6 +242,16 @@
+
+
+ DECK ENTRANCEs to and within a DECK.
+
+
+
+
+ DECK ENTRANCE USAGEs for DECK.
+
+
DECK SPACEs in DECK PLAN.
@@ -425,7 +435,7 @@
- DECK ENTRANCE COUPLEs for DECK SPACE.
+ DEPRECATED since version 2.1. Define DECK ENTRANCE in DECK and reference them from DECK SPACEs via DECK ENTRANCE REF to model their affiliation.