diff --git a/qtviewer_planetosm/osm_frame_widget.ui b/qtviewer_planetosm/osm_frame_widget.ui
index 8b701f6c0a36cfcf6fa909543da29194503de008..5b9d56d488b6bdd828ec77d8085df30a08bce401 100644
--- a/qtviewer_planetosm/osm_frame_widget.ui
+++ b/qtviewer_planetosm/osm_frame_widget.ui
@@ -7,7 +7,7 @@
0
0
640
- 481
+ 483
@@ -194,7 +194,7 @@
false
- 18
+ 20
4
@@ -480,8 +480,6 @@
-
-
diff --git a/qtviewer_planetosm/osmtiles/layer_tiles.cpp b/qtviewer_planetosm/osmtiles/layer_tiles.cpp
index c91519a79844aca874f86d9653b6498d2f5a05bc..c5cbe33d7468f495fca5bb657c588738b974f5ef 100644
--- a/qtviewer_planetosm/osmtiles/layer_tiles.cpp
+++ b/qtviewer_planetosm/osmtiles/layer_tiles.cpp
@@ -192,8 +192,8 @@ namespace QTVOSM{
if (event->delta()<0)
{
nLevel++;
- if (nLevel>18)
- nLevel=18;
+ if (nLevel>20)
+ nLevel=20;
}
else if (event->delta()>0)
{
@@ -337,7 +337,7 @@ namespace QTVOSM{
\fn layer_tiles::RegImages
\param nX col (x) 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.
*/
bool layer_tiles::RegImages(int nX, int nY,int nLevel)
diff --git a/qtviewer_planetosm/osmtiles/tilesviewer.cpp b/qtviewer_planetosm/osmtiles/tilesviewer.cpp
index 1a617c5eb5cf608d558139c121e2970bd8f9d608..1a94317a9f6bdcc505034aa72b76e30d578b9203 100644
--- a/qtviewer_planetosm/osmtiles/tilesviewer.cpp
+++ b/qtviewer_planetosm/osmtiles/tilesviewer.cpp
@@ -750,7 +750,7 @@ namespace QTVOSM{
/*!
\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
- 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!
\fn tilesviewer::CV_MK2World
@@ -779,7 +779,7 @@ namespace QTVOSM{
/*!
\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
- 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!
\fn tilesviewer::CV_World2MK
@@ -807,7 +807,7 @@ namespace QTVOSM{
/*!
\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
- 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!
\fn tilesviewer::CV_LLA2World
@@ -838,7 +838,7 @@ namespace QTVOSM{
/*!
\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
- 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!
\fn tilesviewer::CV_World2LLA
@@ -870,7 +870,7 @@ namespace QTVOSM{
\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
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!
\fn tilesviewer::CV_DP2World
@@ -902,7 +902,7 @@ namespace QTVOSM{
\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
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!
\fn tilesviewer::CV_World2DP
@@ -935,7 +935,7 @@ namespace QTVOSM{
/*!
\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,
- 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
at top-left, 0.5,0.5 at bottom-right
This approach is LEVEL RELATED!
@@ -962,7 +962,7 @@ namespace QTVOSM{
/*!
\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,
- 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
at top-left, 0.5,0.5 at bottom-right
This approach is LEVEL RELATED!
diff --git a/qtviewer_planetosm/osmtiles/tilesviewer.h b/qtviewer_planetosm/osmtiles/tilesviewer.h
index ed01d706f669ecec1f720180c2511987275c9795..6fc31cd4bf507cdcb50a05c6ce8b0f60412cd440 100644
--- a/qtviewer_planetosm/osmtiles/tilesviewer.h
+++ b/qtviewer_planetosm/osmtiles/tilesviewer.h
@@ -42,7 +42,7 @@ namespace QTVOSM{
//Center Lat,Lon
double m_dCenterX; //percentage, -0.5~0.5
double m_dCenterY; //percentage, -0.5~0.5
- int m_nLevel; //0-18
+ int m_nLevel; //0-20
//layers
QList < layer_interface * > m_listLayers;
QSet < layer_interface * > m_setLayers;
diff --git a/qtviewer_planetosm/osmtiles/viewer_interface.h b/qtviewer_planetosm/osmtiles/viewer_interface.h
index 96f79526ffc38968159dff53cab2f8238d97aaa2..8dbcb50713aa162661ffd132b8547172e47152db 100644
--- a/qtviewer_planetosm/osmtiles/viewer_interface.h
+++ b/qtviewer_planetosm/osmtiles/viewer_interface.h
@@ -23,10 +23,11 @@ namespace QTVOSM{
* 2.LLA, latitude, longitude and altitude
*
* 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 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 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.
* top-left is 0,0, right-bottom is 256 * 2 ^level-1,256 * 2 ^level-1
*
diff --git a/qtvplugin_geomarker/geographicsscene.h b/qtvplugin_geomarker/geographicsscene.h
index 30bc78e56563fed46f2818aa0ea1127003b7dd6f..a4031790b838fa15a21ed5596a1ef4839a50a958 100644
--- a/qtvplugin_geomarker/geographicsscene.h
+++ b/qtvplugin_geomarker/geographicsscene.h
@@ -13,7 +13,7 @@ namespace QTVP_GEOMARKER{
*
* 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,
- * 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
* 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.