SQL updates for new shapefiles

fbfmaproom/fbfmaproom-sample.yaml

@@ -334,28 +334,28 @@ countries:
         marker: [8.025, 17.025]
         shapes:
             - name: National
-              sql: select adm0_code as key, adm0_name as label, ST_AsBinary(the_geom) as the_geom
-                  from iridb.g2015_2012_0 where adm0_name = 'Niger'
-              vuln_sql: select adm0_code as key, year, sum(vulnerability) as vuln
+              sql: select 'NER00' as key, adm_00 as label, ST_AsBinary(the_geom) as the_geom
+                  from iridb.ner_adm00_feb2018 where adm0_name = 'Niger'
+              vuln_sql: select 'NER00' as key, year, sum(vulnerability) as vuln
                   from public.fbf_vulnerability where adm0_name = 'Niger' group by 1, 2
 
             - name: Regional
-              sql: select (adm0_code, adm1_code) as key, adm1_name as label,
-                  ST_AsBinary(the_geom) as the_geom from iridb.g2015_2014_1
+              sql: select rowcacode1 as key, adm_01 as label,
+                  ST_AsBinary(the_geom) as the_geom from iridb.ner_adm01_feb2018
                   where adm0_name = 'Niger'
-              vuln_sql: select (adm0_code, adm1_code) as key, year, sum(vulnerability) as vuln
+              vuln_sql: select rowcacode1 as key, year, sum(vulnerability) as vuln
                   from public.fbf_vulnerability where adm0_name = 'Niger' group by 1, 2
 
             - name: Department
-              sql: select (adm0_code, adm1_code, adm2_code) as key, adm2_name as label,
-                  ST_AsBinary(the_geom) as the_geom from iridb.g2015_2014_2
+              sql: select rowcacode2 as key, adm_02 as label,
+                  ST_AsBinary(the_geom) as the_geom from iridb.ner_adm02_feb2018
                   where adm0_name = 'Niger'
-              vuln_sql: select (adm0_code, adm1_code, adm2_code) as key, year, sum(vulnerability) as vuln
+              vuln_sql: select rowcacode2 as key, year, sum(vulnerability) as vuln
                   from public.fbf_vulnerability where adm0_name = 'Niger' group by 1, 2
 
             - name: Commune
               sql: select rowcacode3 as key, adm_03 as label,
-                  ST_AsBinary(the_geom) as the_geom from ner_adm03_feb2018
+                  ST_AsBinary(the_geom) as the_geom from iridb.ner_adm03_feb2018
               vuln_sql: select null as key, 0 as year, 0 as vuln where 1 = 2
               # ^ placeholder sql until we have vulnerabilities for the Commune level.
               # note that the type of each column must be correct or the generated