Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
79618021
Unverified
Commit
79618021
authored
Oct 08, 2019
by
Gus Grubba
Committed by
GitHub
Oct 08, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7752 from ans10528/googleHybridMap
Add MapType: Google Hybrid
parents
925e581d
4b2ab45e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
8 deletions
+15
-8
QGCMapEngine.cpp
src/QtLocationPlugin/QGCMapEngine.cpp
+1
-0
QGCMapUrlEngine.cpp
src/QtLocationPlugin/QGCMapUrlEngine.cpp
+12
-0
QGCMapUrlEngine.h
src/QtLocationPlugin/QGCMapUrlEngine.h
+1
-0
QGeoTiledMappingManagerEngineQGC.cpp
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
+1
-7
FlightMapSettings.cc
src/Settings/FlightMapSettings.cc
+0
-1
No files found.
src/QtLocationPlugin/QGCMapEngine.cpp
View file @
79618021
...
...
@@ -50,6 +50,7 @@ static stQGeoTileCacheQGCMapTypes kMapTypes[] = {
{
"Google Street Map"
,
UrlFactory
::
GoogleMap
},
{
"Google Satellite Map"
,
UrlFactory
::
GoogleSatellite
},
{
"Google Terrain Map"
,
UrlFactory
::
GoogleTerrain
},
{
"Google Hybrid Map"
,
UrlFactory
::
GoogleHybrid
},
#endif
{
"Bing Street Map"
,
UrlFactory
::
BingMap
},
{
"Bing Satellite Map"
,
UrlFactory
::
BingSatellite
},
...
...
src/QtLocationPlugin/QGCMapUrlEngine.cpp
View file @
79618021
...
...
@@ -56,6 +56,7 @@ UrlFactory::UrlFactory()
_versionGoogleSatellite
=
"692"
;
_versionGoogleLabels
=
"h@336"
;
_versionGoogleTerrain
=
"t@354,r@354000000"
;
_versionGoogleHybrid
=
"y"
;
_secGoogleWord
=
"Galileo"
;
#endif
// BingMaps
...
...
@@ -273,6 +274,17 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager*
return
QString
(
"http://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10"
).
arg
(
server
).
arg
(
_getServerNum
(
x
,
y
,
4
)).
arg
(
request
).
arg
(
_versionGoogleTerrain
).
arg
(
_language
).
arg
(
x
).
arg
(
sec1
).
arg
(
y
).
arg
(
zoom
).
arg
(
sec2
);
}
break
;
case
GoogleHybrid
:
{
QString
server
=
"mt"
;
QString
request
=
"vt"
;
QString
sec1
=
""
;
// after &x=...
QString
sec2
=
""
;
// after &zoom=...
_getSecGoogleWords
(
x
,
y
,
sec1
,
sec2
);
_tryCorrectGoogleVersions
(
networkManager
);
return
QString
(
"http://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10"
).
arg
(
server
).
arg
(
_getServerNum
(
x
,
y
,
4
)).
arg
(
request
).
arg
(
_versionGoogleHybrid
).
arg
(
_language
).
arg
(
x
).
arg
(
sec1
).
arg
(
y
).
arg
(
zoom
).
arg
(
sec2
);
}
break
;
#endif
case
StatkartTopo
:
{
...
...
src/QtLocationPlugin/QGCMapUrlEngine.h
View file @
79618021
...
...
@@ -120,6 +120,7 @@ private:
QString
_versionGoogleSatellite
;
QString
_versionGoogleLabels
;
QString
_versionGoogleTerrain
;
QString
_versionGoogleHybrid
;
QString
_secGoogleWord
;
#endif
...
...
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
View file @
79618021
...
...
@@ -108,15 +108,9 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian
QGCGEOMAPTYPE
(
QGeoMapType
::
StreetMap
,
"Google Street Map"
,
"Google street map"
,
false
,
false
,
UrlFactory
::
GoogleMap
),
QGCGEOMAPTYPE
(
QGeoMapType
::
SatelliteMapDay
,
"Google Satellite Map"
,
"Google satellite map"
,
false
,
false
,
UrlFactory
::
GoogleSatellite
),
QGCGEOMAPTYPE
(
QGeoMapType
::
TerrainMap
,
"Google Terrain Map"
,
"Google terrain map"
,
false
,
false
,
UrlFactory
::
GoogleTerrain
),
QGCGEOMAPTYPE
(
QGeoMapType
::
HybridMap
,
"Google Hybrid Map"
,
"Google hybrid map"
,
false
,
false
,
UrlFactory
::
GoogleHybrid
),
#endif
/* TODO:
* Proper google hybrid maps requires collecting two separate bitmaps and overlaying them.
*
* mapTypes << QGCGEOMAPTYPE(QGeoMapType::HybridMap, "Google Hybrid Map", "Google hybrid map", false, false, UrlFactory::GoogleHybrid),
*
*/
// Bing
QGCGEOMAPTYPE
(
QGeoMapType
::
StreetMap
,
"Bing Street Map"
,
"Bing street map"
,
false
,
false
,
UrlFactory
::
BingMap
),
QGCGEOMAPTYPE
(
QGeoMapType
::
SatelliteMapDay
,
"Bing Satellite Map"
,
"Bing satellite map"
,
false
,
false
,
UrlFactory
::
BingSatellite
),
...
...
src/Settings/FlightMapSettings.cc
View file @
79618021
...
...
@@ -86,7 +86,6 @@ void FlightMapSettings::_newMapProvider(QVariant value)
_removeEnumValue
(
mapTypeTerrain
,
enumStrings
,
enumValues
);
break
;
case
mapProviderGoogle
:
_removeEnumValue
(
mapTypeHybrid
,
enumStrings
,
enumValues
);
break
;
case
mapProviderStarkart
:
_removeEnumValue
(
mapTypeStreet
,
enumStrings
,
enumValues
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment