1 files changed, 25 insertions, 2 deletions
diff --git a/src/data/Tweet.java b/src/data/Tweet.java
index 577b620..3caae6a 100644
--- a/src/data/Tweet.java
+++ b/src/data/Tweet.java
@@ -10,13 +10,19 @@ public class Tweet {
 
     public long id;
     public String lang;
+    @ValidatingJsonDeserializer.Nullable
     public long in_reply_to_user_id;
     public String created_at;
     public long favorite_count;
-    public String place;
-    public String coordinates;
+    @ValidatingJsonDeserializer.Nullable
+    @ValidatingJsonDeserializer.Validator
+    public Place place;
+    @ValidatingJsonDeserializer.Nullable
+    @ValidatingJsonDeserializer.Validator
+    public Coordinates coordinates;
     public String text;
     @ValidatingJsonDeserializer.Nullable
+    @ValidatingJsonDeserializer.Validator
     public Tweet retweeted_status;
     @ValidatingJsonDeserializer.Validator
     public Entities entities;
@@ -30,6 +36,23 @@ public class Tweet {
         return gson.toJson(this);
     }
 
+    public static class Place {
+
+        //public String id; // "a5b6bdd8008412b1"
+        //public String name; // "Danbury"
+        //public String country_code; // "US"
+        public String country; // "United States"
+        //public String url; // "https://api.twitter.com/1.1/geo/id/a5b6bdd8008412b1.json"
+        public String full_name; // "Danbury, CT"
+    }
+
+    public static class Coordinates {
+
+        //public String type; // always "Point"?
+        @ValidatingJsonDeserializer.ArrayValidator(minLen = 2, maxLen = 2)
+        public float[] coordinates; // e.g. [-73.49513755, 41.43286284]
+    }
+
     public static class Entities {
 
         @ValidatingJsonDeserializer.Validator