giga-spatial 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

{giga_spatial-0.7.0.dist-info → giga_spatial-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: giga-spatial
-Version: 0.7.0
+Version: 0.7.1
 Summary: A package for spatial data download & processing
 Author: Utku Can Ozturk
 Author-email: utkucanozturk@gmail.com

{giga_spatial-0.7.0.dist-info → giga_spatial-0.7.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-giga_spatial-0.7.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-gigaspatial/__init__.py,sha256=RaANGbRu5e-vehwXI1-Qe2ggPPfs1TQaZj072JdbLk4,22
-gigaspatial/config.py,sha256=pLbxGc08OHT2IfTBzZVuIJTPR2vvg3KTFfvciOtRswk,9304
+giga_spatial-0.7.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+gigaspatial/__init__.py,sha256=2KJZDSMOG7KS82AxYOrZ4ZihYxX0wjfUjDsIZh3L024,22
+gigaspatial/config.py,sha256=xqP800jaDMYE7-cgHXSGGwuF1fmo5Q56-DqpJ61p8a0,9382
 gigaspatial/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gigaspatial/core/io/__init__.py,sha256=stlpgEeHf5KIb2ZW8yEbdJK5iq6n_wX4DPmKyR9PK-w,317
 gigaspatial/core/io/adls_data_store.py,sha256=Pr1FKpzFb2TSeidMSGhhNSDk1tFxAi4G1aPZ_No_xUs,15783
@@ -13,39 +13,40 @@ gigaspatial/core/io/writers.py,sha256=asb56ZHQEWO2rdilIq7QywDRk8yfebecWv1KwzUpaX
 gigaspatial/core/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gigaspatial/core/schemas/entity.py,sha256=QAhEW0-JgdWh9pjKGbB5ArvqtVK85ayYZJPgjdb-IKw,8590
 gigaspatial/generators/__init__.py,sha256=cKbMTW7Eh-oDPtM9OfGP14_ekVwc2_7Je7n_pr_anig,223
-gigaspatial/generators/poi.py,sha256=FMYH2yPFuCeYiwj-pHYe83bAxXPkQP28VDQx5L2eEnQ,35869
+gigaspatial/generators/poi.py,sha256=tlLqVsXOjl83OL3Z6yajz9BLtZVbhZF67A-el-F2oU4,42356
 gigaspatial/generators/zonal/__init__.py,sha256=egnpvGVeIOS2Zg516AT84tJnIqS4owxmMLLmBQJmK7Y,301
 gigaspatial/generators/zonal/admin.py,sha256=rgOyQX3f_g9qnXqrf-NkR2GEdwOqjNuPNe1H7AUVsfg,3698
-gigaspatial/generators/zonal/base.py,sha256=aoq9AmawPnxu04YI7hPmJzvBTyuUqBQuMZAEUdiVStg,22818
-gigaspatial/generators/zonal/geometry.py,sha256=iDpITqTTU_Tzd0eEO9suuoOA9Dpc2kbtwRgOX8C5zAE,21485
+gigaspatial/generators/zonal/base.py,sha256=byyfv4dNpOMzszBMMbKQlZuHMlq2e84Hboh0W58f-8k,22959
+gigaspatial/generators/zonal/geometry.py,sha256=0EF3VXAVOcj5AtcubGWU325biLaZ76zt3Sf1uyKEE88,23358
 gigaspatial/generators/zonal/mercator.py,sha256=fA02j30PWB5BVjrbNGCMjiOw-ds182yK7R27z8mWFug,5291
 gigaspatial/grid/__init__.py,sha256=ypSSyZ4fYtMNc4IG7chSD7NkUfS2bv9KWRsKR1D9pDI,80
 gigaspatial/grid/h3.py,sha256=0d_rNNvwxc0LDD2qKCd2gTy_16_5sgPwJwk29z5pE9U,15310
 gigaspatial/grid/mercator_tiles.py,sha256=dzUDbXe0QHEC4s334IVT76d41D35dbd-QiN2LnkDdvA,11240
 gigaspatial/handlers/__init__.py,sha256=T0_6OxXQ59yTu9g2P6P9vnepudOWp_85R4WQKxRF94c,1618
-gigaspatial/handlers/base.py,sha256=wxkB8fniOIzgsg0WF9WkaZbAmFhNkqtZ_LGD8Ch53Mw,27238
+gigaspatial/handlers/base.py,sha256=JSZ64eWRoF17bKvVj2Bq3lFA00uJ4i6qlwp72O4HSv4,27885
 gigaspatial/handlers/boundaries.py,sha256=jtWyQt3iAzS77mbAOi7mjh3cv_YCV3uB_r1h56gCfeY,20729
-gigaspatial/handlers/ghsl.py,sha256=aSEVQVANzJf8O8TiQYmfwyeM43ZaO65VJHmiuLSQfLs,30524
-gigaspatial/handlers/giga.py,sha256=F5ZfcE37a24X-c6Xhyt72C9eZZbyN_gV7w_InxKFMQQ,28348
+gigaspatial/handlers/ghsl.py,sha256=QvW7GeHWQSrPdxXxmR_61UcfBIHziNpCHCxRXg1nnug,31285
+gigaspatial/handlers/giga.py,sha256=tNy2O0YAdy4iYWjMNKUadV_W2HxcTsb-aG4te6wvMOk,28660
 gigaspatial/handlers/google_open_buildings.py,sha256=Liqk7qJhDtB4Ia4uhBe44LFcf-XVKBjRfj-pWlE5erY,16594
 gigaspatial/handlers/hdx.py,sha256=1m6oG1DeEC_RLFtb6CrTReWpbQ5uG2e8EIt-IUkZbaI,18122
+gigaspatial/handlers/healthsites.py,sha256=gJCnKDXE4Gu-3Z6Io0-EknXfSdOxBHdr4-JV0z9bul0,12829
 gigaspatial/handlers/mapbox_image.py,sha256=M_nkJ_b1PD8FG1ajVgSycCb0NRTAI_SLpHdzszNetKA,7786
 gigaspatial/handlers/maxar_image.py,sha256=kcc8uGljQB0Yh0MKBA7lT7KwBbNZwFzuyBklR3db1P4,10204
 gigaspatial/handlers/microsoft_global_buildings.py,sha256=bQ5WHIv3v0wWrZZUbZkKPRjgdlqIxlK7CV_0zSvdrTw,20292
 gigaspatial/handlers/ookla_speedtest.py,sha256=EcvSAxJZ9GPfzYnT_C85Qgy2ecc9ndf70Pklk53OdC8,6506
 gigaspatial/handlers/opencellid.py,sha256=KuJqd-5-RO5ZzyDaBSrTgCK2ib5N_m3RUcPlX5heWwI,10683
-gigaspatial/handlers/osm.py,sha256=vUbdUm6lO2f8YyU7o4qUSkWMxlZElp7EPBFlneRaeo0,16641
+gigaspatial/handlers/osm.py,sha256=gyY_a2OoRZjL14iOTEKLCPbKTcmSDHc72Q0hluaENrY,25464
 gigaspatial/handlers/overture.py,sha256=lKeNw00v5Qia7LdWORuYihnlKEqxE9m38tdeRrvag9k,4218
 gigaspatial/handlers/rwi.py,sha256=eAaplDysVeBhghJusYUKZYbKL5hW-klWvi8pWhILQkY,4962
 gigaspatial/handlers/unicef_georepo.py,sha256=ODYNvkU_UKgOHXT--0MqmJ4Uk6U1_mp9xgehbTzKpX8,31924
-gigaspatial/handlers/worldpop.py,sha256=jV166EP02Xdj8jiT8aQi4sexds8Qd3KRGHXqq70_Sdk,30161
+gigaspatial/handlers/worldpop.py,sha256=5gSAhTPs3l8cVflx_Vp4ZxhvcUKKb_r2hGmc_sXCgio,39893
 gigaspatial/processing/__init__.py,sha256=QDVL-QbLCrIb19lrajP7LrHNdGdnsLeGcvAs_jQpdRM,183
 gigaspatial/processing/algorithms.py,sha256=6fBCwbZrI_ISWJ7UpkH6moq1vw-7dBy14yXSLHZprqY,6591
-gigaspatial/processing/geo.py,sha256=i8MMXrf05dik-LkmeSZ45siWLT9Dgk0M-tjWKx5jVdk,41686
+gigaspatial/processing/geo.py,sha256=ekGbU1sEn10zX3esYIEba6eZyhpx9WOjPlVEkspqcNk,41674
 gigaspatial/processing/sat_images.py,sha256=YUbH5MFNzl6NX49Obk14WaFcr1s3SyGJIOk-kRpbBNg,1429
-gigaspatial/processing/tif_processor.py,sha256=NSTxxeRtLS70Ki_AjaOfSGYpAFevkQnM-ZfYaE1RF7M,46793
+gigaspatial/processing/tif_processor.py,sha256=WzD3inLUdr50fl11WPF6czvG1d8s7y2qdTBOc5Yo2yw,66400
 gigaspatial/processing/utils.py,sha256=HC85vGKQakxlkoQAkZmeAXWHsenAwTIRn7jPKUA7x20,1500
-giga_spatial-0.7.0.dist-info/METADATA,sha256=PZ1IWjRm10ol2wfFifI1Sp5tm2v-dhdr-ip0NiRKB_s,9277
-giga_spatial-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-giga_spatial-0.7.0.dist-info/top_level.txt,sha256=LZsccgw6H4zXT7m6Y4XChm-Y5LjHAwZ2hkGN_B3ExmI,12
-giga_spatial-0.7.0.dist-info/RECORD,,
+giga_spatial-0.7.1.dist-info/METADATA,sha256=Fo_X_aPJg9Mv1GfX4esviiljEhcK4n7imbACWKrNo6s,9277
+giga_spatial-0.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+giga_spatial-0.7.1.dist-info/top_level.txt,sha256=LZsccgw6H4zXT7m6Y4XChm-Y5LjHAwZ2hkGN_B3ExmI,12
+giga_spatial-0.7.1.dist-info/RECORD,,

gigaspatial/__init__.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.7.1"

gigaspatial/config.py

@@ -38,6 +38,7 @@ class Config(BaseSettings):
     GIGA_SCHOOL_MEASUREMENTS_API_KEY: str = Field(
         default="", alias="GIGA_SCHOOL_MEASUREMENTS_API_KEY"
     )
+    HEALTHSITES_API_KEY: str = Field(default="", alias="HEALTHSITES_API_KEY")
 
     ROOT_DATA_DIR: Path = Field(
         default=Path("."),

gigaspatial/generators/poi.py

@@ -18,14 +18,11 @@ from gigaspatial.processing.geo import (
     convert_to_geodataframe,
     buffer_geodataframe,
     detect_coordinate_columns,
+    aggregate_points_to_zones,
     aggregate_polygons_to_zones,
     get_centroids,
 )
-from gigaspatial.processing.tif_processor import (
-    sample_multiple_tifs_by_polygons,
-    sample_multiple_tifs_by_coordinates,
-    TifProcessor,
-)
+from gigaspatial.processing.tif_processor import TifProcessor
 from scipy.spatial import cKDTree
 
 
@@ -165,7 +162,9 @@ class PoiViewGenerator:
                         raise ValueError(
                             f"Column '{poi_id_column}' provided as 'poi_id_column' contains duplicate values."
                         )
-                return convert_to_geodataframe(points)
+                return convert_to_geodataframe(
+                    points, lat_col="latitude", lon_col="longitude"
+                )
             except ValueError as e:
                 raise ValueError(
                     f"Could not detect coordinate columns in DataFrame: {str(e)}"
@@ -202,7 +201,9 @@ class PoiViewGenerator:
                             raise ValueError(
                                 f"Column '{poi_id_column}' provided as 'poi_id_column' contains duplicate values."
                             )
-                    return convert_to_geodataframe(df)
+                    return convert_to_geodataframe(
+                        df, lat_col="latitude", lon_col="longitude"
+                    )
                 except ValueError as e:
                     raise ValueError(
                         f"Could not detect coordinate columns in dictionary list: {str(e)}"
@@ -365,11 +366,11 @@ class PoiViewGenerator:
                 f"{output_prefix}_distance": dist,
             }
         )
-        self._update_view(temp_result_df)
+        # self._update_view(temp_result_df) # Removed direct view update
         self.logger.info(
             f"Nearest points mapping complete with prefix '{output_prefix}'"
         )
-        return self.view
+        return temp_result_df  # Return the DataFrame
 
     def map_google_buildings(
         self,
@@ -405,12 +406,14 @@ class PoiViewGenerator:
             self.logger.info("No Google buildings data found for the provided POIs")
             return self.view
 
-        return self.map_nearest_points(
+        mapped_data = self.map_nearest_points(
             points_df=buildings_df,
             id_column="full_plus_code",
             output_prefix="nearest_google_building",
             **kwargs,
         )
+        self._update_view(mapped_data)
+        return self.view
 
     def map_ms_buildings(
         self,
@@ -455,12 +458,14 @@ class PoiViewGenerator:
                 axis=1,
             )
 
-        return self.map_nearest_points(
+        mapped_data = self.map_nearest_points(
             points_df=building_centroids,
             id_column="building_id",
             output_prefix="nearest_ms_building",
             **kwargs,
         )
+        self._update_view(mapped_data)
+        return self.view
 
     def map_zonal_stats(
         self,
@@ -481,9 +486,10 @@ class PoiViewGenerator:
         3. Polygon aggregation: Aggregates polygon data to POI buffers with optional area weighting
 
         Args:
-            data (Union[List[TifProcessor], gpd.GeoDataFrame]):
-                Either a list of TifProcessor objects containing raster data to sample,
-                or a GeoDataFrame containing polygon data to aggregate.
+            data (Union[TifProcessor, List[TifProcessor], gpd.GeoDataFrame]):
+                Either a TifProcessor object, a list of TifProcessor objects (which will be merged
+                into a single TifProcessor for processing), or a GeoDataFrame containing polygon
+                data to aggregate.
             stat (str, optional):
                 For raster data: Statistic to calculate ("sum", "mean", "median", "min", "max").
                 For polygon data: Aggregation method to use.
@@ -512,20 +518,32 @@ class PoiViewGenerator:
                       or if required parameters (value_column) are missing for polygon data.
         """
 
-        if isinstance(data, list) and all(isinstance(x, TifProcessor) for x in data):
-            results_df = pd.DataFrame({"poi_id": self.points_gdf["poi_id"]})
+        raster_processor: Optional[TifProcessor] = None
 
-            # Handle raster data
+        if isinstance(data, TifProcessor):
+            raster_processor = data
+        elif isinstance(data, list) and all(isinstance(x, TifProcessor) for x in data):
             if not data:
-                self.logger.info("No valid raster data found for the provided POIs")
+                self.logger.info("No valid raster data provided")
                 return self.view
 
-            raster_crs = data[0].crs
+            if len(data) > 1:
+                all_source_paths = [tp.dataset_path for tp in data]
 
-            if not all(tp.crs == raster_crs for tp in data):
-                raise ValueError(
-                    "All TifProcessors must have the same CRS for zonal statistics."
+                self.logger.info(
+                    f"Merging {len(all_source_paths)} rasters into a single TifProcessor for zonal statistics."
+                )
+                raster_processor = TifProcessor(
+                    dataset_path=all_source_paths,
+                    data_store=self.data_store,
+                    **kwargs,
                 )
+            else:
+                raster_processor = data[0]
+
+        if raster_processor:
+            results_df = pd.DataFrame({"poi_id": self.points_gdf["poi_id"]})
+            raster_crs = raster_processor.crs
 
             if map_radius_meters is not None:
                 self.logger.info(
@@ -539,11 +557,9 @@ class PoiViewGenerator:
                 )
 
                 # Calculate zonal statistics
-                sampled_values = sample_multiple_tifs_by_polygons(
-                    tif_processors=data,
+                sampled_values = raster_processor.sample_by_polygons(
                     polygon_list=buffers_gdf.to_crs(raster_crs).geometry,
                     stat=stat,
-                    **kwargs,
                 )
             else:
                 self.logger.info(f"Sampling {stat} at POI locations")
@@ -551,8 +567,8 @@ class PoiViewGenerator:
                 coord_list = (
                     self.points_gdf.to_crs(raster_crs).get_coordinates().to_numpy()
                 )
-                sampled_values = sample_multiple_tifs_by_coordinates(
-                    tif_processors=data, coordinate_list=coord_list, **kwargs
+                sampled_values = raster_processor.sample_by_coordinates(
+                    coordinate_list=coord_list, **kwargs
                 )
 
             results_df[output_column] = sampled_values
@@ -560,24 +576,16 @@ class PoiViewGenerator:
         elif isinstance(data, gpd.GeoDataFrame):
             # Handle polygon data
             if data.empty:
-                self.logger.info("No valid polygon data found for the provided POIs")
-                return self.points_gdf.copy()
+                self.logger.info("No valid GeoDataFrame data provided")
+                return pd.DataFrame(
+                    columns=["poi_id", output_column]
+                )  # Return empty DataFrame
 
             if map_radius_meters is None:
-                raise ValueError("map_radius_meters must be provided for polygon data")
-
-            if value_column is None:
-                raise ValueError("value_column must be provided for polygon data")
-
-            if value_column not in data.columns:
                 raise ValueError(
-                    f"Value column '{value_column}' not found in input polygon GeoDataFrame."
+                    "map_radius_meters must be provided for for GeoDataFrame data"
                 )
 
-            self.logger.info(
-                f"Aggregating {value_column} within {map_radius_meters}m buffers around POIs using predicate '{predicate}'"
-            )
-
             # Create buffers around POIs
             buffer_gdf = buffer_geodataframe(
                 self.points_gdf,
@@ -585,34 +593,92 @@ class PoiViewGenerator:
                 cap_style="round",
             )
 
-            # Aggregate polygons to buffers
-            aggregation_result_gdf = aggregate_polygons_to_zones(
-                polygons=data,
-                zones=buffer_gdf,
-                value_columns=value_column,
-                aggregation=stat,
-                predicate=predicate,
-                zone_id_column="poi_id",
-                output_suffix="",
-                drop_geometry=True,
-                **kwargs,
-            )
+            if any(data.geom_type.isin(["MultiPoint", "Point"])):
+
+                self.logger.info(
+                    f"Aggregating point data within {map_radius_meters}m buffers around POIs using predicate '{predicate}'"
+                )
+
+                # If no value_column, default to 'count'
+                if value_column is None:
+                    actual_stat = "count"
+                    self.logger.warning(
+                        "No value_column provided for point data. Defaulting to 'count' aggregation."
+                    )
+                else:
+                    actual_stat = stat
+                    if value_column not in data.columns:
+                        raise ValueError(
+                            f"Value column '{value_column}' not found in input GeoDataFrame."
+                        )
+
+                aggregation_result_gdf = aggregate_points_to_zones(
+                    points=data,
+                    zones=buffer_gdf,
+                    value_columns=value_column,
+                    aggregation=actual_stat,
+                    point_zone_predicate=predicate,  # can't be `fractional``
+                    zone_id_column="poi_id",
+                    output_suffix="",
+                    drop_geometry=True,
+                    **kwargs,
+                )
+
+                output_col_from_agg = (
+                    f"{value_column}_{actual_stat}" if value_column else "point_count"
+                )
+                results_df = aggregation_result_gdf[["poi_id", output_col_from_agg]]
+
+                if output_column != "zonal_stat":
+                    results_df = results_df.rename(
+                        columns={output_col_from_agg: output_column}
+                    )
+
+            else:
+                if value_column is None:
+                    raise ValueError(
+                        "value_column must be provided for polygon data aggregation."
+                    )
+                if value_column not in data.columns:
+                    raise ValueError(
+                        f"Value column '{value_column}' not found in input GeoDataFrame."
+                    )
+                self.logger.info(
+                    f"Aggregating polygon data within {map_radius_meters}m buffers around POIs using predicate '{predicate}'"
+                )
 
-            results_df = aggregation_result_gdf[["poi_id", value_column]]
+                # Aggregate polygons to buffers
+                aggregation_result_gdf = aggregate_polygons_to_zones(
+                    polygons=data,
+                    zones=buffer_gdf,
+                    value_columns=value_column,
+                    aggregation=stat,
+                    predicate=predicate,
+                    zone_id_column="poi_id",
+                    output_suffix="",
+                    drop_geometry=True,
+                    **kwargs,
+                )
+
+                output_col_from_agg = value_column
+
+            results_df = aggregation_result_gdf[["poi_id", output_col_from_agg]]
 
             if output_column != "zonal_stat":
-                results_df = results_df.rename(columns={value_column: output_column})
+                results_df = results_df.rename(
+                    columns={output_col_from_agg: output_column}
+                )
 
         else:
             raise ValueError(
                 "data must be either a list of TifProcessor objects or a GeoDataFrame"
             )
 
-        self._update_view(results_df)
+        # self._update_view(results_df) # Removed direct view update
         self.logger.info(
             f"Zonal statistics mapping complete for column(s) derived from '{output_column}' or '{value_column}'"
         )
-        return self.view
+        return results_df  # Return the DataFrame
 
     def map_built_s(
         self,
@@ -654,16 +720,20 @@ class PoiViewGenerator:
         )
         self.logger.info("Loading GHSL Built Surface raster tiles")
         tif_processors = handler.load_data(
-            self.points_gdf.copy(), ensure_available=self.config.ensure_available
+            self.points_gdf.copy(),
+            ensure_available=self.config.ensure_available,
+            merge_rasters=True,
         )
 
-        return self.map_zonal_stats(
+        mapped_data = self.map_zonal_stats(
             data=tif_processors,
             stat=stat,
             map_radius_meters=map_radius_meters,
             output_column=output_column,
             **kwargs,
         )
+        self._update_view(mapped_data)
+        return self.view
 
     def map_smod(
         self,
@@ -702,14 +772,18 @@ class PoiViewGenerator:
 
         self.logger.info("Loading GHSL SMOD raster tiles")
         tif_processors = handler.load_data(
-            self.points_gdf.copy(), ensure_available=self.config.ensure_available
+            self.points_gdf.copy(),
+            ensure_available=self.config.ensure_available,
+            merge_rasters=True,
         )
 
-        return self.map_zonal_stats(
+        mapped_data = self.map_zonal_stats(
             data=tif_processors,
             output_column=output_column,
             **kwargs,
         )
+        self._update_view(mapped_data)
+        return self.view
 
     def map_wp_pop(
         self,
@@ -718,17 +792,25 @@ class PoiViewGenerator:
         resolution=1000,
         predicate: Literal[
             "centroid_within", "intersects", "fractional", "within"
-        ] = "fractional",
+        ] = "intersects",
         output_column: str = "population",
         **kwargs,
     ):
-        if isinstance(country, str):
-            country = [country]
+        # Ensure country is always a list for consistent handling
+        countries_list = [country] if isinstance(country, str) else country
 
         handler = WPPopulationHandler(
-            project="pop", resolution=resolution, data_store=self.data_store, **kwargs
+            resolution=resolution,
+            data_store=self.data_store,
+            **kwargs,
         )
 
+        # Restrict to single country for age_structures project
+        if handler.config.project == "age_structures" and len(countries_list) > 1:
+            raise ValueError(
+                "For 'age_structures' project, only a single country can be processed at a time."
+            )
+
         self.logger.info(
             f"Mapping WorldPop Population data (year: {handler.config.year}, resolution: {handler.config.resolution}m)"
         )
@@ -738,36 +820,98 @@ class PoiViewGenerator:
                 "Fractional aggregations only supported for datasets with 1000m resolution. Using `intersects` as predicate"
             )
             predicate = "intersects"
-        
+
+        data_to_process: Union[List[TifProcessor], gpd.GeoDataFrame, pd.DataFrame]
+
         if predicate == "centroid_within":
-            data = []
-            for c in country:
-                data.extend(
-                    handler.load_data(c, ensure_available=self.config.ensure_available)
+            if handler.config.project == "age_structures":
+                # Load individual tif processors for the single country
+                all_tif_processors = handler.load_data(
+                    countries_list[0],
+                    ensure_available=self.config.ensure_available,
+                    **kwargs,
                 )
+
+                # Sum results from each tif_processor separately
+                summed_results_by_poi = {
+                    poi_id: 0.0 for poi_id in self.points_gdf["poi_id"].unique()
+                }
+
+                self.logger.info(
+                    f"Sampling individual age_structures rasters using 'sum' statistic and summing per POI."
+                )
+                for tif_processor in all_tif_processors:
+                    single_raster_df = self.map_zonal_stats(
+                        data=tif_processor,
+                        stat="sum",
+                        map_radius_meters=map_radius_meters,
+                        value_column="pixel_value",
+                        predicate=predicate,
+                        output_column=output_column,  # This output_column will be in the temporary DF
+                        **kwargs,
+                    )
+                    # Add values from this single raster to the cumulative sum
+                    for _, row in single_raster_df.iterrows():
+                        summed_results_by_poi[row["poi_id"]] += row[output_column]
+
+                # Convert the summed dictionary back to a DataFrame
+                data_to_process = pd.DataFrame(
+                    list(summed_results_by_poi.items()),
+                    columns=["poi_id", output_column],
+                )
+
+            else:
+                # Existing behavior for non-age_structures projects or if merging is fine
+                # 'data_to_process' will be a list of TifProcessor objects, which map_zonal_stats will merge
+                data_to_process = []
+                for c in countries_list:
+                    data_to_process.extend(
+                        handler.load_data(
+                            c, ensure_available=self.config.ensure_available, **kwargs
+                        )
+                    )
         else:
-            data = pd.concat(
+            # 'data_to_process' will be a GeoDataFrame
+            data_to_process = pd.concat(
                 [
                     handler.load_into_geodataframe(
-                        c, ensure_available=self.config.ensure_available
+                        c, ensure_available=self.config.ensure_available, **kwargs
                     )
-                    for c in country
+                    for c in countries_list  # Original iteration over countries_list
                 ],
                 ignore_index=True,
             )
 
-        self.logger.info(f"Mapping WorldPop Population data into {map_radius_meters}m zones around POIs using 'sum' statistic")
-
-        return self.map_zonal_stats(
-            data,
-            stat="sum",
-            map_radius_meters=map_radius_meters,
-            value_column="pixel_value",
-            predicate=predicate,
-            output_column=output_column,
-            **kwargs
+        self.logger.info(
+            f"Mapping WorldPop Population data into {map_radius_meters}m zones around POIs using 'sum' statistic"
         )
 
+        final_mapped_df: pd.DataFrame
+
+        # If 'data_to_process' is already the summed DataFrame (from age_structures/centroid_within branch),
+        # use it directly.
+        if (
+            isinstance(data_to_process, pd.DataFrame)
+            and output_column in data_to_process.columns
+            and "poi_id" in data_to_process.columns
+        ):
+            final_mapped_df = data_to_process
+        else:
+            # For other cases, proceed with the original call to map_zonal_stats
+            final_mapped_df = self.map_zonal_stats(
+                data=data_to_process,
+                stat="sum",
+                map_radius_meters=map_radius_meters,
+                value_column="pixel_value",
+                predicate=predicate,
+                output_column=output_column,
+                **kwargs,
+            )
+        self._update_view(
+            final_mapped_df
+        )  # Update the view with the final mapped DataFrame
+        return self.view
+
     def save_view(
         self,
         name: str,