Skip to content

Commit

Permalink
Addition of reviews to comments about (#519)
Browse files Browse the repository at this point in the history 
* Addition of reviews to vehicle pooling drivers and passengers

Addition of reviews to vehicle pooling drivers and passengers
Also adds a missing Transmodel relation from SINGLE JOURNEY to VEHICLE POOLING DRIVER

Answers to #318

* Fix XML Spy issue

* Lint and update documentation tables

* Update following Github review

Updates following Github review and typo fixing

* Lint and update documentation tables

* Decision from meeting # 15

Global rating are decimal
5 stars model Ok: annotation mentions that 5 is better the 1

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@Aurige @github-actions
Aurige and github-actions[bot] authored Oct 27, 2023
1 parent 8d278fb commit 0215777
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 7 deletions.
21 changes: 20 additions & 1 deletion xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<!-- ==== VEHICLE POOLING DRIVER INFO. ============================================ -->
<!-- ==== INDIVIDUALPASSENGER INFO. ============================================ -->
<xsd:complexType name="IndividualPassengerInfoRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of INDIVIDUAL PASSENGER INFOs.</xsd:documentation>
Expand Down Expand Up @@ -182,5 +182,24 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<!-- ==== USER RANKING ============================================ -->
<xsd:simpleType name="UserRankingType">
<xsd:annotation>
<xsd:documentation>Individual ranking based on the traditional 5 stars (1 to 5, 5 being the better) ranking which is the most used (note that the Like/Dislike model can be mapped to no-ranking/ranking=1 and the rare 10 stars model, like IMDb, will mapp 1/2 ti 1, 2/3 to 2, etc.) </xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:positiveInteger">
<xsd:minInclusive value="1"/>
<xsd:maxInclusive value="5"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="GlobalRankingType">
<xsd:annotation>
<xsd:documentation>Mean ranking based on the traditional 5 stars (1 to 5 better) ranking which is the most used (note that the Like/Dislike model can be mapped to no-ranking/ranking=1 and the rare 10 stars model, like IMDb, will mapp 1/2 ti 1, 2/3 to 2, etc.) </xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:decimal">
<xsd:minInclusive value="1.0"/>
<xsd:maxInclusive value="5.0"/>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
</xsd:schema>
63 changes: 57 additions & 6 deletions xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether traveller'ss identify has been verified. has been </xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Ranking" type="xsd:integer" minOccurs="0">
<xsd:element name="Ranking" type="GlobalRankingType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Rating for traveller</xsd:documentation>
<xsd:documentation>Mean rating for traveller</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Gender" type="GenderEnumeration" minOccurs="0">
Expand Down Expand Up @@ -244,9 +244,9 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="IndividualTravellerRef" minOccurs="0"/>
<xsd:element name="Ranking" type="xsd:integer" minOccurs="0">
<xsd:element name="Ranking" type="GlobalRankingType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Rating for driver.</xsd:documentation>
<xsd:documentation>Meanrating for driver.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="LastTripDate" type="xsd:dateTime" minOccurs="0">
Expand Down Expand Up @@ -290,6 +290,11 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:element ref="VehicleRef" minOccurs="0"/>
<xsd:element name="reviews" type="reviews_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reviews associated to the vehicle pooling driver</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- === INDIVIDUAL PASSENGER INFO. ================================================= -->
Expand Down Expand Up @@ -348,9 +353,9 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="IndividualTravellerRef" minOccurs="0"/>
<xsd:element name="Ranking" type="xsd:integer" minOccurs="0">
<xsd:element name="Ranking" type="GlobalRankingType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Rating for driver.</xsd:documentation>
<xsd:documentation>Mean rating for passenger.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="LastTripDate" type="xsd:dateTime" minOccurs="0">
Expand All @@ -368,6 +373,52 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether travelling with Pet.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="reviews" type="reviews_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reviews associated to the passenger</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ==== REVIEWS. ============================================ -->
<xsd:element name="Review" type="ReviewStructure">
<xsd:annotation>
<xsd:documentation>A review of a diver or of a traveler.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="reviews_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for collection of reviews.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="Review" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="ReviewStructure">
<xsd:annotation>
<xsd:documentation>Type for Review.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="Date" type="xsd:date" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Date of the review</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Ranking" type="UserRankingType">
<xsd:annotation>
<xsd:documentation>Rating attributed by the reviewer (1 to 5, and the higher is the better)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Comment" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Comment associated with the review</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="UserAcronym" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Acronym name of the reviewer</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
8 changes: 8 additions & 0 deletions xsd/netex_part_5/part5_sj/netex_nm_singleJourneyService_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
<xsd:include schemaLocation="../part5_nd/netex_nm_vehicleMeetingPointAssignment_version.xsd"/>
<xsd:include schemaLocation="../part5_fm/netex_nm_individualTraveller_support.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand All @@ -20,6 +21,8 @@
<Creator>First drafted for NeTEx version 1.2.2 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:[email protected]</Creator>
<Date><Created>2020-10-05</Created>Add for New Modes
</Date>
<Date><Created>2020-10-05</Created>Add for New Modes
</Date>
<Date>
<Modified>2020-10-05</Modified>
</Date>
Expand Down Expand Up @@ -143,6 +146,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>MEETING POINT ASSIGNMENTS for SINGLE JOURNEY</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="VehiclePoolingDriverInfoRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Possible relation to a VEHICLE POOLING DRIVER, as defined in Transmodel</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="SingleJourneyReferencesGroup">
Expand Down

0 comments on commit 0215777

Please sign in to comment.