Merge branch 'dev'

apilayer · Apr 30, 2017 · 239a82c · 239a82c
2 parents bcf1694 + b5c2c19
commit 239a82c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/python/countries-input.json b/python/countries-input.json
diff --git a/python/countries-output.json b/python/countries-output.json
diff --git a/python/crawlers/currencies.py b/python/crawlers/currencies.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from bs4 import BeautifulSoup
 import requests
 

diff --git a/python/updater.py b/python/updater.py
@@ -1,7 +1,6 @@
 # This is only for countriesV2
 # 1- load countries-input.json
-# 2- crawl,parse and update population
-# 3- crawl,parse and update gini
+# 2- crawl,parse and update json
 # 4- save json string in new file
 
 import json

diff --git a/src/main/java/fayder/restcountries/domain/BaseCountry.java b/src/main/java/fayder/restcountries/domain/BaseCountry.java
@@ -1,7 +1,5 @@
 package fayder.restcountries.domain;
 
-import fayder.restcountries.v1.domain.CountryTranslations;
-
 import java.util.List;
 
 public class BaseCountry {

diff --git a/src/main/java/fayder/restcountries/v2/domain/Country.java b/src/main/java/fayder/restcountries/v2/domain/Country.java
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package fayder.restcountries.v2.domain;
 
+import com.google.gson.annotations.SerializedName;
 import fayder.restcountries.domain.BaseCountry;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
@@ -14,6 +15,8 @@ public class Country extends BaseCountry {
     private List<Language> languages;
     private Translations translations;
     private String flag;
+    @SerializedName("european_union")
+    private boolean europeanUnion;
 
     public List<Currency> getCurrencies() {
         return currencies;
@@ -42,4 +45,8 @@ public Translations getTranslations() {
     public String getFlag() {
         return flag;
     }
+
+    public boolean isEuropeanUnion() {
+        return europeanUnion;
+    }
 }
diff --git a/src/main/resources/countriesV2.json b/src/main/resources/countriesV2.json