@cpp.js/package-geotiff 1.0.0 → 2.0.0-beta.2

package/cppjs.build.js

@@ -22,4 +22,11 @@ export default {
         `--with-proj=${depPaths.proj.root}`, `--with-libtiff=${depPaths.tiff.root}`, `--with-zlib=${depPaths.z.root}`,
     ],
     getExtraLibs: (platform) => platformExtraLibs[platform] || [],
+    replaceList: [
+        {
+            regex: 'double GTIFAtof\\(const char',
+            replacement: 'double GTIFAtof2(const char',
+            paths: ['geo_strtod.c'],
+        },
+    ],
 };

package/cppjs.config.js

@@ -1,22 +1,14 @@
-import proj from '@cpp.js/package-proj/cppjs.config.js';
-import tiff from '@cpp.js/package-tiff/cppjs.config.js';
-import zlib from '@cpp.js/package-zlib/cppjs.config.js';
+import geotiffWasm from '@cpp.js/package-geotiff-wasm/cppjs.config.js';
+import geotiffAndroid from '@cpp.js/package-geotiff-android/cppjs.config.js';
+import geotiffIos from '@cpp.js/package-geotiff-ios/cppjs.config.js';
 
 export default {
-    general: {
-        name: 'geotiff',
-    },
-    export: {
-        type: 'cmake',
-    },
-    dependencies: [
-        proj,
-        tiff,
-        zlib,
-    ],
-    paths: {
-        config: import.meta.url,
-        base: '../..',
-        output: 'dist',
-    },
+  dependencies: [
+    geotiffWasm,
+    geotiffAndroid,
+    geotiffIos,
+  ],
+  paths: {
+    config: import.meta.url
+  }
 };

package/package.json

