update green enricher

enrich-citygml-with-greenarea/src/main/java/de/hft/stuttgart/citygml/green/alkis/AlkisGreenEnricher.java

@@ -91,7 +91,7 @@ public class AlkisGreenEnricher {
 		
 		String inputString = inFile.getFileName().toString();
 		String inputPathWithoutFileEnding = inputString.substring(0, inputString.lastIndexOf('.'));
-		Path outputPath = Paths.get("data", inputPathWithoutFileEnding + "_with_alkis_greens.gml");
+		Path outputPath = Paths.get("data", inputPathWithoutFileEnding + "_with_alkis_greens_realistic.gml");
 		System.out.println("Writing output file.");
 		GreenEnricher.writeCityGML(cityModel, outputPath);
 		System.out.println("Done");

enrich-citygml-with-greenarea/src/main/java/de/hft/stuttgart/citygml/green/osm/TreeKatasterData.java

@@ -65,8 +65,11 @@ public class TreeKatasterData {
 				if (trunkCirc == null) {
 					continue;
 				}
-				tree.setTrunkRadius(Integer.parseInt(trunkCirc.toString()) / (2 * Math.PI) / 100);
-
+				int circInCm = Integer.parseInt(trunkCirc.toString());
+				if (circInCm == 0) {
+					circInCm = 89;
+				}
+				tree.setTrunkRadius(circInCm / (2 * Math.PI) / 100);
 				result.getTrees().add(tree);
 			}
 		}

enrich-citygml-with-greenarea/src/main/java/de/hft/stuttgart/citygml/green/osm/TreeUtils.java

@@ -16,11 +16,15 @@ import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
 public class TreeUtils {
 	
 	public static void insertTrees(CityModel cityModel, OsmData osmData) throws IOException {
-		TreeKatasterData katasterData = TreeKatasterData.parseTreeKatasterData(Paths.get("data", "Baum.shp"));
+		TreeKatasterData katasterData = TreeKatasterData.parseTreeKatasterData(Paths.get("data", "Trees_realisticScenario_20240201.shp"));
 		generateTreesFromKataster(cityModel, katasterData);
 
+//		TreeKatasterData katasterData2 = TreeKatasterData.parseTreeKatasterData(Paths.get("data", "Trees_realistic_20240201.shp"));
+//		generateTreesFromKataster(cityModel, katasterData2);
+
 		// All kataster trees are taken, osm trees are removed
 		filterDuplicateTreesFromOSM(osmData, katasterData);
+//		filterDuplicateTreesFromOSM(osmData, katasterData2);
 		
 		generateTreesFromOSM(cityModel, osmData);
 
@@ -52,7 +56,7 @@ public class TreeUtils {
 			MultiSurface generatedTree = TreeGenerator.generateTree(coordinate, trunkRadius, trunkHeight, crownRadius,
 					crownRadius, crownHeight);
 			SolitaryVegetationObject cover = new SolitaryVegetationObject();
-			cover.setSpecies(new Code("Acer campestre"));
+			cover.setSpecies(new Code("Acer platanoides"));
 			cover.setId(UUID.randomUUID().toString());
 			cover.setLod2MultiSurface(new MultiSurfaceProperty(generatedTree));
 			cityModel.getCityObjectMembers().add(new AbstractCityObjectProperty(cover));

enrich-citygml-with-greenarea/src/test/java/de/hft/stuttgart/citygml/green/alkis/AlkisGreenEnricherTest.java

@@ -13,7 +13,7 @@ class AlkisGreenEnricherTest {
 
 	@Test
 	void testAlkisGreen() throws IOException, CityGMLContextException, CityGMLReadException, JAXBException, CityGMLWriteException {
-		String[] args = new String[] {"data/Grombühl_v3.gml"};
+		String[] args = new String[] {"data/Grombühl_v4_case_study.gml"};
 		
 		AlkisGreenEnricher.main(args);
 	}