feat(countries): migrate queries from gadm 3.6 to 4.1

wri · Dec 18, 2024 · 72fd5cc · 72fd5cc
1 parent da0c405
commit 72fd5cc
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 40 deletions.
diff --git a/pages/dashboards/[[...location]].js b/pages/dashboards/[[...location]].js
@@ -183,7 +183,7 @@ export const getServerSideProps = async ({ params, query, req }) => {
       const countryLinks = await getCountryLinksSerialized();
       countryData = {
         ...countryData,
-        regions: uniqBy(regions.data.rows).map((row) => ({
+        regions: uniqBy(regions.data).map((row) => ({
           id: parseGadm36Id(row.id).adm1,
           value: parseGadm36Id(row.id).adm1,
           label: row.name,
@@ -197,7 +197,7 @@ export const getServerSideProps = async ({ params, query, req }) => {
       const subRegions = await getSubRegionsProvider(adm0, adm1);
       countryData = {
         ...countryData,
-        subRegions: uniqBy(subRegions.data.rows).map((row) => ({
+        subRegions: uniqBy(subRegions.data).map((row) => ({
           id: parseGadm36Id(row.id).adm2,
           value: parseGadm36Id(row.id).adm2,
           label: row.name,

diff --git a/pages/embed/sentence/[[...location]].js b/pages/embed/sentence/[[...location]].js
@@ -91,7 +91,7 @@ export const getServerSideProps = async ({ params }) => {
       const countryLinks = await getCountryLinksSerialized();
       countryData = {
         ...countryData,
-        regions: uniqBy(regions.data.rows).map((row) => ({
+        regions: uniqBy(regions.data).map((row) => ({
           id: parseGadm36Id(row.id).adm1,
           value: parseGadm36Id(row.id).adm1,
           label: row.name,
@@ -105,7 +105,7 @@ export const getServerSideProps = async ({ params }) => {
       const subRegions = await getSubRegionsProvider(adm0, adm1);
       countryData = {
         ...countryData,
-        subRegions: uniqBy(subRegions.data.rows).map((row) => ({
+        subRegions: uniqBy(subRegions.data).map((row) => ({
           id: parseGadm36Id(row.id).adm2,
           value: parseGadm36Id(row.id).adm2,
           label: row.name,

diff --git a/providers/country-data-provider/actions.js b/providers/country-data-provider/actions.js
@@ -47,7 +47,7 @@ export const getRegions = createThunkAction(
     getRegionsProvider(country)
       .then((response) => {
         const parsedResponse = [];
-        uniqBy(response.data.rows).forEach((row) => {
+        uniqBy(response.data).forEach((row) => {
           parsedResponse.push({
             id: parseGadm36Id(row.id).adm1,
             name: row.name,
@@ -64,25 +64,26 @@ export const getRegions = createThunkAction(
 
 export const getSubRegions = createThunkAction(
   'getSubRegions',
-  ({ adm0, adm1, token }) => (dispatch) => {
-    dispatch(setSubRegionsLoading(true));
-    getSubRegionsProvider(adm0, adm1, token)
-      .then((subRegions) => {
-        const { rows } = subRegions.data;
-        const parsedResponse = [];
-        uniqBy(rows).forEach((row) => {
-          parsedResponse.push({
-            id: parseGadm36Id(row.id).adm2,
-            name: row.name,
+  ({ adm0, adm1, token }) =>
+    (dispatch) => {
+      dispatch(setSubRegionsLoading(true));
+      getSubRegionsProvider(adm0, adm1, token)
+        .then((subRegions) => {
+          const { rows } = subRegions.data;
+          const parsedResponse = [];
+          uniqBy(rows).forEach((row) => {
+            parsedResponse.push({
+              id: parseGadm36Id(row.id).adm2,
+              name: row.name,
+            });
           });
+          dispatch(setSubRegions(uniqBy(parsedResponse, 'id')));
+          dispatch(setSubRegionsLoading(false));
+        })
+        .catch(() => {
+          dispatch(setSubRegionsLoading(false));
         });
-        dispatch(setSubRegions(uniqBy(parsedResponse, 'id')));
-        dispatch(setSubRegionsLoading(false));
-      })
-      .catch(() => {
-        dispatch(setSubRegionsLoading(false));
-      });
-  }
+    }
 );
 
 export const getCountryLinks = createThunkAction(

diff --git a/services/country.js b/services/country.js
@@ -1,17 +1,19 @@
 import { all, spread } from 'axios';
 
-import { cartoRequest } from 'utils/request';
+import { cartoRequest, dataRequest } from 'utils/request';
 import { getGadm36Id } from 'utils/gadm';
 
+const GADM_DATASET = '/dataset/gadm_administrative_boundaries/v4.1/query';
+
 const SQL_QUERIES = {
-  getCountries:
-    "SELECT iso, name_engli as name FROM gadm36_countries WHERE iso != 'TWN' AND iso != 'XCA' ORDER BY name",
+  getGADMCountries:
+    "SELECT country AS name, gid_0 AS iso FROM gadm_administrative_boundaries WHERE adm_level = '0' ORDER BY country",
+  getGADMRegions:
+    "SELECT name_1 AS name, gid_1 AS id FROM gadm_administrative_boundaries WHERE adm_level='1' AND gid_0 = '{iso}' ORDER BY name ",
+  getGADMSubRegions:
+    "SELECT gid_2 as id, name_2 as name FROM gadm_administrative_boundaries WHERE gid_0 = '{iso}' AND gid_1 = '{adm1}' AND adm_level='2' AND type_2 NOT IN ('Waterbody', 'Water body', 'Water Body') ORDER BY name",
   getFAOCountries:
     'SELECT DISTINCT country AS iso, name FROM table_1_forest_area_and_characteristics',
-  getRegions:
-    "SELECT gid_1 as id, name_1 as name FROM gadm36_adm1 WHERE iso = '{iso}' ORDER BY name ",
-  getSubRegions:
-    "SELECT gid_2 as id, name_2 as name FROM gadm36_adm2 WHERE iso = '{iso}' AND gid_1 = '{adm1}' AND type_2 NOT IN ('Waterbody', 'Water body', 'Water Body') ORDER BY name",
   getCountryLinks:
     'SELECT iso, external_links FROM external_links_gfw WHERE forest_atlas is true',
   getRanking:
@@ -22,8 +24,9 @@ const convertToOptions = (countries) =>
   countries.map((c) => ({ label: c.name, value: c.iso }));
 
 export const getCountriesProvider = () => {
-  const url = `/sql?q=${SQL_QUERIES.getCountries}`;
-  return cartoRequest.get(url);
+  const url = `${GADM_DATASET}?sql=${SQL_QUERIES.getGADMCountries}`;
+
+  return dataRequest.get(url);
 };
 
 export const getFAOCountriesProvider = () => {
@@ -32,15 +35,20 @@ export const getFAOCountriesProvider = () => {
 };
 
 export const getRegionsProvider = ({ adm0, token }) => {
-  const url = `/sql?q=${SQL_QUERIES.getRegions}`.replace('{iso}', adm0);
-  return cartoRequest.get(url, { cancelToken: token });
+  const url = `${GADM_DATASET}?sql=${SQL_QUERIES.getGADMRegions}`.replace(
+    '{iso}',
+    adm0
+  );
+
+  return dataRequest.get(url, { cancelToken: token });
 };
 
 export const getSubRegionsProvider = (adm0, adm1, token) => {
-  const url = `/sql?q=${SQL_QUERIES.getSubRegions}`
+  const url = `${GADM_DATASET}?sql=${SQL_QUERIES.getGADMSubRegions}`
     .replace('{iso}', adm0)
     .replace('{adm1}', getGadm36Id(adm0, adm1));
-  return cartoRequest.get(url, { cancelToken: token });
+
+  return dataRequest.get(url, { cancelToken: token });
 };
 
 export const getCountryLinksProvider = (token) => {
@@ -67,17 +75,17 @@ export const getCountryLinksSerialized = async () => {
 
 export const getCategorisedCountries = (asOptions = false) =>
   all([getCountriesProvider(), getFAOCountriesProvider()]).then(
-    spread((gadm36Countries, faoCountries) => {
+    spread((gadm41Countries, faoCountries) => {
       return {
         gadmCountries: asOptions
-          ? convertToOptions(gadm36Countries.data.rows)
-          : gadm36Countries.data.rows,
+          ? convertToOptions(gadm41Countries.data)
+          : gadm41Countries.data,
         faoCountries: asOptions
           ? convertToOptions(faoCountries.data.rows)
           : faoCountries.data.rows,
         countries: asOptions
-          ? convertToOptions(gadm36Countries.data.rows)
-          : gadm36Countries.data.rows,
+          ? convertToOptions(gadm41Countries.data)
+          : gadm41Countries.data,
       };
     })
   );