Skip to content

Commit

Permalink
Fetch from scripts/sourceTypes.csv instead of sourceTypes.csv
Browse files Browse the repository at this point in the history
As part of the OpenDRR/seismic-risk-model publication cleanup
originally intended for v1.0.0 release but was overlooked in 2022,
sourceTypes.csv was moved to scripts/sourceTypes.csv on 2023-05-29
on master branch, making into v1.1.0 release on 2023-09-12.

See OpenDRR/seismic-risk-model#92
  • Loading branch information
anthonyfok committed Apr 1, 2024
1 parent 13976d1 commit 14de9d8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
7 changes: 5 additions & 2 deletions python/add_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# add_data.sh - Populate PostGIS database for Elasticsearch
#
# Copyright (C) 2020-2022 Government of Canada
# Copyright (C) 2020-2024 Government of Canada
#
# Main Authors: Drew Rotheram-Clarke <drew.rotheram-clarke@canada.ca>
# Joost van Ulden <joost.vanulden@canada.ca>
Expand Down Expand Up @@ -190,8 +190,11 @@ run_ogr2ogr() {

download_luts() {
LOG "## Downloading LUTs"
# sourceTypes.csv was moved to scripts/sourceTypes.csv on 2023-05-29
# on master branch, making into v1.1.0 release on 2023-09-12.
# See https://github.com/OpenDRR/seismic-risk-model/pull/92
RUN fetch_csv seismic-risk-model \
sourceTypes.csv?ref=master
scripts/sourceTypes.csv?ref=master
}

# run_psql runs PostgreSQL queries from a given input SQL file.
Expand Down
7 changes: 4 additions & 3 deletions python/build_exposure_ancillary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -647,10 +647,11 @@ download_luts() {
exposure/general-building-stock/1.%20documentation/collapse_probability.csv
RUN run_psql Create_collapse_probability_table.sql

# RUN fetch_csv seismic-risk-model \
# blob/tieg_natmodel2021/sourceTypes.csv
# sourceTypes.csv was moved to scripts/sourceTypes.csv on 2023-05-29
# on master branch, making into v1.1.0 release on 2023-09-12.
# See https://github.com/OpenDRR/seismic-risk-model/pull/92
RUN fetch_csv seismic-risk-model \
sourceTypes.csv?ref=master
scripts/sourceTypes.csv?ref=master
}

download_retrofit_costs() {
Expand Down

0 comments on commit 14de9d8

Please sign in to comment.