feat(currentness): optionally query ohsomedb in preprocess function

instead of ohsome API.

This is implemented as feature flag.

Author: matthiasschaub

ohsome_quality_api/indicators/currentness/indicator.py

@@ -8,19 +8,23 @@
     th: Threshold
 """
 
+import json
 import locale
 import logging
 import os
 from dataclasses import dataclass
+from pathlib import Path
 from string import Template
 
 import plotly.graph_objects as pgo
 import yaml
 from dateutil.parser import isoparse
 from geojson import Feature
+from ohsome_filter_to_sql.main import ohsome_filter_to_sql
 from plotly.subplots import make_subplots
 
 from ohsome_quality_api.definitions import Color
+from ohsome_quality_api.geodatabase import client
 from ohsome_quality_api.indicators.base import BaseIndicator
 from ohsome_quality_api.ohsome import client as ohsome_client
 from ohsome_quality_api.topics.models import BaseTopic as Topic
@@ -29,7 +33,7 @@
 try:
     locale.setlocale(locale.LC_ALL, ["en_US", locale.getencoding()])
 except locale.Error:
-    logging.warn(
+    logging.warning(
         "Could not set locale to en_US. Output may be different than expected."
     )
 
@@ -69,7 +73,13 @@ def __init__(
         self.bin_in_between: Bin
         self.bin_out_of_date: Bin
 
-    async def preprocess(self):
+    async def preprocess(self, ohsomedb: bool = False):
+        if ohsomedb:
+            await self.preprocess_ohsomedb()
+        else:
+            await self.preprocess_ohsomeapi()
+
+    async def preprocess_ohsomeapi(self):
         """Fetch all latest contributions in monthly buckets since 2008
 
         Beside the creation, latest contribution includes also the change to the
@@ -114,6 +124,46 @@ async def preprocess(self):
         self.contrib_sum = contrib_sum
         self.result.timestamp_osm = self.bin_total.to_timestamps[0]
 
+    async def preprocess_ohsomedb(self):
+        where = ohsome_filter_to_sql(self.topic.filter)
+        with open(Path(__file__).parent / "query.sql", "r") as file:
+            template = file.read()
+        query = Template(template).substitute(
+            {
+                "aoi": json.dumps(self.feature["geometry"]),
+                "filter": where,
+            }
+        )
+        results = await client.fetch(query)
+        if len(results) == 0:
+            # no data
+            self.contrib_sum = 0
+            return
+        to_timestamps = []
+        from_timestamps = []
+        timestamps = []
+        contrib_abs = []
+        contrib_sum = 0
+        for r in reversed(results):  # latest contributions first
+            to_timestamps.append(r[0])
+            from_timestamps.append(r[0])
+            timestamps.append(r[0])
+            contrib_abs.append(r[1])
+            contrib_sum += r[1]
+        if contrib_sum == 0:
+            contrib_rel = [0 for _ in contrib_abs]
+        else:
+            contrib_rel = [c / contrib_sum for c in contrib_abs]
+        self.bin_total = Bin(
+            contrib_abs,
+            contrib_rel,
+            to_timestamps,
+            from_timestamps,
+            timestamps,
+        )
+        self.contrib_sum = contrib_sum
+        self.result.timestamp_osm = self.bin_total.to_timestamps[0]
+
     def calculate(self):
         """Determine up-to-date, in-between and out-of-date contributions.
 

ohsome_quality_api/indicators/currentness/query.sql

@@ -0,0 +1,20 @@
+WITH bpoly AS (
+    SELECT
+        ST_Setsrid (ST_GeomFromGeoJSON ('$aoi'), 4326) AS geom
+)
+SELECT
+    Date_trunc('month', valid_from) AS month,
+    Count(*)
+FROM
+    contributions c,
+    bpoly b
+WHERE
+    ST_Intersects (c.geom, b.geom)
+    AND (status_geom_type).status = 'latest'
+    -- TODO
+    -- AND contrib_type in ("CREATION", "GEOMETRY", "TAG")
+    AND ($filter)
+GROUP BY
+    month
+ORDER BY
+    month;

tests/approvals/integrationtests/indicators/test_currentness.py-TestCalculation-test_calculate.approved.txt renamed to tests/approvals/integrationtests/indicators/test_currentness.py-TestCalculation-test_calculate[False].approved.txt

@@ -0,0 +1,2 @@
+In the area of interest 71% of the 6879 features were edited (created or modified) for the last time in the period between 01 Aug 2022 and 01 Aug 2025.
+Most features are up-to-date.

tests/approvals/integrationtests/indicators/test_currentness.py-TestCalculation-test_calculate[True].approved.txt

@@ -0,0 +1,2 @@
+Please note that in the area of interest less than 25 features of the selected topic are present today. In the area of interest 71% of the 20 features were edited (created or modified) for the last time in the period between 01 Aug 2022 and 01 Aug 2025.
+Most features are up-to-date.

tests/approvals/integrationtests/indicators/test_currentness.py-TestCalculation-test_low_contributions.approved.txt renamed to tests/approvals/integrationtests/indicators/test_currentness.py-TestCalculation-test_low_contributions[False].approved.txt

@@ -0,0 +1,2 @@
+Please note that there was no mapping activity for 13 months in this region. In the area of interest 71% of the 30 features were edited (created or modified) for the last time in the period between 01 Aug 2022 and 01 Aug 2025.
+Most features are up-to-date.