@@ -213,15 +213,15 @@ def from_countries(
213213 # GSDP data folder.
214214 litpop_list = [
215215 _calc_admin1_one_country (
216- country ,
217- res_arcsec ,
218- exponents ,
219- fin_mode ,
220- tot_value ,
221- reference_year ,
222- gpw_version ,
223- data_dir ,
224- target_grid ,
216+ country = country ,
217+ res_arcsec = res_arcsec ,
218+ exponents = exponents ,
219+ fin_mode = fin_mode ,
220+ total_value = tot_value ,
221+ reference_year = reference_year ,
222+ gpw_version = gpw_version ,
223+ data_dir = data_dir ,
224+ target_grid = target_grid ,
225225 )
226226 for tot_value , country in zip (total_values , countries )
227227 ]
@@ -231,7 +231,7 @@ def from_countries(
231231 # within each country and combined at the end.
232232 litpop_list = [
233233 cls ._from_country (
234- country ,
234+ country = country ,
235235 exponents = exponents ,
236236 fin_mode = fin_mode ,
237237 total_value = total_values [idc ],
@@ -382,7 +382,7 @@ def from_nightlight_intensity(
382382 )
383383 if countries is not None :
384384 exp = cls .from_countries (
385- countries ,
385+ countries = countries ,
386386 res_arcsec = res_arcsec ,
387387 exponents = (1 , 0 ),
388388 fin_mode = "none" ,
@@ -393,8 +393,8 @@ def from_nightlight_intensity(
393393 )
394394 else :
395395 exp = cls .from_shape (
396- shape ,
397- None ,
396+ shape = shape ,
397+ total_value = None ,
398398 res_arcsec = res_arcsec ,
399399 exponents = (1 , 0 ),
400400 value_unit = "" ,
@@ -496,7 +496,7 @@ def from_population(
496496 )
497497 if countries is not None :
498498 exp = cls .from_countries (
499- countries ,
499+ countries = countries ,
500500 res_arcsec = res_arcsec ,
501501 exponents = (0 , 1 ),
502502 fin_mode = "pop" ,
@@ -507,8 +507,8 @@ def from_population(
507507 )
508508 else :
509509 exp = cls .from_shape (
510- shape ,
511- None ,
510+ shape = shape ,
511+ total_value = None ,
512512 res_arcsec = res_arcsec ,
513513 exponents = (0 , 1 ),
514514 value_unit = "people" ,
@@ -617,7 +617,7 @@ def from_shape_and_countries(
617617 """
618618 # init countries' exposure:
619619 exp = cls .from_countries (
620- countries ,
620+ countries = countries ,
621621 res_arcsec = res_arcsec ,
622622 exponents = exponents ,
623623 fin_mode = fin_mode ,
@@ -788,13 +788,13 @@ def from_shape(
788788 )
789789
790790 litpop_gdf , _ = _get_litpop_single_polygon (
791- shape ,
792- reference_year ,
793- data_dir ,
794- gpw_version ,
795- exponents ,
796- target_grid ,
797- region_id ,
791+ polygon = shape ,
792+ reference_year = reference_year ,
793+ data_dir = data_dir ,
794+ gpw_version = gpw_version ,
795+ exponents = exponents ,
796+ target_grid = target_grid ,
797+ region_id = region_id ,
798798 )
799799
800800 # disaggregate total value proportional to LitPop values:
@@ -977,12 +977,12 @@ def _from_country(
977977 gdf_tmp ,
978978 meta_tmp ,
979979 ) = _get_litpop_single_polygon (
980- polygon ,
981- reference_year ,
982- data_dir ,
983- gpw_version ,
984- exponents ,
985- target_grid ,
980+ polygon = polygon ,
981+ reference_year = reference_year ,
982+ data_dir = data_dir ,
983+ gpw_version = gpw_version ,
984+ exponents = exponents ,
985+ target_grid = target_grid ,
986986 verbose = (idx > 0 ),
987987 region_id = iso3n ,
988988 )
@@ -1064,12 +1064,12 @@ def _crop_target_grid(target_grid, polygon):
10641064 cropped_grid ["width" ] = col_max - col_min
10651065 cropped_grid ["height" ] = row_max - row_min
10661066 cropped_grid ["transform" ] = Affine (
1067- target_grid ["transform" ].a ,
1068- 0 ,
1069- cropped_min_lon ,
1070- 0 ,
1071- target_grid ["transform" ].e ,
1072- cropped_max_lat ,
1067+ a = target_grid ["transform" ].a ,
1068+ b = 0 ,
1069+ c = cropped_min_lon ,
1070+ d = 0 ,
1071+ e = target_grid ["transform" ].e ,
1072+ f = cropped_max_lat ,
10731073 )
10741074 return cropped_grid
10751075
@@ -1133,8 +1133,8 @@ def _get_litpop_single_polygon(
11331133 offsets = (0 , 0 ) if exponents [1 ] == 0 else (1 , 0 )
11341134 # import population data (2d array), meta data, and global grid info,
11351135 pop , meta_pop , _ = pop_util .load_gpw_pop_shape (
1136- polygon ,
1137- reference_year ,
1136+ polygon = polygon ,
1137+ reference_year = reference_year ,
11381138 gpw_version = gpw_version ,
11391139 data_dir = data_dir ,
11401140 verbose = verbose ,
@@ -1149,8 +1149,8 @@ def _get_litpop_single_polygon(
11491149 # reproject Lit and Pop input data to aligned grid with target resolution:
11501150 try :
11511151 [pop , nlight ], meta_out = reproject_input_data (
1152- [pop , nlight ],
1153- [meta_pop , meta_nl ],
1152+ data_array_list = [pop , nlight ],
1153+ meta_list = [meta_pop , meta_nl ],
11541154 target_grid = cropped_grid ,
11551155 )
11561156 except ValueError as err :
@@ -1363,9 +1363,9 @@ def reproject_input_data(
13631363 dst_height , dst_width , dst_transform
13641364 )
13651365 data_out_list [idx ], meta_out ["transform" ] = u_coord .align_raster_data (
1366- data_array_list [idx ],
1367- meta_list [idx ]["crs" ],
1368- meta_list [idx ]["transform" ],
1366+ source = data_array_list [idx ],
1367+ src_crs = meta_list [idx ]["crs" ],
1368+ src_transform = meta_list [idx ]["transform" ],
13691369 dst_crs = dst_crs ,
13701370 dst_resolution = (res_degree , res_degree ),
13711371 dst_bounds = dst_bounds ,
@@ -1648,8 +1648,8 @@ def _calc_admin1_one_country(
16481648 # total value is defined from country multiplied by grp_share:
16491649 exp_list .append (
16501650 LitPop .from_shape (
1651- admin1_shapes [idx ],
1652- total_value * grp_values [record ["name" ]],
1651+ shape = admin1_shapes [idx ],
1652+ total_value = total_value * grp_values [record ["name" ]],
16531653 res_arcsec = res_arcsec ,
16541654 exponents = exponents ,
16551655 reference_year = reference_year ,
0 commit comments