Skip to content

Add DynamicDistanceMatrixElement #151

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.

Sign up for GitHub

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

Merged
skinkie merged 2 commits into from
Apr 14, 2022
Merged

Add DynamicDistanceMatrixElement #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b57386
Add dynamicdistancematrixelement for on-the-fly generation when pre-c…
seime Feb 4, 2021
1c82fa3
Added proper element definition
seime Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions xsd/NeTEx_publication.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7519,6 +7519,15 @@
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====DynamicDistanceMatrixElement unique========================== -->
<xsd:unique name="DynamicDistanceMatrixElement_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [DynamicDistanceMatrixElement Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:DynamicDistanceMatrixElement"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
<!-- =====GroupOfDistanceMatrixElements============================== -->
<!-- =====GroupOfDistanceMatrixElements unique========================== -->
<xsd:unique name="GroupOfDistanceMatrixElements_UniqueBy_Id_Version">
Expand Down
7 changes: 5 additions & 2 deletions xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
Expand Down Expand Up @@ -250,7 +250,10 @@ Rail transport, Roads and Road transport
<xsd:element ref="TariffRef" minOccurs="0"/>
<xsd:element ref="FareStructureElementRef" minOccurs="0"/>
<xsd:element ref="FareElementInSequenceRef" minOccurs="0"/>
<xsd:element ref="DistanceMatrixElementRef" minOccurs="0"/>
<xsd:choice minOccurs="0">
Copy link
Copy Markdown
Contributor

@Aurige Aurige Aug 18, 2021

Choose a reason for hiding this comment

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

since both choices are in the same substitution group, I'm not sure the use of choice is really effective... but it does not harm anyway

<xsd:element ref="DistanceMatrixElementRef"/>
<xsd:element ref="DynamicDistanceMatrixElement"/>
</xsd:choice>
<xsd:element ref="DistanceMatrixElementInverseRef" minOccurs="0"/>
<xsd:element ref="DistanceMatrixElementView" minOccurs="0"/>
<xsd:element ref="SalesOfferPackageRef" minOccurs="0"/>
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="PriceableObjectIdType"/>
</xsd:simpleType>
<xsd:simpleType name="DynamicDistanceMatrixElementIdType">
<xsd:annotation>
<xsd:documentation>Type for identifier of a DYNAMIC DISTANCE MATRIX ELEMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="DistanceMatrixElementIdType"/>
</xsd:simpleType>
<xsd:element name="DistanceMatrixElementRef" substitutionGroup="PriceableObjectRef">
<xsd:annotation>
<xsd:documentation>Reference to a DISTANCE MATRIX ELEMENT, used in a forward direction.</xsd:documentation>
Expand Down
55 changes: 52 additions & 3 deletions xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_distanceMatrixElement_version">
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10"
id="netex_distanceMatrixElement_version">
<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
Expand Down Expand Up @@ -31,7 +33,10 @@
</Date>
<Date>
<Modified>2019-03-25</Modified>Fix #40 by Skinkie from 2019.01.07 . Fix typo on DistanceMatrixElement.IsDirect.
NB this will break existing XML that uses IsDirect.
NB this will break existing XML that uses IsDirect.
</Date>
<Date>
<Modified>2021-02-05</Modified>Add DynamicDistanceMatrixElement for on-the-fly creation when pre-computing all possible combinations is not feasible
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down Expand Up @@ -225,7 +230,14 @@ Rail transport, Roads and Road transport
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="DistanceMatrixElement" abstract="false" substitutionGroup="PriceableObject">

Copy link
Copy Markdown
Contributor

@skinkie skinkie Apr 14, 2022

Choose a reason for hiding this comment

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

Suggested change


Copy link
Copy Markdown
Contributor

@skinkie skinkie Apr 14, 2022

Choose a reason for hiding this comment

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

Suggested change

<xsd:element name="DistanceMatrixElement_" type="PriceableObject_VersionStructure" abstract="true" substitutionGroup="PriceableObject">
<xsd:annotation>
<xsd:documentation>Dummy SERVICE JOURNEY Supertype.</xsd:documentation>
Copy link
Copy Markdown
Contributor

@skinkie skinkie Apr 14, 2022

Choose a reason for hiding this comment

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

Suggested change
<xsd:documentation>Dummy SERVICE JOURNEY Supertype.</xsd:documentation>
<xsd:documentation>Dummy SERVICE JOURNEY supertype.</xsd:documentation>

</xsd:annotation>
</xsd:element>
<xsd:element name="DistanceMatrixElement" abstract="false" substitutionGroup="DistanceMatrixElement_">
<xsd:annotation>
<xsd:documentation>A cell of an origin-destination matrix for TARIFF ZONEs or STOP POINTs, expressing a fare distance for the corresponding trip: value in km, number of fare units etc.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -479,6 +491,43 @@ Rail transport, Roads and Road transport
</xsd:choice>
</xsd:group>
<!-- ======================================================================= -->
<!-- === DYNAMIC DISTANCE MATRIX ELEMENT ================================================= -->
<xsd:element name="DynamicDistanceMatrixElement" abstract="false" substitutionGroup="DistanceMatrixElement_">
<xsd:annotation>
<xsd:documentation>A dynamic free-standing distance matrix element. Used when a pre-computed distance matrix element is not feasible.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="DynamicDistanceMatrixElement_VersionStructure">
<xsd:sequence>
<xsd:sequence>
<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="DataManagedObjectGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="PriceableObjectGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="DistanceMatrixElementGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="DynamicDistanceMatrixElementIdType"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="DynamicDistanceMatrixElement_VersionStructure">
<xsd:annotation>
<xsd:documentation>Type for DYNAMIC DISTANCE MATRIX ELEMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="DistanceMatrixElement_VersionStructure">
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<!-- == DISTANCE MATRIX ELEMENT View-->
<xsd:element name="DistanceMatrixElementView" type="DistanceMatrixElement_DerivedViewStructure" abstract="false" substitutionGroup="DerivedView">
<xsd:annotation>
Expand Down