Commit 58bb25ba authored by András Wippelhauser's avatar András Wippelhauser
Browse files

Minor refactor: use ObjectDimension and fix EvSEID

parent cbde0635
Loading
Loading
Loading
Loading
+7 −42
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ BEGIN

IMPORTS 

BasicContainer, ItsPduHeader, Identifier2B, ParkingSpaceStatus, StandardLength12b, TimestampIts, StationId, Wgs84Angle, DeltaPosition, Path, DeltaTimeTenthOfSecond, StandardLength1B, GeoPosition, ParkingReservationType, ParkingAreaArrangementType, ParkingOccupancyInfo, ParkingSpaceBasic, DeltaPositions, MessageSegmentationInfo
BasicContainer, ItsPduHeader, Identifier2B, ParkingSpaceStatus, StandardLength12b, TimestampIts, StationId, Wgs84Angle, DeltaPosition, Path, DeltaTimeTenthOfSecond, StandardLength1B, GeoPosition, ParkingReservationType, ParkingAreaArrangementType, ParkingOccupancyInfo, ParkingSpaceBasic, DeltaPositions, MessageSegmentationInfo, ObjectDimension
FROM ETSI-ITS-CDD {
    itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) 102894 cdd (2) major-version-4 (4) minor-version-2 (2)
}
@@ -193,7 +193,7 @@ ParkingSpaceSegment ::= SEQUENCE {
/**
 * This DF represents external ids
 * 
 * @field evId: Identifier of the electric charing space. -> Reference to ISO standard
 * @field evSEId: Electric Vehicle Supply Equipment Identification, as defined in ISO 15118.
 * 
 * @field parkingSpaceId: The identifier of the parking space, as defined in the ParkingSpaceBasic data frame.
 *
@@ -201,7 +201,7 @@ ParkingSpaceSegment ::= SEQUENCE {
 * @revision: Created in V2.1.1
 */
ExternalParkingSpaceIdentifiers ::= SEQUENCE {
    evId            EvId OPTIONAL,
    evSEId          IA5String SIZE(1..36) OPTIONAL,
    parkingSpaceId  Identifier2B OPTIONAL,
    ...
}
@@ -287,46 +287,11 @@ ParkingSpaceAttributes ::= SEQUENCE {
 */

ParkingSpaceSize ::= SEQUENCE {
    observedWidth           StandardLength1BWithConfidence OPTIONAL,
    observedLength          StandardLength1BWithConfidence OPTIONAL,
    nominalWidth            StandardLength1BWithConfidence OPTIONAL,
    nominalLength           StandardLength1BWithConfidence OPTIONAL
    observedWidth           ObjectDimension OPTIONAL,
    observedLength          ObjectDimension OPTIONAL,
    nominalWidth            ObjectDimension OPTIONAL,
    nominalLength           ObjectDimension OPTIONAL
}

-- Move to CDD

/**
 * This DE represents the electric vehicle charging station id
 * 
 * @category:
 * @revision: Created in V2.1.1
 */
EvId ::= INTEGER(0..4294967295) -- TODO: figure out real evids -> its is Identifier2b in CDD parking

/**
* This DE represents a standard length with an associated confidence value
*
* @field length: The value of the length.
*
* @field confidence: The confidence value with 95% level.
* @category:
* @revision: Created in V2.1.1
*/
StandardLength1BWithConfidence ::= SEQUENCE {
    length      StandardLength1B,
    confidence  StandardLength1BConfidence
}

/**
* This DE represents the 95% confidence value.
*
* @unit: 0.1 metre
* @category:
* @revision: Created in V2.1.1
*/
StandardLength1BConfidence ::= INTEGER {
    oneDecimeter (1),
    unavailable (15)
} (0..15)

END