[mapguide-commits] r9532 - sandbox/jng/mvt/Server/src/Services/Tile

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-06-03 04:56:34 -0700 (Mon, 03 Jun 2019)
New Revision: 9532

Modified:
   sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.cpp
   sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.h
Log:
Ensure meta-tiling is only done for image-based tile formats.

Modified: sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.cpp
===================================================================
--- sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.cpp	2019-06-03 11:52:35 UTC (rev 9531)
+++ sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.cpp	2019-06-03 11:56:34 UTC (rev 9532)
@@ -44,6 +44,11 @@
 
 }
 
+bool MgTileCacheXYZProvider::IsImageFormat()
+{
+    return m_format != L"UTFGRID" && m_format != L"MVT";
+}
+
 MgByteReader* MgTileCacheXYZProvider::GetTile(CREFSTRING baseMapLayerGroupName,
                                                   INT32 tileColumn,
                                                   INT32 tileRow,
@@ -52,7 +57,7 @@
     Ptr<MgByteReader> ret;
     MG_TRY()
 
-        if (m_metaTileFactor > 1)
+        if (IsImageFormat() && m_metaTileFactor > 1)
             ret = GetMetatileForResource(m_tilesetId, baseMapLayerGroupName, tileColumn, tileRow, scaleIndex);
         else
             ret = GetTileForResource(m_tilesetId, baseMapLayerGroupName, tileColumn, tileRow, scaleIndex);

Modified: sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.h
===================================================================
--- sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.h	2019-06-03 11:52:35 UTC (rev 9531)
+++ sandbox/jng/mvt/Server/src/Services/Tile/TileCacheXYZProvider.h	2019-06-03 11:56:34 UTC (rev 9532)
@@ -67,6 +67,8 @@
         INT32 tileRow,
         INT32 scaleIndex);
 
+    bool IsImageFormat();
+
     // use a memory based locking scheme
     static ACE_Recursive_Thread_Mutex sm_MetaTileMutex;