Version 19, May 2018

[GpsPrune.git] / tim / prune / function / browser / UrlGenerator.java

diff --git a/tim/prune/function/browser/UrlGenerator.java b/tim/prune/function/browser/UrlGenerator.java
index faca5a276f685218919d0d978ca770d84d4bcdb0..7c923d3a698d3ad9f1ead4df4c5b59f4f4529304 100644 (file)
--- a/tim/prune/function/browser/UrlGenerator.java
+++ b/tim/prune/function/browser/UrlGenerator.java
@@ -31,7 +31,6 @@ public abstract class UrlGenerator
                MAP_SOURCE_BING,       /* Bing */
                MAP_SOURCE_PEAKFINDER, /* PeakFinder */
                MAP_SOURCE_GEOHACK,    /* Geohack */
                MAP_SOURCE_BING,       /* Bing */
                MAP_SOURCE_PEAKFINDER, /* PeakFinder */
                MAP_SOURCE_GEOHACK,    /* Geohack */

-               MAP_SOURCE_PANORAMIO,  /* Panoramio */

        }
 
        /**
        }
 
        /**


@@ -54,7 +53,6 @@ public abstract class UrlGenerator
                                return generateBingUrl(inTrackInfo);
                        case MAP_SOURCE_PEAKFINDER:
                        case MAP_SOURCE_GEOHACK:
                                return generateBingUrl(inTrackInfo);
                        case MAP_SOURCE_PEAKFINDER:
                        case MAP_SOURCE_GEOHACK:

-                       case MAP_SOURCE_PANORAMIO:

                                return generateUrlForPoint(inSource, inTrackInfo);
                        case MAP_SOURCE_OSM:
                        default:
                                return generateUrlForPoint(inSource, inTrackInfo);
                        case MAP_SOURCE_OSM:
                        default:


@@ -209,8 +207,6 @@ public abstract class UrlGenerator
                                return generatePeakfinderUrl(currPoint);
                        case MAP_SOURCE_GEOHACK:
                                return generateGeohackUrl(currPoint);
                                return generatePeakfinderUrl(currPoint);
                        case MAP_SOURCE_GEOHACK:
                                return generateGeohackUrl(currPoint);

-                       case MAP_SOURCE_PANORAMIO:
-                               return generatePanoramioUrl(currPoint);

                        default:
                                return null;
                }
                        default:
                                return null;
                }


@@ -240,17 +236,6 @@ public abstract class UrlGenerator
                // TODO: Could use absolute values and S, W but this seems to work
        }
 
                // 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";
-       }
-

 
        /**
         * Get the median value from the given lat/long range
 
        /**
         * Get the median value from the given lat/long range