X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fbrowser%2FUrlGenerator.java;h=7c923d3a698d3ad9f1ead4df4c5b59f4f4529304;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=a0100b104f59732cdf25d27a8dd8d172339cb4cc;hpb=0a2480df5845e2d7190dfdec9b2653b1609e853d;p=GpsPrune.git

diff --git a/tim/prune/function/browser/UrlGenerator.java b/tim/prune/function/browser/UrlGenerator.java
index a0100b1..7c923d3 100644
--- a/tim/prune/function/browser/UrlGenerator.java
+++ b/tim/prune/function/browser/UrlGenerator.java
@@ -31,8 +31,6 @@ public abstract class UrlGenerator
 		MAP_SOURCE_BING,       /* Bing */
 		MAP_SOURCE_PEAKFINDER, /* PeakFinder */
 		MAP_SOURCE_GEOHACK,    /* Geohack */
-		MAP_SOURCE_PANORAMIO,  /* Panoramio */
-		MAP_SOURCE_OPENCACHINGCOM, /* Opencaching.com */
 	}
 
 	/**
@@ -55,8 +53,6 @@ public abstract class UrlGenerator
 				return generateBingUrl(inTrackInfo);
 			case MAP_SOURCE_PEAKFINDER:
 			case MAP_SOURCE_GEOHACK:
-			case MAP_SOURCE_PANORAMIO:
-			case MAP_SOURCE_OPENCACHINGCOM:
 				return generateUrlForPoint(inSource, inTrackInfo);
 			case MAP_SOURCE_OSM:
 			default:
@@ -211,10 +207,6 @@ public abstract class UrlGenerator
 				return generatePeakfinderUrl(currPoint);
 			case MAP_SOURCE_GEOHACK:
 				return generateGeohackUrl(currPoint);
-			case MAP_SOURCE_PANORAMIO:
-				return generatePanoramioUrl(currPoint);
-			case MAP_SOURCE_OPENCACHINGCOM:
-				return generateOpencachingComUrl(currPoint);
 			default:
 				return null;
 		}
@@ -244,32 +236,6 @@ public abstract class UrlGenerator
 		// TODO: Could use absolute values and S, W but this seems to work
 	}
 
-	/**
-	 * Generate a url for Panoramio.com
-	 * @param inPoint current point, not null
-	 * @return URL
-	 */
-	private static String generatePanoramioUrl(DataPoint inPoint)
-	{
-		return "http://panoramio.com/map/#lt=" + FIVE_DP.format(inPoint.getLatitude().getDouble())
-			+ "&ln=" + FIVE_DP.format(inPoint.getLongitude().getDouble()) + "&z=1&k=0";
-	}
-
-
-	/**
-	 * Generate a url for OpenCaching.com
-	 * @param inPoint current point, not null
-	 * @return URL
-	 */
-	private static String generateOpencachingComUrl(DataPoint inPoint)
-	{
-		final String occLang = I18nManager.getText("webservice.opencachingcom.lang");
-		final String url = "http://www.opencaching.com/" + occLang
-			+ "/#find?&loc=" + FIVE_DP.format(inPoint.getLatitude().getDouble())
-			+ "," + FIVE_DP.format(inPoint.getLongitude().getDouble());
-		return url;
-	}
-
 
 	/**
 	 * Get the median value from the given lat/long range