rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Merged in f5soh/librepilot/LP-261_Update_maps (pull request #203)

Browse Source 
Lp 261_update_maps
This commit is contained in:
Philippe Renon 2016-03-25 21:46:07 +01:00
commit 2df5b1ea0f
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/gcs/src/libs/opmapcontrol/src/core/opmaps.cpp
View File

@ -37,16 +37,14 @@ OPMaps *OPMaps::Instance()
}
return m_pInstance;
}
OPMaps::OPMaps() : RetryLoadTile(2), useMemoryCache(true)
{
accessmode = AccessMode::ServerAndCache;
// Need to figure out why this is *fixed* to Portugese. This casues pt-PT to be sent with every Google request
Language = LanguageType::PortuguesePortugal;
LanguageStr = LanguageType().toShortString(Language);
LanguageStr = QLocale().bcp47Name();
Cache::Instance();
}
OPMaps::~OPMaps()
{
TileDBcacheQueue.wait();

12
ground/gcs/src/libs/opmapcontrol/src/core/urlfactory.cpp
View File

@ -372,19 +372,21 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
{
// http://wiki.openstreetmap.org/wiki/MapSurfer.NET -> Mapsurfernet.com -> dead
// http://wiki.openstreetmap.org/wiki/OpenMapSurfer mentions: http://korona.geog.uni-heidelberg.de
// http://korona.geog.uni-heidelberg.de/contact.html
// 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
// OSM Roads layer: http://korona.geog.uni-heidelberg.de/tiles/roads/x={x}&y={y}&z={z}
// or http://129.206.66.245:8001/tms_r.ashx?x={x}&y={y}&z={z}
#ifdef DEBUG_URLFACTORY
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);
qDebug() << QString("http://korona.geog.uni-heidelberg.de/tiles/roads/x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);
#endif
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);
return QString("http://korona.geog.uni-heidelberg.de/tiles/roads/x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);
}
break;
case MapType::OpenStreetMapSurferTerrain:
{
// http://korona.geog.uni-heidelberg.de/tiles/asterh/x=501&y=388&z=10
// ASTER GDEM & SRTM Hillshade layer: http://korona.geog.uni-heidelberg.de/tiles/asterh/
// or http://129.206.66.245:8004/tms_hs.ashx?x={x}&y={y}&z={z}
#ifdef DEBUG_URLFACTORY
qDebug() << QString("http://korona.geog.uni-heidelberg.de/tiles/asterh/x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);

2
ground/gcs/src/share/configurations/default.xml
View File

@ -1554,7 +1554,7 @@
<defaultLatitude>0</defaultLatitude>
<defaultLongitude>0</defaultLongitude>
<defaultZoom>2</defaultZoom>
<mapProvider>GoogleSatellite</mapProvider>
<mapProvider>GoogleHybrid</mapProvider>
<maxUpdateRate>2000</maxUpdateRate>
<overlayOpacity>1</overlayOpacity>
<showTileGridLines>false</showTileGridLines>