Skip to content

New modes corrections #142

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.

Sign up for GitHub

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

Merged
skinkie merged 110 commits into from
Apr 7, 2021
Merged

New modes corrections #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
ca92fcd
Update README.md
nick-knowles Jun 21, 2020
52522c6
Added missing keyref to AdministrativeZone
seime Aug 7, 2020
e8430ce
dd ResponsibilityRoles to RESOURCE FRAM
nick-knowles Aug 11, 2020
3280712
Issue #110 add missing fule types
nick-knowles Aug 11, 2020
43bb885
Update README.md
nick-knowles Jun 21, 2020
0d46bcd
Currection to LinkProject
nick-knowles Jun 21, 2020
7427938
JourneyPart/MainRef Issue 78
nick-knowles Jun 21, 2020
e538d0d
Issue #73 FIX - Recursive includes
nick-knowles Jun 21, 2020
6d57bef
Update README.md
nick-knowles Jun 21, 2020
9b826a6
Update README.md
nick-knowles Jun 21, 2020
c132339
Issue #75 FareClass enumeration
nick-knowles Jun 21, 2020
55bd4a3
OrganisationalUnit #100 Fix subsitution group
nick-knowles Jul 28, 2020
ad65f3a
Update readme for issue #100
nick-knowles Jul 28, 2020
a8a70a0
Issues #101 fix constraints
nick-knowles Jul 28, 2020
0d3725a
Updates to examples
nick-knowles Jul 28, 2020
1033fb1
Issue97 FIX - Add DatedJourney to TimetableFrame
nick-knowles Jul 28, 2020
e8a7599
Add irish examples
nick-knowles Aug 11, 2020
8aa9643
Issues 107add missing key constrainst for UicOperatingPeriod
nick-knowles Aug 11, 2020
27b5e0b
Merge branch 'master' into CumulativeRollupOfFixes
nick-knowles Aug 11, 2020
566da0d
Merge branch 'pr/106' into CumulativeRollupOfFixes
nick-knowles Aug 11, 2020
b71339f
Update REadme
nick-knowles Aug 11, 2020
76417fc
Update README.md
nick-knowles Aug 11, 2020
6a41269
Update README.md
nick-knowles Aug 11, 2020
4911c03
UPdate readme and add html version
nick-knowles Aug 12, 2020
705ff91
Add 1.2 and 1.1 release numbers
nick-knowles Aug 12, 2020
dfe17c7
Chaneg to use ther point semantic version style numbering
nick-knowles Aug 12, 2020
63602b2
Fixed incorrect/inconsistent documentation strings for attribute defi…
syversenkr Oct 1, 2020
e49d583
Update README.md
nick-knowles Oct 4, 2020
e3a8a5b
New Modes - Add Mode of Operation
nick-knowles Oct 5, 2020
b36c1d7
Update README.md
nick-knowles Oct 5, 2020
1d203c7
NewModes: VehicleMode and ModeOfOperation references
nick-knowles Oct 5, 2020
8aa22d4
NewModes: Revise Transport Organisation hierarchy
nick-knowles Oct 5, 2020
88dca99
NewModes - Add FLeet Model
nick-knowles Oct 5, 2020
c9c448a
NewModes revise VehicleTypes
nick-knowles Oct 5, 2020
ba4d9f1
NewModes - Add Mobility Services
nick-knowles Oct 5, 2020
8300586
Add new enum values for responsibility roles
nick-knowles Oct 5, 2020
f4fd558
NewModes Add VehicleMeetingPoint Model
nick-knowles Oct 5, 2020
7559bb8
Add new modes Single Journey Service basic support
nick-knowles Oct 6, 2020
7d14e64
New Modes Add vehicleMeeting Points & Places
nick-knowles Oct 6, 2020
6d3ba58
New MOdes update XMPLSPY project file
nick-knowles Oct 6, 2020
3cc8e6a
NewModes - Add Vehicle Service PLACE ASsigments
nick-knowles Oct 6, 2020
5a72383
Doc tidy ups
nick-knowles Oct 7, 2020
df8fe31
NewModes - Add SIngleJourney Service
nick-knowles Oct 7, 2020
a9e3aff
NewModes Revisions to SingleJourney
nick-knowles Oct 7, 2020
4026080
New Mdoes equipment revisions
nick-knowles Oct 7, 2020
a56995a
New modes equiment revisions
nick-knowles Oct 7, 2020
306fec4
New Modes ACcess credentials, payment means and mediuam access device
nick-knowles Oct 7, 2020
1064d26
NewModes - Add parameters to AccessParameterAssgnment
nick-knowles Oct 8, 2020
b9250e0
NewModes revisions to FM support
nick-knowles Oct 8, 2020
c7f0de6
NewModes addframes
nick-knowles Oct 8, 2020
8222292
NewModes revise mobilityserviceframe
nick-knowles Oct 8, 2020
bc6f230
Fix up UIC files
nick-knowles Oct 8, 2020
ea453bb
NewModes ADd to main farmes
nick-knowles Oct 9, 2020
c9aca64
NewModes - Revise booking arrangemenets
nick-knowles Oct 11, 2020
e125295
NewModes - Fix up referencess to OperatorRef, VehicleType
nick-knowles Oct 11, 2020
60c0b83
Update readme
nick-knowles Oct 11, 2020
a58e894
Update references
nick-knowles Oct 11, 2020
f73148f
NewModes - Reoragnise files to follow dependencies
nick-knowles Oct 13, 2020
979b228
Minor doc corrections notice while making new modes changes
nick-knowles Oct 13, 2020
6166592
NewModes -Reorganize farmes
nick-knowles Oct 13, 2020
9b3f6a7
NewModes - Updates to fare model
nick-knowles Oct 14, 2020
63c7347
NewModes - Add ParkingBayStatus modle
nick-knowles Oct 14, 2020
c49f4b6
NewModes -Add PArkingBay STatus more
nick-knowles Oct 14, 2020
6b7ca9a
New Modes add ParkingCapacityASsignment
nick-knowles Oct 14, 2020
3114cdf
Fix - RevisE allObject file sto include all files
nick-knowles Oct 14, 2020
5e85c4d
NewModes - AddMobiliteServicelement and price
nick-knowles Oct 15, 2020
085ac87
NewModes - Revise frames - add MobilityServiceELement and VehicleMeet…
nick-knowles Oct 16, 2020
737a743
NewModes: Add integrity constraints
nick-knowles Oct 16, 2020
e5e3652
NewModes update version number on schema to 1.2.2
nick-knowles Oct 16, 2020
3caee80
NewModes - CYcleShare Example and enabling revisions
nick-knowles Oct 18, 2020
96c7db2
Update Read.ME
nick-knowles Oct 18, 2020
cbba3e1
NewModes - fixes to example
nick-knowles Oct 18, 2020
55a9b61
NewMdoes - fixes to cycle sharing example
nick-knowles Oct 18, 2020
05d4e03
NewModes Add Examples
nick-knowles Oct 21, 2020
309cbe1
NewModes - Updates to example
nick-knowles Oct 21, 2020
2f3546e
New modes add constraint zone
nick-knowles Oct 26, 2020
248eaf0
xNewModescorercttype
nick-knowles Oct 26, 2020
c2790f7
Tidy up read me markdown
nick-knowles Oct 27, 2020
1e276c8
fix parking capacity
nick-knowles Oct 27, 2020
b74f217
Update oygwn project file
nick-knowles Oct 27, 2020
23be8e6
Merge branch 'NewModes---Examples' of https://github.com/nick-knowles…
nick-knowles Oct 27, 2020
4b506de
Update netex_nm_ParkingCapacityAssignment_version.xsd
nick-knowles Oct 27, 2020
d1db72e
Update oxygen file
nick-knowles Oct 27, 2020
589ae2c
Added multimodal to QuayTypeEnumeration (#125)
syversenkr Oct 30, 2020
5cbd8d5
Add support for NAND, NOR, XNOR as a LogicalOperation. Also renamed B…
seime Nov 3, 2020
3d88dd8
Add changes from master
nick-knowles Nov 6, 2020
fefcfc1
NewModes (Norway) Add relatedOrganisation and also resuable contacts
nick-knowles Nov 6, 2020
3d914ad
Add changes from master
nick-knowles Nov 6, 2020
15f92ac
NewModes (Norway) Add relatedOrganisation and also resuable contacts
nick-knowles Nov 6, 2020
84ed250
rebase
nick-knowles Nov 6, 2020
83ad5a7
NewModes Enhance Organisations - Add example
nick-knowles Nov 6, 2020
f857124
Merge branch 'pr/126' into NewModes-OrganisationRelationship
nick-knowles Nov 6, 2020
e2b3ac1
NewModes -Corrections to reusable components
nick-knowles Nov 9, 2020
302bab2
NewModes: Simplify - move contact into Organisation packet
nick-knowles Nov 10, 2020
cf484e5
Commit Add publicRElations to COntact types
nick-knowles Nov 11, 2020
4841e9a
NewModes - Upodate readme
nick-knowles Nov 12, 2020
462450c
NewModes-Rename ModelEQuipmentProfiel to VehicleModelProfile
nick-knowles Nov 14, 2020
995e01e
FIX Issue 131 GaragePoints etc were not appearing as TimingPoints in…
nick-knowles Nov 27, 2020
fa337cb
NewModes Fix supertypes on ParkingEquipment
nick-knowles Nov 27, 2020
b104b19
NewModes - Drop continous md0oes enum
nick-knowles Nov 27, 2020
0216df6
Update readme
nick-knowles Nov 27, 2020
567cf09
Minor corrections to new modes
nick-knowles Dec 11, 2020
2e809af
NewModes Corrections to mode
nick-knowles Dec 11, 2020
97117c4
NewModes - Rename simple vehicletype
nick-knowles Jan 8, 2021
8653a55
NewModes - add fare examples
nick-knowles Jan 8, 2021
7344816
New Modes - Correct Parking Capacity ASsignment
nick-knowles Jan 8, 2021
e982a99
NewModes: DRop mobilityServiceElement
nick-knowles Jan 8, 2021
bfb4dae
NewModes: Add verification flags for customer email and phone
nick-knowles Jan 12, 2021
69d3b1f
NewModes: Revise MobilityService for revei change
nick-knowles Jan 12, 2021
5bffab4
NewModes: Rveisons after review
nick-knowles Jan 15, 2021
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
265 changes: 229 additions & 36 deletions NeTEx.spp
View file
Open in desktop

Large diffs are not rendered by default.

141 changes: 139 additions & 2 deletions NeTEx.xpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,140 @@
<file name="xsd/netex_part_3/part3_salesTransactions/netex_travelSpecificationSummary_version.xsd"/>
</folder>
</folder>
<folder name="netex_part_5">
<folder name="netex_part5_extensions">
<folder name="netex_part5_FM_Extensions">
<file name="xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd"/>
<file name="xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd"/>
</folder>
<folder name="netex_part5_frame_Extensions">
<file name="xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd"/>
</folder>
<folder name="netex_part5_framework">
<file name="xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
<file name="xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
<file name="xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
<file name="xsd/netex_framework/netex_utility/netex_utility_types.xsd"/>
</folder>
<folder name="netex_part5_IF_Extensions">
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_taxiPlace_support.xsd"/>
<file name="xsd/netex_part_1/part1_ifopt/netex_taxiPlace_version.xsd"/>
</folder>
<folder name="netex_part5_ND_Extensions">
<file name="xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd"/>
<file name="xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd"/>
<file name="xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd"/>
<file name="xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd"/>
<file name="xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd"/>
</folder>
<folder name="netex_part5_RC_NM_Extensions">
<file name="xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_fleet_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd"/>
</folder>
<folder name="netex_part5_ST_Extensions">
<file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_support.xsd"/>
<file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPaymentMeans_version.xsd"/>
<file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd"/>
<file name="xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd"/>
<file name="xsd/netex_part_3/part3_salesTransactions/netex_mediumApplication_version.xsd"/>
<file name="xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd"/>
<file name="xsd/netex_part_3/part3_salesTransactions/netex_travelSpecificationSummary_version.xsd"/>
</folder>
<folder name="netex_part5_TP_Extensions">
<file name="xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
<file name="xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd"/>
<file name="xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd"/>
<file name="xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
<file name="xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd"/>
</folder>
</folder>
<folder name="netex_part5_frames">
<file name="xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd"/>
<file name="xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd"/>
</folder>
<folder name="netex_part5_NM_FM">
<file name="xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_support.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_support.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_mobilityServiceElement_support.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_mobilityServiceElement_version.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_support.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_usageParameterEligibility_version.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_support.xsd"/>
<file name="xsd/netex_part_5/part5_fm/netex_nm_usageParameterRental_version.xsd"/>
</folder>
<folder name="netex_part5_NM_ND">
<file name="xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPointAssignment_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleServicePlaceAssignment_version.xsd"/>
</folder>
<folder name="netex_part5_NM_RC">
<file name="xsd/netex_part_5/part5_rc/netex_nm_mobilityService_support.xsd"/>
<file name="xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd"/>
<file name="xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd"/>
<file name="xsd/netex_part_5/part5_rc/netex_nm_onlineService_version.xsd"/>
</folder>
<folder name="netex_part5_NM_SJ">
<file name="xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_support.xsd"/>
<file name="xsd/netex_part_5/part5_sj/netex_nm_singleJourneyPath_version.xsd"/>
<file name="xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_support.xsd"/>
<file name="xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd"/>
</folder>
<file name="xsd/netex_part_5/netex_all_frames_part5.xsd"/>
<file name="xsd/netex_part_5/netex_all_objects_part5_newModes.xsd"/>
</folder>
<folder name="netex_service">
<file name="xsd/netex_service/netex_all.xsd"/>
<file name="xsd/netex_service/netex_dataObjectRequest_service.xsd"/>
Expand All @@ -411,7 +545,6 @@
<file name="xsd/siri_utility/siri_participant-v2.0.xsd"/>
<file name="xsd/siri_utility/siri_permissions-v2.0.xsd"/>
<file name="xsd/siri_utility/siri_types-v2.0.xsd"/>
<file name="xsd/siri_utility/siri_utility.xsd"/>
</folder>
<file name="xsd/NeTEx_publication-NoConstraint.xsd"/>
<file name="xsd/NeTEx_publication_timetable.xsd"/>
Expand Down Expand Up @@ -486,6 +619,11 @@
<folder name="network">
<file name="examples/functions/simpleNetwork/Netex_SimpleNetwork_1.xml"/>
</folder>
<folder name="newModes">
<file name="examples/functions/newModes/NewModes-CarPoolingExample.xml"/>
<file name="examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml"/>
<file name="examples/functions/newModes/NewModes-CycleSharingExample.xml"/>
</folder>
<folder name="patterns">
<file name="examples/functions/patterns/Netex_KBIC_ParisNetwork_1.xml"/>
</folder>
Expand Down Expand Up @@ -698,6 +836,5 @@
</folder>
</folder>
</folder>
<file name="xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
</projectTree>
</project>
Loading