[mapguide-commits] r9095 - in branches/3.1/MgDev: . Common/Schema Server/src/Services/Mapping
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 24 03:31:39 PST 2016
Author: jng
Date: 2016-11-24 03:31:38 -0800 (Thu, 24 Nov 2016)
New Revision: 9095
Modified:
branches/3.1/MgDev/
branches/3.1/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd
branches/3.1/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd
branches/3.1/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
Log:
Merged revision(s) 9094 from trunk/MgDev:
#2752: Fix CREATERUNTIMEMAP for raster and DWF layers. Includes updated documentation errata for the RuntimeMap XML schemas.
........
Property changes on: branches/3.1/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094
Modified: branches/3.1/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd
===================================================================
--- branches/3.1/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd 2016-11-24 11:22:49 UTC (rev 9094)
+++ branches/3.1/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd 2016-11-24 11:31:38 UTC (rev 9095)
@@ -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: branches/3.1/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd
===================================================================
--- branches/3.1/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd 2016-11-24 11:22:49 UTC (rev 9094)
+++ branches/3.1/MgDev/Common/Schema/RuntimeMap-3.0.0.xsd 2016-11-24 11:31:38 UTC (rev 9095)
@@ -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: branches/3.1/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- branches/3.1/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2016-11-24 11:22:49 UTC (rev 9094)
+++ branches/3.1/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2016-11-24 11:31:38 UTC (rev 9095)
@@ -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