Skip to content

Commit

Permalink
Merge branch 'master' into sprawl_config
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebocher
ebocher authored Mar 28, 2024
2 parents f0789aa + 8b0c16b commit e0fa345
Show file tree
Hide file tree
Showing 11 changed files with 1,638 additions and 613 deletions.
190 changes: 147 additions & 43 deletions bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/InputDataFormatting.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ String formatBuildingLayer(JdbcDataSource datasource, String building, String zo
def types_uses_dictionnary =
["Bâtiment agricole" : ["farm_auxiliary": "agricultural"],
"Bâtiment commercial" : ["commercial": "commercial"],
"Bâtiment industriel" : ["light_industry": "industrial"],
"Bâtiment industriel" : ["industrial": "industrial"],
"Serre" : ["greenhouse": "agricultural"],
"Silo" : ["silo": "agricultural"],
"Aérogare" : ["terminal": "transport"],
"Aérogare" : ["aeroway": "transport"],
"Arc de triomphe" : ["monument": "heritage"],
"Arène ou théâtre antique" : ["monument": "monument"],
"Bâtiment religieux divers" : ["religious": "religious"],
"Bâtiment sportif" : ["sports_centre": "entertainment_arts_culture"],
"Bâtiment sportif" : ["sports_centre": "sport"],
"Chapelle" : ["chapel": "religious"],
"Château" : ["castle": "heritage"],
"Eglise" : ["church": "religious"],
Expand All @@ -97,48 +97,152 @@ String formatBuildingLayer(JdbcDataSource datasource, String building, String zo
"Annexe" : ["annex": "building"],
"Industriel, agricole ou commercial": ["commercial": "commercial"],
"Bâtiment" : ["building": "building"],
"Industrie lourde" : ["heavy_industry": "industrial"]
"Industrie lourde" : ["industrial": "industrial"]
]

def building_type_level = ["building" : 1,
"annex" : 0,
"house" : 1,
"detached" : 1,
"residential" : 1,
"apartments" : 1,
"bungalow" : 0,
"historic" : 0,
"monument" : 0,
"ruins" : 0,
"castle" : 0,
"agricultural" : 0,
"farm" : 0,
"farm_auxiliary" : 0,
"barn" : 0,
"greenhouse" : 0,
"silo" : 0,
"commercial" : 2,
"industrial" : 0,
"sport" : 0,
"sports_centre" : 0,
"grandstand" : 0,
"transport" : 0,
"train_station" : 0,
"toll_booth" : 0,
"terminal" : 0,
"healthcare" : 1,
"education" : 1,
"entertainment_arts_culture": 0,
"sustenance" : 1,
"military" : 0,
"religious" : 0,
"chapel" : 0,
"church" : 0,
"government" : 1,
"townhall" : 1,
"office" : 1,
"heavy_industry" : 0,
"light_industry" : 0]
def building_type_level = [
"building": 1,
"house": 1,
"detached": 1,
"residential": 1,
"apartments": 1,
"bungalow": 0,
"historic": 0,
"monument": 0,
"ruins": 0,
"castle": 1,
"agricultural": 0,
"farm": 0,
"farm_auxiliary": 0,
"barn": 0,
"greenhouse": 0,
"silo": 0,
"commercial": 2,
"industrial": 0,
"sport": 0,
"sports_centre": 0,
"grandstand": 0,
"transport": 0,
"train_station": 0,
"toll_booth": 0,
"toll": 0,
"terminal": 0,
"airport_terminal": 0,
"healthcare": 1,
"education": 1,
"entertainment_arts_culture": 0,
"sustenance": 1,
"military": 0,
"religious": 0,
"chapel": 0,
"church": 0,
"government": 1,
"townhall": 1,
"office": 1,
"emergency": 0,
"hotel": 2,
"hospital": 2,
"parking": 1,
"slight_construction": 0,
"water_tower" : 0,
"fortress": 0,
"abbey": 0,
"cathedral": 0,
"mosque": 0,
"musalla": 0,
"temple": 0,
"synagogue": 0,
"shrine": 0,
"place_of_worship": 0,
"wayside_shrine": 0,
"swimming_pool" : 0,
"fitness_centre": 1,
"horse_riding": 0,
"ice_rink" : 0,
"pitch": 0,
"stadium": 0,
"track": 0,
"sports_hall": 0,
"ammunition": 0,
"bunker": 0,
"barracks": 1,
"casemate": 0,
"station": 0,
"government_office": 1,
"stable": 0,
"sty": 0,
"cowshed": 0,
"digester": 0,
"farmhouse": 0,
"bank": 1,
"bureau_de_change": 0,
"boat_rental": 0,
"car_rental" : 0,
"internet_cafe": 0,
"kiosk": 0,
"money_transfer": 0,
"market": 0,
"marketplace": 0,
"pharmacy" : 0,
"post_office" : 1,
"retail": 0,
"shop" : 0,
"store": 0,
"supermarket": 0,
"warehouse": 0,
"factory": 0,
"gas" : 0,
"heating_station": 0,
"oil_mill" : 0,
"oil": 0,
"wellsite": 0,
"well_cluster": 0,
"grain_silo": 0,
"villa": 1,
"dormitory": 1,
"condominium": 1,
"sheltered_housing": 0,
"workers_dormitory" :0,
"terrace": 1,
"transportation": 0,
"hangar": 0,
"tower": 1,
"control_tower": 0,
"aeroway": 1,
"roundhouse": 0,
"social_facility": 1,
"college": 1,
"kindergarten": 0,
"school": 0,
"university": 1,
"cinema": 1,
"arts_centre": 0,
"brothel": 1,
"casino": 0,
"community_centre": 0,
"conference_centre": 1,
"events_venue": 1,
"exhibition_centre": 0,
"gambling": 0,
"music_venue": 0,
"nightclub": 0,
"planetarium": 0,
"social_centre": 0,
"studio": 0,
"theatre": 0,
"library": 1,
"museum": 0,
"aquarium": 0,
"gallery": 0,
"information": 0,
"restaurant": 0,
"bar": 0,
"cafe": 0,
"fast_food": 0,
"ice_cream": 0,
"pub": 0,
"attraction": 0
]


//Formating building table
Expand Down
1 change: 1 addition & 0 deletions bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowDebugTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class WorkflowDebugTest {
["distance" : 0,
rsu_indicators : [
"indicatorUse": ["LCZ", "UTRF", "TEB"]

],
"grid_indicators": [
"x_size" : 100,
Expand Down
Loading

0 comments on commit e0fa345

Please sign in to comment.