redoing NeTEx-CEN#339 work

Author: ue71603

xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd

@@ -444,6 +444,11 @@
           <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,7 +1,6 @@
 <?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">
@@ -87,7 +86,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>
@@ -107,7 +106,7 @@
     </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>