@@ -373,13 +373,6 @@ def from_nightlight_intensity(
373373 raise ValueError (
374374 "Not allowed to set both `countries` and `shape`. Aborting."
375375 )
376- if target_grid is None :
377- target_grid = cls ._define_target_grid (
378- reference_year = reference_year ,
379- gpw_version = GPW_VERSION ,
380- data_dir = data_dir ,
381- res_arcsec = res_arcsec ,
382- )
383376 if countries is not None :
384377 exp = cls .from_countries (
385378 countries = countries ,
@@ -487,13 +480,6 @@ def from_population(
487480 raise ValueError (
488481 "Not allowed to set both `countries` and `shape`. Aborting."
489482 )
490- if target_grid is None :
491- target_grid = cls ._define_target_grid (
492- reference_year = reference_year ,
493- gpw_version = gpw_version ,
494- data_dir = data_dir ,
495- res_arcsec = res_arcsec ,
496- )
497483 if countries is not None :
498484 exp = cls .from_countries (
499485 countries = countries ,
@@ -787,6 +773,14 @@ def from_shape(
787773 "GeoSeries. Loop over elements of series outside method."
788774 )
789775
776+ if target_grid is None :
777+ target_grid = cls ._define_target_grid (
778+ reference_year = reference_year ,
779+ gpw_version = gpw_version ,
780+ data_dir = data_dir ,
781+ res_arcsec = res_arcsec ,
782+ )
783+
790784 litpop_gdf , _ = _get_litpop_single_polygon (
791785 polygon = shape ,
792786 reference_year = reference_year ,
0 commit comments