X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FCountry.java;h=2516c2bfdc4172b41d9f5da9b4fc5fdb207bee7e;hb=f710e396068ce8fb27e753a3e1be0b36430275b1;hp=8b711084bb81e145f7ac8317a83cafdbd0c9b950;hpb=f56708fa0a19755ac5ec0313d9ee9c45a9aef0ce;p=Persons_Comparator.git

diff --git a/src/Country.java b/src/Country.java
index 8b71108..2516c2b 100644
--- a/src/Country.java
+++ b/src/Country.java
@@ -3,19 +3,24 @@ public class Country {
     private String region;
     private double lat;
     private double lng;
+    private String flag;
 
-
-    public Country(String name, String region, double lat, double lng) {
+    public Country(String name, String region, double lat, double lng, String flag) {
         setName(name);
         setRegion(region);
         setLat(lat);
         setLng(lng);
+        setFlag(flag);
     }
 
     public void setName(String name) {
         this.name = name;
     }
 
+    public String getName() {
+        return name;
+    }
+
     public void setRegion(String region) {
         this.region = region;
     }
@@ -24,10 +29,41 @@ public class Country {
         this.lat = lat;
     }
 
+    public double getLat() {
+        return lat;
+    }
+
     public void setLng(double lng) {
         this.lng = lng;
     }
 
+    public double getLng() {
+        return lng;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public int distanceTo(Country country) {
+        if ((this.lat == country.lat) && (this.lng == country.lng)) {
+            return 0;
+        } else {
+            double theta = this.lng - country.lng;
+            Double dist = Math.sin(Math.toRadians(this.lat)) * Math.sin(Math.toRadians(country.lat)) + Math.cos(Math.toRadians(this.lat)) * Math.cos(Math.toRadians(country.lat)) * Math.cos(Math.toRadians(theta));
+            dist = Math.acos(dist);
+            dist = Math.toDegrees(dist);
+            dist = dist * 60 * 1.1515;
+            // Kilometers
+            dist = dist * 1.609344;
+            return dist.intValue();
+        }
+    }
+
     @Override
     public String toString() {
         return "Country{" +
@@ -35,6 +71,7 @@ public class Country {
                 ", region='" + region + '\'' +
                 ", lat=" + lat +
                 ", lng=" + lng +
+                ", flag=" + flag +
                 '}';
     }
 }