Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to next 20240502 #721

Merged
merged 14 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/validate-examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e

echo "Validating NeTEx XML examples ..."

if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deckPlans/*.xml examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/deckPlans/*.xml examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
else
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/deckPlans/DeckPlans-Example_train.xml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ The train reverse in the station and departs, oriented backwards to the right
<Description>Example of DeckPlans</Description>
<!-- =============== RESULTS =========== -->
<dataObjects>
<CompositeFrame version="1.0" id="rc:CF-deck_plan_example_rail" dataSourceRef="rc:railco" responsibilitySetRef="rc:RS-service_data">
<CompositeFrame version="1.0" id="rc:CF-deck_plan_example_rail" responsibilitySetRef="rc:RS-service_data">
<ValidBetween>
<FromDate>2023-01-01T00:00:00</FromDate>
<ToDate>2023-12-31T12:00:00</ToDate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<Description>Example of DeckPlans</Description>
<!-- =============== RESULTS =========== -->
<dataObjects>
<CompositeFrame version="1.0" id="rc:CF-deck_plan_example_rail" dataSourceRef="rc:railco" responsibilitySetRef="rc:RS-service_data">
<CompositeFrame version="1.0" id="rc:CF-deck_plan_example_rail" responsibilitySetRef="rc:RS-service_data">
<ValidBetween>
<FromDate>2023-01-01T00:00:00</FromDate>
<ToDate>2023-12-31T12:00:00</ToDate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<CompositeFrame version="1" id="ENT:school_carnet:38" dataSourceRef="ENT:fare_data">
<frames>
<!--==== FRAME DEFAULTS ==== -->
<ResourceFrame id="ENT:1" version="1">
<dataSources>
<DataSource id="ENT:fare_data" version="1"/>
</dataSources>
</ResourceFrame>
<FareFrame id="ENT:1" version="1">
<tariffs>
<Tariff version="1" id="ENT:school_carnet:380">
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/newModes/NewModes-CarClubExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<FrameDefaults>
<!--- The default means that actually we could leave off all id s that belong to the mc: namespace. -->
<DefaultCodespaceRef ref="mc_data"/>
<DefaultDataSourceRef ref="mc:my_car" version="any"/>
<DefaultDataSourceRef ref="mc:my_car" version="1.0"/>
<DefaultCurrency>EUR</DefaultCurrency>
</FrameDefaults>
<frames>
Expand All @@ -76,7 +76,7 @@
</Codespace>
</codespaces>
<dataSources>
<DataSource id="mc:my_car" version="any">
<DataSource id="mc:my_car" version="1.0">
<Email>feedback@mycar.com</Email>
</DataSource>
</dataSources>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/newModes/NewModes-CarPoolingExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
<!--==== FRAME DEFAULTS ==== -->
<FrameDefaults>
<DefaultCodespaceRef ref="ryd_data"/>
<DefaultDataSourceRef ref="rd:ryde" version="any"/>
<DefaultDataSourceRef ref="rd:ryde" version="1.0"/>
<DefaultCurrency>GBP</DefaultCurrency>
</FrameDefaults>
<frames>
Expand All @@ -103,7 +103,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
</Codespace>
</codespaces>
<dataSources>
<DataSource id="rd:ryde" version="any">
<DataSource id="rd:ryde" version="1.0">
<Email>feedback@ryde.eu</Email>
<DataLicenceCode type="SPX" ref="GSCYQ"/>
<DataLicenceUrl>https://opendata.eu/vanilla</DataLicenceUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<!--==== FRAME DEFAULTS ==== -->
<FrameDefaults>
<DefaultCodespaceRef ref="hjm_data"/>
<DefaultDataSourceRef ref="hjm:home_james" version="any"/>
<DefaultDataSourceRef ref="hjm:home_james" version="1.0"/>
<DefaultCurrency>GBP</DefaultCurrency>
</FrameDefaults>
<frames>
Expand All @@ -69,7 +69,7 @@
</Codespace>
</codespaces>
<dataSources>
<DataSource id="hjm:home_james" version="any">
<DataSource id="hjm:home_james" version="1.0">
<Email>feedback@homeJames.eu</Email>
</DataSource>
</dataSources>
Expand Down
88 changes: 62 additions & 26 deletions examples/functions/newModes/NewModes-CycleSharingExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@
Deposit required.
SALES PACKAGES (a) mobile app for preregistered users only.

(C) CEN 2021
Update
2023.01.30 Add AcceptedDriverPermit and VehicleEquipmentProfile examples

(C) CEN 2023
-->
<PublicationTimestamp>2020-12-17T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>SYS001</ParticipantRef>
<!-- ======WHAT WAS REQUESTED ========== -->
<PublicationRequest version="1.0">
<RequestTimestamp>2020-12-17T09:30:46.0Z</RequestTimestamp>
<ParticipantRef>SYS002</ParticipantRef>
<Description>Request for Metrobike 1 tariff</Description>
<Description>Request for Metrobike 1 tariff</Description>
<topics>
<NetworkFrameTopic>
<selectionValidityConditions>
Expand All @@ -54,8 +57,8 @@
<FromDate>2020-01-01T00:00:00</FromDate>
<ToDate>2020-12-31T12:00:00</ToDate>
</ValidBetween>
<Name>Cycle Sharing Example</Name>
<Description>This is an example showing how one might encode a cycle sharings scheme " Metrobike" in NeTEx. It includes some prices.</Description>
<Name>Cycle Sharing Example</Name>
<Description>This is an example showing how one might encode a cycle sharings scheme " Metrobike" in NeTEx. It includes some prices.</Description>
<!--==== CODESPACEs ==== -->
<codespaces>
<CodespaceRef ref="mb_data"/>
Expand All @@ -64,13 +67,13 @@
<FrameDefaults>
<!--- The default means that actually we could leave off all id s that belong to the mb: namespace. -->
<DefaultCodespaceRef ref="mb_data"/>
<DefaultDataSourceRef ref="mb:metrobike" version="any"/>
<DefaultDataSourceRef ref="mb:metrobike" version="1.0"/>
<DefaultCurrency>EUR</DefaultCurrency>
</FrameDefaults>
<frames>
<!--==== OPERATOR COMMON RESOURCES==== -->
<ResourceFrame version="1.0" id="mb:cycle_sharing_example" responsibilitySetRef="mb:network_data">
<Name>Metrobike Operator specific common resources</Name>
<Name>Metrobike Operator specific common resources</Name>
<codespaces>
<Codespace id="mb_data">
<Xmlns>mb</Xmlns>
Expand All @@ -79,7 +82,7 @@
</Codespace>
</codespaces>
<dataSources>
<DataSource id="mb:metrobike" version="any">
<DataSource id="mb:metrobike" version="1.0">
<Email>feedback@metrobike.eu</Email>
</DataSource>
</dataSources>
Expand Down Expand Up @@ -117,12 +120,26 @@
</Branding>
</values>
</ValueSet>
<ValueSet version="any" id="BikeEquip" classOfValues="TypeOfEequipment">
<Name>Bike equimebt</Name>
<ValueSet version="any" id="BikeEquip" classOfValues="TypeOfEquipment">
<Name>Bike equipment</Name>
<values>
<TypeOfEquipment version="any" id="battery">
<Name>Battery</Name>
</TypeOfEquipment>
<TypeOfEquipment version="any" id="charger">
<Name>Charger</Name>
</TypeOfEquipment>
</values>
</ValueSet>
<ValueSet version="any" id="DriverPermits" classOfValues="TypeOfDriverPermit">
<Name>Driving licence types</Name>
<values>
<TypeOfDriverPermit version="any" id="ecycle_permit">
<Name>ecycle</Name>
</TypeOfDriverPermit>
<TypeOfDriverPermit version="any" id="car_permit">
<Name>car</Name>
</TypeOfDriverPermit>
</values>
</ValueSet>
</typesOfValue>
Expand Down Expand Up @@ -224,6 +241,14 @@
<LicenceRequirements>none</LicenceRequirements>
<VehicleCategory>cycle</VehicleCategory>
<MinimumAge>14</MinimumAge>
<acceptedDriverPermits>
<AcceptedDriverPermit version="any" id="electric_cycle@scooter">
<TypeOfDriverPermitRef version="any" ref="ecycle_permit"/>
</AcceptedDriverPermit>
<AcceptedDriverPermit version="any" id="electric_cycle@car">
<TypeOfDriverPermitRef version="any" ref="car_permit"/>
</AcceptedDriverPermit>
</acceptedDriverPermits>
</SimpleVehicleType>
</vehicleTypes>
<vehicleModels>
Expand All @@ -249,7 +274,18 @@
<vehicleEquipmentProfiles>
<VehicleEquipmentProfile version="any" id="ebike">
<Units>2</Units>
<TypeOfEquipmentRef version="any" ref="battery"/>
<vehicleEquipmentProfileMembers>
<VehicleEquipmentProfileMember version="any" id="ebike@battery">
<Name>Batteries</Name>
<MinimumUnits>2</MinimumUnits>
<TypeOfEquipmentRef version="any" ref="battery"/>
</VehicleEquipmentProfileMember>
<VehicleEquipmentProfileMember version="any" id="ebike@charger">
<Name>Charger</Name>
<MinimumUnits>1</MinimumUnits>
<TypeOfEquipmentRef version="any" ref="charger"/>
</VehicleEquipmentProfileMember>
</vehicleEquipmentProfileMembers>
</VehicleEquipmentProfile>
<RechargingEquipmentProfile version="any" id="ebike_charging">
<CouplingType>plug</CouplingType>
Expand Down Expand Up @@ -302,7 +338,7 @@
<Location id="Alphaville">
<Longitude>1.35250</Longitude>
<Latitude>52.44692</Latitude>
<gml:pos srsName="UKOS">376748 167119</gml:pos>
<gml:pos srsName="UKOS">376748 167119</gml:pos>
</Location>
</Centroid>
<Descriptor>
Expand Down Expand Up @@ -464,7 +500,7 @@
<CycleStorageType>docks</CycleStorageType>
</CycleStorageEquipment>
<TicketingEquipment version="any" id="bike_station_beta_B1@rack">
<Name>Ticket Machine at Bike Station Beta</Name>
<Name>Ticket Machine at Bike Station Beta</Name>
<TicketMachines>true</TicketMachines>
<NumberOfMachines>1</NumberOfMachines>
<TicketingFacilityList>ticketMachines</TicketingFacilityList>
Expand Down Expand Up @@ -848,15 +884,15 @@
<Duration>PT45M</Duration>
</TimeInterval>
<TimeInterval version="any" id="metrobike@M45+M90">
<Name>45 - 90 minutes</Name>
<Name>45 - 90 minutes</Name>
<Duration>PT45M</Duration>
</TimeInterval>
<TimeInterval version="any" id="metrobike@M90-eachM60">
<Name>90 - 600 minutes, per hour</Name>
<Name>90 - 600 minutes, per hour</Name>
<Duration>PT60M</Duration>
</TimeInterval>
<TimeInterval version="any" id="metrobike@M600+">
<Name>More than 5 hours 600 minutes</Name>
<Name>More than 5 hours 600 minutes</Name>
<Duration>P1D</Duration>
</TimeInterval>
</timeIntervals>
Expand Down Expand Up @@ -1016,7 +1052,7 @@
<!--==== VALIDABLE ELEMENTs ==== -->
<validableElements>
<ValidableElement version="any" id="metrobike@single_session@travel">
<Name>Single ride</Name>
<Name>Single ride</Name>
<fareStructureElements>
<FareStructureElementRef version="any" ref="metrobike@single_session@access"/>
<FareStructureElementRef version="any" ref="metrobike@single_session@durations"/>
Expand Down Expand Up @@ -1102,7 +1138,7 @@
</SalesOfferPackage>
<SalesOfferPackage version="any" id="metrobike@single_session-SOP@p-ticket">
<BrandingRef version="any" ref="myBrand"/>
<Name>Metrobike one-session purchase from ticket machine</Name>
<Name>Metrobike one-session purchase from ticket machine</Name>
<distributionAssignments>
<DistributionAssignment version="any" id="metrobike@single_session-SOP@p-ticket@onStreet" order="1">
<Name>On street ticket machine</Name>
Expand Down Expand Up @@ -1161,7 +1197,7 @@
</salesOfferPackages>
</FareFrame>
<FareFrame version="1.0" id="mb:cycle_sharing_example-day_pass" dataSourceRef="mb:metrobike" responsibilitySetRef="mb:tariffs">
<Name>Metrobike day Pass1</Name>
<Name>Metrobike day Pass1</Name>
<prerequisites>
<MobilityServiceFrameRef version="1.0" ref="mb:cycle_sharing_example"/>
<SiteFrameRef version="1.0" ref="mb:cycle_sharing_example"/>
Expand Down Expand Up @@ -1261,7 +1297,7 @@
<!--==== VALIDABLE ELEMENTs ==== -->
<validableElements>
<ValidableElement version="any" id="metrobike@day_pass@travel">
<Name>Single ride</Name>
<Name>Single ride</Name>
<fareStructureElements>
<FareStructureElementRef version="any" ref="metrobike@day_pass@access"/>
<FareStructureElementRef version="any" ref="metrobike@day_pass@eligibility"/>
Expand Down Expand Up @@ -1344,7 +1380,7 @@
<!--==== Fare Prices ==== -->
<fareTables>
<FareTable version="any" id="metrobike">
<Name>Metrobike prices</Name>
<Name>Metrobike prices</Name>
<OperatorRef version="any" ref="noc:MBIKE"/>
<limitations>
<UserProfileRef version="any" ref="notATot"/>
Expand Down Expand Up @@ -1389,7 +1425,7 @@
<TimeIntervalRef version="any" ref="metrobike@M45+M90"/>
</TimeIntervalPrice>
<TimeIntervalPrice version="any" id="metrobike@M90-eachM60">
<Name>90 to 600 minutes, charge per hour e</Name>
<Name>90 to 600 minutes, charge per hour e</Name>
<Amount>4.00</Amount>
<Units>60</Units>
<TimeIntervalRef version="any" ref="metrobike@M90-eachM60"/>
Expand Down Expand Up @@ -1752,7 +1788,7 @@ This Shows sample Purchases
<CustomerRef versionRef="EXTERNAL" ref="mbt:Anon001"/>
<fareContractEntries>
<SalesTransaction version="any" id="mbt:Anon001@trans069@purchase_single_session@checkout">
<Name>Buy Single ticket Adult</Name>
<Name>Buy Single ticket Adult</Name>
<Date>2020-12-08T12:01:00</Date>
<TypeOfFareContractEntryRef versionRef="EXTERNAL" ref="fxc:product_purchase"/>
<Amount>2.10</Amount>
Expand Down Expand Up @@ -1843,7 +1879,7 @@ This Shows sample Purchases
<AdjustmentAmount>8.00</AdjustmentAmount>
<AdjustmentUnits>120</AdjustmentUnits>
<PricingRuleRef version="any" ref="per_hour"/>
<Narrative>91 minutes to 600 minutes</Narrative>
<Narrative>91 minutes to 600 minutes</Narrative>
</RuleStepResult>
</ruleStepResults>
<EndOfValidity>2020-10-08T13:10:00</EndOfValidity>
Expand Down Expand Up @@ -1971,7 +2007,7 @@ This Shows sample Purchases
<FromDate>2020-12-08T12:01:00</FromDate>
<ToDate>2020-12-08T14:01:00</ToDate>
</ValidBetween>
<Name>Single session cycle use</Name>
<Name>Single session cycle use</Name>
<CustomerRef versionRef="EXTERNAL" ref="mbt:Anon001"/>
<customerPurchasePackageElements>
<CustomerPurchasePackageElement version="any" id="mbt:Anon001@027" order="1" created="2020-12-08T12:01:00">
Expand All @@ -1992,7 +2028,7 @@ This Shows sample Purchases
<MarkedAs>used</MarkedAs>
<validityParameterAssignments>
<CustomerPurchaseParameterAssignment version="any" id="mbt:Anon001@027@002" created="2020-12-08T14:47:00" order="1">
<Name>Check back in to station beta_b1_004</Name>
<Name>Check back in to station beta_b1_004</Name>
<validityParameters>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@04"/>
</validityParameters>
Expand Down Expand Up @@ -2025,7 +2061,7 @@ This Shows sample Purchases
<CustomerPurchasePackageRef version="any" ref="mbt:Anon001@027"/>
</CustomerPurchasePackagePrice>
<CustomerPurchasePackagePrice version="any" id="mbt:Anon001@027" created="2020-12-08T14:47:00">
<Name>Additional charge 3 + 4</Name>
<Name>Additional charge 3 + 4</Name>
<Amount>7.00</Amount>
<CustomerPurchasePackageRef version="any" ref="mbt:Anon001@027"/>
</CustomerPurchasePackagePrice>
Expand Down
5 changes: 5 additions & 0 deletions examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@ Updated to give exampel of group of SItes
<DefaultCodespaceRef ref="oda"/>
</FrameDefaults>
<frames>
<ResourceFrame id="oda:RES_01" version="any">
<dataSources>
<DataSource id="NaPTAN" version="any"/>
</dataSources>
</ResourceFrame>
<!-- - ==== SERVICE CALENDAR === -->
<ServiceCalendarFrame version="any" id="oda:CAL_01">
<Name>Olympic Park2 2012 </Name>
Expand Down
5 changes: 5 additions & 0 deletions examples/functions/site/Netex_21_Sites_Parking_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ Overview
<PublicationRefreshInterval>PT5M0S</PublicationRefreshInterval>
<!--- =============== RESULTS =========== -->
<dataObjects>
<ResourceFrame id="pkg:RF01" version="any">
<dataSources>
<DataSource id="parkopedia" version="any"/>
</dataSources>
</ResourceFrame>
<SiteFrame version="any" id="pkg:SF01">
<validityConditions>
<AvailabilityCondition version="any" id="pkg:PP01_Opening_Hours">
Expand Down
5 changes: 5 additions & 0 deletions examples/functions/site/Netex_21_Sites_Parking_2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ v1.1 revised ids and corrections
<PublicationRefreshInterval>PT5M0S</PublicationRefreshInterval>
<!--- =============== RESULTS =========== -->
<dataObjects>
<ResourceFrame id="mypark:RF01" version="any">
<dataSources>
<DataSource id="parkopedia" version="any"/>
</dataSources>
</ResourceFrame>
<SiteFrame version="any" id="mypark:SF01">
<validityConditions>
<AvailabilityCondition version="any" id="mypark:PP01@Opening_Hours">
Expand Down
5 changes: 5 additions & 0 deletions examples/functions/site/Netex_Address_Example_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ Overview
<PublicationRefreshInterval>PT5M0S</PublicationRefreshInterval>
<!--- =============== RESULTS =========== -->
<dataObjects>
<ResourceFrame version="any" id="ResourceFrame:RF01">
<dataSources>
<DataSource id="parkopedia" version="any"/>
</dataSources>
</ResourceFrame>
<SiteFrame version="any" id="SiteFrame:SF01">
<validityConditions>
<AvailabilityCondition version="any" id="mysite:PP01_OpeningHours">
Expand Down
Loading
Loading