Country + Origin + RegionView modify

[Persons_Comparator.git] / src / Country.java

diff --git a/src/Country.java b/src/Country.java
index 8b711084bb81e145f7ac8317a83cafdbd0c9b950..cb672731751803f73034a76dd3e55280c5637c8d 100644 (file)
--- a/src/Country.java
+++ b/src/Country.java
@@ -1,9 +1,11 @@
+import javax.swing.*;
+
 public class Country {
     private String name;
     private String region;
     private double lat;
     private double lng;
-
+    private ImageIcon flag;
 
     public Country(String name, String region, double lat, double lng) {
         setName(name);
@@ -16,6 +18,10 @@ public class Country {
         this.name = name;
     }
 
+    public String getName() {
+        return name;
+    }
+
     public void setRegion(String region) {
         this.region = region;
     }
@@ -24,10 +30,33 @@ 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 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{" +