[mapguide-commits] r5270 - in trunk/MgDev/Web/src:
DotNetUnmanagedApi/Geometry JavaApi MapGuideApi PhpApi
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Oct 11 18:39:54 EDT 2010
Author: NormOlsen
Date: 2010-10-11 15:39:54 -0700 (Mon, 11 Oct 2010)
New Revision: 5270
Modified:
trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryConstants.xml
trunk/MgDev/Web/src/JavaApi/Makefile.am
trunk/MgDev/Web/src/MapGuideApi/Constants.xml
trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
trunk/MgDev/Web/src/PhpApi/Makefile.am
Log:
MapGuide Trac# 1456:
While the GeometryApiGen.xml file was correctly updated, the RFC 94 submission
did not correctly update the MapGuideApiGen.xml file thus the generation of the
Java version of the API failed. Thee associated ..Constant.xml files were
similarly handled.
Neither were the Makefile.am files for Java and Php updated to include the new
interfaces. Correcting that issue lead to the discovery that the
implementation of RFC 76 (Grids and MGRS) did not include several new classes
in the Makefile.am files. This situation was corrected as well.
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml 2010-10-11 15:31:19 UTC (rev 5269)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml 2010-10-11 22:39:54 UTC (rev 5270)
@@ -138,16 +138,16 @@
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h" />
@@ -169,6 +169,8 @@
<Header path="../../../../Common/Geometry/Exception/CoordinateSystemComputationFailedException.h" />
<Header path="../../../../Common/Geometry/Exception/CoordinateSystemConversionFailedException.h" />
+ <Header path="../../../../Common/Geometry/Exception/CoordinateSystemInitializationFailedException.h" />
+ <Header path="../../../../Common/Geometry/Exception/CoordinateSystemLoadFailedException.h" />
<Header path="../../../../Common/Geometry/Exception/CoordinateSystemMeasureFailedException.h" />
<Header path="../../../../Common/Geometry/Exception/CoordinateSystemTransformFailedException.h" />
<Header path="../../../../Common/Geometry/Exception/GeometryException.h" />
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryConstants.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryConstants.xml 2010-10-11 15:31:19 UTC (rev 5269)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryConstants.xml 2010-10-11 22:39:54 UTC (rev 5270)
@@ -120,10 +120,10 @@
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h" />
<Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h" />
- <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h" />
</Headers>
Modified: trunk/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/JavaApi/Makefile.am 2010-10-11 15:31:19 UTC (rev 5269)
+++ trunk/MgDev/Web/src/JavaApi/Makefile.am 2010-10-11 22:39:54 UTC (rev 5270)
@@ -348,6 +348,25 @@
../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h \
../WebApp/WebCommand.h \
../WebApp/WebUiTargetCommand.h \
../WebApp/WebSearchCommand.h \
Modified: trunk/MgDev/Web/src/MapGuideApi/Constants.xml
===================================================================
--- trunk/MgDev/Web/src/MapGuideApi/Constants.xml 2010-10-11 15:31:19 UTC (rev 5269)
+++ trunk/MgDev/Web/src/MapGuideApi/Constants.xml 2010-10-11 22:39:54 UTC (rev 5270)
@@ -108,7 +108,9 @@
<Class name="MgCoordinateSystemGeodeticTransformationMethod" />
<Class name="MgCoordinateSystemGridOrientation" />
<Class name="MgCoordinateSystemGridSpecializationType" />
+ <Class name="MgCoordinateSystemMgrsGridLevel" />
<Class name="MgCoordinateSystemMgrsLetteringScheme" />
+ <Class name="MgCoordinateSystemMgrsGridSquarePosition" />
<Class name="MgCoordinateSystemProjectionCode" />
<Class name="MgCoordinateSystemProjectionFormatType" />
<Class name="MgCoordinateSystemProjectionLogicalType" />
@@ -117,6 +119,10 @@
<Class name="MgCoordinateSystemUnitCode" />
<Class name="MgCoordinateSystemUnitType" />
<Class name="MgCoordinateSystemWktFlavor" />
+ <Class name="MgCoordinateSystemGeodeticTransformDefType" />
+ <Class name="MgCoordinateSystemGeodeticAnalyticalTransformationMethod" />
+ <Class name="MgCoordinateSystemGeodeticMultipleRegressionTransformationMethod"/>
+ <Class name="MgCoordinateSystemGeodeticTransformGridFileFormat"/>
<Class name="MgMapPlotInstruction" />
<Class name="MgUnitType" />
<Class name="MgPackageStatus" />
@@ -159,7 +165,9 @@
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h" />
@@ -168,6 +176,10 @@
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h" />
<Header path="../../../Common/MapGuideCommon/Services/MappingDefs.h" />
<Header path="../../../Common/MapGuideCommon/Services/MapPlotInstruction.h" />
Modified: trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml 2010-10-11 15:31:19 UTC (rev 5269)
+++ trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml 2010-10-11 22:39:54 UTC (rev 5270)
@@ -220,6 +220,16 @@
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h" />
<Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h" />
Modified: trunk/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/PhpApi/Makefile.am 2010-10-11 15:31:19 UTC (rev 5269)
+++ trunk/MgDev/Web/src/PhpApi/Makefile.am 2010-10-11 22:39:54 UTC (rev 5270)
@@ -346,6 +346,25 @@
../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h \
../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h \
../WebApp/WebCommand.h \
../WebApp/WebUiTargetCommand.h \
../WebApp/WebSearchCommand.h \
More information about the mapguide-commits
mailing list