Feature/centroids as gdf #787
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 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 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 |
|---|---|---|
|
|
@@ -110,14 +110,12 @@ def test_Forecast_plot(self): | |
| HAZ_DIR.joinpath('storm_europe_cosmoe_forecast_vmax_testfile.nc'), | ||
| run_datetime=dt.datetime(2018,1,1), | ||
| event_date=dt.datetime(2018,1,3)) | ||
| haz1.centroids.gdf.geometry = haz1.centroids.gdf.geometry.translate(-1.2, 0.6) | ||
| haz2 = StormEurope.from_cosmoe_file( | ||
| HAZ_DIR.joinpath('storm_europe_cosmoe_forecast_vmax_testfile.nc'), | ||
| run_datetime=dt.datetime(2018,1,1), | ||
| event_date=dt.datetime(2018,1,3)) | ||
| haz2.centroids.gdf.geometry = haz2.centroids.gdf.geometry.translate(-1.2, 0.6) | ||
| #exposure | ||
| data = {} | ||
| data['latitude'] = haz1.centroids.lat | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -498,7 +498,7 @@ | |
| -------- | ||
| Exposures | ||
| """ | ||
|
|
||
| meta, value = u_coord.read_raster(file_name, [band], src_crs, window, | ||
| geometry, dst_crs, transform, width, | ||
| height, resampling) | ||
|
|
@@ -507,16 +507,13 @@ | |
| lry = uly + meta['height'] * yres | ||
| x_grid, y_grid = np.meshgrid(np.arange(ulx + xres / 2, lrx, xres), | ||
| np.arange(uly + yres / 2, lry, yres)) | ||
| return cls( | ||
| {'longitude': x_grid.flatten(), 'latitude': y_grid.flatten(), 'value': value.reshape(-1)} | ||
| , meta=meta, crs= meta['crs'] | ||
| ) | ||
|
|
||
|
|
||
| def plot_scatter(self, mask=None, ignore_zero=False, pop_name=True, | ||
|
Check warning on line 516 in climada/entity/exposures/base.py
|
||
| buffer=0.0, extend='neither', axis=None, figsize=(9, 13), | ||
| adapt_fontsize=True, title=None, **kwargs): | ||
| """Plot exposures geometry's value sum scattered over Earth's map. | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -60,7 +60,6 @@ def test_assign_pass(self): | |
| np_rand = np.random.RandomState(123456789) | ||
|
|
||
| haz = Hazard.from_raster([HAZ_DEMO_FL], haz_type='FL', window=Window(10, 20, 50, 60)) | ||
| ncentroids = haz.centroids.size | ||
|
|
||
| exp = Exposures(crs=haz.centroids.crs) | ||
|
|
@@ -74,8 +73,8 @@ def test_assign_pass(self): | |
|
|
||
| # make sure that it works for both float32 and float64 | ||
| for test_dtype in [np.float64, np.float32]: | ||
| haz.centroids.gdf.lat = haz.centroids.lat.astype(test_dtype) | ||
| haz.centroids.gdf.lon = haz.centroids.lon.astype(test_dtype) | ||
| exp.assign_centroids(haz) | ||
| self.assertEqual(exp.gdf.shape[0], len(exp.gdf[INDICATOR_CENTR + 'FL'])) | ||
| np.testing.assert_array_equal(exp.gdf[INDICATOR_CENTR + 'FL'].values, expected_result) | ||
|
|
@@ -131,7 +130,7 @@ def test_assign_raster_pass(self): | |
| 'width': 20, 'height': 10, | ||
| 'transform': rasterio.Affine(1.5, 0.0, -20, 0.0, -1.4, 8) | ||
| } | ||
| haz = Hazard('FL', centroids=Centroids.from_meta(meta)) | ||
|
|
||
| # explicit points with known results (see `expected_result` for details) | ||
| exp = Exposures(crs=DEF_CRS) | ||
|
|
@@ -151,9 +150,9 @@ def test_assign_raster_pass(self): | |
|
|
||
| expected_result = [ | ||
| # constant y-value, varying x-value | ||
| 0, 0, 0, 0, 0, 1, | ||
| # constant x-value, varying y-value | ||
| 0, 0, 0, 20, | ||
| # out of bounds: topleft, top, topright, right, bottomright, bottom, bottomleft, left | ||
| -1, -1, -1, -1, -1, -1, -1, -1, | ||
| # some explicit points within the raster | ||
|
|
@@ -171,18 +170,20 @@ def test_assign_raster_same_pass(self): | |
| np.testing.assert_array_equal(exp.gdf[INDICATOR_CENTR + 'FL'].values, | ||
| np.arange(haz.centroids.size, dtype=int)) | ||
|
|
||
| # Test fails because exposures stores the crs in the meta attribute as rasterio object, | ||
| # while the centroids stores the crs in the geodataframe, which is not a rasterio object. | ||
| # The comparison in assign_centroids then fails. | ||
| def test_assign_large_hazard_subset_pass(self): | ||
| """Test assign_centroids with raster hazard""" | ||
| exp = Exposures.from_raster(HAZ_DEMO_FL, window=Window(10, 20, 50, 60)) | ||
| exp.gdf.latitude[[0, 1]] = exp.gdf.latitude[[1, 0]] | ||
| exp.gdf.longitude[[0, 1]] = exp.gdf.longitude[[1, 0]] | ||
| exp.check() | ||
| haz = Hazard.from_raster([HAZ_DEMO_FL], haz_type='FL') | ||
| exp.assign_centroids(haz) | ||
| assigned_centroids = haz.centroids.select(sel_cen=exp.gdf[INDICATOR_CENTR + 'FL'].values) | ||
| np.testing.assert_array_equal(np.unique(assigned_centroids.lat), np.unique(exp.gdf.latitude)) | ||
| np.testing.assert_array_equal(np.unique(assigned_centroids.lon), np.unique(exp.gdf.longitude)) | ||
|
Comment on lines
+185
to
+186
There was a problem hiding this comment. er - why the |
||
|
|
||
| def test_affected_total_value(self): | ||
| haz_type = "RF" | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -34,12 +34,16 @@ | |
| from climada.entity.measures.base import Measure, IMPF_ID_FACT | ||
| from climada.util.constants import EXP_DEMO_H5, HAZ_DEMO_H5 | ||
| import climada.util.coordinates as u_coord | ||
| from climada.test import get_test_file | ||
| import climada.entity.exposures.test as exposures_test | ||
|
|
||
| DATA_DIR = CONFIG.measures.test_data.dir() | ||
|
|
||
| HAZ_TEST_TC :Path = get_test_file('test_tc_florida') | ||
| """ | ||
| Hazard test file from Data API: Hurricanes from 1851 to 2011 over Florida with 100 centroids. | ||
| Fraction is empty. Format: HDF5. | ||
| """ | ||
| ENT_TEST_MAT = Path(exposures_test.__file__).parent / 'data' / 'demo_today.mat' | ||
|
|
||
| class TestApply(unittest.TestCase): | ||
|
|
@@ -78,7 +82,7 @@ def test_cutoff_hazard_pass(self): | |
| meas = MeasureSet.from_mat(ENT_TEST_MAT) | ||
| act_1 = meas.get_measure(name='Seawall')[0] | ||
|
|
||
| haz = Hazard.from_hdf5(HAZ_TEST_TC) | ||
| exp = Exposures.from_mat(ENT_TEST_MAT) | ||
| exp.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True) | ||
| exp.check() | ||
|
|
@@ -112,7 +116,7 @@ def test_cutoff_hazard_region_pass(self): | |
| act_1 = meas.get_measure(name='Seawall')[0] | ||
| act_1.exp_region_id = [1] | ||
|
|
||
| haz = Hazard.from_hdf5(HAZ_TEST_TC) | ||
| exp = Exposures.from_mat(ENT_TEST_MAT) | ||
| exp.gdf['region_id'] = np.zeros(exp.gdf.shape[0]) | ||
| exp.gdf.region_id.values[10:] = 1 | ||
|
|
@@ -246,7 +250,7 @@ def test_filter_exposures_pass(self): | |
|
|
||
| imp_set = ImpactFuncSet.from_mat(ENT_TEST_MAT) | ||
|
|
||
| haz = Hazard.from_hdf5(HAZ_TEST_TC) | ||
| exp.assign_centroids(haz) | ||
|
|
||
| new_exp = copy.deepcopy(exp) | ||
|
|
@@ -329,7 +333,7 @@ def test_filter_exposures_pass(self): | |
|
|
||
| def test_apply_ref_pass(self): | ||
| """Test apply method: apply all measures but insurance""" | ||
| hazard = Hazard.from_hdf5(HAZ_TEST_TC) | ||
|
|
||
| entity = Entity.from_mat(ENT_TEST_MAT) | ||
| entity.measures._data['TC'] = entity.measures._data.pop('XX') | ||
|
|
@@ -365,7 +369,7 @@ def test_apply_ref_pass(self): | |
| def test_calc_impact_pass(self): | ||
| """Test calc_impact method: apply all measures but insurance""" | ||
|
|
||
| hazard = Hazard.from_hdf5(HAZ_TEST_TC) | ||
|
|
||
| entity = Entity.from_mat(ENT_TEST_MAT) | ||
| entity.exposures.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True) | ||
|
|
@@ -399,7 +403,7 @@ def test_calc_impact_pass(self): | |
| def test_calc_impact_transf_pass(self): | ||
| """Test calc_impact method: apply all measures and insurance""" | ||
|
|
||
| hazard = Hazard.from_hdf5(HAZ_TEST_TC) | ||
|
|
||
| entity = Entity.from_mat(ENT_TEST_MAT) | ||
| entity.exposures.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we list the functions that are known to have changed?
u_coord.match_centroids? (s.b.)