Merge branch 'smalldata'

winterstein · Aug 9, 2016 · d8bb928 · d8bb928
2 parents c22e15c + 94262f1
commit d8bb928
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/com/winterwell/jgeoplanet/GeoCodeQuery.java b/src/com/winterwell/jgeoplanet/GeoCodeQuery.java
@@ -182,6 +182,11 @@ public boolean isEmpty() {
 	public GeoCodeQuery setReqLocn(boolean reqLocn) {
 		this.reqLocn = reqLocn;
 		return this;
+	}
+
+	public GeoCodeQuery setLatitudeLongitude(double lat, double lng) {
+		this.locn = new Location(lat, lng);
+		return this;
 	}	
 
 }
diff --git a/src/com/winterwell/jgeoplanet/Location.java b/src/com/winterwell/jgeoplanet/Location.java
@@ -164,7 +164,9 @@ public String toSimpleCoords(){
 		return latitude + "," + longitude;
 	}
 
-	// NB: will not pick up a trailing . See bug #9788
+	/** 
+	 * Latitude, Longitude
+	 * NB: will not pick up a trailing . See bug #9788 */
 	public static final Pattern latLongLocn = Pattern.compile(
 			"(\\S+:)?\\s*(-?[\\d\\.]*\\d),\\s*(-?[\\d\\.]*\\d)\\.?\\s*");
 

diff --git a/test/winterwell/jtwitter/TwitterTest.java b/test/winterwell/jtwitter/TwitterTest.java
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 
-import winterwell.utils.Printer;
+import com.winterwell.utils.Printer;
 
 import winterwell.json.JSONException;
 import winterwell.json.JSONObject;

diff --git a/test/winterwell/jtwitter/UserStreamTest.java b/test/winterwell/jtwitter/UserStreamTest.java
@@ -7,7 +7,7 @@
 
 import org.junit.Test;
 
-import winterwell.utils.Printer;
+import com.winterwell.utils.Printer;
 
 import winterwell.jtwitter.AStream.IListen;
 import winterwell.jtwitter.Twitter.ITweet;