Commit 5434a6ef authored by Danijel Schorlemmer's avatar Danijel Schorlemmer
Browse files

Resolved conflicts

parent 4cb184ad
Pipeline #21730 passed with stage
in 1 minute and 29 seconds
......@@ -567,12 +567,15 @@ class JapanDatabase(SpatialiteDatabase):
district_id = result[0]
# Get ID of building type, dwelling type, and tenure type
building_type_id = add_element_and_get_index(row["Type of building"],
building_type_list)
dwelling_type_id = add_element_and_get_index(row["Type of dwelling"],
dwelling_type_list)
tenure_type_id = add_element_and_get_index(row["Tenure of dwelling"],
tenure_type_list)
building_type_id = add_element_and_get_index(
row["Type of building"], building_type_list
)
dwelling_type_id = add_element_and_get_index(
row["Type of dwelling"], dwelling_type_list
)
tenure_type_id = add_element_and_get_index(
row["Tenure of dwelling"], tenure_type_list
)
# Read the relevant values from the input data
number_dwelling = float(str(row[5]).replace("-", "0"))
......
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