Merge branch 'main' of github.com:alexandre-bry/Inclusive-TU-Delft-Map

Author: Lars van Blokland

README.md

@@ -10,4 +10,4 @@ You can also find more information about it in the [about page of the website](h
 
 ## Documentation
 
-The documentation is hosted at: <https://alexandre-bry.github.io/Inclusive-TU-Delft-Map/>.
+The documentation is hosted at: <https://tudelft3d.github.io/Inclusive-TU-Delft-Map/>.

mkdocs.yml

@@ -1,7 +1,7 @@
 site_name: Inclusive 3D Campus Map of TU Delft
 
-repo_name: alexandre-bry/Inclusive-TU-Delft-Map
-repo_url: https://github.com/alexandre-bry/Inclusive-TU-Delft-Map
+repo_name: tudelft3d/Inclusive-TU-Delft-Map
+repo_url: https://github.com/tudelft3d/Inclusive-TU-Delft-Map
 edit_uri: edit/main/docs/
 
 theme:

python/src/data_pipeline/cj_helpers/cj_attributes.py

@@ -246,7 +246,10 @@ def __init__(
         if len(self.unit_storeys) == 0:
             unit_storeys_set: set[str] = set()
             for space in self.unit_spaces:
-                storey = ".".join(space.split(".")[:-1])
+                space_split = space.split(".")
+                if len(space.split(".")) < 3:
+                    continue
+                storey = ".".join(space_split[:3])
                 unit_storeys_set.add(storey)
             self.unit_storeys = list(unit_storeys_set)
 

python/src/data_pipeline/cj_writing/bag_to_cj.py

@@ -207,8 +207,6 @@ def _process_bag_element(
             ):
                 space_id = bdg_attributes.space_id
                 obj_key = Building.key_to_cj_key(key=bdg_attributes.cj_key)
-                print(f"{space_id = }")
-                print(f"{bdg_attributes.bag_ids = }")
 
                 geoms = _process_bag_element(
                     obj_key=obj_key,
@@ -255,11 +253,11 @@ def _process_bag_element(
                 CityJSONObject.add_parent_child(parent=bdg_obj, child=main_container)
 
             z_container_id = BuildingUnitContainer.unit_code_to_cj_key(
-                code="BS", prefix=prefix
+                code="BS-SP", prefix=prefix
             )
             if z_container_id not in all_objects_cj:
                 z_container = BuildingUnitContainer(
-                    cj_key=z_container_id, unit_code="BS"
+                    cj_key=z_container_id, unit_code="BS-SP"
                 )
                 all_objects_cj[z_container_id] = z_container
                 CityJSONObject.add_parent_child(
@@ -272,12 +270,12 @@ def _process_bag_element(
             units_same_code = len(z_container.children_ids)
 
             obj_key = BuildingUnit.unit_code_to_cj_key(
-                code="BS", prefix=prefix, index=units_same_code
+                code="BS-SP", prefix=prefix, index=units_same_code
             )
 
             unit = BuildingUnit(
                 cj_key=obj_key,
-                unit_code="BS",
+                unit_code="BS-SP",
                 unit_storeys=[],
                 icon_position=bdgs_sub_attributes.icon_position,
             )
@@ -292,7 +290,6 @@ def _process_bag_element(
         for bag_2d_id in tqdm(
             unprocessed_bag_ids, desc="Processing the remaining buildings"
         ):
-            print(bag_2d_id)
             # Skip the children
             if bag_2d_id[-2] == "-":
                 continue

python/src/data_pipeline/cj_writing/gltf_to_cj.py

@@ -231,13 +231,16 @@ def load_units_from_csv(
             cj_file_pos = spaces_ids_to_pos[space_id]
             space = cj_file.city_objects[cj_file_pos]
             assert isinstance(space, CityJSONSpaceSubclass)
-            if space.geometries is None:
+            if space.geometries is None or len(space.geometries) == 0:
                 continue
-            best_idx = 0
-            for idx in range(1, len(space.geometries)):
-                if space.geometries[idx].lod > space.geometries[best_idx].lod:
+            best_idx = -1
+            best_lod = -1
+            for idx in range(0, len(space.geometries)):
+                if space.geometries[idx].lod > best_lod:
                     best_idx = idx
-            meshes.append(space.geometries[best_idx].to_trimesh())
+                    best_lod = space.geometries[best_idx].lod
+            if best_idx >= 0:
+                meshes.append(space.geometries[best_idx].to_trimesh())
 
         if len(meshes) == 0:
             continue

python/src/data_pipeline/cli.py

@@ -519,7 +519,9 @@ def format_codelist(
             f"There is already a file at {output_json_path.absolute()}. Set `overwrite` to True to overwrite it."
         )
 
-    format_codelist(input_csv_path=input_csv_path, output_json_path=output_json_path)
+    format_codelist_json(
+        input_csv_path=input_csv_path, output_json_path=output_json_path
+    )
 
 
 def setup_logging(verbose: int):

threejs/index.html

@@ -19,6 +19,7 @@
     <link href="./styles/location.css" rel="stylesheet" type="text/css">
     <link href="./styles/infoPane.css" rel="stylesheet" type="text/css">
     <link href="./styles/storeyManager.css" rel="stylesheet" type="text/css">
+    <link href="./styles/attribution.css" rel="stylesheet" type="text/css">
 
     <script type="module" src="./src/header.js" defer></script>
     <script type="module" src="./src/main.js"></script>
@@ -176,7 +177,13 @@
     <div id="basemap-aerial"></div>
 
     <!-- overlay used to dim background when sheet is open -->
-    <div id="layers-overlay" aria-hidden="true"></div>
+    <div id="layers-overlay" aria-hidden="true">    </div>
+
+    <div id="attribution">
+        <p>
+            <a href="https://www.pdok.nl/">PDOK</a> | <a href="https://docs.3dbag.nl/en/copyright">© 3DBAG by tudelft3d and 3DGI</a>
+        </p>
+    </div>
 
 </body>
 

threejs/src/cjHelper.js

@@ -65,6 +65,11 @@ export class CjHelper {
         return type == "Building";
     }
 
+    isBuildingStorey(key) {
+        const type = this.getType(key);
+        return type == "BuildingStorey";
+    }
+
     isBuildingRoom(key) {
         const type = this.getType(key);
         return type == "BuildingRoom";
@@ -264,25 +269,6 @@ export class CjHelper {
         );
     }
 
-    /**
-     * Get the object keys of all the objects of one of the given types.
-     *
-     * @param {string[]} objectTypes
-     * @returns
-     */
-    _getAllObjectKeysFilter(objectTypes) {
-        const allObjectKeys = [];
-        for (const [objectKey, object] of Object.entries(
-            cityjson.CityObjects
-        )) {
-            const objectType = this.getType(objectKey);
-            if (objectTypes.includes(objectType)) {
-                allObjectKeys.push(objectKey);
-            }
-        }
-        return allObjectKeys;
-    }
-
     /**
      * @param {key} buildingKey: The cityjson key of the building object from which the keys of the building unit groups need to be extracted.
      * 
@@ -305,6 +291,32 @@ export class CjHelper {
         return this.getChildrenObjectKeys(buildingUnitMainGroup);
     }
 
+    /**
+     * Get the object keys of all the objects of one of the given types.
+     * Returns all objects if the list is empty.
+     *
+     * @param {string[]} objectTypes
+     * @returns
+     */
+    _getAllObjectKeysFilter(objectTypes) {
+        const allObjectKeys = [];
+        for (const [objectKey, object] of Object.entries(
+            cityjson.CityObjects
+        )) {
+            const objectType = this.getType(objectKey);
+            if (objectTypes.length == 0) {
+                allObjectKeys.push(objectKey);
+            } else if (objectTypes.includes(objectType)) {
+                allObjectKeys.push(objectKey);
+            }
+        }
+        return allObjectKeys;
+    }
+
+    getAllObjectKeys() {
+        return this._getAllObjectKeysFilter([]);
+    }
+
     getAllBuildingsObjectKeys() {
         return this._getAllObjectKeysFilter(["Building"]);
     }

threejs/src/objectPicker.js

@@ -531,50 +531,64 @@ export class ObjectPicker {
             if (unitSpacesObjectKeys.length != 0) {
                 // Case where the unit links to spaces
 
-                unitSpacesMeshes = unitSpacesObjectKeys.map((objectKey) => {
-                    return this.cjHelper.getMesh(objectKey);
-                });
-                const unitSpacesBuildingObjectKeys = unitSpacesObjectKeys.map(
-                    (objectKey) => {
-                        return this.cjHelper.findParentBuildingObjectKey(
+                // unitSpacesMeshes = unitSpacesObjectKeys.map((objectKey) => {
+                //     if (this.cjHelper.isBuildingRoom(objectKey)) {
+                //         return this.cjHelper.getMesh(objectKey);
+                //     } else if (this.cjHelper.isBuildingStorey(objectKey)) {
+                //         const rooms = this.cjHelper.getChildrenObjectKeys(objectKey);
+                //         return rooms.map((roomKey) => {
+                //             return this.cjHelper.getMesh(roomKey);
+                //         });
+                //     } else {
+                //         console.error("The specified object is not a BuildingRoom or BuildingStorey.")
+                //     }
+                // });
+
+                // Find the spaces of the unit and their parent building
+                unitSpacesMeshes = [];
+                const unitSpacesBuildingKeys = [];
+                for (const objectKey of unitSpacesObjectKeys) {
+                    if (this.cjHelper.isBuildingRoom(objectKey)) {
+                        unitSpacesMeshes.push(this.cjHelper.getMesh(objectKey));
+                        unitSpacesBuildingKeys.push(this.cjHelper.findParentBuildingObjectKey(
                             objectKey
-                        );
+                        ));
+                    } else if (this.cjHelper.isBuildingStorey(objectKey)) {
+                        const rooms = this.cjHelper.getChildrenObjectKeys(objectKey);
+                        rooms.forEach((roomKey) => {
+                            unitSpacesMeshes.push(this.cjHelper.getMesh(roomKey));
+                            unitSpacesBuildingKeys.push(this.cjHelper.findParentBuildingObjectKey(
+                                roomKey
+                            ));
+
+                        });
+                    } else {
+                        console.error("The specified object is not a BuildingRoom or BuildingStorey.")
                     }
-                );
+                }
+
+                // const unitSpacesBuildingKeys = unitSpacesObjectKeys.map(
+                //     (objectKey) => {
+                //         return this.cjHelper.findParentBuildingObjectKey(
+                //             objectKey
+                //         );
+                //     }
+                // );
 
                 // Check if all the unit spaces are in the same building
                 if (
-                    !unitSpacesBuildingObjectKeys.every(
-                        (v) => v === unitSpacesBuildingObjectKeys[0]
+                    !unitSpacesBuildingKeys.every(
+                        (v) => v === unitSpacesBuildingKeys[0]
                     )
                 ) {
                     console.error(
                         "A unit with spaces in multiple buildings is not supported."
                     );
                     return;
                 }
-                buildingObjectKey = unitSpacesBuildingObjectKeys[0];
+                buildingObjectKey = unitSpacesBuildingKeys[0];
                 buildingMesh = this.cjHelper.getMesh(buildingObjectKey);
 
-                // // Find the most frequent storey code
-                // const unitSpacesStoreyCodes = unitSpacesObjectKeys.map(
-                //     (objectKey) => {
-                //         return this.cjHelper.getStoreyCode(objectKey);
-                //     }
-                // );
-                // var counts = {};
-                // var compare = 0;
-                // for (const spaceStoreyCode of unitSpacesStoreyCodes) {
-                //     if (counts[spaceStoreyCode] === undefined) {
-                //         counts[spaceStoreyCode] = 1;
-                //     } else {
-                //         counts[spaceStoreyCode] += 1;
-                //     }
-                //     if (counts[spaceStoreyCode] > compare) {
-                //         compare = counts[spaceStoreyCode];
-                //         storeyCode = spaceStoreyCode;
-                //     }
-                // }
             } else {
                 // Case where the unit has no spaces
 
@@ -597,7 +611,6 @@ export class ObjectPicker {
                 storeyCode = this.cjHelper.getUnitMainStoreyCode(pickedObjectKey);
             }
 
-
             // Highlight the meshes
             this.pickHighlighter.highlight(unitSpacesMeshes);