fix FACT_air queries to include state-country codes and indexes.

src/data_services/FACT_air.jl

@@ -27,8 +27,10 @@ function eu_air(conn_dict::Dict, selection::Dict)
     dftemp = DataFrame()
     # iterate over geo objects
     for (id, shape) in zip(geo_id, shape_obj)
+        # Extract the first two characters of id in Julia
+        id_short = id[1:2]
         # prepare query
-        query = "SELECT COUNT(DISTINCT(ea.airp_icao_)) as airports, SUM(et.flights) as flights FROM eu_airports_2013 ea JOIN eu_traffic et ON ea.airp_icao_ = et.ICAO_id WHERE ST_Intersects(ST_GeomFromText('"*shape*"'), ea.SHAPE) AND et.Year = 2022;"
+        query = "SELECT COUNT(DISTINCT(ea.airp_icao_)) as airports, SUM(et.flights) as flights FROM eu_airports_2013 ea JOIN eu_traffic et ON ea.airp_icao_ = et.ICAO_id WHERE ea.eu_country = '"*id_short*"' AND ST_Intersects(ST_GeomFromText('"*shape*"'), ea.SHAPE) AND et.Year = 2022;"
         # create connection
         conn = establish_connection(conn_dict["host"], conn_dict["user"], conn_dict["password"], conn_dict["database"]; port=conn_dict["port"])
         # execute