[mapguide-commits] r9094 - in trunk/MgDev: Common/Schema Server/src/Services/Mapping
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 24 03:22:50 PST 2016
Author: jng
Date: 2016-11-24 03:22:49 -0800 (Thu, 24 Nov 2016)
New Revision: 9094
Modified:
trunk/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd
trunk/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd
trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
Log:
#2752: Fix CREATERUNTIMEMAP for raster and DWF layers. Includes updated documentation errata for the RuntimeMap XML schemas.
Modified: trunk/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd 2016-11-21 15:18:33 UTC (rev 9093)
+++ trunk/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd 2016-11-24 11:22:49 UTC (rev 9094)
@@ -221,7 +221,7 @@
</xs:element>
<xs:element name="FeatureStyle" type="FeatureStyleInfo" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>The feature style for a given geometry type.</xs:documentation>
+ <xs:documentation>The feature style for a given geometry type. This is empty for drawing and raster layers</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Modified: trunk/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd 2016-11-21 15:18:33 UTC (rev 9093)
+++ trunk/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd 2016-11-24 11:22:49 UTC (rev 9094)
@@ -237,7 +237,7 @@
</xs:element>
<xs:element name="FeatureStyle" type="FeatureStyleInfo" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>The feature style for a given geometry type.</xs:documentation>
+ <xs:documentation>The feature style for a given geometry type. This is empty for drawing and raster layers</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Modified: trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2016-11-21 15:18:33 UTC (rev 9093)
+++ trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2016-11-24 11:22:49 UTC (rev 9094)
@@ -1637,6 +1637,8 @@
if (NULL != ldf)
{
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf);
+ MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf);
+ MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf);
if (NULL != vl)
{
MdfModel::VectorScaleRangeCollection* vsrs = vl->GetScaleRanges();
@@ -1742,6 +1744,41 @@
xml.append("</ScaleRange>\n");
}
}
+ else if (NULL != gl)
+ {
+ MdfModel::GridScaleRangeCollection* gsrs = gl->GetScaleRanges();
+ for (INT32 i = 0; i < gsrs->GetCount(); i++)
+ {
+ MdfModel::GridScaleRange* gsr = gsrs->GetAt(i);
+ xml.append("<ScaleRange>\n");
+ xml.append("<MinScale>");
+ std::string sMinScale;
+ MgUtil::DoubleToString(gsr->GetMinScale(), sMinScale);
+ xml.append(sMinScale);
+ xml.append("</MinScale>\n");
+ xml.append("<MaxScale>");
+ std::string sMaxScale;
+ MgUtil::DoubleToString(gsr->GetMaxScale(), sMaxScale);
+ xml.append(sMaxScale);
+ xml.append("</MaxScale>\n");
+ xml.append("</ScaleRange>\n");
+ }
+ }
+ else if (NULL != dl)
+ {
+ xml.append("<ScaleRange>\n");
+ xml.append("<MinScale>");
+ std::string sMinScale;
+ MgUtil::DoubleToString(dl->GetMinScale(), sMinScale);
+ xml.append(sMinScale);
+ xml.append("</MinScale>\n");
+ xml.append("<MaxScale>");
+ std::string sMaxScale;
+ MgUtil::DoubleToString(dl->GetMaxScale(), sMaxScale);
+ xml.append(sMaxScale);
+ xml.append("</MaxScale>\n");
+ xml.append("</ScaleRange>\n");
+ }
else
{
xml.append("<ScaleRange/>");
More information about the mapguide-commits
mailing list