Skip to content

Deck plan examples and fixes#656

Merged
skinkie merged 152 commits intoNeTEx-CEN:nextfrom
nick-knowles:Deck-Plan-examples-and-fixes
Mar 8, 2024
Merged

Deck plan examples and fixes#656
skinkie merged 152 commits intoNeTEx-CEN:nextfrom
nick-knowles:Deck-Plan-examples-and-fixes

Conversation

@nick-knowles
Copy link
Contributor

(1) Refactor Path Links and Navigation Paths as a generic PATH LINK stub in core . Place common enums for paths and site environment as reusable netex_environment_support package.
(2) Revise IFOPT pt1 SItePathLinks to suptype generic PathLink add SItePathJunction
(3) Also Add DECK PATH and DECK NAVIGATION PATHs talso extending generic Path Link. Add new constraints to publication file. for enw elements
(4) Add Bus Deck Plan example with layour for double decker bus
(5) Add extensive train DECK PLAN example (a) with three cartriage types couchettes, (b) motro rail and buffet . (c) Include train make up and boarding poisition alignment and (d) Deck Navigation path example.
ALso had to fix up o some existing examples to pass validation checks esp PassengerCapacity

ue71603 and others added 21 commits December 16, 2023 19:53
…_support.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…_support.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…nt_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
Add extra enum values to bed ty[e
Add bus and train examples  for deck plans. Fix various equipment issues. Revise DEckPlanassignment
Add deck plane xamples and update deck path
(1) Refactor Path Links and Navigation Paths as  a generic PATH LINK stub in core . Place common enums as Reusable environment_support package.
(2) Revise IFOPT pt1  SItePathLinks to extend generic PathLink
(3) Also  Add DECK PATH and DECK NAVIGATION PATHs to extend generic Path Link. Add new constraints to pub file.
(4) Add Bus DEck Plan example
(5) Add extensive train DECK PLAN example with train make up and boarding poistion akigmnet and Deck Navigation path example.
ALso had to fix upo some existing  example  to pass validation PassengerCapacity
@ue71603 ue71603 added change-request Additional feature, discussed withe the group and having a proper Change Requet in Basecamp. enhancement non semantic enhacement: technical enhancement, etc. and removed change-request Additional feature, discussed withe the group and having a proper Change Requet in Basecamp. labels Feb 7, 2024
@ue71603 ue71603 added this to the netex_2.0 milestone Feb 7, 2024
@ue71603
Copy link
Contributor

ue71603 commented Feb 7, 2024

Result discussion:

  • We base the deckplan work on this PR
  • Christophe, Stefan and I test if everything from change all order to positiveInteger, #657 is included and 657 can be closed.
  • also the comments from Matthias need to be covered
    @nick-knowles Are you still working on this PR? Or can we assume this is the result you would like to merge?

@Aurige
Copy link
Contributor

Aurige commented Feb 7, 2024

Looking at commits, it looks that al lot of them are coming from master (and not next) like #579 which explains the PassengerCapacity issue that Nick faced (and that will have to be managed at some point in next anyway).
How safe is to to merge master to next at that point ?

@ue71603
Copy link
Contributor

ue71603 commented Feb 8, 2024

Is this a final review of the difference master/next to this PR? I guess a check with this one needs to be done: #615

@Aurige
Copy link
Contributor

Aurige commented Feb 8, 2024

All the commits from #615 look to be inside this one:
image

I don't know why we don't see it as the PR itself (as all the ones imported from master)... maybe @nick-knowles cherry picked them ?
But anyway they are here

skinkie and others added 22 commits March 7, 2024 14:53
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
…rsion.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
@skinkie
Copy link
Contributor

skinkie commented Mar 7, 2024

@ue71603

Validating NeTEx XML examples ...
xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd:186: element complexType: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}complexType': A global complex type definition '{http://www.netex.org.uk/netex}groupOfTariffZoneRefs_RelStructure' does already exist.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:81: element complexType: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}complexType': A global complex type definition '{http://www.netex.org.uk/netex}deckPlanRefs_RelStructure' does already exist.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:172: element complexType: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}complexType': A global complex type definition '{http://www.netex.org.uk/netex}deckRefs_RelStructure' does already exist.
xsd/netex_framework/netex_reusableComponents/netex_deckPath_support.xsd:55: element complexType: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}complexType': A global complex type definition '{http://www.netex.org.uk/netex}deckPathLinkRefs_RelStructure' does already exist.
xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_support.xsd:64: element complexType: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}complexType': A global complex type definition '{http://www.netex.org.uk/netex}deckEntranceAssignmentRefs_RelStructure' does already exist.
xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd:69: element complexType: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}complexType': A global complex type definition '{http://www.netex.org.uk/netex}deckPlanAssignmentRefs_RelStructure' does already exist.
xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd:201: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}checkConstraints', attribute 'type': The QName value '{http://www.netex.org.uk/netex}checkConstraintRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd:481: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}pathLinksInSequence', attribute 'type': The QName value '{http://www.netex.org.uk/netex}pathLinkInSequenceRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd:518: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}facilities', attribute 'type': The QName value '{http://www.netex.org.uk/netex}serviceFacilitySetRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:159: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckLevels', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckLevelRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:404: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckSpaceCapacities', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckSpaceCapacityRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:416: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckEntrances', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckEntranceRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:421: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckEntranceCouples', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckEntranceCoupleRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:426: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckEntranceUsages', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckEntranceUsageRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd:431: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckWindows', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckWindowRefs_RelStructure' does not resolve to a(n) type definition.
xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd:413: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckEntranceAssignments', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckEntranceAssignments_RelStructure' does not resolve to a(n) type definition.
xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd:220: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}groupsOfTariffZones', attribute 'type': The QName value '{http://www.netex.org.uk/netex}groupsOfTariffZones_RelStructure' does not resolve to a(n) type definition.
xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd:208: element element: Schemas parser error : element decl. '{http://www.netex.org.uk/netex}deckPlanAssignments', attribute 'type': The QName value '{http://www.netex.org.uk/netex}deckPlanAssignments_RelStructure' does not resolve to a(n) type definition.

This should be a case by case evaluation. This is really... odd.

@skinkie skinkie merged commit 6801947 into NeTEx-CEN:next Mar 8, 2024
skinkie added a commit that referenced this pull request Mar 12, 2024
This was referenced Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement non semantic enhacement: technical enhancement, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants