added generic attributes for rotation

tum-gis · Mar 4, 2024 · 2df02e1 · 2df02e1
1 parent 4d6df17
commit 2df02e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.../kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/BuildingModuleBuilder.kt b/.../kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/BuildingModuleBuilder.kt
@@ -57,6 +57,9 @@ class BuildingModuleBuilder(
         // geometry
         val pointGeometryTransformer = GeometryTransformer.of(roadspaceObject.pointGeometry, parameters)
         buildingFeature.populateLod1ImplicitGeometry(pointGeometryTransformer)
+        pointGeometryTransformer.rotation.onSome {
+            attributesAdder.addRotationAttributes(it, buildingFeature)
+        }
 
         roadspaceObject.boundingBoxGeometry.onSome { currentBoundingBoxGeometry ->
             val geometryTransformer = GeometryTransformer.of(currentBoundingBoxGeometry, parameters)

diff --git a/...in/io/rtron/transformer/converter/roadspaces2citygml/module/CityFurnitureModuleBuilder.kt b/...in/io/rtron/transformer/converter/roadspaces2citygml/module/CityFurnitureModuleBuilder.kt
@@ -48,6 +48,9 @@ class CityFurnitureModuleBuilder(
         // geometry
         val pointGeometryTransformer = GeometryTransformer.of(roadspaceObject.pointGeometry, parameters)
         cityFurnitureFeature.populateLod1ImplicitGeometry(pointGeometryTransformer)
+        pointGeometryTransformer.rotation.onSome {
+            attributesAdder.addRotationAttributes(it, cityFurnitureFeature)
+        }
 
         roadspaceObject.boundingBoxGeometry.onSome { currentBoundingBoxGeometry ->
             val geometryTransformer = GeometryTransformer.of(currentBoundingBoxGeometry, parameters)
@@ -75,10 +78,6 @@ class CityFurnitureModuleBuilder(
                         wasFixed = true
                     )
                 }
-
-            geometryTransformer.rotation.onSome {
-                attributesAdder.addRotationAttributes(it, cityFurnitureFeature)
-            }
         }
 
         // semantics

diff --git a/.../kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/GenericsModuleBuilder.kt b/.../kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/GenericsModuleBuilder.kt
@@ -60,6 +60,9 @@ class GenericsModuleBuilder(
         // geometry
         val pointGeometryTransformer = GeometryTransformer.of(roadspaceObject.pointGeometry, parameters)
         genericOccupiedSpaceFeature.populateLod1ImplicitGeometry(pointGeometryTransformer)
+        pointGeometryTransformer.rotation.onSome {
+            attributesAdder.addRotationAttributes(it, genericOccupiedSpaceFeature)
+        }
 
         roadspaceObject.boundingBoxGeometry.onSome { currentBoundingBoxGeometry ->
             val geometryTransformer = GeometryTransformer.of(currentBoundingBoxGeometry, parameters)
@@ -87,9 +90,6 @@ class GenericsModuleBuilder(
                         wasFixed = true
                     )
                 }
-            geometryTransformer.rotation.onSome {
-                attributesAdder.addRotationAttributes(it, genericOccupiedSpaceFeature)
-            }
         }
 
         // semantics