X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fgpsies%2FGetGpsiesFunction.java;h=51085cf14742a8ae57b6b4bf75930439ee1fb8b0;hp=804c4ce12e8d897369c47037b5b85c0951fff186;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hpb=eebbb64b5d63f9eea43a0dff908c30361a376768

diff --git a/tim/prune/function/gpsies/GetGpsiesFunction.java b/tim/prune/function/gpsies/GetGpsiesFunction.java
index 804c4ce..51085cf 100644
--- a/tim/prune/function/gpsies/GetGpsiesFunction.java
+++ b/tim/prune/function/gpsies/GetGpsiesFunction.java
@@ -3,12 +3,14 @@ package tim.prune.function.gpsies;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import tim.prune.App;
+import tim.prune.GpsPrune;
 import tim.prune.I18nManager;
 import tim.prune.load.xml.XmlFileLoader;
 import tim.prune.load.xml.ZipFileLoader;
@@ -23,6 +25,8 @@ public class GetGpsiesFunction extends GenericDownloaderFunction
 	private static final int RESULTS_PER_PAGE = 20;
 	/** Maximum number of results to get */
 	private static final int MAX_RESULTS = 60;
+	/** New API key (specific to this program) */
+	private static final String GPSIES_API_KEY = "oumgvvbckiwpvsnb";
 
 
 	/**
@@ -69,16 +73,19 @@ public class GetGpsiesFunction extends GenericDownloaderFunction
 		// Loop for each page of the results
 		do
 		{
-			String urlString = "http://www.gpsies.com/api.do?BBOX=" +
+			String urlString = "http://ws.gpsies.com/api.do?BBOX=" +
 				coords[1] + "," + coords[0] + "," + coords[3] + "," + coords[2] +
-				"&limit=" + RESULTS_PER_PAGE + "&resultPage=" + currPage;
+				"&limit=" + RESULTS_PER_PAGE + "&resultPage=" + currPage +
+				"&key=" + GPSIES_API_KEY;
 			// Parse the returned XML with a special handler
 			GpsiesXmlHandler xmlHandler = new GpsiesXmlHandler();
 			try
 			{
 				url = new URL(urlString);
 				SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
-				inStream = url.openStream();
+				URLConnection conn = url.openConnection();
+				conn.setRequestProperty("User-Agent", "GpsPrune v" + GpsPrune.VERSION_NUMBER);
+				inStream = conn.getInputStream();
 				saxParser.parse(inStream, xmlHandler);
 			}
 			catch (Exception e) {