Skip to content

Commit

Permalink
Aanpassingen tbv NL flex Profiel
Browse files Browse the repository at this point in the history
  • Loading branch information
@hennoit
hennoit committed Apr 15, 2021
1 parent 1d4403b commit 7a08d83
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 97 deletions.
43 changes: 16 additions & 27 deletions xml/NeTEx_PVGD_test_20200603_hwi_v2.xml → xml/NeTEx_PVGD_test_20200603_hwi_v3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Example-implementation for simple flexible line with unrestricted transport with
<Description>Hubtaxi</Description>
<dataObjects>
<CompositeFrame id="PVGD:CompositeFrame:Hubtaxi" version="20200603">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_BASELINE" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_BASELINE" version="9.2.3"/>
<FrameDefaults>
<DefaultCodespaceRef ref="BISON:Codespace:PVGD"/>
<DefaultDataSourceRef ref="PVGD:DataSource:PVGD"/>
Expand All @@ -30,7 +30,7 @@ Example-implementation for simple flexible line with unrestricted transport with
</versions>
<frames>
<ResourceFrame id="PVGD:ResourceFrame:PVGD" version="20200603">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.3"/>
<dataSources>
<DataSource id="PVGD:DataSource:PVGD">
<Name>PVGD</Name>
Expand Down Expand Up @@ -130,7 +130,7 @@ Example-implementation for simple flexible line with unrestricted transport with
</zones>
</ResourceFrame>
<SiteFrame id="PVGD:SiteFrame:PVGD" version="20200603">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SITE" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SITE" version="9.2.3"/>
<flexibleStopPlaces>
<FlexibleStopPlace id="PVGD:FlexibleStopPlace:Region_11">
<Name>Oost-Groningen</Name>
Expand Down Expand Up @@ -275,7 +275,7 @@ Example-implementation for simple flexible line with unrestricted transport with
</flexibleStopPlaces>
</SiteFrame>
<ServiceFrame id="PVGD:ServiceFrame:Region_11" version="20200603">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.3"/>
<FrameDefaults>
<DefaultResponsibilitySetRef ref="PVGD:ResponsibilitySet:financier"/>
</FrameDefaults>
Expand Down Expand Up @@ -689,7 +689,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>0 0</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:Region_11"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -699,7 +698,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>253891 575747</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:12650210"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -709,7 +707,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>247530 575695</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:12601010"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -719,7 +716,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>255343 569689</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:12631690"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -729,7 +725,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>265447 573750</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:13000010"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -739,7 +734,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>261391 576659</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:13020110"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -749,7 +743,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>263362 569949</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:13501410"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -759,7 +752,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>253798 585785</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:12582910"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -769,7 +761,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>260370 556693</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:12700010"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -779,7 +770,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>267798 544443</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:18730100"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -789,7 +779,6 @@ Example-implementation for simple flexible line with unrestricted transport with
<gml:pos>270450 561470</gml:pos>
</Location>
<projections><PointProjection id="PVGD:PointProjection:Region_11"><ProjectToPointRef nameOfRefClass="RoutePoint" ref="PVGD:RoutePoint:13382410"/></PointProjection></projections>
<PrivateCode type="UserStopCode">dummy</PrivateCode>
<ForAlighting>true</ForAlighting>
<ForBoarding>true</ForBoarding>
</ScheduledStopPoint>
Expand All @@ -801,43 +790,43 @@ Example-implementation for simple flexible line with unrestricted transport with
</FlexibleStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_12650210" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:12650210"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:12650210" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:12650210" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_12601010" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:12601010"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:12601010" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:12601010" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_12631690" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:12631690"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:12631690" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:12631690" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_13000010" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:13000010"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:13000010" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:13000010" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_13020110" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:13020110"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:13020110" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:13020110" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_13501410" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:13501410"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:13501410" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:13501410" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_12582910" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:12582910"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:12582910" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:12582910" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_12700010" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:12700010"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:12700010" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:12700010" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_18730100" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:18730100"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:18730100" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:18730100" version="any"/>
</PassengerStopAssignment>
<PassengerStopAssignment id="PVGD:PassengerStopAssignment:Region_11_13382410" order="1">
<ScheduledStopPointRef ref="PVGD:ScheduledStopPoint:13382410"/>
<StopPlaceRef ref="NL:NDOV:StopPlace:NL:S:13382410" version="CHB20200513"/>
<StopPlaceRef ref="CHB:StopPlace:13382410" version="any"/>
</PassengerStopAssignment>
</stopAssignments>
<timingLinks>
Expand Down Expand Up @@ -1472,7 +1461,7 @@ Example-implementation for simple flexible line with unrestricted transport with
</timeDemandTypes>
</ServiceFrame>
<TimetableFrame id="PVGD:TimetableFrame:Region_11" version="20200603">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.3"/>
<contentValidityConditions>
<AvailabilityCondition id="PVGD:AvailabilityCondition:AllDays_11">
<FromDate>2020-06-03T00:00:00</FromDate>
Expand Down Expand Up @@ -1883,7 +1872,7 @@ Example-implementation for simple flexible line with unrestricted transport with
</frequencyGroups>
</TimetableFrame>
<ServiceCalendarFrame id="PVGD:ServiceCalendarFrame:PVGD" version="20200603">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.3"/>
<dayTypes>
<DayType id="PVGD:DayType:EveryDay">
<properties>
Expand Down
13 changes: 4 additions & 9 deletions xsd/gml-bison.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
<?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 -->
<!-- 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) -->
<!-- v9.2.2 (apr.2021) toevoegen flexvervoer -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<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.2" id="gml-bison">
<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.3" id="gml-bison">
<attribute name="id" type="ID"/>
<element name="pos">
<complexType>
Expand Down
20 changes: 13 additions & 7 deletions xsd/netex-nl-basic.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?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 -->
<!-- v9.2.2 (apr.2021) toevoegen flexvervoer -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<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.2" id="netex-nl-basic">
<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.3" id="netex-nl-basic">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- AFHANKELIJKHEDEN -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Expand Down Expand Up @@ -123,6 +124,9 @@ bestandtypes jpg, jpeg, gif, png, svg (hoofdletters of kleine letters, geen comb
<xsd:documentation>Het object hoeft géén 'id' of 'version' attribuut, omdat het altijd embedded is in een ander object.</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id" type="ObjectIdType" use="optional" form="unqualified"/>
<!--
<xsd:attribute name="version" type="VersionIdType" use="optional" default="any" form="unqualified"/>
-->
</xsd:complexType>
<xsd:complexType name="SimpleObjectStructure">
<xsd:annotation>
Expand Down Expand Up @@ -317,6 +321,7 @@ De TypeOfFrame standaardenumeraties hebben een expliciete 'version', nl. de vers
</xsd:element>
</xsd:sequence>
</xsd:complexType>
<!--
<xsd:complexType name="extensionFlexParameters">
<xsd:sequence>
<xsd:element name="MaxDetourFactor" type="xsd:duration"/>
Expand All @@ -325,6 +330,7 @@ De TypeOfFrame standaardenumeraties hebben een expliciete 'version', nl. de vers
<xsd:element name="AvgTraveltimeOffset" type="xsd:duration"/>
</xsd:sequence>
</xsd:complexType>
-->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- ELEMENTEN (ONDERSTEUNEND) -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Expand Down
Loading

0 comments on commit 7a08d83

Please sign in to comment.