[Countries] Synonyms or possible names for a lot of countries by buster95 · Pull Request #117 · disease-sh/API

buster95 · 2020-03-23T15:48:53Z

Adding synonyms for a lot of countries, homologate
https://www.worldometers.info/coronavirus/ Country Catalog with this API

This PR has:

Pairing countries with worldometers web page
Some spanish country names for searches ex. Korea del Sur -> South Korea, Italia -> Italy
Improvements on countries/{country name} endpoint found countries easier
Code reduction

This PR
resolve #121
resolve #127
resolve #128
resolve #150

ghost · 2020-03-23T16:01:30Z

alot has been changed. have you tested it?

buster95 · 2020-03-23T16:07:35Z

sure, was tested.

I wanna know if can I integrate
func/countryMap.js file into utils/country_utils.js??
in a next PR

buster95 · 2020-03-24T01:28:48Z

@ebwinters you can check this, I modified your code on endpoint countries/{country name} in file server.js

ebwinters · 2020-03-24T01:33:57Z

@buster95 why did you remove the standardize countryName code? What is this PR even doing it seems like it's gonna screw a lot of things up

buster95 · 2020-03-24T01:44:52Z

@ebwinters 🙄 standardize countryName was moved, check results in my endpoint version and then check results in your endpoint version, after that tell me what version throws better result, PLEASE CHECK

ebwinters · 2020-03-24T01:52:42Z

@buster95 I'm tryna fix something for my CLI rn but I'll pull your branch and run locally to test then I'll approve or reject 👍

ebwinters · 2020-03-24T03:51:04Z

I reviewed it and there's a lot of differences for the worse. For example, /countries/korea,%20south should return

country: "S. Korea"
countryInfo : 
iso2: "NO DATA"
iso3: "NO DATA"
_id: "NO DATA"
lat: 0
long: 0
flag: "https://raw.githubusercontent.com/NovelCOVID/API/master/assets/flags/unknow.png"
cases: 9037
todayCases: 76
deaths: 120
todayDeaths: 9
recovered: 3507
active: 5410
critical: 59
casesPerOneMillion: 176

but instead returns

message: "Country not found or dosen't have cases"

I'm not sure why this PR is necessary stll, if it's something specific for an application you're building just do it on your end. When I ran it locally a lot of things that worked stopped working

buster95 · 2020-03-24T05:30:17Z

I don't think so, you can add possibleNames on South Korea in country_utils.js
Korea, South then try again, I'm trying to improve this web service, I'm not development an application

buster95 · 2020-03-24T05:46:01Z

I add Korea, South in possible names (simple), this was results

This PR fix country data too for a lot of countries
With this PR

Without this PR

ghost · 2020-03-24T12:41:38Z

update the pr wih your latest code.

…rs not understand ex. s. Korea from webpage in redis South Korea

buster95 · 2020-03-24T16:46:40Z

@EliteDaMyth finished, you can check this

ebwinters

Need to fix all comments before merge

ebwinters · 2020-03-25T00:37:05Z

+  // @ebwinters version
+  // const standardizedCountryName = countryMap.standardizeCountryName(req.params.country.toLowerCase());
+  // let country = countries.find(e => {
+  //   // see if strict was even a parameter
+  //   if (req.query.strict) {
+  //     return req.query.strict.toLowerCase() == 'true' ? e.country.toLowerCase() === standardizedCountryName : e.country.toLowerCase().includes(standardizedCountryName)
+  //   }
+  //   else {
+  //     return e.country.toLowerCase().includes(standardizedCountryName);
+  //   }
+  // });


Need to uncomment this for the endpoint to work correctly

ebwinters · 2020-03-25T00:37:25Z

