From 2df02e161f4b4afcb6bd6e17fc1790d239ed4111 Mon Sep 17 00:00:00 2001 From: Benedikt Schwab Date: Mon, 4 Mar 2024 17:05:15 +0100 Subject: [PATCH] added generic attributes for rotation --- .../roadspaces2citygml/module/BuildingModuleBuilder.kt | 3 +++ .../module/CityFurnitureModuleBuilder.kt | 7 +++---- .../roadspaces2citygml/module/GenericsModuleBuilder.kt | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/BuildingModuleBuilder.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/BuildingModuleBuilder.kt index c6035aa2..12fdc94d 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/BuildingModuleBuilder.kt +++ b/rtron-transformer/src/main/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/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/CityFurnitureModuleBuilder.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/CityFurnitureModuleBuilder.kt index 9988853a..f90673e9 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/CityFurnitureModuleBuilder.kt +++ b/rtron-transformer/src/main/kotlin/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/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/GenericsModuleBuilder.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/GenericsModuleBuilder.kt index f1c4cb4c..83ebc042 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/GenericsModuleBuilder.kt +++ b/rtron-transformer/src/main/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