Skip to content

Revert new modes StopPlace_ abstract on stopPlacesInFrame_RelStructure #513

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
ue71603 merged 7 commits into from
Feb 19, 2024
Merged

Revert new modes StopPlace_ abstract on stopPlacesInFrame_RelStructure #513

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20dc6bb
Revert new modes StopPlace_ abstract on stopPlacesInFrame_RelStructure
skinkie Sep 29, 2023
094d451
Merge branch 'master' into revert_stopplaces_abstract
skinkie Jan 17, 2024
5661dfb
fix
skinkie Jan 17, 2024
bc35be2
taxiRanks now separately. Vehicle Meeting Points never were in stopPl…
ue71603 Jan 24, 2024
b2c6dea
Lint and update documentation tables
github-actions[bot] Jan 24, 2024
db7237d
Update xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd
ue71603 Jan 25, 2024
2d18874
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
ue71603 Jan 25, 2024
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
4 changes: 3 additions & 1 deletion examples/functions/newModes/NewModes-CarPoolingExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
</Quay>
</quays>
</StopPlace>
</stopPlaces>
<taxiRanks>
<TaxiRank version="any" id="alphaville_hdv_taxi">
<Name>Taxi Rank at Alphaville Hotel de Ville</Name>
<adjacentSites>
Expand All @@ -276,7 +278,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
</TaxiStand>
</taxiStands>
</TaxiRank>
</stopPlaces>
</taxiRanks>
<pointsOfInterest>
<PointOfInterest version="any" id="alphaville_hdv">
<Name>ALphaville Hotel de Ville</Name>
Expand Down
4 changes: 3 additions & 1 deletion examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@
</Quay>
</quays>
</StopPlace>
</stopPlaces>
<taxiRanks>
<TaxiRank version="any" id="alphaville_hdv_taxi">
<Name>Taxi Rank at Alphaville Hotel de Ville</Name>
<adjacentSites>
Expand All @@ -409,7 +411,7 @@
</TaxiStand>
</taxiStands>
</TaxiRank>
</stopPlaces>
</taxiRanks>
<pointsOfInterest>
<PointOfInterest version="any" id="alphaville_hdv">
<Name>Alphaville Hotel de Ville</Name>
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd"/>
<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version.xsd"/>
<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version.xsd"/>
<xsd:include schemaLocation="../part1_ifopt/netex_taxiPlace_version.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -168,6 +169,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>STOP PLACEs in frame.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="taxiRanks" type="taxiRanksInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>TAXI RANKs in frame.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="pointsOfInterest" type="pointsOfInterestInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>POINTS OF INTEREST in frame.</xsd:documentation>
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ Rail transport, Roads and Road transport
<!-- ===ENTIITY IN VERSION IN FRAME====(Used in SITE FRAME)=================================================== -->
<xsd:complexType name="stopPlacesInFrame_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for containment in frame of STOP PLACE, VEHICLE MEETING POINT, TAXI RANK.</xsd:documentation>
<xsd:documentation>Type for containment in frame of STOP PLACE</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="StopPlace_" maxOccurs="unbounded">
<xsd:element ref="StopPlace" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Can be a STOP PLACE, VEHICLE MEETING POINT, TAXI RANK.</xsd:documentation>
<xsd:documentation>Can be a STOP PLACE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
16 changes: 16 additions & 0 deletions xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,22 @@ Rail transport, Roads and Road transport
<xsd:documentation>TAXI PLACE data types</xsd:documentation>
</xsd:annotation>
<!-- ======TAXI RANK ======================================================== -->
<xsd:complexType name="taxiRanksInFrame_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for containment in frame of TAXI RANKs.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="TaxiRank" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>TAXI RANK.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="TaxiRank" abstract="false" substitutionGroup="StopPlace_">
<xsd:annotation>
<xsd:documentation>A place comprising one or more locations where taxis may stop to pick up or set down passengersA place comprising one or more locations where taxis may stop to pick up or set down passengers. +v1.2.2
Expand Down