Skip to content

Fix improve mode#507

Merged
skinkie merged 8 commits into
masterfrom
fix_improve_mode
Sep 27, 2023
Merged

Fix improve mode#507
skinkie merged 8 commits into
masterfrom
fix_improve_mode

Conversation

@skinkie
Copy link
Copy Markdown
Contributor

@skinkie skinkie commented Sep 27, 2023

Fix #376 (directly on master)

@Aurige would this be ok?

ue71603 and others added 5 commits September 27, 2023 17:39
* Better explanations in VEHICLE MODE
* AccessMode now works TRANSFERs and OTHER LEG (for OJP)
* Some depreciations
Deprecated not Depreciated ;-)
Deprecated not Depreciated ;-)
Comment thread xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
Comment thread xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
@Aurige Aurige added the needs documentation update The NeTEx document needs to be updated label Sep 27, 2023
Comment thread xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Outdated
</xsd:enumeration>
<xsd:enumeration value="lift">
<xsd:annotation>
<xsd:documentation>General Mode for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that.</xsd:documentation>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I guess this should also include all sorts of elevators? There exist hydraulic and cogwheel-driven elevators. Proposal: "Mode for elevators and for modes moved by cable...."

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sure, make it a suggestion.

Copy link
Copy Markdown
Contributor

@Aurige Aurige Sep 28, 2023

Choose a reason for hiding this comment

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

I would rather go to the Vehicle/Lift Equipment description to go to that level of details (modes are expected to be generic)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@trurlurl can you accept Christophe's comment and we don't change it here?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@trurlurl sorry is merged already. so done.

…t.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
Comment thread xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Outdated
…t.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
@skinkie skinkie merged commit 9ffc9a8 into master Sep 27, 2023
@skinkie skinkie deleted the fix_improve_mode branch September 27, 2023 20:46
skinkie added a commit that referenced this pull request Nov 21, 2023
* Update netex_nm_vehicleMeetingPointAssignment_support.xsd (#506)

Co-authored-by: ue71603 <matthias.guenter@sbb.ch>

* 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>

* Fix passenger information equipment list (#510)

* 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>

* Fix typo's (#511)

* Introduce VAT (#516)

* Introduce VAT number

* Removing duplicate enumeration (thanks to David) (#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>

* enhancement-TMTC-add ACCEPTED DRIVER PERMITs

Add ACCEPTED DRIVER PERMITS to VEHICEL TYpe

* lint

* revert non-changes

* revert non-changes

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

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

* Apply suggestions from code review

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

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

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.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>
Co-authored-by: Nicholas Knowles <nick.knowles@gmail.com>
skinkie added a commit that referenced this pull request Mar 14, 2024
* 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>
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>
@trurlurl trurlurl added document has been updated NeTEx Document already updated and removed needs documentation update The NeTEx document needs to be updated labels Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

document has been updated NeTEx Document already updated

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants