Commit 4cb184ad authored by Danijel Schorlemmer's avatar Danijel Schorlemmer
Browse files

Resolved conflicts

parent 392638ed
Pipeline #21728 failed with stage
in 1 minute and 14 seconds
......@@ -474,19 +474,12 @@ class JapanDatabase(SpatialiteDatabase):
district_id = result[0]
# Get ID of building type and number of stories
<<<<<<< HEAD
building_type_id = add_element_and_get_index(
row["Type of building"], building_type_list
)
story_number_id = add_element_and_get_index(
row["Stories of building"], story_number_list
)
=======
building_type_id = add_element_and_get_index(row["Type of building"],
building_type_list)
story_number_id = add_element_and_get_index(row["Stories of building"],
story_number_list)
>>>>>>> 71ad9d3 (Implemented the import of the numbers of households and related parameters)
# Insert dwelling numbers for each construction material
for material_id in range(5):
......@@ -525,19 +518,12 @@ class JapanDatabase(SpatialiteDatabase):
district_id = result[0]
# Get ID of building type and number of stories
<<<<<<< HEAD
building_type_id = add_element_and_get_index(
row["Type of building"], building_type_list
)
story_number_id = add_element_and_get_index(
row["Stories of building"], story_number_list
)
=======
building_type_id = add_element_and_get_index(row["Type of building"],
building_type_list)
story_number_id = add_element_and_get_index(row["Stories of building"],
story_number_list)
>>>>>>> 71ad9d3 (Implemented the import of the numbers of households and related parameters)
# Insert building numbers for each construction material
for material_index in range(3):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment