Add Place information into Photo

hytgbn · hytgbn · commit 8717b7b76e09 · 2014-10-22T23:54:35.000-07:00
diff --git a/Flickr4Java/src/main/java/com/flickr4java/flickr/photos/Photo.java b/Flickr4Java/src/main/java/com/flickr4java/flickr/photos/Photo.java
@@ -5,6 +5,7 @@
 
 import com.flickr4java.flickr.FlickrException;
 import com.flickr4java.flickr.people.User;
+import com.flickr4java.flickr.places.Place;
 import com.flickr4java.flickr.stats.Stats;
 import com.flickr4java.flickr.stats.StatsInterface;
 import com.flickr4java.flickr.tags.Tag;
@@ -181,6 +182,14 @@ protected synchronized SimpleDateFormat initialValue() {
     
     private boolean hasPeople;
 
+    private Place locality;
+
+    private Place county;
+
+    private Place region;
+
+    private Place country;
+
     /**
      * Stats on views, comments and favorites. Only set on {@link StatsInterface#getPopularPhotos} call.
      */
@@ -1248,5 +1257,36 @@ public void setIsHasPeople(boolean hasPeople) {
 		this.hasPeople = hasPeople;
 	}
 
+    public Place getLocality() {
+        return locality;
+    }
+
+    public void setLocality(Place locality) {
+        this.locality = locality;
+    }
+
+    public Place getCounty() {
+        return county;
+    }
+
+    public void setCounty(Place county) {
+        this.county = county;
+    }
+
+    public Place getRegion() {
+        return region;
+    }
+
+    public void setRegion(Place region) {
+        this.region = region;
+    }
+
+    public Place getCountry() {
+        return country;
+    }
+
+    public void setCountry(Place country) {
+        this.country = country;
+    }
 	
 }
diff --git a/Flickr4Java/src/main/java/com/flickr4java/flickr/photos/PhotoUtils.java b/Flickr4Java/src/main/java/com/flickr4java/flickr/photos/PhotoUtils.java
@@ -8,6 +8,7 @@
 import org.w3c.dom.Text;
 
 import com.flickr4java.flickr.people.User;
+import com.flickr4java.flickr.places.Place;
 import com.flickr4java.flickr.tags.Tag;
 import com.flickr4java.flickr.util.XMLUtilities;
 
@@ -416,6 +417,42 @@ public static final Photo createPhoto(Element photoElement, Element defaultEleme
             }
         }
 
+        try {
+            Place place = null;
+            Element element = (Element) photoElement.getElementsByTagName("locality").item(0);
+            place = new Place(element.getAttribute("place_id"), element.getTextContent(), element.getAttribute("woeid"));
+            photo.setLocality(place);
+        } catch(IndexOutOfBoundsException e) {
+        } catch(NullPointerException e) {
+        }
+
+        try {
+            Place place = null;
+            Element element = (Element) photoElement.getElementsByTagName("county").item(0);
+            place = new Place(element.getAttribute("place_id"), element.getTextContent(), element.getAttribute("woeid"));
+            photo.setCounty(place);
+        } catch(IndexOutOfBoundsException e) {
+        } catch(NullPointerException e) {
+        }
+
+        try {
+            Place place = null;
+            Element element = (Element) photoElement.getElementsByTagName("region").item(0);
+            place = new Place(element.getAttribute("place_id"), element.getTextContent(), element.getAttribute("woeid"));
+            photo.setRegion(place);
+        } catch(IndexOutOfBoundsException e) {
+        } catch(NullPointerException e) {
+        }
+
+        try {
+            Place place = null;
+            Element element = (Element) photoElement.getElementsByTagName("country").item(0);
+            place = new Place(element.getAttribute("place_id"), element.getTextContent(), element.getAttribute("woeid"));
+            photo.setCountry(place);
+        } catch(IndexOutOfBoundsException e) {
+        } catch(NullPointerException e) {
+        }
+
         return photo;
     }
 
diff --git a/Flickr4Java/src/main/java/com/flickr4java/flickr/places/Place.java b/Flickr4Java/src/main/java/com/flickr4java/flickr/places/Place.java
@@ -62,6 +62,12 @@ public Place(String placeId, String name, int placeType) {
         this.placeType = placeType;
     }
 
+    public Place(String placeId, String name, String woeId) {
+        this.name = name;
+        this.placeId = placeId;
+        this.woeId = woeId;
+    }
+
     public String getName() {
         return name;
     }

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,12 @@ public Place(String placeId, String name, int placeType) {`
`62`	`62`	`this.placeType = placeType;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ public Place(String placeId, String name, String woeId) {`
	`66`	`+ this.name = name;`
	`67`	`+ this.placeId = placeId;`
	`68`	`+ this.woeId = woeId;`
	`69`	`+ }`
	`70`	`+`
`65`	`71`	`public String getName() {`
`66`	`72`	`return name;`
`67`	`73`	`}`