[mapguide-commits] r1204 - in trunk/MgDev/Server/src/Services: Kml
Mapping Rendering
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Mar 12 19:51:34 EDT 2007
Author: waltweltonlair
Date: 2007-03-12 19:51:34 -0400 (Mon, 12 Mar 2007)
New Revision: 1204
Modified:
trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp
trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp
trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
Some cleanup of the Stylizer interface
- removed the Initialize method
- Renderer parameter is now passed to all StylizeLayer() methods
- renamed StylizeFeatures to StylizeVectorLayer for consistency
Modified: trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp 2007-03-12 23:51:11 UTC (rev 1203)
+++ trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp 2007-03-12 23:51:34 UTC (rev 1204)
@@ -443,9 +443,6 @@
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(layerDef);
if(vl != NULL)
{
- KmlRenderer renderer(&kmlContent, bounds, scale, dpi, metersPerUnit, drawOrder);
- DefaultStylizer stylizer;
- stylizer.Initialize(&renderer);
if(m_svcFeature == NULL)
{
InitializeFeatureService();
@@ -470,11 +467,14 @@
MdfModel::NameStringPair* m = pmappings->GetAt(j);
fcInfo.add_mapping(m->GetName(), m->GetValue());
}
+
+ KmlRenderer renderer(&kmlContent, bounds, scale, dpi, metersPerUnit, drawOrder);
+ DefaultStylizer stylizer(NULL);
renderer.StartLayer(&layerInfo, &fcInfo);
- stylizer.StylizeFeatures(vl, rdr, csTrans, NULL, NULL);
+ stylizer.StylizeVectorLayer(vl, &renderer, rdr, csTrans, NULL, NULL);
renderer.EndLayer();
+ delete rdr;
}
- delete rdr;
}
/*else if(dl != NULL)
@@ -508,14 +508,12 @@
RSMgInputStream is(reader);
- stylizer.StylizeDrawingLayer( dl, &layerInfo, &is, dl->GetLayerFilter(), csTrans);
+ stylizer.StylizeDrawingLayer(dl, &renderer, &layerInfo, &is, dl->GetLayerFilter(), csTrans);
}
}*/
+
if(csTrans != NULL)
- {
delete csTrans;
- csTrans = NULL;
- }
}
double MgServerKmlService::GetScale(MgEnvelope* llExtents, int width, int height, double dpi)
Modified: trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2007-03-12 23:51:11 UTC (rev 1203)
+++ trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2007-03-12 23:51:34 UTC (rev 1204)
@@ -422,8 +422,7 @@
RSMgSymbolManager mgr(m_svcResource);
dr.SetSymbolManager(&mgr);
- DefaultStylizer ds;
- ds.Initialize(&dr);
+ DefaultStylizer ds(NULL);
RS_MapUIInfo mapInfo(sessionId, map->GetName(), map->GetObjectId(), srs, units, bgcolor);
@@ -955,8 +954,6 @@
b.maxy = ur2->GetY();
}
- DefaultStylizer ds;
-
// Create a simple print layout containing only the map
Ptr<MgPrintLayout> printLayout = new MgPrintLayout();
if (printLayout == NULL)
@@ -992,7 +989,7 @@
RSMgSymbolManager mgr(m_svcResource);
dr.SetSymbolManager(&mgr);
- ds.Initialize(&dr);
+ DefaultStylizer ds(NULL);
//get the map coordinate system
MdfModel::MdfString srs = map->GetMapSRS();
@@ -1298,15 +1295,11 @@
// get a temporary file to write out EPlot DWF to
STRING dwfName = MgFileUtil::GenerateTempFileName(false, L"legendplot");
- DefaultStylizer ds;
-
EPlotRenderer dr(dwfName, plotSpec->GetPaperWidth(), plotSpec->GetPaperHeight(), plotSpec->GetPageSizeUnits());
RSMgSymbolManager mgr(m_svcResource);
dr.SetSymbolManager(&mgr);
- ds.Initialize(&dr);
-
//get the map coordinate system
MdfModel::MdfString srs = map->GetMapSRS();
Ptr<MgCoordinateSystem> dstCs;
Modified: trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp 2007-03-12 23:51:11 UTC (rev 1203)
+++ trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp 2007-03-12 23:51:34 UTC (rev 1204)
@@ -750,7 +750,7 @@
RSMgFeatureReader* rdr = ExecuteFeatureQuery(svcFeature, extent, vl, overrideFilter.c_str(), dstCs, item ? item->GetCoordSys() : NULL, item);
if (rdr)
{
- ds->StylizeFeatures(vl, rdr, item->GetTransform(), NULL, NULL);
+ ds->StylizeVectorLayer(vl, dr, rdr, item->GetTransform(), NULL, NULL);
}
delete rdr;
}
@@ -784,7 +784,7 @@
RSMgFeatureReader* rdr = ExecuteFeatureQuery(svcFeature, extent, vl, overrideFilter.c_str(), dstCs, item ? item->GetCoordSys() : NULL, item);
if (rdr)
{
- ds->StylizeFeatures(vl, rdr, item->GetTransform(), NULL, NULL);
+ ds->StylizeVectorLayer(vl, dr, rdr, item->GetTransform(), NULL, NULL);
}
delete rdr;
@@ -830,7 +830,7 @@
{
//stylize into output format
dr->StartLayer(&legendInfo, &fcinfo);
- ds->StylizeFeatures(vl, rdr, item ? item->GetTransform() : NULL, NULL, NULL);
+ ds->StylizeVectorLayer(vl, dr, rdr, item ? item->GetTransform() : NULL, NULL, NULL);
dr->EndLayer();
}
delete rdr;
@@ -922,7 +922,7 @@
{
//stylize into a dwf
dr->StartLayer(&legendInfo, &fcinfo);
- ds->StylizeGridLayer(gl, rdr, item->GetTransform(), NULL, NULL);
+ ds->StylizeGridLayer(gl, dr, rdr, item->GetTransform(), NULL, NULL);
dr->EndLayer();
}
delete rdr;
@@ -987,7 +987,7 @@
RSMgInputStream is(reader);
- ds->StylizeDrawingLayer( dl, &legendInfo, &is, dl->GetLayerFilter(), xformer);
+ ds->StylizeDrawingLayer(dl, dr, &legendInfo, &is, dl->GetLayerFilter(), xformer);
}
#ifdef _DEBUG
Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2007-03-12 23:51:11 UTC (rev 1203)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2007-03-12 23:51:34 UTC (rev 1204)
@@ -634,10 +634,8 @@
dr->SetSymbolManager(&mgr);
SEMgSymbolManager semgr(m_svcResource);
+ DefaultStylizer ds(&semgr);
- DefaultStylizer ds;
- ds.Initialize(dr, &semgr);
-
RS_Color bgcolor(0, 0, 0, 255); //not used -- GDRenderer is already initialized to the correct bgcolor
RS_MapUIInfo mapInfo(sessionId, map->GetName(), map->GetObjectId(), srs, units, bgcolor);
@@ -1054,9 +1052,6 @@
Ptr<MgFeatureReader> rdr = m_svcFeature->SelectFeatures(featResId, vl->GetFeatureName(), options);
RSMgFeatureReader rsrdr(rdr, m_svcFeature, featResId, options, vl->GetGeometry());
- DefaultStylizer ds;
- ds.Initialize(selRenderer);
-
//run a stylization loop with the FeatureInfoRenderer.
//This will build up the selection set and also
//evaluate the tooltip, hyperlink and feature properties
@@ -1093,8 +1088,9 @@
fcinfo.add_mapping(m->GetName(), m->GetValue());
}
+ DefaultStylizer ds(NULL);
selRenderer->StartLayer(&info, &fcinfo);
- ds.StylizeFeatures(vl, &rsrdr, NULL, StylizeThatMany, selRenderer);
+ ds.StylizeVectorLayer(vl, selRenderer, &rsrdr, NULL, StylizeThatMany, selRenderer);
selRenderer->EndLayer();
//update maxFeatures to number of features that
More information about the mapguide-commits
mailing list