Skip to content

Commit 58b2e31

Browse files
benediktschwabbenediktschwab
committed
mapped deprecated object according v1.8.1 suggestions
1 parent d017df5 commit 58b2e31

File tree

8 files changed

+15
-34
lines changed

8 files changed

+15
-34
lines changed

‎rtron-model/src/main/kotlin/io/rtron/model/opendrive/objects/Enumerations.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ enum class EObjectType {
3232
BARRIER,
3333
BUILDING,
3434
PARKING_SPACE,
35-
PATCH,
36-
RAILING,
3735
TRAFFIC_ISLAND,
3836
CROSSWALK,
39-
STREET_LAMP,
4037
GANTRY,
41-
SOUND_BARRIER,
4238
ROAD_MARK,
4339
ROAD_SURFACE,
4440
}

‎rtron-model/src/main/kotlin/io/rtron/model/roadspaces/roadspace/objects/RoadObjectType.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@ enum class RoadObjectType {
2525
BARRIER,
2626
BUILDING,
2727
PARKING_SPACE,
28-
PATCH,
29-
RAILING,
3028
TRAFFIC_ISLAND,
3129
CROSSWALK,
32-
STREET_LAMP,
3330
GANTRY,
34-
SOUND_BARRIER,
3531
ROAD_MARK,
3632
ROAD_SURFACE,
3733
SIGNAL,

‎rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive14/Opendrive14ObjectMapper.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,15 @@ abstract class Opendrive14ObjectMapper {
8282
in EObjectType.BARRIER.name.toUpperCaseVariations() -> EObjectType.BARRIER
8383
in EObjectType.BUILDING.name.toUpperCaseVariations() -> EObjectType.BUILDING
8484
in EObjectType.PARKING_SPACE.name.toUpperCaseVariations() -> EObjectType.PARKING_SPACE
85-
in EObjectType.PATCH.name.toUpperCaseVariations() -> EObjectType.PATCH
86-
in EObjectType.RAILING.name.toUpperCaseVariations() -> EObjectType.RAILING
85+
in "patch" -> EObjectType.ROAD_SURFACE
86+
in "railing" -> EObjectType.BARRIER
8787
in EObjectType.TRAFFIC_ISLAND.name.toUpperCaseVariations() -> EObjectType.TRAFFIC_ISLAND
8888
in EObjectType.CROSSWALK.name.toUpperCaseVariations() -> EObjectType.CROSSWALK
89-
in EObjectType.STREET_LAMP.name.toUpperCaseVariations() -> EObjectType.STREET_LAMP
89+
in "streetLamp" -> EObjectType.POLE
9090
in EObjectType.GANTRY.name.toUpperCaseVariations() -> EObjectType.GANTRY
91-
in EObjectType.SOUND_BARRIER.name.toUpperCaseVariations() -> EObjectType.SOUND_BARRIER
91+
in "soundBarrier" -> EObjectType.BARRIER
9292
in EObjectType.ROAD_MARK.name.toUpperCaseVariations() -> EObjectType.ROAD_MARK
93+
in "wind" -> EObjectType.POLE
9394
else -> EObjectType.NONE
9495
}
9596
}

