Merge pull request #121 from MIERUNE/realestate-id-on-building

bldgRealEstateIDAttribute を Building に直接含める
MIERUNE · Mar 18, 2024 · 61482de · 61482de
2 parents 47c96d9 + f49936f
commit 61482de
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 49 deletions.
diff --git a/plateau_plugin/plateau/models/__init__.py b/plateau_plugin/plateau/models/__init__.py
@@ -24,7 +24,6 @@
     BUILDING_INT_INSTALLATION,
     BUILDING_OPENING,
     LARGE_CUSTOMER_FACILITY_ATTRIBUTE,
-    REAL_ESTATE_ID_ATTRIBUTE,
 )
 from .cityfurniture import CITY_FURNITURE, CITY_FURNITURE_DETAIL_ATTRIBUTE
 from .generics import GENERIC_CITY_OBJECT
@@ -82,7 +81,6 @@
         BUILDING_FURNITURE,
         BUILDING_DETAIL,
         LARGE_CUSTOMER_FACILITY_ATTRIBUTE,
-        REAL_ESTATE_ID_ATTRIBUTE,
         # bridge
         BRIDGE,
         BRIDGE_BOUNDARY_SURFACE,

diff --git a/plateau_plugin/plateau/models/building.py b/plateau_plugin/plateau/models/building.py
@@ -18,7 +18,6 @@
         "./uro:buildingDetails/uro:BuildingDetails",  # PLATEAU v1.x
         "./uro:largeCustomerFacilityAttribute/uro:LargeCustomerFacilityAttribute",
         "./uro:largeCustomerFacilities/uro:LargeCustomerFacilities",  # PLATEAU v1.x
-        "./uro:bldgRealEstateIDAttribute/uro:RealEstateIDAttribute",
     ],
     attribute_groups=[
         AttributeGroup(
@@ -146,6 +145,41 @@
                 ),
             ],
         ),
+        AttributeGroup(
+            base_element="./uro:bldgRealEstateIDAttribute/uro:RealEstateIDAttribute",
+            attributes=[
+                Attribute(
+                    name="realEstateIDOfBuilding",
+                    path="./uro:realEstateIDOfBuilding",
+                    datatype="string",
+                ),
+                Attribute(
+                    name="numberOfBuildingUnitOwnership",
+                    path="./uro:numberOfBuildingUnitOwnership",
+                    datatype="integer",
+                ),
+                Attribute(
+                    name="realEstateIDOfBuildingUnitOwnership",
+                    path="./uro:realEstateIDOfBuildingUnitOwnership",
+                    datatype="[]string",
+                ),
+                Attribute(
+                    name="numberOfRealEstateIDOfLand",
+                    path="./uro:numberOfRealEstateIDOfLand",
+                    datatype="integer",
+                ),
+                Attribute(
+                    name="realEstateIDOfLand",
+                    path="./uro:realEstateIDOfLand",
+                    datatype="[]string",
+                ),
+                Attribute(
+                    name="matchingScore",
+                    path="./uro:matchingScore",
+                    datatype="integer",
+                ),
+            ],
+        ),
         # TODO: uro:keyValuePairAttribute
         # (TODO: uro:ifcBuildingAttribute)
         # TODO: uro:indoorBuildingAttribute
@@ -710,49 +744,3 @@
     ],
     geometries=GeometricAttributes(),
 )
-
-
-REAL_ESTATE_ID_ATTRIBUTE = FeatureProcessingDefinition(
-    id="uro:RealEstateIDAttribute",
-    name="RealEstateIDAttribute",
-    target_elements=["uro:RealEstateIDAttribute"],
-    non_geometric=True,
-    attribute_groups=[
-        AttributeGroup(
-            base_element=None,
-            attributes=[
-                Attribute(
-                    name="realEstateIDOfBuilding",
-                    path="./uro:realEstateIDOfBuilding",
-                    datatype="string",
-                ),
-                Attribute(
-                    name="numberOfBuildingUnitOwnership",
-                    path="./uro:numberOfBuildingUnitOwnership",
-                    datatype="integer",
-                ),
-                Attribute(
-                    name="realEstateIDOfBuildingUnitOwnership",
-                    path="./uro:realEstateIDOfBuildingUnitOwnership",
-                    datatype="string",
-                ),
-                Attribute(
-                    name="numberOfRealEstateIDOfLand",
-                    path="./uro:numberOfRealEstateIDOfLand",
-                    datatype="integer",
-                ),
-                Attribute(
-                    name="realEstateIDOfLand",
-                    path="./uro:realEstateIDOfLand",
-                    datatype="string",
-                ),
-                Attribute(
-                    name="matchingScore",
-                    path="./uro:matchingScore",
-                    datatype="integer",
-                ),
-            ],
-        ),
-    ],
-    geometries=GeometricAttributes(),
-)