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
e76d49f6
Unverified
Commit
e76d49f6
authored
Sep 15, 2020
by
murata,katsutoshi
Committed by
GitHub
Sep 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QtLocationPlugin: Add Japan Map (#8712)
QtLocationPlugin: Add Japan GSI Map
parent
38d2641d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
0 deletions
+91
-0
GenericMapProvider.cpp
src/QtLocationPlugin/GenericMapProvider.cpp
+35
-0
GenericMapProvider.h
src/QtLocationPlugin/GenericMapProvider.h
+50
-0
QGCMapUrlEngine.cpp
src/QtLocationPlugin/QGCMapUrlEngine.cpp
+6
-0
No files found.
src/QtLocationPlugin/GenericMapProvider.cpp
View file @
e76d49f6
...
@@ -8,6 +8,41 @@
...
@@ -8,6 +8,41 @@
****************************************************************************/
****************************************************************************/
#include "GenericMapProvider.h"
#include "GenericMapProvider.h"
static
const
QString
JapanStdMapUrl
=
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/std/%1/%2/%3.png"
);
QString
JapanStdMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
Q_UNUSED
(
networkManager
)
return
JapanStdMapUrl
.
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
}
static
const
QString
JapanSeamlessMapUrl
=
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/seamlessphoto/%1/%2/%3.jpg"
);
QString
JapanSeamlessMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
Q_UNUSED
(
networkManager
)
return
JapanSeamlessMapUrl
.
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
}
static
const
QString
JapanAnaglyphMapUrl
=
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/anaglyphmap_color/%1/%2/%3.png"
);
QString
JapanAnaglyphMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
Q_UNUSED
(
networkManager
)
return
JapanAnaglyphMapUrl
.
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
}
static
const
QString
JapanSlopeMapUrl
=
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/slopemap/%1/%2/%3.png"
);
QString
JapanSlopeMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
Q_UNUSED
(
networkManager
)
return
JapanSlopeMapUrl
.
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
}
static
const
QString
JapanReliefMapUrl
=
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/relief/%1/%2/%3.png"
);
QString
JapanReliefMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
Q_UNUSED
(
networkManager
)
return
JapanReliefMapUrl
.
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
}
static
const
QString
StatkartMapUrl
=
QStringLiteral
(
"http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo4&zoom=%1&x=%2&y=%3"
);
static
const
QString
StatkartMapUrl
=
QStringLiteral
(
"http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo4&zoom=%1&x=%2&y=%3"
);
QString
StatkartMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
QString
StatkartMapProvider
::
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
{
...
...
src/QtLocationPlugin/GenericMapProvider.h
View file @
e76d49f6
...
@@ -10,6 +10,56 @@
...
@@ -10,6 +10,56 @@
#include "MapProvider.h"
#include "MapProvider.h"
class
JapanStdMapProvider
:
public
MapProvider
{
Q_OBJECT
public:
JapanStdMapProvider
(
QObject
*
parent
=
nullptr
)
:
MapProvider
(
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/std"
),
QStringLiteral
(
"png"
),
AVERAGE_TILE_SIZE
,
QGeoMapType
::
StreetMap
,
parent
)
{}
QString
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
override
;
};
class
JapanSeamlessMapProvider
:
public
MapProvider
{
Q_OBJECT
public:
JapanSeamlessMapProvider
(
QObject
*
parent
=
nullptr
)
:
MapProvider
(
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/seamlessphoto"
),
QStringLiteral
(
"jpg"
),
AVERAGE_TILE_SIZE
,
QGeoMapType
::
StreetMap
,
parent
)
{}
QString
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
override
;
};
class
JapanAnaglyphMapProvider
:
public
MapProvider
{
Q_OBJECT
public:
JapanAnaglyphMapProvider
(
QObject
*
parent
=
nullptr
)
:
MapProvider
(
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/anaglyphmap_color"
),
QStringLiteral
(
"png"
),
AVERAGE_TILE_SIZE
,
QGeoMapType
::
StreetMap
,
parent
)
{}
QString
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
override
;
};
class
JapanSlopeMapProvider
:
public
MapProvider
{
Q_OBJECT
public:
JapanSlopeMapProvider
(
QObject
*
parent
=
nullptr
)
:
MapProvider
(
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/slopemap"
),
QStringLiteral
(
"png"
),
AVERAGE_TILE_SIZE
,
QGeoMapType
::
StreetMap
,
parent
)
{}
QString
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
override
;
};
class
JapanReliefMapProvider
:
public
MapProvider
{
Q_OBJECT
public:
JapanReliefMapProvider
(
QObject
*
parent
=
nullptr
)
:
MapProvider
(
QStringLiteral
(
"https://cyberjapandata.gsi.go.jp/xyz/relief"
),
QStringLiteral
(
"png"
),
AVERAGE_TILE_SIZE
,
QGeoMapType
::
StreetMap
,
parent
)
{}
QString
_getURL
(
const
int
x
,
const
int
y
,
const
int
zoom
,
QNetworkAccessManager
*
networkManager
)
override
;
};
class
StatkartMapProvider
:
public
MapProvider
{
class
StatkartMapProvider
:
public
MapProvider
{
Q_OBJECT
Q_OBJECT
public:
public:
...
...
src/QtLocationPlugin/QGCMapUrlEngine.cpp
View file @
e76d49f6
...
@@ -76,6 +76,12 @@ UrlFactory::UrlFactory() : _timeout(5 * 1000) {
...
@@ -76,6 +76,12 @@ UrlFactory::UrlFactory() : _timeout(5 * 1000) {
_providersTable
[
"VWorld Satellite Map"
]
=
new
VWorldSatMapProvider
(
this
);
_providersTable
[
"VWorld Satellite Map"
]
=
new
VWorldSatMapProvider
(
this
);
_providersTable
[
"Airmap Elevation"
]
=
new
AirmapElevationProvider
(
this
);
_providersTable
[
"Airmap Elevation"
]
=
new
AirmapElevationProvider
(
this
);
_providersTable
[
"Japan-GSI Contour"
]
=
new
JapanStdMapProvider
(
this
);
_providersTable
[
"Japan-GSI Seamless"
]
=
new
JapanSeamlessMapProvider
(
this
);
_providersTable
[
"Japan-GSI Anaglyph"
]
=
new
JapanAnaglyphMapProvider
(
this
);
_providersTable
[
"Japan-GSI Slope"
]
=
new
JapanSlopeMapProvider
(
this
);
_providersTable
[
"Japan-GSI Relief"
]
=
new
JapanReliefMapProvider
(
this
);
}
}
void
UrlFactory
::
registerProvider
(
QString
name
,
MapProvider
*
provider
)
{
void
UrlFactory
::
registerProvider
(
QString
name
,
MapProvider
*
provider
)
{
...
...
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