[mapguide-commits] r9033 - in sandbox/adsk/3.1n: Oem/geos/src/io Server/src/Services/Rendering
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 12 18:29:41 PDT 2016
Author: christinebao
Date: 2016-09-12 18:29:40 -0700 (Mon, 12 Sep 2016)
New Revision: 9033
Modified:
sandbox/adsk/3.1n/Oem/geos/src/io/WKTReader.cpp
sandbox/adsk/3.1n/Oem/geos/src/io/WKTWriter.cpp
sandbox/adsk/3.1n/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
Merged revision(s) 8986 from trunk/MgDev to adsk\3.1n branch
Modified: sandbox/adsk/3.1n/Oem/geos/src/io/WKTReader.cpp
===================================================================
--- sandbox/adsk/3.1n/Oem/geos/src/io/WKTReader.cpp 2016-08-23 12:58:17 UTC (rev 9032)
+++ sandbox/adsk/3.1n/Oem/geos/src/io/WKTReader.cpp 2016-09-13 01:29:40 UTC (rev 9033)
@@ -61,7 +61,7 @@
WKTReader::read(const string &wellKnownText)
{
//auto_ptr<StringTokenizer> tokenizer(new StringTokenizer(wellKnownText));
- CLocalizer clocale;
+ //CLocalizer clocale;
StringTokenizer tokenizer(wellKnownText);
Geometry *g=NULL;
g=readGeometryTaggedText(&tokenizer);
Modified: sandbox/adsk/3.1n/Oem/geos/src/io/WKTWriter.cpp
===================================================================
--- sandbox/adsk/3.1n/Oem/geos/src/io/WKTWriter.cpp 2016-08-23 12:58:17 UTC (rev 9032)
+++ sandbox/adsk/3.1n/Oem/geos/src/io/WKTWriter.cpp 2016-09-13 01:29:40 UTC (rev 9033)
@@ -169,7 +169,7 @@
WKTWriter::writeFormatted(const Geometry *geometry, bool isFormatted,
Writer *writer)
{
- CLocalizer clocale;
+ //CLocalizer clocale;
this->isFormatted=isFormatted;
decimalPlaces = roundingPrecision == -1 ? geometry->getPrecisionModel()->getMaximumSignificantDigits() : roundingPrecision;
appendGeometryTaggedText(geometry, 0, writer);
Modified: sandbox/adsk/3.1n/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- sandbox/adsk/3.1n/Server/src/Services/Rendering/ServerRenderingService.cpp 2016-08-23 12:58:17 UTC (rev 9032)
+++ sandbox/adsk/3.1n/Server/src/Services/Rendering/ServerRenderingService.cpp 2016-09-13 01:29:40 UTC (rev 9033)
@@ -1575,13 +1575,14 @@
break;
MdfModel::VectorLayerDefinition* vl = NULL;
+ Ptr<MgResourceLayerDefinitionCacheItem> cacheItem;
auto_ptr<MdfModel::LayerDefinition> ldf;
Ptr<MgResourceIdentifier> layerResId = layer->GetLayerDefinition();
if (bOnlyVisibleLayers)
{
//get the MDF layer definition
MgCacheManager* cacheManager = MgCacheManager::GetInstance();
- Ptr<MgResourceLayerDefinitionCacheItem> cacheItem = cacheManager->GetResourceLayerDefinitionCacheItem(layerResId);
+ cacheItem = cacheManager->GetResourceLayerDefinitionCacheItem(layerResId);
MdfModel::LayerDefinition* layerDefinition = cacheItem->Get();
vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(layerDefinition);
}
@@ -1589,6 +1590,18 @@
{
ldf.reset(MgLayerBase::GetLayerDefinition(m_svcResource, layerResId));
vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
+
+ // Modify the layer scale range only for layers that are passed in
+ MdfModel::VectorScaleRangeCollection* scaleRanges = vl->GetScaleRanges();
+ if (scaleRanges)
+ {
+ MdfModel::VectorScaleRange* scaleRange = scaleRanges->GetAt(0);
+ if (scaleRange)
+ {
+ scaleRange->SetMinScale(0.0);
+ scaleRange->SetMaxScale(MdfModel::VectorScaleRange::MAX_MAP_SCALE);
+ }
+ }
}
//we can only do geometric query selection for vector layers
@@ -1596,22 +1609,6 @@
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%t) RenderForSelection(): Layer: %W Vector Layer\n"), layer->GetName().c_str()));
- //check to see if we want even layers that aren't visible at the current scale
- if (!bOnlyVisibleLayers)
- {
- // Modify the layer scale range only for layers that are passed in
- MdfModel::VectorScaleRangeCollection* scaleRanges = vl->GetScaleRanges();
- if (scaleRanges)
- {
- MdfModel::VectorScaleRange* scaleRange = scaleRanges->GetAt(0);
- if (scaleRange)
- {
- scaleRange->SetMinScale(0.0);
- scaleRange->SetMaxScale(MdfModel::VectorScaleRange::MAX_MAP_SCALE);
- }
- }
- }
-
Ptr<MgResourceIdentifier> featResId = new MgResourceIdentifier(layer->GetFeatureSourceId());
//get a transform from layer coord sys to map coord sys
More information about the mapguide-commits
mailing list