[mapguide-commits] r7281 - trunk/MgDev/Server/src/Services/Mapping
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Dec 19 15:09:58 PST 2012
Author: jng
Date: 2012-12-19 15:09:57 -0800 (Wed, 19 Dec 2012)
New Revision: 7281
Modified:
trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
Log:
#1981: Fix selection highlight size when multiple scale ranges are defined. Reviewed by Walt Welton-Lair
Modified: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp 2012-12-18 10:56:55 UTC (rev 7280)
+++ trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp 2012-12-19 23:09:57 UTC (rev 7281)
@@ -468,14 +468,28 @@
if (vl) //############################################################################ vector layer
{
+ // Tweaking this logic for #1981:
+ //
+ // We first try to find a valid scale range, only when we can't find a valid scale range do we
+ // coerce the first one to [0 - Infinity]
+
+ MdfModel::VectorScaleRangeCollection* scaleRanges = vl->GetScaleRanges();
+ MdfModel::VectorScaleRange* scaleRange = NULL;
+ if (scaleRanges)
+ {
+ // make sure we have a valid scale range
+ scaleRange = Stylizer::FindScaleRange(*scaleRanges, scale);
+ }
+
+ // We have a selection but no applicable scale range
+ //
// Modify the layer scale range to also support infinite
// Need to apply default style as one will not be defined
- if (selection)
+ if (selection && !scaleRange)
{
- MdfModel::VectorScaleRangeCollection* scaleRanges = vl->GetScaleRanges();
if (scaleRanges)
{
- MdfModel::VectorScaleRange* scaleRange = scaleRanges->GetAt(0);
+ scaleRange = scaleRanges->GetAt(0);
if (scaleRange)
{
scaleRange->SetMinScale(0.0);
@@ -484,9 +498,6 @@
}
}
- // make sure we have a valid scale range
- MdfModel::VectorScaleRange* scaleRange = Stylizer::FindScaleRange(*vl->GetScaleRanges(), scale);
-
if (scaleRange)
{
minScale_Profile = scaleRange->GetMinScale();
More information about the mapguide-commits
mailing list