[mapguide-commits] r8491 - in trunk/MgDev/Common: CoordinateSystem Geometry/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2015-01-03 16:32:20 -0800 (Sat, 03 Jan 2015)
New Revision: 8491

Modified:
   trunk/MgDev/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysUnitInformation.cpp
   trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h
Log:
#2516: Add new projection method for Michigan and units British foot, chain and link trunk.
Submit on behalf of Andreas Steffen.

Add the new units: BritishFootTrunc, BritishChainTrunc and BritishLinkTrunc 
This units are used for a new coordinate reference system with name Kertau.MalayaRSO/02 which came in with the EPSG version 8.5 sync.

New projection method Michigan Lambert Conformal Conic

Follow up of CsMap submission, add the needed changes in MgGeometry.
Add new specific Michigan Lambert Conformal Conic projection method with one new specific parameter needed.


Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysProjectionInformation.cpp	2015-01-02 20:03:14 UTC (rev 8490)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysProjectionInformation.cpp	2015-01-04 00:32:20 UTC (rev 8491)
@@ -32,7 +32,7 @@
 //MENTOR_MAINTENANCE:  The following constant is the number of
 //different projections supported by the Mentor library.  It
 //will need to be adjusted if Mentor adds additional projections.
-const long klNumProjections = 71;
+const long klNumProjections = 72;
 
 
 //MENTOR_MAINTENANCE:  This is a list of all projections that
@@ -109,7 +109,8 @@
     MgCoordinateSystemProjectionCode::Sys34_01,
     MgCoordinateSystemProjectionCode::EdcylE,
     MgCoordinateSystemProjectionCode::PlateCarree,
-    MgCoordinateSystemProjectionCode::PvMercator
+    MgCoordinateSystemProjectionCode::PvMercator,
+    MgCoordinateSystemProjectionCode::LmMich,
 };
 
 

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysUnitInformation.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysUnitInformation.cpp	2015-01-02 20:03:14 UTC (rev 8490)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysUnitInformation.cpp	2015-01-04 00:32:20 UTC (rev 8491)
@@ -35,7 +35,7 @@
 //the number of different linear and angular units which
 //the public API supports.  These will need to be adjusted if Mentor
 //adds more units.
-const INT32 klNumLinearUnits = 50;
+const INT32 klNumLinearUnits = 53;
 const INT32 klNumAngularUnits = 11;
 
 
@@ -96,7 +96,10 @@
     MgCoordinateSystemUnitCode::IndianYd37,
     MgCoordinateSystemUnitCode::Decameter,
     MgCoordinateSystemUnitCode::InternationalChain,
-    MgCoordinateSystemUnitCode::InternationalLink
+    MgCoordinateSystemUnitCode::InternationalLink,
+    MgCoordinateSystemUnitCode::BrFootTrunc,
+    MgCoordinateSystemUnitCode::BrChainTrunc,
+    MgCoordinateSystemUnitCode::BrLinkTrunc,
 };
 
 //MENTOR_MAINTENANCE:  This is a list of all angular units

Modified: trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp	2015-01-02 20:03:14 UTC (rev 8490)
+++ trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp	2015-01-04 00:32:20 UTC (rev 8491)
@@ -189,6 +189,7 @@
     { MgCoordinateSystemProjectionCode::EdcylE,       true,    true,    false,    true,    true },
     { MgCoordinateSystemProjectionCode::PlateCarree,  true,    true,    false,    true,    true },
     { MgCoordinateSystemProjectionCode::PvMercator,   false,   true,    false,    true,    true },
+    { MgCoordinateSystemProjectionCode::LmMich,       true,    true,    false,    true,    true },
     { MgCoordinateSystemProjectionCode::Unknown,      false,   false,   false,    false,   false }
 };
 
@@ -671,6 +672,9 @@
     { MgCoordinateSystemUnitCode::CapeFoot, "CapeFoot" },
     { MgCoordinateSystemUnitCode::InternationalChain, "IntnlChain" },
     { MgCoordinateSystemUnitCode::InternationalLink, "IntnlLink" },
+    { MgCoordinateSystemUnitCode::BrFootTrunc, "BrFootTrunc" },
+    { MgCoordinateSystemUnitCode::BrChainTrunc, "BrChainTrunc" },
+    { MgCoordinateSystemUnitCode::BrLinkTrunc, "BrLinkTrunc" },
     { MgCoordinateSystemUnitCode::Brealey, "Brealey" }, //here starts angle units
     { MgCoordinateSystemUnitCode::Degree, "Degree" },
     { MgCoordinateSystemUnitCode::Grad, "Grad" },

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h	2015-01-02 20:03:14 UTC (rev 8490)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h	2015-01-04 00:32:20 UTC (rev 8491)
@@ -386,6 +386,11 @@
     static const INT32 PvMercator = 69;     
     ///////////////////////////////////////////////////////////////////////////////////////////////
     /// \brief
+    /// Lambert Conformal Conic, Michigan Variation
+    ///
+    static const INT32 LmMich = 70;
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    /// \brief
     /// Unknown
     ///
     static const INT32 Unknown = 0;

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h	2015-01-02 20:03:14 UTC (rev 8490)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h	2015-01-04 00:32:20 UTC (rev 8491)
@@ -316,6 +316,12 @@
     /// Cartesian Rotation Angle
     ///
     static const INT32 Nrthrot = 47;        
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// Ellipsoid scaling factor
+    ///
+    static const INT32 EllipsoidScale = 48;
 };
 /// \}
 

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h	2015-01-02 20:03:14 UTC (rev 8490)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h	2015-01-04 00:32:20 UTC (rev 8491)
@@ -331,6 +331,24 @@
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
     /// \brief
+    /// BritishFootTrunc
+    ///
+    static const INT32 BrFootTrunc = 51;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// BritishChainTrunc
+    ///
+    static const INT32 BrChainTrunc = 52;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    /// \brief
+    /// BritishLinkTrunc
+    ///
+    static const INT32 BrLinkTrunc = 53;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    /// \brief
     /// Degree
     ///
     static const INT32 Degree = 1001;