[mapguide-commits] r1200 - trunk/MgDev/Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: traianstanev
Date: 2007-03-12 13:12:43 -0400 (Mon, 12 Mar 2007)
New Revision: 1200

Modified:
   trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h
Log:
Changed my mind about when to interpolate the first and last points of each rectangle edge. Also removed a function that transforms a single point from XY to LL. -- it was no longer necessary.

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2007-03-12 17:04:01 UTC (rev 1199)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2007-03-12 17:12:43 UTC (rev 1200)
@@ -684,18 +684,18 @@
 
     for (int i = 0; i < 100; i++)
     {
-        xInterp += xInc;
         *dstx++ = xInterp;
         *dsty++ = ptNWY;
+        xInterp += xInc;
     }
 
     xInterp = ptSEX;
 
     for (int i = 0; i < 100; i++)
     {
-        xInterp += xInc;
         *dstx++ = xInterp;
         *dsty++ = ptSEY;
+        xInterp += xInc;
     }
 
     // left and right borders
@@ -705,18 +705,18 @@
 
     for (int i = 0; i < 100; i++)
     {
-        yInterp += yInc;
         *dstx++ = ptNWX;
         *dsty++ = yInterp;
+        yInterp += yInc;
     }
 
     yInterp = ptSEY;
 
     for (int i = 0; i < 100; i++)
     {
-        yInterp += yInc;
         *dstx++ = ptSEX;
         *dsty++ = yInterp;
+        yInterp += yInc;
     }
 
     transform->Transform(400, tess_x, tess_y);
@@ -878,21 +878,7 @@
     return pEnvelope;
 }
 
-void CCoordinateSystemTransform::XYToLL(OGRCoordinateTransformation* transform, double dX, double dY, double& dLon, double& dLat)
-{
-    if(NULL == transform)
-    {
-        throw new CNullArgumentException(L"CCoordinateSystemTransform.XYToLL", __LINE__, __WFILE__, L"[1] - OGRCoordinateTransformation pointer.");
-    }
 
-    double xy[3] = { dX, dY, 0.0 };
-
-    transform->Transform(1, &xy[0], &xy[1], &xy[2]);
-
-    dLon = xy[0];
-    dLat = xy[1];
-}
-
 void CCoordinateSystemTransform::LLToXY(OGRCoordinateTransformation* transform, double dLon, double dLat, double& dX, double& dY)
 {
     if(NULL == transform)

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h	2007-03-12 17:04:01 UTC (rev 1199)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h	2007-03-12 17:12:43 UTC (rev 1200)
@@ -230,7 +230,6 @@
     CEnvelope* XYExtentToLL(OGRCoordinateTransformation* transform, CEnvelope* envelope);
     CEnvelope* LLExtentToXY(OGRCoordinateTransformation* transform, CEnvelope* envelope);
 
-    void XYToLL(OGRCoordinateTransformation* transform, double dX, double dY, double& dLon, double& dLat);
     void LLToXY(OGRCoordinateTransformation* transform, double dLon, double dLat, double& dX, double& dY);
 
     CCoordinateSystem* m_coordSysSource;