Skip to content

RouteInstructionRef reintroduced#588

Merged
skinkie merged 11 commits into
masterfrom
fix-466
May 10, 2024
Merged

RouteInstructionRef reintroduced#588
skinkie merged 11 commits into
masterfrom
fix-466

Conversation

@ue71603
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 commented Dec 12, 2023

with including also the stuff that Christophe wrote.
fixes #466

@ue71603
fix 466
c146fad 
with including also the stuff that Christophe wrote.
@ue71603 ue71603 added bug Technical mistake, inconsistency with the documentation, etc. needs documentation update The NeTEx document needs to be updated labels Dec 12, 2023
@ue71603 ue71603 added this to the netex_1.2 milestone Dec 12, 2023
@ue71603 ue71603 mentioned this pull request Dec 12, 2023
Closed
skinkie
skinkie reviewed Dec 12, 2023
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
@ue71603 @skinkie
Update xsd/netex_part_1/part1_networkDescription/netex_routeInstructi…
1997f30 
…on_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>
skinkie
skinkie reviewed Dec 13, 2023
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Outdated
@skinkie skinkie mentioned this pull request Dec 13, 2023
Open
@ue71603 ue71603 modified the milestones: netex_1.2, netex_2.0 Dec 14, 2023
@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented Dec 14, 2023

generalized to all such lists.

@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented Dec 14, 2023 •
edited
Loading

Nick: FacilitySet you want to mix up. Bad for "decorators"

@ue71603 ue71603 assigned ue71603 and unassigned skinkie Jan 17, 2024
@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented Jan 19, 2024

@skinkie the discussion and what I see in code don't make sense. Also to discuss in the chat on Wednesday.

@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented Jan 24, 2024

either Ref or direct, but never mixed.
choice
ref
no ref mulitp

...

@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented Jan 24, 2024

@Aurige @skinkie ok now?

@ue71603 ue71603 removed their assignment Jan 24, 2024
skinkie
skinkie reviewed Feb 2, 2024
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Outdated
skinkie
skinkie reviewed Feb 8, 2024
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Outdated
</xsd:annotation>
</xsd:element>
<xsd:choice>
<xsd:element ref="RouteInstructionRef" maxOccurs="unbounded">
Copy link
Copy Markdown
Contributor

@skinkie skinkie Feb 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Would it be possible to do this in the following way:

<choice>
  <sequence>
    <xsd:element ref="RouteInstructionRef" maxOccurs="unbounded">
  </sequence>
  <sequence>
    <xsd:element ref="RouteInstruction" maxOccurs="unbounded">
  </sequence>
</choice>

Copy link
Copy Markdown
Contributor Author

@ue71603 ue71603 Feb 8, 2024

Choose a reason for hiding this comment

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

it is... but would be a bit strange. Do you need it for the conversion? commit done

Copy link
Copy Markdown
Contributor

@skinkie skinkie Feb 8, 2024

Choose a reason for hiding this comment

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

I would love to have a conversation on this being our 'default' way to do containers with aggregations, so that its either a List[Type1] or List[Type2]. Sure in ServiceJourneyPattern it serves a function, I cannot wrap my hand around why you want to instantiate a type here (being the RouteInstruction) and then next in the list you make it a RouteInstructionRef.

Copy link
Copy Markdown
Contributor Author

@ue71603 ue71603 Apr 19, 2024

Choose a reason for hiding this comment

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

@skinkie if we need a general discussion: can you create an issue for release 2.1?

skinkie
skinkie requested changes Feb 8, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@skinkie skinkie left a comment

Choose a reason for hiding this comment

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

See suggestion.

skinkie
skinkie reviewed Feb 8, 2024
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd Outdated
@ue71603 ue71603 self-assigned this Apr 15, 2024
@ue71603 ue71603 requested a review from Aurige April 19, 2024 07:41
@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented Apr 19, 2024

@skinkie the concrete example is done right now? Isn't it? so you can accept it?

@skinkie skinkie mentioned this pull request Apr 19, 2024
Closed
@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented May 8, 2024

@skinkie ok now or obsolete?

@skinkie
Copy link
Copy Markdown
Contributor

skinkie commented May 8, 2024

Why obsolete?

@ue71603
Copy link
Copy Markdown
Contributor Author

ue71603 commented May 8, 2024

Why obsolete?
@skinkie
then pls accept it or tell me what needs doing.

skinkie
skinkie reviewed May 8, 2024
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Outdated
Aurige
Aurige reviewed May 10, 2024
View reviewed changes
Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Outdated
@@ -73,11 +73,22 @@ Rail transport, Roads and Road transport
<xsd:complexContent>
<xsd:extension base="strictContainmentAggregationStructure">
<xsd:sequence>
Copy link
Copy Markdown
Contributor

@Aurige Aurige May 10, 2024

Choose a reason for hiding this comment

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

this level can be removed

Comment thread xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd Outdated
Aurige
Aurige reviewed May 10, 2024
View reviewed changes
Comment thread examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml Outdated
Aurige
Aurige approved these changes May 10, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@Aurige Aurige left a comment

Choose a reason for hiding this comment

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

That's Ok for me (latest XSD is just more compact, does not change anything for the XML)

@ue71603 ue71603 removed their assignment May 10, 2024
@skinkie skinkie merged commit 1e9458f into master May 10, 2024
@skinkie skinkie deleted the fix-466 branch May 10, 2024 19:24
skinkie added a commit that referenced this pull request May 10, 2024
@ue71603 @github-actions @skinkie
RouteInstructionRef reintroduced (#588)
be64880 
* fix 466

with including also the stuff that Christophe wrote.

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd

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

* example, fixed choice, added constraints

* Lint and update documentation tables

* fix carrdinalties and a typo

* sequences in choice

* Lint and update documentation tables

* Apply suggestions from code review

* typos and simplification

* Lint and update documentation tables

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stefan de Konink <stefan@konink.de>
@trurlurl trurlurl added document has been updated NeTEx Document already updated UML update needed Update UML physical model needed and removed needs documentation update The NeTEx document needs to be updated labels Jun 12, 2024
@thbar thbar mentioned this pull request Jan 13, 2026
Closed
32 tasks
skinkie added a commit that referenced this pull request Feb 1, 2026
@ue71603 @github-actions @skinkie
RouteInstructionRef reintroduced (#588)
0765ccf 
* fix 466

with including also the stuff that Christophe wrote.

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd

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

* example, fixed choice, added constraints

* Lint and update documentation tables

* fix carrdinalties and a typo

* sequences in choice

* Lint and update documentation tables

* Apply suggestions from code review

* typos and simplification

* Lint and update documentation tables

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stefan de Konink <stefan@konink.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@skinkie skinkie skinkie approved these changes

@Aurige Aurige Aurige approved these changes

@trurlurl trurlurl trurlurl approved these changes

Assignees

No one assigned

Labels

bug Technical mistake, inconsistency with the documentation, etc. document has been updated NeTEx Document already updated UML update needed Update UML physical model needed

Projects

None yet

Milestone

netex_2.0

Development

Successfully merging this pull request may close these issues.

RouteInstruction seem to be duplicated

4 participants

@ue71603 @skinkie @Aurige @trurlurl