Skip to content

Commit

Permalink
Proposal for URI with an object reference. (#291)
Browse files Browse the repository at this point in the history 
* Proposal for URI with an object reference.

* Update test-01-main.xml

Small cleanup

* Lint and update documentation tables

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@skinkie @github-actions
skinkie and github-actions[bot] authored Nov 21, 2023
1 parent 80abd49 commit 45c03d3
Show file tree
Hide file tree
Showing 3 changed files with 181 additions and 0 deletions.
122 changes: 122 additions & 0 deletions examples/functions/relations/test-01-main.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" version="ntx:1.1">
<PublicationTimestamp>2022-01-11T16:04:26</PublicationTimestamp>
<ParticipantRef>DK</ParticipantRef>
<PublicationRequest>
<RequestTimestamp>2022-01-11T16:04:26</RequestTimestamp>
<topics>
<NetworkFrameTopic>
<Current/>
<NetworkFilterByValue>
<objectReferences>
<TypeOfFrameRef ref="epip:EU_PI_LINE_OFFER" versionRef="1.0"/>
<LineRef ref="DK::Line:25294::" version="1641913466"/>
</objectReferences>
</NetworkFilterByValue>
</NetworkFrameTopic>
</topics>
</PublicationRequest>
<dataObjects>
<CompositeFrame id="DK::CompositeFrame_EU_PI_LINE_OFFER:AR-000087-021" version="1641913466">
<ValidBetween>
<FromDate>2022-01-11T00:00:00</FromDate>
<ToDate>2022-03-30T00:00:00</ToDate>
</ValidBetween>
<TypeOfFrameRef ref="epip:EU_PI_LINE_OFFER" versionRef="1.0"/>
<codespaces>
<Codespace id="epip_data">
<Xmlns>epd</Xmlns>
<XmlnsUrl>http://netex-cen.eu/epip_data</XmlnsUrl>
<Description>EPIP data</Description>
</Codespace>
</codespaces>
<FrameDefaults>
<DefaultCodespaceRef ref="epip_data"/>
<DefaultDataSourceRef ref="epip_data:DataSource:General"/>
<DefaultResponsibilitySetRef ref="DK::ResponsibilitySet:120::" version="1641913466"/>
<DefaultLocale>
<TimeZone>Europe/Berlin</TimeZone>
<DefaultLanguage>ENGLISH-US</DefaultLanguage>
</DefaultLocale>
<DefaultLocationSystem>urn:ogc:def:crs:EPSG::4326</DefaultLocationSystem>
</FrameDefaults>
<frames>
<ResourceFrame id="DK::ResourceFrame_EU_PI_COMMON:AR-000087-021" version="1641913466">
<TypeOfFrameRef ref="epip:EU_PI_COMMON" versionRef="1.0"/>
<dataSources>
<DataSource id="epip_data:DataSource:General" version="1641913466">
<Name>DK</Name>
</DataSource>
</dataSources>
<responsibilitySets>
<ResponsibilitySet id="DK::ResponsibilitySet:120::" version="1641913466">
<roles>
<ResponsibilityRoleAssignment id="DK::ResponsibilityRoleAssignment:120::" version="1641913466">
<DataRoleType>creates</DataRoleType>
<ResponsibleOrganisationRef ref="DK::Authority:516::" version="1641913466"/>
</ResponsibilityRoleAssignment>
</roles>
</ResponsibilitySet>
</responsibilitySets>
<organisations>
<Authority id="DK::Authority:516::" version="1641913466">
<PublicCode>AR</PublicCode>
<Name>Arriva</Name>
<ShortName>AR</ShortName>
<LegalName>Arriva</LegalName>
<ContactDetails>
<Phone>+45 70277482</Phone>
</ContactDetails>
<OrganisationType>authority</OrganisationType>
<Address id="DK::Address:240::" version="1641913466"/>
</Authority>
<Operator id="DK::Operator:306::" version="1641913466">
<PublicCode>Arriva</PublicCode>
<Name>Arriva tog</Name>
<ShortName>Arriva</ShortName>
<LegalName>Arriva tog</LegalName>
<ContactDetails>
<Url>http://www.mitarriva.dk</Url>
</ContactDetails>
<OrganisationType>operator</OrganisationType>
<Address id="DK::Address:241::" version="1641913466"/>
</Operator>
</organisations>
</ResourceFrame>
<ServiceCalendarFrame id="DK::ServiceCalendarFrame_EU_PI_CALENDAR:AR-000087-021" version="1641913466">
<TypeOfFrameRef ref="epip:EU_PI_CALENDAR" versionRef="1.0"/>
<ServiceCalendar id="DK::ServiceCalendar:120::" version="1641913466">
<FromDate>2022-01-11</FromDate>
<ToDate>2022-03-30</ToDate>
</ServiceCalendar>
</ServiceCalendarFrame>
<ServiceFrame id="DK::ServiceFrame_EU_PI_NETWORK:AR-000087-021" version="1641913466">
<TypeOfFrameRef ref="epip:EU_PI_NETWORK" versionRef="1.0"/>
<lines>
<Line id="DK::Line:25294::" version="1641913466">
<Name>Arriva</Name>
<ShortName>021</ShortName>
<TransportMode>bus</TransportMode>
<PublicCode>Arriva</PublicCode>
<PrivateCode>021</PrivateCode>
<AuthorityRef ref="DK::Authority:516::" version="1641913466"/>
<additionalOperators>
<OperatorRef ref="DK::Operator:306::" version="1641913466"/>
</additionalOperators>
</Line>
</lines>
</ServiceFrame>
<SiteFrame id="DK::SiteFrame_EU_PI_STOP:AR-000087-021" version="1641913466">
<TypeOfFrameRef ref="epip:EU_PI_STOP" versionRef="1.0"/>
</SiteFrame>
<TimetableFrame id="DK::TimetableFrame_EU_PI_TIMETABLE:AR-000087-021" version="1641913466">
<TypeOfFrameRef ref="epip:EU_PI_TIMETABLE" versionRef="1.0"/>
<prerequisites>
<ServiceFrameRef ref="DK::ServiceFrame_EU_PI_NETWORK:AR-000087-021" version="1641913466"/>
<ServiceCalendarFrameRef ref="DK::ServiceCalendarFrame_EU_PI_CALENDAR:AR-000087-021" version="1641913466"/>
</prerequisites>
</TimetableFrame>
</frames>
</CompositeFrame>
</dataObjects>
</PublicationDelivery>
54 changes: 54 additions & 0 deletions examples/functions/relations/test-01-timetable.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" version="ntx:1.1">
<PublicationTimestamp>2022-01-11T16:04:26</PublicationTimestamp>
<ParticipantRef>DK</ParticipantRef>
<PublicationRequest>
<RequestTimestamp>2022-01-11T16:04:26</RequestTimestamp>
<topics>
<NetworkFrameTopic>
<Current/>
<NetworkFilterByValue>
<objectReferences>
<TypeOfFrameRef ref="epip:EU_PI_LINE_OFFER" versionRef="1.0"/>
<LineRef ref="DK::Line:25294::" version="1641913466"/>
</objectReferences>
</NetworkFilterByValue>
</NetworkFrameTopic>
</topics>
</PublicationRequest>
<dataObjects>
<CompositeFrame id="DK::CompositeFrame_EU_PI_LINE_OFFER:AR-000087-021" version="1641913466">
<ValidBetween>
<FromDate>2022-01-11T00:00:00</FromDate>
<ToDate>2022-03-30T00:00:00</ToDate>
</ValidBetween>
<TypeOfFrameRef ref="epip:EU_PI_LINE_OFFER" versionRef="1.0"/>
<codespaces>
<Codespace id="epip_data">
<Xmlns>epd</Xmlns>
<XmlnsUrl>http://netex-cen.eu/epip_data</XmlnsUrl>
<Description>EPIP data</Description>
</Codespace>
</codespaces>
<FrameDefaults>
<DefaultCodespaceRef ref="epip_data"/>
<DefaultDataSourceRef ref="epip_data:DataSource:General"/>
<DefaultResponsibilitySetRef ref="DK::ResponsibilitySet:120::" version="1641913466"/>
<DefaultLocale>
<TimeZone>Europe/Berlin</TimeZone>
<DefaultLanguage>ENGLISH-US</DefaultLanguage>
</DefaultLocale>
<DefaultLocationSystem>urn:ogc:def:crs:EPSG::4326</DefaultLocationSystem>
</FrameDefaults>
<frames>
<TimetableFrame id="DK::TimetableFrame_EU_PI_TIMETABLE:AR-000087-021" version="1641913466">
<TypeOfFrameRef ref="epip:EU_PI_TIMETABLE" versionRef="1.0"/>
<prerequisites>
<ServiceFrameRef ref="DK::ServiceFrame_EU_PI_NETWORK:AR-000087-021" versionRef="1641913466" uri="test-01-main.xml"/>
<ServiceCalendarFrameRef ref="DK::ServiceCalendarFrame_EU_PI_CALENDAR:AR-000087-021" versionRef="1641913466" uri="test-01-main.xml"/>
</prerequisites>
</TimetableFrame>
</frames>
</CompositeFrame>
</dataObjects>
</PublicationDelivery>
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
<xsd:annotation>
<xsd:documentation>Location of the external entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
Expand Down

0 comments on commit 45c03d3

Please sign in to comment.