Merge branch 'beta7' into 'master'

Beta7

See merge request energy-ade/energy-ade-2-3dcitydb!2

.idea/gradle.xml

@@ -7,10 +7,10 @@
         <compositeConfiguration>
           <compositeBuild compositeDefinitionSource="SCRIPT">
             <builds>
-              <build path="$PROJECT_DIR$/../energy-ade2-citygml4j" name="energy-ade2-citygml4j">
+              <build path="$PROJECT_DIR$/../energy-ade-2-citygml4j" name="energy-ade2-citygml4j">
                 <projects>
-                  <project path="$PROJECT_DIR$/../energy-ade2-citygml4j" />
-                  <project path="$PROJECT_DIR$/../energy-ade2-citygml4j/energy-ade-samples" />
+                  <project path="$PROJECT_DIR$/../energy-ade-2-citygml4j" />
+                  <project path="$PROJECT_DIR$/../energy-ade-2-citygml4j/energy-ade-samples" />
                 </projects>
               </build>
             </builds>
@@ -21,8 +21,8 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/../energy-ade2-citygml4j" />
-            <option value="$PROJECT_DIR$/../energy-ade2-citygml4j/energy-ade-samples" />
+            <option value="$PROJECT_DIR$/../energy-ade-2-citygml4j" />
+            <option value="$PROJECT_DIR$/../energy-ade-2-citygml4j/energy-ade-samples" />
           </set>
         </option>
       </GradleProjectSettings>

.idea/misc.xml

@@ -4,6 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$/../digitwins4peds" />
     <file type="web" url="file://$PROJECT_DIR$" />
+    <file type="web" url="file://$PROJECT_DIR$/../energy-ade-2-citygml4j" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="liberica-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />

README.md

@@ -13,7 +13,7 @@ Priority List:
 -  DataType
 -  Core
 -  Resource
--  UrbanFunctionAreas
+-  UrbanFunctionArea
 -  WeatherStation
 -  Layered Construction
 -  Schedule

settings.gradle

-rootProject.name = 'energy-ade2-citydb'
-includeBuild '../energy-ade2-citygml4j'
\ No newline at end of file
+rootProject.name = 'energy-ade-2-citydb'
+includeBuild '../energy-ade-2-citygml4j'
\ No newline at end of file