Skip to content

Commit

Permalink
Merge branch 'bugfixes_v920'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hennoit
hennoit committed May 17, 2021
2 parents 1dda256 + 610c557 commit 884320a
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 45 deletions.
12 changes: 12 additions & 0 deletions xml/NeTEx_HTM_test_20210301.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18801,6 +18801,7 @@
<lines>
<Line id="HTM:Line:6" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Den Haag Leyenburg - Leidschendam Noord</Name>
<ShortName>6</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>6</PublicCode>
<PrivateCode type="LinePlanningNumber">6</PrivateCode>
Expand All @@ -18814,6 +18815,7 @@
</Line>
<Line id="HTM:Line:12" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Den Haag Duindorp - Station Den Haag HS</Name>
<ShortName>12</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>12</PublicCode>
<PrivateCode type="LinePlanningNumber">12</PrivateCode>
Expand All @@ -18827,6 +18829,7 @@
</Line>
<Line id="HTM:Line:3" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 3</Name>
<ShortName>3</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>3</PublicCode>
<PrivateCode type="LinePlanningNumber">3</PrivateCode>
Expand All @@ -18840,6 +18843,7 @@
</Line>
<Line id="HTM:Line:4" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 4</Name>
<ShortName>4</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>4</PublicCode>
<PrivateCode type="LinePlanningNumber">4</PrivateCode>
Expand All @@ -18853,6 +18857,7 @@
</Line>
<Line id="HTM:Line:1" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Scheveningen Noord - Delft Tanthof</Name>
<ShortName>1</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>1</PublicCode>
<PrivateCode type="LinePlanningNumber">1</PrivateCode>
Expand All @@ -18869,6 +18874,7 @@
</Line>
<Line id="HTM:Line:16" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Wateringen - Den Haag Statenkwartier</Name>
<ShortName>16</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>16</PublicCode>
<PrivateCode type="LinePlanningNumber">16</PrivateCode>
Expand All @@ -18882,6 +18888,7 @@
</Line>
<Line id="HTM:Line:2" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 2 Kraaijenstein - Leidschendam Leidsenhage</Name>
<ShortName>2</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>2</PublicCode>
<PrivateCode type="LinePlanningNumber">2</PrivateCode>
Expand All @@ -18895,6 +18902,7 @@
</Line>
<Line id="HTM:Line:11" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Scheveningen Haven - Rijswijkseplein</Name>
<ShortName>11</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>11</PublicCode>
<PrivateCode type="LinePlanningNumber">11</PrivateCode>
Expand All @@ -18908,6 +18916,7 @@
</Line>
<Line id="HTM:Line:15" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Nootdorp - Kalvermarkt</Name>
<ShortName>15</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>15</PublicCode>
<PrivateCode type="LinePlanningNumber">15</PrivateCode>
Expand All @@ -18921,6 +18930,7 @@
</Line>
<Line id="HTM:Line:17" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Centrum - Wateringen</Name>
<ShortName>17</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>17</PublicCode>
<PrivateCode type="LinePlanningNumber">17</PrivateCode>
Expand All @@ -18934,6 +18944,7 @@
</Line>
<Line id="HTM:Line:19" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 19 Delft Noord - Leidschendam leidsenhage</Name>
<ShortName>19</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>19</PublicCode>
<PrivateCode type="LinePlanningNumber">19</PrivateCode>
Expand All @@ -18947,6 +18958,7 @@
</Line>
<Line id="HTM:Line:9" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Vrederust -Scheveningen Noorderstrand</Name>
<ShortName>9</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>9</PublicCode>
<PrivateCode type="LinePlanningNumber">9</PrivateCode>
Expand Down
12 changes: 12 additions & 0 deletions xml/NeTEx_HTM_test_20210301_met_general.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18799,6 +18799,7 @@
<lines>
<Line id="HTM:Line:6" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Den Haag Leyenburg - Leidschendam Noord</Name>
<ShortName>6</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>6</PublicCode>
<PrivateCode type="LinePlanningNumber">6</PrivateCode>
Expand All @@ -18812,6 +18813,7 @@
</Line>
<Line id="HTM:Line:12" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Den Haag Duindorp - Station Den Haag HS</Name>
<ShortName>12</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>12</PublicCode>
<PrivateCode type="LinePlanningNumber">12</PrivateCode>
Expand All @@ -18825,6 +18827,7 @@
</Line>
<Line id="HTM:Line:3" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 3</Name>
<ShortName>3</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>3</PublicCode>
<PrivateCode type="LinePlanningNumber">3</PrivateCode>
Expand All @@ -18838,6 +18841,7 @@
</Line>
<Line id="HTM:Line:4" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 4</Name>
<ShortName>4</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>4</PublicCode>
<PrivateCode type="LinePlanningNumber">4</PrivateCode>
Expand All @@ -18851,6 +18855,7 @@
</Line>
<Line id="HTM:Line:1" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Scheveningen Noord - Delft Tanthof</Name>
<ShortName>1</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>1</PublicCode>
<PrivateCode type="LinePlanningNumber">1</PrivateCode>
Expand All @@ -18867,6 +18872,7 @@
</Line>
<Line id="HTM:Line:16" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Wateringen - Den Haag Statenkwartier</Name>
<ShortName>16</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>16</PublicCode>
<PrivateCode type="LinePlanningNumber">16</PrivateCode>
Expand All @@ -18880,6 +18886,7 @@
</Line>
<Line id="HTM:Line:2" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 2 Kraaijenstein - Leidschendam Leidsenhage</Name>
<ShortName>2</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>2</PublicCode>
<PrivateCode type="LinePlanningNumber">2</PrivateCode>
Expand All @@ -18893,6 +18900,7 @@
</Line>
<Line id="HTM:Line:11" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Scheveningen Haven - Rijswijkseplein</Name>
<ShortName>11</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>11</PublicCode>
<PrivateCode type="LinePlanningNumber">11</PrivateCode>
Expand All @@ -18906,6 +18914,7 @@
</Line>
<Line id="HTM:Line:15" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Nootdorp - Kalvermarkt</Name>
<ShortName>15</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>15</PublicCode>
<PrivateCode type="LinePlanningNumber">15</PrivateCode>
Expand All @@ -18919,6 +18928,7 @@
</Line>
<Line id="HTM:Line:17" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Centrum - Wateringen</Name>
<ShortName>17</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>17</PublicCode>
<PrivateCode type="LinePlanningNumber">17</PrivateCode>
Expand All @@ -18932,6 +18942,7 @@
</Line>
<Line id="HTM:Line:19" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name>Lijn 19 Delft Noord - Leidschendam leidsenhage</Name>
<ShortName>19</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>19</PublicCode>
<PrivateCode type="LinePlanningNumber">19</PrivateCode>
Expand All @@ -18945,6 +18956,7 @@
</Line>
<Line id="HTM:Line:9" version="any" responsibilitySetRef="HTM:ResponsibilitySet:HGL-R">
<Name> Vrederust -Scheveningen Noorderstrand</Name>
<ShortName>9</ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>9</PublicCode>
<PrivateCode type="LinePlanningNumber">9</PrivateCode>
Expand Down
2 changes: 1 addition & 1 deletion xml/NeTEx_test_centraal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- Historie: -->
<!-- v20201116 (nov.2020) concept (klad)versie -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.netex.org.uk/netex ../xsd/netex-nl-geen-constraints.xsd" version="ntx:1.1">
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.netex.org.uk/netex ..\xsd\netex-nl-geen-constraints.xsd" version="ntx:1.1">
<PublicationTimestamp>2020-11-16T18:00:00Z</PublicationTimestamp>
<ParticipantRef>BISON</ParticipantRef>
<Description>Export van de (door BISON en DOVA) voorgedefinieerde gegevens t.b.v. het NL NeTEx Profiel.</Description>
Expand Down
11 changes: 3 additions & 8 deletions xsd/gml-bison.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Dit bestand is onderdeel van de XML Schema definitie van het NL NeTEx profiel: -->
<!-- * type definities van GML elementen -->
<!-- -->
<!-- Copyright: -->
<!-- Dit document is eigendom van Platform BISON onder Samenwerkingsverband DOVA -->
<!-- en wordt gepubliceerd onder de Creative Commons Licentie by-nd/3.0/nl, -->
<!-- zie http://creativecommons.org/licences/by-nd/3.0/nl -->
<!-- Dit bestand is onderdeel van het TMI9 NeTEx Nederlands profiel -->
<!-- Versie: 9.1.0 -->
<!-- Historie: -->
<!-- v9.0.0 (april 2017): initiele versie -->
<!-- v9.1.0 (oktober 2018) -->
<!-- v9.1.0a (januari 2020) copyright aangepast -->
<!-- v9.2.0 (nov.2020) (ongewijzigd) -->
<!-- v9.2.1 (feb.2021) (ongewijzigd) -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="9.2.1" id="gml-bison">
<attribute name="id" type="ID"/>
Expand Down
20 changes: 14 additions & 6 deletions xsd/netex-nl-basic.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Dit bestand is onderdeel van de XML Schema definitie van het NL NeTEx profiel: -->
<!-- * basale type definities -->
<!-- * abstracte type definities -->
<!-- * type definities van referenties -->
<!-- * type definities van ondersteunende elementen -->
<!-- * uitbreidingen op de NeTEx standaard -->
<!-- -->
<!-- Copyright: -->
<!-- Dit document is eigendom van Platform BISON onder Samenwerkingsverband DOVA -->
<!-- en wordt gepubliceerd onder de Creative Commons Licentie by-nd/3.0/nl, -->
<!-- zie http://creativecommons.org/licences/by-nd/3.0/nl -->
<!-- Dit bestand is onderdeel van het TMI9 Nederlands NeTEx profiel -->
<!-- Historie: -->
<!-- v9.2.0 (nov.2020) initiele versie (afgesplitst van netex-nl.xsd) -->
<!-- v9.2.0a (dec.2020) naamgeving hulpstructuren dichter bij NeTEx origineel -->
<!-- v9.2.1 (mrt.2021) voertuigkenmerken en voertuigen -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="qualified" version="9.2.1" id="netex-nl-basic">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Expand Down Expand Up @@ -47,15 +49,21 @@
<xsd:restriction base="xsd:decimal"/>
</xsd:simpleType>
<xsd:simpleType name="PhoneType">
<xsd:annotation>
<xsd:documentation>Telefoonnummer, bijvoorbeeld van de vorm (+31)1234567890.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString"/>
</xsd:simpleType>
<xsd:simpleType name="EmailAddressType">
<xsd:annotation>
<xsd:documentation>Email adres van de vorm a@b.</xsd:documentation>
<xsd:documentation>E-mailadres van de vorm a@b.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString"/>
</xsd:simpleType>
<xsd:simpleType name="ColourValueType">
<xsd:annotation>
<xsd:documentation>Kleurcode van de vorm RRGGBB.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:hexBinary">
<xsd:maxLength value="6"/>
</xsd:restriction>
Expand Down
15 changes: 7 additions & 8 deletions xsd/netex-nl-data.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Dit bestand is onderdeel van de XML Schema definitie van het NL NeTEx profiel: -->
<!-- * type definities van functionele elementen -->
<!-- * type definities van ondersteunende elementen -->
<!-- -->
<!-- Copyright: -->
<!-- Dit document is eigendom van Platform BISON onder Samenwerkingsverband DOVA -->
<!-- en wordt gepubliceerd onder de Creative Commons Licentie by-nd/3.0/nl, -->
<!-- zie http://creativecommons.org/licences/by-nd/3.0/nl -->
<!-- Dit bestand is onderdeel van het TMI9 Nederlands NeTEx profiel -->
<!-- Historie: -->
<!-- v9.2.0 (nov.2020) initiele versie (afgesplitst van netex-nl.xsd) -->
<!-- v9.2.0a (dec.2020) naamgeving hulpstructuren dichter bij NeTEx origineel -->
<!-- VehicleType aangepast aan nieuwste NeTEx v2.1 -->
<!-- v9.2.0b (mrt.2021) correctie Route: DirectionType, pointsInSequence verplicht -->
<!-- v9.2.1 (mrt.2021) voertuigkenmerken en voertuigen -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="qualified" version="9.2.1" id="netex-nl-data">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Expand Down Expand Up @@ -504,7 +501,7 @@ Bij een Version is attribuut 'version' verplicht. De waarde is gelijk aan attrib
<xsd:complexContent>
<xsd:extension base="DataManagedObjectStructure">
<xsd:sequence>
<xsd:element name="MobilityImpairedAccess" type="LimitationStatusEnumeration" minOccurs="0"/>
<xsd:element name="MobilityImpairedAccess" type="LimitationStatusEnumeration"/>
<xsd:element name="Comment" type="MultilingualString" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
Expand All @@ -516,6 +513,8 @@ Bij een Version is attribuut 'version' verplicht. De waarde is gelijk aan attrib
<xsd:sequence>
<xsd:element name="BrandingRef" type="VersionOfObjectRefStructure" minOccurs="0"/>
<xsd:element name="Name" type="MultilingualString"/>
<xsd:element name="ShortName" type="MultilingualString" minOccurs="0"/>
<xsd:element name="Description" type="MultilingualString" minOccurs="0"/>
<xsd:element name="TransportMode" type="TransportmodeEnum"/>
<xsd:element name="TransportSubmode" type="PtSubmodeChoice" minOccurs="0"/>
<xsd:element name="PublicCode" type="xsd:normalizedString"/>
Expand Down
11 changes: 5 additions & 6 deletions xsd/netex-nl-enums.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Dit bestand is onderdeel van de XML Schema definitie van het NL NeTEx profiel: -->
<!-- * enumeraties -->
<!-- * type definities van ValueSets -->
<!-- -->
<!-- Copyright: -->
<!-- Dit document is eigendom van Platform BISON onder Samenwerkingsverband DOVA -->
<!-- en wordt gepubliceerd onder de Creative Commons Licentie by-nd/3.0/nl, -->
<!-- zie http://creativecommons.org/licences/by-nd/3.0/nl -->
<!-- Dit bestand is onderdeel van het TMI9 Nederlands NeTEx profiel -->
<!-- Historie: -->
<!-- v9.2.0 (nov.2020) initiele versie (afgesplitst van netex-nl.xsd) -->
<!-- v9.2.0a (dec.2020) naamgeving hulpstructuren dichter bij NeTEx origineel -->
<!-- v9.2.1 (mrt.2021) voertuigkenmerken en voertuigen -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="qualified" version="9.2.1" id="netex-nl-enums">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Expand Down Expand Up @@ -158,7 +157,7 @@
<xsd:complexType name="PtSubmodeChoice">
<xsd:choice>
<xsd:element name="BusSubmode" type="BusSubmodeEnumeration" default="unknown"/>
<xsd:element name="CoachSubmode" type="CoachSubmodeEnumeration"/>
<xsd:element name="CoachSubmode" type="CoachSubmodeEnumeration" default="unknown"/>
<xsd:element name="MetroSubmode" type="MetroSubmodeEnumeration" default="unknown"/>
<xsd:element name="TramSubmode" type="TramSubmodeEnumeration" default="unknown"/>
<xsd:element name="RailSubmode" type="RailSubmodeEnumeration" default="unknown"/>
Expand Down
Loading

0 comments on commit 884320a

Please sign in to comment.