-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add additional ES indices for dsra/psra/exposure * run modified es index scripts * run dsra shkmap script + exposure script bug fix * add additional ES indices for dsra/psra/exposure * run modified es index scripts * run dsra shkmap script + exposure script bug fix * remove global fabric - null value bug
- Loading branch information
Showing
6 changed files
with
458 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| #!/usr/bin/python3 | ||
| # ================================================================= | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
| # Copyright (C) 2020-2021 Government of Canada | ||
| # | ||
| # Main Authors: Drew Rotheram <drew.rotheram-clarke@canada.ca> | ||
| # Joost van Ulden <joost.vanulden@canada.ca> | ||
| # ================================================================= | ||
|
|
||
| import utils | ||
| import argparse | ||
|
|
||
|
|
||
| def main(): | ||
| args = parse_args() | ||
|
|
||
| # Create shakemap object and load to ES | ||
| dsraTable = utils.PostGISdataset( | ||
| utils.PostGISConnection(), | ||
| utils.ESConnection(settings={ | ||
| 'settings': { | ||
| 'number_of_shards': 1, | ||
| 'number_of_replicas': 0 | ||
| }, | ||
| 'mappings': { | ||
| 'properties': { | ||
| 'coordinates': { | ||
| 'type': 'geo_point' | ||
| }, | ||
| 'geometry': { | ||
| 'type': 'geo_shape' | ||
| } | ||
| } | ||
| } | ||
| }), | ||
| view="opendrr_dsra_{eqScenario}_shakemap".format(**{ | ||
| 'eqScenario': args.eqScenario}).lower(), | ||
| sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \ | ||
| FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap \ | ||
| ORDER BY dsra_{eqScenario}_shakemap."SiteID" \ | ||
| LIMIT {{limit}} \ | ||
| OFFSET {{offset}}'.format(**{'eqScenario': args.eqScenario}) | ||
| ) | ||
| dsraTable.postgis2es() | ||
|
|
||
| # Create load 5km shakemap hexbin | ||
| dsraTable = utils.PostGISdataset( | ||
| utils.PostGISConnection(), | ||
| utils.ESConnection(settings={ | ||
| 'settings': { | ||
| 'number_of_shards': 1, | ||
| 'number_of_replicas': 0 | ||
| }, | ||
| 'mappings': { | ||
| 'properties': { | ||
| 'geometry': { | ||
| 'type': 'geo_shape' | ||
| } | ||
| } | ||
| } | ||
| }), | ||
| view="opendrr_dsra_{eqScenario}_shakemap_hexbin_5km".format(**{ | ||
| 'eqScenario': args.eqScenario}).lower(), | ||
| sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \ | ||
| FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_5km \ | ||
| ORDER BY dsra_{eqScenario}_shakemap_hexbin_5km."gridid_5" \ | ||
| LIMIT {{limit}} \ | ||
| OFFSET {{offset}}'.format(**{'eqScenario': args.eqScenario}) | ||
| ) | ||
| dsraTable.postgis2es() | ||
|
|
||
| # Create load 10km shakemap hexbin | ||
| dsraTable = utils.PostGISdataset( | ||
| utils.PostGISConnection(), | ||
| utils.ESConnection(settings={ | ||
| 'settings': { | ||
| 'number_of_shards': 1, | ||
| 'number_of_replicas': 0 | ||
| }, | ||
| 'mappings': { | ||
| 'properties': { | ||
| 'geometry': { | ||
| 'type': 'geo_shape' | ||
| } | ||
| } | ||
| } | ||
| }), | ||
| view="opendrr_dsra_{eqScenario}_shakemap_hexbin_10km".format(**{ | ||
| 'eqScenario': args.eqScenario}).lower(), | ||
| sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \ | ||
| FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_10km \ | ||
| ORDER BY dsra_{eqScenario}_shakemap_hexbin_10km."gridid_10" \ | ||
| LIMIT {{limit}} \ | ||
| OFFSET {{offset}}'.format(**{'eqScenario': args.eqScenario}) | ||
| ) | ||
| dsraTable.postgis2es() | ||
|
|
||
| # Create load 25km shakemap hexbin | ||
| dsraTable = utils.PostGISdataset( | ||
| utils.PostGISConnection(), | ||
| utils.ESConnection(settings={ | ||
| 'settings': { | ||
| 'number_of_shards': 1, | ||
| 'number_of_replicas': 0 | ||
| }, | ||
| 'mappings': { | ||
| 'properties': { | ||
| 'geometry': { | ||
| 'type': 'geo_shape' | ||
| } | ||
| } | ||
| } | ||
| }), | ||
| view="opendrr_dsra_{eqScenario}_shakemap_hexbin_25km".format(**{ | ||
| 'eqScenario': args.eqScenario}).lower(), | ||
| sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \ | ||
| FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_25km \ | ||
| ORDER BY dsra_{eqScenario}_shakemap_hexbin_25km."gridid_25" \ | ||
| LIMIT {{limit}} \ | ||
| OFFSET {{offset}}'.format(**{'eqScenario': args.eqScenario}) | ||
| ) | ||
| dsraTable.postgis2es() | ||
|
|
||
| # Create load 50km shakemap hexbin | ||
| dsraTable = utils.PostGISdataset( | ||
| utils.PostGISConnection(), | ||
| utils.ESConnection(settings={ | ||
| 'settings': { | ||
| 'number_of_shards': 1, | ||
| 'number_of_replicas': 0 | ||
| }, | ||
| 'mappings': { | ||
| 'properties': { | ||
| 'geometry': { | ||
| 'type': 'geo_shape' | ||
| } | ||
| } | ||
| } | ||
| }), | ||
| view="opendrr_dsra_{eqScenario}_shakemap_hexbin_50km".format(**{ | ||
| 'eqScenario': args.eqScenario}).lower(), | ||
| sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \ | ||
| FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_50km \ | ||
| ORDER BY dsra_{eqScenario}_shakemap_hexbin_50km."gridid_50" \ | ||
| LIMIT {{limit}} \ | ||
| OFFSET {{offset}}'.format(**{'eqScenario': args.eqScenario}) | ||
| ) | ||
| dsraTable.postgis2es() | ||
|
|
||
| # Create load 100km shakemap hexbin | ||
| dsraTable = utils.PostGISdataset( | ||
| utils.PostGISConnection(), | ||
| utils.ESConnection(settings={ | ||
| 'settings': { | ||
| 'number_of_shards': 1, | ||
| 'number_of_replicas': 0 | ||
| }, | ||
| 'mappings': { | ||
| 'properties': { | ||
| 'geometry': { | ||
| 'type': 'geo_shape' | ||
| } | ||
| } | ||
| } | ||
| }), | ||
| view="opendrr_dsra_{eqScenario}_shakemap_hexbin_100km".format(**{ | ||
| 'eqScenario': args.eqScenario}).lower(), | ||
| sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \ | ||
| FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_100km \ | ||
| ORDER BY dsra_{eqScenario}_shakemap_hexbin_100km."gridid_100" \ | ||
| LIMIT {{limit}} \ | ||
| OFFSET {{offset}}'.format(**{'eqScenario': args.eqScenario}) | ||
| ) | ||
| dsraTable.postgis2es() | ||
|
|
||
| return | ||
|
|
||
|
|
||
| def parse_args(): | ||
| parser = argparse.ArgumentParser(description="script description") | ||
| parser.add_argument("--eqScenario", type=str, help="Earthquake scenario id", required=True) | ||
| args = parser.parse_args() | ||
|
|
||
| return args | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.