D eck plan revisions#695
Closed
nick-knowles wants to merge 157 commits into
Closed
Conversation
…_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
same way Nick fixed stuff in the new examples
…EEMNT Extend the DECK PLAN Examples Apply Transmodel enhancements to ELEMENT TYPES and TRAINs Revise VEHICLE Add ROLLING STOCK
…k-knowles/NeTEx into Deck-Plan-examples-and-fixes
Add Constraints to publication
Tidy up to fix broken exampels - correction to constraing
…ersion.xsd Co-authored-by: trurlurl <82838870+trurlurl@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>
Revise name s of path elements NAVIGATION --> GENERIC NAVIGATION PATH SITE NAVIGATION --> (NAVIGATION PATH) and SITE NAVIGATION PATH DECK NAVIGATION --> DECK NAVIGATION PATH PATH LINK --> GENERIC PATH LINK SITE PATH LINK --> (PATH LINK) and SITE PATH LINK PATH JUNCTION --> GENERIC PATH JUNCTION SITE PATH JUNCTION--> (PATH LINK) and SITE PATH JUNCTION
Reame file names from deckPlanAlignment_ to _deckPlanAssignment_ so as to be consitnet with UML. Also add exclusion flag to DeckPlanAssignment
Allow PathLinks in PathFrame
…NeTEx into DEckPLan-Revisiosn
ue71603
added a commit
that referenced
this pull request
Mar 27, 2024
Contributor
|
will all be done in #681 |
skinkie
added a commit
that referenced
this pull request
Apr 10, 2024
* DEckPlan changes Revised rebased Rbaseddeck plane ready to fix * Lint and update documentation tables * enhancement-SIte levels, SIteStructure, LevelInStructure GroupOfSItes Adds SIteStructure to allow alternative labelling of levels within a site. Also GroupOfSItes and GroupOfTariffZones added to SiteFrame. Test example also provided * Lint and update documentation tables * Lint and update documentation tables * Lint and update documentation tables * Fix typo * Fix examples * Fix improve mode (#507) * First draft of the clean up of MODE * Better explanations in VEHICLE MODE * AccessMode now works TRANSFERs and OTHER LEG (for OJP) * Some depreciations * added a mode to Connection * Update netex_mode_support.xsd Deprecated not Depreciated ;-) * Update netex_submode_version.xsd Deprecated not Depreciated ;-) * Apply suggestions from code review * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: ue71603 <matthias.guenter@sbb.ch> Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update fix validation * Enhancee Seeting plan 615 Add child beds Add extra enum values to bed ty[e * Update netex_spotEquipment_version.xsd * Deck Plan examples and fixes Add bus and train examples for deck plans. Fix various equipment issues. Revise DEckPlanassignment * Fix examples * LiftCallEquipment added * Updated deckplan examples Add deck plane xamples and update deck path * fix xml example * Enhancement-Add Deck Paths and DEckplan Examples (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 * Update * Extend DECK Plan Examples and add Transmodel enhancements to TRAIN ELEEMNT Extend the DECK PLAN Examples Apply Transmodel enhancements to ELEMENT TYPES and TRAINs Revise VEHICLE Add ROLLING STOCK * Update * DECK Plan Examples add constraints Add Constraints to publication * DECK Plan example - fix broken examples Tidy up to fix broken exampels - correction to constraing * Fix branch Notice that the examples still miss RelativeLevelOrder. * examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional and a small validity problem (#430) Examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional. We otherwise have examples that break. And it might be that people don't wish to use them. * DEck Plan Path links Integrate with other changes * update * DEckPlans Add in Stefan Jugelts simplified train deck plan example Add in simplified train deck plan example. thanks stefan * DEckPlan- AddPply norway commenst Minor revisions to SeatingPlan/DeckPlan (a) Use an enum rather that ByWindow ByAisle boolean (b) Revise PassengerSPot HasTable boolean to use ENum toinidcate type of table c) Add a DeckWindowType enum Examples updated * Lint and update documentation tables * Ypdate with 641 addition of maximumvelocity * DeckPlans Add missing VehicleSide for DeckWindow - Stefan Jugelt noted there was no way to set relative posiition of a DEckWindow, have corrected to use Vehicle side as for DEckENtrance * Progress * Update examples * trying to fix some (or undo it, if it does not help... * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * I don't like windows users * Add netex:EquipmentPlace to SitePathLink_Place_KeyRef * Extension back to restriction * fix train validation * Deckplan examples "validate", look for commented out sections. * Add version/id to PassengerCapacity * Reintroduce FlooringStatus * Add TactileWarningStrip, TactileWarningStripContract back * linting only * Make the SensorEquipment_ dummy abstract * redoneccb6e2f from °674 introducinng spotaffinity * remove wrongfiles * redo * redo of 48618f0 from#695 * redo of 7f89c10 from #695 DECK PLAN ASSIGNMENT revision * DEckPlan further correction redo of a3d4fa8 from #695 * fix include problem * Things to review by Nick * check all other examples * swithing removal of parentzoneref * Lint and update documentation tables * reestablish complexest Deckplan example. * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * fixed some typos * fix missing PathInstructions in SitePathJunction * Lint and update documentation tables * fix duplicate elements and an order="0" * Update xsd/netex_framework/netex_genericFramework/netex_place_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Typo's * More typo's Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> * More typo's * Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * remove removed parts completly. * Update netex_trainElement_version.xsd I would like to see this element to be 'moved up'. For example above TrainInCompoundTrainGroup, so it does not look to be removed and added. * description relvovling door * Lint and update documentation tables * Update netex_accessRightParameter_version.xsd added inlcude so that VehicleRef is known * Lint and update documentation tables --------- Co-authored-by: Nicholas Knowles <nick.knowles@gmail.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ue71603 <matthias.guenter@sbb.ch> Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Further correction - allow simple PathLinks in SieFrame