X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fbrowser%2FUrlGenerator.java;fp=tim%2Fprune%2Fbrowser%2FUrlGenerator.java;h=14d15776a8be3d19213cf0419ea240349146b9d6;hp=aa78a22344c57167cdb4c9c6d22cb8e05209cfe2;hb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;hpb=52bf9e8686c916be37a26a0b75340393d4478b05

diff --git a/tim/prune/browser/UrlGenerator.java b/tim/prune/function/browser/UrlGenerator.java
similarity index 67%
rename from tim/prune/browser/UrlGenerator.java
rename to tim/prune/function/browser/UrlGenerator.java
index aa78a22..14d1577 100644
--- a/tim/prune/browser/UrlGenerator.java
+++ b/tim/prune/function/browser/UrlGenerator.java
@@ -1,4 +1,4 @@
-package tim.prune.browser;
+package tim.prune.function.browser;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -16,7 +16,7 @@ import tim.prune.data.TrackInfo;
 public abstract class UrlGenerator
 {
 	/** Number formatter for five dp */
-	public static final NumberFormat FIVE_DP = NumberFormat.getNumberInstance(Locale.UK);
+	private static final NumberFormat FIVE_DP = NumberFormat.getNumberInstance(Locale.UK);
 	// Select the UK locale for this formatter so that decimal point is always used (not comma)
 	static {
 		if (FIVE_DP instanceof DecimalFormat) ((DecimalFormat) FIVE_DP).applyPattern("0.00000");
@@ -26,8 +26,12 @@ public abstract class UrlGenerator
 	public static final int MAP_SOURCE_GOOGLE = 0;
 	/** Constant for Open Street Maps */
 	public static final int MAP_SOURCE_OSM    = 1;
+	/** Constant for Mapquest */
+	public static final int MAP_SOURCE_MAPQUEST = 2;
+	/** Constant for Yahoo */
+	public static final int MAP_SOURCE_YAHOO  = 3;
 
-	// TODO: Add other map sources, eg Yahoo, MSN, search.ch ?
+	// TODO: Add other map sources, eg MSN, search.ch ?
 
 	/**
 	 * Generate a URL for the given source and track info
@@ -40,6 +44,12 @@ public abstract class UrlGenerator
 		if (inSource == MAP_SOURCE_GOOGLE) {
 			return generateGoogleUrl(inTrackInfo);
 		}
+		else if (inSource == MAP_SOURCE_MAPQUEST) {
+			return generateMapquestUrl(inTrackInfo);
+		}
+		else if (inSource == MAP_SOURCE_YAHOO) {
+			return generateYahooUrl(inTrackInfo);
+		}
 		return generateOpenStreetMapUrl(inTrackInfo);
 	}
 
@@ -104,6 +114,47 @@ public abstract class UrlGenerator
 	}
 
 	/**
+	 * Generate a url for Mapquest maps
+	 * @param inTrackInfo track information
+	 * @return URL
+	 */
+	private static String generateMapquestUrl(TrackInfo inTrackInfo)
+	{
+		// Check if any data to display
+		if (inTrackInfo == null || inTrackInfo.getTrack() == null || inTrackInfo.getTrack().getNumPoints() < 1)
+		{
+			return null;
+		}
+		double medianLat = getMedianValue(inTrackInfo.getTrack().getLatRange());
+		double medianLon = getMedianValue(inTrackInfo.getTrack().getLonRange());
+		// Build basic url with centre position
+		String url = "http://atlas.mapquest.com/maps/map.adp?latlongtype=decimal&latitude="
+			+ FIVE_DP.format(medianLat) + "&longitude=" + FIVE_DP.format(medianLon);
+		return url;
+	}
+
+
+	/**
+	 * Generate a url for Yahoo maps
+	 * @param inTrackInfo track information
+	 * @return URL
+	 */
+	private static String generateYahooUrl(TrackInfo inTrackInfo)
+	{
+		// Check if any data to display
+		if (inTrackInfo == null || inTrackInfo.getTrack() == null || inTrackInfo.getTrack().getNumPoints() < 1)
+		{
+			return null;
+		}
+		double medianLat = getMedianValue(inTrackInfo.getTrack().getLatRange());
+		double medianLon = getMedianValue(inTrackInfo.getTrack().getLonRange());
+		// Build basic url with centre position
+		String url = "http://maps.yahoo.com/#lat=" + FIVE_DP.format(medianLat)
+			+ "&lon=" + FIVE_DP.format(medianLon) + "&zoom=13";
+		return url;
+	}
+
+/**
 	 * Get the median value from the given lat/long range
 	 * @param inRange range of values
 	 * @return median value