Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps-dev): bump karma from 6.1.0 to 6.2.0 in /interfaces/IBF-dashboard #19

Closed
wants to merge 4 commits into from
Closed

build(deps-dev): bump karma from 6.1.0 to 6.2.0 in /interfaces/IBF-dashboard #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5078390
edit rainfalldata
p-phung Feb 19, 2021
4111fb6
adapt rainfalldata and edit admin_boundaries settings
p-phung Feb 19, 2021
0af5e7c
Merge branch 'master' of https://github.com/p-phung/IBF-system
p-phung Feb 19, 2021
8d1f6af
build(deps-dev): bump karma in /interfaces/IBF-dashboard
dependabot[bot] Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions interfaces/IBF-dashboard/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 15 additions & 14 deletions services/IBF-pipeline/pipeline/lib/cronJob/rainfalldata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from datetime import datetime
from bs4 import BeautifulSoup
import requests
from geocube.api.core import make_geocube


class RainfallData:
Expand All @@ -24,10 +25,10 @@ def __init__(self, fcStep, days, country_code):
self.fcStep = fcStep
self.days = days
self.inputPath = PIPELINE_DATA + 'input/rainfall/'
# self.extractedGlofasPath = PIPELINE_OUTPUT + \
# 'glofas_extraction/glofas_forecast_' + self.fcStep + '_' + country_code + '.json' ## create name of outputs, stick to json
self.triggersPerStationPath = PIPELINE_OUTPUT + \
'triggers_rp_per_station/triggers_rp_' + self.fcStep + '_' + country_code + '.json'
self.rainrasterPath = PIPELINE_OUTPUT + \
'triggers_rp_per_station/rain_rp_' + self.fcStep + '_' + country_code + '.tif'
# self.triggersPerStationPath = PIPELINE_OUTPUT + \
# 'triggers_rp_per_station/triggers_rp_' + self.fcStep + '_' + country_code + '.json'
self.WATERSTATIONS_TRIGGERS = PIPELINE_INPUT + SETTINGS[country_code]['trigger_levels']
self.TRIGGER_RP_COLNAME = SETTINGS[country_code]['trigger_colname']
self.ADMIN_BOUNDARIES = PIPELINE_INPUT + SETTINGS[country_code]['admin_boundaries']['filename']
Expand Down Expand Up @@ -131,7 +132,7 @@ def download_GFS_forecast(self):
all_url = self.listFD(GFS_SOURCE, ext='')
gfs_url = sorted([i for i in all_url if i.split('/')[-2].startswith('gfs.')], reverse=True)
# url_date = []
fc_hrs = np.arange(3, 267, 3)
fc_hrs = np.arange(3, 195, 3)

for url_date in gfs_url:
# latest_day_url = gfs_url[-1]
Expand Down Expand Up @@ -231,7 +232,7 @@ def findTrigger(self):
threshold_gdf = gpd.GeoDataFrame(df_leadtime, geometry=geometry).set_crs("EPSG:4326")

## forecast (.5 degree)
fc_by_day = mean_by_day.sel(fc_day=mean_by_day.fc_day.values[self.days - 1]).to_dataframe().reset_index()
fc_by_day = mean_by_day.sel(fc_day=mean_by_day.fc_day.values[self.days]).to_dataframe().reset_index()
geometry = [Point(xy) for xy in zip(fc_by_day.longitude.astype(float), fc_by_day.latitude.astype(float))]
fc_gdf = gpd.GeoDataFrame(fc_by_day, geometry=geometry).set_crs("EPSG:4326")

Expand All @@ -251,13 +252,13 @@ def findTrigger(self):
compare_gdf['fc_day'] = compare_gdf['fc_day'].astype(str)
df_trigger = compare_gdf.filter(['latitude', 'longitude', 'geometry', str(str(self.fcStep) + '_pred')])

out = df_trigger.to_json()
# out = df_trigger.to_json()
# output_name = '%s_%sday_'%(runcycle_day, self.fcStep) +self.TRIGGER_RP_COLNAME
with open(self.triggersPerStationPath, 'w') as fp:
fp.write(out)
print('Processed Glofas data - File saved')

# cube = make_geocube(vector_data=compare_gdf, measurements=[str(str(self.fcStep)+'_pred')], resolution=(0.5, -0.5), output_crs="EPSG:4326")
# cube.rio.to_raster(PIPELINE_OUTPUT + '/' + output_name + '.tif')
# compare_gdf.to_file(outpath + 'option2/' + output_name + '.shp')
# with open(self.triggersPerStationPath, 'w') as fp:
# fp.write(out)

cube = make_geocube(vector_data=df_trigger, measurements=[str(str(self.fcStep)+'_pred')], resolution=(-0.5, 0.5), align=(0.25, 0.25), output_crs="EPSG:4326")
cube.rio.to_raster(self.rainrasterPath)

print('Processed Glofas data - File saved')

5 changes: 4 additions & 1 deletion services/IBF-pipeline/pipeline/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@
},
"trigger_levels": 'Rainfall_station_locations_with_trigger_levels.csv',
'district_mapping': 'Rainfall_station_per_district_uga.csv',
'admin_boundaries': 'vector/egy_admbnda_adm1_capmas_20170421.shp',
'admin_boundaries': {
'filename': 'vector/egy_admbnda_adm1_capmas_20170421.shp',
'pcode_colname': 'ADM1_PCODE'
},
'flood_extent_admin_boundaries': '',
'exposure_admin_boundaries': '',
'trigger_colname': '5yr_threshold',
Expand Down