[mapguide-commits] r8192 - in sandbox/jng/tiling: Common/MapGuideCommon/MapLayer Common/MapGuideCommon/Services Server/src/Services/Tile
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jun 10 00:39:32 PDT 2014
Author: jng
Date: 2014-06-10 00:39:31 -0700 (Tue, 10 Jun 2014)
New Revision: 8192
Modified:
sandbox/jng/tiling/Common/MapGuideCommon/MapLayer/Map.cpp
sandbox/jng/tiling/Common/MapGuideCommon/Services/TileDefs.h
sandbox/jng/tiling/Server/src/Services/Tile/ServerTileService.cpp
Log:
Move our string constants up to the MapGuideCommon level so it can be referenced in both MgMap and server tile service.
Modified: sandbox/jng/tiling/Common/MapGuideCommon/MapLayer/Map.cpp
===================================================================
--- sandbox/jng/tiling/Common/MapGuideCommon/MapLayer/Map.cpp 2014-06-09 22:57:56 UTC (rev 8191)
+++ sandbox/jng/tiling/Common/MapGuideCommon/MapLayer/Map.cpp 2014-06-10 07:39:31 UTC (rev 8192)
@@ -781,19 +781,19 @@
//to FDO-ize this tile provider concept.
MdfModel::TileStoreParameters* storeParams = tileset->GetTileStoreParameters();
- if (storeParams->GetTileProvider() == L"Default") //NOXLATE
+ if (storeParams->GetTileProvider() == MG_TILE_PROVIDER_DEFAULT)
{
MdfModel::NameStringPairCollection* parameters = storeParams->GetParameters();
for (INT32 i = 0; i < parameters->GetCount(); i++)
{
MdfModel::NameStringPair* nsp = parameters->GetAt(i);
- if (nsp->GetName() == L"CoordinateSystem") //NOXLATE
+ if (nsp->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_COORDINATESYSTEM)
{
return nsp->GetValue();
}
}
}
- else if (storeParams->GetTileProvider() == L"XYZ") //NOXLATE
+ else if (storeParams->GetTileProvider() == MG_TILE_PROVIDER_XYZ)
{
//XYZ is always LL84
Ptr<MgCoordinateSystemFactory> csFactory = new MgCoordinateSystemFactory();
@@ -817,13 +817,13 @@
//to FDO-ize this tile provider concept.
MdfModel::TileStoreParameters* storeParams = tileset->GetTileStoreParameters();
- if (storeParams->GetTileProvider() == L"Default") //NOXLATE
+ if (storeParams->GetTileProvider() == MG_TILE_PROVIDER_DEFAULT) //NOXLATE
{
MdfModel::NameStringPairCollection* parameters = storeParams->GetParameters();
for (INT32 i = 0; i < parameters->GetCount(); i++)
{
MdfModel::NameStringPair* nsp = parameters->GetAt(i);
- if (nsp->GetName() == L"FiniteScaleList") //NOXLATE
+ if (nsp->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_FINITESCALELIST) //NOXLATE
{
Ptr<MgStringCollection> values = MgStringCollection::ParseCollection(nsp->GetValue(), L","); //NOXLATE
for (INT32 i = 0; i < values->GetCount(); i++)
Modified: sandbox/jng/tiling/Common/MapGuideCommon/Services/TileDefs.h
===================================================================
--- sandbox/jng/tiling/Common/MapGuideCommon/Services/TileDefs.h 2014-06-09 22:57:56 UTC (rev 8191)
+++ sandbox/jng/tiling/Common/MapGuideCommon/Services/TileDefs.h 2014-06-10 07:39:31 UTC (rev 8192)
@@ -57,4 +57,14 @@
};
/// \endcond
+#define MG_TILE_PROVIDER_DEFAULT L"Default"
+#define MG_TILE_PROVIDER_XYZ L"XYZ"
+#define MG_TILE_PROVIDER_COMMON_PARAM_TILEPATH L"TilePath"
+#define MG_TILE_PROVIDER_COMMON_PARAM_TILEWIDTH L"TileWidth"
+#define MG_TILE_PROVIDER_COMMON_PARAM_TILEHEIGHT L"TileHeight"
+#define MG_TILE_PROVIDER_COMMON_PARAM_TILEFORMAT L"TileFormat"
+#define MG_TILE_PROVIDER_COMMON_PARAM_RENDERONLY L"RenderOnly"
+#define MG_TILE_PROVIDER_COMMON_PARAM_COORDINATESYSTEM L"CoordinateSystem"
+#define MG_TILE_PROVIDER_COMMON_PARAM_FINITESCALELIST L"FiniteScaleList"
+
#endif
Modified: sandbox/jng/tiling/Server/src/Services/Tile/ServerTileService.cpp
===================================================================
--- sandbox/jng/tiling/Server/src/Services/Tile/ServerTileService.cpp 2014-06-09 22:57:56 UTC (rev 8191)
+++ sandbox/jng/tiling/Server/src/Services/Tile/ServerTileService.cpp 2014-06-10 07:39:31 UTC (rev 8192)
@@ -23,16 +23,6 @@
IMPLEMENT_CREATE_SERVICE(MgServerTileService)
-#define TILE_PROVIDER_DEFAULT L"Default"
-#define TILE_PROVIDER_XYZ L"XYZ"
-#define TILE_PROVIDER_COMMON_PARAM_TILEPATH L"TilePath"
-#define TILE_PROVIDER_COMMON_PARAM_TILEWIDTH L"TileWidth"
-#define TILE_PROVIDER_COMMON_PARAM_TILEHEIGHT L"TileHeight"
-#define TILE_PROVIDER_COMMON_PARAM_TILEFORMAT L"TileFormat"
-#define TILE_PROVIDER_COMMON_PARAM_RENDERONLY L"RenderOnly"
-#define TILE_PROVIDER_COMMON_PARAM_COORDINATESYSTEM L"CoordinateSystem"
-#define TILE_PROVIDER_COMMON_PARAM_FINITESCALELIST L"FiniteScaleList"
-
MgServerTileService::MgServerTileService() : MgTileService()
{
MgTileCacheDefault::Initialize();
@@ -182,7 +172,7 @@
xml.append("<TileProvider>\n");
xml.append("<Name>");
std::string mbName;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_DEFAULT, mbName);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_DEFAULT, mbName);
xml.append(mbName);
xml.append("</Name>\n");
xml.append("<DisplayName>");
@@ -203,7 +193,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbTilePath;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_TILEPATH, mbTilePath);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_TILEPATH, mbTilePath);
xml.append(mbTilePath);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -223,7 +213,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbTileWidth;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_TILEWIDTH, mbTileWidth);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_TILEWIDTH, mbTileWidth);
xml.append(mbTileWidth);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -243,7 +233,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbTileHeight;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_TILEHEIGHT, mbTileHeight);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_TILEHEIGHT, mbTileHeight);
xml.append(mbTileHeight);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -263,7 +253,7 @@
xml.append("<ConnectionProperty Enumerable=\"true\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbTileFormat;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_TILEFORMAT, mbTileFormat);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_TILEFORMAT, mbTileFormat);
xml.append(mbTileFormat);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -285,7 +275,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"false\">\n");
xml.append("<Name>");
std::string mbRenderOnly;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_RENDERONLY, mbRenderOnly);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_RENDERONLY, mbRenderOnly);
xml.append(mbRenderOnly);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -301,7 +291,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbCoordSys;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_COORDINATESYSTEM, mbCoordSys);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_COORDINATESYSTEM, mbCoordSys);
xml.append(mbCoordSys);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -317,7 +307,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbFiniteScaleList;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_FINITESCALELIST, mbFiniteScaleList);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_FINITESCALELIST, mbFiniteScaleList);
xml.append(mbFiniteScaleList);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -337,7 +327,7 @@
xml.append("<TileProvider>\n");
xml.append("<Name>");
std::string mbName;
- STRING wName = TILE_PROVIDER_XYZ;
+ STRING wName = MG_TILE_PROVIDER_XYZ;
MgUtil::WideCharToMultiByte(wName, mbName);
xml.append(mbName);
xml.append("</Name>\n");
@@ -359,7 +349,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbTilePath;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_TILEPATH, mbTilePath);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_TILEPATH, mbTilePath);
xml.append(mbTilePath);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -379,7 +369,7 @@
xml.append("<ConnectionProperty Enumerable=\"true\" Protected=\"false\" Required=\"true\">\n");
xml.append("<Name>");
std::string mbTileFormat;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_TILEFORMAT, mbTileFormat);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_TILEFORMAT, mbTileFormat);
xml.append(mbTileFormat);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -401,7 +391,7 @@
xml.append("<ConnectionProperty Enumerable=\"false\" Protected=\"false\" Required=\"false\">\n");
xml.append("<Name>");
std::string mbRenderOnly;
- MgUtil::WideCharToMultiByte(TILE_PROVIDER_COMMON_PARAM_RENDERONLY, mbRenderOnly);
+ MgUtil::WideCharToMultiByte(MG_TILE_PROVIDER_COMMON_PARAM_RENDERONLY, mbRenderOnly);
xml.append(mbRenderOnly);
xml.append("</Name>\n");
xml.append("<LocalizedName>");
@@ -514,7 +504,7 @@
MdfModel::TileStoreParameters* tilesetParams = tileset->GetTileStoreParameters();
const MdfModel::MdfString& provider = tilesetParams->GetTileProvider();
- if (provider == TILE_PROVIDER_DEFAULT)
+ if (provider == MG_TILE_PROVIDER_DEFAULT)
{
MdfModel::NameStringPairCollection* parameters = tilesetParams->GetParameters();
INT32 width = 300;
@@ -525,23 +515,23 @@
for (INT32 i = 0; i < parameters->GetCount(); i++)
{
MdfModel::NameStringPair* pair = parameters->GetAt(i);
- if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_TILEPATH)
+ if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_TILEPATH)
{
path = pair->GetValue();
}
- else if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_TILEWIDTH)
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_TILEWIDTH)
{
width = MgUtil::StringToInt32(pair->GetValue());
}
- else if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_TILEHEIGHT)
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_TILEHEIGHT)
{
height = MgUtil::StringToInt32(pair->GetValue());
}
- else if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_TILEFORMAT)
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_TILEFORMAT)
{
format = pair->GetValue();
}
- else if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_RENDERONLY)
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_RENDERONLY)
{
bRenderOnly = MgUtil::StringToBoolean(pair->GetValue());
}
@@ -555,7 +545,7 @@
cache = new MgTileCacheDefaultProvider(tileSetId, path, width, height, format, bRenderOnly);
}
- else if (provider == TILE_PROVIDER_XYZ)
+ else if (provider == MG_TILE_PROVIDER_XYZ)
{
MdfModel::NameStringPairCollection* parameters = tilesetParams->GetParameters();
STRING format = L"PNG";
@@ -564,15 +554,15 @@
for (INT32 i = 0; i < parameters->GetCount(); i++)
{
MdfModel::NameStringPair* pair = parameters->GetAt(i);
- if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_TILEPATH)
+ if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_TILEPATH)
{
path = pair->GetValue();
}
- else if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_TILEFORMAT)
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_TILEFORMAT)
{
format = pair->GetValue();
}
- else if (pair->GetName() == TILE_PROVIDER_COMMON_PARAM_RENDERONLY)
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_RENDERONLY)
{
bRenderOnly = MgUtil::StringToBoolean(pair->GetValue());
}
More information about the mapguide-commits
mailing list