Extracted more CityGml data Issue#386 Issue#356 (#403)

amosproj · Jul 14, 2024 · a93a738 · a93a738
2 parents 7a7b6d6 + 9c644d2
commit a93a738
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 4 deletions.
diff --git a/backend/src/BIE.DataPipeline/DbHelper.cs b/backend/src/BIE.DataPipeline/DbHelper.cs
@@ -312,9 +312,12 @@ Id INT PRIMARY KEY IDENTITY(1,1),
         DistrictKey VARCHAR(255),
         CheckDate DATE,
         GroundArea FLOAT,
+        BuildingVolume FLOAT,
         BuildingWallHeight FLOAT,
+        WallArea FLOAT,
         LivingArea FLOAT,
         RoofArea FLOAT,
+        SolarPotential FLOAT,
     );
 END";
             }

diff --git a/backend/src/BIE.DataPipeline/Import/CityGmlImporter.cs b/backend/src/BIE.DataPipeline/Import/CityGmlImporter.cs
@@ -123,18 +123,24 @@ public bool ReadLine(out string nextLine)
                 string checkDate = GetBuildingCheckDate(buildingNode);
                 float groundArea = GetBuildingGroundArea(buildingNode);
                 float buildingWallHeight = GetBuildingWallHeight(buildingNode);
+                float wallArea = GetWallArea(buildingNode);
+                float buildingVolume = GetBuildingVolume(buildingNode, groundArea, buildingWallHeight);
                 float livingArea = GetLivingArea(buildingNode, groundArea, buildingWallHeight);
                 float roofArea = GetRoofArea(buildingNode);
+                float solarPotential = GetSolarPotential(buildingNode, roofArea);
 
                 nextLine = $"geometry::STGeomFromText('{geometry.AsText()}', 4326)";
                 nextLine += string.Format(",'{0}'", buildingNode.InnerXml);
                 nextLine += string.Format(",'{0}'", groundHeight.ToString(culture));
                 nextLine += string.Format(",'{0}'", districtKey);
                 nextLine += string.Format(",'{0}'", checkDate);
                 nextLine += string.Format(",{0}", groundArea.ToString(culture));
+                nextLine += string.Format(",{0}", buildingVolume.ToString(culture));
                 nextLine += string.Format(",{0}", buildingWallHeight.ToString(culture));
+                nextLine += string.Format(",{0}", wallArea.ToString(culture));
                 nextLine += string.Format(",{0}", livingArea.ToString(culture));
                 nextLine += string.Format(",{0}", roofArea.ToString(culture));
+                nextLine += string.Format(",{0}", solarPotential.ToString(culture));
 
                 this.buildingIndex++;
                 return true;
@@ -307,18 +313,59 @@ private float GetBuildingGroundArea(XmlNode buildingNode)
             return res;
         }
 
+        private float GetBuildingVolume(XmlNode buildingNode, float groundArea, float wallHeight)
+        {
+            float wallVolume = groundArea * wallHeight;
+            float roofHeight = GetBuildingRoofHeight(buildingNode);
+            float averageRoofAngle = GetAverageRoofAngle(buildingNode);
+            float roofFactor = (1 - (averageRoofAngle / 90)); //scale the averageRoofange between 0 and 1 where 0 is 90 degress (flat roof) and 1 is 0 degree (steep roof)
+            float roofVolume = groundArea * roofHeight * roofFactor;
+            return wallVolume + roofVolume;
+        }
+
+        private float GetBuildingRoofHeight(XmlNode buildingNode)
+        {
+            float niedrigsteTraufeDesGebaeudes = GetStringAttributeValue(buildingNode, "NiedrigsteTraufeDesGebaeudes");
+            float hoeheDach = GetStringAttributeValue(buildingNode, "HoeheDach");
+            if (hoeheDach == -1 || niedrigsteTraufeDesGebaeudes == -1)
+            {
+                return -1;
+            }
+            else
+            {
+                return hoeheDach - niedrigsteTraufeDesGebaeudes;
+            }
+        }
+
         private float GetBuildingWallHeight(XmlNode buildingNode)
         {
             float hoeheGrund = GetStringAttributeValue(buildingNode, "HoeheGrund");
             float niedrigsteTraufeDesGebaeudes = GetStringAttributeValue(buildingNode, "NiedrigsteTraufeDesGebaeudes");
-            if(hoeheGrund == -1 || niedrigsteTraufeDesGebaeudes == -1)
+            float hoeheDach = GetStringAttributeValue(buildingNode, "HoeheDach");
+            if(hoeheGrund == -1 || niedrigsteTraufeDesGebaeudes == -1 || hoeheDach == -1)
             {
                 return -1;
             }
             else
             {
-                return niedrigsteTraufeDesGebaeudes - hoeheGrund;
+                return ((niedrigsteTraufeDesGebaeudes - hoeheGrund) + (hoeheDach - hoeheGrund)) / 2f;
+            }
+        }
+
+        private float GetWallArea(XmlNode buildingNode)
+        {
+            XmlNodeList wallNodes = buildingNode.SelectNodes(".//bldg:WallSurface", this.nsmgr);
+            float wallArea = 0;
+            foreach (XmlNode wallNode in wallNodes)
+            {
+                float wallTileArea = GetStringAttributeValue(wallNode, "Flaeche");
+                if (wallTileArea != -1)
+                {
+                    wallArea += wallTileArea;
+                }
             }
+
+            return wallArea;
         }
 
         private float GetLivingArea(XmlNode buildingNode, float groundArea, float buildingWallHeight)
@@ -332,6 +379,24 @@ private float GetLivingArea(XmlNode buildingNode, float groundArea, float buildi
             return groundArea * (float)Math.Ceiling(buildingWallHeight / averageFloorHeight);
         }
 
+        private float GetAverageRoofAngle(XmlNode buildingNode)
+        {
+            XmlNodeList roofNodes = buildingNode.SelectNodes(".//bldg:RoofSurface", this.nsmgr);
+            float roofAngle = 0;
+            float numAngle = 0;
+            foreach (XmlNode roofNode in roofNodes)
+            {
+                float roofTileAngle = GetStringAttributeValue(roofNode, "Dachneigung");
+                if (roofTileAngle != -1)
+                {
+                    numAngle++;
+                    roofAngle += roofTileAngle;
+                }
+            }
+
+            return roofAngle / numAngle;
+        }
+
         private float GetRoofArea(XmlNode buildingNode)
         {
             XmlNodeList roofNodes = buildingNode.SelectNodes(".//bldg:RoofSurface", this.nsmgr);
@@ -389,5 +454,10 @@ private float ParseArea(XmlNode node)
 
             return result;
         }
+
+        private float GetSolarPotential(XmlNode node, float roofArea)
+        {
+            return roofArea * 0.5f; //dummy function
+        }
     }
 }
diff --git a/backend/src/BIE.DataPipeline/Program.cs b/backend/src/BIE.DataPipeline/Program.cs
@@ -84,8 +84,7 @@
 
         case "CITYGML":
             importer = new CityGmlImporter(description, dbHelper);
-            dbHelper.SetInfo(description.table_name,
-                             "Location, XmlData, GroundHeight, DistrictKey, CheckDate, GroundArea, BuildingWallHeight, LivingArea, RoofArea");
+            dbHelper.SetInfo(description.table_name, "Location, XmlData, GroundHeight, DistrictKey, CheckDate, GroundArea, BuildingVolume, BuildingWallHeight, WallArea, LivingArea, RoofArea, SolarPotential");
             break;
 
         default: