Some changes based on feedback

Author: aaomidi

README.md

@@ -150,7 +150,7 @@ public class Main {
             System.out.println(response.getCountryCode());
 
             // Print out the country name
-            System.out.println(ipInfo.lookupCountryName(response.getCountryCode()));
+            System.out.println(response.getCountryName());
         } catch (RateLimitedException ex) {
             // Handle rate limits here.
         }
@@ -162,6 +162,34 @@ This file must follow the same layout as seen [here](https://github.com/ipinfo/j
 
 More language files can be found [here](https://country.io/data)
 
+### Location Information
+
+This library provides an easy way to get the latitude and longitude of an IP Address:
+
+```java
+import io.ipinfo.IPInfo;
+import io.ipinfo.errors.RateLimitedException;
+import io.ipinfo.model.IPResponse;
+
+public class Main {
+
+    public static void main(String... args) {
+        IPInfo ipInfo = IPInfo.builder().setToken("YOUR TOKEN").setCountryFile(new File("path/to/file.json")).build();
+
+        try {
+            IPResponse response = ipInfo.lookupIP("8.8.8.8");
+
+            // Print out the Latitude and Longitude
+            System.out.println(response.getLatitude());
+            System.out.println(response.getLongitude());
+
+        } catch (RateLimitedException ex) {
+            // Handle rate limits here.
+        }
+    }
+}
+```
+
 ## Extra Information
 
 - This library is thread safe. Feel free to call the different endpoints from different threads.

src/main/java/io/ipinfo/IPInfo.java

@@ -1,25 +1,24 @@
 package io.ipinfo;
 
 import io.ipinfo.cache.Cache;
+import io.ipinfo.context.Context;
 import io.ipinfo.errors.RateLimitedException;
 import io.ipinfo.model.ASNResponse;
 import io.ipinfo.model.IPResponse;
 import io.ipinfo.request.ASNRequest;
 import io.ipinfo.request.IPRequest;
 import okhttp3.OkHttpClient;
 
-import java.util.Map;
-
 public class IPInfo {
     private final OkHttpClient client;
+    private final Context context;
     private final String token;
-    private final Map<String, String> countryMap;
     private final Cache cache;
 
-    IPInfo(OkHttpClient client, String token, Map<String, String> countryMap, Cache cache) {
+    IPInfo(OkHttpClient client, Context context, String token, Cache cache) {
         this.client = client;
+        this.context = context;
         this.token = token;
-        this.countryMap = countryMap;
         this.cache = cache;
     }
 
@@ -50,6 +49,8 @@ public IPResponse lookupIP(String ip) throws RateLimitedException {
         if (response != null) return response;
 
         response = new IPRequest(client, token, ip).handle();
+        response.setContext(context);
+
         cache.setIp(ip, response);
         return response;
     }
@@ -66,17 +67,9 @@ public ASNResponse lookupASN(String asn) throws RateLimitedException {
         if (response != null) return response;
 
         response = new ASNRequest(client, token, asn).handle();
+        response.setContext(context);
+
         cache.setAsn(asn, response);
         return response;
     }
-
-    /**
-     * Looks up a country name.
-     *
-     * @param countryCode
-     * @return The name of the country.
-     */
-    public String lookupCountryName(String countryCode) {
-        return countryMap.getOrDefault(countryCode, null);
-    }
 }

src/main/java/io/ipinfo/IPInfoBuilder.java

@@ -4,6 +4,7 @@
 import com.google.gson.reflect.TypeToken;
 import io.ipinfo.cache.Cache;
 import io.ipinfo.cache.SimpleCache;
+import io.ipinfo.context.Context;
 import okhttp3.OkHttpClient;
 
 import java.io.File;
@@ -53,6 +54,6 @@ public IPInfo build() {
             map = Collections.unmodifiableMap(new HashMap<>());
         }
 
-        return new IPInfo(client, token, map, cache);
+        return new IPInfo(client, new Context(map), token, cache);
     }
 }

src/main/java/io/ipinfo/context/Context.java

@@ -0,0 +1,15 @@
+package io.ipinfo.context;
+
+import java.util.Map;
+
+public class Context {
+    private final Map<String, String> countryMap;
+
+    public Context(Map<String, String> countryMap) {
+        this.countryMap = countryMap;
+    }
+
+    public String getCountryName(String countryCode) {
+        return countryMap.get(countryCode);
+    }
+}

src/main/java/io/ipinfo/model/ASNResponse.java

@@ -2,6 +2,7 @@
 
 
 import com.google.gson.annotations.SerializedName;
+import io.ipinfo.context.Context;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ public class ASNResponse {
     private final String numIps;
     private final List<Prefix> prefixes;
     private final List<Prefix> prefixes6;
+    private transient Context context;
 
     public ASNResponse(String asn, String name, String country, String allocated, String registry, String domain, String numIps, List<Prefix> prefixes, List<Prefix> prefixes6) {
         this.asn = asn;
@@ -29,6 +31,15 @@ public ASNResponse(String asn, String name, String country, String allocated, St
         this.prefixes6 = prefixes6;
     }
 
+    /**
+     * Set by the library for extra utility functions
+     *
+     * @param context
+     */
+    public void setContext(Context context) {
+        this.context = context;
+    }
+
     public String getAsn() {
         return asn;
     }

src/main/java/io/ipinfo/model/IPResponse.java

@@ -1,5 +1,7 @@
 package io.ipinfo.model;
 
+import io.ipinfo.context.Context;
+
 public class IPResponse {
     private final String ip;
     private final String hostname;
@@ -13,6 +15,7 @@ public class IPResponse {
     private final ASN asn;
     private final Company company;
     private final Carrier carrier;
+    private transient Context context;
 
     public IPResponse(String ip, String hostname, String city, String region, String country, String loc, String postal, String org, String phone, ASN asn, Company company, Carrier carrier) {
         this.ip = ip;
@@ -29,6 +32,15 @@ public IPResponse(String ip, String hostname, String city, String region, String
         this.carrier = carrier;
     }
 
+    /**
+     * Set by the library for extra utility functions
+     *
+     * @param context
+     */
+    public void setContext(Context context) {
+        this.context = context;
+    }
+
     public String getIp() {
         return ip;
     }
@@ -49,6 +61,10 @@ public String getCountryCode() {
         return country;
     }
 
+    public String getCountryName() {
+        return context.getCountryName(getCountryCode());
+    }
+
     public String getLocation() {
         return loc;
     }

src/main/java/io/ipinfo/request/ASNRequest.java

@@ -9,7 +9,7 @@
 
 
 public class ASNRequest extends BaseRequest<ASNResponse> {
-    private final static String URL_FORMAT = "https://ipinfo.io/%s/json";
+    private final static String URL_FORMAT = "https://ipinfo.io/%s";
     private final String asn;
 
     public ASNRequest(OkHttpClient client, String token, String asn) {

src/main/java/io/ipinfo/request/BaseRequest.java

@@ -23,7 +23,9 @@ protected BaseRequest(OkHttpClient client, String token) {
     public Response handleRequest(Request.Builder request) {
         request
                 .addHeader("Authorization", Credentials.basic(token, ""))
-                .addHeader("user-agent", "IPinfoClient/Java/1.0");
+                .addHeader("user-agent", "IPinfoClient/Java/1.0")
+                .addHeader("Content-Type", "application/json");
+
         try {
             return client.newCall(request.build()).execute();
         } catch (Exception e) {

src/main/java/io/ipinfo/request/IPRequest.java

@@ -8,7 +8,7 @@
 import okhttp3.Response;
 
 public class IPRequest extends BaseRequest<IPResponse> {
-    private final static String URL_FORMAT = "https://ipinfo.io/%s/json";
+    private final static String URL_FORMAT = "https://ipinfo.io/%s";
     private final String ip;
 
     public IPRequest(OkHttpClient client, String token, String ip) {