@@ -1,20 +1,12 @@
 {
   "name": "@cpp.js/package-geotiff",
-  "version": "1.0.0",
-  "nativeVersion": "1.7.3",
+  "version": "2.0.0-beta.2",
+  "nativeVersion": "1.7.4",
   "description": "This package provides the precompiled geotiff library, built using cpp.js, for easy integration into JavaScript, WebAssembly and React Native projects. Designed for working with GeoTIFF files, offering robust support for geospatial metadata handling, ensuring high performance and cross-platform compatibility. Ideal for use in web and mobile applications.",
   "homepage": "https://github.com/bugra9/cpp.js/tree/main/packages/cppjs-package-geotiff#readme",
   "repository": "https://github.com/bugra9/cpp.js.git",
-  "license": "MIT",
   "type": "module",
-  "dependencies": {
-    "@cpp.js/package-proj": "^1.0.0",
-    "@cpp.js/package-tiff": "^1.0.0",
-    "@cpp.js/package-zlib": "^1.0.0"
-  },
-  "devDependencies": {
-    "cpp.js": "^1.0.0"
-  },
+  "license": "MIT",
   "keywords": [
     "geotiff",
     "libgeotiff",
@@ -22,11 +14,12 @@
     "webassembly",
     "react-native"
   ],
-  "scripts": {
-    "build": "cppjs build",
-    "build:wasm": "cppjs build -p WebAssembly",
-    "build:android": "cppjs build -p Android",
-    "build:ios": "cppjs build -p iOS",
-    "clear": "rm -rf .cppjs dist *.xcframework"
+  "dependencies": {
+    "@cpp.js/package-geotiff-wasm": "^2.0.0-beta.1",
+    "@cpp.js/package-geotiff-ios": "^2.0.0-beta.1",
+    "@cpp.js/package-geotiff-android": "^2.0.0-beta.1"
+  },
+  "devDependencies": {
+    "cpp.js": "^2.0.0-beta.1"
   }
 }

package/dist/prebuilt/Android-arm64-v8a/include/cpl_serv.h

@@ -1,258 +0,0 @@
-/******************************************************************************
- * Copyright (c) 1998, Frank Warmerdam
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- ******************************************************************************
- *
- * cpl_serv.h
- *
- * This include file derived and simplified from the GDAL Common Portability
- * Library.
- */
-
-#ifndef CPL_SERV_H_INCLUDED
-#define CPL_SERV_H_INCLUDED
-
-/* ==================================================================== */
-/*	Standard include files.						*/
-/* ==================================================================== */
-
-#include "geo_config.h"
-#include <stdio.h>
-
-#include <math.h>
-
-#include <string.h>
-#if defined(GEOTIFF_HAVE_STRINGS_H) && !defined(_WIN32)
-#  include <strings.h>
-#endif
-#include <stdlib.h>
-
-/**********************************************************************
- * Do we want to build as a DLL on windows?
- **********************************************************************/
-#if !defined(GTIF_DLL)
-#  if defined(_WIN32) && defined(BUILD_AS_DLL)
-#    define GTIF_DLL     __declspec(dllexport)
-#  else
-#    define GTIF_DLL
-#  endif
-#endif
-
-/* ==================================================================== */
-/*      Other standard services.                                        */
-/* ==================================================================== */
-#ifdef __cplusplus
-#  define CPL_C_START		extern "C" {
-#  define CPL_C_END		}
-#else
-#  define CPL_C_START
-#  define CPL_C_END
-#endif
-
-#ifndef NULL
-#  define NULL	0
-#endif
-
-#ifndef FALSE
-#  define FALSE	0
-#endif
-
-#ifndef TRUE
-#  define TRUE	1
-#endif
-
-#ifndef MAX
-#  define MIN(a,b)      (((a)<(b)) ? (a) : (b))
-#  define MAX(a,b)      (((a)>(b)) ? (a) : (b))
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef ABS
-#  define ABS(x)        (((x)<0) ? (-1*(x)) : (x))
-#endif
-
-#ifndef EQUAL
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#   if     (_MSC_FULL_VER >= 15000000)
-#       define EQUALN(a,b,n)           (_strnicmp(a,b,n)==0)
-#       define EQUAL(a,b)              (_stricmp(a,b)==0)
-#   else
-#       define EQUALN(a,b,n)           (strnicmp(a,b,n)==0)
-#       define EQUAL(a,b)              (stricmp(a,b)==0)
-#   endif
-#else
-#  define EQUALN(a,b,n)           (strncasecmp(a,b,n)==0)
-#  define EQUAL(a,b)              (strcasecmp(a,b)==0)
-#endif
-#endif
-
-/* ==================================================================== */
-/*      VSI Services (just map directly onto Standard C services.       */
-/* ==================================================================== */
-
-#define VSIFOpen	fopen
-#define VSIFClose	fclose
-#define VSIFEof		feof
-#define VSIFPrintf	fprintf
-#define VSIFPuts	fputs
-#define VSIFPutc	fputc
-#define VSIFGets	fgets
-#define VSIRewind	rewind
-#define VSIFSeek        fseek
-#define VSIFTell        ftell
-#define VSIFRead        fread
-
-#ifndef notdef
-#define VSICalloc(x,y)	_GTIFcalloc((x)*(y))
-#define VSIMalloc	_GTIFcalloc
-#define VSIFree	        _GTIFFree
-#define VSIRealloc      _GTIFrealloc
-#else
-#define VSICalloc(x,y)	(((char *) _GTIFcalloc((x)*(y)+4)) + 4)
-#define VSIMalloc(x)	(((char *) _GTIFcalloc((x)+4)) + 4)
-#define VSIFree(x)      _GTIFFree(((char *) (x)) - 4)
-#define VSIRealloc(p,n) (((char *) _GTIFrealloc(((char *)(p))-4,(n)+4)) + 4)
-#endif
-
-
-#if !defined(GTIFAtof)
-#  define GTIFAtof atof
-#endif
-
-
-/* -------------------------------------------------------------------- */
-/*      Safe malloc() API.  Thin cover over VSI functions with fatal    */
-/*      error reporting if memory allocation fails.                     */
-/* -------------------------------------------------------------------- */
-CPL_C_START
-
-#define CPLMalloc  gtCPLMalloc
-#define CPLCalloc  gtCPLCalloc
-#define CPLRealloc gtCPLRealloc
-#define CPLStrdup  gtCPLStrdup
-
-void GTIF_DLL *CPLMalloc( int );
-void GTIF_DLL *CPLCalloc( int, int );
-void GTIF_DLL *CPLRealloc( void *, int );
-char GTIF_DLL *CPLStrdup( const char * );
-
-#define CPLFree(x)	{ if( x != NULL ) VSIFree(x); }
-
-/* -------------------------------------------------------------------- */
-/*      Locale insensitive string to float conversion.                  */
-/* -------------------------------------------------------------------- */
-/*double GTIFAtof(const char *nptr); */
-double GTIFStrtod(const char *nptr, char **endptr);
-
-/* -------------------------------------------------------------------- */
-/*      Read a line from a text file, and strip of CR/LF.               */
-/* -------------------------------------------------------------------- */
-
-#define CPLReadLine gtCPLReadLine
-
-const char GTIF_DLL *CPLReadLine( FILE * );
-
-/*=====================================================================
-                   Error handling functions (cpl_error.c)
- =====================================================================*/
-
-typedef enum
-{
-    CE_None = 0,
-    CE_Log = 1,
-    CE_Warning = 2,
-    CE_Failure = 3,
-    CE_Fatal = 4
-} CPLErr;
-
-#define CPLError      gtCPLError
-#define CPLErrorReset gtCPLErrorReset
-#define CPLGetLastErrorNo gtCPLGetLastErrorNo
-#define CPLGetLastErrorMsg gtCPLGetLastErrorMsg
-#define CPLSetErrorHandler gtCPLSetErrorHandler
-#define _CPLAssert    gt_CPLAssert
-
-void GTIF_DLL CPLError(CPLErr eErrClass, int err_no, const char *fmt, ...);
-void GTIF_DLL CPLErrorReset();
-int  GTIF_DLL CPLGetLastErrorNo();
-const char GTIF_DLL * CPLGetLastErrorMsg();
-void GTIF_DLL CPLSetErrorHandler(void(*pfnErrorHandler)(CPLErr,int,
-                                                       const char *));
-void GTIF_DLL _CPLAssert( const char *, const char *, int );
-
-#ifdef DEBUG
-#  define CPLAssert(expr)  ((expr) ? (void)(0) : _CPLAssert(#expr,__FILE__,__LINE__))
-#else
-#  define CPLAssert(expr)
-#endif
-
-CPL_C_END
-
-/* ==================================================================== */
-/*      Well known error codes.                                         */
-/* ==================================================================== */
-
-#define CPLE_AppDefined			1
-#define CPLE_OutOfMemory		2
-#define CPLE_FileIO			3
-#define CPLE_OpenFailed			4
-#define CPLE_IllegalArg			5
-#define CPLE_NotSupported		6
-#define CPLE_AssertionFailed		7
-#define CPLE_NoWriteAccess		8
-
-/*=====================================================================
-                   Stringlist functions (strlist.c)
- =====================================================================*/
-CPL_C_START
-
-#define CSLAddString gtCSLAddString
-#define CSLCount     gtCSLCount
-#define CSLGetField  gtCSLGetField
-#define CSLDestroy   gtCSLDestroy
-#define CSLDuplicate gtCSLDuplicate
-#define CSLTokenizeString gtCSLTokenizeString
-#define CSLTokenizeStringComplex gtCSLTokenizeStringComplex
-
-char GTIF_DLL   **CSLAddString(char **papszStrList, const char *pszNewString);
-int  GTIF_DLL   CSLCount(char **papszStrList);
-const char GTIF_DLL *CSLGetField( char **, int );
-void GTIF_DLL   CSLDestroy(char **papszStrList);
-char GTIF_DLL   **CSLDuplicate(char **papszStrList);
-
-char GTIF_DLL   **CSLTokenizeString(const char *pszString );
-char GTIF_DLL   **CSLTokenizeStringComplex(const char *pszString,
-                                   const char *pszDelimiter,
-                                   int bHonourStrings, int bAllowEmptyTokens );
-
-/*
- * The following functions were used up to libgeotiff 1.4.X series, but
- * are now no-operation, since there is no longer any CSV use in libgeotiff.
- */
-#define SetCSVFilenameHook gtSetCSVFilenameHook
-void GTIF_DLL SetCSVFilenameHook( const char *(*CSVFileOverride)(const char *) );
-
-
-CPL_C_END
-
-#endif /* ndef CPL_SERV_H_INCLUDED */

package/dist/prebuilt/Android-arm64-v8a/include/epsg_datum.inc

@@ -1,174 +0,0 @@
-/*
- *  EPSG/POSC Datum database -- GeoTIFF Rev. 0.2
- */
-
-/* C database for Geotiff include files.   */
-/* the macro ValuePair() must be defined   */
-/* by the enclosing include file           */
-
-#ifdef INCLUDE_OLD_CODES
-#include old_datum.inc
-#endif /* OLD Codes */
-
-/* New datums */
-ValuePair(Datum_Dealul_Piscului_1970,6317)
-
-/* Datums for which only the ellipsoid is known */
-ValuePair(DatumE_Airy1830,	6001)
-ValuePair(DatumE_AiryModified1849,	6002)
-ValuePair(DatumE_AustralianNationalSpheroid,	6003)
-ValuePair(DatumE_Bessel1841,	6004)
-ValuePair(DatumE_BesselModified,	6005)
-ValuePair(DatumE_BesselNamibia,	6006)
-ValuePair(DatumE_Clarke1858,	6007)
-ValuePair(DatumE_Clarke1866,	6008)
-ValuePair(DatumE_Clarke1866Michigan,	6009)
-ValuePair(DatumE_Clarke1880_Benoit,	6010)
-ValuePair(DatumE_Clarke1880_IGN,	6011)
-ValuePair(DatumE_Clarke1880_RGS,	6012)
-ValuePair(DatumE_Clarke1880_Arc,	6013)
-ValuePair(DatumE_Clarke1880_SGA1922,	6014)
-ValuePair(DatumE_Everest1830_1937Adjustment,	6015)
-ValuePair(DatumE_Everest1830_1967Definition,	6016)
-ValuePair(DatumE_Everest1830_1975Definition,	6017)
-ValuePair(DatumE_Everest1830Modified,	6018)
-ValuePair(DatumE_GRS1980,	6019)
-ValuePair(DatumE_Helmert1906,	6020)
-ValuePair(DatumE_IndonesianNationalSpheroid,	6021)
-ValuePair(DatumE_International1924,	6022)
-ValuePair(DatumE_International1967,	6023)
-ValuePair(DatumE_Krassowsky1960,	6024)
-ValuePair(DatumE_NWL9D,	6025)
-ValuePair(DatumE_NWL10D,	6026)
-ValuePair(DatumE_Plessis1817,	6027)
-ValuePair(DatumE_Struve1860,	6028)
-ValuePair(DatumE_WarOffice,	6029)
-ValuePair(DatumE_WGS84,	6030)
-ValuePair(DatumE_GEM10C,	6031)
-ValuePair(DatumE_OSU86F,	6032)
-ValuePair(DatumE_OSU91A,	6033)
-ValuePair(DatumE_Clarke1880,	6034)
-ValuePair(DatumE_Sphere,	6035)
-
-/* standard datums */
-ValuePair(Datum_Adindan,	6201)
-ValuePair(Datum_Australian_Geodetic_Datum_1966,	6202)
-ValuePair(Datum_Australian_Geodetic_Datum_1984,	6203)
-ValuePair(Datum_Ain_el_Abd_1970,	6204)
-ValuePair(Datum_Afgooye,	6205)
-ValuePair(Datum_Agadez,	6206)
-ValuePair(Datum_Lisbon,	6207)
-ValuePair(Datum_Aratu,	6208)
-ValuePair(Datum_Arc_1950,	6209)
-ValuePair(Datum_Arc_1960,	6210)
-ValuePair(Datum_Batavia,	6211)
-ValuePair(Datum_Barbados,	6212)
-ValuePair(Datum_Beduaram,	6213)
-ValuePair(Datum_Beijing_1954,	6214)
-ValuePair(Datum_Reseau_National_Belge_1950,	6215)
-ValuePair(Datum_Bermuda_1957,	6216)
-ValuePair(Datum_Bern_1898,	6217)
-ValuePair(Datum_Bogota,	6218)
-ValuePair(Datum_Bukit_Rimpah,	6219)
-ValuePair(Datum_Camacupa,	6220)
-ValuePair(Datum_Campo_Inchauspe,	6221)
-ValuePair(Datum_Cape,	6222)
-ValuePair(Datum_Carthage,	6223)
-ValuePair(Datum_Chua,	6224)
-ValuePair(Datum_Corrego_Alegre,	6225)
-ValuePair(Datum_Cote_d_Ivoire,	6226)
-ValuePair(Datum_Deir_ez_Zor,	6227)
-ValuePair(Datum_Douala,	6228)
-ValuePair(Datum_Egypt_1907,	6229)
-ValuePair(Datum_European_Datum_1950,	6230)
-ValuePair(Datum_European_Datum_1987,	6231)
-ValuePair(Datum_Fahud,	6232)
-ValuePair(Datum_Gandajika_1970,	6233)
-ValuePair(Datum_Garoua,	6234)
-ValuePair(Datum_Guyane_Francaise,	6235)
-ValuePair(Datum_Hu_Tzu_Shan,	6236)
-ValuePair(Datum_Hungarian_Datum_1972,	6237)
-ValuePair(Datum_Indonesian_Datum_1974,	6238)
-ValuePair(Datum_Indian_1954,	6239)
-ValuePair(Datum_Indian_1975,	6240)
-ValuePair(Datum_Jamaica_1875,	6241)
-ValuePair(Datum_Jamaica_1969,	6242)
-ValuePair(Datum_Kalianpur,	6243)
-ValuePair(Datum_Kandawala,	6244)
-ValuePair(Datum_Kertau,	6245)
-ValuePair(Datum_Kuwait_Oil_Company,	6246)
-ValuePair(Datum_La_Canoa,	6247)
-ValuePair(Datum_Provisional_S_American_Datum_1956,	6248)
-ValuePair(Datum_Lake,	6249)
-ValuePair(Datum_Leigon,	6250)
-ValuePair(Datum_Liberia_1964,	6251)
-ValuePair(Datum_Lome,	6252)
-ValuePair(Datum_Luzon_1911,	6253)
-ValuePair(Datum_Hito_XVIII_1963,	6254)
-ValuePair(Datum_Herat_North,	6255)
-ValuePair(Datum_Mahe_1971,	6256)
-ValuePair(Datum_Makassar,	6257)
-ValuePair(Datum_European_Reference_System_1989,	6258)
-ValuePair(Datum_Malongo_1987,	6259)
-ValuePair(Datum_Manoca,	6260)
-ValuePair(Datum_Merchich,	6261)
-ValuePair(Datum_Massawa,	6262)
-ValuePair(Datum_Minna,	6263)
-ValuePair(Datum_Mhast,	6264)
-ValuePair(Datum_Monte_Mario,	6265)
-ValuePair(Datum_M_poraloko,	6266)
-ValuePair(Datum_North_American_Datum_1927,	6267)
-ValuePair(Datum_NAD_Michigan,	6268)
-ValuePair(Datum_North_American_Datum_1983,	6269)
-ValuePair(Datum_Nahrwan_1967,	6270)
-ValuePair(Datum_Naparima_1972,	6271)
-ValuePair(Datum_New_Zealand_Geodetic_Datum_1949,	6272)
-ValuePair(Datum_NGO_1948,	6273)
-ValuePair(Datum_Datum_73,	6274)
-ValuePair(Datum_Nouvelle_Triangulation_Francaise,	6275)
-ValuePair(Datum_NSWC_9Z_2,	6276)
-ValuePair(Datum_OSGB_1936,	6277)
-ValuePair(Datum_OSGB_1970_SN,	6278)
-ValuePair(Datum_OS_SN_1980,	6279)
-ValuePair(Datum_Padang_1884,	6280)
-ValuePair(Datum_Palestine_1923,	6281)
-ValuePair(Datum_Pointe_Noire,	6282)
-ValuePair(Datum_Geocentric_Datum_of_Australia_1994,	6283)
-ValuePair(Datum_Pulkovo_1942,	6284)
-ValuePair(Datum_Qatar,	6285)
-ValuePair(Datum_Qatar_1948,	6286)
-ValuePair(Datum_Qornoq,	6287)
-ValuePair(Datum_Loma_Quintana,	6288)
-ValuePair(Datum_Amersfoort,	6289)
-ValuePair(Datum_RT38,	6290)
-ValuePair(Datum_South_American_Datum_1969,	6291)
-ValuePair(Datum_Sapper_Hill_1943,	6292)
-ValuePair(Datum_Schwarzeck,	6293)
-ValuePair(Datum_Segora,	6294)
-ValuePair(Datum_Serindung,	6295)
-ValuePair(Datum_Sudan,	6296)
-ValuePair(Datum_Tananarive_1925,	6297)
-ValuePair(Datum_Timbalai_1948,	6298)
-ValuePair(Datum_TM65,	6299)
-ValuePair(Datum_TM75,	6300)
-ValuePair(Datum_Tokyo,	6301)
-ValuePair(Datum_Trinidad_1903,	6302)
-ValuePair(Datum_Trucial_Coast_1948,	6303)
-ValuePair(Datum_Voirol_1875,	6304)
-ValuePair(Datum_Voirol_Unifie_1960,	6305)
-ValuePair(Datum_Bern_1938,	6306)
-ValuePair(Datum_Nord_Sahara_1959,	6307)
-ValuePair(Datum_Stockholm_1938,	6308)
-ValuePair(Datum_Yacare,	6309)
-ValuePair(Datum_Yoff,	6310)
-ValuePair(Datum_Zanderij,	6311)
-ValuePair(Datum_Militar_Geographische_Institut,	6312)
-ValuePair(Datum_Reseau_National_Belge_1972,	6313)
-ValuePair(Datum_Deutsche_Hauptdreiecksnetz,	6314)
-ValuePair(Datum_Conakry_1905,	6315)
-ValuePair(Datum_WGS72,	6322)
-ValuePair(Datum_WGS72_Transit_Broadcast_Ephemeris,	6324)
-ValuePair(Datum_WGS84,	6326)
-ValuePair(Datum_Ancienne_Triangulation_Francaise,	6901)
-ValuePair(Datum_Nord_de_Guerre,	6902)
-/* end of list */

package/dist/prebuilt/Android-arm64-v8a/include/epsg_ellipse.inc

@@ -1,48 +0,0 @@
-/*
- *  GeoTIFF Rev. 0.2  Ellipsoids
- */
-
-/* C database for Geotiff include files.   */
-/* the macro ValuePair() must be defined   */
-/* by the enclosing include file           */
-
-#ifdef INCLUDE_OLD_CODES
-#include old_ellipse.inc
-#endif /* OLD Codes */
-
-ValuePair(Ellipse_Airy_1830,	7001)
-ValuePair(Ellipse_Airy_Modified_1849,	7002)
-ValuePair(Ellipse_Australian_National_Spheroid,	7003)
-ValuePair(Ellipse_Bessel_1841,	7004)
-ValuePair(Ellipse_Bessel_Modified,	7005)
-ValuePair(Ellipse_Bessel_Namibia,	7006)
-ValuePair(Ellipse_Clarke_1858,	7007)
-ValuePair(Ellipse_Clarke_1866,	7008)
-ValuePair(Ellipse_Clarke_1866_Michigan,	7009)
-ValuePair(Ellipse_Clarke_1880_Benoit,	7010)
-ValuePair(Ellipse_Clarke_1880_IGN,	7011)
-ValuePair(Ellipse_Clarke_1880_RGS,	7012)
-ValuePair(Ellipse_Clarke_1880_Arc,	7013)
-ValuePair(Ellipse_Clarke_1880_SGA_1922,	7014)
-ValuePair(Ellipse_Everest_1830_1937_Adjustment,	7015)
-ValuePair(Ellipse_Everest_1830_1967_Definition,	7016)
-ValuePair(Ellipse_Everest_1830_1975_Definition,	7017)
-ValuePair(Ellipse_Everest_1830_Modified,	7018)
-ValuePair(Ellipse_GRS_1980,	7019)
-ValuePair(Ellipse_Helmert_1906,	7020)
-ValuePair(Ellipse_Indonesian_National_Spheroid,	7021)
-ValuePair(Ellipse_International_1924,	7022)
-ValuePair(Ellipse_International_1967,	7023)
-ValuePair(Ellipse_Krassowsky_1940,	7024)
-ValuePair(Ellipse_NWL_9D,	7025)
-ValuePair(Ellipse_NWL_10D,	7026)
-ValuePair(Ellipse_Plessis_1817,	7027)
-ValuePair(Ellipse_Struve_1860,	7028)
-ValuePair(Ellipse_War_Office,	7029)
-ValuePair(Ellipse_WGS_84,	7030)
-ValuePair(Ellipse_GEM_10C,	7031)
-ValuePair(Ellipse_OSU86F,	7032)
-ValuePair(Ellipse_OSU91A,	7033)
-ValuePair(Ellipse_Clarke_1880,	7034)
-ValuePair(Ellipse_Sphere,	7035)
-/* end of list */