WIP

Author: tnagorra

pystac_monty/geocoding.py

@@ -501,7 +501,8 @@ def get_geometry_by_country_name(self, country_name: str) -> Optional[Dict[str,
             return None
 
     def get_iso3_from_geometry(self, geometry: Dict[str, Any]) -> Optional[str]:
-        raise NotImplementedError("Method not implemented")
+        # FIXME: Implement this later
+        return "UNK"
 
     def get_geometry_from_iso3(self, iso3: str) -> Optional[Dict[str, Any]]:
         raise NotImplementedError("Method not implemented")

pystac_monty/sources/desinventar.py

@@ -24,107 +24,19 @@
 )
 from pystac_monty.hazard_profiles import MontyHazardProfiles
 from pystac_monty.sources.common import MontyDataTransformer
-
-STAC_EVENT_ID_PREFIX = "desinventar-event-"
-STAC_HAZARD_ID_PREFIX = "desinventar-hazard-"
-STAC_IMPACT_ID_PREFIX = "desinventar-impact-"
+from pystac_monty.validators.desinventar import (
+    STAC_EVENT_ID_PREFIX,
+    STAC_HAZARD_ID_PREFIX,
+    STAC_IMPACT_ID_PREFIX,
+    DataRow,
+    GeoDataEntry,
+)
 
 logger = logging.getLogger(__name__)
 
 T = typing.TypeVar("T")
 
 
-class GeoDataEntry(TypedDict):
-    level: Optional[str]
-    property_code: Optional[str]
-    shapefile_data: Optional[gpd.GeoDataFrame]
-
-
-# Properties extracted from desinventar
-class DataRow(pydantic.BaseModel):
-    serial: str
-    comment: str | None
-    # source: str | None
-
-    deaths: float | None
-    injured: float | None
-    missing: float | None
-    houses_destroyed: float | None
-    houses_damaged: float | None
-    directly_affected: float | None
-    indirectly_affected: float | None
-    relocated: float | None
-    evacuated: float | None
-    losses_in_dollar: float | None
-    losses_local_currency: float | None
-    # education_centers: str | None
-    # hospitals: str | None
-    damages_in_crops_ha: float | None
-    lost_cattle: float | None
-    damages_in_roads_mts: float | None
-
-    level0: str | None
-    level1: str | None
-    level2: str | None
-    # name0: str | None
-    # name1: str | None
-    # name2: str | None
-    # latitude: str | None
-    # longitude: str | None
-
-    # haz_maxvalue: str | None
-    event: str | None
-    # glide: str | None
-    location: str | None
-
-    # duration: str | None
-    year: int
-    month: int | None
-    day: int | None
-
-    # Added fields
-
-    iso3: str
-    data_source_url: str | None
-
-    @property
-    def event_stac_id(self):
-        return f"{STAC_EVENT_ID_PREFIX}{self.iso3}-{self.serial}"
-
-    @property
-    def event_title(self):
-        return f"{self.event} in {self.location} on {self.event_start_date}"
-
-    @property
-    def event_description(self):
-        return f"{self.event} in {self.location}: {self.comment}"
-
-    @property
-    def event_start_date(self):
-        if self.year is None:
-            return
-
-        start_year = self.year
-        start_month = self.month or 1
-        start_day = self.day or 1
-
-        try:
-            start_dt = datetime(start_year, start_month, start_day)
-            return pytz.utc.localize(start_dt)
-        except Exception:
-            return None
-
-    @property
-    def lowest_level(self):
-        if self.level2 is not None:
-            return 'level2'
-        if self.level1 is not None:
-            return 'level1'
-        if self.level0 is not None:
-            return 'level0'
-        return None
-
-
 # TODO: move to common utils
 def get_list_item_safe(lst: list[T], index: int, default_value: T | None = None) -> T | None:
     try:
@@ -686,6 +598,8 @@ def get_stac_items(self) -> typing.Generator[Item, None, None]:
                         if event_item := self._create_event_item_from_row(row_data):
                             yield event_item
                             yield from self._create_impact_items_from_row(row_data, event_item)
+                        else:
+                            failed_items_count += 1
                 except Exception:
                     failed_items_count += 1
                     logger.error('Failed to process desinventar', exc_info=True)