[mapguide-commits] r9497 - in sandbox/jng/tiling_v2: Common/MapGuideCommon/Services Server/src/Services/Tile
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Apr 25 23:56:13 PDT 2019
Author: jng
Date: 2019-04-25 23:56:13 -0700 (Thu, 25 Apr 2019)
New Revision: 9497
Modified:
sandbox/jng/tiling_v2/Common/MapGuideCommon/Services/TileDefs.h
sandbox/jng/tiling_v2/Server/src/Services/Tile/ServerTileService.cpp
sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.cpp
sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.h
sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.cpp
sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.h
Log:
Initial tile service changes to slot in metatiling later on.
Modified: sandbox/jng/tiling_v2/Common/MapGuideCommon/Services/TileDefs.h
===================================================================
--- sandbox/jng/tiling_v2/Common/MapGuideCommon/Services/TileDefs.h 2019-04-25 10:09:05 UTC (rev 9496)
+++ sandbox/jng/tiling_v2/Common/MapGuideCommon/Services/TileDefs.h 2019-04-26 06:56:13 UTC (rev 9497)
@@ -59,13 +59,15 @@
#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"
-#define MG_TILE_PROVIDER_COMMON_PARAM_TILEEXTENTOFFSET L"TileExtentOffset"
+#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"
+#define MG_TILE_PROVIDER_COMMON_PARAM_TILEEXTENTOFFSET L"TileExtentOffset"
+#define MG_TILE_PROVIDER_COMMON_PARAM_METATILEFACTOR L"MetaTileFactor"
+#define MG_TILE_PROVIDER_COMMON_PARAM_METATILELOCKMETHOD L"MetaTileLockMethod"
#endif
Modified: sandbox/jng/tiling_v2/Server/src/Services/Tile/ServerTileService.cpp
===================================================================
--- sandbox/jng/tiling_v2/Server/src/Services/Tile/ServerTileService.cpp 2019-04-25 10:09:05 UTC (rev 9496)
+++ sandbox/jng/tiling_v2/Server/src/Services/Tile/ServerTileService.cpp 2019-04-26 06:56:13 UTC (rev 9497)
@@ -57,8 +57,8 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- Ptr<MgTileCacheDefault> cache = new MgTileCacheDefault(map);
- ret = cache->GetTile(baseMapLayerGroupName, tileColumn, tileRow, scaleIndex);
+ MgTileCacheDefault cache(map);
+ ret = cache.GetTile(baseMapLayerGroupName, tileColumn, tileRow, scaleIndex);
MG_CATCH_AND_THROW(L"MgServerTileService.GetTile")
@@ -93,8 +93,8 @@
CHECKARGUMENTNULL(map, L"MgServerTileService.ClearCache");
- Ptr<MgTileCacheDefault> cache = new MgTileCacheDefault(map);
- cache->Clear();
+ MgTileCacheDefault cache(map);
+ cache.Clear();
MG_CATCH_AND_THROW(L"MgServerTileService.ClearCache")
}
@@ -540,6 +540,8 @@
STRING format = L"PNG";
STRING path;
bool bRenderOnly = false;
+ INT32 metaTileFactor = 0;
+ INT32 metaTileLockMethod = 0;
for (INT32 i = 0; i < parameters->GetCount(); i++)
{
MdfModel::NameStringPair* pair = parameters->GetAt(i);
@@ -571,6 +573,14 @@
tileExtentOffset = MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset;
}
}
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_METATILEFACTOR)
+ {
+ metaTileFactor = MgUtil::StringToInt32(pair->GetValue());
+ }
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_METATILELOCKMETHOD)
+ {
+ metaTileLockMethod = MgUtil::StringToInt32(pair->GetValue());
+ }
}
//If we find the cache path substitution tag, replace it with the default path from the configuration
@@ -579,7 +589,7 @@
path = MgTileParameters::tileCachePath;
}
- cache = new MgTileCacheDefaultProvider(tileSetId, path, width, height, format, bRenderOnly, tileExtentOffset);
+ cache = new MgTileCacheDefaultProvider(tileSetId, path, width, height, format, bRenderOnly, tileExtentOffset, metaTileFactor, metaTileLockMethod);
}
else if (provider == MG_TILE_PROVIDER_XYZ)
{
@@ -588,6 +598,8 @@
double tileExtentOffset = MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset;
STRING path;
bool bRenderOnly = false;
+ INT32 metaTileFactor = 0;
+ INT32 metaTileLockMethod = 0;
for (INT32 i = 0; i < parameters->GetCount(); i++)
{
MdfModel::NameStringPair* pair = parameters->GetAt(i);
@@ -611,6 +623,14 @@
tileExtentOffset = MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset;
}
}
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_METATILEFACTOR)
+ {
+ metaTileFactor = MgUtil::StringToInt32(pair->GetValue());
+ }
+ else if (pair->GetName() == MG_TILE_PROVIDER_COMMON_PARAM_METATILELOCKMETHOD)
+ {
+ metaTileLockMethod = MgUtil::StringToInt32(pair->GetValue());
+ }
}
//If we find the cache path substitution tag, replace it with the default path from the configuration
@@ -619,7 +639,7 @@
path = MgTileParameters::tileCachePath;
}
- cache = new MgTileCacheXYZProvider(tileSetId, path, format, bRenderOnly, tileExtentOffset);
+ cache = new MgTileCacheXYZProvider(tileSetId, path, format, bRenderOnly, tileExtentOffset, metaTileFactor, metaTileLockMethod);
}
else
{
Modified: sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.cpp
===================================================================
--- sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.cpp 2019-04-25 10:09:05 UTC (rev 9496)
+++ sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.cpp 2019-04-26 06:56:13 UTC (rev 9497)
@@ -18,7 +18,15 @@
#include "MapGuideCommon.h"
#include "TileCacheDefaultProvider.h"
-MgTileCacheDefaultProvider::MgTileCacheDefaultProvider(MgResourceIdentifier* tileSetId, CREFSTRING path, INT32 tileWidth, INT32 tileHeight, CREFSTRING format, bool bRenderOnly, double tileExtentOffset)
+MgTileCacheDefaultProvider::MgTileCacheDefaultProvider(MgResourceIdentifier* tileSetId,
+ CREFSTRING path,
+ INT32 tileWidth,
+ INT32 tileHeight,
+ CREFSTRING format,
+ bool bRenderOnly,
+ double tileExtentOffset,
+ INT32 metaTileFactor,
+ INT32 metaTileLockMethod)
{
m_tilesetId = SAFE_ADDREF(tileSetId);
m_path = path;
@@ -27,6 +35,8 @@
m_format = format;
m_renderOnly = bRenderOnly;
m_tileExtentOffset = tileExtentOffset;
+ m_metaTileFactor = metaTileFactor;
+ m_metaTileLockMethod = metaTileLockMethod;
}
MgTileCacheDefaultProvider::~MgTileCacheDefaultProvider()
Modified: sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.h
===================================================================
--- sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.h 2019-04-25 10:09:05 UTC (rev 9496)
+++ sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheDefaultProvider.h 2019-04-26 06:56:13 UTC (rev 9497)
@@ -22,7 +22,15 @@
class MG_SERVER_TILE_API MgTileCacheDefaultProvider : public MgTileCacheDefault
{
public:
- MgTileCacheDefaultProvider(MgResourceIdentifier* tileSetId, CREFSTRING path, INT32 tileWidth, INT32 tileHeight, CREFSTRING format, bool bRenderOnly, double tileExtentOffset);
+ MgTileCacheDefaultProvider(MgResourceIdentifier* tileSetId,
+ CREFSTRING path,
+ INT32 tileWidth,
+ INT32 tileHeight,
+ CREFSTRING format,
+ bool bRenderOnly,
+ double tileExtentOffset,
+ INT32 metaTileFactor,
+ INT32 metaTileLockMethod);
virtual ~MgTileCacheDefaultProvider();
virtual MgByteReader* GetTile(CREFSTRING baseMapLayerGroupName,
@@ -54,6 +62,8 @@
STRING m_format;
bool m_renderOnly;
double m_tileExtentOffset;
+ INT32 m_metaTileFactor;
+ INT32 m_metaTileLockMethod;
};
#endif
\ No newline at end of file
Modified: sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.cpp
===================================================================
--- sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.cpp 2019-04-25 10:09:05 UTC (rev 9496)
+++ sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.cpp 2019-04-26 06:56:13 UTC (rev 9497)
@@ -18,7 +18,13 @@
#include "MapGuideCommon.h"
#include "TileCacheXYZProvider.h"
-MgTileCacheXYZProvider::MgTileCacheXYZProvider(MgResourceIdentifier* tileSetId, CREFSTRING path, CREFSTRING format, bool bRenderOnly, double tileExtentOffset)
+MgTileCacheXYZProvider::MgTileCacheXYZProvider(MgResourceIdentifier* tileSetId,
+ CREFSTRING path,
+ CREFSTRING format,
+ bool bRenderOnly,
+ double tileExtentOffset,
+ INT32 metaTileFactor,
+ INT32 metaTileLockMethod)
{
m_tilesetId = SAFE_ADDREF(tileSetId);
m_path = path;
@@ -25,6 +31,8 @@
m_format = format;
m_renderOnly = bRenderOnly;
m_tileExtentOffset = tileExtentOffset;
+ m_metaTileFactor = metaTileFactor;
+ m_metaTileLockMethod = metaTileLockMethod;
}
MgTileCacheXYZProvider::~MgTileCacheXYZProvider()
Modified: sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.h
===================================================================
--- sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.h 2019-04-25 10:09:05 UTC (rev 9496)
+++ sandbox/jng/tiling_v2/Server/src/Services/Tile/TileCacheXYZProvider.h 2019-04-26 06:56:13 UTC (rev 9497)
@@ -22,7 +22,13 @@
class MG_SERVER_TILE_API MgTileCacheXYZProvider : public MgTileCacheDefault
{
public:
- MgTileCacheXYZProvider(MgResourceIdentifier* tileSetId, CREFSTRING path, CREFSTRING format, bool bRenderOnly, double tileExtentOffset);
+ MgTileCacheXYZProvider(MgResourceIdentifier* tileSetId,
+ CREFSTRING path,
+ CREFSTRING format,
+ bool bRenderOnly,
+ double tileExtentOffset,
+ INT32 metaTileFactor,
+ INT32 metaTileLockMethod);
virtual ~MgTileCacheXYZProvider();
virtual MgByteReader* GetTile(CREFSTRING baseMapLayerGroupName,
@@ -58,6 +64,8 @@
STRING m_format;
bool m_renderOnly;
double m_tileExtentOffset;
+ INT32 m_metaTileFactor;
+ INT32 m_metaTileLockMethod;
};
#endif
\ No newline at end of file
More information about the mapguide-commits
mailing list