[mapguide-commits] r9864 - in sandbox/jng/vanilla_swig: . Common/CoordinateSystem Common/Foundation/System Common/MapGuideCommon/MapLayer Common/MapGuideCommon/System Common/MdfParser/PrintLayout Common/PlatformBase/MapLayer Common/Renderers Doc/samples Doc/samples/javasamples Doc/samples/javasamples/hello_map Doc/samples/javasamples/interacting_with_layers Doc/samples/javaviewersample Doc/samples/javaviewersample/findaddress Doc/samples/javaviewersample/plot Doc/samples/javaviewersample/query Doc/samples/javaviewersample/query/classes Doc/samples/javaviewersample/theme Doc/samples/javaviewersample/theme/classes Server/src/Common/Cache Server/src/Common/Manager Server/src/Core Server/src/PostBuild Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Server/src/UnitTesting UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers UnitTest/WebTier/MapAgent/MapAgentForms Web/src Web/src/HttpHandler Web/src/mapviewerjava cmake/configs
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 16 02:04:50 PDT 2021
Author: jng
Date: 2021-07-16 02:04:49 -0700 (Fri, 16 Jul 2021)
New Revision: 9864
Added:
sandbox/jng/vanilla_swig/Doc/samples/clientsamples/
Removed:
sandbox/jng/vanilla_swig/Doc/samples/ol2samples/
Modified:
sandbox/jng/vanilla_swig/
sandbox/jng/vanilla_swig/Common/CoordinateSystem/MentorDictionary.h
sandbox/jng/vanilla_swig/Common/Foundation/System/Util.cpp
sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Layer.cpp
sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Selection.cpp
sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.cpp
sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.h
sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h
sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h
sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerBase.cpp
sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.cpp
sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.h
sandbox/jng/vanilla_swig/Doc/samples/CMakeLists.txt
sandbox/jng/vanilla_swig/Doc/samples/javasamples/hello_map/display_spatial_reference.jsp
sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/layer_visibility.jsp
sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/toggle_roads_label.jsp
sandbox/jng/vanilla_swig/Doc/samples/javasamples/main.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxtiledviewersample.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxviewersample.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/dwfviewersample.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddress.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressmain.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plot.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plotmain.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/feature.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/query.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querycontroller.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querymain.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/classes/theme.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/themecontroller.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/thememain.jsp
sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/utilityfunctions.jsp
sandbox/jng/vanilla_swig/Doc/samples/samples.php
sandbox/jng/vanilla_swig/Server/src/Common/Cache/FeatureSourceCacheItem.h
sandbox/jng/vanilla_swig/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h
sandbox/jng/vanilla_swig/Server/src/Common/Cache/SpatialContextCacheItem.h
sandbox/jng/vanilla_swig/Server/src/Common/Manager/CacheManager.cpp
sandbox/jng/vanilla_swig/Server/src/Common/Manager/SessionCache.cpp
sandbox/jng/vanilla_swig/Server/src/Core/EventTimer.h
sandbox/jng/vanilla_swig/Server/src/Core/ServiceHandlerFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Core/TimedEventHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Core/serverconfig.ini
sandbox/jng/vanilla_swig/Server/src/PostBuild/PostBuild.mak
sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingService.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Feature/TransformCache.h
sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Kml/ServerKmlService.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Mapping/LegendPlotUtil.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingUtil.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Mapping/ServerMappingService.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ServerProfilingService.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderMap.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ApplicationRepositoryManager.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/LibraryRepositoryManager.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceContainer.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeader.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageLoader.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageManifestHandler.h
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/SiteResourceContentManager.cpp
sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileOperationFactory.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileServiceHandler.cpp
sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestMisc.cpp
sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestRenderingService.cpp
sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestServiceFactory.cpp
sandbox/jng/vanilla_swig/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml
sandbox/jng/vanilla_swig/UnitTest/WebTier/MapAgent/MapAgentForms/getmapwmsform.html
sandbox/jng/vanilla_swig/Web/src/CMakeLists.txt
sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp
sandbox/jng/vanilla_swig/Web/src/HttpHandler/WmsMapUtil.cpp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/ajaxviewerabout.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/buffer.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/common.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/gettingstarted.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/init.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/legend.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mainframe.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mapframe.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/measure.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/quickplotgeneratepicture.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/search.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/selectwithin.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/serveradminhelper.jsp
sandbox/jng/vanilla_swig/Web/src/mapviewerjava/taskframe.jsp
sandbox/jng/vanilla_swig/build.bat
sandbox/jng/vanilla_swig/cmake/configs/serverconfig.ini.in
sandbox/jng/vanilla_swig/cmake/configs/tomcat.conf.in
Log:
Merged revision(s) 9825-9863 from trunk/MgDev: Synchronize sandbox branch against latest trunk
Index: sandbox/jng/vanilla_swig
===================================================================
--- sandbox/jng/vanilla_swig 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig 2021-07-16 09:04:49 UTC (rev 9864)
Property changes on: sandbox/jng/vanilla_swig
___________________________________________________________________
Modified: svn:mergeinfo
## -24,6 +24,7 ##
/sandbox/jng/library_init:9700-9709
/sandbox/jng/mvt:9527-9528,9535,9537,9546-9547
/sandbox/jng/mvt_alt:9604-9629
+/sandbox/jng/mvt_render_fixes:9828-9833
/sandbox/jng/ogc:9240-9255
/sandbox/jng/ogc_viewer_representation:9678-9698
/sandbox/jng/php56x:8975-8985
## -39,4 +40,4 ##
/sandbox/jng/v4:9511-9519
/sandbox/jng/wfs_hits:9569-9577
/sandbox/rfc94:5099-5163
-/trunk/MgDev:9824
\ No newline at end of property
+/trunk/MgDev:9742-9863
\ No newline at end of property
Modified: sandbox/jng/vanilla_swig/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/CoordinateSystem/MentorDictionary.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/CoordinateSystem/MentorDictionary.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -42,22 +42,22 @@
namespace MentorDictionary
{
template<class TCsMap, class TContainer >
- class TContainerPtr : public auto_ptr<TContainer>
+ class TContainerPtr : public unique_ptr<TContainer>
{
public:
TContainerPtr()
- : auto_ptr<TContainer>()
+ : unique_ptr<TContainer>()
{
}
TContainerPtr(TContainer* pContainer)
- : auto_ptr<TContainer>(pContainer)
+ : unique_ptr<TContainer>(pContainer)
{
}
~TContainerPtr()
{
- TContainer* pContainer = auto_ptr<TContainer>::get();
+ TContainer* pContainer = unique_ptr<TContainer>::get();
if (NULL == pContainer)
return;
@@ -192,7 +192,7 @@
{
//Make a collection to return - we first read all entries from the dictionary file
//and use those to fill up the dictionary we're returning
- auto_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
+ unique_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
for(typename vector<T>::size_type i = 0; i < csMapDefs->size(); ++i)
{
T* def = csMapDefs->at(i);
@@ -235,7 +235,7 @@
{
//Make a collection to return - we first read all entries from the dictionary file
//and use those to fill up the dictionary we're returning
- auto_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
+ unique_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
TContainerPtr<T, vector<T*> > allDictEntries(MentorDictionary::ReadDictionaryEntries(pFile, CS_Trd));
if (NULL == allDictEntries.get())
return NULL;
Modified: sandbox/jng/vanilla_swig/Common/Foundation/System/Util.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/System/Util.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/Foundation/System/Util.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -1111,6 +1111,11 @@
// Slice off trailing 0s
size_t end = str.find_last_not_of('0') + 1;
str.erase(end);
+ // If this means we sliced off *all* decimal places, slice off the decimal point as well
+ if (str.back() == '.')
+ {
+ str.erase(str.length() - 1);
+ }
}
}
@@ -1128,6 +1133,11 @@
// Slice off trailing 0s
size_t end = str.find_last_not_of(L'0') + 1;
str.erase(end);
+ // If this means we sliced off *all* decimal places, slice off the decimal point as well
+ if (str.back() == '.')
+ {
+ str.erase(str.length() - 1);
+ }
}
}
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Layer.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Layer.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Layer.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -365,7 +365,7 @@
throw new MgException(MgExceptionCodes::MgInvalidFeatureSourceException, L"MgLayer::UpdateFeatures", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- auto_ptr<MdfModel::FeatureSource> featureSource;
+ unique_ptr<MdfModel::FeatureSource> featureSource;
featureSource.reset(parser.DetachFeatureSource());
// Get the provider name.
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Selection.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Selection.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Selection.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -70,7 +70,7 @@
Ptr<MgResourceIdentifier> layerid = layer->GetLayerDefinition();
Ptr<MgResourceService> resourceService = dynamic_cast<MgResourceService*>(
m_map->GetService(MgServiceType::ResourceService));
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerid));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerid));
Ptr<MgStringCollection> propertyNames = new MgStringCollection();
if(ldf.get() != NULL)
{
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -318,6 +318,12 @@
const INT32 MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageWidth = 2048;
const STRING MgConfigProperties::RenderingServicePropertyMaxRasterImageHeight = L"MaxRasterImageHeight";
const INT32 MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageHeight = 2048;
+const STRING MgConfigProperties::RenderingServicePropertyMaxRenderImageWidth = L"MaxRenderImageWidth";
+const INT32 MgConfigProperties::DefaultRenderingServicePropertyMaxRenderImageWidth = 16384;
+const STRING MgConfigProperties::RenderingServicePropertyMaxRenderImageHeight = L"MaxRenderImageHeight";
+const INT32 MgConfigProperties::DefaultRenderingServicePropertyMaxRenderImageHeight = 16384;
+const STRING MgConfigProperties::RenderingServicePropertiesGlobalRasterStylizationLockEnabled = L"GlobalRasterStylizationLockEnabled";
+const bool MgConfigProperties::DefaultRenderingServicePropertiesGlobalRasterStylizationLockEnabled = true;
// ******************************************************************
// Font Alias Mappings section
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/ConfigProperties.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -410,14 +410,25 @@
static const bool DefaultRenderingServicePropertyGeneralizeData; /// value(false)
/// Sets the max width for raster image
- static const STRING RenderingServicePropertyMaxRasterImageWidth; /// value("MaxRasterImageWidth")
- static const INT32 DefaultRenderingServicePropertyMaxRasterImageWidth; /// value(2048)
+ static const STRING RenderingServicePropertyMaxRasterImageWidth; /// value("MaxRasterImageWidth")
+ static const INT32 DefaultRenderingServicePropertyMaxRasterImageWidth; /// value(2048)
/// Sets the max height for raster image
- static const STRING RenderingServicePropertyMaxRasterImageHeight; /// value("MaxRasterImageHeight")
- static const INT32 DefaultRenderingServicePropertyMaxRasterImageHeight; /// value(2048)
+ static const STRING RenderingServicePropertyMaxRasterImageHeight; /// value("MaxRasterImageHeight")
+ static const INT32 DefaultRenderingServicePropertyMaxRasterImageHeight; /// value(2048)
+ /// Sets the max allowed width for a map image rendering operation
+ static const STRING RenderingServicePropertyMaxRenderImageWidth; /// value("MaxRenderImageWidth")
+ static const INT32 DefaultRenderingServicePropertyMaxRenderImageWidth; /// value(16384)
+ /// Sets the max allowed width for a map image rendering operation
+ static const STRING RenderingServicePropertyMaxRenderImageHeight; /// value("MaxRenderImageHeight")
+ static const INT32 DefaultRenderingServicePropertyMaxRenderImageHeight; /// value(16384)
+
+ /// Sets the global raster stylization lock option
+ static const STRING RenderingServicePropertiesGlobalRasterStylizationLockEnabled; /// value("GlobalRasterStylizationLockEnabled")
+ static const bool DefaultRenderingServicePropertiesGlobalRasterStylizationLockEnabled; /// value(true)
+
/// FONT ALIASES SECTION -----------------------------------------------------------------------------
/// font alias mappings
Modified: sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -42,7 +42,7 @@
IOPrintLayoutElementCollection& operator=(const IOPrintLayoutElementCollection&);
PrintLayoutElementCollection* m_layoutElems;
- auto_ptr<PrintLayoutElement> m_currElem;
+ unique_ptr<PrintLayoutElement> m_currElem;
};
END_NAMESPACE_MDFPARSER
Modified: sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -42,7 +42,7 @@
IOPropertyMappingCollection& operator=(const IOPropertyMappingCollection&);
PropertyMappingCollection* m_propMappings;
- auto_ptr<PropertyMapping> m_currMapping;
+ unique_ptr<PropertyMapping> m_currMapping;
};
END_NAMESPACE_MDFPARSER
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerBase.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerBase.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerBase.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -625,7 +625,7 @@
MG_TRY()
- auto_ptr<MdfModel::LayerDefinition> ldf;
+ unique_ptr<MdfModel::LayerDefinition> ldf;
if(!m_forceReadFromServer && m_resourceContent != L"")
{
ldf.reset(MgLayerBase::GetLayerDefinition(m_resourceContent));
Modified: sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -61,7 +61,10 @@
, m_dfTopY(kmMAX_GM)
, m_dfTileDim0(2 * kmMAX_GM)
, m_parent(parent)
- { }
+ , m_nBuffer(0)
+ {
+ m_nBuffer = 5 * m_nExtent / 256;
+ }
~MVTImpl()
{
@@ -68,10 +71,38 @@
}
+ double GetMVTBuffer()
+ {
+ double dfTileDim = m_dfTileDim0 / (1 << m_tileZ);
+ double dfBuffer = dfTileDim * m_nBuffer / m_nExtent;
+ return dfBuffer;
+ }
+
+ void AddDebugTileBorder(LineBuffer* lb)
+ {
+ auto layer = std::make_shared<MVTTileLayer>();
+ layer->setName("MG_DEBUG_TILE_BORDER");
+ // In the past it appeared we were able to get away with not setting this information, but with recent client libraries like
+ // OpenLayers, this information is expected to be there, so set it.
+ layer->setVersion(2);
+ layer->setExtent(4096);
+ m_tile.addLayer(layer);
+
+ auto feature = std::make_shared<MVTTileLayerFeature>();
+ feature->setType(MVTTileLayerFeature::GeomType::POLYGON);
+
+ if (EncodePolygon(feature.get(), lb))
+ layer->addFeature(feature);
+ }
+
void SetActiveLayerBuilder(const std::string& name)
{
m_activeLayer = std::make_shared<MVTTileLayer>();
m_activeLayer->setName(name);
+ // In the past it appeared we were able to get away with not setting this information, but with recent client libraries like
+ // OpenLayers, this information is expected to be there, so set it.
+ m_activeLayer->setVersion(2);
+ m_activeLayer->setExtent(4096);
m_tile.addLayer(m_activeLayer);
}
@@ -493,6 +524,8 @@
double m_dfTopY;
double m_dfTileDim0;
+ unsigned int m_nBuffer;
+
unsigned int m_nExtent;
};
@@ -501,6 +534,7 @@
, m_mapInfo(nullptr)
, m_layerInfo(nullptr)
, m_fcInfo(nullptr)
+ , m_bRenderDebugTileBorders(false)
{
}
@@ -511,22 +545,24 @@
//Called by the stylizer when rendering is about to begin on the map
void MVTRenderer::StartMap(RS_MapUIInfo * /*mapInfo*/, RS_Bounds & extents, double mapScale, double dpi, double metersPerUnit, CSysTransformer * /*xformToLL*/)
{
+ double dfBuffer = m_impl->GetMVTBuffer();
+
m_mapScale = mapScale;
m_dpi = dpi;
m_metersPerUnit = metersPerUnit;
m_extents = extents;
- // find scale used to convert to pixel coordinates
- // need to take aspect ratios into account
- /*
- double arDisplay = (double)m_width / (double)m_height;
- double arMap = m_extents.width() / m_extents.height();
+ //Capture a copy of the original extents
+ m_origExtents.minx = extents.minx;
+ m_origExtents.miny = extents.miny;
+ m_origExtents.maxx = extents.maxx;
+ m_origExtents.maxy = extents.maxy;
- double scale;
- if (arDisplay > arMap)
- scale = (double)m_height / m_extents.height();
- else
- */
+ m_extents.minx -= dfBuffer;
+ m_extents.miny -= dfBuffer;
+ m_extents.maxx += dfBuffer;
+ m_extents.maxy += dfBuffer;
+
double wScale = (double)m_width / m_extents.width();
double hScale = (double)m_height / m_extents.height();
@@ -556,6 +592,18 @@
{
// clear the map info
m_mapInfo = nullptr;
+
+ if (m_bRenderDebugTileBorders)
+ {
+ LineBuffer lb(1);
+ lb.MoveTo(m_origExtents.minx, m_origExtents.miny);
+ lb.LineTo(m_origExtents.maxx, m_origExtents.miny);
+ lb.LineTo(m_origExtents.maxx, m_origExtents.maxy);
+ lb.LineTo(m_origExtents.minx, m_origExtents.maxy);
+ lb.Close();
+
+ m_impl->AddDebugTileBorder(&lb);
+ }
}
//Called by the stylizer when rendering is about to begin on the map for the given layer
@@ -593,20 +641,6 @@
auto workbuffer = lb->Optimize(m_drawingScale, m_pPool);
std::unique_ptr<LineBuffer> spLB(workbuffer);
- //Also clip the geometry to the extents if required as we do not want to encode
- //"out of tile" coordinates
- auto clipped = workbuffer->Clip(m_extents, LineBuffer::ctArea, m_pPool);
- if (workbuffer != clipped)
- {
- if (spLB.get())
- {
- LineBufferPool::FreeLineBuffer(m_pPool, spLB.release());
- }
-
- workbuffer = clipped;
- spLB.reset(workbuffer);
- }
-
if (workbuffer)
m_impl->ProcessPolygon(m_activeFeature, workbuffer);
@@ -621,20 +655,6 @@
auto workbuffer = lb->Optimize(m_drawingScale, m_pPool);
std::unique_ptr<LineBuffer> spLB(workbuffer);
- //Also clip the geometry to the extents if required as we do not want to encode
- //"out of tile" coordinates
- auto clipped = workbuffer->Clip(m_extents, LineBuffer::ctLine, m_pPool);
- if (workbuffer != clipped)
- {
- if (spLB.get())
- {
- LineBufferPool::FreeLineBuffer(m_pPool, spLB.release());
- }
-
- workbuffer = clipped;
- spLB.reset(workbuffer);
- }
-
if (workbuffer)
m_impl->ProcessPolyline(m_activeFeature, workbuffer);
@@ -658,20 +678,6 @@
auto workbuffer = lb->Optimize(m_drawingScale, m_pPool);
std::unique_ptr<LineBuffer> spLB(workbuffer);
- //Also clip the geometry to the extents if required as we do not want to encode
- //"out of tile" coordinates
- auto clipped = workbuffer->Clip(m_extents, LineBuffer::ctPoint, m_pPool);
- if (workbuffer != clipped)
- {
- if (spLB.get())
- {
- LineBufferPool::FreeLineBuffer(m_pPool, spLB.release());
- }
-
- workbuffer = clipped;
- spLB.reset(workbuffer);
- }
-
if (workbuffer)
m_impl->ProcessMarker(m_activeFeature, workbuffer);
@@ -745,7 +751,7 @@
bool MVTRenderer::RequiresClipping()
{
- return false;
+ return true;
}
bool MVTRenderer::RequiresLabelClipping()
Modified: sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Common/Renderers/MVTRenderer.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -96,11 +96,14 @@
int m_width;
int m_height;
+ RS_Bounds m_origExtents;
RS_Bounds m_extents;
double m_drawingScale;
double m_metersPerUnit;
double m_dpi;
double m_mapScale;
+
+ bool m_bRenderDebugTileBorders;
};
#endif
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Doc/samples/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/CMakeLists.txt 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/CMakeLists.txt 2021-07-16 09:04:49 UTC (rev 9864)
@@ -1,5 +1,5 @@
install(FILES samples.php DESTINATION ${MG_WWWROOT})
install(
- DIRECTORY javasamples javaviewersample ol2samples phpsamples phpviewersample
+ DIRECTORY javasamples javaviewersample clientsamples phpsamples phpviewersample
DESTINATION ${MG_WWWROOT}
)
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Doc/samples/javasamples/hello_map/display_spatial_reference.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javasamples/hello_map/display_spatial_reference.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javasamples/hello_map/display_spatial_reference.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -42,7 +42,7 @@
// --------------------------------------------------//
// Basic initialization needs to be done every time.
- MapGuideJavaApi.MgInitializeWebTier(webconfigFilePath);
+ MapGuideJavaApiEx.MgInitializeWebTier(webconfigFilePath);
// Get the user information using the session id,
// and set up a connection to the site server.
@@ -49,7 +49,7 @@
MgUserInformation userInfo = new MgUserInformation(sessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
// Finished basic initialization.
// --------------------------------------------------//
@@ -57,12 +57,12 @@
// Query the spatial reference system used for the map.
MgMap map = new MgMap(siteConnection);
- map.Open(mapName);
- String srs = map.GetMapSRS();
+ map.open(mapName);
+ String srs = map.getMapSRS();
// Format it and display it in the task pane.
- out.println("<p>Map <strong>" + map.GetName() + "</strong> uses this reference system: </p>");
+ out.println("<p>Map <strong>" + map.getName() + "</strong> uses this reference system: </p>");
Integer lineLength = 30;
out.println("<pre style=\"padding: 2px; border: 1px solid black; background-color: #eee\">");
while (srs.length() > lineLength)
@@ -76,7 +76,7 @@
catch (MgException e)
{
out.println("<p><strong>Error:</strong> ");
- out.println(e.GetDetails());
+ out.println(e.getDetails());
out.println("</p>");
}
%>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/layer_visibility.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/layer_visibility.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/layer_visibility.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -39,7 +39,7 @@
try
{
- MapGuideJavaApi.MgInitializeWebTier(webconfigFilePath);
+ MapGuideJavaApiEx.MgInitializeWebTier(webconfigFilePath);
// Get the user information using the session id,
// and set up a connection to the site server.
@@ -46,21 +46,21 @@
MgUserInformation userInfo = new MgUserInformation(sessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
MgMap map = new MgMap(siteConnection);
- map.Open(mapName);
+ map.open(mapName);
- MgLayerCollection layers = map.GetLayers(); // Get layer collection
+ MgLayerCollection layers = map.getLayers(); // Get layer collection
out.println("<p>Layers, in draw order:</p>");
out.println("<table class=\"taskPane\" cellspacing=\"0\">");
- out.println("<tr><th class=\"rowHead\">Layer</th><th>GetVisible()</th><th>IsVisible()</th></tr>");
- Integer count = layers.GetCount();
+ out.println("<tr><th class=\"rowHead\">Layer</th><th>getVisible()</th><th>isVisible()</th></tr>");
+ Integer count = layers.getCount();
for (Integer i = 0; i < count; i++)
{
- MgLayer layer = (MgLayer) layers.GetItem(i);
- out.println("<tr><td class=\"rowHead\">" + layer.GetName() +
- "</td><td>" + (layer.GetVisible() ? "on" : "off") + "</td><td>" + (layer.IsVisible() ? "on" : "off") + "</td></tr>\n");
+ MgLayer layer = (MgLayer) layers.getItem(i);
+ out.println("<tr><td class=\"rowHead\">" + layer.getName() +
+ "</td><td>" + (layer.getVisible() ? "on" : "off") + "</td><td>" + (layer.isVisible() ? "on" : "off") + "</td></tr>\n");
}
out.println("</table>");
}
@@ -67,12 +67,12 @@
catch (MgException e)
{
out.println("<p><strong>Error:</strong> ");
- out.println(e.GetDetails());
+ out.println(e.getDetails());
out.println("</p>");
}
%>
- <p><code>GetVisible()</code> returns the state of the visibility flag for a given layer (the check box in the
- Layers pane). <code>IsVisible()</code> returns the actual visibility of a layer, based on its visibility flag,
+ <p><code>getVisible()</code> returns the state of the visibility flag for a given layer (the check box in the
+ Layers pane). <code>isVisible()</code> returns the actual visibility of a layer, based on its visibility flag,
the visibility flag of any groups that include the layer, and whether the layer has a defined style for the
current view scale.</p>
</body>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/toggle_roads_label.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/toggle_roads_label.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javasamples/interacting_with_layers/toggle_roads_label.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -51,7 +51,7 @@
// the Web Extensions session identifier stored in PHP
// session state.
- MapGuideJavaApi.MgInitializeWebTier(webconfigFilePath);
+ MapGuideJavaApiEx.MgInitializeWebTier(webconfigFilePath);
// Get the user information using the session id,
// and set up a connection to the site server.
@@ -58,15 +58,15 @@
MgUserInformation userInfo = new MgUserInformation(sessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
MgMap map = new MgMap(siteConnection);
- map.Open(mapName);
+ map.open(mapName);
- MgLayerCollection layers = map.GetLayers(); // Get layer collection
+ MgLayerCollection layers = map.getLayers(); // Get layer collection
- MgLayer roadLayer = (MgLayer) layers.GetItem("Roads");
- String roadLabel = roadLayer.GetLegendLabel();
+ MgLayer roadLayer = (MgLayer) layers.getItem("Roads");
+ String roadLabel = roadLayer.getLegendLabel();
String newLabel;
if (roadLabel.equals("Roads"))
newLabel = "Streets";
@@ -73,12 +73,12 @@
else
newLabel = "Roads";
- roadLayer.SetLegendLabel(newLabel);
+ roadLayer.setLegendLabel(newLabel);
// You must save the updated map or the
// changes will not be applied
// Also be sure to refresh the map on page load.
- map.Save();
+ map.save();
out.println("<p>Layer label has been changed to " + newLabel + ".</p>");
@@ -96,8 +96,8 @@
}
catch (MgException e)
{
- out.println(e.GetExceptionMessage());
- out.println(e.GetDetails());
+ out.println(e.getExceptionMessage());
+ out.println(e.getDetails());
}
%>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javasamples/main.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javasamples/main.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javasamples/main.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -30,36 +30,36 @@
// Initialize web tier with the site configuration file. The config
// file should be in the same folder as this script.
String configPath = realpath + "webconfig.ini";
- MapGuideJavaApi.MgInitializeWebTier( configPath );
+ MapGuideJavaApiEx.MgInitializeWebTier( configPath );
MgUserInformation userInfo = new MgUserInformation("Author", "author");
MgSite site = new MgSite();
- site.Open(userInfo);
+ site.open(userInfo);
- String sessionId = site.CreateSession();
+ String sessionId = site.createSession();
String title = "JSP Samples";
String webLayout = "Library://Samples/Layouts/JavaSamples.WebLayout";
MgSiteConnection siteConn = new MgSiteConnection();
- siteConn.Open(userInfo);
+ siteConn.open(userInfo);
// We check for the existence of the specified WebLayout
//
// If it doesn't exist, we load a copy from the WebLayout.xml on disk. This is a basic example
// of programmatically loading resource content into to the repository.
- MgResourceService resSvc = (MgResourceService)siteConn.CreateService(MgServiceType.ResourceService);
+ MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
MgResourceIdentifier wlResId = new MgResourceIdentifier(webLayout);
- if (!resSvc.ResourceExists(wlResId)) {
+ if (!resSvc.resourceExists(wlResId)) {
String xmlPath = realpath + File.separator + "/javasamples/WebLayout.xml";
MgByteSource wlByteSource = new MgByteSource(xmlPath);
- MgByteReader wlByteReader = wlByteSource.GetReader();
+ MgByteReader wlByteReader = wlByteSource.getReader();
// NOTE: The Author account generally has write access into the site repository
// which is why we're doing it like this.
// If this was an Anonymous user, they can't write into the session repository. We would normally
// load our content into a session-based repository and modify $webLayout to point to our
// session loaded resource
- resSvc.SetResource(wlResId, wlByteReader, null);
+ resSvc.setResource(wlResId, wlByteReader, null);
}
%>
<html>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxtiledviewersample.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxtiledviewersample.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxtiledviewersample.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -33,9 +33,9 @@
MgUserInformation userInfo = new MgUserInformation("Anonymous", "");
MgSite site = new MgSite();
- site.Open(userInfo);
+ site.open(userInfo);
- String sessionId = site.CreateSession();
+ String sessionId = site.createSession();
String webLayout = "Library://Samples/Sheboygan/Layouts/SheboyganJspTiled.WebLayout";
%>
<html>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxviewersample.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxviewersample.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/ajaxviewersample.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -33,9 +33,9 @@
MgUserInformation userInfo = new MgUserInformation("Anonymous", "");
MgSite site = new MgSite();
- site.Open(userInfo);
+ site.open(userInfo);
- String sessionId = site.CreateSession();
+ String sessionId = site.createSession();
String webLayout = "Library://Samples/Sheboygan/Layouts/SheboyganJsp.WebLayout";
%>
<html>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/dwfviewersample.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/dwfviewersample.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/dwfviewersample.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -33,9 +33,9 @@
MgUserInformation userInfo = new MgUserInformation("Anonymous", "");
MgSite site = new MgSite();
- site.Open(userInfo);
+ site.open(userInfo);
- String sessionId = site.CreateSession();
+ String sessionId = site.createSession();
String webLayout = "Library://Samples/Sheboygan/Layouts/SheboyganJsp.WebLayout";
%>
<html>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddress.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddress.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddress.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -59,7 +59,7 @@
MgUserInformation userInfo = new MgUserInformation(mgSessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
String address = request.getParameter("address") + ", Sheboygan, WI";
@@ -81,11 +81,11 @@
// the ResourceService object to open the map instance in
// session state.
- MgResourceService resourceService = (MgResourceService)siteConnection.CreateService(MgServiceType.ResourceService);
- MgFeatureService featureService = (MgFeatureService)siteConnection.CreateService(MgServiceType.FeatureService);
+ MgResourceService resourceService = (MgResourceService)siteConnection.createService(MgServiceType.ResourceService);
+ MgFeatureService featureService = (MgFeatureService)siteConnection.createService(MgServiceType.FeatureService);
MgMap map = new MgMap(siteConnection);
- map.Open("Sheboygan");
+ map.open("Sheboygan");
// Check the map for the AddressMarker layer. If it does not
// exist then create a feature source to store address results
@@ -98,9 +98,9 @@
CreateAddressMarkerFeatureSource(featureService, addressMarkerDataResId);
addressLayer = CreateAddressMarkerLayer(resourceService, addressMarkerDataResId, mgSessionId);
- map.GetLayers().Insert(0, addressLayer);
+ map.getLayers().insert(0, addressLayer);
}
- else if (addressLayer.GetVisible())
+ else if (addressLayer.getVisible())
{
// If the layer exists and is visible, then display the
// previous results.
@@ -114,21 +114,21 @@
MgAgfReaderWriter geometryReaderWriter = new MgAgfReaderWriter();
MgGeometryFactory geometryFactory = new MgGeometryFactory();
- MgPoint addrPoint = geometryFactory.CreatePoint(geometryFactory.CreateCoordinateXY(Double.parseDouble(addr.lon), Double.parseDouble(addr.lat)));
+ MgPoint addrPoint = geometryFactory.createPoint(geometryFactory.createCoordinateXY(Double.parseDouble(addr.lon), Double.parseDouble(addr.lat)));
MgPropertyCollection properties = new MgPropertyCollection();
- properties.Add(new MgStringProperty("Address", addr.address1));
- properties.Add(new MgGeometryProperty("Location", geometryReaderWriter.Write(addrPoint)));
+ properties.add(new MgStringProperty("Address", addr.address1));
+ properties.add(new MgGeometryProperty("Location", geometryReaderWriter.write(addrPoint)));
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(new MgInsertFeatures("AddressMarker", properties));
+ commands.add(new MgInsertFeatures("AddressMarker", properties));
- featureService.UpdateFeatures(addressMarkerDataResId, commands, false);
+ featureService.updateFeatures(addressMarkerDataResId, commands, false);
- addressLayer.SetVisible(true);
- addressLayer.ForceRefresh();
+ addressLayer.setVisible(true);
+ addressLayer.forceRefresh();
- map.Save();
+ map.save();
success = true;
}
@@ -139,9 +139,9 @@
}
catch (MgException e)
{
- out.write("<tr><td>" + e.GetExceptionMessage()+ "</td></tr>");
+ out.write("<tr><td>" + e.getExceptionMessage()+ "</td></tr>");
out.write("<tr><td class=\"Spacer\"></td></tr>");
- out.write("<tr><td>" + e.GetDetails() + "</td></tr>");
+ out.write("<tr><td>" + e.getDetails() + "</td></tr>");
}
%>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressfunctions.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -48,22 +48,22 @@
out.write("<tr><td class=\"SubTitle\">Previous Results</td></tr>");
MgAgfReaderWriter geometryReaderWriter = new MgAgfReaderWriter();
- MgFeatureReader featureReader = (MgFeatureReader)featureService.SelectFeatures(addressMarkerDataResId, "AddressMarker", null);
+ MgFeatureReader featureReader = (MgFeatureReader)featureService.selectFeatures(addressMarkerDataResId, "AddressMarker", null);
- while (featureReader.ReadNext())
+ while (featureReader.readNext())
{
- String address = featureReader.GetString("Address");
- MgByteReader byteReader = featureReader.GetGeometry("Location");
+ String address = featureReader.getString("Address");
+ MgByteReader byteReader = featureReader.getGeometry("Location");
- MgPoint point = (MgPoint)geometryReaderWriter.Read(byteReader);
- double x = point.GetCoordinate().GetX();
- double y = point.GetCoordinate().GetY();
+ MgPoint point = (MgPoint)geometryReaderWriter.read(byteReader);
+ double x = point.getCoordinate().getX();
+ double y = point.getCoordinate().getY();
out.write("<tr><td>");
out.write("<img src=\"../images/pushpinblue.jpg\">");
out.write("<a href=\"gotopoint.jsp?X=" + x + "&Y=" + y + "&Scale=2000\" target=\"scriptFrame\"> " + address + "</a></td></tr>");
}
- featureReader.Close();
+ featureReader.close();
out.write("</table>");
out.write("<form action=\"clearaddressresults.jsp\" method=\"get\" target=\"scriptFrame\">");
@@ -80,41 +80,41 @@
String ll84Wkt = "GEOGCS[\"WGS84 Lat/Long's, Degrees, -180 ==> +180\",DATUM[\"D_WGS_1984]\",SPHEROID[\"World_Geodetic_System_of_1984\",6378137,298.257222932867]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]]";
MgClassDefinition addressClass = new MgClassDefinition();
- addressClass.SetName("AddressMarker");
- MgPropertyDefinitionCollection properties = addressClass.GetProperties();
+ addressClass.setName("AddressMarker");
+ MgPropertyDefinitionCollection properties = addressClass.getProperties();
MgDataPropertyDefinition idProperty = new MgDataPropertyDefinition("ID");
- idProperty.SetDataType(MgPropertyType.Int32);
- idProperty.SetReadOnly(true);
- idProperty.SetNullable(false);
- idProperty.SetAutoGeneration(true);
- properties.Add(idProperty);
+ idProperty.setDataType(MgPropertyType.Int32);
+ idProperty.setReadOnly(true);
+ idProperty.setNullable(false);
+ idProperty.setAutoGeneration(true);
+ properties.add(idProperty);
MgDataPropertyDefinition addressProperty = new MgDataPropertyDefinition("Address");
- addressProperty.SetDataType(MgPropertyType.String);
- addressProperty.SetLength(512);
- properties.Add(addressProperty);
+ addressProperty.setDataType(MgPropertyType.String);
+ addressProperty.setLength(512);
+ properties.add(addressProperty);
MgGeometricPropertyDefinition locationProperty = new MgGeometricPropertyDefinition("Location");
- locationProperty.SetGeometryTypes(MgGeometryType.Point);
- locationProperty.SetHasElevation(false);
- locationProperty.SetHasMeasure(false);
- locationProperty.SetReadOnly(false);
- locationProperty.SetSpatialContextAssociation("LL84");
- properties.Add(locationProperty);
+ locationProperty.setGeometryTypes(MgGeometryType.Point);
+ locationProperty.setHasElevation(false);
+ locationProperty.setHasMeasure(false);
+ locationProperty.setReadOnly(false);
+ locationProperty.setSpatialContextAssociation("LL84");
+ properties.add(locationProperty);
- MgPropertyDefinitionCollection idProperties = addressClass.GetIdentityProperties();
- idProperties.Add(idProperty);
+ MgPropertyDefinitionCollection idProperties = addressClass.getIdentityProperties();
+ idProperties.add(idProperty);
- addressClass.SetDefaultGeometryPropertyName("Location");
+ addressClass.setDefaultGeometryPropertyName("Location");
MgFeatureSchema addressSchema = new MgFeatureSchema();
- addressSchema.SetName("AddressMarkerSchema");
- addressSchema.GetClasses().Add(addressClass);
+ addressSchema.setName("AddressMarkerSchema");
+ addressSchema.getClasses().add(addressClass);
MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LL84", ll84Wkt, addressSchema);
- featureService.CreateFeatureSource(addressMarkerDataResId, sdfParams);
+ featureService.createFeatureSource(addressMarkerDataResId, sdfParams);
}
// Create a temporary Layer to display geocode results.
@@ -131,7 +131,7 @@
Document document = builder.parse(new File(getServletContext().getRealPath("/") + "javaviewersample//findaddress//templates" + File.separator + "addressmarker.xml"));
NodeList nodes = document.getElementsByTagName("ResourceId");
Node resNode = nodes.item(0);
- Node resContent = document.createTextNode(addressMarkerDataResId.ToString());
+ Node resContent = document.createTextNode(addressMarkerDataResId.toString());
resNode.appendChild(resContent);
// write the modified layer XML definition into a byte stream
@@ -148,20 +148,20 @@
byte[] layerDefinition = bos.toByteArray();
MgByteSource byteSource = new MgByteSource(layerDefinition, layerDefinition.length);
- byteSource.SetMimeType(MgMimeType.Xml);
+ byteSource.setMimeType(MgMimeType.Xml);
MgResourceIdentifier tempLayerResId = new MgResourceIdentifier("Session:" + sessionId + "//AddressMarker.LayerDefinition");
- resourceService.SetResource(tempLayerResId, byteSource.GetReader(), null);
+ resourceService.setResource(tempLayerResId, byteSource.getReader(), null);
// Create an MgLayer object based on the new layer definition
// and return it to the caller.
MgLayer addressLayer = new MgLayer(tempLayerResId, resourceService);
- addressLayer.SetName("AddressMarker");
- addressLayer.SetLegendLabel("AddressMarker");
- addressLayer.SetDisplayInLegend(false);
- addressLayer.SetSelectable(false);
+ addressLayer.setName("AddressMarker");
+ addressLayer.setLegendLabel("AddressMarker");
+ addressLayer.setDisplayInLegend(false);
+ addressLayer.setSelectable(false);
return addressLayer;
}
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressmain.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressmain.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/findaddress/findaddressmain.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -60,7 +60,7 @@
MgUserInformation userInfo = new MgUserInformation(mgSessionId);
siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
// Create a ReserviceService object and use it to open the Map
// object from the sessions repository. Use the Map object to
@@ -67,18 +67,18 @@
// determine if the "AddressMarker" layer is visible.
MgMap map = new MgMap(siteConnection);
- map.Open("Sheboygan");
+ map.open("Sheboygan");
MgLayer addressLayer = GetLayerByName(map, "AddressMarker");
if (addressLayer != null)
{
- showPreviousResults = addressLayer.GetVisible();
+ showPreviousResults = addressLayer.getVisible();
}
}
catch (MgException e)
{
- out.write(e.GetExceptionMessage());
- out.write(e.GetDetails());
+ out.write(e.getExceptionMessage());
+ out.write(e.getDetails());
}
%>
@@ -114,7 +114,7 @@
if (showPreviousResults)
{
- MgFeatureService featureService = (MgFeatureService)siteConnection.CreateService(MgServiceType.FeatureService);
+ MgFeatureService featureService = (MgFeatureService)siteConnection.createService(MgServiceType.FeatureService);
MgResourceIdentifier addressMarkerDataResId = new MgResourceIdentifier("Session:" + mgSessionId + "//AddressMarker.FeatureSource");
EmitAddressResults(out, featureService, addressMarkerDataResId, mgSessionId);
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plot.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plot.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plot.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -37,10 +37,10 @@
MgUserInformation userInfo = new MgUserInformation(mgSessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
MgMap map = new MgMap(siteConnection);
- map.Open("Sheboygan");
+ map.open("Sheboygan");
// Now create an instance of MappingService and use it to plot the
// current view of the map.
@@ -47,9 +47,9 @@
MgDwfVersion dwfVersion = new MgDwfVersion("6.01", "1.2");
MgPlotSpecification plotSpec = new MgPlotSpecification(8.5f, 11.0f, MgPageUnitsType.Inches, 0f, 0f, 0f, 0f);
- plotSpec.SetMargins(0.5f, 0.5f, 0.5f, 0.5f);
+ plotSpec.setMargins(0.5f, 0.5f, 0.5f, 0.5f);
- MgMappingService mappingService = (MgMappingService)siteConnection.CreateService(MgServiceType.MappingService);
+ MgMappingService mappingService = (MgMappingService)siteConnection.createService(MgServiceType.MappingService);
MgLayout layout = null;
String useLayout = request.getParameter("UseLayout");
@@ -63,12 +63,12 @@
MgByteReader byteReader = null;
if (scale <= 0)
{
- byteReader = mappingService.GeneratePlot(map, plotSpec, layout, dwfVersion);
+ byteReader = mappingService.generatePlot(map, plotSpec, layout, dwfVersion);
}
else
{
- MgCoordinate mapCenter = map.GetViewCenter().GetCoordinate();
- byteReader = mappingService.GeneratePlot(map, mapCenter, scale, plotSpec, layout, dwfVersion);
+ MgCoordinate mapCenter = map.getViewCenter().getCoordinate();
+ byteReader = mappingService.generatePlot(map, mapCenter, scale, plotSpec, layout, dwfVersion);
}
// Now output the resulting DWF.
@@ -77,7 +77,7 @@
}
catch (MgException e)
{
- String result = e.GetExceptionMessage() + "<br><br>" + e.GetDetails();
+ String result = e.getExceptionMessage() + "<br><br>" + e.getDetails();
response.setContentType("text/html");
response.setContentLength(result.length());
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plotmain.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plotmain.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/plot/plotmain.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -88,7 +88,7 @@
MgUserInformation userInfo = new MgUserInformation(mgSessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
+ siteConnection.open(userInfo);
// Create a ResourcService object and use it to open the Map
// object from the sessions repository. Use the Map object to
@@ -96,15 +96,15 @@
// page.
MgMap map = new MgMap(siteConnection);
- map.Open("Sheboygan");
+ map.open("Sheboygan");
- viewCenter = map.GetViewCenter();
- viewScale = map.GetViewScale();
+ viewCenter = map.getViewCenter();
+ viewScale = map.getViewScale();
}
catch (MgException e)
{
- out.write(e.GetExceptionMessage());
- out.write(e.GetDetails());
+ out.write(e.getExceptionMessage());
+ out.write(e.getDetails());
return;
}
%>
@@ -118,8 +118,8 @@
<table class="RegText" border="0" cellspacing="0" width="100%">
<tr><td class="Title"> Plot as DWF<hr></td></tr>
<tr><td class="SubTitle">Plot a View of the Map</td></tr>
- <tr><td>View Center X: <%= nf.format(viewCenter.GetCoordinate().GetX()) %></td></tr>
- <tr><td>View Center Y: <%= nf.format(viewCenter.GetCoordinate().GetY()) %></td></tr>
+ <tr><td>View Center X: <%= nf.format(viewCenter.getCoordinate().getX()) %></td></tr>
+ <tr><td>View Center Y: <%= nf.format(viewCenter.getCoordinate().getY()) %></td></tr>
<tr><td class=\"Spacer\"></td></tr>
<tr><td class=\"Spacer\"></td></tr>
<tr><td>View Scale: 1:<%= nf.format((int)viewScale) %><hr></td></tr>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/feature.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/feature.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/feature.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -34,8 +34,8 @@
this.displayValue = displayValue;
if (centerPoint != null)
{
- this.centerX = centerPoint.GetCoordinate().GetX();
- this.centerY = centerPoint.GetCoordinate().GetY();
+ this.centerX = centerPoint.getCoordinate().getX();
+ this.centerY = centerPoint.getCoordinate().getY();
}
this.idList = new HashMap(idList);
}
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/query.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/query.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/classes/query.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -38,7 +38,7 @@
{
this.args = incomingArgs;
this.site = new MgSiteConnection();
- this.site.Open(new MgUserInformation(this.args.get("SESSION")));
+ this.site.open(new MgUserInformation(this.args.get("SESSION")));
this.numOperators = new String[] {"Equal to", "Not equal to", "Greater than", "Greater than or equal to", "Less than", "Less than or equal to"};
this.numExpressions = new String[] {" = %s", " != %s", " > %s", " >= %s", " < %s", " <= %s"};
this.strOperators = new String[] {"Begins with", "Contains", "Equal to"};
@@ -65,21 +65,21 @@
return jsonArray.toString();
}
- public ArrayList<String> GetMapLayerNames() throws MgException
+ public ArrayList<String> getMapLayerNames() throws MgException
{
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayerCollection layers = map.GetLayers();
+ map.open(this.args.get("MAPNAME"));
+ MgLayerCollection layers = map.getLayers();
ArrayList<String> layerNames = new ArrayList<String>();
- for(int i=0; i<layers.GetCount(); i++)
+ for(int i=0; i<layers.getCount(); i++)
{
- MgLayer layer = (MgLayer) layers.GetItem(i);
+ MgLayer layer = (MgLayer) layers.getItem(i);
//TODO: Exclue Raster and Drawing Layers???
- if(!layer.GetName().startsWith("_") && !layer.GetFeatureSourceId().toUpperCase().startsWith("SESSION"))
- layerNames.add(layer.GetLegendLabel());
+ if(!layer.getName().startsWith("_") && !layer.getFeatureSourceId().toUpperCase().startsWith("SESSION"))
+ layerNames.add(layer.getLegendLabel());
}
Collections.sort(layerNames);
@@ -86,26 +86,26 @@
return layerNames;
}
- public ArrayList<Property> GetLayerProperties() throws MgException
+ public ArrayList<Property> getLayerProperties() throws MgException
{
ArrayList<Property> properties = new ArrayList<Property>();
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
+ map.open(this.args.get("MAPNAME"));
+ MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
- MgClassDefinition classDef = layer.GetClassDefinition();
+ MgClassDefinition classDef = layer.getClassDefinition();
- for(int i=0; i<classDef.GetProperties().GetCount(); i++)
+ for(int i=0; i<classDef.getProperties().getCount(); i++)
{
- MgPropertyDefinition propertyDef = classDef.GetProperties().GetItem(i);
+ MgPropertyDefinition propertyDef = classDef.getProperties().getItem(i);
- if(propertyDef.GetPropertyType() == MgFeaturePropertyType.DataProperty)
+ if(propertyDef.getPropertyType() == MgFeaturePropertyType.DataProperty)
{
MgDataPropertyDefinition propertyDataDef = (MgDataPropertyDefinition) propertyDef;
- int dataType = propertyDataDef.GetDataType();
- if(this.IsValidDataType(dataType))
+ int dataType = propertyDataDef.getDataType();
+ if(this.isValidDataType(dataType))
{
- properties.add(new Property(propertyDataDef.GetName(), dataType == MgPropertyType.String));
+ properties.add(new Property(propertyDataDef.getName(), dataType == MgPropertyType.String));
}
}
}
@@ -112,54 +112,54 @@
return properties;
}
- public boolean ToggleSpatialFilter() throws MgException
+ public boolean toggleSpatialFilter() throws MgException
{
boolean result = true;
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
+ map.open(this.args.get("MAPNAME"));
- MgLayerCollection layers = map.GetLayers();
- if(layers.Contains("_QuerySpatialFilter"))
+ MgLayerCollection layers = map.getLayers();
+ if(layers.contains("_QuerySpatialFilter"))
{
- MgLayer layer = (MgLayer) layers.GetItem("_QuerySpatialFilter");
+ MgLayer layer = (MgLayer) layers.getItem("_QuerySpatialFilter");
if(this.args.get("VISIBLE").equals("true"))
- layer.SetVisible(true);
+ layer.setVisible(true);
else
- layer.SetVisible(false);
+ layer.setVisible(false);
- map.Save();
+ map.save();
}
return result;
}
- public boolean ShowSpatialFilter() throws MgException, FileNotFoundException, IOException
+ public boolean showSpatialFilter() throws MgException, FileNotFoundException, IOException
{
boolean result = true;
MgResourceIdentifier sdfResId = new MgResourceIdentifier("Session:"+this.args.get("SESSION")+"//Filter.FeatureSource");
- MgResourceService resourceService = (MgResourceService)this.site.CreateService(MgServiceType.ResourceService);
- MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
+ MgResourceService resourceService = (MgResourceService)this.site.createService(MgServiceType.ResourceService);
+ MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
MgFeatureCommandCollection updateCommands = new MgFeatureCommandCollection();
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
+ map.open(this.args.get("MAPNAME"));
MgLayer layer = null;
- MgLayerCollection layers = map.GetLayers();
- if(layers.Contains("_QuerySpatialFilter"))
+ MgLayerCollection layers = map.getLayers();
+ if(layers.contains("_QuerySpatialFilter"))
{
- layer = (MgLayer) layers.GetItem("_QuerySpatialFilter");
- updateCommands.Add(new MgDeleteFeatures("Filter", "ID like '%'"));
+ layer = (MgLayer) layers.getItem("_QuerySpatialFilter");
+ updateCommands.add(new MgDeleteFeatures("Filter", "ID like '%'"));
}
else
{
// Create the Feature Source (SDF)
- MgFeatureSchema sdfSchema = this.CreateFilterSchema();
- MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "MAPCS", map.GetMapSRS(), sdfSchema);
- featureService.CreateFeatureSource(sdfResId, sdfParams);
+ MgFeatureSchema sdfSchema = this.createFilterSchema();
+ MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "MAPCS", map.getMapSRS(), sdfSchema);
+ featureService.createFeatureSource(sdfResId, sdfParams);
// Create the Layer
@@ -175,76 +175,76 @@
strBuffer.append(lineSep);
}
String layerDefinition = strBuffer.toString();
- layerDefinition = layerDefinition.replaceAll("%s", sdfResId.ToString());
+ layerDefinition = layerDefinition.replaceAll("%s", sdfResId.toString());
MgByteSource byteSource = new MgByteSource(layerDefinition.getBytes(), layerDefinition.length());
- resourceService.SetResource(layerResId, byteSource.GetReader(), null);
+ resourceService.setResource(layerResId, byteSource.getReader(), null);
layer = new MgLayer(layerResId, resourceService);
- layer.SetName("_QuerySpatialFilter");
- layer.SetLegendLabel("_QuerySpatialFilter");
- layer.SetDisplayInLegend(false);
- layer.SetSelectable(false);
+ layer.setName("_QuerySpatialFilter");
+ layer.setLegendLabel("_QuerySpatialFilter");
+ layer.setDisplayInLegend(false);
+ layer.setSelectable(false);
- layers.Insert(0, layer);
+ layers.insert(0, layer);
}
// Make the layer visible
- layer.SetVisible(true);
- map.Save();
+ layer.setVisible(true);
+ map.save();
// Add the geometry to the filter feature source
- MgPolygon polygon = this.CreatePolygonFromGeomText(this.args.get("GEOMTEXT"));
+ MgPolygon polygon = this.createPolygonFromGeomText(this.args.get("GEOMTEXT"));
MgAgfReaderWriter agfWriter = new MgAgfReaderWriter();
- MgByteReader byteReader = agfWriter.Write(polygon);
+ MgByteReader byteReader = agfWriter.write(polygon);
MgPropertyCollection propertyValues = new MgPropertyCollection();
- propertyValues.Add(new MgGeometryProperty("Geometry", byteReader));
+ propertyValues.add(new MgGeometryProperty("Geometry", byteReader));
- updateCommands.Add(new MgInsertFeatures("Filter", propertyValues));
+ updateCommands.add(new MgInsertFeatures("Filter", propertyValues));
- featureService.UpdateFeatures(sdfResId, updateCommands, false);
+ featureService.updateFeatures(sdfResId, updateCommands, false);
return result;
}
- public ArrayList<Feature> Execute() throws MgException
+ public ArrayList<Feature> execute() throws MgException
{
ArrayList<Feature> result = new ArrayList<Feature>();
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
+ map.open(this.args.get("MAPNAME"));
+ MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
- MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
- MgResourceIdentifier resId = new MgResourceIdentifier(layer.GetFeatureSourceId());
- String featureGeometry = layer.GetFeatureGeometryName();
+ MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
+ MgResourceIdentifier resId = new MgResourceIdentifier(layer.getFeatureSourceId());
+ String featureGeometry = layer.getFeatureGeometryName();
// Initialize the coordinate system transform
- MgClassDefinition classDef = layer.GetClassDefinition();
- MgGeometricPropertyDefinition geomProp = (MgGeometricPropertyDefinition) classDef.GetProperties().GetItem(featureGeometry);
- String spatialContext = geomProp.GetSpatialContextAssociation();
+ MgClassDefinition classDef = layer.getClassDefinition();
+ MgGeometricPropertyDefinition geomProp = (MgGeometricPropertyDefinition) classDef.getProperties().getItem(featureGeometry);
+ String spatialContext = geomProp.getSpatialContextAssociation();
MgCoordinateSystemTransform csTransform = null;
MgCoordinateSystemTransform csInverseTransform = null;
MgCoordinateSystemFactory coordSysFactory = new MgCoordinateSystemFactory();
- MgSpatialContextReader scReader = featureService.GetSpatialContexts(resId, false);
- while(scReader.ReadNext() && csTransform==null)
+ MgSpatialContextReader scReader = featureService.getSpatialContexts(resId, false);
+ while(scReader.readNext() && csTransform==null)
{
- if(spatialContext.equals(scReader.GetName()))
+ if(spatialContext.equals(scReader.getName()))
{
- MgCoordinateSystem source = coordSysFactory.Create(scReader.GetCoordinateSystemWkt());
- MgCoordinateSystem target = coordSysFactory.Create(map.GetMapSRS());
- csTransform = coordSysFactory.GetTransform(source, target);
- csInverseTransform = coordSysFactory.GetTransform(target, source);
+ MgCoordinateSystem source = coordSysFactory.create(scReader.getCoordinateSystemWkt());
+ MgCoordinateSystem target = coordSysFactory.create(map.getMapSRS());
+ csTransform = coordSysFactory.getTransform(source, target);
+ csInverseTransform = coordSysFactory.getTransform(target, source);
}
}
- scReader.Close();
+ scReader.close();
// Execute the query
@@ -264,29 +264,29 @@
{
propertyFilter = propertyFilter + this.numExpressions[operator].replaceAll("%s", this.args.get("VALUE"));
}
- queryOptions.SetFilter(propertyFilter);
+ queryOptions.setFilter(propertyFilter);
}
if(this.args.get("USESPATIALFILTER").equals("true"))
{
- MgPolygon polygon = this.CreatePolygonFromGeomText(this.args.get("GEOMTEXT"));
- MgGeometry geometry = (MgGeometry) polygon.Transform(csInverseTransform);
- queryOptions.SetSpatialFilter(featureGeometry, geometry, MgFeatureSpatialOperations.Intersects);
+ MgPolygon polygon = this.createPolygonFromGeomText(this.args.get("GEOMTEXT"));
+ MgGeometry geometry = (MgGeometry) polygon.transform(csInverseTransform);
+ queryOptions.setSpatialFilter(featureGeometry, geometry, MgFeatureSpatialOperations.Intersects);
}
int count = 0;
MgAgfReaderWriter geometryReaderWriter = new MgAgfReaderWriter();
- MgFeatureReader featureReader = layer.SelectFeatures(queryOptions);
+ MgFeatureReader featureReader = layer.selectFeatures(queryOptions);
String displayValue = null;
- while(featureReader.ReadNext() && (queryMax <= 0 || count < queryMax))
+ while(featureReader.readNext() && (queryMax <= 0 || count < queryMax))
{
- MgByteReader byteReader = featureReader.GetGeometry(featureGeometry);
+ MgByteReader byteReader = featureReader.getGeometry(featureGeometry);
MgPoint centerPoint = null;
try
{
- MgGeometry geometry = geometryReaderWriter.Read(byteReader);
- centerPoint = geometry.GetCentroid();
- centerPoint = (MgPoint) centerPoint.Transform(csTransform);
+ MgGeometry geometry = geometryReaderWriter.read(byteReader);
+ centerPoint = geometry.getCentroid();
+ centerPoint = (MgPoint) centerPoint.transform(csTransform);
}
catch (MgException ex) //Maybe because of bad geometry
{
@@ -293,34 +293,34 @@
centerPoint = null;
}
- Map idList = new HashMap(this.GetFeatureIdList(featureReader));
+ Map idList = new HashMap(this.getFeatureIdList(featureReader));
- int propertyType = featureReader.GetPropertyType(this.args.get("OUTPUTPROPERTY"));
+ int propertyType = featureReader.getPropertyType(this.args.get("OUTPUTPROPERTY"));
switch(propertyType)
{
case MgPropertyType.Boolean :
- displayValue = String.valueOf(featureReader.GetBoolean(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getBoolean(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.Byte :
- displayValue = String.valueOf(featureReader.GetByte(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getByte(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.Single :
- displayValue = String.valueOf(featureReader.GetSingle(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getSingle(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.Double :
- displayValue = String.valueOf(featureReader.GetDouble(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getDouble(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.Int16 :
- displayValue = String.valueOf(featureReader.GetInt16(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getInt16(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.Int32 :
- displayValue = String.valueOf(featureReader.GetInt32(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getInt32(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.Int64 :
- displayValue = String.valueOf(featureReader.GetInt64(this.args.get("OUTPUTPROPERTY")));
+ displayValue = String.valueOf(featureReader.getInt64(this.args.get("OUTPUTPROPERTY")));
break;
case MgPropertyType.String :
- displayValue = featureReader.GetString(this.args.get("OUTPUTPROPERTY"));
+ displayValue = featureReader.getString(this.args.get("OUTPUTPROPERTY"));
break;
case MgPropertyType.DateTime :
case MgPropertyType.Null :
@@ -339,15 +339,15 @@
return result;
}
- public String GetSelectionXML() throws MgException, JSONException
+ public String getSelectionXML() throws MgException, JSONException
{
- MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
+ MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
- String featureClass = layer.GetFeatureClassName();
- MgClassDefinition classDef = layer.GetClassDefinition();
+ map.open(this.args.get("MAPNAME"));
+ MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
+ String featureClass = layer.getFeatureClassName();
+ MgClassDefinition classDef = layer.getClassDefinition();
MgPropertyCollection properties = new MgPropertyCollection();
MgDataPropertyDefinition dataPropDef = null;
@@ -358,32 +358,32 @@
{
String key = (String) it.next();
Object value = json.get(key);
- dataPropDef = (MgDataPropertyDefinition) classDef.GetProperties().GetItem(key);
- switch(dataPropDef.GetDataType())
+ dataPropDef = (MgDataPropertyDefinition) classDef.getProperties().getItem(key);
+ switch(dataPropDef.getDataType())
{
case MgPropertyType.Boolean :
- properties.Add(new MgBooleanProperty(key, Boolean.valueOf(value.toString())));
+ properties.add(new MgBooleanProperty(key, Boolean.valueOf(value.toString())));
break;
case MgPropertyType.Byte :
- properties.Add(new MgByteProperty(key, Byte.valueOf(value.toString())));
+ properties.add(new MgByteProperty(key, Byte.valueOf(value.toString())));
break;
case MgPropertyType.Single :
- properties.Add(new MgSingleProperty(key, Float.valueOf(value.toString())));
+ properties.add(new MgSingleProperty(key, Float.valueOf(value.toString())));
break;
case MgPropertyType.Double :
- properties.Add(new MgDoubleProperty(key, Double.valueOf(value.toString())));
+ properties.add(new MgDoubleProperty(key, Double.valueOf(value.toString())));
break;
case MgPropertyType.Int16 :
- properties.Add(new MgInt16Property(key, Short.valueOf(value.toString())));
+ properties.add(new MgInt16Property(key, Short.valueOf(value.toString())));
break;
case MgPropertyType.Int32 :
- properties.Add(new MgInt32Property(key, Integer.valueOf(value.toString())));
+ properties.add(new MgInt32Property(key, Integer.valueOf(value.toString())));
break;
case MgPropertyType.Int64 :
- properties.Add(new MgInt64Property(key, Long.valueOf(value.toString())));
+ properties.add(new MgInt64Property(key, Long.valueOf(value.toString())));
break;
case MgPropertyType.String :
- properties.Add(new MgStringProperty(key, value.toString()));
+ properties.add(new MgStringProperty(key, value.toString()));
break;
case MgPropertyType.DateTime :
case MgPropertyType.Null :
@@ -397,49 +397,49 @@
}
MgSelection selection = new MgSelection(map);
- selection.AddFeatureIds(layer, featureClass, properties);
+ selection.addFeatureIds(layer, featureClass, properties);
- return selection.ToXml();
+ return selection.toXml();
}
- private Map GetFeatureIdList(MgFeatureReader featureReader) throws MgException
+ private Map getFeatureIdList(MgFeatureReader featureReader) throws MgException
{
- MgClassDefinition classDef = featureReader.GetClassDefinition();
- MgPropertyDefinitionCollection idProps = classDef.GetIdentityProperties();
+ MgClassDefinition classDef = featureReader.getClassDefinition();
+ MgPropertyDefinitionCollection idProps = classDef.getIdentityProperties();
Map idList = new HashMap();
- for(int i=0; i<idProps.GetCount(); i++)
+ for(int i=0; i<idProps.getCount(); i++)
{
- MgDataPropertyDefinition idProp = (MgDataPropertyDefinition) idProps.GetItem(i);
+ MgDataPropertyDefinition idProp = (MgDataPropertyDefinition) idProps.getItem(i);
- switch(idProp.GetDataType())
+ switch(idProp.getDataType())
{
case MgPropertyType.Boolean :
- idList.put(idProp.GetName(), featureReader.GetBoolean(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getBoolean(idProp.getName()));
break;
case MgPropertyType.Byte :
- idList.put(idProp.GetName(), featureReader.GetByte(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getByte(idProp.getName()));
break;
case MgPropertyType.Single :
- idList.put(idProp.GetName(), featureReader.GetSingle(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getSingle(idProp.getName()));
break;
case MgPropertyType.Double :
- idList.put(idProp.GetName(), featureReader.GetDouble(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getDouble(idProp.getName()));
break;
case MgPropertyType.Int16 :
- idList.put(idProp.GetName(), featureReader.GetInt16(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getInt16(idProp.getName()));
break;
case MgPropertyType.Int32 :
- idList.put(idProp.GetName(), featureReader.GetInt32(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getInt32(idProp.getName()));
break;
case MgPropertyType.Int64 :
- idList.put(idProp.GetName(), featureReader.GetInt64(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getInt64(idProp.getName()));
break;
case MgPropertyType.String :
- idList.put(idProp.GetName(), featureReader.GetString(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getString(idProp.getName()));
break;
case MgPropertyType.DateTime :
- idList.put(idProp.GetName(), featureReader.GetDateTime(idProp.GetName()));
+ idList.put(idProp.getName(), featureReader.getDateTime(idProp.getName()));
break;
case MgPropertyType.Null :
case MgPropertyType.Blob :
@@ -454,7 +454,7 @@
return idList;
}
- private boolean IsValidDataType(int type)
+ private boolean isValidDataType(int type)
{
boolean valid = true;
@@ -473,39 +473,39 @@
return valid;
}
- private MgFeatureSchema CreateFilterSchema() throws MgException
+ private MgFeatureSchema createFilterSchema() throws MgException
{
MgFeatureSchema filterSchema = new MgFeatureSchema();
- filterSchema.SetName("FilterSchema");
+ filterSchema.setName("FilterSchema");
MgClassDefinition filterClass = new MgClassDefinition();
- filterClass.SetName("Filter");
- MgPropertyDefinitionCollection properties = filterClass.GetProperties();
+ filterClass.setName("Filter");
+ MgPropertyDefinitionCollection properties = filterClass.getProperties();
MgDataPropertyDefinition idProperty = new MgDataPropertyDefinition("ID");
- idProperty.SetDataType(MgPropertyType.Int32);
- idProperty.SetReadOnly(true);
- idProperty.SetNullable(false);
- idProperty.SetAutoGeneration(true);
- properties.Add(idProperty);
+ idProperty.setDataType(MgPropertyType.Int32);
+ idProperty.setReadOnly(true);
+ idProperty.setNullable(false);
+ idProperty.setAutoGeneration(true);
+ properties.add(idProperty);
MgGeometricPropertyDefinition geometryProperty = new MgGeometricPropertyDefinition("Geometry");
- geometryProperty.SetGeometryTypes(MgFeatureGeometricType.Surface);
- geometryProperty.SetHasElevation(false);
- geometryProperty.SetHasMeasure(false);
- geometryProperty.SetReadOnly(false);
- geometryProperty.SetSpatialContextAssociation("MAPCS");
- properties.Add(geometryProperty);
+ geometryProperty.setGeometryTypes(MgFeatureGeometricType.Surface);
+ geometryProperty.setHasElevation(false);
+ geometryProperty.setHasMeasure(false);
+ geometryProperty.setReadOnly(false);
+ geometryProperty.setSpatialContextAssociation("MAPCS");
+ properties.add(geometryProperty);
- filterClass.GetIdentityProperties().Add(idProperty);
- filterClass.SetDefaultGeometryPropertyName("Geometry");
+ filterClass.getIdentityProperties().add(idProperty);
+ filterClass.setDefaultGeometryPropertyName("Geometry");
- filterSchema.GetClasses().Add(filterClass);
+ filterSchema.getClasses().add(filterClass);
return filterSchema;
}
- private MgPolygon CreatePolygonFromGeomText(String geomText) throws MgException
+ private MgPolygon createPolygonFromGeomText(String geomText) throws MgException
{
MgGeometryFactory geometryFactory = new MgGeometryFactory();
@@ -515,12 +515,12 @@
MgCoordinateCollection coords = new MgCoordinateCollection();
for(int i=0; i<count; i++)
{
- MgCoordinate coord = geometryFactory.CreateCoordinateXY(Double.valueOf(vertices[(i*2)+1]), Double.valueOf(vertices[(i*2)+2]));
- coords.Add(coord);
+ MgCoordinate coord = geometryFactory.createCoordinateXY(Double.valueOf(vertices[(i*2)+1]), Double.valueOf(vertices[(i*2)+2]));
+ coords.add(coord);
}
- MgLinearRing linearRing = geometryFactory.CreateLinearRing(coords);
- MgPolygon polygon = geometryFactory.CreatePolygon(linearRing, null);
+ MgLinearRing linearRing = geometryFactory.createLinearRing(coords);
+ MgPolygon polygon = geometryFactory.createPolygon(linearRing, null);
return polygon;
}
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querycontroller.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querycontroller.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querycontroller.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -51,7 +51,7 @@
{
case Command.GETLAYERPROPERTIES:
responseType = "text/plain";
- ArrayList<Property> arrayList = query.GetLayerProperties();
+ ArrayList<Property> arrayList = query.getLayerProperties();
for(int i=0;i<arrayList.size();i++)
{
jsonObj.put("name", arrayList.get(i).name);
@@ -62,15 +62,15 @@
break;
case Command.TOGGLESPATIALFILTER:
responseType = "text/plain";
- responseString = json.put(query.ToggleSpatialFilter()).toString();
+ responseString = json.put(query.toggleSpatialFilter()).toString();
break;
case Command.SHOWSPATIALFILTER:
responseType = "text/plain";
- responseString = json.put(query.ShowSpatialFilter()).toString();
+ responseString = json.put(query.showSpatialFilter()).toString();
break;
case Command.EXECUTEQUERY:
responseType = "text/plain";
- ArrayList<Feature> resultList = query.Execute();
+ ArrayList<Feature> resultList = query.execute();
for(int i=0;i<resultList.size();i++)
{
jsonObj.put("displayValue", resultList.get(i).displayValue);
@@ -83,7 +83,7 @@
break;
case Command.GETSELECTIONXML:
responseType = "text/xml";
- responseString = query.GetSelectionXML();
+ responseString = query.getSelectionXML();
break;
}
}
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querymain.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querymain.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/query/querymain.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -46,12 +46,12 @@
query = new Query(args);
- layerNames = query.GetMapLayerNames();
+ layerNames = query.getMapLayerNames();
}
catch (MgException e)
{
- errorMsg = e.GetExceptionMessage();
- errorDetail = e.GetDetails();
+ errorMsg = e.getExceptionMessage();
+ errorDetail = e.getDetails();
}
%>
<html>
@@ -202,10 +202,7 @@
else
reqHandler = new XMLHttpRequest();
- if (msie)
- reqHandler.open("POST", "querycontroller.jsp", false);
- else
- reqHandler.open("POST", "../javaviewersample/query/querycontroller.jsp", false);
+ reqHandler.open("POST", "querycontroller.jsp", false);
reqHandler.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
reqHandler.send(reqParams);
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/classes/theme.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/classes/theme.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/classes/theme.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -42,7 +42,7 @@
{
this.args = incomingArgs;
this.site = new MgSiteConnection();
- this.site.Open(new MgUserInformation(this.args.get("SESSION")));
+ this.site.open(new MgUserInformation(this.args.get("SESSION")));
this.distNameArray = new String[] {"Individual", "Equal", "Standard Deviation", "Quantile", "Jenks (Natural Breaks)"};
this.distValueArray = new String[] {"INDIV_DIST", "EQUAL_DIST", "STDEV_DIST", "QUANT_DIST", "JENK_DIST"};
}
@@ -67,29 +67,29 @@
return jsonArray.toString();
}
- public ArrayList<String> GetMapLayerNames() throws MgException
+ public ArrayList<String> getMapLayerNames() throws MgException
{
- MgFeatureService featureService = (MgFeatureService)this.site.CreateService(MgServiceType.FeatureService);
+ MgFeatureService featureService = (MgFeatureService)this.site.createService(MgServiceType.FeatureService);
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayerCollection layers = map.GetLayers();
+ map.open(this.args.get("MAPNAME"));
+ MgLayerCollection layers = map.getLayers();
ArrayList<String> layerNames = new ArrayList<String>();
- for(int i=0; i<layers.GetCount(); i++)
+ for(int i=0; i<layers.getCount(); i++)
{
- MgLayer layer = (MgLayer) layers.GetItem(i);
- if(!layer.GetName().startsWith("_") && !layer.GetFeatureSourceId().toUpperCase().startsWith("SESSION"))
+ MgLayer layer = (MgLayer) layers.getItem(i);
+ if(!layer.getName().startsWith("_") && !layer.getFeatureSourceId().toUpperCase().startsWith("SESSION"))
{
- MgClassDefinition classDef = layer.GetClassDefinition();
- MgPropertyDefinition propDef = classDef.GetProperties().GetItem(layer.GetFeatureGeometryName());
+ MgClassDefinition classDef = layer.getClassDefinition();
+ MgPropertyDefinition propDef = classDef.getProperties().getItem(layer.getFeatureGeometryName());
- if(propDef.GetPropertyType() == MgFeaturePropertyType.GeometricProperty)
+ if(propDef.getPropertyType() == MgFeaturePropertyType.GeometricProperty)
{
MgGeometricPropertyDefinition geomPropDef = (MgGeometricPropertyDefinition) propDef;
- if(geomPropDef.GetGeometryTypes() == MgFeatureGeometricType.Surface)
- layerNames.add(layer.GetLegendLabel());
+ if(geomPropDef.getGeometryTypes() == MgFeatureGeometricType.Surface)
+ layerNames.add(layer.getLegendLabel());
}
}
}
@@ -98,31 +98,31 @@
return layerNames;
}
- public LayerInfo GetLayerInfo() throws MgException, ParserConfigurationException, IOException, SAXException
+ public LayerInfo getLayerInfo() throws MgException, ParserConfigurationException, IOException, SAXException
{
ArrayList<Property> properties = new ArrayList<Property>();
ArrayList<String> scaleRanges = new ArrayList<String>();
- MgResourceService resourceService = (MgResourceService)this.site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceService = (MgResourceService)this.site.createService(MgServiceType.ResourceService);
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
+ map.open(this.args.get("MAPNAME"));
+ MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
- MgClassDefinition classDef = layer.GetClassDefinition();
+ MgClassDefinition classDef = layer.getClassDefinition();
- for(int i=0; i<classDef.GetProperties().GetCount(); i++)
+ for(int i=0; i<classDef.getProperties().getCount(); i++)
{
- MgPropertyDefinition propertyDef = classDef.GetProperties().GetItem(i);
+ MgPropertyDefinition propertyDef = classDef.getProperties().getItem(i);
- if(propertyDef.GetPropertyType() == MgFeaturePropertyType.DataProperty)
+ if(propertyDef.getPropertyType() == MgFeaturePropertyType.DataProperty)
{
MgDataPropertyDefinition propertyDataDef = (MgDataPropertyDefinition) propertyDef;
- int dataType = propertyDataDef.GetDataType();
- ArrayList<Integer> distroTypes = new ArrayList(this.GetDistributionsForDataType(dataType));
+ int dataType = propertyDataDef.getDataType();
+ ArrayList<Integer> distroTypes = new ArrayList(this.getDistributionsForDataType(dataType));
if(distroTypes.size() > 0)
{
- properties.add(new Property(propertyDataDef.GetName(), dataType, distroTypes));
+ properties.add(new Property(propertyDataDef.getName(), dataType, distroTypes));
}
}
}
@@ -129,12 +129,12 @@
// Next get a list of all of the layers scale ranges.
- MgResourceIdentifier layerDefResId = layer.GetLayerDefinition();
- MgByteReader byteReader = resourceService.GetResourceContent(layerDefResId);
+ MgResourceIdentifier layerDefResId = layer.getLayerDefinition();
+ MgByteReader byteReader = resourceService.getResourceContent(layerDefResId);
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(new InputSource(new StringReader(byteReader.ToString())));
+ Document doc = docBuilder.parse(new InputSource(new StringReader(byteReader.toString())));
NodeList nodeList = doc.getElementsByTagName("VectorScaleRange");
for(int i=0; i<nodeList.getLength(); i++)
@@ -160,13 +160,13 @@
return new LayerInfo(properties, scaleRanges);
}
- public ArrayList<String> GetPropertyMinMaxCount() throws MgException
+ public ArrayList<String> getPropertyMinMaxCount() throws MgException
{
ArrayList<String> propertyMinMaxCount = new ArrayList<String>();
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayer layer = (MgLayer) map.GetLayers().GetItem(this.args.get("LAYERNAME"));
+ map.open(this.args.get("MAPNAME"));
+ MgLayer layer = (MgLayer) map.getLayers().getItem(this.args.get("LAYERNAME"));
String minValue = null;
String maxValue = null;
@@ -174,13 +174,13 @@
int count = 0;
MgFeatureQueryOptions queryOptions = new MgFeatureQueryOptions();
- queryOptions.AddFeatureProperty(this.args.get("PROPERTYNAME"));
+ queryOptions.addFeatureProperty(this.args.get("PROPERTYNAME"));
- MgFeatureReader featureReader = layer.SelectFeatures(queryOptions);
- while(featureReader.ReadNext())
+ MgFeatureReader featureReader = layer.selectFeatures(queryOptions);
+ while(featureReader.readNext())
{
- String value = this.GetFeaturePropertyValue(featureReader, this.args.get("PROPERTYNAME"));
- int propertyType = featureReader.GetPropertyType(this.args.get("PROPERTYNAME"));
+ String value = this.getFeaturePropertyValue(featureReader, this.args.get("PROPERTYNAME"));
+ int propertyType = featureReader.getPropertyType(this.args.get("PROPERTYNAME"));
if(firstTime)
{
maxValue = value;
@@ -232,7 +232,7 @@
}
count++;
}
- featureReader.Close();
+ featureReader.close();
propertyMinMaxCount.add(minValue.toString());
propertyMinMaxCount.add(maxValue.toString());
@@ -241,24 +241,24 @@
return propertyMinMaxCount;
}
- public String ApplyTheme() throws MgException, ParserConfigurationException, IOException, SAXException, TransformerConfigurationException, TransformerException
+ public String applyTheme() throws MgException, ParserConfigurationException, IOException, SAXException, TransformerConfigurationException, TransformerException
{
- MgResourceService resourceService = (MgResourceService)this.site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceService = (MgResourceService)this.site.createService(MgServiceType.ResourceService);
MgMap map = new MgMap(this.site);
- map.Open(this.args.get("MAPNAME"));
- MgLayerCollection layers = map.GetLayers();
- MgLayer layer = (MgLayer) layers.GetItem(this.args.get("LAYERNAME"));
+ map.open(this.args.get("MAPNAME"));
+ MgLayerCollection layers = map.getLayers();
+ MgLayer layer = (MgLayer) layers.getItem(this.args.get("LAYERNAME"));
- MgResourceIdentifier resId = new MgResourceIdentifier(layer.GetFeatureSourceId());
- MgResourceIdentifier layerDefResId = layer.GetLayerDefinition();
- MgByteReader byteReader = resourceService.GetResourceContent(layerDefResId);
+ MgResourceIdentifier resId = new MgResourceIdentifier(layer.getFeatureSourceId());
+ MgResourceIdentifier layerDefResId = layer.getLayerDefinition();
+ MgByteReader byteReader = resourceService.getResourceContent(layerDefResId);
// Load the Layer Definition and Navigate to the specified <VectorScaleRange>
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(new InputSource(new StringReader(byteReader.ToString())));
+ Document doc = docBuilder.parse(new InputSource(new StringReader(byteReader.toString())));
NodeList nodeList = doc.getElementsByTagName("VectorScaleRange");
@@ -298,13 +298,13 @@
if("INDIV_DIST".equals(this.args.get("DISTRO")))
{
- aggregateOptions.AddFeatureProperty(this.args.get("PROPERTYNAME"));
- aggregateOptions.SelectDistinct(true);
+ aggregateOptions.addFeatureProperty(this.args.get("PROPERTYNAME"));
+ aggregateOptions.selectDistinct(true);
- MgDataReader dataReader = layer.SelectAggregate(aggregateOptions);
- while(dataReader.ReadNext())
+ MgDataReader dataReader = layer.selectAggregate(aggregateOptions);
+ while(dataReader.readNext())
{
- value = this.GetFeaturePropertyValue(dataReader, this.args.get("PROPERTYNAME"));
+ value = this.getFeaturePropertyValue(dataReader, this.args.get("PROPERTYNAME"));
filterText = """ + this.args.get("PROPERTYNAME") + "" = ";
if(Integer.valueOf(this.args.get("DATATYPE")) == MgPropertyType.String)
@@ -315,8 +315,8 @@
areaRuleXML = String.format(areaRuleTemplate,
this.args.get("PROPERTYNAME") + ":" + value,
filterText,
- this.InterpolateColor(portion, this.args.get("FILLFROM"), this.args.get("FILLTO"), Integer.valueOf(this.args.get("FILLTRANS"))),
- this.InterpolateColor(portion, this.args.get("LINEFROM"), this.args.get("LINETO"), 0));
+ this.interpolateColor(portion, this.args.get("FILLFROM"), this.args.get("FILLTO"), Integer.valueOf(this.args.get("FILLTRANS"))),
+ this.interpolateColor(portion, this.args.get("LINEFROM"), this.args.get("LINETO"), 0));
docFactory = DocumentBuilderFactory.newInstance();
docBuilder = docFactory.newDocumentBuilder();
areaDoc = docBuilder.parse(new InputSource(new StringReader(areaRuleXML)));
@@ -326,22 +326,22 @@
portion = portion + increment;
}
- dataReader.Close();
+ dataReader.close();
}
else
{
ArrayList<String> values = new ArrayList<String>();
- aggregateOptions.AddComputedProperty("THEME_VALUE",
+ aggregateOptions.addComputedProperty("THEME_VALUE",
this.args.get("DISTRO") + "(\"" + this.args.get("PROPERTYNAME") + "\"," + this.args.get("NUMRULES") + "," + this.args.get("MINVALUE") + "," + this.args.get("MAXVALUE") + ")");
- MgDataReader dataReader = layer.SelectAggregate(aggregateOptions);
- while(dataReader.ReadNext())
+ MgDataReader dataReader = layer.selectAggregate(aggregateOptions);
+ while(dataReader.readNext())
{
- value = this.GetFeaturePropertyValue(dataReader, "THEME_VALUE");
+ value = this.getFeaturePropertyValue(dataReader, "THEME_VALUE");
values.add(value);
}
- dataReader.Close();
+ dataReader.close();
for(int i=0; i<values.size() - 1; i++)
{
@@ -354,8 +354,8 @@
areaRuleXML = String.format(areaRuleTemplate,
this.args.get("PROPERTYNAME") + ":" + values.get(i) + " - " + values.get(i+1),
filterText,
- this.InterpolateColor(portion, this.args.get("FILLFROM"), this.args.get("FILLTO"), Integer.valueOf(this.args.get("FILLTRANS"))),
- this.InterpolateColor(portion, this.args.get("LINEFROM"), this.args.get("LINETO"), 0));
+ this.interpolateColor(portion, this.args.get("FILLFROM"), this.args.get("FILLTO"), Integer.valueOf(this.args.get("FILLTRANS"))),
+ this.interpolateColor(portion, this.args.get("LINEFROM"), this.args.get("LINETO"), 0));
docFactory = DocumentBuilderFactory.newInstance();
docBuilder = docFactory.newDocumentBuilder();
@@ -377,8 +377,8 @@
Transformer transformer = tf.newTransformer();
transformer.transform(domSource, result);
String layerDefinition = writer.toString();
- String uniqueName = this.MakeUniqueLayerName(map, this.args.get("LAYERNAME"), this.args.get("THEMENAME"));
- String legendLabel = layer.GetLegendLabel();
+ String uniqueName = this.makeUniqueLayerName(map, this.args.get("LAYERNAME"), this.args.get("THEMENAME"));
+ String legendLabel = layer.getLegendLabel();
if(this.args.get("THEMENAME").trim().length() > 0)
legendLabel = legendLabel + " (" + this.args.get("THEMENAME") + ")";
@@ -385,22 +385,22 @@
MgResourceIdentifier layerResId = new MgResourceIdentifier("Session:" + this.args.get("SESSION") + "//" + uniqueName + ".LayerDefinition");
MgByteSource byteSource = new MgByteSource(layerDefinition.getBytes(), layerDefinition.length());
- resourceService.SetResource(layerResId, byteSource.GetReader(), null);
+ resourceService.setResource(layerResId, byteSource.getReader(), null);
MgLayer newLayer = new MgLayer(layerResId, resourceService);
- newLayer.SetName(uniqueName);
- newLayer.SetLegendLabel(legendLabel);
- newLayer.SetDisplayInLegend(layer.GetDisplayInLegend());
- newLayer.SetVisible(true);
- newLayer.SetSelectable(layer.GetSelectable());
- layers.Insert(layers.IndexOf(layer), newLayer);
+ newLayer.setName(uniqueName);
+ newLayer.setLegendLabel(legendLabel);
+ newLayer.setDisplayInLegend(layer.getDisplayInLegend());
+ newLayer.setVisible(true);
+ newLayer.setSelectable(layer.getSelectable());
+ layers.insert(layers.indexOf(layer), newLayer);
- map.Save();
+ map.save();
return uniqueName;
}
- private String InterpolateColor(double portion, String startColor, String endColor, int percentTransparent)
+ private String interpolateColor(double portion, String startColor, String endColor, int percentTransparent)
{
String result = String.format("%02x", 255*(100-percentTransparent)/100);
@@ -407,23 +407,23 @@
if(startColor.equals(endColor))
return result+startColor;
- int red = this.CalculateRGB(portion, startColor.substring(0,2), endColor.substring(0,2));
+ int red = this.calculateRGB(portion, startColor.substring(0,2), endColor.substring(0,2));
result = (Integer.toHexString(red).length() == 1)? result+"0"+Integer.toHexString(red) : result+Integer.toHexString(red);
- int green = this.CalculateRGB(portion, startColor.substring(2,4), endColor.substring(2,4));
+ int green = this.calculateRGB(portion, startColor.substring(2,4), endColor.substring(2,4));
result = (Integer.toHexString(green).length() == 1)? result+"0"+Integer.toHexString(green) : result+Integer.toHexString(green);
- int blue = this.CalculateRGB(portion, startColor.substring(4,6), endColor.substring(4,6));
+ int blue = this.calculateRGB(portion, startColor.substring(4,6), endColor.substring(4,6));
result = (Integer.toHexString(blue).length() == 1)? result+"0"+Integer.toHexString(blue) : result+Integer.toHexString(blue);
return result;
}
- private int CalculateRGB(double portion, String startRGB, String endRGB)
+ private int calculateRGB(double portion, String startRGB, String endRGB)
{
double result = Integer.parseInt(startRGB, 16) + portion*(Integer.parseInt(endRGB, 16) - Integer.parseInt(startRGB, 16));
return (int) result;
}
- private ArrayList<Integer> GetDistributionsForDataType(int type) throws MgException
+ private ArrayList<Integer> getDistributionsForDataType(int type) throws MgException
{
ArrayList<Integer> distroTypes = new ArrayList<Integer>();
@@ -461,13 +461,13 @@
return distroTypes;
}
- private String MakeUniqueLayerName(MgMap map, String layerName, String themeName) throws MgException
+ private String makeUniqueLayerName(MgMap map, String layerName, String themeName) throws MgException
{
String desiredName = "_" + layerName + themeName;
String uniqueName = desiredName;
int index = 1;
- while(map.GetLayers().Contains(uniqueName))
+ while(map.getLayers().contains(uniqueName))
{
uniqueName = desiredName + Integer.toString(index);
index++;
@@ -475,35 +475,35 @@
return uniqueName;
}
- private String GetFeaturePropertyValue(MgReader dataReader, String name) throws MgException
+ private String getFeaturePropertyValue(MgReader dataReader, String name) throws MgException
{
String value = null;
- int propertyType = dataReader.GetPropertyType(name);
+ int propertyType = dataReader.getPropertyType(name);
switch(propertyType)
{
case MgPropertyType.Boolean :
- value = String.valueOf(dataReader.GetBoolean(name));
+ value = String.valueOf(dataReader.getBoolean(name));
break;
case MgPropertyType.Byte :
- value = String.valueOf(dataReader.GetByte(name));
+ value = String.valueOf(dataReader.getByte(name));
break;
case MgPropertyType.Single :
- value = String.valueOf(dataReader.GetSingle(name));
+ value = String.valueOf(dataReader.getSingle(name));
break;
case MgPropertyType.Double :
- value = String.valueOf(dataReader.GetDouble(name));
+ value = String.valueOf(dataReader.getDouble(name));
break;
case MgPropertyType.Int16 :
- value = String.valueOf(dataReader.GetInt16(name));
+ value = String.valueOf(dataReader.getInt16(name));
break;
case MgPropertyType.Int32 :
- value = String.valueOf(dataReader.GetInt32(name));
+ value = String.valueOf(dataReader.getInt32(name));
break;
case MgPropertyType.Int64 :
- value = String.valueOf(dataReader.GetInt64(name));
+ value = String.valueOf(dataReader.getInt64(name));
break;
case MgPropertyType.String :
- value = dataReader.GetString(name);
+ value = dataReader.getString(name);
break;
case MgPropertyType.DateTime :
case MgPropertyType.Null :
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/themecontroller.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/themecontroller.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/themecontroller.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -55,7 +55,7 @@
{
case Command.GETLAYERINFO:
responseType = "text/plain";
- LayerInfo layerInfo = theme.GetLayerInfo();
+ LayerInfo layerInfo = theme.getLayerInfo();
ArrayList<Property> propArrayList = layerInfo.properties;
for(int i=0; i<propArrayList.size(); i++)
@@ -83,7 +83,7 @@
break;
case Command.GETPROPERTYMINMAXCOUNT:
responseType = "text/plain";
- ArrayList<String> arrayList = theme.GetPropertyMinMaxCount();
+ ArrayList<String> arrayList = theme.getPropertyMinMaxCount();
for(int i=0;i<arrayList.size();i++)
{
jsonArr.put(arrayList.get(i));
@@ -92,7 +92,7 @@
break;
case Command.APPLYTHEME:
responseType = "text/plain";
- responseString = theme.ApplyTheme();
+ responseString = theme.applyTheme();
break;
}
}
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/thememain.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/thememain.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/theme/thememain.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -46,12 +46,12 @@
theme = new Theme(args);
- layerNames = theme.GetMapLayerNames();
+ layerNames = theme.getMapLayerNames();
}
catch (MgException e)
{
- errorMsg = e.GetExceptionMessage();
- errorDetail = e.GetDetails();
+ errorMsg = e.getExceptionMessage();
+ errorDetail = e.getDetails();
}
%>
<html>
Modified: sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/utilityfunctions.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/utilityfunctions.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/javaviewersample/utilityfunctions.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -26,7 +26,7 @@
// Initialize web tier with the site configuration file. The config
// file should be in the same folder as this script.
String configPath = realpath + "webconfig.ini";
- MapGuideJavaApi.MgInitializeWebTier( configPath );
+ MapGuideJavaApiEx.MgInitializeWebTier( configPath );
}
String GetQueryXmlTemplatePath()
@@ -34,7 +34,7 @@
String realpath = getServletContext().getRealPath("/");
// Initialize web tier with the site configuration file. The config
// file should be in the same folder as this script.
- String xmlTemplatePath = realpath + "javaviewersample\\query\\templates\\filterlayerdefinition.xml";
+ String xmlTemplatePath = realpath + "javaviewersample/query/templates/filterlayerdefinition.xml";
return xmlTemplatePath;
}
@@ -43,7 +43,7 @@
String realpath = getServletContext().getRealPath("/");
// Initialize web tier with the site configuration file. The config
// file should be in the same folder as this script.
- String xmlTemplatePath = realpath + "javaviewersample\\theme\\templates\\arearuletemplate.xml";
+ String xmlTemplatePath = realpath + "javaviewersample/theme/templates/arearuletemplate.xml";
return xmlTemplatePath;
}
@@ -52,10 +52,10 @@
MgLayer GetLayerByName(MgMap map, String layerName) throws MgException
{
MgLayer layer = null;
- for (int i = 0; i < map.GetLayers().GetCount(); i++)
+ for (int i = 0; i < map.getLayers().getCount(); i++)
{
- MgLayer nextLayer = (MgLayer) map.GetLayers().GetItem(i);
- if (nextLayer.GetName().equals(layerName))
+ MgLayer nextLayer = (MgLayer) map.getLayers().getItem(i);
+ if (nextLayer.getName().equals(layerName))
{
layer = nextLayer;
break;
@@ -69,14 +69,14 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
byte[] byteBuffer = new byte[1024];
- int numBytes = byteReader.Read(byteBuffer, 1024);
+ int numBytes = byteReader.read(byteBuffer, 1024);
while(numBytes > 0)
{
bos.write(byteBuffer, 0, numBytes);
- numBytes = byteReader.Read(byteBuffer, 1024);
+ numBytes = byteReader.read(byteBuffer, 1024);
}
response.setContentLength(bos.size());
- response.setContentType(byteReader.GetMimeType());
+ response.setContentType(byteReader.getMimeType());
response.getOutputStream().write(bos.toByteArray());
}
Modified: sandbox/jng/vanilla_swig/Doc/samples/samples.php
===================================================================
--- sandbox/jng/vanilla_swig/Doc/samples/samples.php 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Doc/samples/samples.php 2021-07-16 09:04:49 UTC (rev 9864)
@@ -11,7 +11,7 @@
$hasPhpViewerSample = is_installed("phpviewersample");
$hasJavaDevGuide = is_installed("javasamples");
$hasJavaViewerSample = is_installed("javaviewersample");
-$hasOL2Samples = is_installed("ol2samples");
+$hasClientSamples = is_installed("clientsamples");
$hasDotNet = $hasDotNetDevGuide || $hasDotNetViewerSample;
$hasPhp = $hasPhpDevGuide || $hasPhpViewerSample;
@@ -61,7 +61,7 @@
<ul>
<li>AJAX Viewer</li>
<li>MapGuide Web Extensions API</li>
- <? if ($hasOL2Samples) {?>
+ <? if ($hasClientSamples) {?>
<li>OpenLayers integration</li>
<? } ?>
</ul>
@@ -68,8 +68,8 @@
<p>For more code samples, visit the <a href="http://trac.osgeo.org/mapguide/wiki/CodeSamples">Community Code Samples</a> page on the MapGuide Open Source wiki</p>
<p><strong>NOTE: You should download the <a href="http://download.osgeo.org/mapguide/releases/2.0.0/samples/Sheboygan.mgp">Sheboygan Dataset</a> and load this in via the <a href="mapadmin/login.php">MapGuide Site Administrator</a> before running any of these samples</strong></p>
<p><strong>NOTE: Some samples may not be available because you did not choose to enable this feature from the Windows installer.</strong></p>
- <? if ($hasOL2Samples) { ?>
- <p><strong>NOTE: Some OpenLayers integration samples require some sample resources to be loaded. <a href="ol2samples/data/load.php">Click here</a> to load these resources</strong></p>
+ <? if ($hasClientSamples) { ?>
+ <p><strong>NOTE: Some OpenLayers integration samples require some sample resources to be loaded. <a href="clientsamples/data/load.php">Click here</a> to load these resources</strong></p>
<? } ?>
<p>Click on a link below to go to that particular sample</p>
<? if ($hasNothing) { ?>
@@ -111,23 +111,26 @@
<? } ?>
</ul>
<? } ?>
- <? if ($hasOL2Samples) { ?>
+ <? if ($hasClientSamples) { ?>
<p class="sample-header">MapGuide with <a href="http://www.openlayers.org/two">OpenLayers 2</a></p>
<ul>
- <li><a href="ol2samples/untiled/index.html">Basic Sheboygan un-tiled map example with basic legend</a></li>
- <li><a href="ol2samples/tiled/index.html">Basic Sheboygan tiled map example</a></li>
- <li><a href="ol2samples/selection/index.html">Basic Sheboygan un-tiled map example with selection</a></li>
- <li><a href="ol2samples/mixed/index.html">Basic Sheboygan mixed map (tiled and untiled) example</a></li>
- <li><a href="ol2samples/commercial/index.html">Sheboygan map with Google/OSM layers</a></li>
- <li><a href="ol2samples/xyz/index.html">Sheboygan map as XYZ layer</a></li>
+ <li><a href="clientsamples/untiled/index.html">Basic Sheboygan un-tiled map example with basic legend</a></li>
+ <li><a href="clientsamples/tiled/index.html">Basic Sheboygan tiled map example</a></li>
+ <li><a href="clientsamples/selection/index.html">Basic Sheboygan un-tiled map example with selection</a></li>
+ <li><a href="clientsamples/mixed/index.html">Basic Sheboygan mixed map (tiled and untiled) example</a></li>
+ <li><a href="clientsamples/external/index.html">Sheboygan map with external base layers</a></li>
+ <li><a href="clientsamples/xyz/index.html">Sheboygan map as XYZ layer</a></li>
</ul>
<p class="sample-header">MapGuide with <a href="http://www.openlayers.org">OpenLayers</a></p>
<ul>
- <li><a href="ol2samples/hybrid/index.html">Open any map or tile set</a></li>
- <li><a href="ol2samples/xyz/index_ol.html">Sheboygan map as XYZ layer</a></li>
- <li><a href="ol2samples/utfgrid/index.html">Sheboygan map as XYZ layer with UTFGrid interaction tiles</a></li>
- <li><a href="ol2samples/wms/index.html">Sheboygan map as WMS layers</a></li>
- <li><a href="ol2samples/mvt/index.html">Sheboygan map as Mapbox Vector Tiles</a></li>
+ <li><a href="clientsamples/hybrid/index.html">Open any map or tile set</a></li>
+ <li><a href="clientsamples/xyz/index_ol.html">Sheboygan map as XYZ layer</a></li>
+ <li><a href="clientsamples/retina/index_ol.html">Sheboygan map as XYZ retina tile layer</a></li>
+ <li><a href="clientsamples/mixed/index_ol.html">Basic Sheboygan mixed map (tiled and untiled) example</a></li>
+ <li><a href="clientsamples/utfgrid/index.html">Sheboygan map as XYZ layer with UTFGrid interaction tiles</a></li>
+ <li><a href="clientsamples/wms/index.html">Sheboygan map as WMS layers</a></li>
+ <li><a href="clientsamples/mvt/index.html">Sheboygan map as Mapbox Vector Tiles</a></li>
+ <li><a href="clientsamples/geoprocessing/index_ol.html">Using Geo-Processing APIs</a></li>
</ul>
<? } ?>
<? } ?>
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Cache/FeatureSourceCacheItem.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Cache/FeatureSourceCacheItem.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Cache/FeatureSourceCacheItem.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -48,7 +48,7 @@
private:
- auto_ptr<MdfModel::FeatureSource> m_featureSource;
+ unique_ptr<MdfModel::FeatureSource> m_featureSource;
};
/// Inline Methods
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -50,7 +50,7 @@
private:
- auto_ptr<MdfModel::LayerDefinition> m_layerDefinition;
+ unique_ptr<MdfModel::LayerDefinition> m_layerDefinition;
};
/// Inline Methods
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Cache/SpatialContextCacheItem.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Cache/SpatialContextCacheItem.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Cache/SpatialContextCacheItem.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -49,7 +49,7 @@
private:
- auto_ptr<MgSpatialContextInfo> m_spatialContextInfo;
+ unique_ptr<MgSpatialContextInfo> m_spatialContextInfo;
};
/// Inline Methods
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Manager/CacheManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Manager/CacheManager.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Manager/CacheManager.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -265,7 +265,7 @@
// Detach the feature source from the parser.
// It's now the caller's responsibility to delete it.
- auto_ptr<MdfModel::FeatureSource> featureSource;
+ unique_ptr<MdfModel::FeatureSource> featureSource;
featureSource.reset(parser.DetachFeatureSource());
if (NULL == featureSource.get())
@@ -318,7 +318,7 @@
featureSource->GetSupplementalSpatialContextInfo();
CHECKNULL(spatialContexts, L"MgCacheManager.GetSpatialContextCacheItem");
- auto_ptr<MgSpatialContextInfo> spatialContextInfo;
+ unique_ptr<MgSpatialContextInfo> spatialContextInfo;
spatialContextInfo.reset(new MgSpatialContextInfo());
for (int i = 0; i < spatialContexts->GetCount(); ++i)
@@ -412,7 +412,7 @@
m_serviceManager->RequestService(MgServiceType::ResourceService));
ACE_ASSERT(NULL != resourceService.p);
- auto_ptr<MdfModel::LayerDefinition> layerDefinition;
+ unique_ptr<MdfModel::LayerDefinition> layerDefinition;
layerDefinition.reset(MgLayerBase::GetLayerDefinition(resourceService, resource));
if (NULL == layerDefinition.get())
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Manager/SessionCache.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Manager/SessionCache.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Manager/SessionCache.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -89,7 +89,7 @@
{
if (m_sessionInfoMap.end() == m_sessionInfoMap.find(session))
{
- auto_ptr<MgSessionInfo> sessionInfo;
+ unique_ptr<MgSessionInfo> sessionInfo;
sessionInfo.reset(new MgSessionInfo());
sessionInfo->SetUser(user);
Modified: sandbox/jng/vanilla_swig/Server/src/Core/EventTimer.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Core/EventTimer.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Core/EventTimer.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -82,7 +82,7 @@
long m_id;
ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> m_timer;
INT32 m_interval;
- auto_ptr<MgTimedEventHandler> m_eventHandler;
+ unique_ptr<MgTimedEventHandler> m_eventHandler;
};
/// Inline Methods
Modified: sandbox/jng/vanilla_swig/Server/src/Core/ServiceHandlerFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Core/ServiceHandlerFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Core/ServiceHandlerFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -30,7 +30,7 @@
#include "ProfilingServiceHandler.h"
// References the static singleton MgServiceHandlerFactory object
-static auto_ptr<MgServiceHandlerFactory> s_pFactory;
+static unique_ptr<MgServiceHandlerFactory> s_pFactory;
//-------------------------------------------------------------------------
// Constructors/Destructors
Modified: sandbox/jng/vanilla_swig/Server/src/Core/TimedEventHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Core/TimedEventHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Core/TimedEventHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -49,7 +49,7 @@
CHECKNULL(serverManager, L"MgTimedEventHandler.Create");
- auto_ptr<MgTimedEventHandler> eventHandler;
+ unique_ptr<MgTimedEventHandler> eventHandler;
bool isSiteServer = serverManager->IsSiteServer();
switch (type)
Modified: sandbox/jng/vanilla_swig/Server/src/Core/serverconfig.ini
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Core/serverconfig.ini 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Core/serverconfig.ini 2021-07-16 09:04:49 UTC (rev 9864)
@@ -357,6 +357,12 @@
# 0 < Value <= 2147483647
# MaxRasterImageHeight The max height of raster image in pixels
# 0 < Value <= 2147483647
+# MaxRenderImageWidth The maximum allowed width for a map image rendering operation
+# 0 < Value <= 2147483647
+# MaxRenderImageHeight The minimum allowed width for a map image rendering operation
+# 0 < Value <= 2147483647
+# GlobalRasterStylizationLockEnabled Enable/disable the use of a global lock for raster stylization
+# 0 = false and 1 = true
# *****************************************************************************
TileExtentOffset = 0.35
RasterGridSize = 100
@@ -370,6 +376,9 @@
GeneralizeData = 0
MaxRasterImageWidth = 2048
MaxRasterImageHeight = 2048
+MaxRenderImageWidth = 16384
+MaxRenderImageHeight = 16384
+GlobalRasterStylizationLockEnabled = 1
[ResourceServiceProperties]
# *****************************************************************************
Modified: sandbox/jng/vanilla_swig/Server/src/PostBuild/PostBuild.mak
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/PostBuild/PostBuild.mak 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/PostBuild/PostBuild.mak 2021-07-16 09:04:49 UTC (rev 9864)
@@ -93,7 +93,7 @@
CopyFdoComponentsDebug : ..\..\..\Oem\FDO\*.*
if NOT EXIST ..\..\bin\debug\FDO\nul mkdir ..\..\bin\debug\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\debug\FDO\
+ xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\debug ..\..\bin\debug\FDO\
CopyFdoProvidersDebug : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug\FDO\
@@ -375,7 +375,7 @@
CopyFdoComponentsDebug64 : ..\..\..\Oem\FDO\*.*
if NOT EXIST ..\..\bin\debug64\FDO\nul mkdir ..\..\bin\debug64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\debug64\FDO\
+ xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\debug64 ..\..\bin\debug64\FDO\
CopyFdoProvidersDebug64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug64\FDO\
@@ -1722,1675 +1722,6 @@
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
-..\..\bin\debug(v100)\MgFoundationd.dll : ..\..\..\Common\bin\debug(v100)\MgFoundationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgFoundationd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgFoundationd.pdb : ..\..\..\Common\bin\debug(v100)\MgFoundationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgFoundationd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgPlatformBased.dll : ..\..\..\Common\bin\debug(v100)\MgPlatformBased.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgPlatformBased.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgPlatformBased.pdb : ..\..\..\Common\bin\debug(v100)\MgPlatformBased.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgPlatformBased.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgGeometryd.dll : ..\..\..\Common\bin\debug(v100)\MgGeometryd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgGeometryd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgGeometryd.pdb : ..\..\..\Common\bin\debug(v100)\MgGeometryd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgGeometryd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMapGuideCommond.dll : ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMapGuideCommond.pdb : ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfModeld.dll : ..\..\..\Common\bin\debug(v100)\MgMdfModeld.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfModeld.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfModeld.pdb : ..\..\..\Common\bin\debug(v100)\MgMdfModeld.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfModeld.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfParserd.dll : ..\..\..\Common\bin\debug(v100)\MgMdfParserd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfParserd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfParserd.pdb : ..\..\..\Common\bin\debug(v100)\MgMdfParserd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfParserd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgStylizationd.dll : ..\..\..\Common\bin\debug(v100)\MgStylizationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgStylizationd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgStylizationd.pdb : ..\..\..\Common\bin\debug(v100)\MgStylizationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgStylizationd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgRenderersd.dll : ..\..\..\Common\bin\debug(v100)\MgRenderersd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgRenderersd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgRenderersd.pdb : ..\..\..\Common\bin\debug(v100)\MgRenderersd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgRenderersd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\ACEd.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\ACEd.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\gd.dll : ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\GEOSd.dll : ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\GEOSd.pdb : ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdb48d.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdb48d.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xqilla24d.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug(v100)\
-
-CopyFdoComponentsdebug(v100) : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\debug(v100)\FDO\nul mkdir ..\..\bin\debug(v100)\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release ..\..\bin\debug(v100)\FDO\
-
-CopyFdoProvidersdebug(v100) : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug(v100)\FDO\
-
-CopySchemadebug(v100) : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\debug(v100)\Schema\nul mkdir ..\..\bin\debug(v100)\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\debug(v100)\Schema
-
-CopyResourcesdebug(v100) : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\debug(v100)\Resources\nul mkdir ..\..\bin\debug(v100)\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\debug(v100)\Resources\
-
-CopyOgcFilesdebug(v100) : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\debug(v100)\wms\nul mkdir ..\..\bin\debug(v100)\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\debug(v100)\wms
- if NOT EXIST ..\..\bin\debug(v100)\wfs\nul mkdir ..\..\bin\debug(v100)\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\debug(v100)\wfs
-
-CreatePathsdebug(v100) :
- if NOT EXIST ..\..\bin\debug(v100)\Logs\nul mkdir ..\..\bin\debug(v100)\Logs
- if NOT EXIST ..\..\bin\debug(v100)\Packages\nul mkdir ..\..\bin\debug(v100)\Packages
- if NOT EXIST ..\..\bin\debug(v100)\Temp\nul mkdir ..\..\bin\debug(v100)\Temp
- if NOT EXIST ..\..\bin\debug(v100)\wms\nul mkdir ..\..\bin\debug(v100)\wms
- if NOT EXIST ..\..\bin\debug(v100)\wfs\nul mkdir ..\..\bin\debug(v100)\wfs
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\nul mkdir ..\..\bin\debug(v100)\Repositories
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Library\nul mkdir ..\..\bin\debug(v100)\Repositories\Library
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Library\DataFiles\nul mkdir ..\..\bin\debug(v100)\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Session\nul mkdir ..\..\bin\debug(v100)\Repositories\Session
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Session\DataFiles\nul mkdir ..\..\bin\debug(v100)\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Site\nul mkdir ..\..\bin\debug(v100)\Repositories\Site
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\TileCache\nul mkdir ..\..\bin\debug(v100)\Repositories\TileCache
-
-debug(v100) : ..\..\bin\debug(v100)\MgFoundationd.dll \
- ..\..\bin\debug(v100)\MgFoundationd.pdb \
- ..\..\bin\debug(v100)\MgGeometryd.dll \
- ..\..\bin\debug(v100)\MgGeometryd.pdb \
- ..\..\bin\debug(v100)\MgPlatformBased.dll \
- ..\..\bin\debug(v100)\MgPlatformBased.pdb \
- ..\..\bin\debug(v100)\MgMapGuideCommond.dll \
- ..\..\bin\debug(v100)\MgMapGuideCommond.pdb \
- ..\..\bin\debug(v100)\MgMdfModeld.dll \
- ..\..\bin\debug(v100)\MgMdfModeld.pdb \
- ..\..\bin\debug(v100)\MgMdfParserd.dll \
- ..\..\bin\debug(v100)\MgMdfParserd.pdb \
- ..\..\bin\debug(v100)\MgStylizationd.dll \
- ..\..\bin\debug(v100)\MgStylizationd.pdb \
- ..\..\bin\debug(v100)\MgRenderersd.dll \
- ..\..\bin\debug(v100)\MgRenderersd.pdb \
- ..\..\bin\debug(v100)\ACEd.dll \
- ..\..\bin\debug(v100)\ACEd.pdb \
- ..\..\bin\debug(v100)\gd.dll \
- ..\..\bin\debug(v100)\gd.pdb \
- ..\..\bin\debug(v100)\GEOSd.dll \
- ..\..\bin\debug(v100)\GEOSd.pdb \
- ..\..\bin\debug(v100)\libdb48d.dll \
- ..\..\bin\debug(v100)\libdb48d.pdb \
- ..\..\bin\debug(v100)\libdbxml25d.dll \
- ..\..\bin\debug(v100)\libdbxml25d.pdb \
- ..\..\bin\debug(v100)\xqilla24d.dll \
- ..\..\bin\debug(v100)\xqilla24d.pdb \
- ..\..\bin\debug(v100)\xerces-c_3_1mgD.dll \
- ..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb \
- ..\..\bin\debug(v100)\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\PlotHole.mgp \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsdebug(v100) \
- CopyFdoProvidersdebug(v100) \
- CopySchemadebug(v100) \
- CopyResourcesdebug(v100) \
- CreatePathsdebug(v100) \
- CopyOgcFilesdebug(v100)
-
-
-..\..\bin\debug(v100)64\MgFoundationd.dll : ..\..\..\Common\bin\debug(v100)64\MgFoundationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgFoundationd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgFoundationd.pdb : ..\..\..\Common\bin\debug(v100)64\MgFoundationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgFoundationd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgPlatformBased.dll : ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgPlatformBased.pdb : ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgGeometryd.dll : ..\..\..\Common\bin\debug(v100)64\MgGeometryd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgGeometryd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgGeometryd.pdb : ..\..\..\Common\bin\debug(v100)64\MgGeometryd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgGeometryd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMapGuideCommond.dll : ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMapGuideCommond.pdb : ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfModeld.dll : ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfModeld.pdb : ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfParserd.dll : ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfParserd.pdb : ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgStylizationd.dll : ..\..\..\Common\bin\debug(v100)64\MgStylizationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgStylizationd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgStylizationd.pdb : ..\..\..\Common\bin\debug(v100)64\MgStylizationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgStylizationd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgRenderersd.dll : ..\..\..\Common\bin\debug(v100)64\MgRenderersd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgRenderersd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgRenderersd.pdb : ..\..\..\Common\bin\debug(v100)64\MgRenderersd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgRenderersd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\ACEd.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\ACEd.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\gd.dll : ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\GEOSd.dll : ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\GEOSd.pdb : ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdb48d.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdb48d.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xqilla24d.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug(v100)64\
-
-CopyFdoComponentsdebug(v100)64 : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\debug(v100)64\FDO\nul mkdir ..\..\bin\debug(v100)64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\debug(v100)64\FDO\
-
-CopyFdoProvidersdebug(v100)64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug(v100)64\FDO\
-
-CopySchemadebug(v100)64 : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\debug(v100)64\Schema\nul mkdir ..\..\bin\debug(v100)64\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\debug(v100)64\Schema
-
-CopyResourcesdebug(v100)64 : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\debug(v100)64\Resources\nul mkdir ..\..\bin\debug(v100)64\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\debug(v100)64\Resources\
-
-CopyOgcFilesdebug(v100)64 : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\debug(v100)64\wms\nul mkdir ..\..\bin\debug(v100)64\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\debug(v100)64\wms
- if NOT EXIST ..\..\bin\debug(v100)64\wfs\nul mkdir ..\..\bin\debug(v100)64\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\debug(v100)64\wfs
-
-CreatePathsdebug(v100)64 :
- if NOT EXIST ..\..\bin\debug(v100)64\Logs\nul mkdir ..\..\bin\debug(v100)64\Logs
- if NOT EXIST ..\..\bin\debug(v100)64\Packages\nul mkdir ..\..\bin\debug(v100)64\Packages
- if NOT EXIST ..\..\bin\debug(v100)64\Temp\nul mkdir ..\..\bin\debug(v100)64\Temp
- if NOT EXIST ..\..\bin\debug(v100)64\wms\nul mkdir ..\..\bin\debug(v100)64\wms
- if NOT EXIST ..\..\bin\debug(v100)64\wfs\nul mkdir ..\..\bin\debug(v100)64\wfs
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\nul mkdir ..\..\bin\debug(v100)64\Repositories
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Library\nul mkdir ..\..\bin\debug(v100)64\Repositories\Library
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Library\DataFiles\nul mkdir ..\..\bin\debug(v100)64\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Session\nul mkdir ..\..\bin\debug(v100)64\Repositories\Session
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Session\DataFiles\nul mkdir ..\..\bin\debug(v100)64\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Site\nul mkdir ..\..\bin\debug(v100)64\Repositories\Site
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\TileCache\nul mkdir ..\..\bin\debug(v100)64\Repositories\TileCache
-
-debug(v100)64 : ..\..\bin\debug(v100)64\MgFoundationd.dll \
- ..\..\bin\debug(v100)64\MgFoundationd.pdb \
- ..\..\bin\debug(v100)64\MgGeometryd.dll \
- ..\..\bin\debug(v100)64\MgGeometryd.pdb \
- ..\..\bin\debug(v100)64\MgPlatformBased.dll \
- ..\..\bin\debug(v100)64\MgPlatformBased.pdb \
- ..\..\bin\debug(v100)64\MgMapGuideCommond.dll \
- ..\..\bin\debug(v100)64\MgMapGuideCommond.pdb \
- ..\..\bin\debug(v100)64\MgMdfModeld.dll \
- ..\..\bin\debug(v100)64\MgMdfModeld.pdb \
- ..\..\bin\debug(v100)64\MgMdfParserd.dll \
- ..\..\bin\debug(v100)64\MgMdfParserd.pdb \
- ..\..\bin\debug(v100)64\MgStylizationd.dll \
- ..\..\bin\debug(v100)64\MgStylizationd.pdb \
- ..\..\bin\debug(v100)64\MgRenderersd.dll \
- ..\..\bin\debug(v100)64\MgRenderersd.pdb \
- ..\..\bin\debug(v100)64\ACEd.dll \
- ..\..\bin\debug(v100)64\ACEd.pdb \
- ..\..\bin\debug(v100)64\gd.dll \
- ..\..\bin\debug(v100)64\gd.pdb \
- ..\..\bin\debug(v100)64\GEOSd.dll \
- ..\..\bin\debug(v100)64\GEOSd.pdb \
- ..\..\bin\debug(v100)64\libdb48d.dll \
- ..\..\bin\debug(v100)64\libdb48d.pdb \
- ..\..\bin\debug(v100)64\libdbxml25d.dll \
- ..\..\bin\debug(v100)64\libdbxml25d.pdb \
- ..\..\bin\debug(v100)64\xqilla24d.dll \
- ..\..\bin\debug(v100)64\xqilla24d.pdb \
- ..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll \
- ..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb \
- ..\..\bin\debug(v100)64\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\PlotHole.mgp \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsdebug(v100)64 \
- CopyFdoProvidersdebug(v100)64 \
- CopySchemadebug(v100)64 \
- CopyResourcesdebug(v100)64 \
- CreatePathsdebug(v100)64 \
- CopyOgcFilesdebug(v100)64
-
-
-..\..\bin\release(v100)\MgFoundation.dll : ..\..\..\Common\bin\release(v100)\MgFoundation.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgFoundation.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgFoundation.pdb : ..\..\..\Common\bin\release(v100)\MgFoundation.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgFoundation.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgPlatformBase.dll : ..\..\..\Common\bin\release(v100)\MgPlatformBase.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgPlatformBase.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgPlatformBase.pdb : ..\..\..\Common\bin\release(v100)\MgPlatformBase.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgPlatformBase.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgGeometry.dll : ..\..\..\Common\bin\release(v100)\MgGeometry.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgGeometry.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgGeometry.pdb : ..\..\..\Common\bin\release(v100)\MgGeometry.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgGeometry.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMapGuideCommon.dll : ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMapGuideCommon.pdb : ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfModel.dll : ..\..\..\Common\bin\release(v100)\MgMdfModel.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfModel.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfModel.pdb : ..\..\..\Common\bin\release(v100)\MgMdfModel.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfModel.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfParser.dll : ..\..\..\Common\bin\release(v100)\MgMdfParser.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfParser.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfParser.pdb : ..\..\..\Common\bin\release(v100)\MgMdfParser.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfParser.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgStylization.dll : ..\..\..\Common\bin\release(v100)\MgStylization.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgStylization.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgStylization.pdb : ..\..\..\Common\bin\release(v100)\MgStylization.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgStylization.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgRenderers.dll : ..\..\..\Common\bin\release(v100)\MgRenderers.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgRenderers.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgRenderers.pdb : ..\..\..\Common\bin\release(v100)\MgRenderers.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgRenderers.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\ACE.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\ACE.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\gd.dll : ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\GEOS.dll : ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\GEOS.pdb : ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdb48.dll : ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdb48.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdbxml25.dll : ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xqilla24.dll : ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xqilla24.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release(v100)\
-
-CopyFdoComponentsrelease(v100) : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\release(v100)\FDO\nul mkdir ..\..\bin\release(v100)\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release ..\..\bin\release(v100)\FDO\
-
-CopyFdoProvidersrelease(v100) : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release(v100)\FDO\
-
-CopySchemarelease(v100) : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\release(v100)\Schema\nul mkdir ..\..\bin\release(v100)\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\release(v100)\Schema
-
-CopyResourcesrelease(v100) : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\release(v100)\Resources\nul mkdir ..\..\bin\release(v100)\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\release(v100)\Resources\
-
-CopyOgcFilesrelease(v100) : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\release(v100)\wms\nul mkdir ..\..\bin\release(v100)\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\release(v100)\wms
- if NOT EXIST ..\..\bin\release(v100)\wfs\nul mkdir ..\..\bin\release(v100)\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\release(v100)\wfs
-
-CreatePathsrelease(v100) :
- if NOT EXIST ..\..\bin\release(v100)\Logs\nul mkdir ..\..\bin\release(v100)\Logs
- if NOT EXIST ..\..\bin\release(v100)\Packages\nul mkdir ..\..\bin\release(v100)\Packages
- if NOT EXIST ..\..\bin\release(v100)\Temp\nul mkdir ..\..\bin\release(v100)\Temp
- if NOT EXIST ..\..\bin\release(v100)\wms\nul mkdir ..\..\bin\release(v100)\wms
- if NOT EXIST ..\..\bin\release(v100)\wfs\nul mkdir ..\..\bin\release(v100)\wfs
- if NOT EXIST ..\..\bin\release(v100)\Repositories\nul mkdir ..\..\bin\release(v100)\Repositories
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Library\nul mkdir ..\..\bin\release(v100)\Repositories\Library
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Library\DataFiles\nul mkdir ..\..\bin\release(v100)\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Session\nul mkdir ..\..\bin\release(v100)\Repositories\Session
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Session\DataFiles\nul mkdir ..\..\bin\release(v100)\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Site\nul mkdir ..\..\bin\release(v100)\Repositories\Site
- if NOT EXIST ..\..\bin\release(v100)\Repositories\TileCache\nul mkdir ..\..\bin\release(v100)\Repositories\TileCache
-
-release(v100) : ..\..\bin\release(v100)\MgFoundation.dll \
- ..\..\bin\release(v100)\MgFoundation.pdb \
- ..\..\bin\release(v100)\MgGeometry.dll \
- ..\..\bin\release(v100)\MgGeometry.pdb \
- ..\..\bin\release(v100)\MgPlatformBase.dll \
- ..\..\bin\release(v100)\MgPlatformBase.pdb \
- ..\..\bin\release(v100)\MgMapGuideCommon.dll \
- ..\..\bin\release(v100)\MgMapGuideCommon.pdb \
- ..\..\bin\release(v100)\MgMdfModel.dll \
- ..\..\bin\release(v100)\MgMdfModel.pdb \
- ..\..\bin\release(v100)\MgMdfParser.dll \
- ..\..\bin\release(v100)\MgMdfParser.pdb \
- ..\..\bin\release(v100)\MgStylization.dll \
- ..\..\bin\release(v100)\MgStylization.pdb \
- ..\..\bin\release(v100)\MgRenderers.dll \
- ..\..\bin\release(v100)\MgRenderers.pdb \
- ..\..\bin\release(v100)\ACE.dll \
- ..\..\bin\release(v100)\ACE.pdb \
- ..\..\bin\release(v100)\gd.dll \
- ..\..\bin\release(v100)\gd.pdb \
- ..\..\bin\release(v100)\GEOS.dll \
- ..\..\bin\release(v100)\GEOS.pdb \
- ..\..\bin\release(v100)\libdb48.dll \
- ..\..\bin\release(v100)\libdb48.pdb \
- ..\..\bin\release(v100)\libdbxml25.dll \
- ..\..\bin\release(v100)\libdbxml25.pdb \
- ..\..\bin\release(v100)\xqilla24.dll \
- ..\..\bin\release(v100)\xqilla24.pdb \
- ..\..\bin\release(v100)\xerces-c_3_1mg.dll \
- ..\..\bin\release(v100)\xerces-c_3_1mg.pdb \
- ..\..\bin\release(v100)\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\PlotHole.mgp \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsrelease(v100) \
- CopyFdoProvidersrelease(v100) \
- CopySchemarelease(v100) \
- CopyResourcesrelease(v100) \
- CreatePathsrelease(v100) \
- CopyOgcFilesrelease(v100)
-
-
-..\..\bin\release(v100)64\MgFoundation.dll : ..\..\..\Common\bin\release(v100)64\MgFoundation.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgFoundation.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgFoundation.pdb : ..\..\..\Common\bin\release(v100)64\MgFoundation.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgFoundation.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgPlatformBase.dll : ..\..\..\Common\bin\release(v100)64\MgPlatformBase.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgPlatformBase.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgPlatformBase.pdb : ..\..\..\Common\bin\release(v100)64\MgPlatformBase.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgPlatformBase.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgGeometry.dll : ..\..\..\Common\bin\release(v100)64\MgGeometry.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgGeometry.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgGeometry.pdb : ..\..\..\Common\bin\release(v100)64\MgGeometry.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgGeometry.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMapGuideCommon.dll : ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMapGuideCommon.pdb : ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfModel.dll : ..\..\..\Common\bin\release(v100)64\MgMdfModel.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfModel.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfModel.pdb : ..\..\..\Common\bin\release(v100)64\MgMdfModel.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfModel.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfParser.dll : ..\..\..\Common\bin\release(v100)64\MgMdfParser.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfParser.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfParser.pdb : ..\..\..\Common\bin\release(v100)64\MgMdfParser.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfParser.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgStylization.dll : ..\..\..\Common\bin\release(v100)64\MgStylization.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgStylization.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgStylization.pdb : ..\..\..\Common\bin\release(v100)64\MgStylization.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgStylization.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgRenderers.dll : ..\..\..\Common\bin\release(v100)64\MgRenderers.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgRenderers.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgRenderers.pdb : ..\..\..\Common\bin\release(v100)64\MgRenderers.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgRenderers.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\ACE.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\ACE.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\gd.dll : ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\GEOS.dll : ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\GEOS.pdb : ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdb48.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdb48.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdbxml25.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xqilla24.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xqilla24.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release(v100)64\
-
-CopyFdoComponentsrelease(v100)64 : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\release(v100)64\FDO\nul mkdir ..\..\bin\release(v100)64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\release(v100)64\FDO\
-
-CopyFdoProvidersrelease(v100)64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release(v100)64\FDO\
-
-CopySchemarelease(v100)64 : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\release(v100)64\Schema\nul mkdir ..\..\bin\release(v100)64\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\release(v100)64\Schema
-
-CopyResourcesrelease(v100)64 : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\release(v100)64\Resources\nul mkdir ..\..\bin\release(v100)64\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\release(v100)64\Resources\
-
-CopyOgcFilesrelease(v100)64 : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\release(v100)64\wms\nul mkdir ..\..\bin\release(v100)64\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\release(v100)64\wms
- if NOT EXIST ..\..\bin\release(v100)64\wfs\nul mkdir ..\..\bin\release(v100)64\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\release(v100)64\wfs
-
-CreatePathsrelease(v100)64 :
- if NOT EXIST ..\..\bin\release(v100)64\Logs\nul mkdir ..\..\bin\release(v100)64\Logs
- if NOT EXIST ..\..\bin\release(v100)64\Packages\nul mkdir ..\..\bin\release(v100)64\Packages
- if NOT EXIST ..\..\bin\release(v100)64\Temp\nul mkdir ..\..\bin\release(v100)64\Temp
- if NOT EXIST ..\..\bin\release(v100)64\wms\nul mkdir ..\..\bin\release(v100)64\wms
- if NOT EXIST ..\..\bin\release(v100)64\wfs\nul mkdir ..\..\bin\release(v100)64\wfs
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\nul mkdir ..\..\bin\release(v100)64\Repositories
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Library\nul mkdir ..\..\bin\release(v100)64\Repositories\Library
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Library\DataFiles\nul mkdir ..\..\bin\release(v100)64\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Session\nul mkdir ..\..\bin\release(v100)64\Repositories\Session
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Session\DataFiles\nul mkdir ..\..\bin\release(v100)64\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Site\nul mkdir ..\..\bin\release(v100)64\Repositories\Site
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\TileCache\nul mkdir ..\..\bin\release(v100)64\Repositories\TileCache
-
-release(v100)64 : ..\..\bin\release(v100)64\MgFoundation.dll \
- ..\..\bin\release(v100)64\MgFoundation.pdb \
- ..\..\bin\release(v100)64\MgGeometry.dll \
- ..\..\bin\release(v100)64\MgGeometry.pdb \
- ..\..\bin\release(v100)64\MgPlatformBase.dll \
- ..\..\bin\release(v100)64\MgPlatformBase.pdb \
- ..\..\bin\release(v100)64\MgMapGuideCommon.dll \
- ..\..\bin\release(v100)64\MgMapGuideCommon.pdb \
- ..\..\bin\release(v100)64\MgMdfModel.dll \
- ..\..\bin\release(v100)64\MgMdfModel.pdb \
- ..\..\bin\release(v100)64\MgMdfParser.dll \
- ..\..\bin\release(v100)64\MgMdfParser.pdb \
- ..\..\bin\release(v100)64\MgStylization.dll \
- ..\..\bin\release(v100)64\MgStylization.pdb \
- ..\..\bin\release(v100)64\MgRenderers.dll \
- ..\..\bin\release(v100)64\MgRenderers.pdb \
- ..\..\bin\release(v100)64\ACE.dll \
- ..\..\bin\release(v100)64\ACE.pdb \
- ..\..\bin\release(v100)64\gd.dll \
- ..\..\bin\release(v100)64\gd.pdb \
- ..\..\bin\release(v100)64\GEOS.dll \
- ..\..\bin\release(v100)64\GEOS.pdb \
- ..\..\bin\release(v100)64\libdb48.dll \
- ..\..\bin\release(v100)64\libdb48.pdb \
- ..\..\bin\release(v100)64\libdbxml25.dll \
- ..\..\bin\release(v100)64\libdbxml25.pdb \
- ..\..\bin\release(v100)64\xqilla24.dll \
- ..\..\bin\release(v100)64\xqilla24.pdb \
- ..\..\bin\release(v100)64\xerces-c_3_1mg.dll \
- ..\..\bin\release(v100)64\xerces-c_3_1mg.pdb \
- ..\..\bin\release(v100)64\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd \
- ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\PlotHole.mgp \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsrelease(v100)64 \
- CopyFdoProvidersrelease(v100)64 \
- CopySchemarelease(v100)64 \
- CopyResourcesrelease(v100)64 \
- CreatePathsrelease(v100)64 \
- CopyOgcFilesrelease(v100)64
-
-
-cleandebug(v100):
- if EXIST ..\..\bin\debug(v100)\MgFoundationd.dll del /F ..\..\bin\debug(v100)\MgFoundationd.dll
- if EXIST ..\..\bin\debug(v100)\MgFoundationd.pdb del /F ..\..\bin\debug(v100)\MgFoundationd.pdb
- if EXIST ..\..\bin\debug(v100)\MgGeometryd.dll del /F ..\..\bin\debug(v100)\MgGeometryd.dll
- if EXIST ..\..\bin\debug(v100)\MgGeometryd.pdb del /F ..\..\bin\debug(v100)\MgGeometryd.pdb
- if EXIST ..\..\bin\debug(v100)\MgPlatformBased.dll del /F ..\..\bin\debug(v100)\MgPlatformBased.dll
- if EXIST ..\..\bin\debug(v100)\MgPlatformBased.pdb del /F ..\..\bin\debug(v100)\MgPlatformBased.pdb
- if EXIST ..\..\bin\debug(v100)\MgMapGuideCommond.dll del /F ..\..\bin\debug(v100)\MgMapGuideCommond.dll
- if EXIST ..\..\bin\debug(v100)\MgMapGuideCommond.pdb del /F ..\..\bin\debug(v100)\MgMapGuideCommond.pdb
- if EXIST ..\..\bin\debug(v100)\MgMdfModeld.dll del /F ..\..\bin\debug(v100)\MgMdfModeld.dll
- if EXIST ..\..\bin\debug(v100)\MgMdfModeld.pdb del /F ..\..\bin\debug(v100)\MgMdfModeld.pdb
- if EXIST ..\..\bin\debug(v100)\MgMdfParserd.dll del /F ..\..\bin\debug(v100)\MgMdfParserd.dll
- if EXIST ..\..\bin\debug(v100)\MgMdfParserd.pdb del /F ..\..\bin\debug(v100)\MgMdfParserd.pdb
- if EXIST ..\..\bin\debug(v100)\MgStylizationd.dll del /F ..\..\bin\debug(v100)\MgStylizationd.dll
- if EXIST ..\..\bin\debug(v100)\MgStylizationd.pdb del /F ..\..\bin\debug(v100)\MgStylizationd.pdb
- if EXIST ..\..\bin\debug(v100)\MgRenderersd.dll del /F ..\..\bin\debug(v100)\MgRenderersd.dll
- if EXIST ..\..\bin\debug(v100)\MgRenderersd.pdb del /F ..\..\bin\debug(v100)\MgRenderersd.pdb
- if EXIST ..\..\bin\debug(v100)\ACEd.dll del /F ..\..\bin\debug(v100)\ACEd.dll
- if EXIST ..\..\bin\debug(v100)\ACEd.pdb del /F ..\..\bin\debug(v100)\ACEd.pdb
- if EXIST ..\..\bin\debug(v100)\gd.dll del /F ..\..\bin\debug(v100)\gd.dll
- if EXIST ..\..\bin\debug(v100)\gd.pdb del /F ..\..\bin\debug(v100)\gd.pdb
- if EXIST ..\..\bin\debug(v100)\GEOSd.dll del /F ..\..\bin\debug(v100)\GEOSd.dll
- if EXIST ..\..\bin\debug(v100)\GEOSd.pdb del /F ..\..\bin\debug(v100)\GEOSd.pdb
- if EXIST ..\..\bin\debug(v100)\libdb48d.dll del /F ..\..\bin\debug(v100)\libdb48d.dll
- if EXIST ..\..\bin\debug(v100)\libdb48d.pdb del /F ..\..\bin\debug(v100)\libdb48d.pdb
- if EXIST ..\..\bin\debug(v100)\libdbxml25d.dll del /F ..\..\bin\debug(v100)\libdbxml25d.dll
- if EXIST ..\..\bin\debug(v100)\libdbxml25d.pdb del /F ..\..\bin\debug(v100)\libdbxml25d.pdb
- if EXIST ..\..\bin\debug(v100)\xqilla24d.dll del /F ..\..\bin\debug(v100)\xqilla24d.dll
- if EXIST ..\..\bin\debug(v100)\xqilla24d.pdb del /F ..\..\bin\debug(v100)\xqilla24d.pdb
- if EXIST ..\..\bin\debug(v100)\xerces-c_3_1mgD.dll del /F ..\..\bin\debug(v100)\xerces-c_3_1mgD.dll
- if EXIST ..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb
- if EXIST ..\..\bin\debug(v100)\serverconfig.ini del /F ..\..\bin\debug(v100)\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\PlotHole.mgp del /F ..\..\bin\UnitTestFiles\PlotHole.mgp
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf del /F ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
- del /F ..\..\bin\debug(v100)\*.ilk
-
-
-cleandebug(v100)64:
- if EXIST ..\..\bin\debug(v100)64\MgFoundationd.dll del /F ..\..\bin\debug(v100)64\MgFoundationd.dll
- if EXIST ..\..\bin\debug(v100)64\MgFoundationd.pdb del /F ..\..\bin\debug(v100)64\MgFoundationd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgGeometryd.dll del /F ..\..\bin\debug(v100)64\MgGeometryd.dll
- if EXIST ..\..\bin\debug(v100)64\MgGeometryd.pdb del /F ..\..\bin\debug(v100)64\MgGeometryd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgPlatformBased.dll del /F ..\..\bin\debug(v100)64\MgPlatformBased.dll
- if EXIST ..\..\bin\debug(v100)64\MgPlatformBased.pdb del /F ..\..\bin\debug(v100)64\MgPlatformBased.pdb
- if EXIST ..\..\bin\debug(v100)64\MgMapGuideCommond.dll del /F ..\..\bin\debug(v100)64\MgMapGuideCommond.dll
- if EXIST ..\..\bin\debug(v100)64\MgMapGuideCommond.pdb del /F ..\..\bin\debug(v100)64\MgMapGuideCommond.pdb
- if EXIST ..\..\bin\debug(v100)64\MgMdfModeld.dll del /F ..\..\bin\debug(v100)64\MgMdfModeld.dll
- if EXIST ..\..\bin\debug(v100)64\MgMdfModeld.pdb del /F ..\..\bin\debug(v100)64\MgMdfModeld.pdb
- if EXIST ..\..\bin\debug(v100)64\MgMdfParserd.dll del /F ..\..\bin\debug(v100)64\MgMdfParserd.dll
- if EXIST ..\..\bin\debug(v100)64\MgMdfParserd.pdb del /F ..\..\bin\debug(v100)64\MgMdfParserd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgStylizationd.dll del /F ..\..\bin\debug(v100)64\MgStylizationd.dll
- if EXIST ..\..\bin\debug(v100)64\MgStylizationd.pdb del /F ..\..\bin\debug(v100)64\MgStylizationd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgRenderersd.dll del /F ..\..\bin\debug(v100)64\MgRenderersd.dll
- if EXIST ..\..\bin\debug(v100)64\MgRenderersd.pdb del /F ..\..\bin\debug(v100)64\MgRenderersd.pdb
- if EXIST ..\..\bin\debug(v100)64\ACEd.dll del /F ..\..\bin\debug(v100)64\ACEd.dll
- if EXIST ..\..\bin\debug(v100)64\ACEd.pdb del /F ..\..\bin\debug(v100)64\ACEd.pdb
- if EXIST ..\..\bin\debug(v100)64\gd.dll del /F ..\..\bin\debug(v100)64\gd.dll
- if EXIST ..\..\bin\debug(v100)64\gd.pdb del /F ..\..\bin\debug(v100)64\gd.pdb
- if EXIST ..\..\bin\debug(v100)64\GEOSd.dll del /F ..\..\bin\debug(v100)64\GEOSd.dll
- if EXIST ..\..\bin\debug(v100)64\GEOSd.pdb del /F ..\..\bin\debug(v100)64\GEOSd.pdb
- if EXIST ..\..\bin\debug(v100)64\libdb48d.dll del /F ..\..\bin\debug(v100)64\libdb48d.dll
- if EXIST ..\..\bin\debug(v100)64\libdb48d.pdb del /F ..\..\bin\debug(v100)64\libdb48d.pdb
- if EXIST ..\..\bin\debug(v100)64\libdbxml25d.dll del /F ..\..\bin\debug(v100)64\libdbxml25d.dll
- if EXIST ..\..\bin\debug(v100)64\libdbxml25d.pdb del /F ..\..\bin\debug(v100)64\libdbxml25d.pdb
- if EXIST ..\..\bin\debug(v100)64\xqilla24d.dll del /F ..\..\bin\debug(v100)64\xqilla24d.dll
- if EXIST ..\..\bin\debug(v100)64\xqilla24d.pdb del /F ..\..\bin\debug(v100)64\xqilla24d.pdb
- if EXIST ..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll del /F ..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll
- if EXIST ..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb
- if EXIST ..\..\bin\debug(v100)64\serverconfig.ini del /F ..\..\bin\debug(v100)64\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\PlotHole.mgp del /F ..\..\bin\UnitTestFiles\PlotHole.mgp
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf del /F ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
- del /F ..\..\bin\debug(v100)64\*.ilk
-
-
-cleanrelease(v100):
- if EXIST ..\..\bin\release(v100)\MgFoundation.dll del /F ..\..\bin\release(v100)\MgFoundation.dll
- if EXIST ..\..\bin\release(v100)\MgFoundation.pdb del /F ..\..\bin\release(v100)\MgFoundation.pdb
- if EXIST ..\..\bin\release(v100)\MgGeometry.dll del /F ..\..\bin\release(v100)\MgGeometry.dll
- if EXIST ..\..\bin\release(v100)\MgGeometry.pdb del /F ..\..\bin\release(v100)\MgGeometry.pdb
- if EXIST ..\..\bin\release(v100)\MgPlatformBase.dll del /F ..\..\bin\release(v100)\MgPlatformBase.dll
- if EXIST ..\..\bin\release(v100)\MgPlatformBase.pdb del /F ..\..\bin\release(v100)\MgPlatformBase.pdb
- if EXIST ..\..\bin\release(v100)\MgMapGuideCommon.dll del /F ..\..\bin\release(v100)\MgMapGuideCommon.dll
- if EXIST ..\..\bin\release(v100)\MgMapGuideCommon.pdb del /F ..\..\bin\release(v100)\MgMapGuideCommon.pdb
- if EXIST ..\..\bin\release(v100)\MgMdfModel.dll del /F ..\..\bin\release(v100)\MgMdfModel.dll
- if EXIST ..\..\bin\release(v100)\MgMdfModel.pdb del /F ..\..\bin\release(v100)\MgMdfModel.pdb
- if EXIST ..\..\bin\release(v100)\MgMdfParser.dll del /F ..\..\bin\release(v100)\MgMdfParser.dll
- if EXIST ..\..\bin\release(v100)\MgMdfParser.pdb del /F ..\..\bin\release(v100)\MgMdfParser.pdb
- if EXIST ..\..\bin\release(v100)\MgStylization.dll del /F ..\..\bin\release(v100)\MgStylization.dll
- if EXIST ..\..\bin\release(v100)\MgStylization.pdb del /F ..\..\bin\release(v100)\MgStylization.pdb
- if EXIST ..\..\bin\release(v100)\MgRenderers.dll del /F ..\..\bin\release(v100)\MgRenderers.dll
- if EXIST ..\..\bin\release(v100)\MgRenderers.pdb del /F ..\..\bin\release(v100)\MgRenderers.pdb
- if EXIST ..\..\bin\release(v100)\ACE.dll del /F ..\..\bin\release(v100)\ACE.dll
- if EXIST ..\..\bin\release(v100)\ACE.pdb del /F ..\..\bin\release(v100)\ACE.pdb
- if EXIST ..\..\bin\release(v100)\gd.dll del /F ..\..\bin\release(v100)\gd.dll
- if EXIST ..\..\bin\release(v100)\gd.pdb del /F ..\..\bin\release(v100)\gd.pdb
- if EXIST ..\..\bin\release(v100)\GEOS.dll del /F ..\..\bin\release(v100)\GEOS.dll
- if EXIST ..\..\bin\release(v100)\GEOS.pdb del /F ..\..\bin\release(v100)\GEOS.pdb
- if EXIST ..\..\bin\release(v100)\libdb48.dll del /F ..\..\bin\release(v100)\libdb48.dll
- if EXIST ..\..\bin\release(v100)\libdb48.pdb del /F ..\..\bin\release(v100)\libdb48.pdb
- if EXIST ..\..\bin\release(v100)\libdbxml25.dll del /F ..\..\bin\release(v100)\libdbxml25.dll
- if EXIST ..\..\bin\release(v100)\libdbxml25.pdb del /F ..\..\bin\release(v100)\libdbxml25.pdb
- if EXIST ..\..\bin\release(v100)\xqilla24.dll del /F ..\..\bin\release(v100)\xqilla24.dll
- if EXIST ..\..\bin\release(v100)\xqilla24.pdb del /F ..\..\bin\release(v100)\xqilla24.pdb
- if EXIST ..\..\bin\release(v100)\xerces-c_3_1mg.dll del /F ..\..\bin\release(v100)\xerces-c_3_1mg.dll
- if EXIST ..\..\bin\release(v100)\xerces-c_3_1mg.pdb del /F ..\..\bin\release(v100)\xerces-c_3_1mg.pdb
- if EXIST ..\..\bin\release(v100)\serverconfig.ini del /F ..\..\bin\release(v100)\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\PlotHole.mgp del /F ..\..\bin\UnitTestFiles\PlotHole.mgp
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf del /F ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
-
-cleanrelease(v100)64:
- if EXIST ..\..\bin\release(v100)64\MgFoundation.dll del /F ..\..\bin\release(v100)64\MgFoundation.dll
- if EXIST ..\..\bin\release(v100)64\MgFoundation.pdb del /F ..\..\bin\release(v100)64\MgFoundation.pdb
- if EXIST ..\..\bin\release(v100)64\MgGeometry.dll del /F ..\..\bin\release(v100)64\MgGeometry.dll
- if EXIST ..\..\bin\release(v100)64\MgGeometry.pdb del /F ..\..\bin\release(v100)64\MgGeometry.pdb
- if EXIST ..\..\bin\release(v100)64\MgPlatformBase.dll del /F ..\..\bin\release(v100)64\MgPlatformBase.dll
- if EXIST ..\..\bin\release(v100)64\MgPlatformBase.pdb del /F ..\..\bin\release(v100)64\MgPlatformBase.pdb
- if EXIST ..\..\bin\release(v100)64\MgMapGuideCommon.dll del /F ..\..\bin\release(v100)64\MgMapGuideCommon.dll
- if EXIST ..\..\bin\release(v100)64\MgMapGuideCommon.pdb del /F ..\..\bin\release(v100)64\MgMapGuideCommon.pdb
- if EXIST ..\..\bin\release(v100)64\MgMdfModel.dll del /F ..\..\bin\release(v100)64\MgMdfModel.dll
- if EXIST ..\..\bin\release(v100)64\MgMdfModel.pdb del /F ..\..\bin\release(v100)64\MgMdfModel.pdb
- if EXIST ..\..\bin\release(v100)64\MgMdfParser.dll del /F ..\..\bin\release(v100)64\MgMdfParser.dll
- if EXIST ..\..\bin\release(v100)64\MgMdfParser.pdb del /F ..\..\bin\release(v100)64\MgMdfParser.pdb
- if EXIST ..\..\bin\release(v100)64\MgStylization.dll del /F ..\..\bin\release(v100)64\MgStylization.dll
- if EXIST ..\..\bin\release(v100)64\MgStylization.pdb del /F ..\..\bin\release(v100)64\MgStylization.pdb
- if EXIST ..\..\bin\release(v100)64\MgRenderers.dll del /F ..\..\bin\release(v100)64\MgRenderers.dll
- if EXIST ..\..\bin\release(v100)64\MgRenderers.pdb del /F ..\..\bin\release(v100)64\MgRenderers.pdb
- if EXIST ..\..\bin\release(v100)64\ACE.dll del /F ..\..\bin\release(v100)64\ACE.dll
- if EXIST ..\..\bin\release(v100)64\ACE.pdb del /F ..\..\bin\release(v100)64\ACE.pdb
- if EXIST ..\..\bin\release(v100)64\gd.dll del /F ..\..\bin\release(v100)64\gd.dll
- if EXIST ..\..\bin\release(v100)64\gd.pdb del /F ..\..\bin\release(v100)64\gd.pdb
- if EXIST ..\..\bin\release(v100)64\GEOS.dll del /F ..\..\bin\release(v100)64\GEOS.dll
- if EXIST ..\..\bin\release(v100)64\GEOS.pdb del /F ..\..\bin\release(v100)64\GEOS.pdb
- if EXIST ..\..\bin\release(v100)64\libdb48.dll del /F ..\..\bin\release(v100)64\libdb48.dll
- if EXIST ..\..\bin\release(v100)64\libdb48.pdb del /F ..\..\bin\release(v100)64\libdb48.pdb
- if EXIST ..\..\bin\release(v100)64\libdbxml25.dll del /F ..\..\bin\release(v100)64\libdbxml25.dll
- if EXIST ..\..\bin\release(v100)64\libdbxml25.pdb del /F ..\..\bin\release(v100)64\libdbxml25.pdb
- if EXIST ..\..\bin\release(v100)64\xqilla24.dll del /F ..\..\bin\release(v100)64\xqilla24.dll
- if EXIST ..\..\bin\release(v100)64\xqilla24.pdb del /F ..\..\bin\release(v100)64\xqilla24.pdb
- if EXIST ..\..\bin\release(v100)64\xerces-c_3_1mg.dll del /F ..\..\bin\release(v100)64\xerces-c_3_1mg.dll
- if EXIST ..\..\bin\release(v100)64\xerces-c_3_1mg.pdb del /F ..\..\bin\release(v100)64\xerces-c_3_1mg.pdb
- if EXIST ..\..\bin\release(v100)64\serverconfig.ini del /F ..\..\bin\release(v100)64\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_OrigSize.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ_Metatiled.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSetXYZ.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\PlotHole.mgp del /F ..\..\bin\UnitTestFiles\PlotHole.mgp
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf del /F ..\..\bin\UnitTestFiles\MdfTestDisabledBounds.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
-
-
"..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml" :
"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" :
"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" :
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -64,7 +64,7 @@
IMgOperationHandler* MgDrawingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Drawing/DrawingServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgDrawingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -100,7 +100,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.DescribeDrawing");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Obtain the manifest from the DWF.
DWFInputStream* pStream = reader->extract(MANIFEST_XML.c_str(), false);
@@ -185,7 +185,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.GetSection");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.GetSection");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest (and get the mime type from the manifest)
DWFManifest& manifest = reader->getManifest();
@@ -277,7 +277,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.GetSectionResource");
CHECKARGUMENTEMPTYSTRING(resourceName, L"MgServerDrawingService.GetSectionResource");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Parse the section name from the resourceName
STRING::size_type index = resourceName.rfind(RESOURCENAME_SEPARATOR);
@@ -396,7 +396,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.EnumerateLayers");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.EnumerateLayers");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
@@ -539,7 +539,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.GetLayer");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.GetLayer");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
@@ -808,7 +808,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.EnumerateSections");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Get the ePlot sections in the DWF
DWFManifest& manifest = reader->getManifest();
@@ -927,7 +927,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.EnumerateSectionResources");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.EnumerateSectionResources");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -302,7 +302,7 @@
bool& bOpenTempFile, REFSTRING tempFileName)
{
Ptr<MgByteReader> byteReader;
- auto_ptr<DWFPackageReader> reader;
+ unique_ptr<DWFPackageReader> reader;
MG_SERVER_DRAWING_SERVICE_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -103,7 +103,7 @@
IMgOperationHandler* MgFeatureOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Feature/FeatureServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgFeatureServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Feature/TransformCache.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Feature/TransformCache.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Feature/TransformCache.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -52,7 +52,7 @@
private:
static ACE_Recursive_Thread_Mutex sm_mutex;
- auto_ptr<MgCSTrans> m_xform;
+ unique_ptr<MgCSTrans> m_xform;
Ptr<MgCoordinateSystem> m_coordSys;
Ptr<MgCoordinateSystemTransform> m_transform;
Ptr<MgEnvelope> m_envelope;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -56,7 +56,7 @@
IMgOperationHandler* MgKmlOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Kml/KmlServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgKmlServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Kml/ServerKmlService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Kml/ServerKmlService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Kml/ServerKmlService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -76,7 +76,7 @@
Ptr<MgResourceIdentifier> mapResId = map->GetMapDefinition();
//get the map definition
- auto_ptr<MdfModel::MapDefinition> mdf(MgMappingUtil::GetMapDefinition(m_svcResource, mapResId));
+ unique_ptr<MdfModel::MapDefinition> mdf(MgMappingUtil::GetMapDefinition(m_svcResource, mapResId));
STRING metadata = mdf->GetMetadata();
if(!metadata.empty())
@@ -147,7 +147,7 @@
//get layer definition
Ptr<MgResourceIdentifier> resId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
KmlContent kmlContent;
kmlContent.StartDocument();
@@ -245,7 +245,7 @@
InitializeResourceService();
}
Ptr<MgResourceIdentifier> resId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
if(gl != NULL)
{
@@ -896,7 +896,7 @@
STRING strCategoryIndex = L"-1";
//get layer definition
Ptr<MgResourceIdentifier> resId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
if(vl != NULL)
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Mapping/LegendPlotUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Mapping/LegendPlotUtil.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Mapping/LegendPlotUtil.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -293,7 +293,7 @@
continue;
Ptr<MgResourceIdentifier> layerid = mapLayer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
// Get bitmaps for rules/themes
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
@@ -588,7 +588,7 @@
//Reserve space for rules in the legend
// Get layer definition
Ptr<MgResourceIdentifier> layerid = mapLayer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -70,7 +70,7 @@
IMgOperationHandler* MgMappingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
switch (operationId)
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -65,7 +65,7 @@
IMgServiceHandler::MgProcessStatus MgMappingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingUtil.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingUtil.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -377,6 +377,14 @@
ACE_DEBUG((LM_INFO, L"(%t)StylizeLayers() **MAPSTART** Layers:%d Scale:%f\n", layers->GetCount(), scale));
#endif
+ // Check if we want to use global raster stylization lock from config
+ MgConfiguration* pConf = MgConfiguration::GetInstance();
+ bool bUseGlobalLock = true;
+ pConf->GetBoolValue(MgConfigProperties::RenderingServicePropertiesSection,
+ MgConfigProperties::RenderingServicePropertiesGlobalRasterStylizationLockEnabled,
+ bUseGlobalLock,
+ MgConfigProperties::DefaultRenderingServicePropertiesGlobalRasterStylizationLockEnabled);
+
// Cache coordinate system transforms for the life of the
// stylization operation.
TransformCacheMap transformCache;
@@ -641,10 +649,15 @@
//get a transform from layer coord sys to map coord sys
TransformCache* item = NULL;
+ if (bUseGlobalLock)
{
ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sg_fdoRfpMutex));
item = TransformCache::GetLayerToMapTransform(transformCache, gl->GetFeatureName(), featResId, dstCs, csFactory, svcFeature, true);
}
+ else
+ {
+ item = TransformCache::GetLayerToMapTransform(transformCache, gl->GetFeatureName(), featResId, dstCs, csFactory, svcFeature, true);
+ }
TCForProfile = item;
Ptr<MgCoordinateSystem> layerCs = item? item->GetCoordSys() : NULL;
@@ -739,11 +752,17 @@
//perform the raster query
FdoPtr<FdoIFeatureReader> fdoReader;
+ if (bUseGlobalLock)
{
ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sg_fdoRfpMutex));
rsReader = ExecuteRasterQuery(svcFeature, extent, gl, overrideFilter.c_str(), dstCs, layerCs, width, height);
fdoReader = (NULL == rsReader) ? NULL : rsReader->GetInternalReader();
}
+ else
+ {
+ rsReader = ExecuteRasterQuery(svcFeature, extent, gl, overrideFilter.c_str(), dstCs, layerCs, width, height);
+ fdoReader = (NULL == rsReader) ? NULL : rsReader->GetInternalReader();
+ }
if (NULL != fdoReader.p)
{
@@ -1226,7 +1245,7 @@
// draw the preview
StylizationUtil::DrawStylePreview(imgWidth, imgHeight, themeCategory, fts, &er, &se_sman);
- auto_ptr<RS_ByteData> data;
+ unique_ptr<RS_ByteData> data;
data.reset(er.Save(format, imgWidth, imgHeight));
if (NULL != data.get())
Property changes on: sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
## -5,4 +5,5 ##
/sandbox/jng/clean_json/Server/src/Services/Mapping/MappingUtil.cpp:8818-9180
/sandbox/jng/createruntimemap/Server/src/Services/Mapping/MappingUtil.cpp:7486-7555
/sandbox/jng/ogc/Server/src/Services/Mapping/MappingUtil.cpp:9240-9255
-/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
\ No newline at end of property
+/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
+/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:9742-9863
\ No newline at end of property
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Mapping/ServerMappingService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Mapping/ServerMappingService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -946,7 +946,7 @@
if (m_svcResource == NULL)
InitializeResourceService();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resource));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resource));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -55,7 +55,7 @@
IMgOperationHandler* MgProfilingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ProfilingServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgProfilingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ServerProfilingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ServerProfilingService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Profiling/ServerProfilingService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -59,7 +59,7 @@
MG_TRY()
CHECKARGUMENTNULL(map, L"MgServerProfilingService.ProfileRenderDynamicOverlay");
- auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
+ unique_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
// Start to profile the ProfileRenderDynamicOverlay process
@@ -72,7 +72,7 @@
// Serialize the ProfileRenderMapResult to xml
MdfParser::SAX2Parser parser;
- auto_ptr<Version> version;
+ unique_ptr<Version> version;
version.reset(new Version(2,4,0));
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
@@ -98,7 +98,7 @@
MG_TRY()
CHECKARGUMENTNULL(map, L"MgServerProfilingService.ProfileRenderMap");
- auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
+ unique_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
// Start to profile the ProfileRenderMap process
@@ -111,7 +111,7 @@
// Serialize the ProfileRenderMapResult to xml
MdfParser::SAX2Parser parser;
- auto_ptr<Version> version;
+ unique_ptr<Version> version;
version.reset(new Version(2,4,0));
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -120,7 +120,7 @@
Ptr<MgRenderingOptions> options = (MgRenderingOptions*)m_stream->GetObject();
- auto_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
+ unique_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
pProfileRenderMapResult.reset((ProfileRenderMapResult*)m_stream->GetObject());
BeginExecution();
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderMap.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderMap.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Rendering/OpRenderMap.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -441,7 +441,7 @@
}
else
{
- auto_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
+ unique_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
pProfileRenderMapResult.reset((ProfileRenderMapResult*)m_stream->GetObject());
BeginExecution();
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -55,7 +55,7 @@
IMgOperationHandler* MgRenderingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Rendering/RenderingServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgRenderingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -43,7 +43,6 @@
#define MVT_TILE_HEIGHT 4096
// the maximum number of allowed pixels for rendered images
-static const INT32 MAX_PIXELS = 16384*16384;
static const INT32 FILTER_VISIBLE = 1;
static const INT32 FILTER_SELECTABLE = 2;
static const INT32 FILTER_HASTOOLTIPS = 4;
@@ -84,35 +83,45 @@
MgConfiguration* pConf = MgConfiguration::GetInstance();
pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
- MgConfigProperties::RenderingServicePropertyRasterGridSize,
- m_rasterGridSize,
- MgConfigProperties::DefaultRenderingServicePropertyRasterGridSize);
+ MgConfigProperties::RenderingServicePropertyRasterGridSize,
+ m_rasterGridSize,
+ MgConfigProperties::DefaultRenderingServicePropertyRasterGridSize);
pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
- MgConfigProperties::RenderingServicePropertyMinRasterGridSize,
- m_minRasterGridSize,
- MgConfigProperties::DefaultRenderingServicePropertyMinRasterGridSize);
+ MgConfigProperties::RenderingServicePropertyMinRasterGridSize,
+ m_minRasterGridSize,
+ MgConfigProperties::DefaultRenderingServicePropertyMinRasterGridSize);
pConf->GetDoubleValue(MgConfigProperties::RenderingServicePropertiesSection,
- MgConfigProperties::RenderingServicePropertyRasterGridSizeOverrideRatio,
- m_rasterGridSizeOverrideRatio,
- MgConfigProperties::DefaultRenderingServicePropertyRasterGridSizeOverrideRatio);
+ MgConfigProperties::RenderingServicePropertyRasterGridSizeOverrideRatio,
+ m_rasterGridSizeOverrideRatio,
+ MgConfigProperties::DefaultRenderingServicePropertyRasterGridSizeOverrideRatio);
pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
- MgConfigProperties::RenderingServicePropertyRenderSelectionBatchSize,
- m_renderSelectionBatchSize,
- MgConfigProperties::DefaultRenderingServicePropertyRenderSelectionBatchSize);
+ MgConfigProperties::RenderingServicePropertyRenderSelectionBatchSize,
+ m_renderSelectionBatchSize,
+ MgConfigProperties::DefaultRenderingServicePropertyRenderSelectionBatchSize);
pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
- MgConfigProperties::RenderingServicePropertyMaxRasterImageWidth,
- m_maxRasterImageWidth,
- MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageWidth);
+ MgConfigProperties::RenderingServicePropertyMaxRasterImageWidth,
+ m_maxRasterImageWidth,
+ MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageWidth);
pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
- MgConfigProperties::RenderingServicePropertyMaxRasterImageHeight,
- m_maxRasterImageHeight,
- MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageHeight);
+ MgConfigProperties::RenderingServicePropertyMaxRasterImageHeight,
+ m_maxRasterImageHeight,
+ MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageHeight);
+ pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
+ MgConfigProperties::RenderingServicePropertyMaxRenderImageWidth,
+ m_maxRenderImageWidth,
+ MgConfigProperties::DefaultRenderingServicePropertyMaxRenderImageWidth);
+
+ pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
+ MgConfigProperties::RenderingServicePropertyMaxRenderImageHeight,
+ m_maxRenderImageHeight,
+ MgConfigProperties::DefaultRenderingServicePropertyMaxRenderImageHeight);
+
// there should only be one instance of this class, so it's safe to
// directly set these static variables
bool bClampPoints;
@@ -348,7 +357,7 @@
//printf("XYZ(%d, %d, %d) -> [%f, %f] [%f, %f] at %f -- (w: %d, h: %d, mpu: %f)\n", x, y, z, mcsMinX, mcsMinY, mcsMaxX, mcsMaxY, scale, width, height, map->GetMetersPerUnit());
// sanity check - number of image pixels cannot exceed MAX_PIXELS
- if (drawWidth * drawHeight > MAX_PIXELS)
+ if (drawWidth * drawHeight > (m_maxRenderImageHeight * m_maxRenderImageWidth))
throw new MgException(MgExceptionCodes::MgOutOfRangeException, L"MgServerRenderingService.RenderTileUTFGrid", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
// create a temporary collection containing all the layers for the base group
@@ -518,6 +527,9 @@
if (userInfo != NULL)
sessionId = userInfo->GetMgSessionId();
+#ifdef _DEBUG
+ ACE_DEBUG((LM_INFO, ACE_TEXT("(%t) Render MVT for (x: %d, y: %d, z: %d)\n"), x, y, z));
+#endif
MVTRenderer dr(x, y, z);
RSMgSymbolManager mgr(m_svcResource);
@@ -692,7 +704,7 @@
throw new MgException(MgExceptionCodes::MgInvalidArgumentException, L"MgServerRenderingService.RenderDynamicOverlay", __LINE__, __WFILE__, NULL, L"MgMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
- if (width * height > MAX_PIXELS)
+ if (width * height > (m_maxRenderImageHeight * m_maxRenderImageWidth))
throw new MgException(MgExceptionCodes::MgOutOfRangeException, L"MgServerRenderingService.RenderDynamicOverlay", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
// compute map extent that corresponds to pixel extent
@@ -897,7 +909,7 @@
ComputeScaledDimensions(b, width, height, dpi, metersPerUnit, drawWidth, drawHeight, scale);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
- if (drawWidth * drawHeight > MAX_PIXELS)
+ if (drawWidth * drawHeight > (m_maxRenderImageHeight * m_maxRenderImageWidth))
throw new MgException(MgExceptionCodes::MgOutOfRangeException, L"MgServerRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
// use the supplied background color
@@ -1028,7 +1040,7 @@
throw new MgException(MgExceptionCodes::MgInvalidArgumentException, L"MgServerRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
- if (width * height > MAX_PIXELS)
+ if (width * height > (m_maxRenderImageHeight * m_maxRenderImageWidth))
throw new MgException(MgExceptionCodes::MgOutOfRangeException, L"MgServerRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
double unitsPerPixel = METERS_PER_INCH / (double)dpi / metersPerUnit;
@@ -1438,7 +1450,7 @@
throw new MgException(MgExceptionCodes::MgInvalidArgumentException, L"MgServerRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
- if (width * height > MAX_PIXELS)
+ if (width * height > (m_maxRenderImageHeight * m_maxRenderImageWidth))
throw new MgException(MgExceptionCodes::MgOutOfRangeException, L"MgServerRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
RS_Color bgcolor(backgroundColor->GetRed(),
@@ -2573,7 +2585,7 @@
//printf("XYZ(%d, %d, %d) -> [%f, %f] [%f, %f] at %f -- (w: %d, h: %d, mpu: %f)\n", x, y, z, mcsMinX, mcsMinY, mcsMaxX, mcsMaxY, scale, width, height, map->GetMetersPerUnit());
// sanity check - number of image pixels cannot exceed MAX_PIXELS
- if (drawWidth * drawHeight > MAX_PIXELS)
+ if (drawWidth * drawHeight > (m_maxRenderImageHeight * m_maxRenderImageWidth))
throw new MgException(MgExceptionCodes::MgOutOfRangeException, L"MgServerRenderingService.RenderMetatileXYZ", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
// initialize the renderer (set clipping to false so that we label
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Rendering/ServerRenderingService.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -419,6 +419,9 @@
INT32 m_renderSelectionBatchSize;
INT32 m_maxRasterImageWidth;
INT32 m_maxRasterImageHeight;
+
+ INT32 m_maxRenderImageWidth;
+ INT32 m_maxRenderImageHeight;
};
#endif
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ApplicationRepositoryManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ApplicationRepositoryManager.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ApplicationRepositoryManager.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -560,7 +560,7 @@
bool overwrite)
{
assert(NULL != sourceResource && NULL != destResource) ;
- auto_ptr<MgApplicationRepositoryManager> sourceRepositoryMan;
+ unique_ptr<MgApplicationRepositoryManager> sourceRepositoryMan;
MG_RESOURCE_SERVICE_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/LibraryRepositoryManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/LibraryRepositoryManager.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/LibraryRepositoryManager.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -173,7 +173,7 @@
bool logActivities)
{
ACE_ASSERT(!packagePathname.empty());
- auto_ptr<MgResourcePackageLoader> packageLoader;
+ unique_ptr<MgResourcePackageLoader> packageLoader;
MG_RESOURCE_SERVICE_TRY()
@@ -200,7 +200,7 @@
{
ACE_ASSERT(NULL != resource && !packagePathname.empty());
- auto_ptr<MgResourcePackageMaker> packageMaker;
+ unique_ptr<MgResourcePackageMaker> packageMaker;
MG_RESOURCE_SERVICE_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -41,7 +41,7 @@
m_currUserIsAdmin(false),
m_currUserIsAuthor(false),
m_dbTxn(NULL),
- m_xmlTxn(NULL)
+ m_xmlTxn((XmlTransaction*)NULL)
{
// Set the source and destination repository managers are the same by default.
m_sourceRepositoryMan = this;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/RepositoryManager.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -112,7 +112,7 @@
protected:
- auto_ptr<MgSecurityManager> m_securityMan;
+ unique_ptr<MgSecurityManager> m_securityMan;
Ptr<MgUserInformation> m_currUserInfo;
bool m_currUserIsAdmin;
@@ -121,7 +121,7 @@
MgRepositoryManager* m_sourceRepositoryMan;
DbTxn* m_dbTxn;
- auto_ptr<XmlTransaction> m_xmlTxn;
+ unique_ptr<XmlTransaction> m_xmlTxn;
time_t m_accessedTime;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceContainer.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceContainer.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceContainer.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -55,7 +55,7 @@
private:
- auto_ptr<XmlContainer> m_xmlContainer;
+ unique_ptr<XmlContainer> m_xmlContainer;
};
/// Inline Methods
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeader.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeader.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeader.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -76,12 +76,12 @@
private:
- auto_ptr<MgXmlUtil> m_xmlUtil;
+ unique_ptr<MgXmlUtil> m_xmlUtil;
INT32 m_properties;
INT32 m_numFolders;
INT32 m_numDocuments;
bool m_inherited;
- auto_ptr<MgResourceInfo> m_resourceInfo;
+ unique_ptr<MgResourceInfo> m_resourceInfo;
bool m_securityInfoFromParent;
};
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -1089,7 +1089,7 @@
// Write the resource list.
- auto_ptr<MgResourceHeader> resourceHeader;
+ unique_ptr<MgResourceHeader> resourceHeader;
resourceHeader.reset(new MgResourceHeader());
resourceHeader->Initialize(currResource, xmlDoc, properties);
@@ -1543,7 +1543,7 @@
XmlQueryExpression& selectGroupNames,
XmlQueryExpression& selectGroupPermissions)
{
- auto_ptr<MgPermissionInfo> permissionInfo;
+ unique_ptr<MgPermissionInfo> permissionInfo;
MG_RESOURCE_SERVICE_TRY()
@@ -1998,7 +1998,7 @@
MgPermissionCache* permissionCache)
{
assert(NULL != permissionCache);
- auto_ptr<MgPermissionInfo> permissionInfo;
+ unique_ptr<MgPermissionInfo> permissionInfo;
MG_RESOURCE_SERVICE_TRY()
@@ -2782,7 +2782,7 @@
// Allow only the owner or the Administrator to change the permission
// information.
- auto_ptr<MgPermissionInfo> oldPermissionInfo(CreatePermissionInfo(
+ unique_ptr<MgPermissionInfo> oldPermissionInfo(CreatePermissionInfo(
xmlDoc, queryContext,
selectInheritedFlags,
selectUserNames, selectUserPermissions,
@@ -2791,7 +2791,7 @@
xmlDoc.setContent(xmlStr);
- auto_ptr<MgPermissionInfo> newPermissionInfo(CreatePermissionInfo(
+ unique_ptr<MgPermissionInfo> newPermissionInfo(CreatePermissionInfo(
xmlDoc, queryContext,
selectInheritedFlags,
selectUserNames, selectUserPermissions,
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceHeaderManager.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -171,7 +171,7 @@
friend class MgLibraryRepositoryManager;
- auto_ptr<MgPermissionManager> m_permissionMan;
+ unique_ptr<MgPermissionManager> m_permissionMan;
Ptr<MgPermissionCache> m_permissionCache;
string m_defaultRootHeader;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -94,7 +94,7 @@
IMgOperationHandler* MgResourceOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_RESOURCE_SERVICE_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageLoader.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageLoader.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageLoader.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -72,7 +72,7 @@
private:
- auto_ptr<MgZipFileReader> m_zipFileReader;
+ unique_ptr<MgZipFileReader> m_zipFileReader;
MgResourcePackageManifestParser m_manifestParser;
};
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -168,7 +168,7 @@
GeneratePathnames(resource, postfix, resourcePathname, archivePathname);
// Initialize the operation information.
- auto_ptr<MgOperationInfo> opInfo;
+ unique_ptr<MgOperationInfo> opInfo;
if (resource.IsRoot())
{
@@ -269,7 +269,7 @@
if (!resource.IsFolder())
{
// Initialize the operation information.
- auto_ptr<MgOperationInfo> opInfo;
+ unique_ptr<MgOperationInfo> opInfo;
opInfo.reset(new MgOperationInfo(MgOperationName::DeleteResource));
MgOperationParameter opParam;
@@ -337,7 +337,7 @@
GeneratePathnames(resource, postfix, resourcePathname, archivePathname);
// Initialize the operation information.
- auto_ptr<MgOperationInfo> opInfo;
+ unique_ptr<MgOperationInfo> opInfo;
opInfo.reset(new MgOperationInfo(MgOperationName::SetResourceData));
MgOperationParameter opParam;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageMaker.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -66,7 +66,7 @@
private:
- auto_ptr<MgZipFileWriter> m_zipFileWriter;
+ unique_ptr<MgZipFileWriter> m_zipFileWriter;
MgResourcePackageManifestSerializer m_manifestSerializer;
MgResourceOperationMap m_resourceOperationMap;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageManifestHandler.h
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageManifestHandler.h 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourcePackageManifestHandler.h 2021-07-16 09:04:49 UTC (rev 9864)
@@ -52,7 +52,7 @@
protected:
- auto_ptr<MgXmlUtil> m_xmlUtil;
+ unique_ptr<MgXmlUtil> m_xmlUtil;
STRING m_description;
};
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ResourceServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -64,7 +64,7 @@
IMgServiceHandler::MgProcessStatus MgResourceServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -290,7 +290,7 @@
if(sm_bSingleSessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -310,7 +310,7 @@
if(0 == sm_sessionRepositories.size())
{
// Since there are no sessions yet we will need to check access rights ourselves
- auto_ptr<MgSecurityManager> securityMan;
+ unique_ptr<MgSecurityManager> securityMan;
securityMan.reset(new MgSecurityManager());
Ptr<MgUserInformation> currUserInfo = MgUserInformation::GetCurrentUserInfo();
@@ -352,7 +352,7 @@
MgSessionRepository* sessionRepository = i->second;
if(NULL != sessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -414,7 +414,7 @@
if(sm_bSingleSessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
int maxRetries = sm_retryAttempts;
@@ -442,7 +442,7 @@
}
else
{
- auto_ptr<MgSecurityManager> securityMan;
+ unique_ptr<MgSecurityManager> securityMan;
securityMan.reset(new MgSecurityManager());
Ptr<MgUserInformation> currUserInfo = MgUserInformation::GetCurrentUserInfo();
@@ -497,7 +497,7 @@
// Initialize the session repository
sessionRepository->Initialize();
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sessionRepository));
int maxRetries = sm_retryAttempts;
@@ -563,7 +563,7 @@
L"MgServerResourceService.DeleteRepository", __LINE__, __WFILE__, NULL, L"", NULL);
}
- auto_ptr<MgSecurityManager> securityMan;
+ unique_ptr<MgSecurityManager> securityMan;
securityMan.reset(new MgSecurityManager());
Ptr<MgUserInformation> currUserInfo = MgUserInformation::GetCurrentUserInfo();
@@ -592,7 +592,7 @@
if(sm_bSingleSessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -615,7 +615,7 @@
MgSessionRepository* sessionRepository = iter->second;
if(NULL != sessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -670,7 +670,7 @@
L"MgServerResourceService.UpdateRepository", __LINE__, __WFILE__, NULL, L"", NULL);
}
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
int maxRetries = sm_retryAttempts;
@@ -720,7 +720,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.GetRepositoryContent");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -763,7 +763,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -789,7 +789,7 @@
CHECKARGUMENTNULL(packageStream, L"MgServerResourceService.ApplyResourcePackage");
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
int maxRetries = sm_retryAttempts;
@@ -836,7 +836,7 @@
__LINE__, __WFILE__, &arguments, L"", NULL);
}
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -880,7 +880,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -907,7 +907,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.ResourceExists");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -951,7 +951,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -989,7 +989,7 @@
logDetail.AddInt64(L"HeaderSize", NULL != header ? header->GetLength() : 0);
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
int maxRetries = sm_retryAttempts;
@@ -1041,7 +1041,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.DeleteResource");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1081,7 +1081,7 @@
CHECKARGUMENTNULL(sourceResource, L"MgServerResourceService.MoveResource");
CHECKARGUMENTNULL(destResource, L"MgServerResourceService.MoveResource");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(destResource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1116,7 +1116,7 @@
CHECKARGUMENTNULL(sourceResource, L"MgServerResourceService.CopyResource");
CHECKARGUMENTNULL(destResource, L"MgServerResourceService.CopyResource");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(destResource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1155,7 +1155,7 @@
logDetail.AddString(L"Tags", preProcessTags);
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1198,7 +1198,7 @@
Ptr<MgResourceIdentifier> resourceId = new MgResourceIdentifier(resource);
Ptr<MgByteReader> byteReader;
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resourceId));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1246,7 +1246,7 @@
logDetail.Create();
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1290,7 +1290,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1325,7 +1325,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.EnumerateReferences");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1601,7 +1601,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateResourceDocuments()");
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1644,7 +1644,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1683,7 +1683,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1716,7 +1716,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.EnumerateResourceData");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1757,7 +1757,7 @@
logDetail.AddInt64(L"Size", data->GetLength());
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
int maxRetries = sm_retryAttempts;
@@ -1803,7 +1803,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.DeleteResourceData");
CHECKARGUMENTEMPTYSTRING(dataName, L"MgServerResourceService.DeleteResourceData");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1839,7 +1839,7 @@
CHECKARGUMENTEMPTYSTRING(oldDataName, L"MgServerResourceService.RenameResourceData");
CHECKARGUMENTEMPTYSTRING(newDataName, L"MgServerResourceService.RenameResourceData");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1881,7 +1881,7 @@
logDetail.AddString(L"Tags", preProcessTags);
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1910,7 +1910,7 @@
MgResourceIdentifier* resource)
{
ACE_ASSERT(NULL != resource);
- auto_ptr<MgApplicationRepositoryManager> repositoryMan;
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan;
STRING repositoryType = resource->GetRepositoryType();
MG_RESOURCE_SERVICE_TRY()
@@ -1984,7 +1984,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2016,7 +2016,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::AddUser()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2044,7 +2044,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::DeleteUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2073,7 +2073,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::UpdateUser()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2105,7 +2105,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2134,7 +2134,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::AddGroup()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2161,7 +2161,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::DeleteGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2190,7 +2190,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::UpdateGroup()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2228,7 +2228,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::GrantGroupMembershipsToUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2266,7 +2266,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::RevokeGroupMembershipsFromUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2312,7 +2312,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateRoles()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2378,7 +2378,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::GrantRoleMembershipsToUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2416,7 +2416,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::RevokeRoleMembershipsFromUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2454,7 +2454,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::GrantRoleMembershipsToGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2492,7 +2492,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::RevokeRoleMembershipsFromGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2516,7 +2516,7 @@
MG_RESOURCE_SERVICE_TRY()
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2547,7 +2547,7 @@
MG_RESOURCE_SERVICE_TRY()
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2580,7 +2580,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.CheckPermission");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MgResourceContentManager* resourceContentMan =
repositoryMan->GetResourceContentManager();
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/SiteResourceContentManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/SiteResourceContentManager.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/SiteResourceContentManager.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -2388,9 +2388,9 @@
STRING resourcePathname;
STRING name, password;
- auto_ptr<MgUserInfo> userInfo;
- auto_ptr<MgGroupInfo> groupInfo;
- auto_ptr<MgRoleInfo> roleInfo;
+ unique_ptr<MgUserInfo> userInfo;
+ unique_ptr<MgGroupInfo> groupInfo;
+ unique_ptr<MgRoleInfo> roleInfo;
XmlDocument xmlDoc;
Modified: sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -88,7 +88,7 @@
IMgOperationHandler* MgServerAdminOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -68,7 +68,7 @@
IMgServiceHandler::MgProcessStatus MgServerAdminServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -100,7 +100,7 @@
IMgOperationHandler* MgSiteOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_SITE_SERVICE_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Site/SiteServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgSiteServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileOperationFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileOperationFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileOperationFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -55,7 +55,7 @@
IMgOperationHandler* MgTileOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileServiceHandler.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileServiceHandler.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Tile/TileServiceHandler.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgTileServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestMisc.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestMisc.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestMisc.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -892,6 +892,19 @@
REQUIRE(L"123.34574834" == ws);
REQUIRE("123.34574834" == s);
+
+ // Brought about by: https://trac.osgeo.org/mapguide/ticket/2832
+ // impl: Should std::setprecision be rounding in such a case?
+ double d3 = 486772.999999999;
+
+ ws.clear();
+ s.clear();
+
+ MgUtil::DoubleToString(d3, ws, 7);
+ MgUtil::DoubleToString(d3, s, 7);
+
+ REQUIRE(L"486773" == ws);
+ REQUIRE("486773" == s);
}
catch (MgException* e)
{
@@ -1245,4 +1258,34 @@
{
throw;
}
+}
+
+TEST_CASE("GeoJsonRounding", "[Misc]")
+{
+ try
+ {
+ Ptr<MgGeoJsonWriter> gjw = new MgGeoJsonWriter();
+ Ptr<MgWktReaderWriter> wktRw = new MgWktReaderWriter();
+ //STRING wkt = L"POLYGON ((486750.766 5784456.011, 486728.359 5784446.655, 486706.876 5784437.296, 486690.777 5784429.9, 486676.834 5784422.189, 486659.232 5784411.444, 486646.087 5784401.948, 486648.067 5784395.8, 486651.508 5784385.121, 486652.819 5784381.05, 486655.289 5784373.384, 486657.158 5784367.581, 486667.279 5784336.166, 486668.836 5784331.334, 486672.166 5784320.995, 486679.091 5784299.499, 486680.004 5784296.665, 486657.192 5784287.844, 486652.536 5784286.043, 486650.669 5784285.322, 486652.693 5784279.674, 486646.319 5784277.197, 486607.544 5784262.129, 486611.782 5784254.856, 486619.71 5784241.874, 486641.348 5784265.104, 486664.672 5784243.409, 486693.607 5784248.872, 486704.871 5784250.998, 486706.382 5784246.318, 486711.838 5784229.225, 486715.044 5784219.176, 486735.317 5784222.052, 486746.793 5784224.479, 486746.643 5784225.14, 486753.34 5784226.848, 486760.007 5784228.698, 486766.554 5784230.807, 486772.999999999 5784233.246, 486779.257 5784236.075, 4867
85.374 5784239.294, 486797.129 5784246.463, 486802.768 5784250.362, 486813.835 5784258.681, 486814.204 5784258.151, 486825.248 5784266.724, 486827.881 5784268.769, 486828.191 5784268.399, 486846.766 5784284.326, 486847.798 5784285.214, 486835.598 5784319.835, 486820.899 5784364.066, 486835.747 5784374.205, 486823.91 5784435.848, 486846.995 5784450.096, 486846.814 5784457.889, 486846.658 5784464.636, 486846.617 5784468.126, 486846.57 5784470.327, 486846.732 5784481.668, 486846.22 5784483.886, 486843.72 5784484.496, 486841.391 5784484.935, 486820.463 5784478.249, 486799.031 5784472.704, 486775.631 5784464.912, 486750.766 5784456.011))";
+
+ STRING wkt = L"POINT (5784230.807 486772.999999999)";
+
+ Ptr<MgGeometry> geom = wktRw->Read(wkt);
+ STRING jsonStr;
+ gjw->SetPrecision(7);
+ gjw->SetPrecisionEnabled(true);
+ gjw->ToGeoJson(geom, jsonStr);
+
+ REQUIRE(L"\"geometry\": { \"type\": \"Point\", \"coordinates\": [5784230.807, 486773]}" == jsonStr);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TestServiceFactory::TEST_LOCALE);
+ SAFE_RELEASE(e);
+ FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
}
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestRenderingService.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestRenderingService.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -1696,4 +1696,89 @@
{
throw;
}
+}
+
+TEST_CASE("RenderDynamicOverlayGroupNesting", "[RenderingService]") //Tagged as [RenderingService] so we can piggyback off of the test data set up already for these tests
+{
+ std::string xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+ "<MapDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" version=\"3.0.0\" xsi:noNamespaceSchemaLocation=\"MapDefinition-3.0.0.xsd\">"
+ "<Name>Map</Name>"
+ "<CoordinateSystem>PROJCS[\"WGS84.PseudoMercator\",GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137.000,298.25722293]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]],PROJECTION[\"Popular Visualisation Pseudo Mercator\"],PARAMETER[\"false_easting\",0.000],PARAMETER[\"false_northing\",0.000],PARAMETER[\"central_meridian\",0.00000000000000],UNIT[\"Meter\",1.00000000000000]]</CoordinateSystem>"
+ "<Extents><MinX>973212</MinX><MaxX>992653</MaxX><MinY>6528182</MinY><MaxY>6541983</MaxY></Extents>"
+ "<BackgroundColor>ffffffff</BackgroundColor>"
+ "<MapLayer>"
+ "<Name>countries</Name>"
+ "<ResourceId>Library://UnitTests/Layers/RoadCenterLines.LayerDefinition</ResourceId>"
+ "<Selectable>true</Selectable>"
+ "<ShowInLegend>true</ShowInLegend>"
+ "<LegendLabel>Baum</LegendLabel>"
+ "<ExpandInLegend>true</ExpandInLegend>"
+ "<Visible>true</Visible>"
+ "<Group>group3</Group>"
+ "</MapLayer>"
+ "<MapLayerGroup>"
+ "<Name>group2</Name>"
+ "<Visible>true</Visible>"
+ "<ShowInLegend>true</ShowInLegend>"
+ "<ExpandInLegend>true</ExpandInLegend>"
+ "<LegendLabel>group2</LegendLabel>"
+ "<Group>group1</Group>"
+ "</MapLayerGroup>"
+ "<MapLayerGroup>"
+ "<Name>group3</Name>"
+ "<Visible>true</Visible>"
+ "<ShowInLegend>true</ShowInLegend>"
+ "<ExpandInLegend>true</ExpandInLegend>"
+ "<LegendLabel>group3</LegendLabel>"
+ "<Group>group2</Group>"
+ "</MapLayerGroup>"
+ "<MapLayerGroup>"
+ "<Name>group1</Name>"
+ "<Visible>true</Visible>"
+ "<ShowInLegend>true</ShowInLegend>"
+ "<ExpandInLegend>true</ExpandInLegend>"
+ "<LegendLabel>group1</LegendLabel>"
+ "<Group />"
+ "</MapLayerGroup>"
+ "<Watermarks />"
+ "</MapDefinition>";
+
+ try
+ {
+
+ Ptr<MgByteSource> bs = new MgByteSource((BYTE_ARRAY_IN)xml.c_str(), (INT32)xml.length());
+ Ptr<MgByteReader> content = bs->GetReader();
+
+ Ptr<MgResourceService> resSvc = TestServiceFactory::CreateResourceService();
+ Ptr<MgResourceIdentifier> mdfId = new MgResourceIdentifier(L"Library://UnitTests/Maps/GroupTesting.MapDefinition");
+ resSvc->SetResource(mdfId, content, nullptr);
+
+ Ptr<MgServerSiteService> svcSite = TestServiceFactory::CreateSiteService();
+ Ptr<MgSiteConnection> m_siteConnection = TestServiceFactory::CreateSiteConnection(svcSite);
+
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfId, mdfId->GetName());
+
+ Ptr<MgCoordinate> coordNewCenter = new MgCoordinateXY(-87.733253, 43.746199);
+ Ptr<MgPoint> ptNewCenter = new MgPoint(coordNewCenter);
+ map->SetViewCenter(ptNewCenter);
+ map->SetViewScale(12000.0);
+ map->SetDisplayDpi(96);
+ map->SetDisplayWidth(1024);
+ map->SetDisplayHeight(1024);
+
+ Ptr<MgRenderingService> renderSvc = TestServiceFactory::CreateRenderingService();
+ Ptr<MgRenderingOptions> renderOpts = new MgRenderingOptions(MgImageFormats::Png, MgRenderingOptions::RenderLayers, nullptr);
+ Ptr<MgByteReader> image = renderSvc->RenderDynamicOverlay(map, nullptr, renderOpts);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TestServiceFactory::TEST_LOCALE);
+ SAFE_RELEASE(e);
+ FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
}
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestServiceFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestServiceFactory.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Server/src/UnitTesting/TestServiceFactory.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -885,93 +885,93 @@
Ptr<MgResourceIdentifier> mapres13 = new MgResourceIdentifier(L"Library://UnitTests/Maps/BaseMap.MapDefinition");
Ptr<MgByteSource> mdfsrc13 = new MgByteSource(L"../UnitTestFiles/UT_BaseMap.mdf", false);
Ptr<MgByteReader> mdfrdr13 = mdfsrc13->GetReader();
-svcResource->SetResource(mapres13, mdfrdr13, nullptr);
+ svcResource->SetResource(mapres13, mdfrdr13, nullptr);
-// publish the layer definitions
-Ptr<MgResourceIdentifier> ldfres12 = new MgResourceIdentifier(L"Library://UnitTests/Layers/RoadCenterLines.LayerDefinition");
-Ptr<MgByteSource> ldfsrc12 = new MgByteSource(L"../UnitTestFiles/UT_RoadCenterLines.ldf", false);
-Ptr<MgByteReader> ldfrdr12 = ldfsrc12->GetReader();
-svcResource->SetResource(ldfres12, ldfrdr12, nullptr);
+ // publish the layer definitions
+ Ptr<MgResourceIdentifier> ldfres12 = new MgResourceIdentifier(L"Library://UnitTests/Layers/RoadCenterLines.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc12 = new MgByteSource(L"../UnitTestFiles/UT_RoadCenterLines.ldf", false);
+ Ptr<MgByteReader> ldfrdr12 = ldfsrc12->GetReader();
+ svcResource->SetResource(ldfres12, ldfrdr12, nullptr);
-Ptr<MgResourceIdentifier> ldfres13 = new MgResourceIdentifier(L"Library://UnitTests/Layers/VotingDistricts.LayerDefinition");
-Ptr<MgByteSource> ldfsrc13 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistricts.ldf", false);
-Ptr<MgByteReader> ldfrdr13 = ldfsrc13->GetReader();
-svcResource->SetResource(ldfres13, ldfrdr13, nullptr);
+ Ptr<MgResourceIdentifier> ldfres13 = new MgResourceIdentifier(L"Library://UnitTests/Layers/VotingDistricts.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc13 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistricts.ldf", false);
+ Ptr<MgByteReader> ldfrdr13 = ldfsrc13->GetReader();
+ svcResource->SetResource(ldfres13, ldfrdr13, nullptr);
-// publish the feature sources
-Ptr<MgResourceIdentifier> fsres6 = new MgResourceIdentifier(L"Library://UnitTests/Data/RoadCenterLines.FeatureSource");
-Ptr<MgByteSource> fssrc6 = new MgByteSource(L"../UnitTestFiles/UT_RoadCenterLines.fs", false);
-Ptr<MgByteReader> fsrdr6 = fssrc6->GetReader();
-svcResource->SetResource(fsres6, fsrdr6, nullptr);
+ // publish the feature sources
+ Ptr<MgResourceIdentifier> fsres6 = new MgResourceIdentifier(L"Library://UnitTests/Data/RoadCenterLines.FeatureSource");
+ Ptr<MgByteSource> fssrc6 = new MgByteSource(L"../UnitTestFiles/UT_RoadCenterLines.fs", false);
+ Ptr<MgByteReader> fsrdr6 = fssrc6->GetReader();
+ svcResource->SetResource(fsres6, fsrdr6, nullptr);
-Ptr<MgResourceIdentifier> fsres7 = new MgResourceIdentifier(L"Library://UnitTests/Data/VotingDistricts.FeatureSource");
-Ptr<MgByteSource> fssrc7 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistricts.fs", false);
-Ptr<MgByteReader> fsrdr7 = fssrc7->GetReader();
-svcResource->SetResource(fsres7, fsrdr7, nullptr);
+ Ptr<MgResourceIdentifier> fsres7 = new MgResourceIdentifier(L"Library://UnitTests/Data/VotingDistricts.FeatureSource");
+ Ptr<MgByteSource> fssrc7 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistricts.fs", false);
+ Ptr<MgByteReader> fsrdr7 = fssrc7->GetReader();
+ svcResource->SetResource(fsres7, fsrdr7, nullptr);
-// publish the resource data
-Ptr<MgByteSource> dataSource6 = new MgByteSource(L"../UnitTestFiles/UT_RoadCenterLines.sdf", false);
-Ptr<MgByteReader> dataReader6 = dataSource6->GetReader();
-svcResource->SetResourceData(fsres6, L"UT_RoadCenterLines.sdf", L"File", dataReader6);
+ // publish the resource data
+ Ptr<MgByteSource> dataSource6 = new MgByteSource(L"../UnitTestFiles/UT_RoadCenterLines.sdf", false);
+ Ptr<MgByteReader> dataReader6 = dataSource6->GetReader();
+ svcResource->SetResourceData(fsres6, L"UT_RoadCenterLines.sdf", L"File", dataReader6);
-Ptr<MgByteSource> dataSource7 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistricts.sdf", false);
-Ptr<MgByteReader> dataReader7 = dataSource7->GetReader();
-svcResource->SetResourceData(fsres7, L"UT_VotingDistricts.sdf", L"File", dataReader7);
+ Ptr<MgByteSource> dataSource7 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistricts.sdf", false);
+ Ptr<MgByteReader> dataReader7 = dataSource7->GetReader();
+ svcResource->SetResourceData(fsres7, L"UT_VotingDistricts.sdf", L"File", dataReader7);
-// ---------------------------------------------------------
-// Data for exercising legend rendering
-// ---------------------------------------------------------
-Ptr<MgResourceIdentifier> ldfres14 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiFTS.LayerDefinition");
-Ptr<MgByteSource> ldfsrc14 = new MgByteSource(L"../UnitTestFiles/UT_MultiFTS.ldf", false);
-Ptr<MgByteReader> ldfrdr14 = ldfsrc14->GetReader();
-svcResource->SetResource(ldfres14, ldfrdr14, nullptr);
+ // ---------------------------------------------------------
+ // Data for exercising legend rendering
+ // ---------------------------------------------------------
+ Ptr<MgResourceIdentifier> ldfres14 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiFTS.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc14 = new MgByteSource(L"../UnitTestFiles/UT_MultiFTS.ldf", false);
+ Ptr<MgByteReader> ldfrdr14 = ldfsrc14->GetReader();
+ svcResource->SetResource(ldfres14, ldfrdr14, nullptr);
-Ptr<MgResourceIdentifier> ldfres15 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiCTS.LayerDefinition");
-Ptr<MgByteSource> ldfsrc15 = new MgByteSource(L"../UnitTestFiles/UT_MultiCTS.ldf", false);
-Ptr<MgByteReader> ldfrdr15 = ldfsrc15->GetReader();
-svcResource->SetResource(ldfres15, ldfrdr15, nullptr);
+ Ptr<MgResourceIdentifier> ldfres15 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiCTS.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc15 = new MgByteSource(L"../UnitTestFiles/UT_MultiCTS.ldf", false);
+ Ptr<MgByteReader> ldfrdr15 = ldfsrc15->GetReader();
+ svcResource->SetResource(ldfres15, ldfrdr15, nullptr);
-Ptr<MgResourceIdentifier> ldfres16 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiFTSWithTheme.LayerDefinition");
-Ptr<MgByteSource> ldfsrc16 = new MgByteSource(L"../UnitTestFiles/UT_MultiFTSWithTheme.ldf", false);
-Ptr<MgByteReader> ldfrdr16 = ldfsrc16->GetReader();
-svcResource->SetResource(ldfres16, ldfrdr16, nullptr);
+ Ptr<MgResourceIdentifier> ldfres16 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiFTSWithTheme.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc16 = new MgByteSource(L"../UnitTestFiles/UT_MultiFTSWithTheme.ldf", false);
+ Ptr<MgByteReader> ldfrdr16 = ldfsrc16->GetReader();
+ svcResource->SetResource(ldfres16, ldfrdr16, nullptr);
-Ptr<MgResourceIdentifier> ldfres17 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiCTSWithTheme.LayerDefinition");
-Ptr<MgByteSource> ldfsrc17 = new MgByteSource(L"../UnitTestFiles/UT_MultiCTSWithTheme.ldf", false);
-Ptr<MgByteReader> ldfrdr17 = ldfsrc17->GetReader();
-svcResource->SetResource(ldfres17, ldfrdr17, nullptr);
+ Ptr<MgResourceIdentifier> ldfres17 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiCTSWithTheme.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc17 = new MgByteSource(L"../UnitTestFiles/UT_MultiCTSWithTheme.ldf", false);
+ Ptr<MgByteReader> ldfrdr17 = ldfsrc17->GetReader();
+ svcResource->SetResource(ldfres17, ldfrdr17, nullptr);
-Ptr<MgResourceIdentifier> ldfres18 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiFTSSingleCTS.LayerDefinition");
-Ptr<MgByteSource> ldfsrc18 = new MgByteSource(L"../UnitTestFiles/UT_MultiFTSSingleCTS.ldf", false);
-Ptr<MgByteReader> ldfrdr18 = ldfsrc18->GetReader();
-svcResource->SetResource(ldfres18, ldfrdr18, nullptr);
+ Ptr<MgResourceIdentifier> ldfres18 = new MgResourceIdentifier(L"Library://UnitTests/Layers/MultiFTSSingleCTS.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc18 = new MgByteSource(L"../UnitTestFiles/UT_MultiFTSSingleCTS.ldf", false);
+ Ptr<MgByteReader> ldfrdr18 = ldfsrc18->GetReader();
+ svcResource->SetResource(ldfres18, ldfrdr18, nullptr);
-Ptr<MgResourceIdentifier> ldfres19 = new MgResourceIdentifier(L"Library://UnitTests/Layers/SingleFTSMultiCTS.LayerDefinition");
-Ptr<MgByteSource> ldfsrc19 = new MgByteSource(L"../UnitTestFiles/UT_SingleFTSMultiCTS.ldf", false);
-Ptr<MgByteReader> ldfrdr19 = ldfsrc19->GetReader();
-svcResource->SetResource(ldfres19, ldfrdr19, nullptr);
+ Ptr<MgResourceIdentifier> ldfres19 = new MgResourceIdentifier(L"Library://UnitTests/Layers/SingleFTSMultiCTS.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc19 = new MgByteSource(L"../UnitTestFiles/UT_SingleFTSMultiCTS.ldf", false);
+ Ptr<MgByteReader> ldfrdr19 = ldfsrc19->GetReader();
+ svcResource->SetResource(ldfres19, ldfrdr19, nullptr);
-// Data related to stylization function tests
-Ptr<MgResourceIdentifier> ldfres20 = new MgResourceIdentifier(L"Library://UnitTests/Layers/StylizationFuncs.LayerDefinition");
-Ptr<MgByteSource> ldfsrc20 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistrictsFunctions.ldf", false);
-Ptr<MgByteReader> ldfrdr20 = ldfsrc20->GetReader();
-svcResource->SetResource(ldfres20, ldfrdr20, nullptr);
+ // Data related to stylization function tests
+ Ptr<MgResourceIdentifier> ldfres20 = new MgResourceIdentifier(L"Library://UnitTests/Layers/StylizationFuncs.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc20 = new MgByteSource(L"../UnitTestFiles/UT_VotingDistrictsFunctions.ldf", false);
+ Ptr<MgByteReader> ldfrdr20 = ldfsrc20->GetReader();
+ svcResource->SetResource(ldfres20, ldfrdr20, nullptr);
-Ptr<MgResourceIdentifier> mapres15 = new MgResourceIdentifier(L"Library://UnitTests/Maps/StylizationFuncs.MapDefinition");
-Ptr<MgByteSource> mdfsrc15 = new MgByteSource(L"../UnitTestFiles/UT_StylizationFuncs.mdf", false);
-Ptr<MgByteReader> mdfrdr15 = mdfsrc15->GetReader();
-svcResource->SetResource(mapres15, mdfrdr15, nullptr);
+ Ptr<MgResourceIdentifier> mapres15 = new MgResourceIdentifier(L"Library://UnitTests/Maps/StylizationFuncs.MapDefinition");
+ Ptr<MgByteSource> mdfsrc15 = new MgByteSource(L"../UnitTestFiles/UT_StylizationFuncs.mdf", false);
+ Ptr<MgByteReader> mdfrdr15 = mdfsrc15->GetReader();
+ svcResource->SetResource(mapres15, mdfrdr15, nullptr);
-// For layer watermark test
-Ptr<MgResourceIdentifier> wdfres2 = new MgResourceIdentifier(L"Library://UnitTests/Watermarks/Rail.WatermarkDefinition");
-Ptr<MgByteSource> wdfsrc2 = new MgByteSource(L"../UnitTestFiles/UT_Rail.wdf", false);
-Ptr<MgByteReader> wdfrdr2 = wdfsrc2->GetReader();
-svcResource->SetResource(wdfres2, wdfrdr2, nullptr);
+ // For layer watermark test
+ Ptr<MgResourceIdentifier> wdfres2 = new MgResourceIdentifier(L"Library://UnitTests/Watermarks/Rail.WatermarkDefinition");
+ Ptr<MgByteSource> wdfsrc2 = new MgByteSource(L"../UnitTestFiles/UT_Rail.wdf", false);
+ Ptr<MgByteReader> wdfrdr2 = wdfsrc2->GetReader();
+ svcResource->SetResource(wdfres2, wdfrdr2, nullptr);
-Ptr<MgResourceIdentifier> ldfres21 = new MgResourceIdentifier(L"Library://UnitTests/Layers/RailWatermark.LayerDefinition");
-Ptr<MgByteSource> ldfsrc21 = new MgByteSource(L"../UnitTestFiles/UT_Rail_Watermark.ldf", false);
-Ptr<MgByteReader> ldfrdr21 = ldfsrc21->GetReader();
-svcResource->SetResource(ldfres21, ldfrdr21, nullptr);
+ Ptr<MgResourceIdentifier> ldfres21 = new MgResourceIdentifier(L"Library://UnitTests/Layers/RailWatermark.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc21 = new MgByteSource(L"../UnitTestFiles/UT_Rail_Watermark.ldf", false);
+ Ptr<MgByteReader> ldfrdr21 = ldfsrc21->GetReader();
+ svcResource->SetResource(ldfres21, ldfrdr21, nullptr);
}
catch (MgException* e)
{
@@ -992,10 +992,10 @@
try
{
// ------------------------------------------------------
- // base map source data
- // ------------------------------------------------------
+ // base map source data
+ // ------------------------------------------------------
- // publish the map definition
+ // publish the map definition
Ptr<MgResourceIdentifier> mapres1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/BaseMap.MapDefinition");
Ptr<MgByteSource> mdfsrc1 = new MgByteSource(L"../UnitTestFiles/UT_BaseMap.mdf", false);
Ptr<MgByteReader> mdfrdr1 = mdfsrc1->GetReader();
@@ -1235,92 +1235,92 @@
svcResource->SetResource(sdres3, sdrdr3, nullptr);
Ptr<MgResourceIdentifier> sdres4 = new MgResourceIdentifier(L"Library://UnitTests/Symbols/MTYP1500a.SymbolDefinition");
-Ptr<MgByteSource> sdsrc4 = new MgByteSource(L"../UnitTestFiles/MTYP1500a.sd", false);
-Ptr<MgByteReader> sdrdr4 = sdsrc4->GetReader();
-svcResource->SetResource(sdres4, sdrdr4, nullptr);
+ Ptr<MgByteSource> sdsrc4 = new MgByteSource(L"../UnitTestFiles/MTYP1500a.sd", false);
+ Ptr<MgByteReader> sdrdr4 = sdsrc4->GetReader();
+ svcResource->SetResource(sdres4, sdrdr4, nullptr);
-// line ldf
-Ptr<MgResourceIdentifier> ldfres6 = new MgResourceIdentifier(L"Library://UnitTests/Layers/Lines.LayerDefinition");
-Ptr<MgByteSource> ldfsrc6 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLines.ldf", false);
-Ptr<MgByteReader> ldfrdr6 = ldfsrc6->GetReader();
-svcResource->SetResource(ldfres6, ldfrdr6, nullptr);
+ // line ldf
+ Ptr<MgResourceIdentifier> ldfres6 = new MgResourceIdentifier(L"Library://UnitTests/Layers/Lines.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc6 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLines.ldf", false);
+ Ptr<MgByteReader> ldfrdr6 = ldfsrc6->GetReader();
+ svcResource->SetResource(ldfres6, ldfrdr6, nullptr);
-Ptr<MgResourceIdentifier> ldfres7 = new MgResourceIdentifier(L"Library://UnitTests/Layers/LinesCrossTick.LayerDefinition");
-Ptr<MgByteSource> ldfsrc7 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLinesCrossTick.ldf", false);
-Ptr<MgByteReader> ldfrdr7 = ldfsrc7->GetReader();
-svcResource->SetResource(ldfres7, ldfrdr7, nullptr);
+ Ptr<MgResourceIdentifier> ldfres7 = new MgResourceIdentifier(L"Library://UnitTests/Layers/LinesCrossTick.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc7 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLinesCrossTick.ldf", false);
+ Ptr<MgByteReader> ldfrdr7 = ldfsrc7->GetReader();
+ svcResource->SetResource(ldfres7, ldfrdr7, nullptr);
-// line mdf
-Ptr<MgResourceIdentifier> mapres4 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Lines.MapDefinition");
-Ptr<MgByteSource> mdfsrc4 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLines.mdf", false);
-Ptr<MgByteReader> mdfrdr4 = mdfsrc4->GetReader();
-svcResource->SetResource(mapres4, mdfrdr4, nullptr);
+ // line mdf
+ Ptr<MgResourceIdentifier> mapres4 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Lines.MapDefinition");
+ Ptr<MgByteSource> mdfsrc4 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLines.mdf", false);
+ Ptr<MgByteReader> mdfrdr4 = mdfsrc4->GetReader();
+ svcResource->SetResource(mapres4, mdfrdr4, nullptr);
-Ptr<MgResourceIdentifier> mapres5 = new MgResourceIdentifier(L"Library://UnitTests/Maps/LinesCrossTick.MapDefinition");
-Ptr<MgByteSource> mdfsrc5 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLinesCrossTick.mdf", false);
-Ptr<MgByteReader> mdfrdr5 = mdfsrc5->GetReader();
-svcResource->SetResource(mapres5, mdfrdr5, nullptr);
+ Ptr<MgResourceIdentifier> mapres5 = new MgResourceIdentifier(L"Library://UnitTests/Maps/LinesCrossTick.MapDefinition");
+ Ptr<MgByteSource> mdfsrc5 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyLinesCrossTick.mdf", false);
+ Ptr<MgByteReader> mdfrdr5 = mdfsrc5->GetReader();
+ svcResource->SetResource(mapres5, mdfrdr5, nullptr);
-// annotation ldf - this shares the point sdf
-Ptr<MgResourceIdentifier> ldfres8 = new MgResourceIdentifier(L"Library://UnitTests/Layers/UT_Annotation1.LayerDefinition");
-Ptr<MgByteSource> ldfsrc8 = new MgByteSource(L"../UnitTestFiles/UT_Annotation1.ldf", false);
-Ptr<MgByteReader> ldfrdr8 = ldfsrc8->GetReader();
-svcResource->SetResource(ldfres8, ldfrdr8, nullptr);
+ // annotation ldf - this shares the point sdf
+ Ptr<MgResourceIdentifier> ldfres8 = new MgResourceIdentifier(L"Library://UnitTests/Layers/UT_Annotation1.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc8 = new MgByteSource(L"../UnitTestFiles/UT_Annotation1.ldf", false);
+ Ptr<MgByteReader> ldfrdr8 = ldfsrc8->GetReader();
+ svcResource->SetResource(ldfres8, ldfrdr8, nullptr);
-Ptr<MgResourceIdentifier> ldfres9 = new MgResourceIdentifier(L"Library://UnitTests/Layers/UT_Annotation2.LayerDefinition");
-Ptr<MgByteSource> ldfsrc9 = new MgByteSource(L"../UnitTestFiles/UT_Annotation2.ldf", false);
-Ptr<MgByteReader> ldfrdr9 = ldfsrc9->GetReader();
-svcResource->SetResource(ldfres9, ldfrdr9, nullptr);
+ Ptr<MgResourceIdentifier> ldfres9 = new MgResourceIdentifier(L"Library://UnitTests/Layers/UT_Annotation2.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc9 = new MgByteSource(L"../UnitTestFiles/UT_Annotation2.ldf", false);
+ Ptr<MgByteReader> ldfrdr9 = ldfsrc9->GetReader();
+ svcResource->SetResource(ldfres9, ldfrdr9, nullptr);
-Ptr<MgResourceIdentifier> ldfres10 = new MgResourceIdentifier(L"Library://UnitTests/Layers/UT_Annotation3.LayerDefinition");
-Ptr<MgByteSource> ldfsrc10 = new MgByteSource(L"../UnitTestFiles/UT_Annotation3.ldf", false);
-Ptr<MgByteReader> ldfrdr10 = ldfsrc10->GetReader();
-svcResource->SetResource(ldfres10, ldfrdr10, nullptr);
+ Ptr<MgResourceIdentifier> ldfres10 = new MgResourceIdentifier(L"Library://UnitTests/Layers/UT_Annotation3.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc10 = new MgByteSource(L"../UnitTestFiles/UT_Annotation3.ldf", false);
+ Ptr<MgByteReader> ldfrdr10 = ldfsrc10->GetReader();
+ svcResource->SetResource(ldfres10, ldfrdr10, nullptr);
-// annotation mdf
-Ptr<MgResourceIdentifier> mapres8 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_Annotation1.MapDefinition");
-Ptr<MgByteSource> mdfsrc8 = new MgByteSource(L"../UnitTestFiles/UT_Annotation1.mdf", false);
-Ptr<MgByteReader> mdfrdr8 = mdfsrc8->GetReader();
-svcResource->SetResource(mapres8, mdfrdr8, nullptr);
+ // annotation mdf
+ Ptr<MgResourceIdentifier> mapres8 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_Annotation1.MapDefinition");
+ Ptr<MgByteSource> mdfsrc8 = new MgByteSource(L"../UnitTestFiles/UT_Annotation1.mdf", false);
+ Ptr<MgByteReader> mdfrdr8 = mdfsrc8->GetReader();
+ svcResource->SetResource(mapres8, mdfrdr8, nullptr);
-Ptr<MgResourceIdentifier> mapres9 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_Annotation2.MapDefinition");
-Ptr<MgByteSource> mdfsrc9 = new MgByteSource(L"../UnitTestFiles/UT_Annotation2.mdf", false);
-Ptr<MgByteReader> mdfrdr9 = mdfsrc9->GetReader();
-svcResource->SetResource(mapres9, mdfrdr9, nullptr);
+ Ptr<MgResourceIdentifier> mapres9 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_Annotation2.MapDefinition");
+ Ptr<MgByteSource> mdfsrc9 = new MgByteSource(L"../UnitTestFiles/UT_Annotation2.mdf", false);
+ Ptr<MgByteReader> mdfrdr9 = mdfsrc9->GetReader();
+ svcResource->SetResource(mapres9, mdfrdr9, nullptr);
-Ptr<MgResourceIdentifier> mapres10 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_Annotation3.MapDefinition");
-Ptr<MgByteSource> mdfsrc10 = new MgByteSource(L"../UnitTestFiles/UT_Annotation3.mdf", false);
-Ptr<MgByteReader> mdfrdr10 = mdfsrc10->GetReader();
-svcResource->SetResource(mapres10, mdfrdr10, nullptr);
+ Ptr<MgResourceIdentifier> mapres10 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_Annotation3.MapDefinition");
+ Ptr<MgByteSource> mdfsrc10 = new MgByteSource(L"../UnitTestFiles/UT_Annotation3.mdf", false);
+ Ptr<MgByteReader> mdfrdr10 = mdfsrc10->GetReader();
+ svcResource->SetResource(mapres10, mdfrdr10, nullptr);
-//symbology - polygons
-Ptr<MgResourceIdentifier> mapres11 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_SymbologyPolygons.MapDefinition");
-Ptr<MgByteSource> mdfsrc11 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyPolygons.mdf", false);
-Ptr<MgByteReader> mdfrdr11 = mdfsrc11->GetReader();
-svcResource->SetResource(mapres11, mdfrdr11, nullptr);
+ //symbology - polygons
+ Ptr<MgResourceIdentifier> mapres11 = new MgResourceIdentifier(L"Library://UnitTests/Maps/UT_SymbologyPolygons.MapDefinition");
+ Ptr<MgByteSource> mdfsrc11 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyPolygons.mdf", false);
+ Ptr<MgByteReader> mdfrdr11 = mdfsrc11->GetReader();
+ svcResource->SetResource(mapres11, mdfrdr11, nullptr);
-Ptr<MgResourceIdentifier> ldfres11 = new MgResourceIdentifier(L"Library://UnitTests/Layers/SymbologyParcels.LayerDefinition");
-Ptr<MgByteSource> ldfsrc11 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyParcels.ldf", false);
-Ptr<MgByteReader> ldfrdr11 = ldfsrc11->GetReader();
-svcResource->SetResource(ldfres11, ldfrdr11, nullptr);
+ Ptr<MgResourceIdentifier> ldfres11 = new MgResourceIdentifier(L"Library://UnitTests/Layers/SymbologyParcels.LayerDefinition");
+ Ptr<MgByteSource> ldfsrc11 = new MgByteSource(L"../UnitTestFiles/UT_SymbologyParcels.ldf", false);
+ Ptr<MgByteReader> ldfrdr11 = ldfsrc11->GetReader();
+ svcResource->SetResource(ldfres11, ldfrdr11, nullptr);
-Ptr<MgResourceIdentifier> sdres5 = new MgResourceIdentifier(L"Library://UnitTests/Symbols/AreaSymbol.SymbolDefinition");
-Ptr<MgByteSource> sdsrc5 = new MgByteSource(L"../UnitTestFiles/areasymbol.sd", false);
-Ptr<MgByteReader> sdrdr5 = sdsrc5->GetReader();
-svcResource->SetResource(sdres5, sdrdr5, nullptr);
+ Ptr<MgResourceIdentifier> sdres5 = new MgResourceIdentifier(L"Library://UnitTests/Symbols/AreaSymbol.SymbolDefinition");
+ Ptr<MgByteSource> sdsrc5 = new MgByteSource(L"../UnitTestFiles/areasymbol.sd", false);
+ Ptr<MgByteReader> sdrdr5 = sdsrc5->GetReader();
+ svcResource->SetResource(sdres5, sdrdr5, nullptr);
-// For watermark test
-// publish the map definition
-Ptr<MgResourceIdentifier> mapres12 = new MgResourceIdentifier(L"Library://UnitTests/Maps/SheboyganWithWatermark.MapDefinition");
-Ptr<MgByteSource> mdfsrc12 = new MgByteSource(L"../UnitTestFiles/UT_SheboyganWithWatermark.mdf", false);
-Ptr<MgByteReader> mdfrdr12 = mdfsrc12->GetReader();
-svcResource->SetResource(mapres12, mdfrdr12, nullptr);
+ // For watermark test
+ // publish the map definition
+ Ptr<MgResourceIdentifier> mapres12 = new MgResourceIdentifier(L"Library://UnitTests/Maps/SheboyganWithWatermark.MapDefinition");
+ Ptr<MgByteSource> mdfsrc12 = new MgByteSource(L"../UnitTestFiles/UT_SheboyganWithWatermark.mdf", false);
+ Ptr<MgByteReader> mdfrdr12 = mdfsrc12->GetReader();
+ svcResource->SetResource(mapres12, mdfrdr12, nullptr);
-// publish the watermark definition
-Ptr<MgResourceIdentifier> wdfres1 = new MgResourceIdentifier(L"Library://UnitTests/Watermarks/PoweredByMapGuide.WatermarkDefinition");
-Ptr<MgByteSource> wdfsrc1 = new MgByteSource(L"../UnitTestFiles/UT_PoweredByMapGuide.wdf", false);
-Ptr<MgByteReader> wdfrdr1 = wdfsrc1->GetReader();
-svcResource->SetResource(wdfres1, wdfrdr1, nullptr);
+ // publish the watermark definition
+ Ptr<MgResourceIdentifier> wdfres1 = new MgResourceIdentifier(L"Library://UnitTests/Watermarks/PoweredByMapGuide.WatermarkDefinition");
+ Ptr<MgByteSource> wdfsrc1 = new MgByteSource(L"../UnitTestFiles/UT_PoweredByMapGuide.wdf", false);
+ Ptr<MgByteReader> wdfrdr1 = wdfsrc1->GetReader();
+ svcResource->SetResource(wdfres1, wdfrdr1, nullptr);
}
catch (MgException* e)
Modified: sandbox/jng/vanilla_swig/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml
===================================================================
--- sandbox/jng/vanilla_swig/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml 2021-07-16 09:04:49 UTC (rev 9864)
@@ -1,33 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ResourceDocumentHeader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ResourceDocumentHeader-1.0.0.xsd">
- <General>
- <IconName>LayerDefinitionVector</IconName>
- </General>
- <Security xsi:noNamespaceSchemaLocation="ResourceSecurity-1.0.0.xsd">
- <Inherited>true</Inherited>
- </Security>
- <Metadata>
- <Simple>
- <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
- <Name>_Queryable</Name>
- <Value>0</Value>
- </Property>
- <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
- <Name>_Bounds</Name>
- <Value><Bounds SRS="EPSG:4326" west="-87.74" south="43.68" east="-87.69" north="43.815"/></Value>
- </Property>
- <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
- <Name>_Title</Name>
- <Value>Parcels</Value>
- </Property>
- <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
- <Name>_Opaque</Name>
- <Value>0</Value>
- </Property>
- <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
- <Name>_IsPublished</Name>
- <Value>1</Value>
- </Property>
- </Simple>
- </Metadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<ResourceDocumentHeader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="ResourceDocumentHeader-1.0.0.xsd">
+ <General>
+ <IconName>LayerDefinitionVector</IconName>
+ </General>
+ <Security>
+ <Inherited>true</Inherited>
+ </Security>
+ <Metadata>
+ <Simple>
+ <Property>
+ <Name>_Queryable</Name>
+ <Value>1</Value>
+ </Property>
+ <Property>
+ <Name>_Bounds</Name>
+ <Value><Bounds SRS="EPSG:4326" west="-87.74" south="43.68" east="-87.69" north="43.815"/></Value>
+ </Property>
+ <Property>
+ <Name>_Title</Name>
+ <Value>Parcels</Value>
+ </Property>
+ <Property>
+ <Name>_Opaque</Name>
+ <Value>0</Value>
+ </Property>
+ <Property>
+ <Name>_IsPublished</Name>
+ <Value>1</Value>
+ </Property>
+ <Property>
+ <Name>_EnableGeometry</Name>
+ <Value>1</Value>
+ </Property>
+ </Simple>
+ </Metadata>
</ResourceDocumentHeader>
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/UnitTest/WebTier/MapAgent/MapAgentForms/getmapwmsform.html
===================================================================
--- sandbox/jng/vanilla_swig/UnitTest/WebTier/MapAgent/MapAgentForms/getmapwmsform.html 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/UnitTest/WebTier/MapAgent/MapAgentForms/getmapwmsform.html 2021-07-16 09:04:49 UTC (rev 9864)
@@ -20,7 +20,7 @@
<option value="application/openlayers">application/openlayers</option>
</select>
<p> Layers (comma-separated):
-<input type="text" name="LAYERS" value="Samples/Sheboygan/Layers/Parcels,Samples/Sheboygan/Layers/Roads" size="100">
+<input type="text" name="LAYERS" value="Samples/Sheboygan/Layers/Parcels" size="100">
<p> Bounding Box (minx,miny,maxx,maxy):
<input type="text" name="BBOX" value="43.73822699224595,-87.7398334220901,43.75068777906662,-87.72068284176505" size="100">
<p> Coordinate System:
Modified: sandbox/jng/vanilla_swig/Web/src/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/CMakeLists.txt 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/CMakeLists.txt 2021-07-16 09:04:49 UTC (rev 9864)
@@ -11,7 +11,8 @@
#add_subdirectory(CgiAgent)
add_subdirectory(PhpApi)
if (WITH_JAVA)
- add_subdirectory(JavaApi)
+ # For preview 3 until new vanilla SWIG wrapper in place, only build/ship MapGuideJavaApiEx.jar
+ #add_subdirectory(JavaApi)
add_subdirectory(JavaApiEx)
endif (WITH_JAVA)
Modified: sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -88,7 +88,7 @@
Ptr<MgFeatureService> pFeatureService = (MgFeatureService*)(CreateService(MgServiceType::FeatureService));
// Retrieve feature definitions
- auto_ptr<MgWfsFeatureDefinitions> pFeatureTypes;
+ unique_ptr<MgWfsFeatureDefinitions> pFeatureTypes;
if(NULL == featureTypeList)
{
pFeatureTypes.reset(new MgWfsFeatureDefinitions(pResourceService,pFeatureService));
Modified: sandbox/jng/vanilla_swig/Web/src/HttpHandler/WmsMapUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/HttpHandler/WmsMapUtil.cpp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/HttpHandler/WmsMapUtil.cpp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -192,7 +192,7 @@
else
{
// Get layer definition from the original layer
- auto_ptr<MdfModel::LayerDefinition> layerDef;
+ unique_ptr<MdfModel::LayerDefinition> layerDef;
layerDef.reset(mgLayer->GetLayerDefinition(resourceService,resId));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(layerDef.get());
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(layerDef.get());
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/ajaxviewerabout.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/ajaxviewerabout.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/ajaxviewerabout.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -57,17 +57,17 @@
// Obtain server version info
//
MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ userInfo.setMgSessionId(sessionId);
+ userInfo.setClientIp(GetClientIp(request));
+ userInfo.setClientAgent(GetClientAgent());
MgSite site = new MgSite();
- site.Open(userInfo);
+ site.open(userInfo);
MgServerAdmin serverAdmin = new MgServerAdmin();
- serverAdmin.Open(userInfo);
- MgPropertyCollection infoProps = serverAdmin.GetInformationProperties();
- MgStringProperty versionProp = (MgStringProperty)infoProps.GetItem(MgServerInformationProperties.ServerVersion);
- serverVersion = versionProp.GetValue();
+ serverAdmin.open(userInfo);
+ MgPropertyCollection infoProps = serverAdmin.getInformationProperties();
+ MgStringProperty versionProp = (MgStringProperty)infoProps.getItem(MgServerInformationProperties.ServerVersion);
+ serverVersion = versionProp.getValue();
String vals[] = { titleBar,
titleBar,
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/buffer.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/buffer.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/buffer.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -87,14 +87,14 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgFeatureService featureSrvc = (MgFeatureService)site.createService(MgServiceType.FeatureService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier dataSourceId = new MgResourceIdentifier(dataSource);
MgResourceIdentifier layerDefId = new MgResourceIdentifier(layerDef);
@@ -102,11 +102,11 @@
//load the map runtime state
//
MgMap map = new MgMap(site);
- map.Open(mapName);
+ map.open(mapName);
//locate the buffer layer in the map. It might or might not already exist
//
- MgLayerCollection layers = map.GetLayers();
+ MgLayerCollection layers = map.getLayers();
MgLayer layer = FindLayer(layers, bufferName);
String[] layerNames = layersParam.split(",");
@@ -124,14 +124,14 @@
MgCoordinateSystemFactory srsFactory = new MgCoordinateSystemFactory();
String srsDefMap = GetMapSrs(map);
String mapSrsUnits = "";
- MgCoordinateSystem srsMap = srsFactory.Create(srsDefMap);
- boolean arbitraryMapSrs = (srsMap.GetType() == MgCoordinateSystemType.Arbitrary);
+ MgCoordinateSystem srsMap = srsFactory.create(srsDefMap);
+ boolean arbitraryMapSrs = (srsMap.getType() == MgCoordinateSystemType.Arbitrary);
if(arbitraryMapSrs)
- mapSrsUnits = srsMap.GetUnits();
+ mapSrsUnits = srsMap.getUnits();
//Create/Modify layer definition
MgByteReader layerDefContent = BuildLayerDefinitionContent();
- resourceSrvc.SetResource(layerDefId, layerDefContent, null);
+ resourceSrvc.setResource(layerDefId, layerDefContent, null);
if(layer == null)
{
@@ -140,44 +140,44 @@
//
MgClassDefinition classDef = new MgClassDefinition();
- classDef.SetName(featureName);
- classDef.SetDescription(MgLocalizer.GetString("BUFFERCLASSDESCR", locale));
- classDef.SetDefaultGeometryPropertyName("GEOM");
+ classDef.setName(featureName);
+ classDef.setDescription(MgLocalizer.GetString("BUFFERCLASSDESCR", locale));
+ classDef.setDefaultGeometryPropertyName("GEOM");
//Set KEY property
MgDataPropertyDefinition propKey = new MgDataPropertyDefinition("KEY");
- propKey.SetDataType(MgPropertyType.Int32);
- propKey.SetAutoGeneration(true);
- propKey.SetReadOnly(true);
- classDef.GetIdentityProperties().Add(propKey);
- classDef.GetProperties().Add(propKey);
+ propKey.setDataType(MgPropertyType.Int32);
+ propKey.setAutoGeneration(true);
+ propKey.setReadOnly(true);
+ classDef.getIdentityProperties().add(propKey);
+ classDef.getProperties().add(propKey);
//Set ID property. Hold this segment ID
MgDataPropertyDefinition propID = new MgDataPropertyDefinition("ID");
- propID.SetDataType(MgPropertyType.Int32);
- classDef.GetProperties().Add(propID);
+ propID.setDataType(MgPropertyType.Int32);
+ classDef.getProperties().add(propID);
//Set geometry property
MgGeometricPropertyDefinition geomProp = new MgGeometricPropertyDefinition("GEOM");
- //geomProp.SetGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
- geomProp.SetGeometryTypes(4);
- classDef.GetProperties().Add(geomProp);
+ //geomProp.setGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
+ geomProp.setGeometryTypes(4);
+ classDef.getProperties().add(geomProp);
//Create the schema
MgFeatureSchema schema = new MgFeatureSchema("BufferSchema", MgLocalizer.GetString("BUFFERSCHEMADESCR", locale));
- schema.GetClasses().Add(classDef);
+ schema.getClasses().add(classDef);
//finally, creation of the feature source
MgFileFeatureSourceParams sdfParams = new MgFileFeatureSourceParams("OSGeo.SDF", "LatLong", srsDefMap, schema);
- featureSrvc.CreateFeatureSource(dataSourceId, sdfParams);
+ featureSrvc.createFeatureSource(dataSourceId, sdfParams);
//Add layer to map
layer = new MgLayer(layerDefId, resourceSrvc);
- layer.SetName(bufferName);
- layer.SetLegendLabel(bufferName);
- layer.SetDisplayInLegend(true);
- layer.SetSelectable(true);
- layers.Insert(0, layer);
+ layer.setName(bufferName);
+ layer.setLegendLabel(bufferName);
+ layer.setDisplayInLegend(true);
+ layer.setSelectable(true);
+ layers.insert(0, layer);
}
else
{
@@ -187,7 +187,7 @@
}
MgSelection sel = new MgSelection(map, selText);
- MgReadOnlyLayerCollection selLayers = sel.GetLayers();
+ MgReadOnlyLayerCollection selLayers = sel.getLayers();
MgAgfReaderWriter agfRW = new MgAgfReaderWriter();
MgGeometryCollection bufferGeometries = new MgGeometryCollection();
@@ -203,11 +203,11 @@
MgGeometryCollection inputGeometries = new MgGeometryCollection();
int bufferFeatures = 0;
- for(int li =0; li < selLayers.GetCount(); li++)
+ for(int li =0; li < selLayers.getCount(); li++)
{
- MgLayer selLayer = (MgLayer) selLayers.GetItem(li);
+ MgLayer selLayer = (MgLayer) selLayers.getItem(li);
boolean inputLayer = false;
- String selLayerName = selLayer.GetName();
+ String selLayerName = selLayer.getName();
for(int il = 0; il < layerNames.length; il++)
{
if(layerNames[il].equals(selLayerName))
@@ -221,11 +221,11 @@
// get the data source SRS
//
- MgResourceIdentifier featSourceId = new MgResourceIdentifier(selLayer.GetFeatureSourceId());
- MgSpatialContextReader ctxs = featureSrvc.GetSpatialContexts(featSourceId, false);
+ MgResourceIdentifier featSourceId = new MgResourceIdentifier(selLayer.getFeatureSourceId());
+ MgSpatialContextReader ctxs = featureSrvc.getSpatialContexts(featSourceId, false);
String srsDefDs = "";
- if(ctxs != null && ctxs.ReadNext())
- srsDefDs = ctxs.GetCoordinateSystemWkt();
+ if(ctxs != null && ctxs.readNext())
+ srsDefDs = ctxs.getCoordinateSystemWkt();
if(srsDefDs == null || srsDefDs.length() == 0)
{
@@ -233,12 +233,12 @@
continue;
}
- srsDs = srsFactory.Create(srsDefDs);
- boolean arbitraryDsSrs = (srsDs.GetType() == MgCoordinateSystemType.Arbitrary);
+ srsDs = srsFactory.create(srsDefDs);
+ boolean arbitraryDsSrs = (srsDs.getType() == MgCoordinateSystemType.Arbitrary);
String dsSrsUnits = "";
if(arbitraryDsSrs)
- dsSrsUnits = srsDs.GetUnits();
+ dsSrsUnits = srsDs.getUnits();
// exclude layer if:
// the map is non-arbitrary and the layer is arbitrary or vice-versa
@@ -253,12 +253,12 @@
// calculate distance in the data source SRS units
//
- double dist = srsDs.ConvertMetersToCoordinateSystemUnits(distance);
+ double dist = srsDs.convertMetersToCoordinateSystemUnits(distance);
// calculate great circle unless data source srs is arbitrary
MgCoordinateSystemMeasure measure;
if(!arbitraryDsSrs)
- measure = srsDs.GetMeasure();
+ measure = srsDs.getMeasure();
else
measure = null;
@@ -265,43 +265,43 @@
// create a SRS transformer if necessary
MgCoordinateSystemTransform srsXform;
if(!srsDefDs.equals(srsDefMap))
- srsXform = srsFactory.GetTransform(srsDs, srsMap);
+ srsXform = srsFactory.getTransform(srsDs, srsMap);
else
srsXform = null;
- String featureClassName = selLayer.GetFeatureClassName();
- String filter = sel.GenerateFilter(selLayer, featureClassName);
+ String featureClassName = selLayer.getFeatureClassName();
+ String filter = sel.generateFilter(selLayer, featureClassName);
if(filter == null || filter.length() == 0)
continue;
- MgClassDefinition clsDef = selLayer.GetClassDefinition();
+ MgClassDefinition clsDef = selLayer.getClassDefinition();
MgFeatureQueryOptions query = BuildFeatureQueryOptions(clsDef);
- query.SetFilter(filter);
+ query.setFilter(filter);
- MgResourceIdentifier featureSource = new MgResourceIdentifier(selLayer.GetFeatureSourceId());
+ MgResourceIdentifier featureSource = new MgResourceIdentifier(selLayer.getFeatureSourceId());
- MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, featureClassName, query);
+ MgFeatureReader features = featureSrvc.selectFeatures(featureSource, featureClassName, query);
- if(features.ReadNext())
+ if(features.readNext())
{
- MgClassDefinition classDef = features.GetClassDefinition();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
+ MgClassDefinition classDef = features.getClassDefinition();
+ String geomPropName = classDef.getDefaultGeometryPropertyName();
do
{
if (geomPropName == null || geomPropName.equals("")) {
- geomPropName = selLayer.GetFeatureGeometryName();
+ geomPropName = selLayer.getFeatureGeometryName();
}
- MgByteReader geomReader = features.GetGeometry(geomPropName);
- MgGeometry geom = agfRW.Read(geomReader);
+ MgByteReader geomReader = features.getGeometry(geomPropName);
+ MgGeometry geom = agfRW.read(geomReader);
if(merge == 0)
{
- geomBuffer = geom.Buffer(dist, measure);
+ geomBuffer = geom.buffer(dist, measure);
if (geomBuffer != null)
{
if(srsXform != null)
- geomBuffer = (MgGeometry)geomBuffer.Transform(srsXform);
+ geomBuffer = (MgGeometry)geomBuffer.transform(srsXform);
AddFeatureToCollection(propCollection, agfRW, featId++, geomBuffer);
bufferFeatures++;
}
@@ -309,29 +309,29 @@
else
{
if(srsXform != null)
- geom = (MgGeometry)geom.Transform(srsXform);
- inputGeometries.Add(geom);
+ geom = (MgGeometry)geom.transform(srsXform);
+ inputGeometries.add(geom);
}
}
- while(features.ReadNext());
+ while(features.readNext());
- features.Close();
+ features.close();
}
}
if(merge == 1)
{
- if(inputGeometries.GetCount() > 0)
+ if(inputGeometries.getCount() > 0)
{
- double dist = srsMap.ConvertMetersToCoordinateSystemUnits(distance);
+ double dist = srsMap.convertMetersToCoordinateSystemUnits(distance);
MgCoordinateSystemMeasure measure;
if(!arbitraryMapSrs)
- measure = srsMap.GetMeasure();
+ measure = srsMap.getMeasure();
else
measure = null;
MgGeometryFactory geomFactory = new MgGeometryFactory();
- geomBuffer = geomFactory.CreateMultiGeometry(inputGeometries).Buffer(dist, measure);
+ geomBuffer = geomFactory.createMultiGeometry(inputGeometries).buffer(dist, measure);
if (geomBuffer != null)
{
AddFeatureToCollection(propCollection, agfRW, featId, geomBuffer);
@@ -340,19 +340,19 @@
}
}
- if(propCollection.GetCount() > 0)
+ if(propCollection.getCount() > 0)
{
- commands.Add(new MgInsertFeatures(featureName, propCollection));
+ commands.add(new MgInsertFeatures(featureName, propCollection));
//Insert the features in the temporary data source
//
- ReleaseReader(featureSrvc.UpdateFeatures(dataSourceId, commands, false), commands);
+ ReleaseReader(featureSrvc.updateFeatures(dataSourceId, commands, false), commands);
}
// Save the new map state
//
- layer.ForceRefresh();
- map.Save();
+ layer.forceRefresh();
+ map.save();
//build report message
String title = MgLocalizer.GetString("BUFFERREPORTTITLE", locale);
@@ -378,7 +378,7 @@
}
catch(MgException exc)
{
- OnError(MgLocalizer.GetString("BUFFERREPORTERRORTITLE", locale), exc.GetDetails(), outStream, request);
+ OnError(MgLocalizer.GetString("BUFFERREPORTERRORTITLE", locale), exc.getDetails(), outStream, request);
return;
}
catch(Exception ne)
@@ -423,10 +423,10 @@
{
MgLayer layer = null;
int i;
- for(i = 0; i < layers.GetCount(); i++)
+ for(i = 0; i < layers.getCount(); i++)
{
- MgLayer layer1 = (MgLayer) layers.GetItem(i);
- if(layer1.GetName().equals(layerName))
+ MgLayer layer1 = (MgLayer) layers.getItem(i);
+ if(layer1.getName().equals(layerName))
{
layer = layer1;
break;
@@ -453,7 +453,7 @@
byte[] bytes = layerTempl.getBytes("UTF-8");
MgByteSource src = new MgByteSource(bytes, bytes.length);
- return src.GetReader();
+ return src.getReader();
}
void ClearDataSource(MgFeatureService featureSrvc, MgResourceIdentifier dataSourceId, String featureName) throws MgException
@@ -460,8 +460,8 @@
{
MgDeleteFeatures deleteCmd = new MgDeleteFeatures(featureName, "ID >= 0");
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(deleteCmd);
- featureSrvc.UpdateFeatures(dataSourceId, commands, false);
+ commands.add(deleteCmd);
+ featureSrvc.updateFeatures(dataSourceId, commands, false);
}
void OnError(String title, String msg, PrintWriter outStream, HttpServletRequest request) throws FileNotFoundException, IOException
@@ -476,18 +476,18 @@
if(res == null)
return;
- for(int i = 0; i < res.GetCount(); i++)
+ for(int i = 0; i < res.getCount(); i++)
{
- MgFeatureCommand cmd = commands.GetItem(i);
+ MgFeatureCommand cmd = commands.getItem(i);
if(cmd instanceof MgInsertFeatures)
{
- MgFeatureProperty resProp = (MgFeatureProperty)res.GetItem(i);
+ MgFeatureProperty resProp = (MgFeatureProperty)res.getItem(i);
if(resProp != null)
{
- MgFeatureReader reader = (MgFeatureReader)resProp.GetValue();
+ MgFeatureReader reader = (MgFeatureReader)resProp.getValue();
if(reader == null)
return;
- reader.Close();
+ reader.close();
}
}
}
@@ -497,11 +497,11 @@
{
MgPropertyCollection bufferProps = new MgPropertyCollection();
MgInt32Property idProp = new MgInt32Property("ID", featureId);
- bufferProps.Add(idProp);
- MgByteReader geomReader = agfRW.Write(featureGeom);
+ bufferProps.add(idProp);
+ MgByteReader geomReader = agfRW.write(featureGeom);
MgGeometryProperty geomProp = new MgGeometryProperty("GEOM", geomReader);
- bufferProps.Add(geomProp);
- propCollection.Add(bufferProps);
+ bufferProps.add(geomProp);
+ propCollection.addItem(bufferProps);
}
String GetMapSrs(MgMap map)
@@ -508,7 +508,7 @@
{
try
{
- String srs = map.GetMapSRS();
+ String srs = map.getMapSRS();
if(!srs.equals(""))
return srs;
}
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/common.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/common.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/common.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -32,7 +32,7 @@
//
String realpath = getServletContext().getRealPath("/");
String configPath = realpath + "webconfig.ini";
- MapGuideJavaApi.MgInitializeWebTier(configPath);
+ MapGuideJavaApiEx.MgInitializeWebTier(configPath);
}
String GetDefaultLocale()
@@ -265,7 +265,7 @@
try
{
MgResourceIdentifier resId = new MgResourceIdentifier(proposedResourceId);
- validResourceId = resId.ToString();
+ validResourceId = resId.toString();
}
catch(MgException e)
{
@@ -303,48 +303,48 @@
MgFeatureQueryOptions BuildFeatureQueryOptions(MgClassDefinition classDef) throws MgException
{
MgFeatureQueryOptions query = new MgFeatureQueryOptions();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
- MgPropertyDefinitionCollection propertyList = classDef.GetProperties();
- for (int i = 0; i < propertyList.GetCount(); i++)
+ String geomPropName = classDef.getDefaultGeometryPropertyName();
+ MgPropertyDefinitionCollection propertyList = classDef.getProperties();
+ for (int i = 0; i < propertyList.getCount(); i++)
{
- MgPropertyDefinition propertyDef = propertyList.GetItem(i);
- String property = propertyDef.GetName();
+ MgPropertyDefinition propertyDef = propertyList.getItem(i);
+ String property = propertyDef.getName();
- if ((!property.equals(geomPropName)) && (propertyDef.GetPropertyType() == MgFeaturePropertyType.DataProperty))
+ if ((!property.equals(geomPropName)) && (propertyDef.getPropertyType() == MgFeaturePropertyType.DataProperty))
{
MgDataPropertyDefinition dp = (MgDataPropertyDefinition)propertyDef;
- int propertyType = dp.GetDataType();
+ int propertyType = dp.getDataType();
switch (propertyType) {
case MgPropertyType.Boolean:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Byte:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.DateTime:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Single:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Double:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Int16:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Int32:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.Int64:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
case MgPropertyType.String:
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
break;
}
} else if (property.equals(geomPropName)) {
- query.AddFeatureProperty(property);
+ query.addFeatureProperty(property);
}
}
return query;
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/gettingstarted.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/gettingstarted.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/gettingstarted.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -61,27 +61,27 @@
//
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier wli = new MgResourceIdentifier(webLayout);
byte[] hb = fixedupHtml.getBytes("UTF-8");
MgByteSource src = new MgByteSource(hb, hb.length);
MgWebLayout wl = new MgWebLayout(resourceSrvc, wli);
- MgByteReader pagestream = wl.ProcessGettingStartedPage(src.GetReader(), dwf);
+ MgByteReader pagestream = wl.processGettingStartedPage(src.getReader(), dwf);
if(pagestream == null)
outStream.write(fixedupHtml);
else
- outStream.write(pagestream.ToString());
+ outStream.write(pagestream.toString());
}
else
outStream.write(fixedupHtml);
}
catch(MgException mge) {
- String errorMsg = EscapeForHtml(mge.GetDetails());
+ String errorMsg = EscapeForHtml(mge.getDetails());
outStream.write(errorMsg);
}
catch(Exception e) {
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/init.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/init.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/init.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -24,7 +24,7 @@
// Initialize web tier with the site configuration file. The config
// file should be in the same folder as this script.
String configPath = realpath + "webconfig.ini";
- MapGuideJavaApi.MgInitializeWebTier( configPath );
+ MapGuideJavaApiEx.MgInitializeWebTier( configPath );
}
%>
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/legend.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/legend.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/legend.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -89,19 +89,19 @@
// Connect to the site and get a resource service instance
//
MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ userInfo.setMgSessionId(sessionId);
+ userInfo.setClientIp(GetClientIp(request));
+ userInfo.setClientAgent(GetClientAgent());
MgSiteConnection site = new MgSiteConnection();
- site.Open(userInfo);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(userInfo);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
//Load the map runtime state.
//
MgMap map = new MgMap(site);
- map.Open(mapName);
+ map.open(mapName);
int updateType = -1;
@@ -136,7 +136,7 @@
}
catch(MgException e)
{
- String details = EscapeForHtml(e.GetDetails());
+ String details = EscapeForHtml(e.getDetails());
writer = response.getWriter();
writer.write(details);
response.setContentLength(details.length());
@@ -177,14 +177,14 @@
ArrayList tree = new ArrayList();
HashMap knownGroups = new HashMap();
ArrayList unresolved = new ArrayList();
- MgLayerGroupCollection groups = map.GetLayerGroups();
+ MgLayerGroupCollection groups = map.getLayerGroups();
- for(int i = 0; i < groups.GetCount(); i++)
+ for(int i = 0; i < groups.getCount(); i++)
{
- MgLayerGroup rtGroup = (MgLayerGroup)groups.GetItem(i);
- TreeItem node = new TreeItem(rtGroup.GetName(), true, rtGroup, "null");
+ MgLayerGroup rtGroup = (MgLayerGroup)groups.getItem(i);
+ TreeItem node = new TreeItem(rtGroup.getName(), true, rtGroup, "null");
knownGroups.put(node.name, node);
- MgLayerGroup parentGroup = rtGroup.GetGroup();
+ MgLayerGroup parentGroup = rtGroup.getGroup();
if(parentGroup == null)
{
tree.add(node);
@@ -191,7 +191,7 @@
}
else
{
- String parentName = parentGroup.GetName();
+ String parentName = parentGroup.getName();
TreeItem parentNode = (TreeItem)knownGroups.get(parentName);
if(parentNode != null)
parentNode.Attach(node);
@@ -215,28 +215,28 @@
}
}
// Get the layers
- MgLayerCollection layers = map.GetLayers();
+ MgLayerCollection layers = map.getLayers();
// Get the resource Ids of the layers
MgStringCollection resIds = new MgStringCollection();
- for(int i = 0; i < layers.GetCount(); i++)
+ for(int i = 0; i < layers.getCount(); i++)
{
- MgLayer rtLayer = (MgLayer) layers.GetItem(i);
- MgResourceIdentifier resId = rtLayer.GetLayerDefinition();
- resIds.Add(resId.ToString());
+ MgLayer rtLayer = (MgLayer) layers.getItem(i);
+ MgResourceIdentifier resId = rtLayer.getLayerDefinition();
+ resIds.add(resId.toString());
}
- MgStringCollection layersData = resSrvc.GetResourceContents(resIds, null);
+ MgStringCollection layersData = resSrvc.getResourceContents(resIds, null);
- for(int i = 0; i < layers.GetCount(); i++)
+ for(int i = 0; i < layers.getCount(); i++)
{
- MgLayer rtLayer = (MgLayer) layers.GetItem(i);
- TreeItem node = new TreeItem(rtLayer.GetName(), false, rtLayer, (String)layersData.GetItem(i));
- MgLayerGroup parentGroup = rtLayer.GetGroup();
+ MgLayer rtLayer = (MgLayer) layers.getItem(i);
+ TreeItem node = new TreeItem(rtLayer.getName(), false, rtLayer, (String)layersData.getItem(i));
+ MgLayerGroup parentGroup = rtLayer.getGroup();
if(parentGroup == null)
tree.add(node);
else
{
- TreeItem parentNode = (TreeItem)knownGroups.get(parentGroup.GetName());
+ TreeItem parentNode = (TreeItem)knownGroups.get(parentGroup.getName());
if(parentNode != null)
parentNode.Attach(node);
else
@@ -252,11 +252,11 @@
HashMap BuildLayerMap(MgMap map) throws MgException
{
HashMap layerMap = new HashMap();
- MgLayerCollection layers = map.GetLayers();
- for(int i = 0; i < layers.GetCount(); i++)
+ MgLayerCollection layers = map.getLayers();
+ for(int i = 0; i < layers.getCount(); i++)
{
- MgLayer rtLayer = (MgLayer) layers.GetItem(i);
- layerMap.put(rtLayer.GetObjectId(), rtLayer);
+ MgLayer rtLayer = (MgLayer) layers.getItem(i);
+ layerMap.put(rtLayer.getObjectId(), rtLayer);
}
return layerMap;
}
@@ -292,21 +292,21 @@
{
output.append(String.format("var %s = new GroupItem(\"%s\", %s, %s, %s, %s, \"%s\", \"%s\", %s);\n",
new Object[] {groupName,
- StrEscape(rtLayerGroup.GetLegendLabel()),
- rtLayerGroup.GetExpandInLegend()? "true": "false",
+ StrEscape(rtLayerGroup.getLegendLabel()),
+ rtLayerGroup.getExpandInLegend()? "true": "false",
parentName,
- rtLayerGroup.GetVisible()? "true": "false",
- rtLayerGroup.GetDisplayInLegend()? "true": "false",
- rtLayerGroup.GetObjectId(),
- StrEscape(rtLayerGroup.GetName()),
- (rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMap || rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMapFromTileSet)? "true": "false"}));
+ rtLayerGroup.getVisible()? "true": "false",
+ rtLayerGroup.getDisplayInLegend()? "true": "false",
+ rtLayerGroup.getObjectId(),
+ StrEscape(rtLayerGroup.getName()),
+ (rtLayerGroup.getLayerGroupType() == MgLayerGroupType.BaseMap || rtLayerGroup.getLayerGroupType() == MgLayerGroupType.BaseMapFromTileSet)? "true": "false"}));
}
else
{
output.append(String.format("var %s = new GroupSummary(\"%s\", \"%s\", %s, %s);\n",
new Object[] {groupName,
- StrEscape(rtLayerGroup.GetName()),
- rtLayerGroup.GetObjectId(),
+ StrEscape(rtLayerGroup.getName()),
+ rtLayerGroup.getObjectId(),
arrChildName,
parentName}));
}
@@ -327,22 +327,22 @@
MgLayer rtLayer = (MgLayer)node.rtObject;
if(fulldata)
{
- MgResourceIdentifier resId = rtLayer.GetLayerDefinition();
+ MgResourceIdentifier resId = rtLayer.getLayerDefinition();
String layerData = node.layerData;
String layerName = "lyr" + (intermediateVar++);
- String objectId = rtLayer.GetObjectId();
+ String objectId = rtLayer.getObjectId();
output.append(String.format("var %s = new LayerItem(\"%s\", \"%s\", %s, %s, %s, %s, %s, \"%s\", \"%s\", %s);\n",
new Object[] {layerName,
- StrEscape(rtLayer.GetLegendLabel()),
- rtLayer.GetName(),
- rtLayer.GetExpandInLegend()? "true": "false",
+ StrEscape(rtLayer.getLegendLabel()),
+ rtLayer.getName(),
+ rtLayer.getExpandInLegend()? "true": "false",
parentName,
- rtLayer.GetVisible()? "true": "false",
- rtLayer.GetDisplayInLegend()? "true": "false",
- rtLayer.GetSelectable()? "true": "false",
- resId.ToString(),
+ rtLayer.getVisible()? "true": "false",
+ rtLayer.getDisplayInLegend()? "true": "false",
+ rtLayer.getSelectable()? "true": "false",
+ resId.toString(),
objectId,
- rtLayer.GetLayerType() == MgLayerType.BaseMap? "true": "false"}));
+ rtLayer.getLayerType() == MgLayerType.BaseMap? "true": "false"}));
output.append(String.format("%s[%d] = %s;\n",
new Object[] {container,
@@ -360,9 +360,9 @@
output.append(String.format("%s[%d] = new LayerSummary(\"%s\", \"%s\", \"%s\");\n",
new Object[] {container,
Integer.valueOf(i),
- StrEscape(rtLayer.GetName()),
- rtLayer.GetObjectId(),
- rtLayer.GetLayerDefinition().ToString()}));
+ StrEscape(rtLayer.getName()),
+ rtLayer.getObjectId(),
+ rtLayer.getLayerDefinition().toString()}));
}
}
}
@@ -485,11 +485,11 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
byte[] byteBuffer = new byte[1024];
- int numBytes = byteReader.Read(byteBuffer, 1024);
+ int numBytes = byteReader.read(byteBuffer, 1024);
while(numBytes > 0)
{
bos.write(byteBuffer, 0, numBytes);
- numBytes = byteReader.Read(byteBuffer, 1024);
+ numBytes = byteReader.read(byteBuffer, 1024);
}
stream = new ByteArrayInputStream(bos.toByteArray());
}
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mainframe.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mainframe.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -59,11 +59,11 @@
MgUserInformation cred = new MgUserInformation();
if(sessionId != null && sessionId != "")
{
- cred.SetMgSessionId(sessionId);
+ cred.setMgSessionId(sessionId);
createSession = false;
}
else if(username != null)
- cred.SetMgUsernamePassword(username, password);
+ cred.setMgUsernamePassword(username, password);
else
{
RequestAuthentication(response);
@@ -71,17 +71,17 @@
}
MgSiteConnection site = new MgSiteConnection();
- cred.SetLocale(locale);
+ cred.setLocale(locale);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
- site.Open(cred);
+ site.open(cred);
if(createSession)
{
- MgSite site1 = site.GetSite();
- sessionId = site1.CreateSession();
+ MgSite site1 = site.getSite();
+ sessionId = site1.createSession();
if(forDwf == 0)
{
orgSessionId = sessionId;
@@ -91,42 +91,42 @@
//Get a MgWebLayout object initialized with the specified web layout definition
//
MgWebLayout webLayout = null;
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier webLayoutId = new MgResourceIdentifier(webLayoutDefinition);
webLayout = new MgWebLayout(resourceSrvc, webLayoutId);
//calculate the size of the variable elements of the viewer
//
- MgWebToolBar toolBar = webLayout.GetToolBar();
- MgWebUiPane statusBar = webLayout.GetStatusBar();
- MgWebTaskPane taskPane = webLayout.GetTaskPane();
- MgWebInformationPane infoPane = webLayout.GetInformationPane();
- MgWebTaskBar taskBar = taskPane.GetTaskBar();
- String mapDef = webLayout.GetMapDefinition();
+ MgWebToolBar toolBar = webLayout.getToolBar();
+ MgWebUiPane statusBar = webLayout.getStatusBar();
+ MgWebTaskPane taskPane = webLayout.getTaskPane();
+ MgWebInformationPane infoPane = webLayout.getInformationPane();
+ MgWebTaskBar taskBar = taskPane.getTaskBar();
+ String mapDef = webLayout.getMapDefinition();
- startupScriptCode = webLayout.GetStartupScript();
- String selectionColor = webLayout.GetSelectionColor();
- String mapImgFormat = webLayout.GetMapImageFormat();
- String selImgFormat = webLayout.GetSelectionImageFormat();
- int pointBuffer = webLayout.GetPointSelectionBuffer();
+ startupScriptCode = webLayout.getStartupScript();
+ String selectionColor = webLayout.getSelectionColor();
+ String mapImgFormat = webLayout.getMapImageFormat();
+ String selImgFormat = webLayout.getSelectionImageFormat();
+ int pointBuffer = webLayout.getPointSelectionBuffer();
- boolean showTaskPane = taskPane.IsVisible();
- boolean showTaskBar = taskBar.IsVisible();
- boolean showStatusbar = statusBar.IsVisible();
- boolean showToolbar = toolBar.IsVisible();
+ boolean showTaskPane = taskPane.isVisible();
+ boolean showTaskBar = taskBar.isVisible();
+ boolean showStatusbar = statusBar.isVisible();
+ boolean showToolbar = toolBar.isVisible();
- int taskPaneWidth = taskPane.GetWidth();
+ int taskPaneWidth = taskPane.getWidth();
int toolbarHeight = 30;
int taskBarHeight = 30;
int statusbarHeight = 26;
- taskPaneWidth = showTaskPane? taskPaneWidth: 0;
- toolbarHeight = showToolbar? toolbarHeight: 0;
+ taskPaneWidth = showTaskPane ? taskPaneWidth: 0;
+ toolbarHeight = showToolbar ? toolbarHeight: 0;
taskBarHeight = showTaskBar ? taskBarHeight : 0;
- statusbarHeight = showStatusbar? statusbarHeight: 0;
+ statusbarHeight = showStatusbar ? statusbarHeight: 0;
//Encode the initial url so that it does not trip any sub-frames (especially if this url has parameters)
- String taskPaneUrl = URLEncoder.encode(taskPane.GetInitialTaskUrl(), "UTF-8");
+ String taskPaneUrl = URLEncoder.encode(taskPane.getInitialTaskUrl(), "UTF-8");
String vpath = GetSurroundVirtualPath(request);
boolean defHome = false;
if(taskPaneUrl == null || taskPaneUrl.length() == 0) {
@@ -141,19 +141,19 @@
// as this script is running. However the naming convention is fixed enough that we can figure out
// what to pass to the Task Pane
MgResourceIdentifier resId = new MgResourceIdentifier(mapDef);
- mapName = resId.GetName();
+ mapName = resId.getName();
- String title = webLayout.GetTitle();
+ String title = webLayout.getTitle();
- boolean showLegend = infoPane.IsLegendBandVisible();
- boolean showProperties = infoPane.IsPropertiesBandVisible();
+ boolean showLegend = infoPane.isLegendBandVisible();
+ boolean showProperties = infoPane.isPropertiesBandVisible();
int infoWidth = 0;
if(showLegend || showProperties)
{
- if(infoPane.IsVisible())
+ if(infoPane.isVisible())
{
- infoWidth = infoPane.GetWidth();
+ infoWidth = infoPane.getWidth();
if(infoWidth < 5)
infoWidth = 5; //ensure visible
}
@@ -170,18 +170,18 @@
//view center
//
- MgPoint ptCenter = webLayout.GetCenter();
+ MgPoint ptCenter = webLayout.getCenter();
String center = "null";
if(ptCenter != null)
{
- MgCoordinate coord = ptCenter.GetCoordinate();
- Object[] formatArgs = { Double.toString(coord.GetX()), Double.toString(coord.GetY()) };
+ MgCoordinate coord = ptCenter.getCoordinate();
+ Object[] formatArgs = { Double.toString(coord.getX()), Double.toString(coord.getY()) };
center = MessageFormat.format("new Point({0}, {1})", formatArgs);
}
//Process commands and declare command objects
//
- MgWebCommandCollection commands = webLayout.GetCommands();
+ MgWebCommandCollection commands = webLayout.getCommands();
String cmdObjects = "";
String cmdObject = "";
int navCmdIndex = 0;
@@ -194,16 +194,16 @@
int selAwareCmdCount = 0;
String selAwareCmds = "";
- for(int i = 0; i < commands.GetCount(); i++)
+ for(int i = 0; i < commands.getCount(); i++)
{
- MgWebCommand cmd = commands.GetItem(i);
- if(!cmd.IsUsed())
+ MgWebCommand cmd = commands.getItem(i);
+ if(!cmd.isUsed())
continue;
- int tgtViewer = cmd.GetTargetViewerType();
+ int tgtViewer = cmd.getTargetViewerType();
if((tgtViewer == MgWebTargetViewerType.Dwf) != (forDwf == 1) && (tgtViewer != MgWebTargetViewerType.All))
continue;
- String name = cmd.GetName();
- int action = cmd.GetAction();
+ String name = cmd.getName();
+ int action = cmd.getAction();
if (action == MgWebActions.Search)
{
MgWebSearchCommand searchCmd = (MgWebSearchCommand)cmd;
@@ -210,11 +210,11 @@
// create the column objects
String cols = "var resCols" + searchCmdIndex + " = new Array();\n";
- if(searchCmd.GetResultColumnCount() > 0)
+ if(searchCmd.getResultColumnCount() > 0)
{
- for(int j = 0; j < searchCmd.GetResultColumnCount(); j++)
+ for(int j = 0; j < searchCmd.getResultColumnCount(); j++)
{
- Object[] formatArgs = { new Integer(searchCmdIndex), new Integer(j), StrEscape(searchCmd.GetColumnDisplayNameAt(j)), StrEscape(searchCmd.GetColumnPropertyNameAt(j)) };
+ Object[] formatArgs = { new Integer(searchCmdIndex), new Integer(j), StrEscape(searchCmd.getColumnDisplayNameAt(j)), StrEscape(searchCmd.getColumnPropertyNameAt(j)) };
String col = MessageFormat.format("resCols{0,number,integer}[{1,number,integer}] = new ResultColumn(\"{2}\", \"{3}\");\n", formatArgs);
cols += col;
}
@@ -224,19 +224,19 @@
// declare a new search command object
Object[] formatArgs = { new Integer(i),
StrEscape(name),
- StrEscape(searchCmd.GetLabel()),
+ StrEscape(searchCmd.getLabel()),
new Integer(action),
- searchCmd.GetIconUrl(),
- searchCmd.GetDisabledIconUrl(),
- StrEscape(searchCmd.GetTooltip()),
- StrEscape(searchCmd.GetDescription()),
- searchCmd.GetLayer(),
- StrEscape(searchCmd.GetPrompt()),
+ searchCmd.getIconUrl(),
+ searchCmd.getDisabledIconUrl(),
+ StrEscape(searchCmd.getTooltip()),
+ StrEscape(searchCmd.getDescription()),
+ searchCmd.getLayer(),
+ StrEscape(searchCmd.getPrompt()),
new Integer(searchCmdIndex),
- StrEscape(searchCmd.GetFilter()),
- new Integer(searchCmd.GetMatchLimit()),
- new Integer(searchCmd.GetTarget()),
- searchCmd.GetTargetName() };
+ StrEscape(searchCmd.getFilter()),
+ new Integer(searchCmd.getMatchLimit()),
+ new Integer(searchCmd.getTarget()),
+ searchCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new SearchCommand(\"{1}\", \"{2}\", {3,number,integer}, \"{4}\", \"{5}\", \"{6}\", \"{7}\", \"{8}\", \"{9}\", resCols{10}, \"{11}\", {12,number,integer}, {13,number,integer}, \"{14}\");\n", formatArgs);
searchCmdIndex++;
@@ -248,24 +248,24 @@
// create the parameter objects
String paramObjs = "var navParams" + navCmdIndex + " = new Array();\n";
String layers = "var layers" + navCmdIndex + " = new Array();\n";
- if(invokeUrlCmd.GetParameterCount() > 0)
+ if(invokeUrlCmd.getParameterCount() > 0)
{
- for(int j = 0; j < invokeUrlCmd.GetParameterCount(); j++)
+ for(int j = 0; j < invokeUrlCmd.getParameterCount(); j++)
{
- Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.GetParameterNameAt(j), invokeUrlCmd.GetParameterValueAt(j) };
+ Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.getParameterNameAt(j), invokeUrlCmd.getParameterValueAt(j) };
String param = MessageFormat.format("navParams{0,number,integer}[{1,number,integer}] = new NavParam(\"{2}\", \"{3}\");\n", formatArgs);
paramObjs = paramObjs + param;
}
}
- for( int j = 0; j < invokeUrlCmd.GetLayerCount(); j++ )
+ for( int j = 0; j < invokeUrlCmd.getLayerCount(); j++ )
{
- Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.GetLayerNameAt(j) };
+ Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.getLayerNameAt(j) };
String layer = MessageFormat.format("layers{0,number,integer}[{1,number,integer}] = \"{2}\";\n", formatArgs);
layers = layers + layer;
}
cmdObjects = cmdObjects + paramObjs + layers;
- if(invokeUrlCmd.DisabledIfSelectionEmpty() || invokeUrlCmd.GetLayerCount() > 0)
+ if(invokeUrlCmd.disabledIfSelectionEmpty() || invokeUrlCmd.getLayerCount() > 0)
{
Object[] formatArgs = { new Integer(selAwareCmdCount), new Integer(i) };
selAwareCmds = selAwareCmds + MessageFormat.format("selectionAwareCmds[{0,number,integer}] = {1,number,integer};\n", formatArgs);
@@ -276,16 +276,16 @@
Object[] formatArgs = { new Integer(i),
StrEscape(name),
new Integer(action),
- invokeUrlCmd.GetIconUrl(),
- invokeUrlCmd.GetDisabledIconUrl(),
- StrEscape( invokeUrlCmd.GetTooltip()),
- StrEscape( invokeUrlCmd.GetDescription()),
- invokeUrlCmd.GetUrl(),
+ invokeUrlCmd.getIconUrl(),
+ invokeUrlCmd.getDisabledIconUrl(),
+ StrEscape( invokeUrlCmd.getTooltip()),
+ StrEscape( invokeUrlCmd.getDescription()),
+ invokeUrlCmd.getUrl(),
new Integer(navCmdIndex),
- invokeUrlCmd.DisabledIfSelectionEmpty() ? "true" : "false",
+ invokeUrlCmd.disabledIfSelectionEmpty() ? "true" : "false",
new Integer(navCmdIndex),
- new Integer(invokeUrlCmd.GetTarget()),
- invokeUrlCmd.GetTargetName() };
+ new Integer(invokeUrlCmd.getTarget()),
+ invokeUrlCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new InvokeUrlCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", \"{7}\", navParams{8,number,integer}, {9}, layers{10,number,integer}, {11,number,integer}, \"{12}\");\n", formatArgs);
navCmdIndex++;
}
@@ -305,12 +305,12 @@
Object[] formatArgs = { new Integer(i),
StrEscape( name ),
new Integer( action ),
- targetCmd.GetIconUrl(),
- targetCmd.GetDisabledIconUrl(),
- StrEscape(targetCmd.GetTooltip()),
- StrEscape(targetCmd.GetDescription()),
- new Integer( targetCmd.GetTarget()),
- targetCmd.GetTargetName() };
+ targetCmd.getIconUrl(),
+ targetCmd.getDisabledIconUrl(),
+ StrEscape(targetCmd.getTooltip()),
+ StrEscape(targetCmd.getDescription()),
+ new Integer( targetCmd.getTarget()),
+ targetCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new UiTargetCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", {7,number,integer}, \"{8}\");\n", formatArgs);
}
else if(action == MgWebActions.Help)
@@ -321,13 +321,13 @@
Object[] formatArgs = { new Integer(i),
StrEscape(name),
new Integer(action),
- helpCmd.GetIconUrl(),
- helpCmd.GetDisabledIconUrl(),
- StrEscape(helpCmd.GetTooltip()),
- StrEscape(helpCmd.GetDescription()),
- helpCmd.GetUrl(),
- new Integer(helpCmd.GetTarget()),
- helpCmd.GetTargetName() };
+ helpCmd.getIconUrl(),
+ helpCmd.getDisabledIconUrl(),
+ StrEscape(helpCmd.getTooltip()),
+ StrEscape(helpCmd.getDescription()),
+ helpCmd.getUrl(),
+ new Integer(helpCmd.getTarget()),
+ helpCmd.getTargetName() };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new HelpCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", \"{7}\", {8,number,integer}, \"{9}\");\n", formatArgs);
}
else if(action == MgWebActions.PrintMap)
@@ -336,10 +336,10 @@
// declare the print layouts
String layouts = "var layouts" + printCmdIndex + " = new Array();\n";
- for(int j = 0; j < printCmd.GetPrintLayoutCount(); j++)
+ for(int j = 0; j < printCmd.getPrintLayoutCount(); j++)
{
String layout = "";
- Object[] formatArgs = { new Integer(printCmdIndex), new Integer(j), printCmd.GetPrintLayoutAt(j) };
+ Object[] formatArgs = { new Integer(printCmdIndex), new Integer(j), printCmd.getPrintLayoutAt(j) };
layout = MessageFormat.format("layouts{0,number,integer}[{1,number,integer}] = \"{2}\";\n", formatArgs);
layouts = layouts + layout;
}
@@ -349,10 +349,10 @@
Object[] formatArgs = { new Integer(i),
StrEscape( name ),
new Integer(action),
- printCmd.GetIconUrl(),
- printCmd.GetDisabledIconUrl(),
- StrEscape( printCmd.GetTooltip()),
- StrEscape( printCmd.GetDescription()),
+ printCmd.getIconUrl(),
+ printCmd.getDisabledIconUrl(),
+ StrEscape( printCmd.getTooltip()),
+ StrEscape( printCmd.getDescription()),
new Integer(printCmdIndex) };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new PrintCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", layouts{7,number,integer});\n", formatArgs );
printCmdIndex++;
@@ -365,14 +365,14 @@
Object[] formatArgs = { new Integer(i),
StrEscape(name),
new Integer(action),
- invokeScriptCmd.GetIconUrl(),
- invokeScriptCmd.GetDisabledIconUrl(),
- StrEscape( invokeScriptCmd.GetTooltip()),
- StrEscape( invokeScriptCmd.GetDescription()),
+ invokeScriptCmd.getIconUrl(),
+ invokeScriptCmd.getDisabledIconUrl(),
+ StrEscape( invokeScriptCmd.getTooltip()),
+ StrEscape( invokeScriptCmd.getDescription()),
new Integer( scriptCmdIndex ) };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new InvokeScriptCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", {7,number,integer});\n", formatArgs);
- userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.GetScriptCode() + "\n}\n";
+ userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.getScriptCode() + "\n}\n";
Object[] formatArgs2 = { new Integer(scriptCmdIndex), new Integer(scriptCmdIndex) };
userCodeCalls = userCodeCalls + MessageFormat.format("case {0,number,integer}: UserFunc{0,number,integer}(); break;\n", formatArgs2);
@@ -384,10 +384,10 @@
Object[] formatArgs = { new Integer(i),
name,
new Integer(action),
- cmd.GetIconUrl(),
- cmd.GetDisabledIconUrl(),
- StrEscape(cmd.GetTooltip()),
- StrEscape(cmd.GetDescription()) };
+ cmd.getIconUrl(),
+ cmd.getDisabledIconUrl(),
+ StrEscape(cmd.getTooltip()),
+ StrEscape(cmd.getDescription()) };
cmdObject = MessageFormat.format("commands[{0,number,integer}] = new BasicCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\");\n", formatArgs);
}
cmdObjects = cmdObjects + cmdObject;
@@ -397,15 +397,15 @@
//Declare toolbar items
//
- String toolbarDef = DeclareUiItems(toolBar.GetWidgets(), "toolbarItems");
+ String toolbarDef = DeclareUiItems(toolBar.getWidgets(), "toolbarItems");
//Declare task items
- String taskListDef = DeclareUiItems(taskBar.GetTaskList(), "taskItems");
+ String taskListDef = DeclareUiItems(taskBar.getTaskList(), "taskItems");
//Declare context menu items
- MgWebContextMenu ctxMenu = webLayout.GetContextMenu();
+ MgWebContextMenu ctxMenu = webLayout.getContextMenu();
String ctxMenuDef;
- if(ctxMenu.IsVisible())
+ if(ctxMenu.isVisible())
ctxMenuDef = DeclareUiItems(ctxMenu, "ctxMenuItems");
else
ctxMenuDef = "";
@@ -412,17 +412,17 @@
//task items texts
String taskItemTexts = "";
- MgWebWidgetCollection taskButtons = taskBar.GetTaskButtons();
+ MgWebWidgetCollection taskButtons = taskBar.getTaskButtons();
for(int i = 0; i < 4; i ++)
{
- MgWebTaskBarWidget btn = (MgWebTaskBarWidget)taskButtons.GetWidget(i);
+ MgWebTaskBarWidget btn = (MgWebTaskBarWidget)taskButtons.getWidget(i);
if(i > 0)
taskItemTexts += ",";
- taskItemTexts += "\"" + StrEscape(btn.GetName()) + "\"," +
- "\"" + StrEscape(btn.GetTooltip()) + "\"," +
- "\"" + StrEscape(btn.GetDescription()) + "\"," +
- "\"" + StrEscape(btn.GetIconUrl()) + "\"," +
- "\"" + StrEscape(btn.GetDisabledIconUrl()) + "\"";
+ taskItemTexts += "\"" + StrEscape(btn.getName()) + "\"," +
+ "\"" + StrEscape(btn.getTooltip()) + "\"," +
+ "\"" + StrEscape(btn.getDescription()) + "\"," +
+ "\"" + StrEscape(btn.getIconUrl()) + "\"," +
+ "\"" + StrEscape(btn.getDisabledIconUrl()) + "\"";
}
//transmit the session to the map pane if one was specified to this request
@@ -449,9 +449,9 @@
showProperties? "1": "0",
String.valueOf(infoWidth),
locale,
- String.valueOf(webLayout.GetHyperlinkTarget()),
- webLayout.GetHyperlinkTargetFrame(),
- webLayout.IsZoomControlVisible()? "1": "0",
+ String.valueOf(webLayout.getHyperlinkTarget()),
+ webLayout.getHyperlinkTargetFrame(),
+ webLayout.isZoomControlVisible()? "1": "0",
selectionColor,
mapImgFormat,
selImgFormat,
@@ -481,9 +481,9 @@
showProperties? "1": "0",
String.valueOf(infoWidth),
locale,
- String.valueOf(webLayout.GetHyperlinkTarget()),
- webLayout.GetHyperlinkTargetFrame(),
- webLayout.IsZoomControlVisible()? "1": "0",
+ String.valueOf(webLayout.getHyperlinkTarget()),
+ webLayout.getHyperlinkTargetFrame(),
+ webLayout.isZoomControlVisible()? "1": "0",
selectionColor,
mapImgFormat,
selImgFormat,
@@ -508,10 +508,10 @@
String int0 = "0";
String int1 = "1";
String[] vals = {
- webLayout.GetTitle(),
+ webLayout.getTitle(),
GetRootVirtualFolder(request) + "/mapagent/mapagent.fcgi",
- webLayout.GetEnablePingServer()? int1 : int0,
- String.valueOf(site.GetSite().GetSessionTimeout()),
+ webLayout.getEnablePingServer()? int1 : int0,
+ String.valueOf(site.getSite().getSessionTimeout()),
locale,
showToolbar ? int1 : int0,
showStatusbar ? int1 : int0,
@@ -523,7 +523,7 @@
mapDef,
String.valueOf(taskPaneWidth),
center,
- String.valueOf(webLayout.GetScale()),
+ String.valueOf(webLayout.getScale()),
StrEscape(title),
(forDwf == 1)? "1" : "0",
cmdObjects,
@@ -549,21 +549,26 @@
response.getWriter().write(templ);
response.setContentLength(templ.length());
}
+catch(MgUserNotFoundException e)
+{
+ RequestAuthentication(response);
+ return;
+}
+catch(MgUnauthorizedAccessException e)
+{
+ RequestAuthentication(response);
+ return;
+}
+catch(MgAuthenticationFailedException e)
+{
+ RequestAuthentication(response);
+ return;
+}
catch(MgException e)
{
- if (e.GetExceptionCode() == MgExceptionCodes.MgUnauthorizedAccessException ||
- e.GetExceptionCode() == MgExceptionCodes.MgUserNotFoundException ||
- e.GetExceptionCode() == MgExceptionCodes.MgAuthenticationFailedException)
- {
- RequestAuthentication(response);
- return;
- }
- else
- {
- String msg = EscapeForHtml(e.GetExceptionMessage());
- response.getWriter().write(msg);
- response.setContentLength(msg.length());
- }
+ String msg = EscapeForHtml(e.getExceptionMessage());
+ response.getWriter().write(msg);
+ response.setContentLength(msg.length());
}
catch(Exception ne)
{
@@ -591,10 +596,10 @@
if(coll != null)
{
- for(int i = 0, j = 0; i < coll.GetCount(); i++)
+ for(int i = 0, j = 0; i < coll.getCount(); i++)
{
- MgWebWidget item = coll.GetWidget(i);
- int it = item.GetType();
+ MgWebWidget item = coll.getWidget(i);
+ int it = item.getType();
if (it == MgWebWidgetType.Separator)
{
Object[] formatArgs = { varname, new Integer(j++) };
@@ -602,11 +607,11 @@
}
else if ( it == MgWebWidgetType.Command && item instanceof MgWebCommandWidget )
{
- MgWebCommand cmd = ((MgWebCommandWidget)item).GetCommand();
- Integer cmdIndex = (Integer)cmds.get(cmd.GetName());
+ MgWebCommand cmd = ((MgWebCommandWidget)item).getCommand();
+ Integer cmdIndex = (Integer)cmds.get(cmd.getName());
if(cmdIndex == null)
continue;
- Object[] formatArgs = { varname, new Integer(j++), StrEscape(cmd.GetLabel()), cmdIndex };
+ Object[] formatArgs = { varname, new Integer(j++), StrEscape(cmd.getLabel()), cmdIndex };
def = def + MessageFormat.format("{0}[{1,number,integer}] = new CommandItem(\"{2}\", {3,number,integer});\n", formatArgs);
}
else
@@ -616,8 +621,8 @@
String htmlName = "FlyoutDiv" + curFlyout;
Object[] formatArgs1 = { subVarname };
def = def + MessageFormat.format("var {0} = new Array()\n", formatArgs1);
- def = def + DeclareUiItems(((MgWebFlyoutWidget) item).GetSubItems(), subVarname);
- Object[] formatArgs2 = { varname, new Integer(j++), StrEscape( ((MgWebFlyoutWidget) item).GetLabel() ), subVarname, StrEscape( htmlName ), ((MgWebFlyoutWidget) item).GetIconUrl() };
+ def = def + DeclareUiItems(((MgWebFlyoutWidget) item).getSubItems(), subVarname);
+ Object[] formatArgs2 = { varname, new Integer(j++), StrEscape( ((MgWebFlyoutWidget) item).getLabel() ), subVarname, StrEscape( htmlName ), ((MgWebFlyoutWidget) item).getIconUrl() };
def = def + MessageFormat.format("{0}[{1,number,integer}] = new FlyoutItem(\"{2}\", {3}, \"{4}\", \"{5}\");\n", formatArgs2);
}
}
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mapframe.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/mapframe.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -54,55 +54,56 @@
// create the map instance and store it with the session
//
MgUserInformation userInfo = new MgUserInformation();
- userInfo.SetMgSessionId(sessionId);
- userInfo.SetClientIp(GetClientIp(request));
- userInfo.SetClientAgent(GetClientAgent());
+ userInfo.setMgSessionId(sessionId);
+ userInfo.setClientIp(GetClientIp(request));
+ userInfo.setClientAgent(GetClientAgent());
MgSiteConnection site = new MgSiteConnection();
- site.Open(userInfo);
+ site.open(userInfo);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgMap map = new MgMap(site);
MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
- String mapName = resId.GetName();
- map.Create(resId, mapName);
+ String mapName = resId.getName();
+ map.create(resId, mapName);
- MgResourceIdentifier tileSetId = map.GetTileSetDefinition();
+ MgResourceIdentifier tileSetId = map.getTileSetDefinition();
- MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
- int tileSizeX = tileSrvc.GetDefaultTileSizeX();
- int tileSizeY = tileSrvc.GetDefaultTileSizeY();
+ MgTileService tileSrvc = (MgTileService)site.createService(MgServiceType.TileService);
+ int tileSizeX = tileSrvc.getDefaultTileSizeX();
+ int tileSizeY = tileSrvc.getDefaultTileSizeY();
if (null != tileSetId)
{
//Can't load map if it points to a non-default tile set provider
- if (map.GetTileSetProvider() != "Default")
+ String tsProvider = map.getTileSetProvider();
+ if (!tsProvider.equals("Default"))
{
- throw new RuntimeException(MessageFormat.format(MgLocalizer.GetString("ERR_UNSUPPORTED_TILESET", locale), new Object[] { map.GetTileSetProvider() }));
+ throw new RuntimeException(MessageFormat.format(MgLocalizer.GetString("ERR_UNSUPPORTED_TILESET", locale), new Object[] { tsProvider }));
}
//Overwrite the map definition with tile set id (this is for GETTILE requests) and
//use size settings from that tile set
- mapDefinition = tileSetId.ToString();
- tileSizeX = tileSrvc.GetDefaultTileSizeX(tileSetId);
- tileSizeY = tileSrvc.GetDefaultTileSizeY(tileSetId);
+ mapDefinition = tileSetId.toString();
+ tileSizeX = tileSrvc.getDefaultTileSizeX(tileSetId);
+ tileSizeY = tileSrvc.getDefaultTileSizeY(tileSetId);
}
//create an empty selection object and store it in the session repository
MgSelection sel = new MgSelection(map);
- sel.Save(resourceSrvc, mapName);
+ sel.save(resourceSrvc, mapName);
//get the map extent and calculate the scale factor
//
- MgEnvelope mapExtent = map.GetMapExtent();
- String srs = map.GetMapSRS();
+ MgEnvelope mapExtent = map.getMapExtent();
+ String srs = map.getMapSRS();
double metersPerUnit;
String unitsType;
if(srs != null && srs.length() > 0)
{
MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
- MgCoordinateSystem cs = csFactory.Create(srs);
- metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
- unitsType = cs.GetUnits();
+ MgCoordinateSystem cs = csFactory.create(srs);
+ metersPerUnit = cs.convertCoordinateSystemUnitsToMeters(1.0);
+ unitsType = cs.getUnits();
}
else
{
@@ -110,9 +111,9 @@
unitsType = MgLocalizer.GetString("DISTANCEMETERS", locale);
}
- MgCoordinate llExtent = mapExtent.GetLowerLeftCoordinate();
- MgCoordinate urExtent = mapExtent.GetUpperRightCoordinate();
- String bgColor = map.GetBackgroundColor();
+ MgCoordinate llExtent = mapExtent.getLowerLeftCoordinate();
+ MgCoordinate urExtent = mapExtent.getUpperRightCoordinate();
+ String bgColor = map.getBackgroundColor();
if(bgColor.length() == 8)
{
bgColor = "#" + bgColor.substring(2);
@@ -126,9 +127,9 @@
// Create a sorted set of display scales
TreeSet scales = new TreeSet();
- for(int i = 0; i < map.GetFiniteDisplayScaleCount(); i++)
+ for(int i = 0; i < map.getFiniteDisplayScaleCount(); i++)
{
- scales.add(new Double(map.GetFiniteDisplayScaleAt(i)));
+ scales.add(new Double(map.getFiniteDisplayScaleAt(i)));
}
Iterator iter = scales.iterator();
int i = 0;
@@ -138,7 +139,7 @@
i++;
}
MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
- map.Save(resourceSrvc, mapStateId);
+ map.save(resourceSrvc, mapStateId);
//load html template code and format it
//
@@ -154,8 +155,8 @@
showLegend != 0 ? "true": "false",
showProperties != 0 ? "true": "false",
sessionId,
- String.valueOf(llExtent.GetX()), String.valueOf(llExtent.GetY()),
- String.valueOf(urExtent.GetX()), String.valueOf(urExtent.GetY()),
+ String.valueOf(llExtent.getX()), String.valueOf(llExtent.getY()),
+ String.valueOf(urExtent.getX()), String.valueOf(urExtent.getY()),
String.valueOf(metersPerUnit),
unitsType,
bgColor,
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/measure.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/measure.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/measure.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -82,14 +82,14 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgFeatureService featureSrvc = (MgFeatureService)site.createService(MgServiceType.FeatureService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier dataSourceId = new MgResourceIdentifier(dataSource);
MgResourceIdentifier layerDefId = new MgResourceIdentifier(layerDef);
@@ -97,8 +97,8 @@
//load the map runtime state and locate the measure layer
//
MgMap map = new MgMap(site);
- map.Open(mapName);
- MgLayerCollection layers = map.GetLayers();
+ map.open(mapName);
+ MgLayerCollection layers = map.getLayers();
srs = GetMapSrs(map);
MgLayer layer = FindLayer(layers, layerDef);
@@ -107,7 +107,7 @@
{
total = 0;
if(layer != null)
- layers.Remove(layer);
+ layers.remove(layer);
if(DataSourceExists(resourceSrvc, dataSourceId))
ClearDataSource(featureSrvc, dataSourceId, featureName);
}
@@ -114,15 +114,15 @@
else
{
MgCoordinateSystemFactory srsFactory = new MgCoordinateSystemFactory();
- MgCoordinateSystem srsMap = srsFactory.Create(srs);
+ MgCoordinateSystem srsMap = srsFactory.create(srs);
- int srsType = srsMap.GetType();
+ int srsType = srsMap.getType();
if(srsType == MgCoordinateSystemType.Geographic)
- distance = srsMap.MeasureGreatCircleDistance(x1, y1, x2, y2);
+ distance = srsMap.measureGreatCircleDistance(x1, y1, x2, y2);
else
- distance = srsMap.MeasureEuclideanDistance(x1, y1, x2, y2);
+ distance = srsMap.measureEuclideanDistance(x1, y1, x2, y2);
- distance = srsMap.ConvertCoordinateSystemUnitsToMeters(distance);
+ distance = srsMap.convertCoordinateSystemUnitsToMeters(distance);
if (units.equals("mi")) distance *= 0.000621371192; //get miles
if (units.equals("km")) distance *= 0.001; //get kilometers
@@ -135,9 +135,9 @@
//
MgGeometryFactory geomFactory = new MgGeometryFactory();
MgCoordinateCollection coordinates = new MgCoordinateCollection();
- coordinates.Add(geomFactory.CreateCoordinateXY(x1, y1));
- coordinates.Add(geomFactory.CreateCoordinateXY(x2, y2));
- MgLineString geom = geomFactory.CreateLineString(coordinates);
+ coordinates.add(geomFactory.createCoordinateXY(x1, y1));
+ coordinates.add(geomFactory.createCoordinateXY(x2, y2));
+ MgLineString geom = geomFactory.createLineString(coordinates);
if(segId == 1)
{
@@ -149,41 +149,41 @@
//
MgClassDefinition classDef = new MgClassDefinition();
- classDef.SetName(featureName);
- classDef.SetDescription(MgLocalizer.GetString("MEASUREFEATURECLASS", locale));
- classDef.SetDefaultGeometryPropertyName("GEOM");
+ classDef.setName(featureName);
+ classDef.setDescription(MgLocalizer.GetString("MEASUREFEATURECLASS", locale));
+ classDef.setDefaultGeometryPropertyName("GEOM");
//Set KEY property
MgDataPropertyDefinition prop = new MgDataPropertyDefinition("KEY");
- prop.SetDataType(MgPropertyType.Int32);
- prop.SetAutoGeneration(true);
- prop.SetReadOnly(true);
- classDef.GetIdentityProperties().Add(prop);
- classDef.GetProperties().Add(prop);
+ prop.setDataType(MgPropertyType.Int32);
+ prop.setAutoGeneration(true);
+ prop.setReadOnly(true);
+ classDef.getIdentityProperties().add(prop);
+ classDef.getProperties().add(prop);
//Set PARTIAL property. Hold the distance for this segment
prop = new MgDataPropertyDefinition("PARTIAL");
- prop.SetDataType(MgPropertyType.Double);
- classDef.GetProperties().Add(prop);
+ prop.setDataType(MgPropertyType.Double);
+ classDef.getProperties().add(prop);
//Set TOTAL property. Hold the total distance up to this segment, including it
prop = new MgDataPropertyDefinition("TOTAL");
- prop.SetDataType(MgPropertyType.Double);
- classDef.GetProperties().Add(prop);
+ prop.setDataType(MgPropertyType.Double);
+ classDef.getProperties().add(prop);
//Set geometry property
MgGeometricPropertyDefinition geomProp = new MgGeometricPropertyDefinition("GEOM");
- //geomProp.SetGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
- geomProp.SetGeometryTypes(4);
- classDef.GetProperties().Add(geomProp);
+ //geomProp.setGeometryTypes(MgFeatureGeometricType.mfgtSurface); //TODO use the constant when exposed
+ geomProp.setGeometryTypes(4);
+ classDef.getProperties().add(geomProp);
//Create the schema
MgFeatureSchema schema = new MgFeatureSchema("MeasureSchema", MgLocalizer.GetString("MEASURESCHEMADESCR", locale));
- schema.GetClasses().Add(classDef);
+ schema.getClasses().add(classDef);
//finally, creation of the feature source
MgFileFeatureSourceParams parameters = new MgFileFeatureSourceParams("OSGeo.SDF", "MapSrs", srs, schema);
- featureSrvc.CreateFeatureSource(dataSourceId, parameters);
+ featureSrvc.createFeatureSource(dataSourceId, parameters);
//build map tip
String unitText = "";
@@ -198,7 +198,7 @@
//Create the layer definition
MgByteReader layerDefContent = BuildLayerDefinitionContent(dataSource, featureName, tip);
- resourceSrvc.SetResource(layerDefId, layerDefContent, null);
+ resourceSrvc.setResource(layerDefId, layerDefContent, null);
}
else
{
@@ -211,9 +211,9 @@
{
legendName = MgLocalizer.GetString("MEASURELAYER", locale);
layer = new MgLayer(layerDefId, resourceSrvc);
- layer.SetDisplayInLegend(true);
- layer.SetLegendLabel(legendName);
- layers.Insert(0, layer);
+ layer.setDisplayInLegend(true);
+ layer.setLegendLabel(legendName);
+ layers.insert(0, layer);
}
}
// create a feature representing this segment and insert it into the data source
@@ -221,32 +221,32 @@
MgPropertyCollection measureProps = new MgPropertyCollection();
MgDoubleProperty partialProp = new MgDoubleProperty("PARTIAL", distance);
- measureProps.Add(partialProp);
+ measureProps.add(partialProp);
MgDoubleProperty totalProp = new MgDoubleProperty("TOTAL", total);
- measureProps.Add(totalProp);
+ measureProps.add(totalProp);
MgAgfReaderWriter agf = new MgAgfReaderWriter();
- MgByteReader geomReader = agf.Write(geom);
+ MgByteReader geomReader = agf.write(geom);
MgGeometryProperty geometryProp = new MgGeometryProperty("GEOM", geomReader);
- measureProps.Add(geometryProp);
+ measureProps.add(geometryProp);
MgInsertFeatures cmd = new MgInsertFeatures(featureName, measureProps);
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(cmd);
+ commands.add(cmd);
//Insert the distance feature in the temporary data source
//
- ReleaseReader(featureSrvc.UpdateFeatures(dataSourceId, commands, false));
+ ReleaseReader(featureSrvc.updateFeatures(dataSourceId, commands, false));
}
if(layer != null)
- layer.ForceRefresh();
- map.Save();
+ layer.forceRefresh();
+ map.save();
}
catch(MgException exc)
{
- OnError(MgLocalizer.GetString("MEASUREERROR", locale), exc.GetDetails(), outStream, request);
+ OnError(MgLocalizer.GetString("MEASUREERROR", locale), exc.getDetails(), outStream, request);
return;
}
catch(Exception ne)
@@ -303,7 +303,7 @@
String GetMapSrs(MgMap map) throws MgException
{
- srs = map.GetMapSRS();
+ srs = map.getMapSRS();
if(!srs.equals(""))
return srs;
@@ -316,10 +316,10 @@
{
MgLayer layer = null;
int i;
- for(i = 0; i < layers.GetCount(); i++)
+ for(i = 0; i < layers.getCount(); i++)
{
- MgLayer layer1 = (MgLayer) layers.GetItem(i);
- if(layer1.GetLayerDefinition().ToString().equals(layerDef))
+ MgLayer layer1 = (MgLayer) layers.getItem(i);
+ if(layer1.getLayerDefinition().toString().equals(layerDef))
{
layer = layer1;
break;
@@ -330,7 +330,7 @@
boolean DataSourceExists(MgResourceService resourceSrvc, MgResourceIdentifier resId) throws MgException
{
- return resourceSrvc.ResourceExists(resId);
+ return resourceSrvc.resourceExists(resId);
}
MgByteReader BuildLayerDefinitionContent(String dataSource, String featureName, String tip) throws MgException, Exception
@@ -347,7 +347,7 @@
byte[] bytes = layerTempl.getBytes("UTF-8");
MgByteSource src = new MgByteSource(bytes, bytes.length);
- return src.GetReader();
+ return src.getReader();
}
void ClearDataSource(MgFeatureService featureSrvc, MgResourceIdentifier dataSourceId, String featureName) throws MgException
@@ -354,8 +354,8 @@
{
MgDeleteFeatures deleteCmd = new MgDeleteFeatures(featureName, "KEY >= 0");
MgFeatureCommandCollection commands = new MgFeatureCommandCollection();
- commands.Add(deleteCmd);
- featureSrvc.UpdateFeatures(dataSourceId, commands, false);
+ commands.add(deleteCmd);
+ featureSrvc.updateFeatures(dataSourceId, commands, false);
}
void OnError(String title, String msg, PrintWriter outStream, HttpServletRequest request) throws FileNotFoundException, IOException
@@ -369,16 +369,16 @@
{
if(res == null)
return;
- MgProperty prop = res.GetItem(0);
+ MgProperty prop = res.getItem(0);
if(prop == null)
return;
if (prop instanceof MgStringProperty)
- throw new RuntimeException(((MgStringProperty)prop).GetValue());
+ throw new RuntimeException(((MgStringProperty)prop).getValue());
MgFeatureProperty resProp = (MgFeatureProperty)prop;
- MgFeatureReader reader = (MgFeatureReader)resProp.GetValue();
+ MgFeatureReader reader = (MgFeatureReader)resProp.getValue();
if(reader == null)
return;
- reader.Close();
+ reader.close();
}
%>
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/quickplotgeneratepicture.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/quickplotgeneratepicture.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/quickplotgeneratepicture.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -55,8 +55,8 @@
catch (MgException e)
{
response.setContentType("text/html");
- out.write ("ERROR:" + e.GetExceptionMessage() + "<br />");
- out.write (e.GetStackTrace() + "<br />");
+ out.write ("ERROR:" + e.getExceptionMessage() + "<br />");
+ out.write (e.getStackTrace() + "<br />");
}
%>
@@ -94,13 +94,13 @@
for (int i = 0; i < coordinates.length; ++i)
{
- coordinateCollection.Add(geometryFactory.CreateCoordinateXY(numberFormat.parse(coordinates[i]).doubleValue(), numberFormat.parse(coordinates[++i]).doubleValue()));
+ coordinateCollection.add(geometryFactory.createCoordinateXY(numberFormat.parse(coordinates[i]).doubleValue(), numberFormat.parse(coordinates[++i]).doubleValue()));
}
- coordinateCollection.Add(geometryFactory.CreateCoordinateXY(numberFormat.parse(coordinates[0]).doubleValue(), numberFormat.parse(coordinates[1]).doubleValue()));
- MgLinearRing linearRing = geometryFactory.CreateLinearRing(coordinateCollection);
+ coordinateCollection.add(geometryFactory.createCoordinateXY(numberFormat.parse(coordinates[0]).doubleValue(), numberFormat.parse(coordinates[1]).doubleValue()));
+ MgLinearRing linearRing = geometryFactory.createLinearRing(coordinateCollection);
- return geometryFactory.CreatePolygon(linearRing, null);
+ return geometryFactory.createPolygon(linearRing, null);
}
BufferedImage GenerateMap(Size<Integer> size) throws MgException, IOException
@@ -109,30 +109,30 @@
MgUserInformation userInfo = new MgUserInformation(sessionId);
MgSiteConnection siteConnection = new MgSiteConnection();
- siteConnection.Open(userInfo);
- MgRenderingService renderingService = (MgRenderingService) siteConnection.CreateService(MgServiceType.RenderingService);
+ siteConnection.open(userInfo);
+ MgRenderingService renderingService = (MgRenderingService) siteConnection.createService(MgServiceType.RenderingService);
MgMap map = new MgMap(siteConnection);
- map.Open(mapName);
+ map.open(mapName);
MgSelection selection = new MgSelection(map);
// Caculate the generated picture size
- MgEnvelope envelope = captureBox.Envelope();
- MgEnvelope normalizedE = normalizedCapture.Envelope();
- Size<Double> size1 = new Size<Double>(envelope.GetWidth(), envelope.GetHeight());
- Size<Double> size2 = new Size<Double>(normalizedE.GetWidth(), normalizedE.GetHeight());
+ MgEnvelope envelope = captureBox.envelope();
+ MgEnvelope normalizedE = normalizedCapture.envelope();
+ Size<Double> size1 = new Size<Double>(envelope.getWidth(), envelope.getHeight());
+ Size<Double> size2 = new Size<Double>(normalizedE.getWidth(), normalizedE.getHeight());
Size<Double> toSize = new Size<Double>(size1.width / size2.width * size.width, size1.height / size2.height * size.height);
- MgCoordinate center = captureBox.GetCentroid().GetCoordinate();
+ MgCoordinate center = captureBox.getCentroid().getCoordinate();
- map.SetDisplayDpi(printDpi);
- String colorString = map.GetBackgroundColor();
+ map.setDisplayDpi(printDpi);
+ String colorString = map.getBackgroundColor();
// The returned color string is in AARRGGBB format. But the constructor of MgColor needs a string in RRGGBBAA format
colorString = colorString.substring(2, 8) + colorString.substring(0, 2);
MgColor color = new MgColor(colorString);
- MgByteReader mgReader = renderingService.RenderMap(map,
+ MgByteReader mgReader = renderingService.renderMap(map,
selection,
center,
scaleDenominator,
@@ -142,7 +142,7 @@
"PNG",
false);
File tempImage = File.createTempFile(UUID.randomUUID().toString(), "png");
- mgReader.ToFile(tempImage.getAbsolutePath());
+ mgReader.toFile(tempImage.getAbsolutePath());
BufferedImage image = ImageIO.read(tempImage);
tempImage.delete();
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/search.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/search.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/search.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -81,24 +81,24 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
+ site.open(cred);
//Create a temporary map runtime object, locate the layer
//
MgMap map = new MgMap(site);
- map.Open(mapName);
- MgLayerCollection layers = map.GetLayers();
+ map.open(mapName);
+ MgLayerCollection layers = map.getLayers();
int i, j;
MgLayer layer = null;
- for(i = 0; i < layers.GetCount(); i++)
+ for(i = 0; i < layers.getCount(); i++)
{
- layer = (MgLayer)layers.GetItem(i);
- if(layer.GetName().equals(layerName))
+ layer = (MgLayer)layers.getItem(i);
+ if(layer.getName().equals(layerName))
break;
}
@@ -116,16 +116,16 @@
boolean displayAll = (resProps.size() == 0);
//query the features
- MgClassDefinition clsDef = layer.GetClassDefinition();
+ MgClassDefinition clsDef = layer.getClassDefinition();
MgFeatureQueryOptions opts = BuildFeatureQueryOptions(clsDef);
- opts.SetFilter(filter);
- String featureClassName = layer.GetFeatureClassName();
- features = layer.SelectFeatures(opts);
- boolean hasResult = features.ReadNext();
+ opts.setFilter(filter);
+ String featureClassName = layer.getFeatureClassName();
+ features = layer.selectFeatures(opts);
+ boolean hasResult = features.readNext();
if(hasResult)
{
- int colCount = displayAll ? features.GetPropertyCount(): resProps.size();
+ int colCount = displayAll ? features.getPropertyCount(): resProps.size();
//output the beginning of the document (head section and beginning of body section)
String templ = MgLocalizer.Localize(LoadTemplate("/viewerfiles/search.templ"), locale, GetClientOS(request));
@@ -136,13 +136,13 @@
};
outStream.write(Substitute(templ, vals));
- MgClassDefinition classDef = features.GetClassDefinition();
- MgPropertyDefinitionCollection classDefProps = classDef.GetIdentityProperties();
- ArrayList idPropNames = new ArrayList(classDefProps.GetCount());
- for(j = 0; j < classDefProps.GetCount(); j++)
+ MgClassDefinition classDef = features.getClassDefinition();
+ MgPropertyDefinitionCollection classDefProps = classDef.getIdentityProperties();
+ ArrayList idPropNames = new ArrayList(classDefProps.getCount());
+ for(j = 0; j < classDefProps.getCount(); j++)
{
- MgPropertyDefinition idProp = classDefProps.GetItem(j);
- idPropNames.add(idProp.GetName());
+ MgPropertyDefinition idProp = classDefProps.getItem(j);
+ idPropNames.add(idProp.getName());
}
//table headings
@@ -151,7 +151,7 @@
{
for(i = 0; i < colCount; i++)
{
- resProps.add(features.GetPropertyName(i));
+ resProps.add(features.getPropertyName(i));
outStream.write("<td class=\"SearchHeading\"> " + (String)resProps.get(i) + "</td>");
}
}
@@ -171,35 +171,35 @@
for(i = 0; i < colCount; i++)
{
String prop = (String)resProps.get(i);
- int propType = features.GetPropertyType(prop);
+ int propType = features.getPropertyType(prop);
String val = "";
- if (!features.IsNull(prop))
+ if (!features.isNull(prop))
{
switch(propType)
{
case MgPropertyType.Boolean:
- val = features.GetBoolean(prop)? "True": "False";
+ val = features.getBoolean(prop)? "True": "False";
break;
case MgPropertyType.Single:
- val = String.valueOf(features.GetSingle(prop));
+ val = String.valueOf(features.getSingle(prop));
break;
case MgPropertyType.Double:
- val = String.valueOf(features.GetDouble(prop));
+ val = String.valueOf(features.getDouble(prop));
break;
case MgPropertyType.Int16:
- val = String.valueOf(features.GetInt16(prop));
+ val = String.valueOf(features.getInt16(prop));
break;
case MgPropertyType.Int32:
- val = String.valueOf(features.GetInt32(prop));
+ val = String.valueOf(features.getInt32(prop));
break;
case MgPropertyType.Int64:
- val = String.valueOf(features.GetInt64(prop));
+ val = String.valueOf(features.getInt64(prop));
break;
case MgPropertyType.String:
- val = features.GetString(prop);
+ val = features.getString(prop);
break;
case MgPropertyType.DateTime:
- val = features.GetDateTime(prop).ToString();
+ val = features.getDateTime(prop).toString();
break;
}
}
@@ -211,33 +211,33 @@
for (Iterator it = idPropNames.iterator(); it.hasNext(); )
{
String id = (String) it.next();
- idPropType = features.GetPropertyType(id);
+ idPropType = features.getPropertyType(id);
switch (idPropType)
{
case MgPropertyType.Int32:
- idProps.Add(new MgInt32Property(id, features.GetInt32(id)));
+ idProps.add(new MgInt32Property(id, features.getInt32(id)));
break;
case MgPropertyType.String:
- idProps.Add(new MgStringProperty(id, features.GetString(id)));
+ idProps.add(new MgStringProperty(id, features.getString(id)));
break;
case MgPropertyType.Int64:
- idProps.Add(new MgInt64Property(id, features.GetInt64(id)));
+ idProps.add(new MgInt64Property(id, features.getInt64(id)));
break;
case MgPropertyType.Double:
- idProps.Add(new MgDoubleProperty(id, features.GetDouble(id)));
+ idProps.add(new MgDoubleProperty(id, features.getDouble(id)));
break;
case MgPropertyType.Single:
- idProps.Add(new MgSingleProperty(id, features.GetSingle(id)));
+ idProps.add(new MgSingleProperty(id, features.getSingle(id)));
break;
case MgPropertyType.DateTime:
- idProps.Add(new MgDateTimeProperty(id, features.GetDateTime(id)));
+ idProps.add(new MgDateTimeProperty(id, features.getDateTime(id)));
break;
default:
throw new SearchError(MessageFormat.format(MgLocalizer.GetString("SEARCHTYYPENOTSUP", locale), new Object[] {String.valueOf(idPropType)}), searchError);
}
}
- sel.AddFeatureIds(layer, featureClassName, idProps);
- String selText = EscapeForHtml(sel.ToXml());
+ sel.addFeatureIds(layer, featureClassName, idProps);
+ String selText = EscapeForHtml(sel.toXml());
outStream.write("<td class=\"" + ((row%2)==0 ? "Search" : "Search2") + "\" id=\"" + row + ":" + i + "\" onmousemove=\"SelectRow(" + row + ")\" onclick=\"CellClicked('" + selText + "')\"> " + val + "</td>\n");
}
@@ -244,7 +244,7 @@
outStream.write("</tr>");
if(++ row == matchLimit)
break;
- } while(features.ReadNext());
+ } while(features.readNext());
}
else
{
@@ -256,9 +256,9 @@
if(features != null)
{
// Close the feature reader
- features.Close();
+ features.close();
}
- OnError(searchError, ae.GetExceptionMessage() + "<br>" + ae.GetStackTrace(), outStream, request);
+ OnError(searchError, ae.getExceptionMessage() + "<br>" + ae.getStackTrace(), outStream, request);
}
catch(SearchError exc)
{
@@ -265,7 +265,7 @@
if(features != null)
{
// Close the feature reader
- features.Close();
+ features.close();
}
OnError(exc.title, exc.getMessage(), outStream, request);
}
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/selectwithin.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/selectwithin.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/selectwithin.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -43,21 +43,21 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get an instance of each service used in this script
//
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgRenderingService renderingSrvc = (MgRenderingService)site.CreateService(MgServiceType.RenderingService);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ site.open(cred);
+ MgFeatureService featureSrvc = (MgFeatureService)site.createService(MgServiceType.FeatureService);
+ MgRenderingService renderingSrvc = (MgRenderingService)site.createService(MgServiceType.RenderingService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
//load the map runtime state
//
MgMap map = new MgMap(site);
- map.Open(mapName);
+ map.open(mapName);
String[] layersList = layers.split(",");
if(layersList.length > 0)
@@ -65,7 +65,7 @@
MgStringCollection layerNames = new MgStringCollection();
for(int i = 0; i < layersList.length; i++)
{
- layerNames.Add(layersList[i]);
+ layerNames.add(layersList[i]);
}
// create a multi-polygon or a multi-geometry containing the input selected features
@@ -75,22 +75,22 @@
{
// Query all the features belonging the the layer list that intersects with the input geometries
//
- MgFeatureInformation fi = renderingSrvc.QueryFeatures(map, layerNames, inputGeom, MgFeatureSpatialOperations.Intersects, -1);
+ MgFeatureInformation fi = renderingSrvc.queryFeatures(map, layerNames, inputGeom, MgFeatureSpatialOperations.Intersects, -1);
if(fi != null)
{
- MgSelection resultSel = fi.GetSelection();
+ MgSelection resultSel = fi.getSelection();
if(resultSel != null)
{
// Return XML
- resultSel.Save(resourceSrvc, mapName);
+ resultSel.save(resourceSrvc, mapName);
//this needs to be re-opened for some reason
resultSel = new MgSelection(map);
- resultSel.Open(resourceSrvc, mapName);
- MgReadOnlyLayerCollection resLayers = resultSel.GetLayers();
- if (resLayers != null && resLayers.GetCount() >= 0)
+ resultSel.open(resourceSrvc, mapName);
+ MgReadOnlyLayerCollection resLayers = resultSel.getLayers();
+ if (resLayers != null && resLayers.getCount() >= 0)
{
response.addHeader("Content-type", "text/xml");
- outStream.write(resultSel.ToXml());
+ outStream.write(resultSel.toXml());
}
}
}
@@ -99,7 +99,7 @@
}
catch(MgException exc)
{
- outStream.write("\nException: " + exc.GetDetails());
+ outStream.write("\nException: " + exc.getDetails());
return;
}
catch(Exception ne)
@@ -113,7 +113,7 @@
MgGeometry MultiGeometryFromSelection(MgFeatureService featureSrvc, MgMap map, String selText) throws MgException
{
MgSelection sel = new MgSelection(map, selText);
- MgReadOnlyLayerCollection selLayers = sel.GetLayers();
+ MgReadOnlyLayerCollection selLayers = sel.getLayers();
if(selLayers == null)
return null;
MgGeometryCollection geomColl = new MgGeometryCollection();
@@ -120,26 +120,26 @@
MgAgfReaderWriter agfRW = new MgAgfReaderWriter();
boolean simplyPolygonOnly = true;
- for(int i = 0; i < selLayers.GetCount(); i++)
+ for(int i = 0; i < selLayers.getCount(); i++)
{
- MgLayer layer = (MgLayer) selLayers.GetItem(i);
- String filter = sel.GenerateFilter(layer, layer.GetFeatureClassName());
+ MgLayer layer = (MgLayer) selLayers.getItem(i);
+ String filter = sel.generateFilter(layer, layer.getFeatureClassName());
- MgClassDefinition clsDef = layer.GetClassDefinition();
+ MgClassDefinition clsDef = layer.getClassDefinition();
MgFeatureQueryOptions query = BuildFeatureQueryOptions(clsDef);
- query.SetFilter(filter);
- MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.GetFeatureSourceId());
- MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, layer.GetFeatureClassName(), query);
+ query.setFilter(filter);
+ MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.getFeatureSourceId());
+ MgFeatureReader features = featureSrvc.selectFeatures(featureSource, layer.getFeatureClassName(), query);
if(features != null)
{
- MgClassDefinition classDef = features.GetClassDefinition();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
- while(features.ReadNext())
+ MgClassDefinition classDef = features.getClassDefinition();
+ String geomPropName = classDef.getDefaultGeometryPropertyName();
+ while(features.readNext())
{
- MgByteReader geomReader = features.GetGeometry(geomPropName);
- MgGeometry geom = agfRW.Read(geomReader);
- int type = geom.GetGeometryType();
+ MgByteReader geomReader = features.getGeometry(geomPropName);
+ MgGeometry geom = agfRW.read(geomReader);
+ int type = geom.getGeometryType();
if(type == MgGeometryType.MultiPolygon || type == MgGeometryType.CurvePolygon || type == MgGeometryType.MultiCurvePolygon)
{
simplyPolygonOnly = false;
@@ -148,13 +148,13 @@
{
continue;
}
- geomColl.Add(geom);
+ geomColl.add(geom);
}
- features.Close();
+ features.close();
}
}
- if(geomColl.GetCount() == 0)
+ if(geomColl.getCount() == 0)
{
return null;
}
@@ -163,15 +163,15 @@
if(simplyPolygonOnly)
{
MgPolygonCollection polyColl = new MgPolygonCollection();
- for(int j = 0; j < geomColl.GetCount(); j++)
+ for(int j = 0; j < geomColl.getCount(); j++)
{
- polyColl.Add((MgPolygon)geomColl.GetItem(j));
+ polyColl.add((MgPolygon)geomColl.getItem(j));
}
- return gf.CreateMultiPolygon(polyColl);
+ return gf.createMultiPolygon(polyColl);
}
else
{
- return gf.CreateMultiGeometry(geomColl);
+ return gf.createMultiGeometry(geomColl);
}
}
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/serveradminhelper.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/serveradminhelper.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/serveradminhelper.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -38,23 +38,23 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation();
- cred.SetMgUsernamePassword("Administrator", "admin");
- cred.SetLocale(GetDefaultLocale());
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setMgUsernamePassword("Administrator", "admin");
+ cred.setLocale(GetDefaultLocale());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
MgServerAdmin serverAdmin = new MgServerAdmin();
- serverAdmin.Open("localhost", cred);
+ serverAdmin.open("localhost", cred);
String operation = request.getParameter("OPERATION");
// Get all information properties
- MgPropertyCollection infoProp = serverAdmin.GetInformationProperties();
+ MgPropertyCollection infoProp = serverAdmin.getInformationProperties();
if (operation.equals("ONLINE"))
{
- serverAdmin.BringOnline();
- if (serverAdmin.IsOnline())
+ serverAdmin.bringOnline();
+ if (serverAdmin.isOnline())
{
outStream.write("Server online<p>");
}
@@ -65,8 +65,8 @@
}
else if (operation.equals("OFFLINE"))
{
- serverAdmin.TakeOffline();
- if (serverAdmin.IsOnline())
+ serverAdmin.takeOffline();
+ if (serverAdmin.isOnline())
{
outStream.write("Server online<p>");
}
@@ -77,63 +77,63 @@
}
else if (operation.equals("GETTOTALPHYSICALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("TotalPhysicalMemory");
- outStream.write("Total Physical Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("TotalPhysicalMemory");
+ outStream.write("Total Physical Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETAVAILABLEPHYSICALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("AvailablePhysicalMemory");
- outStream.write("Available Physical Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("AvailablePhysicalMemory");
+ outStream.write("Available Physical Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETTOTALVIRTUALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("TotalVirtualMemory");
- outStream.write("Total Virtual Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("TotalVirtualMemory");
+ outStream.write("Total Virtual Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETAVAILABLEVIRTUALMEMORY"))
{
- MgInt64Property nMemory = (MgInt64Property)infoProp.GetItem("AvailableVirtualMemory");
- outStream.write("Available Virtual Memory: " + nMemory.GetValue() + " bytes");
+ MgInt64Property nMemory = (MgInt64Property)infoProp.getItem("AvailableVirtualMemory");
+ outStream.write("Available Virtual Memory: " + nMemory.getValue() + " bytes");
}
else if (operation.equals("GETCPUUTILIZATION"))
{
- MgInt32Property nCpuLoad = (MgInt32Property)infoProp.GetItem("CpuUtilization");
- outStream.write("Current CPU Utilization: " + nCpuLoad.GetValue() + "%");
+ MgInt32Property nCpuLoad = (MgInt32Property)infoProp.getItem("CpuUtilization");
+ outStream.write("Current CPU Utilization: " + nCpuLoad.getValue() + "%");
}
else if (operation.equals("GETUPTIME"))
{
- MgInt32Property nUptime = (MgInt32Property)infoProp.GetItem("Uptime");
- outStream.write("Server uptime: " + nUptime.GetValue() + " seconds");
+ MgInt32Property nUptime = (MgInt32Property)infoProp.getItem("Uptime");
+ outStream.write("Server uptime: " + nUptime.getValue() + " seconds");
}
else if (operation.equals("GETAVERAGEOPERATIONTIME"))
{
- MgInt32Property nTime = (MgInt32Property)infoProp.GetItem("AverageOperationTime");
- outStream.write("Average Operation Time: " + nTime.GetValue() + " milliseconds");
+ MgInt32Property nTime = (MgInt32Property)infoProp.getItem("AverageOperationTime");
+ outStream.write("Average Operation Time: " + nTime.getValue() + " milliseconds");
}
else if (operation.equals("GETTOTALOPERATIONTIME"))
{
- MgInt32Property nTime = (MgInt32Property)infoProp.GetItem("TotalOperationTime");
- outStream.write("Total Operation Time: " + nTime.GetValue() + " seconds");
+ MgInt32Property nTime = (MgInt32Property)infoProp.getItem("TotalOperationTime");
+ outStream.write("Total Operation Time: " + nTime.getValue() + " seconds");
}
else if (operation.equals("GETADMINQUEUECOUNT"))
{
- MgInt32Property nCount = (MgInt32Property)infoProp.GetItem("AdminOperationsQueueCount");
- outStream.write("Admin queue count: " + nCount.GetValue());
+ MgInt32Property nCount = (MgInt32Property)infoProp.getItem("AdminOperationsQueueCount");
+ outStream.write("Admin queue count: " + nCount.getValue());
}
else if (operation.equals("GETCLIENTQUEUECOUNT"))
{
- MgInt32Property nCount = (MgInt32Property)infoProp.GetItem("ClientOperationsQueueCount");
- outStream.write("Client queue count: " + nCount.GetValue());
+ MgInt32Property nCount = (MgInt32Property)infoProp.getItem("ClientOperationsQueueCount");
+ outStream.write("Client queue count: " + nCount.getValue());
}
else if (operation.equals("GETSITEQUEUECOUNT"))
{
- MgInt32Property nCount = (MgInt32Property)infoProp.GetItem("SiteOperationsQueueCount");
- outStream.write("Site queue count: " + nCount.GetValue());
+ MgInt32Property nCount = (MgInt32Property)infoProp.getItem("SiteOperationsQueueCount");
+ outStream.write("Site queue count: " + nCount.getValue());
}
else if (operation.equals("SERVERVERSION"))
{
- MgStringProperty version = (MgStringProperty)infoProp.GetItem("ServerVersion");
- outStream.write("Server version: " + version.GetValue());
+ MgStringProperty version = (MgStringProperty)infoProp.getItem("ServerVersion");
+ outStream.write("Server version: " + version.getValue());
}
else
{
@@ -142,7 +142,7 @@
}
catch (MgException mge)
{
- outStream.write(mge.GetDetails());
+ outStream.write(mge.getDetails());
}
%>
Modified: sandbox/jng/vanilla_swig/Web/src/mapviewerjava/taskframe.jsp
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/mapviewerjava/taskframe.jsp 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/Web/src/mapviewerjava/taskframe.jsp 2021-07-16 09:04:49 UTC (rev 9864)
@@ -42,19 +42,19 @@
InitializeWebTier();
MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
+ cred.setClientIp(GetClientIp(request));
+ cred.setClientAgent(GetClientAgent());
//connect to the site and get a feature service and a resource service instances
MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
+ site.open(cred);
//Get the MgWebLayout object
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
+ MgResourceService resourceSrvc = (MgResourceService)site.createService(MgServiceType.ResourceService);
MgResourceIdentifier webLayoutResId = new MgResourceIdentifier(webLayoutId);
MgWebLayout webLayout = new MgWebLayout(resourceSrvc, webLayoutResId);
- MgWebTaskPane taskPane = webLayout.GetTaskPane();
- String taskPaneUrl = taskPane.GetInitialTaskUrl();
+ MgWebTaskPane taskPane = webLayout.getTaskPane();
+ String taskPaneUrl = taskPane.getInitialTaskUrl();
String vpath = GetSurroundVirtualPath(request);
if (taskPaneUrl == null || taskPaneUrl.length() == 0)
{
@@ -86,7 +86,7 @@
}
catch (MgException exc)
{
- OnError(MgLocalizer.GetString("TASKS", locale), exc.GetExceptionMessage(), response.getWriter(), request);
+ OnError(MgLocalizer.GetString("TASKS", locale), exc.getExceptionMessage(), response.getWriter(), request);
return;
}
catch (Exception ne)
Modified: sandbox/jng/vanilla_swig/build.bat
===================================================================
--- sandbox/jng/vanilla_swig/build.bat 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/build.bat 2021-07-16 09:04:49 UTC (rev 9864)
@@ -402,7 +402,7 @@
echo [install]: Developer's Guide Sample Code (DotNet)
%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\dotnetviewersample" "%MG_OUTPUT_WEB%\www\dotnetviewersample" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: OpenLayers Samples
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\ol2samples" "%MG_OUTPUT_WEB%\www\ol2samples" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
+%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\clientsamples" "%MG_OUTPUT_WEB%\www\clientsamples" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: Samples landing page
copy /Y "%MG_DOC_DEVGUIDE_SAMPLES%\samples.php" "%MG_OUTPUT_WEB%\www"
echo [install]: Viewer API documentation
Modified: sandbox/jng/vanilla_swig/cmake/configs/serverconfig.ini.in
===================================================================
--- sandbox/jng/vanilla_swig/cmake/configs/serverconfig.ini.in 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/cmake/configs/serverconfig.ini.in 2021-07-16 09:04:49 UTC (rev 9864)
@@ -359,6 +359,12 @@
# 0 < Value <= 2147483647
# MaxRasterImageHeight The max height of raster image in pixels
# 0 < Value <= 2147483647
+# MaxRenderImageWidth The maximum allowed width for a map image rendering operation
+# 0 < Value <= 2147483647
+# MaxRenderImageHeight The minimum allowed width for a map image rendering operation
+# 0 < Value <= 2147483647
+# GlobalRasterStylizationLockEnabled Enable/disable the use of a global lock for raster stylization
+# 0 = false and 1 = true
# *****************************************************************************
TileExtentOffset = 0.35
RasterGridSize = 100
@@ -372,6 +378,9 @@
GeneralizeData = 0
MaxRasterImageWidth = 2048
MaxRasterImageHeight = 2048
+MaxRenderImageWidth = 16384
+MaxRenderImageHeight = 16384
+GlobalRasterStylizationLockEnabled = 1
[ResourceServiceProperties]
# *****************************************************************************
Modified: sandbox/jng/vanilla_swig/cmake/configs/tomcat.conf.in
===================================================================
--- sandbox/jng/vanilla_swig/cmake/configs/tomcat.conf.in 2021-07-16 08:22:17 UTC (rev 9863)
+++ sandbox/jng/vanilla_swig/cmake/configs/tomcat.conf.in 2021-07-16 09:04:49 UTC (rev 9864)
@@ -20,4 +20,5 @@
JkRequestLogFormat "%w %V %T"
# Send everything for context /examples to worker named worker1 (ajp13)
JkMount /mapguide/mapviewerjava/* worker1
-JkMount /mapguide/javaviewersample/* worker1
\ No newline at end of file
+JkMount /mapguide/javaviewersample/* worker1
+JkMount /mapguide/javasamples/* worker1
\ No newline at end of file
More information about the mapguide-commits
mailing list