From 4e5f68f63b3c71db52fae48801b542adaa593e9d Mon Sep 17 00:00:00 2001 From: kntoshiya <98634289+kntoshiya@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:31:32 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8D=E5=8B=95=E7=94=A3ID=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plateau_plugin/plateau/models/__init__.py | 2 + plateau_plugin/plateau/models/building.py | 56 +++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/plateau_plugin/plateau/models/__init__.py b/plateau_plugin/plateau/models/__init__.py index 6da0726..9836c10 100644 --- a/plateau_plugin/plateau/models/__init__.py +++ b/plateau_plugin/plateau/models/__init__.py @@ -24,6 +24,7 @@ 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 @@ -81,6 +82,7 @@ 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 index 9bd6cfa..5ad38c8 100644 --- a/plateau_plugin/plateau/models/building.py +++ b/plateau_plugin/plateau/models/building.py @@ -18,6 +18,7 @@ "./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( @@ -150,6 +151,7 @@ # TODO: uro:indoorBuildingAttribute ], disaster_risk_attr_conatiner_path="./uro:buildingDisasterRiskAttribute", + # real_estate_id_attr_container_path="./uro:bldgRealEstateIDAttribute", # 不動産ID dm_attr_container_path="./uro:bldgDmAttribute", facility_attr_paths=FacilityAttributePaths( facility_id="./uro:bldgFacilityIdAttribute", @@ -157,6 +159,14 @@ facility_attrs="./uro:bldgFacilityAttribute", large_customer_facility_attrs="./uro:largeCustomerFacilityAttribute", ), + # real_estate_id_path = RealEstateIDAttributePaths( # uro:bldgRealEstateIDAttribute/aaa + # real_estate_id_of_building = "./uro:realEstateIDOfBuilding", + # number_of_building_unit_ownership= "./uro:numberOfBuildingUnitOwnership", + # real_estate_id_of_building_unit_ownership = "./uro:realEstateIDOfBuildingUnitOwnership", + # number_of_real_estate_id_of_Land = "./uro:numberOfRealEstateIDOfLand", + # real_estate_id_of_land = "./uro:realEstateIDOfLand", + # matchingS_score = "./uro:matchingScore", + # ), geometries=GeometricAttributes( lod0=GeometricAttribute( is2d=True, @@ -709,3 +719,49 @@ ], 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(), +) \ No newline at end of file From 537e93ba1aaa1711fe954b30cf0ecba6b6a32631 Mon Sep 17 00:00:00 2001 From: kntoshiya <98634289+kntoshiya@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:32:58 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plateau_plugin/metadata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plateau_plugin/metadata.txt b/plateau_plugin/metadata.txt index 0585b21..eae0b3b 100644 --- a/plateau_plugin/metadata.txt +++ b/plateau_plugin/metadata.txt @@ -1,6 +1,6 @@ [general] name=PLATEAU QGIS Plugin -version=0.0.5 +version=0.0.6 qgisMinimumVersion=3.6 description=Import the PLATEAU 3D city model data (CityGML) used in Japan — PLATEAU 3D都市モデルのCityGMLファイルをQGISに読み込みます author=MLIT Japan From 29fe059effef2f4016ef920aca260c619165b25d Mon Sep 17 00:00:00 2001 From: kntoshiya <98634289+kntoshiya@users.noreply.github.com> Date: Mon, 18 Mar 2024 16:16:41 +0900 Subject: [PATCH 3/4] fix --- plateau_plugin/plateau/models/building.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/plateau_plugin/plateau/models/building.py b/plateau_plugin/plateau/models/building.py index 5ad38c8..36bab42 100644 --- a/plateau_plugin/plateau/models/building.py +++ b/plateau_plugin/plateau/models/building.py @@ -151,7 +151,6 @@ # TODO: uro:indoorBuildingAttribute ], disaster_risk_attr_conatiner_path="./uro:buildingDisasterRiskAttribute", - # real_estate_id_attr_container_path="./uro:bldgRealEstateIDAttribute", # 不動産ID dm_attr_container_path="./uro:bldgDmAttribute", facility_attr_paths=FacilityAttributePaths( facility_id="./uro:bldgFacilityIdAttribute", @@ -159,14 +158,6 @@ facility_attrs="./uro:bldgFacilityAttribute", large_customer_facility_attrs="./uro:largeCustomerFacilityAttribute", ), - # real_estate_id_path = RealEstateIDAttributePaths( # uro:bldgRealEstateIDAttribute/aaa - # real_estate_id_of_building = "./uro:realEstateIDOfBuilding", - # number_of_building_unit_ownership= "./uro:numberOfBuildingUnitOwnership", - # real_estate_id_of_building_unit_ownership = "./uro:realEstateIDOfBuildingUnitOwnership", - # number_of_real_estate_id_of_Land = "./uro:numberOfRealEstateIDOfLand", - # real_estate_id_of_land = "./uro:realEstateIDOfLand", - # matchingS_score = "./uro:matchingScore", - # ), geometries=GeometricAttributes( lod0=GeometricAttribute( is2d=True, From b128273afd5f4c7c3bb01861613fc47ac57920f2 Mon Sep 17 00:00:00 2001 From: kntoshiya <98634289+kntoshiya@users.noreply.github.com> Date: Mon, 18 Mar 2024 16:31:11 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=81=B5=E3=81=89=E3=83=BC=E3=81=BE?= =?UTF-8?q?=E3=81=A3=E3=81=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plateau_plugin/plateau/models/__init__.py | 2 +- plateau_plugin/plateau/models/building.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plateau_plugin/plateau/models/__init__.py b/plateau_plugin/plateau/models/__init__.py index 9836c10..13122a6 100644 --- a/plateau_plugin/plateau/models/__init__.py +++ b/plateau_plugin/plateau/models/__init__.py @@ -24,7 +24,7 @@ BUILDING_INT_INSTALLATION, BUILDING_OPENING, LARGE_CUSTOMER_FACILITY_ATTRIBUTE, - REAL_ESTATE_ID_ATTRIBUTE + REAL_ESTATE_ID_ATTRIBUTE, ) from .cityfurniture import CITY_FURNITURE, CITY_FURNITURE_DETAIL_ATTRIBUTE from .generics import GENERIC_CITY_OBJECT diff --git a/plateau_plugin/plateau/models/building.py b/plateau_plugin/plateau/models/building.py index 36bab42..78be5c3 100644 --- a/plateau_plugin/plateau/models/building.py +++ b/plateau_plugin/plateau/models/building.py @@ -755,4 +755,4 @@ ), ], geometries=GeometricAttributes(), -) \ No newline at end of file +)