Merge pull request #3339 from Vizzuality/fix/country-fetch-for-seo

update rails country model to use gadm28 tables for country names

Author: edbrett

app/javascript/pages/country/meta/meta-component.jsx

@@ -7,9 +7,9 @@ class Meta extends PureComponent {
   // eslint-disable-line react/prefer-stateless-function
   render() {
     const { page } = this.props;
-    return (
+    return page ? (
       <Helmet>
-        <title>{`${page ? `${page} | ` : ''}Global Forest Watch`}</title>
+        <title>{`${page} | Global Forest Watch`}</title>
         <meta
           name="description"
           content={`Data about forest change, tenure, forest related employment and land use in ${page}`}
@@ -22,7 +22,7 @@ class Meta extends PureComponent {
         />
         <meta property="og:url" content={window.location.href} />
       </Helmet>
-    );
+    ) : null;
   }
 }
 

app/javascript/services/country.js

@@ -1,7 +1,6 @@
 import axios from 'axios';
 
 const REQUEST_URL = `${process.env.CARTO_API_URL}/sql?q=`;
-const CARTO_REQUEST_URL = `${process.env.CARTO_API_URL}/sql?q=`;
 
 const SQL_QUERIES = {
   getCountries:
@@ -24,7 +23,7 @@ export const getCountriesProvider = () => {
 };
 
 export const getFAOCountriesProvider = () => {
-  const url = `${CARTO_REQUEST_URL}${SQL_QUERIES.getFAOCountries}`;
+  const url = `${REQUEST_URL}${SQL_QUERIES.getFAOCountries}`;
   return axios.get(url);
 };
 
@@ -44,7 +43,7 @@ export const getSubRegionsProvider = (admin0, admin1) => {
 };
 
 export const getCountryLinksProvider = () => {
-  const url = `${CARTO_REQUEST_URL}${SQL_QUERIES.getCountryLinks}`;
+  const url = `${REQUEST_URL}${SQL_QUERIES.getCountryLinks}`;
   return axios.get(url);
 };
 

app/models/country.rb

@@ -1,11 +1,11 @@
 class Country
   class << self
     def base_path
-      ENV['GFW_API_HOST']
+      "#{ENV['CARTO_API_URL']}/sql?q="
     end
 
     def find_all
-      url = "#{base_path}/countries"
+      url = "#{base_path}SELECT iso, country as name FROM umd_nat_staging GROUP BY iso, name ORDER BY name"
       response = Typhoeus.get(url, headers: {"Accept" => "application/json"})
       if response.success?
         Rails.cache.fetch 'countries', expires_in: 1.day do
@@ -22,12 +22,11 @@ def find_by_iso_or_name(value)
 
     def find_by_iso(iso)
       return nil unless iso
-      url = "#{base_path}/countries/#{iso.downcase}?thresh=30"
+      url = "#{base_path}SELECT%20iso,%20name_0%20as%20name%20FROM%20gadm28_adm2%20WHERE%20iso%20=%20'#{iso}'%20LIMIT%201"
       # CACHE: &bust=true if you want to flush the cache
       response = Typhoeus.get(url, headers: {"Accept" => "application/json"})
-
       if response.success? and (response.body.length > 0)
-        JSON.parse(response.body)
+        JSON.parse(response.body)["rows"][0]
       else
         nil
       end
@@ -36,7 +35,7 @@ def find_by_iso(iso)
     def find_by_name(country_name)
       country_name, *_ = country_name.split(/_/)
       country_name = country_name.capitalize
-      url = "https://wri-01.cartodb.com/api/v2/sql?q=SELECT%20*%20FROM%20gfw2_countries%20where%20name%20like%20'#{country_name}%25'"
+      url = "#{base_path}SELECT iso, name_0 as name FROM gadm28_adm2 WHERE name like '#{country_name}' LIMIT 1"
       response = Typhoeus.get(url, headers: {"Accept" => "application/json"})
 
       if response.success?