feat: changed queries for macro countries in talk to ipcc

climateqa/engine/talk_to_data/ipcc/queries.py

@@ -44,9 +44,10 @@ def indicator_per_year_at_location_query(
     if country_code in MACRO_COUNTRIES:
         table_path = f"'{IPCC_DATASET_URL}/{table.lower()}/{country_code}_macro.parquet'"
         sql_query = f"""
-        SELECT year, scenario, {indicator_column}
+        SELECT year, scenario, AVG({indicator_column}) as {indicator_column}
         FROM {table_path}
-        WHERE admin1 = '{admin1}' AND year >= 1950
+        WHERE latitude = {latitude} AND longitude = {longitude} AND year >= 1950
+        GROUP BY scenario, year
         ORDER BY year, scenario
         """
     else:
@@ -102,11 +103,10 @@ def indicator_for_given_year_query(
     if country_code in MACRO_COUNTRIES:
         table_path = f"'{IPCC_DATASET_URL}/{table.lower()}/{country_code}_macro.parquet'"
         sql_query = f"""
-        SELECT {indicator_column}, c.latitude, c.longitude, c.admin1, scenario
-        FROM {table_path} AS t
-        RIGHT JOIN '{IPCC_DATASET_URL}/coordinates.parquet' AS c 
-        ON c.admin1 = t.admin1 AND c.country_code = t.country_code
+        SELECT latitude, longitude, scenario, AVG({indicator_column}) as {indicator_column}
+        FROM {table_path}
         WHERE year = {year}
+        GROUP BY latitude, longitude, scenario
         ORDER BY latitude, longitude, scenario
         """
     else: