Remove usages_percentage in favor of usages
This commit is contained in:
parent
5ec1708a2c
commit
a492a9eb0a
@ -169,7 +169,7 @@ class EnergyAde:
|
||||
def _building_geometry(self, building, building_dic, city):
|
||||
|
||||
building_dic['bldg:Building']['bldg:function'] = building.function
|
||||
building_dic['bldg:Building']['bldg:usage'] = building.usages_percentage
|
||||
building_dic['bldg:Building']['bldg:usage'] = building.usages
|
||||
building_dic['bldg:Building']['bldg:yearOfConstruction'] = building.year_of_construction
|
||||
building_dic['bldg:Building']['bldg:roofType'] = building.roof_type
|
||||
building_dic['bldg:Building']['bldg:measuredHeight'] = {
|
||||
|
@ -77,8 +77,8 @@ class CesiumjsTileset:
|
||||
'function': {
|
||||
'type': 'STRING'
|
||||
},
|
||||
'usages_percentage': {
|
||||
'type': 'STRING'
|
||||
'usages': {
|
||||
'type': 'LIST'
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -146,7 +146,7 @@ class CesiumjsTileset:
|
||||
'max_height': building.max_height,
|
||||
'year_of_construction': building.year_of_construction,
|
||||
'function': building.function,
|
||||
'usages_percentage': building.usages
|
||||
'usages': building.usages
|
||||
}
|
||||
},
|
||||
'content': {
|
||||
|
@ -46,7 +46,7 @@ class CityObject(Models):
|
||||
self.type = building.type
|
||||
self.year_of_construction = building.year_of_construction
|
||||
self.function = building.function
|
||||
self.usage = building.usages_percentage
|
||||
self.usage = building.usages
|
||||
self.volume = building.volume
|
||||
self.area = building.floor_area
|
||||
self.roof_area = sum(roof.solid_polygon.area for roof in building.roofs)
|
||||
|
Loading…
Reference in New Issue
Block a user