+  // @buster95 version
+  const countryData = country_utils.getCountryData(req.params.country);
  let country = countries.find(e => {
    // see if strict was even a parameter
    if (req.query.strict) {
-      return req.query.strict.toLowerCase() == 'true' ? e.country.toLowerCase() === standardizedCountryName : e.country.toLowerCase().includes(standardizedCountryName)
-    }
-    else {
-      return e.country.toLowerCase().includes(standardizedCountryName);
+      return req.query.strict.toLowerCase() == 'true' ?
+        e.country.toLowerCase() === countryData.country.toLowerCase() :
+        e.country.toLowerCase().includes(countryData.country)
+    } else {
+      if (countryData.country) {
+        return e.country.toLowerCase().includes(countryData.country.toLowerCase());
+      }
    }
  });


Need to delete this

@ebwinters I can't delete this remember, country names has changed in redis storage, names are differents than world meter country names, therefore your code dosen't work

I tested locally and it worked fine, have you tested with these changes?

Your code work but not for all countries

ebwinters · 2020-03-25T00:39:39Z

+    { country: 'Bhutan', iso2: 'BT', iso3: 'BTN', _id: 64, lat: 27.5, long: 90.5 },
+    { country: 'Bolivia, Plurinational State of', iso2: 'BO', iso3: 'BOL', _id: 68, lat: -17, long: -65 },
+    { country: 'Bolivia', iso2: 'BO', iso3: 'BOL', _id: 68, lat: -17, long: -65 },
+    { country: 'Bosnia and Herzegovina', iso2: 'BA', iso3: 'BIH', _id: 70, lat: 44, long: 18 },


Change country name to Bosnia

ebwinters · 2020-03-25T00:39:54Z

+    { country: 'Croatia', iso2: 'HR', iso3: 'HRV', _id: 191, lat: 45.1667, long: 15.5 },
+    { country: 'Cuba', iso2: 'CU', iso3: 'CUB', _id: 192, lat: 21.5, long: -80 },
+    { country: 'Cyprus', iso2: 'CY', iso3: 'CYP', _id: 196, lat: 35, long: 33 },
+    { country: 'Czech Republic', iso2: 'CZ', iso3: 'CZE', _id: 203, lat: 49.75, long: 15.5, possibleNames: ['Czechia', 'Chequia'] },


Change country name to Czechia

ebwinters · 2020-03-25T00:40:20Z

+    { country: 'Kenya', iso2: 'KE', iso3: 'KEN', _id: 404, lat: 1, long: 38 },
+    { country: 'Kiribati', iso2: 'KI', iso3: 'KIR', _id: 296, lat: 1.4167, long: 173 },
+    { country: 'North Korea', iso2: 'KP', iso3: 'PRK', _id: 408, lat: 40, long: 127, possibleNames: ['Korea del Norte', 'N. Korea', 'Korea, North', 'Democratic People\'s Republic of Korea'] },
+    { country: 'South Korea', iso2: 'KR', iso3: 'KOR', _id: 410, lat: 37, long: 127.5, possibleNames: ['Korea del Sur', 'S. Korea', 'Korea, South', 'Republic of Korea'] },


change country name to S. Korea

ebwinters · 2020-03-25T00:40:40Z

+    { country: 'Tuvalu', iso2: 'TV', iso3: 'TUV', _id: 798, lat: -8, long: 178 },
+    { country: 'Uganda', iso2: 'UG', iso3: 'UGA', _id: 800, lat: 1, long: 32 },
+    { country: 'Ukraine', iso2: 'UA', iso3: 'UKR', _id: 804, lat: 49, long: 32 },
+    { country: 'United Arab Emirates', iso2: 'AE', iso3: 'ARE', _id: 784, lat: 24, long: 54, possibleNames: ['uae'] },


Change country name to UAE

ebwinters · 2020-03-25T00:40:49Z

+    { country: 'Uganda', iso2: 'UG', iso3: 'UGA', _id: 800, lat: 1, long: 32 },
+    { country: 'Ukraine', iso2: 'UA', iso3: 'UKR', _id: 804, lat: 49, long: 32 },
+    { country: 'United Arab Emirates', iso2: 'AE', iso3: 'ARE', _id: 784, lat: 24, long: 54, possibleNames: ['uae'] },
+    { country: 'United Kingdom', iso2: 'GB', iso3: 'GBR', _id: 826, lat: 54, long: -2, possibleNames: ['UK'] },


