[mapguide-commits] r9838 - trunk/MgDev/Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Apr 16 02:36:35 PDT 2021
Author: jng
Date: 2021-04-16 02:36:32 -0700 (Fri, 16 Apr 2021)
New Revision: 9838
Modified:
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp
Log:
Add rendering test case to render a dynamic overlay against a map whose definition is a nested structure similar to the one on this mapguide-users thread (https://www.mail-archive.com/mapguide-users@lists.osgeo.org/msg26614.html).
Unfortunately, this test case doesn't not crash. Will need to investigate further to determine if it was a problem that has been fixed since 3.1.2
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2021-04-12 13:05:55 UTC (rev 9837)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2021-04-16 09:36:32 UTC (rev 9838)
@@ -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: trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp 2021-04-12 13:05:55 UTC (rev 9837)
+++ trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
@@ -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)
More information about the mapguide-commits
mailing list