Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colorEagleStdio
qplanetosm
提交
876c43bc
qplanetosm
项目概览
colorEagleStdio
/
qplanetosm
通知
118
Star
10
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
qplanetosm
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
876c43bc
编写于
9月 21, 2019
作者:
A
archosm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extend max level to 20 from 18.
For morden osm server, Tile level has been extended to 20 from 18.
上级
7df42aec
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
17 addition
and
18 deletion
+17
-18
qtviewer_planetosm/osm_frame_widget.ui
qtviewer_planetosm/osm_frame_widget.ui
+2
-4
qtviewer_planetosm/osmtiles/layer_tiles.cpp
qtviewer_planetosm/osmtiles/layer_tiles.cpp
+3
-3
qtviewer_planetosm/osmtiles/tilesviewer.cpp
qtviewer_planetosm/osmtiles/tilesviewer.cpp
+8
-8
qtviewer_planetosm/osmtiles/tilesviewer.h
qtviewer_planetosm/osmtiles/tilesviewer.h
+1
-1
qtviewer_planetosm/osmtiles/viewer_interface.h
qtviewer_planetosm/osmtiles/viewer_interface.h
+2
-1
qtvplugin_geomarker/geographicsscene.h
qtvplugin_geomarker/geographicsscene.h
+1
-1
未找到文件。
qtviewer_planetosm/osm_frame_widget.ui
浏览文件 @
876c43bc
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
640
</width>
<width>
640
</width>
<height>
48
1
</height>
<height>
48
3
</height>
</rect>
</rect>
</property>
</property>
<property
name=
"windowTitle"
>
<property
name=
"windowTitle"
>
...
@@ -194,7 +194,7 @@
...
@@ -194,7 +194,7 @@
<bool>
false
</bool>
<bool>
false
</bool>
</property>
</property>
<property
name=
"maximum"
>
<property
name=
"maximum"
>
<number>
18
</number>
<number>
20
</number>
</property>
</property>
<property
name=
"pageStep"
>
<property
name=
"pageStep"
>
<number>
4
</number>
<number>
4
</number>
...
@@ -480,8 +480,6 @@
...
@@ -480,8 +480,6 @@
</customwidgets>
</customwidgets>
<resources>
<resources>
<include
location=
"resource/resource.qrc"
/>
<include
location=
"resource/resource.qrc"
/>
<include
location=
"resource/resource.qrc"
/>
<include
location=
"resource/resource.qrc"
/>
</resources>
</resources>
<connections>
<connections>
<connection>
<connection>
...
...
qtviewer_planetosm/osmtiles/layer_tiles.cpp
浏览文件 @
876c43bc
...
@@ -192,8 +192,8 @@ namespace QTVOSM{
...
@@ -192,8 +192,8 @@ namespace QTVOSM{
if
(
event
->
delta
()
<
0
)
if
(
event
->
delta
()
<
0
)
{
{
nLevel
++
;
nLevel
++
;
if
(
nLevel
>
18
)
if
(
nLevel
>
20
)
nLevel
=
18
;
nLevel
=
20
;
}
}
else
if
(
event
->
delta
()
>
0
)
else
if
(
event
->
delta
()
>
0
)
{
{
...
@@ -337,7 +337,7 @@ namespace QTVOSM{
...
@@ -337,7 +337,7 @@ namespace QTVOSM{
\fn layer_tiles::RegImages
\fn layer_tiles::RegImages
\param nX col (x) tile id og this level nLevel
\param nX col (x) tile id og this level nLevel
\param nY row (y) tile id og this level nLevel
\param nY row (y) tile id og this level nLevel
\param nLevel current level. In osm, nlevel often take 0~
18
\param nLevel current level. In osm, nlevel often take 0~
20
\return bool succeeded.
\return bool succeeded.
*/
*/
bool
layer_tiles
::
RegImages
(
int
nX
,
int
nY
,
int
nLevel
)
bool
layer_tiles
::
RegImages
(
int
nX
,
int
nY
,
int
nLevel
)
...
...
qtviewer_planetosm/osmtiles/tilesviewer.cpp
浏览文件 @
876c43bc
...
@@ -750,7 +750,7 @@ namespace QTVOSM{
...
@@ -750,7 +750,7 @@ namespace QTVOSM{
/*!
/*!
\brief convert Mercator to World. World Points is according to current level,
\brief convert Mercator to World. World Points is according to current level,
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
This approach is devided into several steps, and it is LEVEL RELATED!
This approach is devided into several steps, and it is LEVEL RELATED!
\fn tilesviewer::CV_MK2World
\fn tilesviewer::CV_MK2World
...
@@ -779,7 +779,7 @@ namespace QTVOSM{
...
@@ -779,7 +779,7 @@ namespace QTVOSM{
/*!
/*!
\brief convert World to Mercator. World Points is according to current level,
\brief convert World to Mercator. World Points is according to current level,
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
This approach is devided into several steps, and it is LEVEL RELATED!
This approach is devided into several steps, and it is LEVEL RELATED!
\fn tilesviewer::CV_World2MK
\fn tilesviewer::CV_World2MK
...
@@ -807,7 +807,7 @@ namespace QTVOSM{
...
@@ -807,7 +807,7 @@ namespace QTVOSM{
/*!
/*!
\brief convert LLA to world. World Points is according to current level,
\brief convert LLA to world. World Points is according to current level,
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
This approach is devided into several steps, and it is LEVEL RELATED!
This approach is devided into several steps, and it is LEVEL RELATED!
\fn tilesviewer::CV_LLA2World
\fn tilesviewer::CV_LLA2World
...
@@ -838,7 +838,7 @@ namespace QTVOSM{
...
@@ -838,7 +838,7 @@ namespace QTVOSM{
/*!
/*!
\brief convert world to LLA. World Points is according to current level,
\brief convert world to LLA. World Points is according to current level,
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
This approach is devided into several steps, and it is LEVEL RELATED!
This approach is devided into several steps, and it is LEVEL RELATED!
\fn tilesviewer::CV_World2LLA
\fn tilesviewer::CV_World2LLA
...
@@ -870,7 +870,7 @@ namespace QTVOSM{
...
@@ -870,7 +870,7 @@ namespace QTVOSM{
\brief convert Device Points to World. Device Points is according to current viewport,
\brief convert Device Points to World. Device Points is according to current viewport,
point(0,0) stay at the top-left, point (width-1,height-1) in bottom-right. World Points is according
point(0,0) stay at the top-left, point (width-1,height-1) in bottom-right. World Points is according
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
This approach is devided into several steps, and it is LEVEL RELATED!
This approach is devided into several steps, and it is LEVEL RELATED!
\fn tilesviewer::CV_DP2World
\fn tilesviewer::CV_DP2World
...
@@ -902,7 +902,7 @@ namespace QTVOSM{
...
@@ -902,7 +902,7 @@ namespace QTVOSM{
\brief convert World to Device Points. Device Points is according to current viewport,
\brief convert World to Device Points. Device Points is according to current viewport,
point(0,0) stay at the top-left, point (width-1,height-1) in bottom-right. World Points is according
point(0,0) stay at the top-left, point (width-1,height-1) in bottom-right. World Points is according
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
This approach is devided into several steps, and it is LEVEL RELATED!
This approach is devided into several steps, and it is LEVEL RELATED!
\fn tilesviewer::CV_World2DP
\fn tilesviewer::CV_World2DP
...
@@ -935,7 +935,7 @@ namespace QTVOSM{
...
@@ -935,7 +935,7 @@ namespace QTVOSM{
/*!
/*!
\brief convert percentage coord to world. World Points is according
\brief convert percentage coord to world. World Points is according
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
. Percentage coord is a
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
. Percentage coord is a
level-unretated coord, take a range -0.5~0.5, the world center in 0,0, -0.5.-0.5
level-unretated coord, take a range -0.5~0.5, the world center in 0,0, -0.5.-0.5
at top-left, 0.5,0.5 at bottom-right
at top-left, 0.5,0.5 at bottom-right
This approach is LEVEL RELATED!
This approach is LEVEL RELATED!
...
@@ -962,7 +962,7 @@ namespace QTVOSM{
...
@@ -962,7 +962,7 @@ namespace QTVOSM{
/*!
/*!
\brief convert world to percentage coord. World Points is according
\brief convert world to percentage coord. World Points is according
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
to current level, point(0,0) stay at the left-top, point (SZ,SZ) in bottom-right,
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
18
. Percentage coord is a
the pixel size is 2^m_nLevel*256, m_nLevel between 0 and
20
. Percentage coord is a
level-unretated coord, take a range -0.5~0.5, the world center in 0,0, -0.5.-0.5
level-unretated coord, take a range -0.5~0.5, the world center in 0,0, -0.5.-0.5
at top-left, 0.5,0.5 at bottom-right
at top-left, 0.5,0.5 at bottom-right
This approach is LEVEL RELATED!
This approach is LEVEL RELATED!
...
...
qtviewer_planetosm/osmtiles/tilesviewer.h
浏览文件 @
876c43bc
...
@@ -42,7 +42,7 @@ namespace QTVOSM{
...
@@ -42,7 +42,7 @@ namespace QTVOSM{
//Center Lat,Lon
//Center Lat,Lon
double
m_dCenterX
;
//percentage, -0.5~0.5
double
m_dCenterX
;
//percentage, -0.5~0.5
double
m_dCenterY
;
//percentage, -0.5~0.5
double
m_dCenterY
;
//percentage, -0.5~0.5
int
m_nLevel
;
//0-
18
int
m_nLevel
;
//0-
20
//layers
//layers
QList
<
layer_interface
*
>
m_listLayers
;
QList
<
layer_interface
*
>
m_listLayers
;
QSet
<
layer_interface
*
>
m_setLayers
;
QSet
<
layer_interface
*
>
m_setLayers
;
...
...
qtviewer_planetosm/osmtiles/viewer_interface.h
浏览文件 @
876c43bc
...
@@ -23,10 +23,11 @@ namespace QTVOSM{
...
@@ -23,10 +23,11 @@ namespace QTVOSM{
* 2.LLA, latitude, longitude and altitude
* 2.LLA, latitude, longitude and altitude
*
*
* 3.World Coordinate: uint:Pixel.
* 3.World Coordinate: uint:Pixel.
* Map system have different zoom level, from 0 to
18
.
* Map system have different zoom level, from 0 to
20
.
* At level 0, the Mercator Square is mapped onto a 256x256 tile.
* At level 0, the Mercator Square is mapped onto a 256x256 tile.
* At level 1, the Mercator Square is mapped onto a 512x512 tile.
* At level 1, the Mercator Square is mapped onto a 512x512 tile.
* At level 18,the Mercator Square is mapped onto a 67108864 x 67108864 tile. (size is 256 * 2 ^18)
* At level 18,the Mercator Square is mapped onto a 67108864 x 67108864 tile. (size is 256 * 2 ^18)
* At level 20,the Mercator Square is mapped onto a 268435456 x 268435456 tile. (size is 256 * 2 ^20)
* the coord direction of .World Coordinate is some different from Mercator projection.
* the coord direction of .World Coordinate is some different from Mercator projection.
* top-left is 0,0, right-bottom is 256 * 2 ^level-1,256 * 2 ^level-1
* top-left is 0,0, right-bottom is 256 * 2 ^level-1,256 * 2 ^level-1
*
*
...
...
qtvplugin_geomarker/geographicsscene.h
浏览文件 @
876c43bc
...
@@ -13,7 +13,7 @@ namespace QTVP_GEOMARKER{
...
@@ -13,7 +13,7 @@ namespace QTVP_GEOMARKER{
*
*
* The scene uses World Pixel Coordinate system, which has a commection between zoom level.
* The scene uses World Pixel Coordinate system, which has a commection between zoom level.
* You can learn more principle about coordinates in the comments of class viewer_interface. in zoom level 0,
* You can learn more principle about coordinates in the comments of class viewer_interface. in zoom level 0,
* world pixel size is 256x256, level 1 is 512x512, level 18 is 67108864 x 67108864
* world pixel size is 256x256, level 1 is 512x512, level 18 is 67108864 x 67108864
,level 20 will be 268435456 x 268435456.
* Since the scene coord will be zoomed in / out together with level change, all graphics items' coords should
* Since the scene coord will be zoomed in / out together with level change, all graphics items' coords should
* be recalculated in time. the method adjust_item_coords will do this automatically,
* be recalculated in time. the method adjust_item_coords will do this automatically,
* and in this function, virtual function geoItemBase::adjust_coords will be called sequentially.
* and in this function, virtual function geoItemBase::adjust_coords will be called sequentially.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录