‎rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16ObjectMapper.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ abstract class Opendrive16ObjectMapper {
108108
fun mapObjectTypeToOption(source: E_ObjectType?): Option<EObjectType> = source?.let { mapObjectType(it).some() } ?: None
109109

110110
@ValueMapping(source = "CAR", target = "NONE")
111+
@ValueMapping(source = "PATCH", target = "ROAD_SURFACE")
112+
@ValueMapping(source = "RAILING", target = "BARRIER")
113+
@ValueMapping(source = "STREET_LAMP", target = "POLE")
114+
@ValueMapping(source = "SOUND_BARRIER", target = "BARRIER")
111115
@ValueMapping(source = "VAN", target = "NONE")
112116
@ValueMapping(source = "BUS", target = "NONE")
113117
@ValueMapping(source = "TRAILER", target = "NONE")
@@ -116,6 +120,6 @@ abstract class Opendrive16ObjectMapper {
116120
@ValueMapping(source = "TRAM", target = "NONE")
117121
@ValueMapping(source = "TRAIN", target = "NONE")
118122
@ValueMapping(source = "PEDESTRIAN", target = "NONE")
119-
@ValueMapping(source = "WIND", target = "NONE")
123+
@ValueMapping(source = "WIND", target = "POLE")
120124
abstract fun mapObjectType(source: E_ObjectType): EObjectType
121125
}

‎rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive18/Opendrive18ObjectMapper.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ abstract class Opendrive18ObjectMapper {
114114
fun mapObjectTypeToOption(source: E_ObjectType?): Option<EObjectType> = source?.let { mapObjectType(it).some() } ?: None
115115

116116
@ValueMapping(source = "CAR", target = "NONE")
117+
@ValueMapping(source = "PATCH", target = "ROAD_SURFACE")
118+
@ValueMapping(source = "RAILING", target = "BARRIER")
119+
@ValueMapping(source = "STREET_LAMP", target = "POLE")
120+
@ValueMapping(source = "SOUND_BARRIER", target = "BARRIER")
117121
@ValueMapping(source = "VAN", target = "NONE")
118122
@ValueMapping(source = "BUS", target = "NONE")
119123
@ValueMapping(source = "TRAILER", target = "NONE")
@@ -122,6 +126,6 @@ abstract class Opendrive18ObjectMapper {
122126
@ValueMapping(source = "TRAM", target = "NONE")
123127
@ValueMapping(source = "TRAIN", target = "NONE")
124128
@ValueMapping(source = "PEDESTRIAN", target = "NONE")
125-
@ValueMapping(source = "WIND", target = "NONE")
129+
@ValueMapping(source = "WIND", target = "POLE")
126130
abstract fun mapObjectType(source: E_ObjectType): EObjectType
127131
}

‎rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/opendrive2roadspaces/roadspaces/RoadspaceObjectBuilder.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,9 @@ class RoadspaceObjectBuilder(
172172
EObjectType.BARRIER -> RoadObjectType.BARRIER
173173
EObjectType.BUILDING -> RoadObjectType.BUILDING
174174
EObjectType.PARKING_SPACE -> RoadObjectType.PARKING_SPACE
175-
EObjectType.PATCH -> RoadObjectType.PATCH
176-
EObjectType.RAILING -> RoadObjectType.RAILING
177175
EObjectType.TRAFFIC_ISLAND -> RoadObjectType.TRAFFIC_ISLAND
178176
EObjectType.CROSSWALK -> RoadObjectType.CROSSWALK
179-
EObjectType.STREET_LAMP -> RoadObjectType.STREET_LAMP
180177
EObjectType.GANTRY -> RoadObjectType.GANTRY
181-
EObjectType.SOUND_BARRIER -> RoadObjectType.SOUND_BARRIER
182178
EObjectType.ROAD_MARK -> RoadObjectType.ROAD_MARK
183179
EObjectType.ROAD_SURFACE -> RoadObjectType.ROAD_SURFACE
184180
}

‎rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/CodeAdder.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,9 @@ object CodeAdder {
169169
RoadObjectType.BARRIER -> emptyList()
170170
RoadObjectType.BUILDING -> emptyList()
171171
RoadObjectType.PARKING_SPACE -> listOf(TrafficAreaFunctionCode.PARKING_LAY_BY)
172-
RoadObjectType.PATCH -> emptyList()
173-
RoadObjectType.RAILING -> emptyList()
174172
RoadObjectType.TRAFFIC_ISLAND -> emptyList()
175173
RoadObjectType.CROSSWALK -> listOf(TrafficAreaFunctionCode.CROSSWALK)
176-
RoadObjectType.STREET_LAMP -> emptyList()
177174
RoadObjectType.GANTRY -> emptyList()
178-
RoadObjectType.SOUND_BARRIER -> emptyList()
179175
RoadObjectType.ROAD_MARK -> emptyList()
180176
RoadObjectType.ROAD_SURFACE -> emptyList()
181177
RoadObjectType.SIGNAL -> emptyList()
@@ -191,13 +187,9 @@ object CodeAdder {
191187
RoadObjectType.BARRIER -> emptyList()
192188
RoadObjectType.BUILDING -> emptyList()
193189
RoadObjectType.PARKING_SPACE -> listOf(AuxiliaryTrafficAreaFunctionCode.PARKING_BAY)
194-
RoadObjectType.PATCH -> emptyList()
195-
RoadObjectType.RAILING -> emptyList()
196190
RoadObjectType.TRAFFIC_ISLAND -> listOf(AuxiliaryTrafficAreaFunctionCode.TRAFFIC_ISLAND)
197191
RoadObjectType.CROSSWALK -> emptyList()
198-
RoadObjectType.STREET_LAMP -> emptyList()
199192
RoadObjectType.GANTRY -> emptyList()
200-
RoadObjectType.SOUND_BARRIER -> emptyList()
201193
RoadObjectType.ROAD_MARK -> emptyList()
202194
RoadObjectType.ROAD_SURFACE -> emptyList()
203195
RoadObjectType.SIGNAL -> emptyList()
@@ -213,13 +205,9 @@ object CodeAdder {
213205
RoadObjectType.BARRIER -> emptyList()
214206
RoadObjectType.BUILDING -> emptyList()
215207
RoadObjectType.PARKING_SPACE -> listOf(TrafficAreaUsageCode.CAR)
216-
RoadObjectType.PATCH -> emptyList()
217-
RoadObjectType.RAILING -> emptyList()
218208
RoadObjectType.TRAFFIC_ISLAND -> emptyList()
219209
RoadObjectType.CROSSWALK -> listOf(TrafficAreaUsageCode.PEDESTRIAN)
220-
RoadObjectType.STREET_LAMP -> emptyList()
221210
RoadObjectType.GANTRY -> emptyList()
222-
RoadObjectType.SOUND_BARRIER -> emptyList()
223211
RoadObjectType.ROAD_MARK -> emptyList()
224212
RoadObjectType.ROAD_SURFACE -> emptyList()
225213
RoadObjectType.SIGNAL -> emptyList()

‎rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/router/RoadspaceObjectRouter.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,9 @@ object RoadspaceObjectRouter {
6666
RoadObjectType.BARRIER -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE
6767
RoadObjectType.BUILDING -> CitygmlTargetFeatureType.BUILDING_BUILDING
6868
RoadObjectType.PARKING_SPACE -> CitygmlTargetFeatureType.TRANSPORTATION_TRAFFICSPACE
69-
RoadObjectType.PATCH -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE
70-
RoadObjectType.RAILING -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE
7169
RoadObjectType.TRAFFIC_ISLAND -> CitygmlTargetFeatureType.TRANSPORTATION_AUXILIARYTRAFFICSPACE
7270
RoadObjectType.CROSSWALK -> CitygmlTargetFeatureType.TRANSPORTATION_TRAFFICSPACE
73-
RoadObjectType.STREET_LAMP -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE
7471
RoadObjectType.GANTRY -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE
75-
RoadObjectType.SOUND_BARRIER -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE
7672
RoadObjectType.ROAD_MARK -> CitygmlTargetFeatureType.TRANSPORTATION_MARKING
7773
RoadObjectType.ROAD_SURFACE -> CitygmlTargetFeatureType.TRANSPORTATION_TRAFFICSPACE
7874
RoadObjectType.SIGNAL -> CitygmlTargetFeatureType.CITYFURNITURE_CITYFURNITURE

0 commit comments

Comments
 (0)