Merge pull request #573 from iridl/mm_southethiopia_badyears

South Ethiopia bad years

Author: aaron-kaplan

fbfmaproom/fbfmaproom-sample.yaml

@@ -1748,22 +1748,26 @@ countries:
         shapes: &south_ethiopia_shapes
             - name: Regional
               sql: select (admin1pcod) as key, admin1name as label,
-                  ST_AsBinary(ST_Union(the_geom)) as the_geom from iridb.eth_zones_2024
+                  ST_AsBinary(ST_Union(the_geom)) as the_geom from iridb.eth_woredas_2024
                   where admin1pcod = 'ET08'
-                  and admin2pcod in ('ET0812','ET0806','ET0807','ET0809','ET0810')
+                  and admin2pcod in ('ET0812','ET0806','ET0807','ET0809','ET0810','ET0803','ET0802')
+                  and admin3pcod in ('ET080601','ET080801','ET081001','ET080701','ET080212','ET080202','ET080211','ET080310','ET080904','ET080902','ET080905','ET080901','ET081206','ET081203','ET081201','ET081202','ET081204','ET081205')
                   group by 1, 2
 
             - name: Zonal
               sql: select (admin2pcod) as key, admin2name as label,
-                  ST_AsBinary(the_geom) as the_geom from iridb.eth_zones_2024
+                  ST_AsBinary(ST_Union(the_geom)) as the_geom from iridb.eth_woredas_2024
                   where admin1pcod = 'ET08'
-                  and admin2pcod in ('ET0812','ET0806','ET0807','ET0809','ET0810')
+                  and admin2pcod in ('ET0812','ET0806','ET0807','ET0809','ET0810','ET0803','ET0802')
+                  and admin3pcod in ('ET080601','ET080801','ET081001','ET080701','ET080212','ET080202','ET080211','ET080310','ET080904','ET080902','ET080905','ET080901','ET081206','ET081203','ET081201','ET081202','ET081204','ET081205')
+                  group by 1, 2
 
             - name: Woreda
               sql: select (admin3pcod) as key, admin3name as label,
                   ST_AsBinary(the_geom) as the_geom from iridb.eth_woredas_2024
                   where admin1pcod = 'ET08'
-                  and admin2pcod in ('ET0812','ET0806','ET0807','ET0809','ET0810')
+                  and admin2pcod in ('ET0812','ET0806','ET0807','ET0809','ET0810','ET0803','ET0802')
+                  and admin3pcod in ('ET080601','ET080801','ET081001','ET080701','ET080212','ET080202','ET080211','ET080310','ET080904','ET080902','ET080905','ET080901','ET081206','ET081203','ET081201','ET081202','ET081204','ET081205')
 
         datasets:
             defaults:
@@ -1928,13 +1932,13 @@ countries:
                     format: number3
                 bad-years:
                     label: Reported bad years
-                    path: ethiopia/bad-years-mam.zarr
+                    path: ethiopia/southethiopia_badyears_mam.zarr
                     var_names:
-                        value: bad
+                        value: rank
                         time: T
                     colormap: precip
-                    lower_is_worse: no
-                    format: bad
+                    lower_is_worse: yes
+                    format: number0
             forecasts:
                 pnep:
                     label: Forecast prob non-exc v1
@@ -2150,13 +2154,13 @@ countries:
                 enso_state: *enso_3mo
                 bad-years:
                     label: Reported bad years
-                    path: ethiopia/bad-years-ond.zarr
+                    path: ethiopia/southethiopia_badyears_ond.zarr
                     var_names:
-                        value: bad
+                        value: rank
                         time: T
                     colormap: precip
-                    lower_is_worse: no
-                    format: bad
+                    lower_is_worse: yes
+                    format: number0
             forecasts:
                 pnep:
                     label: Forecast v1 prob non-exc