[mapguide-commits] r9189 - sandbox/jng/utfgrid/Server/src/Services/Tile

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-05-02 10:01:31 -0700 (Tue, 02 May 2017)
New Revision: 9189

Modified:
   sandbox/jng/utfgrid/Server/src/Services/Tile/ServerTileService.cpp
   sandbox/jng/utfgrid/Server/src/Services/Tile/TileCacheXYZProvider.cpp
Log:
Advertise UTFGRID as a new tile format for the XYZ provider.

Update MgTileCacheXYZProvider to test for a request for UTFGRID to call the respective RenderTileUTFGrid API, otherwise assume it's image-based and use the existing RenderTileXYZ API.

Modified: sandbox/jng/utfgrid/Server/src/Services/Tile/ServerTileService.cpp
===================================================================
--- sandbox/jng/utfgrid/Server/src/Services/Tile/ServerTileService.cpp	2017-05-02 15:31:43 UTC (rev 9188)
+++ sandbox/jng/utfgrid/Server/src/Services/Tile/ServerTileService.cpp	2017-05-02 17:01:31 UTC (rev 9189)
@@ -372,13 +372,13 @@
         MgUtil::WideCharToMultiByte(wLocTileFormat, mbLocTileFormat);
         xml.append(mbLocTileFormat);
         xml.append("</LocalizedName>\n");
-        //Image formats supported by our tile service
+        //Tile formats supported by our tile service
         xml.append("<DefaultValue>PNG</DefaultValue>\n");
         xml.append("<Value>PNG</Value>");
         xml.append("<Value>PNG8</Value>");
         xml.append("<Value>JPG</Value>");
         xml.append("<Value>GIF</Value>");
-
+        xml.append("<Value>UTFGRID</Value>");
         xml.append("</ConnectionProperty>\n");
 
         //Property: RenderOnly

Modified: sandbox/jng/utfgrid/Server/src/Services/Tile/TileCacheXYZProvider.cpp
===================================================================
--- sandbox/jng/utfgrid/Server/src/Services/Tile/TileCacheXYZProvider.cpp	2017-05-02 15:31:43 UTC (rev 9188)
+++ sandbox/jng/utfgrid/Server/src/Services/Tile/TileCacheXYZProvider.cpp	2017-05-02 17:01:31 UTC (rev 9189)
@@ -61,9 +61,17 @@
 
     if (svcRendering != NULL)
     {
-        // generate the tile
-        img = svcRendering->RenderTileXYZ(map, baseMapLayerGroupName, tileRow, tileColumn, scaleIndex, map->GetDisplayDpi(), m_format);
-
+        // Test for non-image formats first
+        if (m_format == L"UTFGRID")
+        {
+            // generate the tile
+            img = svcRendering->RenderTileUTFGrid(map, baseMapLayerGroupName, tileRow, tileColumn, scaleIndex, map->GetDisplayDpi());
+        }
+        else //Assume it must be image-based at this point
+        {
+            // generate the tile
+            img = svcRendering->RenderTileXYZ(map, baseMapLayerGroupName, tileRow, tileColumn, scaleIndex, map->GetDisplayDpi(), m_format);
+        }
         // cache the tile
         if (!m_renderOnly)
         {