change country name to UK

ebwinters · 2020-03-25T00:40:56Z

+    { country: 'Ukraine', iso2: 'UA', iso3: 'UKR', _id: 804, lat: 49, long: 32 },
+    { country: 'United Arab Emirates', iso2: 'AE', iso3: 'ARE', _id: 784, lat: 24, long: 54, possibleNames: ['uae'] },
+    { country: 'United Kingdom', iso2: 'GB', iso3: 'GBR', _id: 826, lat: 54, long: -2, possibleNames: ['UK'] },
+    { country: 'United States', iso2: 'US', iso3: 'USA', _id: 840, lat: 38, long: -97, possibleNames: ['USA', 'Estados Unidos'] },


Change country name to USA

ghost · 2020-03-25T13:34:15Z

the PR is conflicting.

buster95 · 2020-03-25T14:44:10Z

@EliteDaMyth I was talking with @ebwinters in Discord, he will review my PR

buster95 added 3 commits March 23, 2020 09:04

[Countries Response] synonyms or possible names

9939b21

[Countries Response] possible names or synonyms for a lot of countries

d90b265

Merge branch 'master' into master

22666bf

This was referenced Mar 23, 2020

Countries EndPoint : countryInfo returns NO DATA for many countries #121

Closed

Pull Request for #121: Changed country names in variable "countryData" #122

Closed

buster95 added 4 commits March 23, 2020 12:01

Names on comparisons CI and AI, without accents and upper case

07f8c2b

[Countries] Country Names from webpage scraper changed

384c003

[IMPROVED][TESTED] countries/{country name} endpoint 😎

ddd12e5

Merge branch 'master' of https://github.com/NovelCOVID/API

453ebfa

buster95 mentioned this pull request Mar 24, 2020

Some flags come as unkown #128

Closed

buster95 mentioned this pull request Mar 24, 2020

countryInfo iso2 and iso3 'NO DATA' for some countries #150

Closed

buster95 added 2 commits March 24, 2020 10:37

Merge branch 'master' of https://github.com/NovelCOVID/API

0ff90c4

[Countries] Change names countries in redis storage, because some use…

1ec068c

…rs not understand ex. s. Korea from webpage in redis South Korea

Merge branch 'master' into master

eebbb5d

This was referenced Mar 24, 2020

US flag is set to unknown.png while there is a US flag in the assets #163

Closed

Replaced "NO DATA" with null #166

Merged

ebwinters reviewed Mar 25, 2020

View reviewed changes

This was referenced Mar 25, 2020

Lat, Long wrong for some countries #169

Closed

Code style suggestions #167

Closed

buster95 added 3 commits March 24, 2020 19:45

Merge branch 'master' of https://github.com/NovelCOVID/API

8710de0

Countries possibles names added

8cf23cc

Countries names joins with countryMap.js countries names

0b66504

buster95 mentioned this pull request Mar 25, 2020

Flag URL are not correct for all #172

Closed

ghost closed this Mar 25, 2020

buster95 mentioned this pull request Mar 25, 2020

[countries] Resolving conflicts #185

Merged

This pull request was closed.

Conversation

buster95 commented Mar 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Mar 23, 2020

Uh oh!

buster95 commented Mar 23, 2020

Uh oh!

buster95 commented Mar 24, 2020

Uh oh!

ebwinters commented Mar 24, 2020

Uh oh!

buster95 commented Mar 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ebwinters commented Mar 24, 2020

Uh oh!

ebwinters commented Mar 24, 2020

Uh oh!

buster95 commented Mar 24, 2020

Uh oh!

buster95 commented Mar 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Mar 24, 2020

Uh oh!

buster95 commented Mar 24, 2020

Uh oh!

ebwinters left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ebwinters Mar 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Mar 25, 2020

Uh oh!

buster95 commented Mar 25, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

buster95 commented Mar 23, 2020 •

edited

Loading

buster95 commented Mar 24, 2020 •

edited

Loading

buster95 commented Mar 24, 2020 •

edited

Loading

ebwinters Mar 25, 2020 •

edited

Loading