Update pages/_common.py

pages/_common.py

@@ -80,6 +80,11 @@ NAME_COL   = "scientific_name_clements"
 TYPE_COL   = "species_type"
 SEASON_COL = "season"
 
+# Column in final_occs used to match occurrences to a taxon. The original
+# 'scientific_name_clements' lacked subspecies; 'scientific_name_clements_fix'
+# carries both species and subspecies names.
+OCC_NAME_COL = "scientific_name_clements_fix"
+
 # species_type value -> UI group label
 TYPE_TO_GROUP = {"resident": "Resident", "migrant": "Migratory", "subspecies": "Subspecies"}
 GROUP_ORDER   = ["Resident", "Migratory", "Subspecies"]
@@ -389,9 +394,10 @@ def get_iucn_fc(species: str) -> ee.FeatureCollection:
 
 def _occ_name(species: str) -> str:
     """
-    Map a display name to the value used in final_occs.scientific_name_clements.
-    final_occs carries trinomials for subspecies, so identity matching is correct
-    for every taxon. Centralized here in case the occurrence keying ever changes.
+    Map a display name to the value used in final_occs[OCC_NAME_COL].
+    That column carries both species and subspecies names in 'Genus species'
+    (and trinomial) space format, matching the display name, so identity
+    matching is correct for every taxon.
     """
     return species
 
@@ -399,10 +405,11 @@ def _occ_name(species: str) -> str:
 def get_occurrences_fc(species: str) -> ee.FeatureCollection:
     """
     Occurrence points for the species (season-independent).
-    Filters on 'scientific_name_clements' == display name (space format).
+    Filters on OCC_NAME_COL == display name (space format), which includes
+    subspecies.
     """
     return (ee.FeatureCollection(ASSET_FINAL_OCCS)
-              .filter(ee.Filter.eq("scientific_name_clements", _occ_name(species))))
+              .filter(ee.Filter.eq(OCC_NAME_COL, _occ_name(species))))
 
 
 def query_occ_at_click(lat: float, lon: float, species: str,