Skip to content
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

Introduce the examples from Norway & change Covered from boolean to enumeration #683

Merged
merged 11 commits into from
Apr 19, 2024
+14 −4
Merged

Introduce the examples from Norway & change Covered from boolean to enumeration #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
48117f9
Introduce the examples from Norway
skinkie Mar 18, 2024
abd2cbc
Lint and update documentation tables
github-actions[bot] Mar 18, 2024
d101577
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_vers…
skinkie Mar 18, 2024
cd00ea6
Introduce backwards compatibility
skinkie Mar 19, 2024
2a5ca51
Lint and update documentation tables
github-actions[bot] Mar 19, 2024
5693e95
Merge branch 'next' into examples_norway
ue71603 Apr 10, 2024
a266801
Update netex_ifopt_site_support.xsd
ue71603 Apr 10, 2024
23230a8
Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_vers…
ue71603 Apr 11, 2024
0f2fee9
updates CoveredEnumeration with a true and false
ue71603 Apr 11, 2024
b6d5c42
Lint and update documentation tables
github-actions[bot] Apr 11, 2024
bf06f4d
Depreciated added
ue71603 Apr 17, 2024
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
2 changes: 1 addition & 1 deletion examples/standards/norway/vehicles/submodel-VehicleType.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<VehicleType xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd">
<VehicleType xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="VT" version="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd">
<Name>example</Name>
<Description>V</Description>
<EuroClass>Euro 6</EuroClass>
Expand Down
10 changes: 10 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_environment_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,16 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="covered"/>
<xsd:enumeration value="mixed"/>
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="true">
<xsd:annotation>
<xsd:documentation>Value to be used, if covered is used as a "boolean". Equals covered. Depreciated.+v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="false">
<xsd:annotation>
<xsd:documentation>Value to be used, if covered is used as a "boolean". Equals outdoors. Depreciated. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="GatedEnumeration">
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Cage" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>whether shelter is enclosed.</xsd:documentation>
<xsd:documentation>Whether shelter is enclosed.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Covered" type="xsd:boolean" minOccurs="0">
<xsd:element name="Covered" type="CoveredEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether storage is covered.</xsd:documentation>
<xsd:documentation>Whether the parking space is protected from the weather.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Loading