[mapguide-commits] r9097 - in branches/2.6/MgDev: . Common/Schema Server/src/Services/Mapping

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-11-24 03:34:12 -0800 (Thu, 24 Nov 2016)
New Revision: 9097

Modified:
   branches/2.6/MgDev/
   branches/2.6/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd
   branches/2.6/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/2.6/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/3.0/MgDev:8658,8958-8959
/branches/3.1/MgDev:9026,9058-9059
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625
/sandbox/adsk/3.1n:8871,8912,8921-8922,8942,9019-9020
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8874-8884
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443-8444,8518-8519,8567-8568,8571,8588-8589,8595,8616-8618,8626,8682,8728,8844,8956,8980,8996,9000,9004-9006,9021,9028,9034,9038,9042
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/3.0/MgDev:8658,8958-8959
/branches/3.1/MgDev:9026,9058-9059
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625
/sandbox/adsk/3.1n:8871,8912,8921-8922,8942,9019-9020
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8874-8884
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443-8444,8518-8519,8567-8568,8571,8588-8589,8595,8616-8618,8626,8682,8728,8844,8956,8980,8996,9000,9004-9006,9021,9028,9034,9038,9042,9094

Modified: branches/2.6/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd
===================================================================
--- branches/2.6/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd	2016-11-24 11:32:16 UTC (rev 9096)
+++ branches/2.6/MgDev/Common/Schema/RuntimeMap-2.6.0.xsd	2016-11-24 11:34:12 UTC (rev 9097)
@@ -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/2.6/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- branches/2.6/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp	2016-11-24 11:32:16 UTC (rev 9096)
+++ branches/2.6/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp	2016-11-24 11:34:12 UTC (rev 9097)
@@ -2250,6 +2250,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();
@@ -2355,6 +2357,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/>");