Enhancement -Site levels and GroupOfSites#625
Closed
nick-knowles wants to merge 17 commits into
Closed
Conversation
…Ecosystem#506) Co-authored-by: ue71603 <matthias.guenter@sbb.ch>
* 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>
* The connection exists in the documentation, but was not done in the xsd NeTEx part 1, figure 628 * Fixed according to Christophe's proposal * Apply suggestions from code review * Update xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd * Lint and update documentation tables --------- Co-authored-by: ue71603 <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Introduce VAT number
…#509) * Removing duplicate enumeration (thanks to David) btw something is wrong with xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_support.xsd in next * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> --------- Co-authored-by: ue71603 <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
annotation correction to clarify that Gradients are in degrees
Rbaseddeck plane ready to fix
DeckPlanc hanges. Rebased on current next Minor changes to align with TM: move sensorInENtrance and spot to different packges Also correctons to documentation
Adds SIteStructure to allow alternative labelling of levels within a site. Also GroupOfSItes and GroupOfTariffZones added to SiteFrame. Test example also provided
Update comment on RealtiveLevelorder previously added by Mathias to reflect the SITE STRUCTUTUER enhancements
nick-knowles
changed the base branch from
next
to
AccessRightParameterAssignment---TypeOfProofRef-
ue71603
changed the base branch from
AccessRightParameterAssignment---TypeOfProofRef-
to
next
Contributor
|
Last commit added to #615. Therefore I close this one. |
skinkie
added a commit
that referenced
this pull request
Mar 8, 2024
* recreated commit 532c9b * recreated commit 29ee965 * rebuild commit 0eddb08 * incluse #574. but had to comments things out * implements commit fa43f0f * Lint and update documentation tables * redo of #625 * Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_seatingPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_spotEquipment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * 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 * LiftCallEquipment added * Updated deckplan examples Add deck plane xamples and update deck path * 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 * fixing import * Update netex_ifopt_path_support.xsd * fixing validation errors same way Nick fixed stuff in the new examples * Lint and update documentation tables * 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 * DECK Plan Examples add constraints Add Constraints to publication * DECK Plan example - fix broken examples Tidy up to fix broken exampels - correction to constraing * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/tmp0000.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/tmp0000.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd * Update xsd/netex_framework/netex_reusableComponents/netex_environment_version.xsd * Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd * Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd * Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd * Update xsd/netex_framework/netex_genericFramework/netex_path_version.xsd * fixing merge problems * more problems fixed * fixing PathLinks * Update EPIAP_Accessibility_Chur_V08_vehicletypes.xml * more errors * Lint and update documentation tables * DEck Plan - revise to use generic path Link In order to support DECK PATH LINKS, factor out common PATH LINK and NAVIGATION elements into a Generic framework component Move copmmonon environmental properties toa Reusuble component ENVIRONMENT properties in a new package Revise DECK PATH LINKS and DECK NVAIGATION to sepcaialise generic elements Revise Add SITE NAVIGATION , and revise IFOPT SITE PATH LINKS and PATH LINK ENDs to specialise generic components Rename NAVIGATHION PATH to NAVIGATION but retain (Site) NAVIGATION PATH as a deprecated element that is an alisa for SITE NAVIGATION * DEck Plan Path links Integrate with other changes * DEckPlans Add in Stefan Jugelts simplified train deck plan example Add in simplified train deck plan example. thanks stefan * Lint and update documentation tables * 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 * Lint and update documentation tables * 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 * Lint and update documentation tables * Apply suggestions from code review Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd * Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> * Update xsd/netex_part_2/part2_journeyTimes/netex_deckEntranceAlignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * depreciated corrected * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_train.xml * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * fixes * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_2/part2_journeyTimes/netex_deckPlanAssignment_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/NeTEx_publication.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_genericFramework/netex_path_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example_bus.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPath_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_framework/netex_reusableComponents/netex_deckPlan_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Update examples/functions/deckPlans/DeckPlans-Example.xml Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com> * Ref/Rel structures back to before * fixing refs * Lint and update documentation tables --------- Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: Johan Wiklund <33256409+JohanEntur@users.noreply.github.com>
Merged
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
5 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.
Add SITE LEVEL STRUCTURW and LEVEL IN STRUCTURE as per Transmodel so as to support alternative label sets for levels on different building parts within a SITE
Update comment on RelativeLevelOrder attribute previously added by Matthias to reflect enhancement -ie that RelativeLevelOrder is now a 'site default' but that different alternative labbing sets are possible.
UML diagram
