From 666b63c1d77338cec7a06c60efa90ac38074c893 Mon Sep 17 00:00:00 2001 From: Kevin Finisterre Date: Wed, 13 May 2015 14:28:57 -0400 Subject: [PATCH] Update old mapsurfer interface... mapsurfer.net changed to mapsurfernet.com and was depreciated all together. Use GIScience (Geoinformatics) Research Group, Heidelberg University mirror --- .../opmapcontrol/src/core/alllayersoftype.cpp | 7 +++++++ .../libs/opmapcontrol/src/core/urlfactory.cpp | 16 ++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/alllayersoftype.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/alllayersoftype.cpp index ad3033bd0..727fbbc77 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/alllayersoftype.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/alllayersoftype.cpp @@ -55,6 +55,13 @@ QVector AllLayersOfType::GetAllLayersOfType(const MapType::Types } break; + case MapType::OpenStreetMapSurferTerrain: + { + types.append(MapType::OpenStreetMapSurfer); + types.append(MapType::OpenStreetMapSurferTerrain); + } + break; + case MapType::ArcGIS_MapsLT_Map_Hybrid: { types.append(MapType::ArcGIS_MapsLT_OrtoFoto); diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp index 68ba2a999..9d05dc179 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp @@ -352,18 +352,22 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c break; case MapType::OpenStreetMapSurfer: { - // http://tiles1.mapsurfer.net/tms_r.ashx?x=37378&y=20826&z=16 + // http://wiki.openstreetmap.org/wiki/MapSurfer.NET -> Mapsurfernet.com -> dead + // http://wiki.openstreetmap.org/wiki/OpenMapSurfer mentions: http://korona.geog.uni-heidelberg.de - qDebug() << QString("http://tiles1.mapsurfer.net/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); - return QString("http://tiles1.mapsurfer.net/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); + // Searched Google for tms_r.ashx and found korona.geog.uni-heidelberg.de has a service on port 8001 + // http://129.206.74.245:8001/tms_r.ashx?x=37378&y=20826&z=16 + + qDebug() << QString("http://129.206.74.245:8001/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); + return QString("http://129.206.74.245:8001/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); } break; case MapType::OpenStreetMapSurferTerrain: { - // http://tiles2.mapsurfer.net/tms_t.ashx?x=9346&y=5209&z=14 + // http://korona.geog.uni-heidelberg.de/tiles/asterh/x=501&y=388&z=10 - qDebug() << QString("http://tiles2.mapsurfer.net/tms_t.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); - return QString("http://tiles2.mapsurfer.net/tms_t.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); + qDebug() << QString("http://korona.geog.uni-heidelberg.de/tiles/asterh/x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); + return QString("http://korona.geog.uni-heidelberg.de/tiles/asterh/x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); } break; case MapType::BingMap: