Feature/centroids as gdf (#787)

* Add geodataframe to centroids: first commit

* Remove raster methods, obsolete methods, and fix some.

* Remove test for removed methods

* Fix from geodataframe method

* Remove set meta to lat lon

* Update all I/O methods

* Remove area pixel

* Add method to compute the area per pixel (not attribute)

* Make get_area_pixel

* Remove not often used dist_coast and elevation

* Remove unused meta

* Change Centroids call to new signature

* Remove vector - raster hazard methods

* Restore legacy excell reader

* Remove clear method

* Remove clear test

* Update read/write centroids in hazard

* Support empty on land or region id

* Check for empty region id

* Set region id correctly

* Remove scheduler

* Add docstring

* Add legacy read hdf5

* Replace incorrect dot product

* Remove meta in assign centroids

* Remove matlab test file

* Update set lat/lon

* Update test with init

* 'Automated update v4.0.0'

* Add note on method

* changelog: for 4.0.1

* 'Automated update v4.0.1'

* Add from_meta class method

* Update centroids init

* Update read raster intensity / fraction data

* undo changelog duplications

* Update test for points outside of raster within threshold

* Docstring and cosmetics

* Add to default crs method

* Fix legacy from hdf5 for empty extra values

* Update legacy from_hdf5 to exclude 'latitude'/'longitude' from extra

* Update centroids.select to work properly with mask and indices

* Fix forecast translate bug

* Remove _set_centroids

* Remove reproject raster

* Remove test hazard raster

* Update naming for plot fraction centroids

* Replace HAZ_DEMO_MAT with HAZ_TEST_TC

* Replace mat file with hdf5 test file

* Rewrite write raster method for hazard

* Add a default for sel_cen in mask

* Correct indent typos

* Change duplicate test function name

* Replace mat file with hdf5

* Remove unused mat file import

* Add legacy code to read old centroid hdf5 files.

* Update access to centroids dist coast in gdf

* test_trop_cyclone: get test centroids from data api

* Add method to estimate meta raster from centroids

* Remove unecessary conversion to ne_geom

* Add good lat/lon values for unit test

* centroids.centr.write_hdf5: eliminate side effect

* centroids.centr.write_hdf5: elimination of side effect futile for pandas>=2.1

* centroids.test.TestCentroidsFuns.test_select_pass: adapt to downsized LAT/LON arrays

* test_vec_ras: fix TestCentroids.test_centroids_check_pass

* test_vec_ras: remove TestReader.test_write_read_points_h5 as it is redundant
to and covered by test_centr.TestCentroidsWriter.test_read_write_hdf5

* fix typo in from_exposures method

* centroids.centr.from_csv: write class method

* centroids.centr.from_csv: correct order of xy

* centroids.centr.from_excel: update method for gdf

* centroids.centr. update csv and excel methods

* Update tests in test_vec_ras

* Update more tests and remove some with meta

* centroids.centr.from_excel fix columnn indexing

* Add possibility to NOT recenter crs for countires.

This lead to a bug in the assign region id method because longitude of the countries geometry was shifted, but not the entry lat/lon points.

* Add to_csre convenience method

* Prepare the stage for setting other than admin0 region id

* Remove uneeded import

* cenctroids.centr: fix the obvious

* gencenctroids.centr: change crs of the geodataframe instead of the geometry

* white space cosmetics

* PEP8

* Add solid region id and on land tests

* Auto stash before merge of "feature/centroids_as_gdf" and "origin/feature/centroids_as_gdf"

* Update distance and area tests

* Update set crs in load vector shape file

* centr.Centroids.from_excel: deal with region_id column

* Fix write hazard raster with centroids.get_meta

* Area pixel now correctly uses CEA

* Add actual NE CRS test.

* Make on_land and region_id always part of centroids

* Update docstring

* Update import path

* Add overwrite argument to set region id and on land

* Remove from base grid method

* Fix some linting

* Add some docstrings

* Avoid costly computation in from geodataframe

* Add comment

* Fix typo

* Fix set crs in from geodataframe

* Make properties return arrays and not series

* Remove not needed matlab vars

* Revert return numpy arrays.

* update from excel

* update from_excel and from_csv

* centroids.centr: from_excel fix column renaming and adapt to "new argument names"

* Centroids.from_excel fix: switch key,val in test_storm_europe rather than in centr!

* Return numpy arrays instead of series

* Add some basic tests

* Add tests for meta

* Add tentative changelog.

* Make keywords argument only : name lat/lon : remove set_*

* Auto stash before revert of "Make keywords argument only : name lat/lon : remove set_*"

* remove file

* Fix exposures method test

* Fix setting region id and on land at init.

* Fix typo

* Fix all close values for big numbers

* Improve cosmetics.

* update docstrings, doc cosmetics

* update from_csv method, add test

* remove DEF_VAR_CSV

* Update from_excel method and test

* remove unnecessary import

* fix storm_europe tests

* improve csv and excel tests

* Apply suggestions from code review

Co-authored-by: Lukas Riedel <[email protected]>

* add excel, csv write methods and tests

* Replace gdf with _gdf

* Revert "Replace gdf with _gdf"

This reverts commit c7e6ffd.

* Update to_crs methods

* Raise error if wrong exposures

* Make from geodataframe more restrictive.

* Use consistently to_crs method

* Improve read centroids

* Add literal to import

* Update to crs with inplace argument

* improve excel, csv method, test based on review

* Update typing

* Fix equal centroids for different gdf columns ordering

* Make consistent gdf column ordering

* Simplify from excel/csv

* Add support for legacy hazard excell

* Avoid single column loading error for df

* fix path in write_excel, write_csv

* fixing docstrings in centr.py

* Update code cosmetics

* Fix typo

* Allo for kwargs in init and update from exposures

* code linting

* Centroids: test from_meta

* Centroids: refined tests

* Centroids: fix from_exposures

* Centroids: implement get_pixel_shapes

* Centroids: code linting and docstrings

* hazard.test.test_base: remove undefined classes from main

* hazard.base: remove unused imports

* hazard.base: clean up imports

* cosmetics

* hazard.base.write_htdf5: add inline comment.

* Centroids: fix _gdf_from_legacy_hdf signature

* Centroids._gdf_from_legacy_hdf5: static, not classmethod

* hazard.centroids.centr: pylint

* centroids.centr : fix pydoc typos and pylint

* climada.hazard.base: pylint

* hazard.centroids.centr: pylint

* climada.test.test_calicbration: use hzard test file with hdf5 format

* Update climada/hazard/centroids/test/test_vec_ras.py

Co-authored-by: Emanuel Schmid <[email protected]>

* Hazard: fix write_raster, and some docstrings

* test.test_calibration: fix test file name

* test_api_client: added test for basic centroids plotting
(just because it fails in PR #787)

* centr.Centroids.plot: all changes reverted
(with the exception of the obsolete `self.set_meta_to_lat_lon()`)

* Hazard tutorial: use centroids.get_meta() instead of the attribute meta

* Hazard tutorial: use Centroids() instead of from_lat_lon()

* hazard tutorial: update Hazard from raster section

* hazard tutorial: fix dist_coast access

* climada.hazard.Hazard: remove broken vector file support

* climada.hazard.centr: add deprecated methods section

* fix from_tracks method, remove side effect

* climada.hazard.trop_cyclone.TropCytlone.from_tracks: option for predefined dist_coast in centroids

* TropicalCyclone.from_tracks pydoc

* white space cosmetics

* CHANGELOG: list deprecated and removed methods

* Refactor and add to centroids testing

* trop_cyclone.TropCyclone.from_tracks: fix dist_coast type

* climada.hazard.Centroids: raise exception in deprecated methods that really _are_ failing now

* changelog: list added Centroids methods

* hazard.centr: depreecated methods: pydoc string instaed of pass

* fixing geodataframe issues

* Revert "fixing geodataframe issues"

This reverts commit d6d2859.

* centroids: deprecation warnings improved

---------

Co-authored-by: Chahan Kropf <[email protected]>
Co-authored-by: climada <[email protected]>
Co-authored-by: emanuel-schmid <[email protected]>
Co-authored-by: Sarah Hülsen <[email protected]>
Co-authored-by: Igor Detring <[email protected]>
Co-authored-by: Lukas Riedel <[email protected]>
Co-authored-by: Thomas Vogt <[email protected]>
Co-authored-by: Thomas Vogt <[email protected]>
Co-authored-by: Emanuel Schmid <[email protected]>

Author: 9 people

CHANGELOG.md

@@ -10,18 +10,62 @@ Code freeze date: YYYY-MM-DD
 
 ### Dependency Changes
 
-### Added
-
 ### Changed
 
+- Centroids complete overhaul. Most function should be backward compatible. Internal data is stored in a geodataframe attribute. Raster are now stored as points, and the meta attribute is removed. Several methds were deprecated or removed. [#787](https://github.com/CLIMADA-project/climada_python/pull/787)
 - Improved error messages produced by `ImpactCalc.impact()` in case impact function in the exposures is not found in impf_set [#863](https://github.com/CLIMADA-project/climada_python/pull/863)
 
 ### Fixed
 
+### Added
+
+- climada.hazard.centroids.centr.Centroids.get_area_pixel
+- climada.hazard.centroids.centr.Centroids.get_dist_coast
+- climada.hazard.centroids.centr.Centroids.get_elevation
+- climada.hazard.centroids.centr.Centroids.get_meta
+- climada.hazard.centroids.centr.Centroids.get_pixel_shapes
+- climada.hazard.centroids.centr.Centroids.to_crs
+- climada.hazard.centroids.centr.Centroids.to_default_crs
+- climada.hazard.centroids.centr.Centroids.write_csv
+- climada.hazard.centroids.centr.Centroids.write_excel
+
 ### Deprecated
 
+- climada.hazard.centroids.centr.Centroids.from_lat_lon
+- climada.hazard.centroids.centr.Centroids.def set_area_pixel
+- climada.hazard.centroids.centr.Centroids.def set_area_approx
+- climada.hazard.centroids.centr.Centroids.set_dist_coast
+- climada.hazard.centroids.centr.Centroids.empty_geometry_points
+- climada.hazard.centroids.centr.Centroids.set_meta_to_lat_lon
+- climada.hazard.centroids.centr.Centroids.set_lat_lon_to_meta
+
 ### Removed
 
+- climada.hazard.base.Hazard.clear
+- climada.hazard.base.Hazard.raster_to_vector
+- climada.hazard.base.Hazard.read_mat
+- climada.hazard.base.Hazard.reproject_raster
+- climada.hazard.base.Hazard.set_vector
+- climada.hazard.base.Hazard.vector_to_raster
+- climada.hazard.centroids.centr.Centroids.calc_pixels_polygons
+- climada.hazard.centroids.centr.Centroids.check
+- climada.hazard.centroids.centr.Centroids.clear
+- climada.hazard.centroids.centr.Centroids.equal
+- climada.hazard.centroids.centr.Centroids.from_mat
+- climada.hazard.centroids.centr.Centroids.from_base_grid
+- climada.hazard.centroids.centr.Centroids.read_excel
+- climada.hazard.centroids.centr.Centroids.read_hdf5
+- climada.hazard.centroids.centr.Centroids.read_mat
+- climada.hazard.centroids.centr.Centroids.set_elevation
+- climada.hazard.centroids.centr.Centroids.set_geometry_points
+- climada.hazard.centroids.centr.Centroids.set_lat_lon
+- climada.hazard.centroids.centr.Centroids.set_raster_file
+- climada.hazard.centroids.centr.Centroids.set_raster_from_pnt_bounds
+- climada.hazard.centroids.centr.Centroids.set_vector_file
+- climada.hazard.centroids.centr.Centroids.values_from_raster_files
+- climada.hazard.centroids.centr.Centroids.values_from_vector_files
+- climada.hazard.centroids.centr.generate_nat_earth_centroids
+
 ## 4.1.1
 
 Release date: 2024-02-21

climada/engine/test/test_cost_benefit.py

@@ -35,16 +35,15 @@
 from climada.test import get_test_file
 
 
-HAZ_TEST_MAT = get_test_file('atl_prob_no_name', file_format='matlab')
 ENT_TEST_MAT = get_test_file('demo_today', file_format='MAT-file')
-
+HAZ_TEST_TC :Path = get_test_file('test_tc_florida')
 
 class TestSteps(unittest.TestCase):
     """Test intermediate steps"""
     def test_calc_impact_measures_pass(self):
         """Test _calc_impact_measures against reference value"""
-        self.assertTrue(HAZ_TEST_MAT.is_file(), "{} is not a file".format(HAZ_TEST_MAT))
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        self.assertTrue(HAZ_TEST_TC.is_file(), "{} is not a file".format(HAZ_TEST_TC))
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
 
         self.assertTrue(ENT_TEST_MAT.is_file(), "{} is not a file".format(ENT_TEST_MAT))
         entity = Entity.from_mat(ENT_TEST_MAT)
@@ -230,7 +229,7 @@ def test_cb_one_meas_fut_pass(self):
 
     def test_calc_cb_no_change_pass(self):
         """Test _calc_cost_benefit without present value against reference value"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_mat(ENT_TEST_MAT)
         entity.measures._data['TC'] = entity.measures._data.pop('XX')
         for meas in entity.measures.get_measure('TC'):
@@ -267,7 +266,7 @@ def test_calc_cb_no_change_pass(self):
 
     def test_calc_cb_change_pass(self):
         """Test _calc_cost_benefit with present value against reference value"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_mat(ENT_TEST_MAT)
         entity.measures._data['TC'] = entity.measures._data.pop('XX')
         for meas in entity.measures.get_measure('TC'):
@@ -438,7 +437,7 @@ def test_norm_value(self):
 
     def test_combine_fut_pass(self):
         """Test combine_measures with present and future"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -498,7 +497,7 @@ def test_combine_fut_pass(self):
 
     def test_combine_current_pass(self):
         """Test combine_measures with only future"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -538,7 +537,7 @@ def test_combine_current_pass(self):
 
     def test_apply_transf_current_pass(self):
         """Test apply_risk_transfer with only future"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -588,7 +587,7 @@ def test_apply_transf_current_pass(self):
 
     def test_apply_transf_cost_fact_pass(self):
         """Test apply_risk_transfer with only future annd cost factor"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -636,7 +635,7 @@ def test_apply_transf_cost_fact_pass(self):
 
     def test_apply_transf_future_pass(self):
         """Test apply_risk_transfer with present and future"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -692,7 +691,7 @@ def test_apply_transf_future_pass(self):
 
     def test_remove_measure(self):
         """Test remove_measure method"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -720,7 +719,7 @@ class TestCalc(unittest.TestCase):
     def test_calc_change_pass(self):
         """Test calc with future change"""
         # present
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.exposures.gdf.rename(columns={'impf_': 'impf_TC'}, inplace=True)
         entity.check()
@@ -777,7 +776,7 @@ def test_calc_change_pass(self):
 
     def test_calc_no_change_pass(self):
         """Test calc without future change"""
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         entity = Entity.from_excel(ENT_DEMO_TODAY)
         entity.check()
         entity.exposures.ref_year = 2018
@@ -808,7 +807,7 @@ class TestRiskFuncs(unittest.TestCase):
     def test_impact(self):
         ent = Entity.from_excel(ENT_DEMO_TODAY)
         ent.check()
-        hazard = Hazard.from_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
         impact = ImpactCalc(ent.exposures, ent.impact_funcs, hazard).impact()
         return impact
 

climada/engine/test/test_forecast.py

@@ -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.lat += 0.6
-        haz1.centroids.lon -= 1.2
+        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.lat += 0.6
-        haz2.centroids.lon -= 1.2
+        haz2.centroids.gdf.geometry = haz2.centroids.gdf.geometry.translate(-1.2, 0.6)
         #exposure
         data = {}
         data['latitude'] = haz1.centroids.lat

climada/entity/exposures/base.py

@@ -498,7 +498,6 @@ def from_raster(cls, file_name, band=1, src_crs=None, window=None,
         --------
         Exposures
         """
-        exp = cls()
         meta, value = u_coord.read_raster(file_name, [band], src_crs, window,
                                           geometry, dst_crs, transform, width,
                                           height, resampling)
@@ -507,14 +506,16 @@ def from_raster(cls, file_name, band=1, src_crs=None, window=None,
         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'],
+        )
 
-        if exp.crs is None:
-            exp.set_crs()
-        exp.gdf['longitude'] = x_grid.flatten()
-        exp.gdf['latitude'] = y_grid.flatten()
-        exp.gdf['value'] = value.reshape(-1)
-        exp.meta = meta
-        return exp
 
     def plot_scatter(self, mask=None, ignore_zero=False, pop_name=True,
                      buffer=0.0, extend='neither', axis=None, figsize=(9, 13),

climada/entity/exposures/test/test_base.py

@@ -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))
-        haz.raster_to_vector()
         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.lat = haz.centroids.lat.astype(test_dtype)
-            haz.centroids.lon = haz.centroids.lon.astype(test_dtype)
+            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(meta=meta))
+        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
-            -1, 0, 0, 0, 0, 1,
+            0, 0, 0, 0, 0, 1,
             # constant x-value, varying y-value
-            -1, 0, 0, 20,
+            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')
-        haz.raster_to_vector()
         exp.assign_centroids(haz)
         assigned_centroids = haz.centroids.select(sel_cen=exp.gdf[INDICATOR_CENTR + 'FL'].values)
-        np.testing.assert_array_equal(assigned_centroids.lat, exp.gdf.latitude)
-        np.testing.assert_array_equal(assigned_centroids.lon, exp.gdf.longitude)
+        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))
 
     def test_affected_total_value(self):
         haz_type = "RF"

climada/entity/measures/test/test_base.py

@@ -39,7 +39,11 @@
 
 DATA_DIR = CONFIG.measures.test_data.dir()
 
-HAZ_TEST_MAT = get_test_file('atl_prob_no_name', file_format='matlab')
+HAZ_TEST_TC :Path = get_test_file('test_tc_florida', file_format='hdf5')
+"""
+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_mat(HAZ_TEST_MAT)
+        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_mat(HAZ_TEST_MAT)
+        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_mat(HAZ_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_mat(HAZ_TEST_MAT)
+        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_mat(HAZ_TEST_MAT)
+        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_mat(HAZ_TEST_MAT)
+        hazard = Hazard.from_hdf5(HAZ_TEST_TC)
 
         entity = Entity.from_mat(ENT_TEST_MAT)
         entity.exposures.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True)