chore(gadm): replace parseGadm36Id method name to parseGadmId

Let the method more version agnostic

Author: willian-viana

pages/dashboards/[[...location]].js

@@ -7,7 +7,7 @@ import uniqBy from 'lodash/uniqBy';
 
 import useRouter from 'utils/router';
 import { decodeQueryParams } from 'utils/url';
-import { parseGadm36Id } from 'utils/gadm';
+import { parseGadmId } from 'utils/gadm';
 import { parseStringWithVars } from 'utils/strings';
 
 import { getLocationData } from 'services/location';
@@ -183,8 +183,8 @@ export const getServerSideProps = async ({ params, query, req }) => {
       countryData = {
         ...countryData,
         regions: uniqBy(regions.data).map((row) => ({
-          id: parseGadm36Id(row.id).adm1,
-          value: parseGadm36Id(row.id).adm1,
+          id: parseGadmId(row.id).adm1,
+          value: parseGadmId(row.id).adm1,
           label: row.name,
           name: row.name,
         })),
@@ -197,8 +197,8 @@ export const getServerSideProps = async ({ params, query, req }) => {
       countryData = {
         ...countryData,
         subRegions: uniqBy(subRegions.data).map((row) => ({
-          id: parseGadm36Id(row.id).adm2,
-          value: parseGadm36Id(row.id).adm2,
+          id: parseGadmId(row.id).adm2,
+          value: parseGadmId(row.id).adm2,
           label: row.name,
           name: row.name,
         })),

pages/embed/sentence/[[...location]].js

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import uniqBy from 'lodash/uniqBy';
 
-import { parseGadm36Id } from 'utils/gadm';
+import { parseGadmId } from 'utils/gadm';
 
 import { getLocationData } from 'services/location';
 import {
@@ -91,8 +91,8 @@ export const getServerSideProps = async ({ params }) => {
       countryData = {
         ...countryData,
         regions: uniqBy(regions.data).map((row) => ({
-          id: parseGadm36Id(row.id).adm1,
-          value: parseGadm36Id(row.id).adm1,
+          id: parseGadmId(row.id).adm1,
+          value: parseGadmId(row.id).adm1,
           label: row.name,
           name: row.name,
         })),
@@ -105,8 +105,8 @@ export const getServerSideProps = async ({ params }) => {
       countryData = {
         ...countryData,
         subRegions: uniqBy(subRegions.data).map((row) => ({
-          id: parseGadm36Id(row.id).adm2,
-          value: parseGadm36Id(row.id).adm2,
+          id: parseGadmId(row.id).adm2,
+          value: parseGadmId(row.id).adm2,
           label: row.name,
           name: row.name,
         })),

providers/country-data-provider/actions.js

@@ -1,5 +1,5 @@
 import { createAction, createThunkAction } from 'redux/actions';
-import { parseGadm36Id } from 'utils/gadm';
+import { parseGadmId } from 'utils/gadm';
 import uniqBy from 'lodash/uniqBy';
 
 import {
@@ -49,7 +49,7 @@ export const getRegions = createThunkAction(
         const parsedResponse = [];
         uniqBy(response.data).forEach((row) => {
           parsedResponse.push({
-            id: parseGadm36Id(row.id).adm1,
+            id: parseGadmId(row.id).adm1,
             name: row.name,
           });
         });
@@ -73,7 +73,7 @@ export const getSubRegions = createThunkAction(
           const parsedResponse = [];
           uniqBy(rows).forEach((row) => {
             parsedResponse.push({
-              id: parseGadm36Id(row.id).adm2,
+              id: parseGadmId(row.id).adm2,
               name: row.name,
             });
           });

utils/gadm.js

@@ -3,7 +3,7 @@ export const getGadm36Id = (country, region, subRegion) =>
     subRegion ? `.${subRegion}_1` : '_1'
   }`;
 
-export const parseGadm36Id = (gid) => {
+export const parseGadmId = (gid) => {
   if (!gid) return null;
 
   const ids = gid.split('.');
@@ -26,6 +26,6 @@ export const parseGadm36Id = (gid) => {
 export const getGadmLocationByLevel = ({ adm_level, ...location }) => ({
   type: 'country',
   ...(location?.gid_0 && {
-    ...parseGadm36Id(location[`gid_${adm_level || '0'}`]),
+    ...parseGadmId(location[`gid_${adm_level || '0'}`]),
   }),
 });