Skip to content

Commit

Permalink
Aanpassingen voor v9.2.3 (NL flex Profiel)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hennoit
hennoit committed Jul 2, 2021
2 parents 44fa2e1 + 7a08d83 commit 596234e
Show file tree
Hide file tree
Showing 12 changed files with 2,567 additions and 125 deletions.
5 changes: 5 additions & 0 deletions Wijzigingsoverzicht.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Nederlands NeTEx Profiel

De documentatie is te vinden op de [BISON website](http://bison.dova.nu/standaarden/netex-nl).

Het XSD en evt. voorbeelden staan hier op github - zoek de juiste [release](http://github.com/BISONNL/NeTEx-NL/releases)!
26 changes: 13 additions & 13 deletions xml/NeTEx_HTM_test_20210301.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>HTM Dutch NeTEx export.</Description>
<dataObjects>
<CompositeFrame id="HTM:CompositeFrame:Timetable" version="_2021-03-01">
<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:HTM"/>
<DefaultDataSourceRef ref="HTM:DataSource:HTM"/>
Expand All @@ -26,8 +26,8 @@
</Version>
</versions>
<frames>
<ResourceFrame id="HTM:ResourceFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.2"/>
<ResourceFrame id="HTM:ResourceFrame:RF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.3"/>
<dataSources>
<DataSource id="HTM:DataSource:HTM">
<Name>HTM</Name>
Expand Down Expand Up @@ -339,12 +339,12 @@
</zones>
</ResourceFrame>
<!--
<InfrastructureFrame id="HTM:InfrastructureFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_INFRA" version="9.2.2"/>
<InfrastructureFrame id="HTM:InfrastructureFrame:IF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_INFRA" version="9.2.3"/>
</InfrastructureFrame>
-->
<ServiceFrame id="HTM:ServiceFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.2"/>
<ServiceFrame id="HTM:ServiceFrame:SF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.3"/>
<routePoints>
<RoutePoint id="HTM:RoutePoint:R1701">
<Location>
Expand Down Expand Up @@ -89344,8 +89344,8 @@
</TimeDemandType>
</timeDemandTypes>
</ServiceFrame>
<TimetableFrame id="HTM:TimetableFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.2"/>
<TimetableFrame id="HTM:TimetableFrame:TF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.3"/>
<contentValidityConditions>
<AvailabilityCondition id="HTM:AvailabilityCondition:129681">
<FromDate>2020-11-11T00:00:00Z</FromDate>
Expand Down Expand Up @@ -126006,8 +126006,8 @@
</DeadRun>
</vehicleJourneys>
</TimetableFrame>
<ServiceCalendarFrame id="HTM:ServiceCalendarFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.2"/>
<ServiceCalendarFrame id="HTM:ServiceCalendarFrame:SCF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.3"/>
<dayTypes>
<DayType id="HTM:DayType:12345">
<Name>ST0</Name>
Expand Down Expand Up @@ -126063,8 +126063,8 @@
</DayTypeAssignment>
</dayTypeAssignments>
</ServiceCalendarFrame>
<VehicleScheduleFrame id="HTM:VehicleScheduleFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_VEHICLE" version="9.2.2"/>
<VehicleScheduleFrame id="HTM:VehicleScheduleFrame:VSF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_VEHICLE" version="9.2.3"/>
<blocks>
<Block id="HTM:Block:129089:301">
<Name>301</Name>
Expand Down
88 changes: 44 additions & 44 deletions xml/NeTEx_HTM_test_20210301_met_general.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>HTM Dutch NeTEx export.</Description>
<dataObjects>
<CompositeFrame id="HTM:CompositeFrame:Timetable" version="_2021-03-01">
<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:HTM"/>
<DefaultDataSourceRef ref="HTM:DataSource:HTM"/>
Expand All @@ -26,8 +26,8 @@
</Version>
</versions>
<frames>
<ResourceFrame id="HTM:ResourceFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.2"/>
<ResourceFrame id="HTM:ResourceFrame:RF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.3"/>
<dataSources>
<DataSource id="HTM:DataSource:HTM" version="any">
<Name>HTM</Name>
Expand Down Expand Up @@ -337,12 +337,12 @@
</zones>
</ResourceFrame>
<!--
<InfrastructureFrame id="HTM:InfrastructureFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_INFRA" version="9.2.2"/>
<InfrastructureFrame id="HTM:InfrastructureFrame:IF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_INFRA" version="9.2.3"/>
</InfrastructureFrame>
-->
<ServiceFrame id="HTM:ServiceFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.2"/>
<ServiceFrame id="HTM:ServiceFrame:SF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.3"/>
<routePoints>
<RoutePoint id="HTM:RoutePoint:R1701" version="any">
<Location>
Expand Down Expand Up @@ -89342,8 +89342,8 @@
</TimeDemandType>
</timeDemandTypes>
</ServiceFrame>
<TimetableFrame id="HTM:TimetableFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.2"/>
<TimetableFrame id="HTM:TimetableFrame:TF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.3"/>
<contentValidityConditions>
<AvailabilityCondition id="HTM:AvailabilityCondition:129681" version="any">
<FromDate>2020-11-11T00:00:00Z</FromDate>
Expand Down Expand Up @@ -126004,8 +126004,8 @@
</DeadRun>
</vehicleJourneys>
</TimetableFrame>
<ServiceCalendarFrame id="HTM:ServiceCalendarFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.2"/>
<ServiceCalendarFrame id="HTM:ServiceCalendarFrame:SCF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.3"/>
<dayTypes>
<DayType id="HTM:DayType:12345" version="any">
<Name>ST0</Name>
Expand Down Expand Up @@ -126061,8 +126061,8 @@
</DayTypeAssignment>
</dayTypeAssignments>
</ServiceCalendarFrame>
<VehicleScheduleFrame id="HTM:VehicleScheduleFrame:" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_VEHICLE" version="9.2.2"/>
<VehicleScheduleFrame id="HTM:VehicleScheduleFrame:VSF" version="_2021-03-01">
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TT_VEHICLE" version="9.2.3"/>
<blocks>
<Block id="HTM:Block:129089:301" version="any">
<Name>301</Name>
Expand Down Expand Up @@ -130716,7 +130716,7 @@
</CompositeFrame>
<CompositeFrame id="HTM:CompositeFrame:PredefinedCodespaces" version="20201116">
<Description>Kopie van de door BISON vastgestelde domeinen.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_CODESPACES" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_CODESPACES" version="9.2.3"/>
<codespaces>
<Codespace id="BISON:Codespace:EPSG">
<Xmlns>EPSG</Xmlns>
Expand Down Expand Up @@ -130750,14 +130750,14 @@
</CompositeFrame>
<CompositeFrame id="HTM:CompositeFrame:PredefinedEnumerations" version="20201116">
<Description>Kopie van de door BISON vastgestelde enumeraties.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_BISON_ENUMS" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_BISON_ENUMS" version="9.2.3"/>
<FrameDefaults>
<DefaultCodespaceRef ref="BISON:Codespace:BISON"/>
</FrameDefaults>
<frames>
<GeneralFrame id="HTM:GeneralFrame:Predefined_TypeOfService" version="20201116">
<Description>Kopie van de BISON enumeratie met voorgedefinieerde formules (lijnkenmerken).</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TypeOfServiceValues" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TypeOfServiceValues" version="9.2.3"/>
<members>
<ValueSet id="HTM:ValueSet:TypeOfService" version="20201116">
<values>
Expand All @@ -130771,7 +130771,7 @@
</GeneralFrame>
<GeneralFrame id="HTM:GeneralFrame:Predefined_Technical" version="20201116">
<Description>Kopie van de BISON enumeratie met voorgedefinieerde technische enumeraties.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TechnicalEnumerations" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TechnicalEnumerations" version="9.2.3"/>
<members>
<ValueSet id="HTM:ValueSet:DisplayTextLength" version="20201116">
<values>
Expand Down Expand Up @@ -130800,76 +130800,76 @@
<Description>Financieren van het OV</Description>
</TypeOfResponsibilityRole>
<!--
<TypeOfResponsibilityRole id="BISON:TypeOfResponsibilityRole:partition" version="any">
<Name>Partition</Name>
<Description>Partitie van de gegevenslevering</Description>
</TypeOfResponsibilityRole>
<TypeOfResponsibilityRole id="BISON:TypeOfResponsibilityRole:network" version="any">
<Name>Network</Name>
<Description>OV-concessie</Description>
</TypeOfResponsibilityRole>
<TypeOfResponsibilityRole id="BISON:TypeOfResponsibilityRole:partition" version="any">
<Name>Partition</Name>
<Description>Partitie van de gegevenslevering</Description>
</TypeOfResponsibilityRole>
<TypeOfResponsibilityRole id="BISON:TypeOfResponsibilityRole:network" version="any">
<Name>Network</Name>
<Description>OV-concessie</Description>
</TypeOfResponsibilityRole>
-->
</values>
</ValueSet>
<ValueSet id="HTM:ValueSet:TypeOfFrame" version="20201116">
<values>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_BASELINE" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_BASELINE" version="9.2.3">
<Name>Baseline composite frame</Name>
<Description>Composite frame met een 'baseline' (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_RESOURCE" version="9.2.3">
<Name>Resource frame</Name>
<Description>Resource frame (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_INFRA" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_INFRA" version="9.2.3">
<Name>Infrastructure frame</Name>
<Description>Infrastructure frame (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_SERVICE" version="9.2.3">
<Name>Service frame</Name>
<Description>Service frame (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_TIMETABLE" version="9.2.3">
<Name>Timetable frame</Name>
<Description>Timetable frame (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_CALENDAR" version="9.2.3">
<Name>ServiceCalendar frame</Name>
<Description>ServiceCalendar frame (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_VEHICLE" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TT_VEHICLE" version="9.2.3">
<Name>VehicleSchedule frame</Name>
<Description>VehicleSchedule frame (NL dienstregeling Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_CODESPACES" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_CODESPACES" version="9.2.3">
<Name>Codespace composite frame</Name>
<Description>Composite frame met de domeinen (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_BISON_ENUMS" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_BISON_ENUMS" version="9.2.3">
<Name>BISON composite frame</Name>
<Description>Composite frame met de BISON standaardenumeraties (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TypeOfServiceValues" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TypeOfServiceValues" version="9.2.3">
<Name>TypeOfService frame</Name>
<Description>Frame met de TypeOfService standaardenumeratie (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TechnicalEnumerations" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TechnicalEnumerations" version="9.2.3">
<Name>TechnicalValues frame</Name>
<Description>Frame met de technische standaardenumeraties (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_DOVA_LISTS" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_DOVA_LISTS" version="9.2.3">
<Name>DOVA composite frame</Name>
<Description>Composite frame met de DOVA lijsten (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_TariffZoneList" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_TariffZoneList" version="9.2.3">
<Name>TariffZones frame</Name>
<Description>Frame met de DOVA lijst van OV-zones (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_AuthorityList" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_AuthorityList" version="9.2.3">
<Name>Authorities frame</Name>
<Description>Frame met de DOVA lijst van concessieverleners (NL centraal Profiel)</Description>
</TypeOfFrame>
<TypeOfFrame id="BISON:TypeOfFrame:NL_NetworkList" version="9.2.2">
<TypeOfFrame id="BISON:TypeOfFrame:NL_NetworkList" version="9.2.3">
<Name>Networks frame</Name>
<Description>Frame met de DOVA lijst van concessies (NL centraal Profiel)</Description>
</TypeOfFrame>
Expand All @@ -130881,14 +130881,14 @@
</CompositeFrame>
<CompositeFrame id="HTM:CompositeFrame:PredefinedLists" version="20201116">
<Description>Kopie van de door DOVA 'centraal' bijgehouden lijsten.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_DOVA_LISTS" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_DOVA_LISTS" version="9.2.3"/>
<FrameDefaults>
<DefaultCodespaceRef ref="BISON:Codespace:DOVA"/>
</FrameDefaults>
<frames>
<GeneralFrame id="HTM:GeneralFrame:OvZones" version="20201116">
<Description>Kopie van voorgedefinieerde identificaties van OV-zones.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TariffZoneList" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_TariffZoneList" version="9.2.3"/>
<members>
<TariffZone id="DOVA:TariffZone:5400" version="any">
<Name>zone 5400</Name>
Expand Down Expand Up @@ -130938,7 +130938,7 @@
</GeneralFrame>
<GeneralFrame id="HTM:GeneralFrame:ConcessieVerleners" version="20201116">
<Description>Kopie van voorgedefinieerde identificaties van concessieverleners.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_AuthorityList" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_AuthorityList" version="9.2.3"/>
<members>
<Authority id="DOVA:Authority:MRDH" version="any">
<Name>Metropoolregio Rotterdam Den Haag</Name>
Expand All @@ -130949,7 +130949,7 @@
</GeneralFrame>
<GeneralFrame id="HTM:GeneralFrame:Concessies" version="20201116">
<Description>Kopie van voorgedefinieerde identificaties van concessies.</Description>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_NetworkList" version="9.2.2"/>
<TypeOfFrameRef ref="BISON:TypeOfFrame:NL_NetworkList" version="9.2.3"/>
<members>
<Network id="DOVA:Network:HGL-R" version="any">
<Name>Rail Haaglanden</Name>
Expand Down
Loading

0 comments on commit 596234e

Please sign in to comment.