-
Notifications
You must be signed in to change notification settings - Fork 39
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
Added CustomerServiceContactDetails and updates Vehicle/VehicleRef #584
Merged
Merged
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
7f76c93
Added CustomerServiceContactDetails
ue71603 7b69a31
added VehicleRef to ServiceJourney
ue71603 ce54bd5
Lint and update documentation tables
github-actions[bot] 95d15d6
clarification when to use VehicleRef
ue71603 3f87632
Merge branch 'next' into Customer-Information-On-Vehicle
ue71603 98afad4
Update netex_vehicleType_version.xsd
ue71603 f231007
fixing ambiguity and double VehicleCodeGroup
ue71603 28539cd
typos, fixing import
ue71603 93a596a
typos and equipmentProfiles added to VehicleModel
ue71603 af51d62
also VehicleModelProfileRef to VehicleModel
ue71603 e190c35
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 c327e7a
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 8afc953
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 4ab1889
changed equipmentProfiles
ue71603 7a7e971
modeled the Contacts correct and corrected that contacts must allow m…
ue71603 ae93675
Lint and update documentation tables
github-actions[bot] 2f2d932
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 1d7a9a0
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 168b6fd
Lint and update documentation tables
github-actions[bot] c665677
Merge branch 'next' into Customer-Information-On-Vehicle
ue71603 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd"> | ||
| <PublicationTimestamp>2010-12-17T09:30:47.0Z</PublicationTimestamp> | ||
| <ParticipantRef>SYS001</ParticipantRef> | ||
| <!--- ======WHAT WAS REQUESTED ========== --> | ||
| <PublicationRequest version="1.0"> | ||
| <RequestTimestamp>2010-12-17T09:30:47.0Z</RequestTimestamp> | ||
| <ParticipantRef>SYS002</ParticipantRef> | ||
| <topics> | ||
| <NetworkFrameTopic> | ||
| <selectionValidityConditions> | ||
| <AvailabilityCondition version="any" id="xj:cf_12"> | ||
| <FromDate>2010-11-01T00:00:00Z</FromDate> | ||
| </AvailabilityCondition> | ||
| </selectionValidityConditions> | ||
| <TypeOfFrameRef ref="xj:MyVsFrame">REQUEST</TypeOfFrameRef> | ||
| </NetworkFrameTopic> | ||
| </topics> | ||
| </PublicationRequest> | ||
| <PublicationRefreshInterval>P1M</PublicationRefreshInterval> | ||
| <Description>Example of simple vehicle schedule frame with tblocks</Description> | ||
| <!--- =============== RESULTS =========== --> | ||
| <dataObjects> | ||
| <CompositeFrame version="1" id="xj:cf_12"> | ||
| <validityConditions> | ||
| <AvailabilityCondition version="any" id="xj:Cnd001"> | ||
| <Description>Sept to March</Description> | ||
| <FromDate>2010-11-01T00:00:00Z</FromDate> | ||
| <ToDate>2011-03-31T00:00:00Z</ToDate> | ||
| </AvailabilityCondition> | ||
| </validityConditions> | ||
| <TypeOfFrameRef ref="xj:TypeOfFrame:MyVsFrame"/> | ||
| <!--- ======= CODESPACEs======== --> | ||
| <codespaces> | ||
| <Codespace id="mybus"> | ||
| <Xmlns>mybus</Xmlns> | ||
| <XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl> | ||
| <Description>My buses</Description> | ||
| </Codespace> | ||
| <Codespace id="xj"> | ||
| <Xmlns>xj</Xmlns> | ||
| <XmlnsUrl>http://www.borninabahn.de</XmlnsUrl> | ||
| <Description> OtherStop data data</Description> | ||
| </Codespace> | ||
| <Codespace id="kx"> | ||
| <Xmlns>kx</Xmlns> | ||
| <XmlnsUrl>http://www.ksx.com</XmlnsUrl> | ||
| </Codespace> | ||
| </codespaces> | ||
| <!--- =======FRAME DEFAULTS======== --> | ||
| <FrameDefaults> | ||
| <DefaultCodespaceRef ref="kx"/> | ||
| </FrameDefaults> | ||
| <frames> | ||
| <ResourceFrame id="HAV:ResourceFrame:1" version="1"> | ||
| <organisations> | ||
| <Operator id="HAV:Operator:999523587" version="1"/> | ||
| </organisations> | ||
| <vehicles> | ||
| <Vehicle id="HAV:Vehicle:1" version="1"> | ||
| <Name>MS Havila Capella</Name> | ||
| <OperationalNumber>9865570</OperationalNumber> | ||
| <OperatorRef ref="HAV:Operator:999523587" version="1"/> | ||
| <VehicleTypeRef ref="HAV:VehicleType:1" version="1"/> | ||
| </Vehicle> | ||
| <Vehicle id="HAV:Vehicle:2" version="1"> | ||
| <Name>MS Havila Castor</Name> | ||
| <OperationalNumber>9865582</OperationalNumber> | ||
| <OperatorRef ref="HAV:Operator:999523587" version="1"/> | ||
| <VehicleTypeRef ref="HAV:VehicleType:1" version="1"/> | ||
| </Vehicle> | ||
| <Vehicle id="HAV:Vehicle:3" version="1"> | ||
| <Name>MS Havila Polaris</Name> | ||
| <OperationalNumber>9873759</OperationalNumber> | ||
| <OperatorRef ref="HAV:Operator:999523587" version="1"/> | ||
| <VehicleTypeRef ref="HAV:VehicleType:1" version="1"/> | ||
| </Vehicle> | ||
| <Vehicle id="HAV:Vehicle:4" version="1"> | ||
| <Name>MS Havila Pollux</Name> | ||
| <OperationalNumber>9873761</OperationalNumber> | ||
| <OperatorRef ref="HAV:Operator:999523587" version="1"/> | ||
| <VehicleTypeRef ref="HAV:VehicleType:1" version="1"/> | ||
| </Vehicle> | ||
| </vehicles> | ||
| </ResourceFrame> | ||
| <InfrastructureFrame id="HAV:InfrastructureFrame:1" version="1"> | ||
| <vehicleTypes> | ||
| <VehicleType created="2022-09-21T11:41:00.900" id="HAV:VehicleType:1" version="1"> | ||
| <Name>Model</Name> | ||
| <Description>Hybrid cruise vessel</Description> | ||
| <SelfPropelled>true</SelfPropelled> | ||
| <PassengerCapacity> | ||
| <TotalCapacity>640</TotalCapacity> | ||
| </PassengerCapacity> | ||
| <LowFloor>true</LowFloor> | ||
| <HasLiftOrRamp>true</HasLiftOrRamp> | ||
| <Length>124</Length> | ||
| <Width>22</Width> | ||
| </VehicleType> | ||
| </vehicleTypes> | ||
| </InfrastructureFrame> | ||
| <TimetableFrame id="HAV:TimetableFrame:1" version="1"> | ||
| <vehicleJourneys> | ||
| <ServiceJourney id="SJ1" version="1"> | ||
| <VehicleRef ref="HAV:Vehicle:4"/> | ||
| </ServiceJourney> | ||
| </vehicleJourneys> | ||
| </TimetableFrame> | ||
| </frames> | ||
| </CompositeFrame> | ||
| </dataObjects> | ||
| </PublicationDelivery> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm puzzled because this still does not validated (error on CarModelProfileRef ) as if the VehicleCodeGroup has changed position... but it does not seem to be the case !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Aurige What is not validating?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NeTEx\examples\functions\newModes\NewModes-CarClubExample.xml (and it validates in master, so we broke something at some point)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Aurige to provide the details of the error
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Aurige for me it validates in the branch..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes coming from this code are here. It is only Contact and ContactRef. However, we might have changed it before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure what is going on, but when I checkout that brach and validate the CarClub example, I get this (I just double checked)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same pb with XMLLint