Redo NeTEx-CEN#339

Author: skinkie

xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd

@@ -17,7 +17,6 @@
 				<Date>
 					<Modified>2010-11-05</Modified>
 				</Date>
-				</Date>
 				<Description>
 					<p>NeTEx - Network Exchange. This subschema defines ZONE types.</p>
 				</Description>

xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd

@@ -23,7 +23,6 @@
 				</Date>
 				<Date><Modified>2018-10-01</Modified>NK: Correct  substitution group on FarePointInPattern  to PointInLinkSequence
 				</Date>
-				</Date>
 				<Date><Modified>20109-02-25</Modified>UK-14  Add extra  ScopingMethod  attribute to FareZone with enum values   explicitStops,   implicitSpatialProjection, implicitSpatialProjection
 						</Date>
 				<Date><Modified>20109-02-25</Modified>UK-13  Add extra  ZoneTopologyEnumeration   attribute  enum values   annular,   sequence, overlappingSequence

xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd

@@ -22,7 +22,6 @@
 				</Date>
 				<Date><Modified>2019-10-01</Modified>UK-20 Add contains relationship
 				</Date>
-				</Date>
 				<Date><Modified>20109-02-25</Modified>UK-14  Add extra  ScopingMethod  attribute to FareZone with enum values   explicitStops,   implicitSpatialProjection, implicitSpatialProjection
 							UK-18  Specify  fare stages  ona   pattern: Add extra attributes to FarePointInPattern     IsFareStage   
 							EURA  Allow stops to be excluded from a routing    Add extra attributes to FarePointInPattern      _IsForbidden_ 

xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd

@@ -19,7 +19,8 @@
 				<Date><Modified>2011-02-05</Modified>Name Space changes</Date>
 				<Date><Modified>2017-12-05</Modified> dd Notice Assignments
 				</Date>
-				<Date><Created>2019-01-10</Created>					
+				<Date>
+					<Created>2019-01-10</Created>
 				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>

xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd

@@ -426,6 +426,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Use Sms to request stop</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
+			<xsd:enumeration value="speakToDriverOnboard">
+				<xsd:annotation>
+					<xsd:documentation>Tell the driver to request stop. Mainly used for on demand traffic, where the route depends on where passengers want to leave the vehicle.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
 			<xsd:enumeration value="other">
 				<xsd:annotation>
 					<xsd:documentation>Use other method to request stop</xsd:documentation>

xsd/siri_utility/siri_types-v2.0.xsd

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.siri.org.uk/siri" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="siri_types">
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../wsdl/xml/xml.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -82,7 +81,7 @@
 		</xsd:annotation>
 		<xsd:simpleContent>
 			<xsd:extension base="PopulatedStringType">
-				<xsd:attribute ref="xml:lang" use="optional"/>
+				<xsd:attribute name="lang" type="xsd:language" use="optional"/>
 			</xsd:extension>
 		</xsd:simpleContent>
 	</xsd:complexType>
@@ -101,7 +100,7 @@ A string containing a phrase in a natural language name that requires at least o
 		</xsd:annotation>
 		<xsd:simpleContent>
 			<xsd:extension base="PopulatedPlaceNameType">
-				<xsd:attribute ref="xml:lang" use="optional"/>
+				<xsd:attribute name="lang" type="xsd:language" use="optional"/>
 			</xsd:extension>
 		</xsd:simpleContent>
 	</xsd:complexType>