[mapguide-commits] r9530 - in sandbox/jng/mvt: . Common/MapGuideCommon/Resources Server/src/Services/Tile

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-06-02 05:42:11 -0700 (Sun, 02 Jun 2019)
New Revision: 9530

Modified:
   sandbox/jng/mvt/
   sandbox/jng/mvt/Common/MapGuideCommon/Resources/mapguide_en.res
   sandbox/jng/mvt/Server/src/Services/Tile/ServerTileService.cpp
Log:
Merged revision(s) 9529 from trunk/MgDev:
Add missing meta-tiling parameters

Fixes #2798
........


Index: sandbox/jng/mvt
===================================================================
--- sandbox/jng/mvt	2019-06-01 16:33:16 UTC (rev 9529)
+++ sandbox/jng/mvt	2019-06-02 12:42:11 UTC (rev 9530)

Property changes on: sandbox/jng/mvt
___________________________________________________________________
Modified: svn:mergeinfo
## -29,4 +29,4 ##
 /sandbox/jng/v30:8212-8227
 /sandbox/jng/v4:9511-9519
 /sandbox/rfc94:5099-5163
-/trunk/MgDev:9397-9399
\ No newline at end of property
+/trunk/MgDev:9397-9399,9529
\ No newline at end of property
Modified: sandbox/jng/mvt/Common/MapGuideCommon/Resources/mapguide_en.res
===================================================================
--- sandbox/jng/mvt/Common/MapGuideCommon/Resources/mapguide_en.res	2019-06-01 16:33:16 UTC (rev 9529)
+++ sandbox/jng/mvt/Common/MapGuideCommon/Resources/mapguide_en.res	2019-06-02 12:42:11 UTC (rev 9530)
@@ -449,7 +449,11 @@
 MgTileProvider_Common_Property_RenderOnly_LocalizedName = Render Tiles Only (do not cache)
 MgTileProvider_Common_Property_CoordinateSystem_LocalizedName = Coordinate System
 MgTileProvider_Common_Property_FiniteScaleList_LocalizedName = Finite Display Scale List
+MgTileProvider_Common_Property_TileExtentOffset_LocalizedName = Tile Extent Offset
+MgTileProvider_Common_Property_MetaTileFactor_LocalizedName = Meta-tiling factor
+MgTileProvider_Common_Property_MetaTileLockMethod_LocalizedName = Meta-tiling lock method
 
+
 # *****************************************************************************
 # S T Y L I Z A T I O N
 # *****************************************************************************

Modified: sandbox/jng/mvt/Server/src/Services/Tile/ServerTileService.cpp
===================================================================
--- sandbox/jng/mvt/Server/src/Services/Tile/ServerTileService.cpp	2019-06-01 16:33:16 UTC (rev 9529)
+++ sandbox/jng/mvt/Server/src/Services/Tile/ServerTileService.cpp	2019-06-02 12:42:11 UTC (rev 9530)
@@ -333,6 +333,38 @@
         xml.append("<DefaultValue></DefaultValue>\n");
         xml.append("</ConnectionProperty>\n");
 
+        //Property: MetaTileFactor
+        xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
+        xml.append("<Name>");
+        std::string mbMetaTileFactor;
+        MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_METATILEFACTOR, mbMetaTileFactor);
+        xml.append(mbMetaTileFactor);
+        xml.append("</Name>\n");
+        xml.append("<LocalizedName>");
+        std::string mbLocMetaTileFactor;
+        STRING wLocMetaTileFactor = MgUtil::GetResourceMessage(MgResources::TileService, L"MgTileProvider_Common_Property_MetaTileFactor_LocalizedName");
+        MgUtil::WideCharToMultiByte(wLocMetaTileFactor, mbLocMetaTileFactor);
+        xml.append(mbLocMetaTileFactor);
+        xml.append("</LocalizedName>\n");
+        xml.append("<DefaultValue></DefaultValue>\n");
+        xml.append("</ConnectionProperty>\n");
+
+        //Property: MetaTileLockMethod
+        xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
+        xml.append("<Name>");
+        std::string mbMetaTileLockMethod;
+        MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_METATILELOCKMETHOD, mbMetaTileLockMethod);
+        xml.append(mbMetaTileLockMethod);
+        xml.append("</Name>\n");
+        xml.append("<LocalizedName>");
+        std::string mbLocMetaTileLockMethod;
+        STRING wLocMetaTileLockMethod = MgUtil::GetResourceMessage(MgResources::TileService, L"MgTileProvider_Common_Property_MetaTileLockMethod_LocalizedName");
+        MgUtil::WideCharToMultiByte(wLocMetaTileLockMethod, mbLocMetaTileLockMethod);
+        xml.append(mbLocMetaTileLockMethod);
+        xml.append("</LocalizedName>\n");
+        xml.append("<DefaultValue></DefaultValue>\n");
+        xml.append("</ConnectionProperty>\n");
+
         xml.append("</ConnectionProperties>\n");
         xml.append("</TileProvider>\n");
     }
@@ -433,7 +465,39 @@
         xml.append("<DefaultValue></DefaultValue>\n");
         xml.append("</ConnectionProperty>\n");
 
+        //Property: MetaTileFactor
+        xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
+        xml.append("<Name>");
+        std::string mbMetaTileFactor;
+        MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_METATILEFACTOR, mbMetaTileFactor);
+        xml.append(mbMetaTileFactor);
+        xml.append("</Name>\n");
+        xml.append("<LocalizedName>");
+        std::string mbLocMetaTileFactor;
+        STRING wLocMetaTileFactor = MgUtil::GetResourceMessage(MgResources::TileService, L"MgTileProvider_Common_Property_MetaTileFactor_LocalizedName");
+        MgUtil::WideCharToMultiByte(wLocMetaTileFactor, mbLocMetaTileFactor);
+        xml.append(mbLocMetaTileFactor);
+        xml.append("</LocalizedName>\n");
+        xml.append("<DefaultValue></DefaultValue>\n");
+        xml.append("</ConnectionProperty>\n");
 
+        //Property: MetaTileLockMethod
+        xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
+        xml.append("<Name>");
+        std::string mbMetaTileLockMethod;
+        MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_METATILELOCKMETHOD, mbMetaTileLockMethod);
+        xml.append(mbMetaTileLockMethod);
+        xml.append("</Name>\n");
+        xml.append("<LocalizedName>");
+        std::string mbLocMetaTileLockMethod;
+        STRING wLocMetaTileLockMethod = MgUtil::GetResourceMessage(MgResources::TileService, L"MgTileProvider_Common_Property_MetaTileLockMethod_LocalizedName");
+        MgUtil::WideCharToMultiByte(wLocMetaTileLockMethod, mbLocMetaTileLockMethod);
+        xml.append(mbLocMetaTileLockMethod);
+        xml.append("</LocalizedName>\n");
+        xml.append("<DefaultValue></DefaultValue>\n");
+        xml.append("</ConnectionProperty>\n");
+
+
         xml.append("</ConnectionProperties>\n");
         xml.append("</TileProvider>\n");
     }