diff --git a/GeologicProperties.py b/GeologicProperties.py index 34556df316c6e1b86c8db855a895a944b31079f1..5b6bff8e6a97af2e62a5b882806babe71a827520 100644 --- a/GeologicProperties.py +++ b/GeologicProperties.py @@ -14,22 +14,19 @@ class GeologicProperties(object): geol_shp = gpd.read_file(geol_foldername) self.extract_main_geology(geol_shp, catchment_contour_shp) - def extract_main_geology(self, geol_shp, catchment_contour_shp): - geol_shp = gpd.clip(geol_shp, catchment_contour_shp) + + def extract_main_geology(self, geol_shp): geol_shp['area'] = geol_shp.geometry.area / 1e6 geol_shp['prop'] = geol_shp.area / sum(geol_shp.area) geol_shp = geol_shp.loc[geol_shp.prop == max(geol_shp.prop)] self.maingeol_proportion = geol_shp.prop.values[0] self.maingeol_description = geol_shp.Type.values[0] - self.maingeol_id = geol_shp.index.values[0] - - def extract_average_age_geology(self, geol_foldername, catchment_contour_shp): - geol_shp = gpd.read_file(geol_foldername) + # self.maingeol_id = geol_shp.index.values[0] + self.maingeol_id = geol_shp.loc[:,'index'].values[0] - try: - gpd.clip(geol_shp, catchment_contour_shp) - except: - gpd.overlay(geol_shp, catchment_contour_shp) + + def extract_average_age_geology(self, geol_filename): + geol_shp = gpd.read_file(geol_filename) geol_shp['area'] = geol_shp.geometry.area / 1e6 geol_shp['prop'] = geol_shp.area / sum(geol_shp.area) @@ -44,4 +41,40 @@ class GeologicProperties(object): maingeol_age_max = geol_shp.AGE_INF.values[0] maingeol_age_mean = sum([maingeol_age_min, maingeol_age_max])/2 self.maingeol_age = [maingeol_age_min, maingeol_age_mean, maingeol_age_max] + + + + +## From original BDLisa and BRGM files using clip function + + # def extract_main_geology(self, geol_shp, catchment_contour_shp): + # geol_shp = gpd.clip(geol_shp, catchment_contour_shp) + # geol_shp['area'] = geol_shp.geometry.area / 1e6 + # geol_shp['prop'] = geol_shp.area / sum(geol_shp.area) + # geol_shp = geol_shp.loc[geol_shp.prop == max(geol_shp.prop)] + # self.maingeol_proportion = geol_shp.prop.values[0] + # self.maingeol_description = geol_shp.Type.values[0] + # self.maingeol_id = geol_shp.index.values[0] + + # def extract_average_age_geology(self, geol_foldername, catchment_contour_shp): + # geol_shp = gpd.read_file(geol_foldername) + + # try: + # geol_shp = gpd.clip(geol_shp, catchment_contour_shp) + # except: + # geol_shp = gpd.overlay(geol_shp, catchment_contour_shp) + + # geol_shp['area'] = geol_shp.geometry.area / 1e6 + # geol_shp['prop'] = geol_shp.area / sum(geol_shp.area) + # age_min = sum(geol_shp.prop*geol_shp.AGE_SUP) + # age_max = sum(geol_shp.prop*geol_shp.AGE_INF) + # age_mean = sum([age_max, age_min])/2 + # self.age = [age_min, age_mean, age_max] + # self.maingeol_age_proportion = max(geol_shp.prop) + # geol_shp = geol_shp.loc[geol_shp.prop == max(geol_shp.prop)] + # maingeol_age_min = geol_shp.AGE_SUP.values[0] + # maingeol_age_max = geol_shp.AGE_INF.values[0] + # maingeol_age_mean = sum([maingeol_age_min, maingeol_age_max])/2 + # self.maingeol_age = [maingeol_age_min, maingeol_age_mean, maingeol_age_max] + \ No newline at end of file