aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2013-05-16 13:36:48 +0200
committerrsudev <rasch@munin-soft.de>2013-05-16 13:36:48 +0200
commitec37680fdf788750f2ae09a905db1ae166cd80a8 (patch)
treed1a9ccfdf6b0683a9f694879524d02d2538c45ef /main/src
parentad748c4b6404f92b3438684352ce27d0baeea46d (diff)
parent186ac091acc41a5a784a21e18f80602fabb50712 (diff)
downloadcgeo-ec37680fdf788750f2ae09a905db1ae166cd80a8.zip
cgeo-ec37680fdf788750f2ae09a905db1ae166cd80a8.tar.gz
cgeo-ec37680fdf788750f2ae09a905db1ae166cd80a8.tar.bz2
Merge remote-tracking branch 'upstream/release' into currdev
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCConstants.java7
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCMap.java4
2 files changed, 7 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index d8711cf..8567e7c 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -13,14 +13,15 @@ import java.util.regex.Pattern;
public final class GCConstants {
static final String GC_URL = "http://www.geocaching.com/";
+ static final String GC_TILE_URL = "http://tiles.geocaching.com/";
/** Live Map */
public final static String URL_LIVE_MAP = GC_URL + "map/default.aspx";
/** Live Map pop-up */
- public final static String URL_LIVE_MAP_DETAILS = GC_URL + "map/map.details";
+ public final static String URL_LIVE_MAP_DETAILS = GC_TILE_URL + "map.details";
/** Caches in a tile */
- public final static String URL_MAP_INFO = GC_URL + "map/map.info";
+ public final static String URL_MAP_INFO = GC_TILE_URL + "map.info";
/** Tile itself */
- public final static String URL_MAP_TILE = GC_URL + "map/map.png";
+ public final static String URL_MAP_TILE = GC_TILE_URL + "map.png";
/**
* Patterns for parsing the result of a (detailed) search
diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java
index 5f16e10..49f61ef 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCMap.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java
@@ -44,6 +44,7 @@ public class GCMap {
try {
final Parameters params = new Parameters("i", geocodeList, "_", String.valueOf(System.currentTimeMillis()));
+ params.add("app", "cgeo");
final String referer = GCConstants.URL_LIVE_MAP_DETAILS;
final String data = StringUtils.defaultString(Tile.requestMapInfo(referer, params, referer));
@@ -297,7 +298,8 @@ public class GCMap {
"x", String.valueOf(tile.getX()),
"y", String.valueOf(tile.getY()),
"z", String.valueOf(tile.getZoomlevel()),
- "ep", "1");
+ "ep", "1",
+ "app", "cgeo");
if (tokens != null) {
params.put("k", tokens[0], "st", tokens[1]);
}