RestrictedServiceFacilityRef in ServiceJourney/facilities with a restriction in an AvailabilityCondition and From/To in Calls an StopPointsInJourneyPattern. and fixed missing CallRef

[ue71603]

https://github.com/NeTEx-CEN/NeTEx/issues/470

[skinkie]

Please change the tile, I don't think this is what we are reviewing.

[nick-knowles]

A FACILIRY SET is meant to be a GROUP OF FACILITIES Why do we need this?

The whole point of a facility is that it just an name ie enum value and not a first class object. So there is no such thing as FacilityRef

Is what you are after the ability to nest FACILITY SETs?

[ue71603]

@David-Steiner was not yet happy. He really would Like that I model the FAcilitySetsRefs like the Notices. Will again have a look at it.

[skinkie]

@David-Steiner was not yet happy. He really would Like that I model the FAcilitySetsRefs like the Notices. Will again have a look at it.

How would you envision this, if part of a ServiceJourney?

[Aurige]

@ue71603 : can you provide more details about what is blocking ?

[ue71603]

@Aurige I think what @David-Steiner wants is:

• Like Notice he wants a validtyCondition for FacilitySet
• He also likes the AssignmentGroup:

However, I think I have to discuss it with him again. Because for Notices one also has serioous duplicaiton as one Notice per AvailabilitCondition is needed.

[Aurige]

To be finalised between @ue71603 and @Aurige

[ue71603]

@Aurige Can't do it. If we move them out, then I would have to do a bit like this

netex_journey_facility_support.xsd:

<?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:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_journey_facility_support">
	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
	
	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support.xsd"/>
	
	
		<!-- ====SERVICE FACILITY SET================================================================ -->
	<xsd:simpleType name="RestrictedServiceFacilitySetIdType">
		<xsd:annotation>
			<xsd:documentation>Identifier of a restricted SERVICE FACILITY SET.</xsd:documentation>
		</xsd:annotation>
		<xsd:restriction base="ServiceFacilitySetIdType"/>
	</xsd:simpleType>
	<xsd:element name="RestrictedServiceFacilitySetRef" type="RestrictedServiceFacilitySetRefStructure" substitutionGroup="ServiceFacilitySetRef">
		<xsd:annotation>
			<xsd:documentation>Reference to a restricted SERVICE FACILITY SET.</xsd:documentation>
		</xsd:annotation>
	</xsd:element>
	
	<xsd:complexType name="RestrictedServiceFacilitySetRefStructure">
		<xsd:annotation>
			<xsd:documentation>Type for a reference to a restricted SERVICE FACILITY SET.</xsd:documentation>
		</xsd:annotation>
		<xsd:simpleContent>
			<xsd:restriction base="ServiceFacilitySetRefStructure">
				<xsd:attribute name="ref" type="RestrictedServiceFacilitySetIdType" use="required">
					<xsd:annotation>
						<xsd:documentation>Identifier of a restricted FACILITY SET.</xsd:documentation>
					</xsd:annotation>
				</xsd:attribute>
			</xsd:restriction>
		</xsd:simpleContent>
	</xsd:complexType>
	
	
	<xsd:element name="Restricted1ServiceFacilitySet" abstract="false" substitutionGroup="ServiceFacilitySet">
		<xsd:annotation>
			<xsd:documentation>Restricted SERVICE FACILITY. Set of enumerated FACILITY values (Where available names are based on TPEG classifications, augmented with UIC etc.).</xsd:documentation>
		</xsd:annotation>
		</xsd:element>
			
	
	<xsd:complexType name="Restricted1ServiceFacilitySet_VersionStructure">
		<xsd:annotation>
			<xsd:documentation>Type for a restricted SERVICE FACILITY.</xsd:documentation>
		</xsd:annotation>
		<xsd:complexContent>
			<xsd:restriction base="ServiceFacilitySet_VersionStructure">
				<xsd:sequence>
				<xsd:sequence>
						<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
						</xsd:sequence>
						<xsd:sequence>
							<xsd:group ref="DataManagedObjectGroup"/>
						</xsd:sequence>
				</xsd:sequence>
			</xsd:restriction>
		</xsd:complexContent>
	</xsd:complexType>
	
	<xsd:complexType name="RestrictedServiceFacilitySet_VersionStructure">
		<xsd:annotation>
			<xsd:documentation>Type for a restricted SERVICE FACILITY.</xsd:documentation>
		</xsd:annotation>
		<xsd:complexContent>
			<xsd:extension base="Restricted1ServiceFacilitySet_VersionStructure">
				<xsd:sequence>
				<xsd:sequence>					<xsd:group ref="RestrictedServiceFacilitySetGroup"/>

				</xsd:sequence>
				</xsd:sequence>
				<xsd:attribute name="ref" type="RestrictedServiceFacilitySetIdType" use="required">
					<xsd:annotation>
						<xsd:documentation>Identifier of a restricted FACILITY SET.</xsd:documentation>
					</xsd:annotation>
				</xsd:attribute>
			</xsd:extension>
		</xsd:complexContent>
	</xsd:complexType>	
	

	<xsd:group name="RestrictedServiceFacilitySetGroup">
		<xsd:annotation>
			<xsd:documentation>Combinations of Facilities that apply to services.</xsd:documentation>
		</xsd:annotation>
		<xsd:sequence>
			<xsd:element ref="ServiceFacilitySetRef"/>
			<xsd:choice minOccurs="0">
				<xsd:sequence>
					<xsd:element name="FromCall" type="CallRefStructure"/>
					<xsd:element name="ToCall" type="CallRefStructure"/>
				</xsd:sequence>
				<xsd:sequence>
					<xsd:element name="FromStopPointInJourneyPattern" type="StopPointInJourneyPatternRefStructure"/>
					<xsd:element name="ToStopPointInJourneyPattern" type="StopPointInJourneyPatternRefStructure"/>
				</xsd:sequence>
			</xsd:choice>
			<xsd:element ref="AvailabilityConditionRef" minOccurs="0">
			</xsd:element>
		</xsd:sequence>

	</xsd:group>
	
	</xsd:schema>
	

This doesn't allow me to add them in facilities. Do you have an idea?

[ue71603]

@Aurige @trurlurl @skinkie check again before merge.