Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aligning BookingArrangements more closely with NeTEx #232

Merged
merged 52 commits into from
Jan 20, 2023

Conversation

ue71603
Copy link
Contributor

@ue71603 ue71603 commented Aug 11, 2022

kept the Extension

Perhaps we need to outsource this to a NeTEx_include at some time. But perhaps we should sort ENUM in NeTEx first.

Fixes: #224

@ue71603 ue71603 added enhancement New feature or request documentation labels Aug 11, 2022
@ue71603 ue71603 added this to the v2.0 milestone Aug 11, 2022
@ue71603
Copy link
Contributor Author

ue71603 commented Aug 11, 2022

will do all example, when content is ok for group.

Copy link
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.

Well aligned with NeTEx ... just a few comments

OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Show resolved Hide resolved
@trurlurl
Copy link
Contributor

Documentation done - except for MultilingualString which I don't fully understand. Will MultilingualString remain in FareSupport or move to Common? Why not use InternationalText?

@Aurige
Copy link
Contributor

Aurige commented Sep 21, 2022

@ue71603 what are you expecting from me here ?

@ue71603
Copy link
Contributor Author

ue71603 commented Sep 22, 2022

@Aurige If you think something needs to be dealt with within NeTEx, then I would ask you to crate an issue there. And then I can finalise things here.

Copy link
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.

There are some xsd: instaed of xs: ... does not validate like this (in XMLSpy)

OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
@Aurige
Copy link
Contributor

Aurige commented Sep 22, 2022

I did a few corrections, but this version is perfectly aligned with NeTEx now .... no further need on my side.

Aurige
Aurige previously approved these changes Sep 22, 2022
@trurlurl
Copy link
Contributor

Added documentation proposal for MultilingualString that was missing (as mentioned above).

OJP/OJP_FareSupport.xsd Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
@ue71603
Copy link
Contributor Author

ue71603 commented Oct 1, 2022

Documentation done - except for MultilingualString which I don't fully understand. Will MultilingualString remain in FareSupport or move to Common? Why not use InternationalText?

What we really have is:

<xs:complexType name="InternationalTextStructure">
xs:annotation
xs:documentation[a restricted view of ALTERNATIVE NAME in TMv6] alternative identified text to be used in specified languages.</xs:documentation>
</xs:annotation>
xs:sequence
<xs:element name="Text" type="siri:NaturalLanguageStringStructure" maxOccurs="unbounded">
xs:annotation
xs:documentationText content.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TextId" type="xs:NMTOKEN" minOccurs="0">
xs:annotation
xs:documentationId of this text. May be used for matching to pre-recorded audio files.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>

And

<xsd:complexType name="NaturalLanguageStringStructure">
xsd:annotation
xsd:documentationTyoe for a string in a specified language.</xsd:documentation>
</xsd:annotation>
xsd:simpleContent
<xsd:extension base="PopulatedStringType">
<xsd:attribute ref="xml:lang" use="optional"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>

@Aurige @skinkie If you think I should do it, I change to InternationalTextStructure. I guess this saves us one new element.

@Aurige
Copy link
Contributor

Aurige commented Oct 3, 2022

Yes InternationalTextStructure looks Ok here (even if internationalisation is not harmonized across SIRI, NeTEx and OJP)

OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
@ue71603 ue71603 requested a review from skinkie October 26, 2022 18:40
Aurige
Aurige previously approved these changes Oct 27, 2022
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
skinkie and others added 2 commits January 17, 2023 15:42
Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
skinkie
skinkie previously approved these changes Jan 17, 2023
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
Co-authored-by: Stefan de Konink <stefan@konink.de>
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
trurlurl
trurlurl previously approved these changes Jan 19, 2023
skinkie
skinkie previously approved these changes Jan 19, 2023
<xs:annotation>
<xs:documentation>URL to information page.</xs:documentation>
<xs:documentation>Contact fax number.</xs:documentation>

Choose a reason for hiding this comment

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

Do we need Fax? What happens or breaks if we let it away.
As i now fax really used these days.

Copy link
Contributor

Choose a reason for hiding this comment

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

The media exists...

@skinkie skinkie dismissed stale reviews from trurlurl and themself via c558dc8 January 20, 2023 11:13
Copy link

@AndreasAtSBB AndreasAtSBB left a comment

Choose a reason for hiding this comment

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

Changes approved.

@skinkie skinkie merged commit 4e90159 into changes_for_v1.1 Jan 20, 2023
@skinkie skinkie deleted the Extended_BookingArrangements branch January 20, 2023 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc updated enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants