Revert new modes StopPlace_ abstract on stopPlacesInFrame_RelStructure (#513)

* Revert new modes StopPlace_ abstract on stopPlacesInFrame_RelStructure

Fix #512

* fix

* taxiRanks now separately. Vehicle Meeting Points never were in stopPlaces

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd

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

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd

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

---------

Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

Author: 4 people

examples/functions/newModes/NewModes-CarPoolingExample.xml

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

examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml

@@ -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>
@@ -409,7 +411,7 @@
 								</TaxiStand>
 							</taxiStands>
 						</TaxiRank>
-					</stopPlaces>
+					</taxiRanks>
 					<pointsOfInterest>
 						<PointOfInterest version="any" id="alphaville_hdv">
 							<Name>Alphaville Hotel de Ville</Name>

xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd

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

xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd

@@ -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>A STOP PLACE.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 				</xsd:sequence>

xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd

@@ -60,9 +60,25 @@ 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
+			<xsd:documentation>A place comprising one or more locations where taxis may stop to pick up or set down passengers.  +v1.2.2
 </xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>