[mapguide-commits] r5103 - sandbox/rfc94/Common/CoordinateSystem
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 2 08:35:04 EDT 2010
Author: baertelchen
Date: 2010-09-02 12:35:03 +0000 (Thu, 02 Sep 2010)
New Revision: 5103
Modified:
sandbox/rfc94/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
sandbox/rfc94/Common/CoordinateSystem/CoordSysDictionary.cpp
sandbox/rfc94/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
sandbox/rfc94/Common/CoordinateSystem/CoordSysMathComparator.cpp
sandbox/rfc94/Common/CoordinateSystem/MentorUtil.cpp
Log:
Checkin to make the sandbox compiling.
There were some changes in CS Map that caused the Geometry project not compiling anymore (e.g. the CS_rlsUpdt.c file is no longer part of the build but extern methods are still referenced).
Commented out the calls for now and marked all changes with a FIXME.
Modified: sandbox/rfc94/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
===================================================================
--- sandbox/rfc94/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2010-09-01 20:38:49 UTC (rev 5102)
+++ sandbox/rfc94/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2010-09-02 12:35:03 UTC (rev 5103)
@@ -51,7 +51,9 @@
#undef cs_Dtdef08_
+//FIXME (CS_rlsUodt.c isn't built anymore)
//Externs from Mentor
+/*
extern "C"
{
int CSdtrupReadOld (csFILE *oldStrm,struct csDtrup_ *dtrup,int old_lvl);
@@ -59,11 +61,13 @@
int CSdtrupRead06 (csFILE *oldStrm,struct csDtrup_ *dtrup);
extern char cs_Dir[];
}
+*/
-
+//FIXME (CS_rlsUodt.c isn't built anymore)
//Function which works like CS_dtrd(), except that it reads version
//5 datum structs.
//
+/*
static int
CS_dtrd05(
csFILE *oldStrm,
@@ -102,9 +106,8 @@
}
return nStatus;
}
+*/
-
-
//Function which returns whether the specified "magic number" is
//a valid one for a Mentor datum dictionary. The returned value
//indicates the highest access level allowed: CsDictionaryOpenMode::Write if current
@@ -249,8 +252,13 @@
return CS_dtdef(kpName);
}
+ throw new MgInvalidOperationException(L"CCoordinateSystemDatumDictionary.dtdef", __LINE__, __WFILE__, NULL, L"", NULL);
+
+ //FIXME (CS_rlsUodt.c isn't built anymore)
+ //
//It's an old version. We need to do a special search
//in the file, and then, if found, update it to a current struct.
+ /*
UINT32 nStructSize, nNameSize;
GetDatumSizeInfo(m_lMagic, nStructSize, nNameSize);
if (strlen(kpName) > nNameSize-1) return NULL;
@@ -300,6 +308,7 @@
}
CS_fclose(pFile);
return pDef;
+ */
}
//-------------------------------------------------------------------------------
@@ -644,6 +653,8 @@
assert(nVersion > 0);
switch (nVersion)
{
+ // FIXME (CS_rlsUpdt.c isn't built anymore)
+ /*
case 5:
//Generate summary for version 5 datum file.
m_pmapSystemNameDescription = MentorDictionary::GenerateSystemNameDescriptionMap<cs_Dtdef05_>(
@@ -658,6 +669,7 @@
DtDesc06,
CS_dtrd06);
break;
+ */
case 7:
case 8:
//Generate summary for version 7 or 8 datum file.
Modified: sandbox/rfc94/Common/CoordinateSystem/CoordSysDictionary.cpp
===================================================================
--- sandbox/rfc94/Common/CoordinateSystem/CoordSysDictionary.cpp 2010-09-01 20:38:49 UTC (rev 5102)
+++ sandbox/rfc94/Common/CoordinateSystem/CoordSysDictionary.cpp 2010-09-02 12:35:03 UTC (rev 5103)
@@ -49,19 +49,25 @@
#undef cs_Csdef08_
+//FIXME (CS_rlsUodt.c isn't built anymore)
+//
//Externs from Mentor
+/*
extern "C"
{
int CScsrupReadOld (csFILE *oldStrm,struct csCsrup_ *csrup,int old_lvl);
int CScsrupRead05 (csFILE *oldStrm,struct csCsrup_ *csrup);
int CScsrupRead06 (csFILE *oldStrm,struct csCsrup_ *csrup);
}
+*/
-
+//FIXME (CS_rlsUodt.c isn't built anymore)
+//
//Function which works like CS_csrd(), except that it reads version
//5 coordsys structs.
//
+/*
static int
CS_csrd05(
csFILE *oldStrm,
@@ -100,9 +106,9 @@
}
return nStatus;
}
+*/
-
//Function which returns whether the specified "magic number" is
//a valid one for a Mentor coordsys dictionary. The returned value
//indicates the highest access level allowed: CsDictionaryOpenMode::Write if current
@@ -260,8 +266,14 @@
return pDef;
}
+ throw new MgInvalidOperationException(L"CCoordinateSystemDictionary.csdef", __LINE__, __WFILE__, NULL, L"", NULL);
+
+ //FIXME (CS_rlsUodt.c isn't built anymore)
+ //
+
//It's an old version. We need to do a special search
//in the file, and then, if found, update it to a current struct.
+ /*
UINT32 nStructSize, nNameSize;
GetCoordinateSystemSizeInfo(m_lMagic, nStructSize, nNameSize);
if (strlen(kpName) > nNameSize-1) return NULL;
@@ -322,6 +334,7 @@
}
return pDef;
+ */
}
//------------------------------------------------------------------------
@@ -664,6 +677,8 @@
assert(nVersion > 0);
switch (nVersion)
{
+ //FIXME (CS_rlsUpdt.c isn't built anymore)
+ /*
case 5:
//Generate summary for version 5 coordsys file.
m_pmapSystemNameDescription = MentorDictionary::GenerateSystemNameDescriptionMap<cs_Csdef05_>(
@@ -678,6 +693,7 @@
CsDesc06,
CS_csrd06);
break;
+ */
case 7:
case 8:
//Generate summary for version 7 or 8 coordsys file.
Modified: sandbox/rfc94/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
===================================================================
--- sandbox/rfc94/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2010-09-01 20:38:49 UTC (rev 5102)
+++ sandbox/rfc94/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2010-09-02 12:35:03 UTC (rev 5103)
@@ -52,11 +52,14 @@
+//FIXME (CS_rlsUodt.c isn't built anymore)
//Externs from Mentor
+/*
extern "C"
{
int CSelrupReadOld (csFILE *oldStrm,struct csElrup_ *elrup,int old_lvl);
}
+*/
@@ -190,8 +193,14 @@
return CS_eldef(kpName);
}
+ throw new MgInvalidOperationException(L"CCoordinateSystemEllipsoidDictionary.eldef", __LINE__, __WFILE__, NULL, L"", NULL);
+
+ //FIXME (CS_rlsUodt.c isn't built anymore)
+ //
//It's an old version. We need to do a special search
//in the file, and then, if found, update it to a current struct.
+
+ /*
UINT32 nStructSize, nNameSize;
GetEllipsoidSizeInfo(m_lMagic, nStructSize, nNameSize);
if (strlen(kpName) > nNameSize-1) return NULL;
@@ -241,6 +250,7 @@
}
CS_fclose(pFile);
return pDef;
+ */
}
//-----------------------------------------------------------------------------
Modified: sandbox/rfc94/Common/CoordinateSystem/CoordSysMathComparator.cpp
===================================================================
--- sandbox/rfc94/Common/CoordinateSystem/CoordSysMathComparator.cpp 2010-09-01 20:38:49 UTC (rev 5102)
+++ sandbox/rfc94/Common/CoordinateSystem/CoordSysMathComparator.cpp 2010-09-02 12:35:03 UTC (rev 5103)
@@ -22,6 +22,8 @@
#include "CoordSysUtil.h" //for FloatEqual
#include "MentorUtil.h" //for IsLegalMentorName
+#include <cs_Legacy.h>
+
using namespace CSLibrary;
const double CCoordinateSystemMathComparator::kdEpsilonGeographic = 1.0E-12; // latitude & longitude
Modified: sandbox/rfc94/Common/CoordinateSystem/MentorUtil.cpp
===================================================================
--- sandbox/rfc94/Common/CoordinateSystem/MentorUtil.cpp 2010-09-01 20:38:49 UTC (rev 5102)
+++ sandbox/rfc94/Common/CoordinateSystem/MentorUtil.cpp 2010-09-02 12:35:03 UTC (rev 5103)
@@ -37,6 +37,8 @@
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
#include "CoordSysDictionary.h" //for CCoordinateSystemDictionary
+#include <cs_legacy.h>
+
using namespace CSLibrary;
//Externs from Mentor
@@ -1355,7 +1357,10 @@
// Skip datum transformation if we have a null transformation
// We have a null transform if the first transform type is dtcTypNone
- if (dtcTypNone != pDtcprm->xforms[0].xfrmType)
+
+ // FIXME
+ if (NULL != pDtcprm->xforms[0])
+ //if (dtcTypNone != pDtcprm->xforms[0].xfrmType) <-- doesn't compile
{
double dZ=0.;
if (pdZ)
More information about the mapguide-commits
mailing list