Skip to content

Issue #110 add missing fuel types #113

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

Closed
nick-knowles wants to merge 2 commits into from
Closed

Issue #110 add missing fuel types #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8430ce
dd ResponsibilityRoles to RESOURCE FRAM
nick-knowles Aug 11, 2020
3280712
Issue #110 add missing fule types
nick-knowles Aug 11, 2020
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
10 changes: 9 additions & 1 deletion xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<Modified>2017-03-28 CR031 Add Zones to RESOURCE FRAME</Modified>
</Date>
<Date>
<Modified>2017-06-28 CR048 Add Securty Lists to RESOURCE FRAME</Modified>
<Modified>2017-06-28 CR048 Add Security Lists to RESOURCE FRAME</Modified>
</Date>
<Date>
<Modified>2020-08-12 Issue 104 Add ResponsibilityRoles to RESOURCE FRAME</Modified>
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines RESOURCE FRAME types.</p>
Expand Down Expand Up @@ -124,6 +127,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Definitions of DATA SOURCE included in frame.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="responsibilityRoles" type="responsibilityRolesInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>RESPONSIBILITY Roles used in frame.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="responsibilitySets" type="responsibilitySetsInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>RESPONSIBILITY SETs used in frame.</xsd:documentation>
Expand Down
16 changes: 16 additions & 0 deletions xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<Modified>2017-04-27 CR0038 Add REsponsibilityRole as Abstract entity , add general Role </Modified>
<Modified>2017-04-27 CR0038 Add PrivateCOde to ResponsibilitySet </Modified>
</Date>

<Date>
<Modified>2020-08-12 Issue 104 Add ResponsibilityRoles to RESOURCE FRAME</Modified>
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines data administration base types.</p>
</Description>
Expand Down Expand Up @@ -84,6 +88,18 @@ Rail transport, Roads and Road transport
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="responsibilityRolesInFrame_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for containment in frame of RESPONSIBILITY ROLEs.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="ResponsibilityRole" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- =====Responsibility============================================ -->
<xsd:complexType name="responsibilitySets_RelStructure">
<xsd:annotation>
Expand Down
17 changes: 15 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@
<Date>
<Modified>2012-04-15</Modified>Revise Passenger Capacity
</Date>
<Date>
<Date>
<Modified>2019-04-09</Modified>Add list of vehicle type refs for PARKING and general use
</Date>
<Date>
<Modified>2020-08-11</Modified>Issue #110 Add missing fuel types
electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the VEHICLE TYPE identifier Types.</p>
Expand All @@ -40,7 +44,7 @@
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
<Copyright>CEN, Crown Copyright 2009-2020</Copyright>
</Rights>
<Source>
<ul>
Expand Down Expand Up @@ -321,6 +325,15 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="naturalGas"/>
<xsd:enumeration value="biodiesel"/>
<xsd:enumeration value="electricity"/>
<xsd:enumeration value="electricContact"/>
<xsd:enumeration value="battery"/>
<xsd:enumeration value="dieselBatteryHybrid"/>
<xsd:enumeration value="petrolBatteryHybrid"/>
<xsd:enumeration value="biodiesel"/>
<xsd:enumeration value="hydrogen"/>
<xsd:enumeration value="liquidGas"/>
<xsd:enumeration value="methane"/>
<xsd:enumeration value="ethanol"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down