[mapguide-commits] r9882 - in trunk/MgDev: . Common/CoordinateSystem Common/Stylization

[svn_mapguide at osgeo.org]

Author: jng
Date: 2021-10-15 00:24:07 -0700 (Fri, 15 Oct 2021)
New Revision: 9882

Modified:
   trunk/MgDev/
   trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
   trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
Log:
Merged revision(s) 9875-9881 from sandbox/adsk/trunk:
Update method CCoordinateSystemGeodeticTransformGridFile::IsValid() to add OST15 format.
........
Pass the 'geometry' argument to ProcessSELabelGroup, so the renderer can get the centroid of the geometry.
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2021-10-12 00:58:21 UTC (rev 9881)
+++ trunk/MgDev	2021-10-15 07:24:07 UTC (rev 9882)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -8,7 +8,7 ##
 /sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020,9486
 /sandbox/adsk/3.2o.AIMS:9135-9140,9146
 /sandbox/adsk/3.2p:9254
-/sandbox/adsk/trunk:9866-9867,9871-9873
+/sandbox/adsk/trunk:9866-9867,9871-9873,9875-9881
 /sandbox/jng/catch2:9649-9676
 /sandbox/jng/clean_json:8818-9180
 /sandbox/jng/cmake_v2:9259-9317
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp	2021-10-12 00:58:21 UTC (rev 9881)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp	2021-10-15 07:24:07 UTC (rev 9882)
@@ -96,6 +96,7 @@
     case cs_DTCFRMT_ATS77:
     case cs_DTCFRMT_OST97:
     case cs_DTCFRMT_OST02:
+    case cs_DTCFRMT_OST15:
     case cs_DTCFRMT_GEOCN:
         break;
 

Modified: trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp	2021-10-12 00:58:21 UTC (rev 9881)
+++ trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp	2021-10-15 07:24:07 UTC (rev 9882)
@@ -447,7 +447,7 @@
         candidates[7].Set(cx + op_pts[14] - labelMinX, cy + (op_pts[15] - labelMaxY)*yScale, RS_Units_Device, angleRad, st7);
     }
 
-    se_renderer->ProcessSELabelGroup(candidates, 8, RS_OverpostType_FirstFit, true, NULL);
+    se_renderer->ProcessSELabelGroup(candidates, 8, RS_OverpostType_FirstFit, true, geometry);
 }