Issue #121 Norway Wheelchair equipment fix3 - rebased on Master#123
Issue #121 Norway Wheelchair equipment fix3 - rebased on Master#123nick-knowles wants to merge 9 commits intoNeTEx-CEN:masterfrom
Conversation
Non material chaneg to test workklow
1.1.1 becomes 1.1.1 , 1.2 as 1.1.2
…nd AccessVehicelEquipment Correct wrong suppertyupes Corectct inconstisent name for WheechairVehicleEUipmentRef (old name
1 similar comment
| <File FilePath="examples\functions\fares\Netex_91.1_Rail_RailCard_MultipleProduct.xml" HomeFolder="Yes"/> | ||
| </Folder> | ||
| <Folder FolderName="bus"> | ||
| <Folder FolderName="uk"> |
There was a problem hiding this comment.
I suggest not to update NeTEx.spp
| @@ -3,16 +3,8 @@ | |||
|
|
|||
There was a problem hiding this comment.
I suggest not to update README.md from such an old PR
| </xsd:annotation> | ||
| <!-- ======================================================================= --> | ||
| <!-- ======================================================================= --> | ||
| <xsd:complexType name="vehicleEquipments_RelStructure"> |
There was a problem hiding this comment.
Already exists and even in an extended form:
<xsd:complexType name="vehicleEquipments_RelStructure">
xsd:annotation
xsd:documentationList of VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
xsd:complexContent
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="AccessVehicleEquipment"/>
<xsd:element ref="WheelchairVehicleEquipment"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ====ACCESS=====
| </xsd:simpleType> | ||
| <xsd:element name="VehicleEquipmentRef" type="InstalledEquipmentRefStructure" substitutionGroup="PassengerEquipmentRef"> | ||
| <xsd:annotation> | ||
| <xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation> |
There was a problem hiding this comment.
should stay in (if git can find it)
| </xsd:element> | ||
| <xsd:complexType name="VehicleEquipmentRefStructure" abstract="true"> | ||
| <xsd:annotation> | ||
| <xsd:documentation>Type for a reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation> |
| </xsd:annotation> | ||
| <xsd:restriction base="VehicleEquipmentIdType"/> | ||
| </xsd:simpleType> | ||
| <xsd:element name="WheelchairVehicleRef" type="InstalledEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef"> |
| <xsd:documentation>Reference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation> | ||
| </xsd:annotation> | ||
| </xsd:element> | ||
| <xsd:complexType name="WheelchairVehicleRefStructure" abstract="false"> |
There was a problem hiding this comment.
It is in master, but differently (different type). Needs to be discussed.
<xsd:element name="WheelchairVehicleRef" type="InstalledEquipmentRefStructure" substitutionGroup="VehicleEquipmentRef">
xsd:annotation
xsd:documentationReference to a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
| <xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/> | ||
| <xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/> | ||
| <xsd:include schemaLocation="netex_vehicleType_support.xsd"/> | ||
| <xsd:group name="VehicleEquipmentChoice"> |
There was a problem hiding this comment.
still there in master, but used nowhere. So we could remove it.
| </xsd:complexContent> | ||
| </xsd:complexType> | ||
| <!-- ====ACCESS=================================================================== --> | ||
| <xsd:element name="ActualVehicleEquipment" type="ActualVehicleEquipment_VersionStructure" abstract="true" substitutionGroup="PassengerEquipment"> |
| <!-- ====ACCESS=================================================================== --> | ||
| <xsd:element name="ActualVehicleEquipment" type="ActualVehicleEquipment_VersionStructure" abstract="true" substitutionGroup="PassengerEquipment"> | ||
| <!-- =========== ACCESS VEHICLE EQUIPMENT =========================================== --> | ||
| <xsd:element name="VehicleEquipment" substitutionGroup="PassengerEquipment"> |
There was a problem hiding this comment.
new to master. may have impact on other things
| <xsd:element name="VehicleEquipment" substitutionGroup="PassengerEquipment"> | ||
| <xsd:annotation> | ||
| <xsd:documentation>An item of EQUIPMENT of a particular type actually available in an individual VEHICLE.</xsd:documentation> | ||
| <xsd:documentation>Specialisation of VEHICLE EQUIPMENT for ACCESS providing information such as low floor, ramp, access area dimensions, etc.</xsd:documentation> |
There was a problem hiding this comment.
shouldn't it be AccessVehicleEquipment in that case?
| <xsd:group ref="AccessVehicleEquipmentAdditionalGroup"/> | ||
| </xsd:sequence> | ||
| </xsd:group> | ||
| <xsd:group name="AccessVehicleEquipmentGroup2"> |
| <xsd:enumeration value="naturalGas"/> | ||
| <xsd:enumeration value="biodiesel"/> | ||
| <xsd:enumeration value="electricity"/> | ||
| <xsd:enumeration value="electricContact"/> |
There was a problem hiding this comment.
changing things here may break the whole thing.
|
I think @Aurige needs to check as well. Some parts need to be removed from the PR and the rest could then be submitted. |
| </xsd:extension> | ||
| </xsd:complexContent> | ||
| </xsd:complexType> | ||
| <xsd:group name="ActualVehicleEquipmentGroup"> |
There was a problem hiding this comment.
This is also different in master.
|
It looks that we already have what we need ... and there are breaking changes here... I would rather forget this PR |
| <xsd:restriction base="VersionOfObjectRefStructure"> | ||
| <xsd:attribute name="ref" type="ActualVehicleEquipmentIdType" use="required"> | ||
| <xsd:annotation> | ||
| <xsd:documentation>Identifier of a ACTUAL VEHICLE EQUIOMENT.</xsd:documentation> |
There was a problem hiding this comment.
| <xsd:documentation>Identifier of a ACTUAL VEHICLE EQUIOMENT.</xsd:documentation> | |
| <xsd:documentation>Identifier of an ACTUAL VEHICLE EQUIPMENT.</xsd:documentation> |
xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
Outdated
Show resolved
Hide resolved
xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
Outdated
Show resolved
Hide resolved
…_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de>
…_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de>
|
As said before, it's an old PR that is already mostly covered... I would close this one The only good thing looks to be the But since an actualVehicleEquipment is an equipment that's just adding a constraint, not adding a new feature. We may to a separated PR for this. |
|
rest done #622 |
4 participants
Errors in VehicleType / ActualVehicleEquipment, WheelchairVehicleEquipment , AccessVehicleEquipment