Skip to content

Commit

Permalink
Merge branch 'changes_for_v1.1' into obsolete_code_request_support
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/generated/index.html
  • Loading branch information
skinkie committed Jan 20, 2023
2 parents 9e31a90 + d75cdc5 commit 60088a5
Show file tree
Hide file tree
Showing 12 changed files with 918 additions and 79 deletions.
36 changes: 36 additions & 0 deletions OJP/OJP_Common.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@
<xs:documentation>Reference to an Operator ([TMv6] company providing public transport services.) </xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="OperatorRefs_RelStructure">
<xs:sequence>
<xs:element name="OperatorRef" type="siri:OperatorRefStructure" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="OperatorFilterStructure">
<xs:annotation>
<xs:documentation>Filter for in/exclusion of transport operators.</xs:documentation>
Expand Down Expand Up @@ -425,4 +430,35 @@
<xs:group ref="WebLinkGroup" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:annotation>
<xs:documentation>========================================== Sustainability ==========================================</xs:documentation>
</xs:annotation>
<xs:group name="SustainabilityGroup">
<xs:annotation>
<xs:documentation>Elements about sustainability. Primarily for TRIPs and LEGs.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="EmissionCO2" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="KilogramPerPersonKm">
<xs:annotation>
<xs:documentation>Kilogram by person and by kilometer of CO2 emission.</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:float">
<xs:minInclusive value="0"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ConfidenceLevel" type="Percentage" minOccurs="0">
<xs:annotation>
<xs:documentation>Confidence level of the emission value in percent.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:group>
</xs:schema>
Loading

0 comments on commit 60088a5

Please sign in to comment.