G3D -> RASTER3D

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47536 15284696-431f-4ddb-bdfa-cd5b030d7da7

AUTHORS

@@ -276,7 +276,7 @@ GRASS 5 Core Team (most have CVS write access):
                                                 interpolation (RST) 
                                                 and erosion modeling)
  Helena Mitasova <hmitaso unity.ncsu.edu>      (interpolation modules, NVIZ,
-                                                G3D, erosion modelling)
+                                                RASTER3D, erosion modelling)
  Eric G. Miller  <egm2 jps.net>                (sites format, new autoconf 
                                                 system, bugfixes etc.)
  Roger S. Miller <rgrmill rt66.com>            (raster modules, r.drain etc.)
@@ -340,9 +340,9 @@ Former GRASS 4 development (1984 to 1995):
 
 Former Institutions
  - University of Illinois at Urbana-Champaign, USA
-   Helena Mitasova <hmitaso unity.ncsu.edu> (interpolation modules, NVIZ, G3D)
+   Helena Mitasova <hmitaso unity.ncsu.edu> (interpolation modules, NVIZ, RASTER3D)
    William Brown   <brown gis.uiuc.edu>     (libraries, interpolation modules, 
-					     NVIZ, G3D)
+					     NVIZ, RASTER3D)
 
  - National Center for Supercomputing Applications, USA
    Lubos Mitas (multivariate spline interpolation (RST) and erosion modeling)

general/g.region/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.region
 
-LIBES = $(GPROJLIB) $(VECTORLIB) $(G3DLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(PROJLIB)
-DEPENDENCIES = $(GPROJDEP) $(VECTORDEP) $(G3DDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(VECTORLIB) $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(PROJLIB)
+DEPENDENCIES = $(GPROJDEP) $(VECTORDEP) $(RASTER3DDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

general/g.region/main.c

@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
 
     /* raster3d= */
     if ((name = parm.raster3d->answer)) {
-	G3D_Region win;
+	RASTER3D_Region win;
 
 	if ((mapset = G_find_grid3(name, "")) == NULL)
 	    G_fatal_error(_("3D raster map <%s> not found"), name);

gui/wxpython/xml/menudata.xml

@@ -2965,7 +2965,7 @@
     </menuitem>
    	<menuitem>
 	  <label>Interpolate volume from points</label>
-	  <help>Interpolates point data to a G3D grid volume using regularized spline with tension (RST) algorithm.</help>
+	  <help>Interpolates point data to a RASTER3D grid volume using regularized spline with tension (RST) algorithm.</help>
 	  <keywords>vector,surface,interpolation,RST</keywords>
 	  <handler>OnMenuCmd</handler>
 	  <command>v.vol.rst</command>

include/Make/Grass.make

@@ -131,7 +131,7 @@ libs = \
 	DRIVER:driver \
 	DSPF:dspf \
 	FORM:form \
-	G3D:g3d \
+	RASTER3D:g3d \
 	GIS:gis \
 	GMATH:gmath \
 	GPDE:gpde \
@@ -195,10 +195,10 @@ DISPLAYDEPS      = $(HTMLDRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB)
 DRIVERDEPS       = $(GISLIB) $(FTLIB) $(ICONVLIB) $(MATHLIB)
 DSPFDEPS         = $(GISLIB)
 FORMDEPS         = $(DBMILIB) $(GISLIB)
-G3DDEPS          = $(RASTERLIB) $(GISLIB) $(XDRLIB)
+RASTER3DDEPS          = $(RASTERLIB) $(GISLIB) $(XDRLIB)
 GISDEPS          = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
 GMATHDEPS        = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB)
-GPDEDEPS         = $(G3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(MATHLIB)
+GPDEDEPS         = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(MATHLIB)
 GPROJDEPS        = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
 HTMLDRIVERDEPS   = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
 IMAGERYDEPS      = $(GISLIB) $(MATHLIB)
@@ -206,9 +206,9 @@ INTERPFLDEPS     = $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(INTERPDATALIB) $(QTREEL
 #IORTHODEPS       = $(IMAGERYLIB) $(GISLIB)
 LIDARDEPS        = $(VECTORLIB) $(DBMILIB) $(GMATHLIB) $(RASTERLIB) $(SEGMENTLIB) $(GISLIB) $(MATHLIB)
 LRSDEPS          = $(DBMILIB) $(GISLIB)
-MANAGEDEPS       = $(G3DLIB) $(VECTORLIB) $(GISLIB)
+MANAGEDEPS       = $(RASTER3DLIB) $(VECTORLIB) $(GISLIB)
 NVIZDEPS         = $(OGSFLIB) $(GISLIB) $(OPENGLLIB)
-OGSFDEPS         = $(BITMAPLIB) $(G3DLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(TIFFLIBPATH) $(TIFFLIB) $(OPENGLLIB) $(OPENGLULIB) $(MATHLIB)
+OGSFDEPS         = $(BITMAPLIB) $(RASTER3DLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(TIFFLIBPATH) $(TIFFLIB) $(OPENGLLIB) $(OPENGLULIB) $(MATHLIB)
 PNGDRIVERDEPS    = $(DRIVERLIB) $(GISLIB) $(PNGLIB) $(MATHLIB)
 PSDRIVERDEPS     = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
 RASTERDEPS       = $(GISLIB) $(XDRLIB) $(SOCKLIB) $(MATHLIB)

include/gsurf.h

@@ -112,7 +112,7 @@
 #define LT_SHOW_LABELS   0x00002000
 
 /* types of volume files */
-#define VOL_FTYPE_G3D        0
+#define VOL_FTYPE_RASTER3D        0
 
 /* types of volume values */
 #define VOL_DTYPE_FLOAT     0

include/raster3d.h

@@ -4,44 +4,44 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 
-#define G3D_TILE_SAME_AS_FILE 2
-
-#define G3D_NO_COMPRESSION 0
-#define G3D_COMPRESSION 1
-
-#define G3D_USE_LZW 1
-#define G3D_NO_LZW 0
-
-#define G3D_USE_RLE 1
-#define G3D_NO_RLE 0
-
-#define G3D_MAX_PRECISION -1
-
-#define G3D_NO_CACHE 0
-#define G3D_USE_CACHE_DEFAULT -1
-#define G3D_USE_CACHE_X -2
-#define G3D_USE_CACHE_Y -3
-#define G3D_USE_CACHE_Z -4
-#define G3D_USE_CACHE_XY -5
-#define G3D_USE_CACHE_XZ -6
-#define G3D_USE_CACHE_YZ -7
-#define G3D_USE_CACHE_XYZ -8
-
-#define G3D_DEFAULT_WINDOW NULL
-
-#define G3D_DIRECTORY      "grid3"
-#define G3D_CELL_ELEMENT   "cell"
-#define G3D_CATS_ELEMENT   "cats"
-#define G3D_RANGE_ELEMENT  "range"
-#define G3D_HEADER_ELEMENT "cellhd"
-#define G3D_HISTORY_ELEMENT "hist"
-#define G3D_COLOR_ELEMENT  "color"
-#define G3D_COLOR2_DIRECTORY  "colr2"
-#define G3D_MASK_MAP       "G3D_MASK"
-#define G3D_WINDOW_ELEMENT   "WIND3"
-#define G3D_DEFAULT_WINDOW_ELEMENT   "DEFAULT_WIND3"
-#define G3D_WINDOW_DATABASE "windows3d"
-#define G3D_PERMANENT_MAPSET "PERMANENT"
+#define RASTER3D_TILE_SAME_AS_FILE 2
+
+#define RASTER3D_NO_COMPRESSION 0
+#define RASTER3D_COMPRESSION 1
+
+#define RASTER3D_USE_LZW 1
+#define RASTER3D_NO_LZW 0
+
+#define RASTER3D_USE_RLE 1
+#define RASTER3D_NO_RLE 0
+
+#define RASTER3D_MAX_PRECISION -1
+
+#define RASTER3D_NO_CACHE 0
+#define RASTER3D_USE_CACHE_DEFAULT -1
+#define RASTER3D_USE_CACHE_X -2
+#define RASTER3D_USE_CACHE_Y -3
+#define RASTER3D_USE_CACHE_Z -4
+#define RASTER3D_USE_CACHE_XY -5
+#define RASTER3D_USE_CACHE_XZ -6
+#define RASTER3D_USE_CACHE_YZ -7
+#define RASTER3D_USE_CACHE_XYZ -8
+
+#define RASTER3D_DEFAULT_WINDOW NULL
+
+#define RASTER3D_DIRECTORY      "grid3"
+#define RASTER3D_CELL_ELEMENT   "cell"
+#define RASTER3D_CATS_ELEMENT   "cats"
+#define RASTER3D_RANGE_ELEMENT  "range"
+#define RASTER3D_HEADER_ELEMENT "cellhd"
+#define RASTER3D_HISTORY_ELEMENT "hist"
+#define RASTER3D_COLOR_ELEMENT  "color"
+#define RASTER3D_COLOR2_DIRECTORY  "colr2"
+#define RASTER3D_MASK_MAP       "RASTER3D_MASK"
+#define RASTER3D_WINDOW_ELEMENT   "WIND3"
+#define RASTER3D_DEFAULT_WINDOW_ELEMENT   "DEFAULT_WIND3"
+#define RASTER3D_WINDOW_DATABASE "windows3d"
+#define RASTER3D_PERMANENT_MAPSET "PERMANENT"
 
 /*---------------------------------------------------------------------------*/
 
@@ -60,17 +60,17 @@ typedef struct
     int proj;			/* Projection (see gis.h) */
     int zone;			/* Projection zone (see gis.h) */
 
-} G3D_Region;
+} RASTER3D_Region;
 
 /*---------------------------------------------------------------------------*/
 
-struct G3D_Map;
+struct RASTER3D_Map;
 
-typedef void resample_fn(struct G3D_Map *, int, int, int, void *, int);
+typedef void resample_fn(struct RASTER3D_Map *, int, int, int, void *, int);
 
 /*---------------------------------------------------------------------------*/
 
-typedef struct G3D_Map
+typedef struct RASTER3D_Map
 {
 
     char *fileName;
@@ -78,13 +78,13 @@ typedef struct G3D_Map
     char *mapset;
 
     /* operation performed on map */
-    int operation;		/* G3D_WRITE_DATA or G3D_READ_DATA */
+    int operation;		/* RASTER3D_WRITE_DATA or RASTER3D_READ_DATA */
 
     /* region */
-    G3D_Region region;
+    RASTER3D_Region region;
 
     /* window for map */
-    G3D_Region window;
+    RASTER3D_Region window;
 
     /* resmapling function used for map. default is nearest neighbor */
     resample_fn *resampleFun;
@@ -107,12 +107,12 @@ typedef struct G3D_Map
     int type;			/* DCELL_TYPE or FCELL_TYPE */
 
     /* data concering the compression */
-    int precision;		/* G3D_MAX_PRECISION or, 0 .. 23 for float, 
+    int precision;		/* RASTER3D_MAX_PRECISION or, 0 .. 23 for float, 
 				   0 .. 52 for double */
-    int compression;		/* G3D_NO_COMPRESSION or G3D_USE_COMPRESSION */
-    int useLzw;			/* G3D_USE_LZW or G3D_NO_LZW */
-    int useRle;			/* G3D_USE_RLE or G3D_NO_RLE */
-    int useXdr;			/* G3D_USE_XDR or G3D_NO_XDR */
+    int compression;		/* RASTER3D_NO_COMPRESSION or RASTER3D_USE_COMPRESSION */
+    int useLzw;			/* RASTER3D_USE_LZW or RASTER3D_NO_LZW */
+    int useRle;			/* RASTER3D_USE_RLE or RASTER3D_NO_RLE */
+    int useXdr;			/* RASTER3D_USE_XDR or RASTER3D_NO_XDR */
 
     /* pointer to first tile in file */
     int offset;
@@ -130,8 +130,8 @@ typedef struct G3D_Map
     /* pointer to the last entry in the file */
     int fileEndPtr;
 
-    /* indicates if index is stored in file; used for G3D_READ_DATA only */
-    int hasIndex;		/* G3D_HAS_INDEX or G3D_NO_INDEX */
+    /* indicates if index is stored in file; used for RASTER3D_READ_DATA only */
+    int hasIndex;		/* RASTER3D_HAS_INDEX or RASTER3D_NO_INDEX */
 
     /* information concerning internal storage of data */
 
@@ -182,7 +182,7 @@ typedef struct G3D_Map
 
     int useMask;		/* 1 if mask is used; 0 otherwise */
 
-} G3D_Map;
+} RASTER3D_Map;
 
 /*---------------------------------------------------------------------------*/
 
@@ -217,7 +217,7 @@ typedef struct
     void *hash;			/* ptr to hashTable used to relate external names to
 				   internal indices (elts) */
 
-} G3D_cache;
+} RASTER3D_cache;
 
 /*---------------------------------------------------------------------------*/
 

include/raster3ddefs.h

@@ -2,28 +2,28 @@
 #define GRASS_RASTER3DDEFS_H
 
 /* cache.c */
-void G3d_cache_reset(G3D_cache *);
-void G3d_cache_dispose(G3D_cache *);
+void G3d_cache_reset(RASTER3D_cache *);
+void G3d_cache_dispose(RASTER3D_cache *);
 void *G3d_cache_new(int, int, int, write_fn *, void *, read_fn *, void *);
-void G3d_cache_set_removeFun(G3D_cache *, write_fn *, void *);
-void G3d_cache_set_loadFun(G3D_cache *, read_fn *, void *);
+void G3d_cache_set_removeFun(RASTER3D_cache *, write_fn *, void *);
+void G3d_cache_set_loadFun(RASTER3D_cache *, read_fn *, void *);
 void *G3d_cache_new_read(int, int, int, read_fn *, void *);
-int G3d_cache_lock(G3D_cache *, int);
-void G3d_cache_lock_intern(G3D_cache *, int);
-int G3d_cache_unlock(G3D_cache *, int);
-int G3d_cache_unlock_all(G3D_cache *);
-int G3d_cache_lock_all(G3D_cache *);
-void G3d_cache_autolock_on(G3D_cache *);
-void G3d_cache_autolock_off(G3D_cache *);
-void G3d_cache_set_minUnlock(G3D_cache *, int);
-int G3d_cache_remove_elt(G3D_cache *, int);
-int G3d_cache_flush(G3D_cache *, int);
-int G3d_cache_remove_all(G3D_cache *);
-int G3d_cache_flush_all(G3D_cache *);
-void *G3d_cache_elt_ptr(G3D_cache *, int);
-int G3d_cache_load(G3D_cache *, int);
-int G3d_cache_get_elt(G3D_cache *, int, void *);
-int G3d_cache_put_elt(G3D_cache *, int, const void *);
+int G3d_cache_lock(RASTER3D_cache *, int);
+void G3d_cache_lock_intern(RASTER3D_cache *, int);
+int G3d_cache_unlock(RASTER3D_cache *, int);
+int G3d_cache_unlock_all(RASTER3D_cache *);
+int G3d_cache_lock_all(RASTER3D_cache *);
+void G3d_cache_autolock_on(RASTER3D_cache *);
+void G3d_cache_autolock_off(RASTER3D_cache *);
+void G3d_cache_set_minUnlock(RASTER3D_cache *, int);
+int G3d_cache_remove_elt(RASTER3D_cache *, int);
+int G3d_cache_flush(RASTER3D_cache *, int);
+int G3d_cache_remove_all(RASTER3D_cache *);
+int G3d_cache_flush_all(RASTER3D_cache *);
+void *G3d_cache_elt_ptr(RASTER3D_cache *, int);
+int G3d_cache_load(RASTER3D_cache *, int);
+int G3d_cache_get_elt(RASTER3D_cache *, int, void *);
+int G3d_cache_put_elt(RASTER3D_cache *, int, const void *);
 
 /* cachehash.c */
 void G3d_cache_hash_reset(G3d_cache_hash *);
@@ -64,16 +64,16 @@ void *G3d_realloc(void *, int);
 void G3d_free(void *);
 
 /* g3dcache.c */
-int G3d_initCache(G3D_Map *, int);
-int G3d_disposeCache(G3D_Map *);
-int G3d_flushAllTiles(G3D_Map *);
+int G3d_initCache(RASTER3D_Map *, int);
+int G3d_disposeCache(RASTER3D_Map *);
+int G3d_flushAllTiles(RASTER3D_Map *);
 
 /* g3dcats.c */
 int G3d_writeCats(const char *, struct Categories *);
 int G3d_readCats(const char *, const char *, struct Categories *);
 
 /* g3dclose.c */
-int G3d_closeCell(G3D_Map *);
+int G3d_closeCell(RASTER3D_Map *);
 
 /* g3dcolor.c */
 int G3d_removeColor(const char *);
@@ -114,10 +114,10 @@ int G3d_isXdrNullDouble(const double *);
 void G3d_setXdrNullNum(void *, int);
 void G3d_setXdrNullDouble(double *);
 void G3d_setXdrNullFloat(float *);
-int G3d_initFpXdr(G3D_Map *, int);
-int G3d_initCopyToXdr(G3D_Map *, int);
+int G3d_initFpXdr(RASTER3D_Map *, int);
+int G3d_initCopyToXdr(RASTER3D_Map *, int);
 int G3d_copyToXdr(const void *, int);
-int G3d_initCopyFromXdr(G3D_Map *, int);
+int G3d_initCopyFromXdr(RASTER3D_Map *, int);
 int G3d_copyFromXdr(int, void *);
 
 /* g3dhistory.c */
@@ -151,15 +151,15 @@ int G3d_maskClose(void);
 int G3d_maskFileExists(void);
 int G3d_maskOpenOld(void);
 int G3d_maskReopen(int);
-int G3d_isMasked(G3D_Map *, int, int, int);
-void G3d_maskNum(G3D_Map *, int, int, int, void *, int);
-void G3d_maskFloat(G3D_Map *, int, int, int, float *);
-void G3d_maskDouble(G3D_Map *, int, int, int, double *);
-void G3d_maskTile(G3D_Map *, int, void *, int);
-void G3d_maskOn(G3D_Map *);
-void G3d_maskOff(G3D_Map *);
-int G3d_maskIsOn(G3D_Map *);
-int G3d_maskIsOff(G3D_Map *);
+int G3d_isMasked(RASTER3D_Map *, int, int, int);
+void G3d_maskNum(RASTER3D_Map *, int, int, int, void *, int);
+void G3d_maskFloat(RASTER3D_Map *, int, int, int, float *);
+void G3d_maskDouble(RASTER3D_Map *, int, int, int, double *);
+void G3d_maskTile(RASTER3D_Map *, int, void *, int);
+void G3d_maskOn(RASTER3D_Map *);
+void G3d_maskOff(RASTER3D_Map *);
+int G3d_maskIsOn(RASTER3D_Map *);
+int G3d_maskIsOff(RASTER3D_Map *);
 const char *G3d_maskFile(void);
 int G3d_maskMapExists(void);
 
@@ -181,12 +181,12 @@ int G3d_isNullValueNum(const void *, int);
 void G3d_setNullValue(void *, int, int);
 
 /* g3dopen2.c */
-void *G3d_openNewParam(const char *, int , int, G3D_Region *, int, int, int, int, int, int, int);
+void *G3d_openNewParam(const char *, int , int, RASTER3D_Region *, int, int, int, int, int, int, int);
 /* g3dopen.c */
 void *G3d_openCellOldNoHeader(const char *, const char *);
-void *G3d_openCellOld(const char *, const char *, G3D_Region *, int, int);
-void *G3d_openCellNew(const char *, int, int, G3D_Region *);
-void *G3d_openNewOptTileSize(const char *, int , G3D_Region * , int , int );
+void *G3d_openCellOld(const char *, const char *, RASTER3D_Region *, int, int);
+void *G3d_openCellNew(const char *, int, int, RASTER3D_Region *);
+void *G3d_openNewOptTileSize(const char *, int , RASTER3D_Region * , int , int );
 
 /* g3dparam.c */
 void G3d_setStandard3dInputParams(void);
@@ -196,32 +196,32 @@ void G3d_setWindowParams(void);
 char *G3d_getWindowParams(void);
 
 /* g3drange.c */
-void G3d_range_updateFromTile(G3D_Map *, const void *, int, int, int, int,
+void G3d_range_updateFromTile(RASTER3D_Map *, const void *, int, int, int, int,
 			      int, int, int, int);
 int G3d_readRange(const char *, const char *, struct FPRange *);
-int G3d_range_load(G3D_Map *);
-void G3d_range_min_max(G3D_Map *, double *, double *);
-int G3d_range_write(G3D_Map *);
-int G3d_range_init(G3D_Map *);
+int G3d_range_load(RASTER3D_Map *);
+void G3d_range_min_max(RASTER3D_Map *, double *, double *);
+int G3d_range_write(RASTER3D_Map *);
+int G3d_range_init(RASTER3D_Map *);
 
 /* g3dregion.c */
-void G3d_getRegionValue(G3D_Map *, double, double, double, void *, int);
-void G3d_adjustRegion(G3D_Region *);
-void G3d_regionCopy(G3D_Region *, G3D_Region *);
-void G3d_incorporate2dRegion(struct Cell_head *, G3D_Region *);
-void G3d_regionFromToCellHead(struct Cell_head *, G3D_Region *);
-void G3d_adjustRegionRes(G3D_Region *);
-void G3d_extract2dRegion(G3D_Region *, struct Cell_head *);
-void G3d_regionToCellHead(G3D_Region *, struct Cell_head *);
-int G3d_readRegionMap(const char *, const char *, G3D_Region *);
-int G3d_isValidLocation(G3D_Region *, double, double, double);
-void G3d_location2coord(G3D_Region *, double, double, double, int *, int *, int *);
-void G3d_location2coord2(G3D_Region *, double, double, double, int *, int *, int *);
-void G3d_coord2location(G3D_Region *, double, double, double, double *, double *, double *);
+void G3d_getRegionValue(RASTER3D_Map *, double, double, double, void *, int);
+void G3d_adjustRegion(RASTER3D_Region *);
+void G3d_regionCopy(RASTER3D_Region *, RASTER3D_Region *);
+void G3d_incorporate2dRegion(struct Cell_head *, RASTER3D_Region *);
+void G3d_regionFromToCellHead(struct Cell_head *, RASTER3D_Region *);
+void G3d_adjustRegionRes(RASTER3D_Region *);
+void G3d_extract2dRegion(RASTER3D_Region *, struct Cell_head *);
+void G3d_regionToCellHead(RASTER3D_Region *, struct Cell_head *);
+int G3d_readRegionMap(const char *, const char *, RASTER3D_Region *);
+int G3d_isValidLocation(RASTER3D_Region *, double, double, double);
+void G3d_location2coord(RASTER3D_Region *, double, double, double, int *, int *, int *);
+void G3d_location2coord2(RASTER3D_Region *, double, double, double, int *, int *, int *);
+void G3d_coord2location(RASTER3D_Region *, double, double, double, double *, double *, double *);
 /* g3dresample.c */
-void G3d_nearestNeighbor(G3D_Map *, int, int, int, void *, int);
-void G3d_setResamplingFun(G3D_Map *, void (*)());
-void G3d_getResamplingFun(G3D_Map *, void (**)());
+void G3d_nearestNeighbor(RASTER3D_Map *, int, int, int, void *, int);
+void G3d_setResamplingFun(RASTER3D_Map *, void (*)());
+void G3d_getResamplingFun(RASTER3D_Map *, void (**)());
 void G3d_getNearestNeighborFunPtr(void (**)());
 
 /* g3dvolume.c */
@@ -234,61 +234,61 @@ void G3d_getAlignedVolume(void *, double, double, double, double, double,
 void G3d_makeAlignedVolumeFile(void *, const char *, double, double, double,
 			       double, double, double, int, int, int);
 /* g3dwindow.c */
-void G3d_getValue(G3D_Map *, int, int, int, void *, int);
-float G3d_getFloat(G3D_Map *, int, int, int);
-double G3d_getDouble(G3D_Map *, int, int, int);
-void G3d_getWindowValue(G3D_Map *, double, double, double, void *, int);
+void G3d_getValue(RASTER3D_Map *, int, int, int, void *, int);
+float G3d_getFloat(RASTER3D_Map *, int, int, int);
+double G3d_getDouble(RASTER3D_Map *, int, int, int);
+void G3d_getWindowValue(RASTER3D_Map *, double, double, double, void *, int);
 
 
-G3D_Region *G3d_windowPtr(void);
-void G3d_setWindow(G3D_Region *);
-void G3d_setWindowMap(G3D_Map *, G3D_Region *);
-void G3d_getWindow(G3D_Region *);
+RASTER3D_Region *G3d_windowPtr(void);
+void G3d_setWindow(RASTER3D_Region *);
+void G3d_setWindowMap(RASTER3D_Map *, RASTER3D_Region *);
+void G3d_getWindow(RASTER3D_Region *);
 
 /* g3dwindowio.c */
 void G3d_useWindowParams(void);
-int G3d_readWindow(G3D_Region *, const char *);
+int G3d_readWindow(RASTER3D_Region *, const char *);
 
-/* int G3d_writeWindow (G3D_Region *, char *); */
+/* int G3d_writeWindow (RASTER3D_Region *, char *); */
 /* getblock.c */
-void G3d_getBlockNocache(G3D_Map *, int, int, int, int, int, int, void *,
+void G3d_getBlockNocache(RASTER3D_Map *, int, int, int, int, int, int, void *,
 			 int);
-void G3d_getBlock(G3D_Map *, int, int, int, int, int, int, void *, int);
+void G3d_getBlock(RASTER3D_Map *, int, int, int, int, int, int, void *, int);
 
 /* header.c */
-int G3d_readHeader(G3D_Map *, int *, int *, double *, double *, double *,
+int G3d_readHeader(RASTER3D_Map *, int *, int *, double *, double *, double *,
 		   double *, double *, double *, int *, int *, int *,
 		   double *, double *, double *, int *, int *, int *, int *,
 		   int *, int *, int *, int *, int *, int *, int *, char **);
-int G3d_writeHeader(G3D_Map *, int, int, double, double, double, double,
+int G3d_writeHeader(RASTER3D_Map *, int, int, double, double, double, double,
 		    double, double, int, int, int, double, double, double,
 		    int, int, int, int, int, int, int, int, int, int, int,
 		    char *);
 int G3d_cacheSizeEncode(int, int);
-int G3d__computeCacheSize(G3D_Map *, int);
-int G3d_fillHeader(G3D_Map *, int, int, int, int, int, int, int, int, int,
+int G3d__computeCacheSize(RASTER3D_Map *, int);
+int G3d_fillHeader(RASTER3D_Map *, int, int, int, int, int, int, int, int, int,
 		   int, int, int, int, int, int, int, double, double, double,
 		   double, double, double, int, int, int, double, double,
 		   double, char *);
 /* headerinfo.c */
-void G3d_getCoordsMap(G3D_Map *, int *, int *, int *);
-void G3d_getCoordsMapWindow(G3D_Map *, int *, int *, int *);
-void G3d_getNofTilesMap(G3D_Map *, int *, int *, int *);
-void G3d_getRegionMap(G3D_Map *, double *, double *, double *, double *,
+void G3d_getCoordsMap(RASTER3D_Map *, int *, int *, int *);
+void G3d_getCoordsMapWindow(RASTER3D_Map *, int *, int *, int *);
+void G3d_getNofTilesMap(RASTER3D_Map *, int *, int *, int *);
+void G3d_getRegionMap(RASTER3D_Map *, double *, double *, double *, double *,
 		      double *, double *);
-void G3d_getWindowMap(G3D_Map *, double *, double *, double *, double *,
+void G3d_getWindowMap(RASTER3D_Map *, double *, double *, double *, double *,
 		      double *, double *);
-void G3d_getTileDimensionsMap(G3D_Map *, int *, int *, int *);
-int G3d_tileTypeMap(G3D_Map *);
-int G3d_fileTypeMap(G3D_Map *);
-int G3d_tilePrecisionMap(G3D_Map *);
-int G3d_tileUseCacheMap(G3D_Map *);
-void G3d_printHeader(G3D_Map *);
-void G3d_getRegionStructMap(G3D_Map *, G3D_Region *);
+void G3d_getTileDimensionsMap(RASTER3D_Map *, int *, int *, int *);
+int G3d_tileTypeMap(RASTER3D_Map *);
+int G3d_fileTypeMap(RASTER3D_Map *);
+int G3d_tilePrecisionMap(RASTER3D_Map *);
+int G3d_tileUseCacheMap(RASTER3D_Map *);
+void G3d_printHeader(RASTER3D_Map *);
+void G3d_getRegionStructMap(RASTER3D_Map *, RASTER3D_Region *);
 
 /* index.c */
-int G3d_flushIndex(G3D_Map *);
-int G3d_initIndex(G3D_Map *, int);
+int G3d_flushIndex(RASTER3D_Map *);
+int G3d_initIndex(RASTER3D_Map *, int);
 
 /* retile.c */
 void G3d_retile(void *, const char *, int, int, int);
@@ -299,60 +299,60 @@ void G_rle_encode(char *, char *, int, int);
 void G_rle_decode(char *, char *, int, int, int *, int *);
 
 /* tilealloc.c */
-void *G3d_allocTilesType(G3D_Map *, int, int);
-void *G3d_allocTiles(G3D_Map *, int);
+void *G3d_allocTilesType(RASTER3D_Map *, int, int);
+void *G3d_allocTiles(RASTER3D_Map *, int);
 void G3d_freeTiles(void *);
 
 /* tileio.c */
-void *G3d_getTilePtr(G3D_Map *, int);
-int G3d_tileLoad(G3D_Map *, int);
-int G3d__removeTile(G3D_Map *, int);
-float G3d_getFloatRegion(G3D_Map *, int, int, int);
-double G3d_getDoubleRegion(G3D_Map *, int, int, int);
-void G3d_getValueRegion(G3D_Map *, int, int, int, void *, int);
+void *G3d_getTilePtr(RASTER3D_Map *, int);
+int G3d_tileLoad(RASTER3D_Map *, int);
+int G3d__removeTile(RASTER3D_Map *, int);
+float G3d_getFloatRegion(RASTER3D_Map *, int, int, int);
+double G3d_getDoubleRegion(RASTER3D_Map *, int, int, int);
+void G3d_getValueRegion(RASTER3D_Map *, int, int, int, void *, int);
 
 /* tilemath.c */
-void G3d_computeOptimalTileDimension(G3D_Region *, int, int *, int *, int *, int);
-void G3d_tileIndex2tile(G3D_Map *, int, int *, int *, int *);
-int G3d_tile2tileIndex(G3D_Map *, int, int, int);
-void G3d_tileCoordOrigin(G3D_Map *, int, int, int, int *, int *, int *);
-void G3d_tileIndexOrigin(G3D_Map *, int, int *, int *, int *);
-void G3d_coord2tileCoord(G3D_Map *, int, int, int, int *, int *, int *, int *,
+void G3d_computeOptimalTileDimension(RASTER3D_Region *, int, int *, int *, int *, int);
+void G3d_tileIndex2tile(RASTER3D_Map *, int, int *, int *, int *);
+int G3d_tile2tileIndex(RASTER3D_Map *, int, int, int);
+void G3d_tileCoordOrigin(RASTER3D_Map *, int, int, int, int *, int *, int *);
+void G3d_tileIndexOrigin(RASTER3D_Map *, int, int *, int *, int *);
+void G3d_coord2tileCoord(RASTER3D_Map *, int, int, int, int *, int *, int *, int *,
 			 int *, int *);
-void G3d_coord2tileIndex(G3D_Map *, int, int, int, int *, int *);
-int G3d_coordInRange(G3D_Map *, int, int, int);
-int G3d_tileIndexInRange(G3D_Map *, int);
-int G3d_tileInRange(G3D_Map *, int, int, int);
-int G3d_computeClippedTileDimensions(G3D_Map *, int, int *, int *, int *,
+void G3d_coord2tileIndex(RASTER3D_Map *, int, int, int, int *, int *);
+int G3d_coordInRange(RASTER3D_Map *, int, int, int);
+int G3d_tileIndexInRange(RASTER3D_Map *, int);
+int G3d_tileInRange(RASTER3D_Map *, int, int, int);
+int G3d_computeClippedTileDimensions(RASTER3D_Map *, int, int *, int *, int *,
 				     int *, int *, int *);
 
 /* tilenull.c */
-void G3d_setNullTileType(G3D_Map *, void *, int);
-void G3d_setNullTile(G3D_Map *, void *);
+void G3d_setNullTileType(RASTER3D_Map *, void *, int);
+void G3d_setNullTile(RASTER3D_Map *, void *);
 
 /* tileread.c */
-int G3d_readTile(G3D_Map *, int, void *, int);
-int G3d_readTileFloat(G3D_Map *, int, void *);
-int G3d_readTileDouble(G3D_Map *, int, void *);
-int G3d_lockTile(G3D_Map *, int);
-int G3d_unlockTile(G3D_Map *, int);
-int G3d_unlockAll(G3D_Map *);
-void G3d_autolockOn(G3D_Map *);
-void G3d_autolockOff(G3D_Map *);
-void G3d_minUnlocked(G3D_Map *, int);
-int G3d_beginCycle(G3D_Map *);
-int G3d_endCycle(G3D_Map *);
+int G3d_readTile(RASTER3D_Map *, int, void *, int);
+int G3d_readTileFloat(RASTER3D_Map *, int, void *);
+int G3d_readTileDouble(RASTER3D_Map *, int, void *);
+int G3d_lockTile(RASTER3D_Map *, int);
+int G3d_unlockTile(RASTER3D_Map *, int);
+int G3d_unlockAll(RASTER3D_Map *);
+void G3d_autolockOn(RASTER3D_Map *);
+void G3d_autolockOff(RASTER3D_Map *);
+void G3d_minUnlocked(RASTER3D_Map *, int);
+int G3d_beginCycle(RASTER3D_Map *);
+int G3d_endCycle(RASTER3D_Map *);
 
 /* tilewrite.c */
-int G3d_writeTile(G3D_Map *, int, const void *, int);
-int G3d_writeTileFloat(G3D_Map *, int, const void *);
-int G3d_writeTileDouble(G3D_Map *, int, const void *);
-int G3d_flushTile(G3D_Map *, int);
-int G3d_flushTileCube(G3D_Map *, int, int, int, int, int, int);
-int G3d_flushTilesInCube(G3D_Map *, int, int, int, int, int, int);
-int G3d_putFloat(G3D_Map *, int, int, int, float);
-int G3d_putDouble(G3D_Map *, int, int, int, double);
-int G3d_putValue(G3D_Map *, int, int, int, const void *, int);
+int G3d_writeTile(RASTER3D_Map *, int, const void *, int);
+int G3d_writeTileFloat(RASTER3D_Map *, int, const void *);
+int G3d_writeTileDouble(RASTER3D_Map *, int, const void *);
+int G3d_flushTile(RASTER3D_Map *, int);
+int G3d_flushTileCube(RASTER3D_Map *, int, int, int, int, int, int);
+int G3d_flushTilesInCube(RASTER3D_Map *, int, int, int, int, int, int);
+int G3d_putFloat(RASTER3D_Map *, int, int, int, float);
+int G3d_putDouble(RASTER3D_Map *, int, int, int, double);
+int G3d_putValue(RASTER3D_Map *, int, int, int, const void *, int);
 
 /* writeascii.c */
 void G3d_writeAscii(void *, const char *);

lib/dspf/viz.h

@@ -28,7 +28,7 @@ typedef struct
 typedef struct
 {
     int token;			/*type of file */
-    void *g3mapin, *g3mapout;	/* G3D_Map */
+    void *g3mapin, *g3mapout;	/* RASTER3D_Map */
     FILE *datainfp, *dataoutfp;
     FILE *dspfinfp, *dspfoutfp;
     int xdim, ydim, zdim;

lib/gpde/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB) $(G3DLIB) $(GMATHLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(RASTERLIB) $(RASTER3DLIB) $(GMATHLIB) $(MATHLIB)
 
 LIB_NAME = $(GPDE_LIBNAME)
 

lib/gpde/N_arrays_io.c

@@ -258,7 +258,7 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d * array,
     int x, y, z, cols, rows, depths, type;
     double d1 = 0, f1 = 0;
     N_array_3d *data = array;
-    G3D_Region region;
+    RASTER3D_Region region;
 
 
     /*get the current region */
@@ -274,8 +274,8 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d * array,
 
     /*Open all maps with default region */
     map =
-	G3d_openCellOld(name, G_find_grid3(name, ""), G3D_DEFAULT_WINDOW,
-			G3D_TILE_SAME_AS_FILE, G3D_USE_CACHE_DEFAULT);
+	G3d_openCellOld(name, G_find_grid3(name, ""), RASTER3D_DEFAULT_WINDOW,
+			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)
 	G3d_fatalError(_("Error opening g3d map <%s>"), name);
@@ -389,7 +389,7 @@ void N_write_array_3d_to_rast3d(N_array_3d * array, char *name, int mask)
     int x, y, z, cols, rows, depths, count, type;
     double d1 = 0.0, f1 = 0.0;
     N_array_3d *data = array;
-    G3D_Region region;
+    RASTER3D_Region region;
 
     /*get the current region */
     G3d_getWindow(&region);
@@ -412,9 +412,9 @@ void N_write_array_3d_to_rast3d(N_array_3d * array, char *name, int mask)
 
     /*Open the new map */
     if (type == DCELL_TYPE)
-        map = G3d_openNewOptTileSize(name, G3D_USE_CACHE_XY, &region, DCELL_TYPE, 32);
+        map = G3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, &region, DCELL_TYPE, 32);
     else if (type == FCELL_TYPE)
-        map = G3d_openNewOptTileSize(name, G3D_USE_CACHE_XY, &region, FCELL_TYPE, 32);
+        map = G3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, &region, FCELL_TYPE, 32);
 
     if (map == NULL)
 	G3d_fatalError(_("Error opening g3d map <%s>"), name);

lib/gpde/N_geom.c

@@ -65,12 +65,12 @@ void N_free_geom_data(N_geom_data * geom)
  * If the projection is not planimetric, a double array will be created based on the 
  * number of rows of the provided region
  *
- * \param region3d G3D_Region *
+ * \param region3d RASTER3D_Region *
  * \param geodata N_geom_data * - if a NULL pointer is given, a new structure will be allocatet and returned
  *
  * \return N_geom_data *
  * */
-N_geom_data *N_init_geom_data_3d(G3D_Region * region3d, N_geom_data * geodata)
+N_geom_data *N_init_geom_data_3d(RASTER3D_Region * region3d, N_geom_data * geodata)
 {
     N_geom_data *geom = geodata;
     struct Cell_head region2d;

lib/gpde/N_pde.h

@@ -120,7 +120,7 @@ typedef struct
 
 extern N_geom_data *N_alloc_geom_data(void);
 extern void N_free_geom_data(N_geom_data * geodata);
-extern N_geom_data *N_init_geom_data_3d(G3D_Region * region3d, N_geom_data * geodata);
+extern N_geom_data *N_init_geom_data_3d(RASTER3D_Region * region3d, N_geom_data * geodata);
 extern N_geom_data *N_init_geom_data_2d(struct Cell_head *region, N_geom_data * geodata);
 extern double N_get_geom_data_area_of_cell(N_geom_data * geom, int row);
 

lib/gpde/gpdelib.dox

@@ -547,8 +547,8 @@ N_geom_data *#N_alloc_geom_data (void);
 Releasing memory<br>
 void #N_free_geom_data (N_geom_data *geodata);
 <p>
-Initialize the N_geom_data structure with a G3D_Region<br>
-N_geom_data *#N_init_geom_data_3d(G3D_Region * region3d, N_geom_data * geodata);
+Initialize the N_geom_data structure with a RASTER3D_Region<br>
+N_geom_data *#N_init_geom_data_3d(RASTER3D_Region * region3d, N_geom_data * geodata);
 <p>
 Initialize the N_geom_data structure with a 2d region<br>
 N_geom_data *#N_init_geom_data_2d(struct Cell_head * region, N_geom_data * geodata);

lib/gpde/test/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../../..
 
 PGM=test.gpde.lib
 
-LIBES = $(GISLIB) $(G3DLIB) $(GPDELIB) $(GMATHLIB)
-DEPENDENCIES = $(GISDEP) $(G3DDEP) $(GPDEDEP)
+LIBES = $(GISLIB) $(RASTER3DLIB) $(GPDELIB) $(GMATHLIB)
+DEPENDENCIES = $(GISDEP) $(RASTER3DDEP) $(GPDEDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

lib/gpde/test/test_arrays.c

@@ -611,7 +611,7 @@ int test_array_3d(void)
 {
     int sum = 0, res = 0;
     char buff[1024];
-    G3D_Region region;
+    RASTER3D_Region region;
 
     N_array_3d *data1;
     N_array_3d *data11;

lib/gpde/test/test_geom.c

@@ -52,7 +52,7 @@ int unit_test_geom_data(void)
 int test_geom_data(void)
 {
     struct Cell_head region2d;
-    G3D_Region region3d;
+    RASTER3D_Region region3d;
     N_geom_data *geom = NULL;
     int sum = 0, i;
     double area = 0;

lib/gpde/test/test_main.c

@@ -72,7 +72,7 @@ void set_params(void)
 }
 
 /* ************************************************************************* */
-/* Main function, open the G3D map and create the raster maps ************** */
+/* Main function, open the RASTER3D map and create the raster maps ************** */
 /* ************************************************************************* */
 int main(int argc, char *argv[])
 {

lib/manage/Makefile

@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../..
 
 LIB = MANAGE
-DEPENDENCIES = $(GISDEP) $(VECTDEP) $(G3DDEP)
+DEPENDENCIES = $(GISDEP) $(VECTDEP) $(RASTER3DDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/ogsf/GVL2.c

@@ -26,7 +26,7 @@
 static int Vol_ID[MAX_VOLS];
 static int Next_vol = 0;
 
-static G3D_Region wind3;
+static RASTER3D_Region wind3;
 static double Region[6];
 
 /*!
@@ -74,7 +74,7 @@ int GVL_get_region(float *n, float *s, float *w, float *e, float *t, float *b)
 
    \todo gvl_file.c use this - change
 
-   \return pointer to G3D_Region struct (static)
+   \return pointer to RASTER3D_Region struct (static)
  */
 void *GVL_get_window()
 {
@@ -247,7 +247,7 @@ int GVL_load_vol(int id, const char *filename)
 
     G_message(_("Loading 3d raster map <%s>..."), filename);
 
-    if (0 > (handle = gvl_file_newh(filename, VOL_FTYPE_G3D)))
+    if (0 > (handle = gvl_file_newh(filename, VOL_FTYPE_RASTER3D)))
 	return (-1);
 
     gvl->hfile = handle;

lib/ogsf/gvl.c

@@ -694,7 +694,7 @@ int gvl_isosurf_set_att_map(geovol_isosurf * isosurf, int desc,
     G_debug(5, "gvl_isosurf_set_att_map(): att=%d map=%s", desc, filename);
 
     if (isosurf) {
-	if (0 > (hfile = gvl_file_newh(filename, VOL_FTYPE_G3D)))
+	if (0 > (hfile = gvl_file_newh(filename, VOL_FTYPE_RASTER3D)))
 	    return (-1);
 
 	gvl_isosurf_set_att_src(isosurf, desc, MAP_ATT);

lib/ogsf/gvl_file.c

@@ -70,7 +70,7 @@ int close_g3d_file(void *);
 static int init_volfiles(void)
 {
     int i;
-    G3D_Region *w3;
+    RASTER3D_Region *w3;
 
     for (i = 0; i < MAX_VOL_FILES; i++) {
 	/* avoiding dynamic allocation */
@@ -233,7 +233,7 @@ void gvl_file_get_min_max(geovol_file * vf, double *min, double *max)
 void *open_volfile(const char *name, IFLAG file_type, IFLAG * data_type,
 		   double *min, double *max)
 {
-    if (file_type == VOL_FTYPE_G3D) {
+    if (file_type == VOL_FTYPE_RASTER3D) {
 	return open_g3d_file(name, data_type, min, max);
     }
 
@@ -251,7 +251,7 @@ void *open_volfile(const char *name, IFLAG file_type, IFLAG * data_type,
  */
 int close_volfile(void *map, IFLAG type)
 {
-    if (type == VOL_FTYPE_G3D) {
+    if (type == VOL_FTYPE_RASTER3D) {
 	return close_g3d_file(map);
     }
 
@@ -401,7 +401,7 @@ int gvl_file_free_datah(int id)
 }
 
 /******************************************************************/
-/* reading from G3D raster volume files */
+/* reading from RASTER3D raster volume files */
 
 /******************************************************************/
 
@@ -431,8 +431,8 @@ void *open_g3d_file(const char *filename, IFLAG * type, double *min,
 
     /* open g3d file */
     map =
-	G3d_openCellOld(filename, mapset, G3D_DEFAULT_WINDOW,
-			G3D_TILE_SAME_AS_FILE, G3D_USE_CACHE_DEFAULT);
+	G3d_openCellOld(filename, mapset, RASTER3D_DEFAULT_WINDOW,
+			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
     if (!map) {
 	G_warning(_("Unable to open 3D raster map <%s>"), filename);
 	return (NULL);
@@ -467,9 +467,9 @@ void *open_g3d_file(const char *filename, IFLAG * type, double *min,
 int close_g3d_file(void *map)
 {
     /* close opened g3d file */
-    if (G3d_closeCell((G3D_Map *) map) != 1) {
+    if (G3d_closeCell((RASTER3D_Map *) map) != 1) {
 	G_warning(_("Unable to close 3D raster map <%s>"),
-		  ((G3D_Map *) map)->fileName);
+		  ((RASTER3D_Map *) map)->fileName);
 	return (-1);
     }
 
@@ -689,8 +689,8 @@ int get_buff_value(IFLAG type, void *data, int offset, void *value)
 int get_direct_value(geovol_file * vf, int x, int y, int z, void *value)
 {
     switch (vf->file_type) {
-	/* G3D file type */
-    case (VOL_FTYPE_G3D):
+	/* RASTER3D file type */
+    case (VOL_FTYPE_RASTER3D):
 	if (0 > read_g3d_value(vf->data_type, vf->map, x, y, z, value))
 	    return (-1);
 	break;
@@ -766,8 +766,8 @@ int free_vol_buff(geovol_file * vf)
 int read_vol(geovol_file * vf)
 {
     switch (vf->file_type) {
-	/* G3D file format */
-    case (VOL_FTYPE_G3D):
+	/* RASTER3D file format */
+    case (VOL_FTYPE_RASTER3D):
 	if (0 > read_g3d_vol(vf->data_type, vf->map, vf->buff))
 	    return (-1);
 	break;
@@ -876,8 +876,8 @@ int read_slice(geovol_file * vf, int s, int l)
     slice_data *sd = (slice_data *) vf->buff;
 
     switch (vf->file_type) {
-	/* G3D file format */
-    case (VOL_FTYPE_G3D):
+	/* RASTER3D file format */
+    case (VOL_FTYPE_RASTER3D):
 	if (0 > read_g3d_slice(vf->data_type, vf->map, l, sd->slice[s]))
 	    return (-1);
 	break;
@@ -1088,8 +1088,8 @@ int gvl_file_get_value(geovol_file * vf, int x, int y, int z, void *value)
 int gvl_file_is_null_value(geovol_file * vf, void *value)
 {
     switch (vf->file_type) {
-	/* G3D file format */
-    case (VOL_FTYPE_G3D):
+	/* RASTER3D file format */
+    case (VOL_FTYPE_RASTER3D):
 	return is_null_g3d_value(vf->file_type, value);
 	break;
 	/* unsupported file format */

lib/python/ctypes/Makefile

@@ -10,7 +10,7 @@ DOXNAME=
 DOXINPUT=grasspython.dox
 
 MODULES = date gis raster gmath proj imagery vector display stats \
-	dbmi g3d arraystats cluster trans vedit ogsf nviz
+	dbmi raster3d arraystats cluster trans vedit ogsf nviz
 
 date_LIBS       = $(DATETIMELIB)
 gis_LIBS      = $(GISLIB)
@@ -22,7 +22,7 @@ vector_LIBS     = $(VECTLIB)
 display_LIBS    = $(DISPLAYLIB)
 stats_LIBS      = $(STATSLIB)
 dbmi_LIBS       = $(DBMILIB)
-g3d_LIBS        = $(G3DLIB)
+raster3d_LIBS   = $(RASTER3DLIB)
 arraystats_LIBS = $(ARRAYSTATSLIB)
 cluster_LIBS    = $(CLUSTERLIB)
 trans_LIBS      = $(TRANSLIB)
@@ -40,7 +40,7 @@ vector_HDRS     = vector.h vect/dig_structs.h vect/dig_defines.h
 display_HDRS    = display.h
 stats_HDRS      = stats.h
 dbmi_HDRS       = dbmi.h dbmidefs.h
-g3d_HDRS        = G3d.h
+raster3d_HDRS   = raster3d.h
 arraystats_HDRS = arraystats.h
 cluster_HDRS    = cluster.h
 trans_HDRS      = transform.h

lib/raster3d/G3d.h_unused

@@ -1,42 +1,42 @@
-#define G3D_FLOAT 0
-#define G3D_DOUBLE 1
-#define G3D_TILE_SAME_AS_FILE 2
-
-#define G3D_NO_COMPRESSION 0
-#define G3D_COMPRESSION 1
-
-#define G3D_USE_LZW 1
-#define G3D_NO_LZW 0
-
-#define G3D_USE_RLE 1
-#define G3D_NO_RLE 0
-
-#define G3D_MAX_PRECISION -1
-
-#define G3D_NO_CACHE 0
-#define G3D_USE_CACHE_DEFAULT -1
-#define G3D_USE_CACHE_X -2
-#define G3D_USE_CACHE_Y -3
-#define G3D_USE_CACHE_Z -4
-#define G3D_USE_CACHE_XY -5
-#define G3D_USE_CACHE_XZ -6
-#define G3D_USE_CACHE_YZ -7
-#define G3D_USE_CACHE_XYZ -8
-
-#define G3D_DEFAULT_WINDOW NULL
-
-#define G3D_DIRECTORY      "grid3"
-#define G3D_CELL_ELEMENT   "cell"
-#define G3D_CATS_ELEMENT   "cats"
-#define G3D_RANGE_ELEMENT  "range"
-#define G3D_HEADER_ELEMENT "cellhd"
-#define G3D_COLOR_ELEMENT  "color"
-#define G3D_COLOR2_DIRECTORY  "colr2"
-#define G3D_MASK_MAP       "G3D_MASK"
-#define G3D_WINDOW_ELEMENT   "WIND3"
-#define G3D_DEFAULT_WINDOW_ELEMENT   "DEFAULT_WIND3"
-#define G3D_WINDOW_DATABASE "windows3d"
-#define G3D_PERMANENT_MAPSET "PERMANENT"
+#define RASTER3D_FLOAT 0
+#define RASTER3D_DOUBLE 1
+#define RASTER3D_TILE_SAME_AS_FILE 2
+
+#define RASTER3D_NO_COMPRESSION 0
+#define RASTER3D_COMPRESSION 1
+
+#define RASTER3D_USE_LZW 1
+#define RASTER3D_NO_LZW 0
+
+#define RASTER3D_USE_RLE 1
+#define RASTER3D_NO_RLE 0
+
+#define RASTER3D_MAX_PRECISION -1
+
+#define RASTER3D_NO_CACHE 0
+#define RASTER3D_USE_CACHE_DEFAULT -1
+#define RASTER3D_USE_CACHE_X -2
+#define RASTER3D_USE_CACHE_Y -3
+#define RASTER3D_USE_CACHE_Z -4
+#define RASTER3D_USE_CACHE_XY -5
+#define RASTER3D_USE_CACHE_XZ -6
+#define RASTER3D_USE_CACHE_YZ -7
+#define RASTER3D_USE_CACHE_XYZ -8
+
+#define RASTER3D_DEFAULT_WINDOW NULL
+
+#define RASTER3D_DIRECTORY      "grid3"
+#define RASTER3D_CELL_ELEMENT   "cell"
+#define RASTER3D_CATS_ELEMENT   "cats"
+#define RASTER3D_RANGE_ELEMENT  "range"
+#define RASTER3D_HEADER_ELEMENT "cellhd"
+#define RASTER3D_COLOR_ELEMENT  "color"
+#define RASTER3D_COLOR2_DIRECTORY  "colr2"
+#define RASTER3D_MASK_MAP       "RASTER3D_MASK"
+#define RASTER3D_WINDOW_ELEMENT   "WIND3"
+#define RASTER3D_DEFAULT_WINDOW_ELEMENT   "DEFAULT_WIND3"
+#define RASTER3D_WINDOW_DATABASE "windows3d"
+#define RASTER3D_PERMANENT_MAPSET "PERMANENT"
 
 /*---------------------------------------------------------------------------*/
 
@@ -54,7 +54,7 @@ typedef struct {
   int proj;  /* Projection (see gis.h) */
   int zone;  /* Projection zone (see gis.h) */
 
-} G3D_Region;
+} RASTER3D_Region;
 
 /*---------------------------------------------------------------------------*/
 
@@ -90,7 +90,7 @@ extern void G3d_printError (/* msg */);
 
 extern void G3d_setWindow (/* window */);
 /*extern void G3d_getWindow ();*/
-extern G3D_Region *G3d_windowPtr ();
+extern RASTER3D_Region *G3d_windowPtr ();
 
 /*---------------------------------------------------------------------------*/
 

lib/raster3d/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-LIB = G3D
+LIB = RASTER3D
 
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/raster3d/cache.c

@@ -9,7 +9,7 @@
 
 static int cacheRead_readFun(int tileIndex, void *tileBuf, void *closure)
 {
-    G3D_Map *map = closure;
+    RASTER3D_Map *map = closure;
 
     if (!G3d_readTile(map, tileIndex, tileBuf, map->typeIntern)) {
 	G3d_error("cacheRead_readFun: error in G3d_readTile");
@@ -20,7 +20,7 @@ static int cacheRead_readFun(int tileIndex, void *tileBuf, void *closure)
 
 /*---------------------------------------------------------------------------*/
 
-static int initCacheRead(G3D_Map * map, int nCached)
+static int initCacheRead(RASTER3D_Map * map, int nCached)
 {
     map->cache = G3d_cache_new_read(nCached,
 				    map->tileSize * map->numLengthIntern,
@@ -55,7 +55,7 @@ static int initCacheRead(G3D_Map * map, int nCached)
 
 static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure)
 {
-    G3D_Map *map = closure;
+    RASTER3D_Map *map = closure;
     int index, nBytes;
     long pos, offs, offsLast;
 
@@ -134,7 +134,7 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure)
 static int
 cacheWrite_writeFun(int tileIndex, const void *tileBuf, void *closure)
 {
-    G3D_Map *map = closure;
+    RASTER3D_Map *map = closure;
     int nBytes;
     long offs;
 
@@ -165,7 +165,7 @@ cacheWrite_writeFun(int tileIndex, const void *tileBuf, void *closure)
 
 /*---------------------------------------------------------------------------*/
 
-static int disposeCacheWrite(G3D_Map * map)
+static int disposeCacheWrite(RASTER3D_Map * map)
 {
     if (map->cacheFD >= 0) {
 	if (close(map->cacheFD) != 0) {
@@ -183,7 +183,7 @@ static int disposeCacheWrite(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-static int initCacheWrite(G3D_Map * map, int nCached)
+static int initCacheWrite(RASTER3D_Map * map, int nCached)
 {
     map->cacheFileName = G_tempfile();
     map->cacheFD = open(map->cacheFileName, O_RDWR | O_CREAT | O_TRUNC, 0666);
@@ -212,9 +212,9 @@ static int initCacheWrite(G3D_Map * map, int nCached)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_initCache(G3D_Map * map, int nCached)
+int G3d_initCache(RASTER3D_Map * map, int nCached)
 {
-    if (map->operation == G3D_READ_DATA) {
+    if (map->operation == RASTER3D_READ_DATA) {
 	if (!initCacheRead(map, nCached)) {
 	    G3d_error("G3d_initCache: error in initCacheRead");
 	    return 0;
@@ -232,7 +232,7 @@ int G3d_initCache(G3D_Map * map, int nCached)
 
 /*---------------------------------------------------------------------------*/
 
-static int disposeCacheRead(G3D_Map * map)
+static int disposeCacheRead(RASTER3D_Map * map)
 {
     G3d_cache_dispose(map->cache);
     return 1;
@@ -240,9 +240,9 @@ static int disposeCacheRead(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_disposeCache(G3D_Map * map)
+int G3d_disposeCache(RASTER3D_Map * map)
 {
-    if (map->operation == G3D_READ_DATA) {
+    if (map->operation == RASTER3D_READ_DATA) {
 	if (!disposeCacheRead(map)) {
 	    G3d_error("G3d_disposeCache: error in disposeCacheRead");
 	    return 0;
@@ -263,7 +263,7 @@ int G3d_disposeCache(G3D_Map * map)
 
 static int cacheFlushFun(int tileIndex, const void *tileBuf, void *closure)
 {
-    G3D_Map *map = closure;
+    RASTER3D_Map *map = closure;
 
     if (!G3d_writeTile(map, tileIndex, tileBuf, map->typeIntern)) {
 	G3d_error("cacheFlushFun: error in G3d_writeTile");
@@ -275,12 +275,12 @@ static int cacheFlushFun(int tileIndex, const void *tileBuf, void *closure)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_flushAllTiles(G3D_Map * map)
+int G3d_flushAllTiles(RASTER3D_Map * map)
 {
     int tileIndex, nBytes;
     long offs;
 
-    if (map->operation == G3D_READ_DATA) {
+    if (map->operation == RASTER3D_READ_DATA) {
 	if (!G3d_cache_remove_all(map->cache)) {
 	    G3d_error("G3d_flushAllTiles: error in G3d_cache_remove_all");
 	    return 0;

lib/raster3d/cache1.c

@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_cache_reset(G3D_cache * c)
+void G3d_cache_reset(RASTER3D_cache * c)
 {
     int i;
 
@@ -62,7 +62,7 @@ static int cache_dummy_fun(int tileIndex, const void *tileBuf, void *map)
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_cache_dispose(G3D_cache * c)
+void G3d_cache_dispose(RASTER3D_cache * c)
 {
     if (c == NULL)
 	return;
@@ -89,9 +89,9 @@ void *G3d_cache_new(int nofElts, int sizeOfElts, int nofNames,
 		    int (*eltRemoveFun) (), void *eltRemoveFunData,
 		    int (*eltLoadFun) (), void *eltLoadFunData)
 {
-    G3D_cache *tmp;
+    RASTER3D_cache *tmp;
 
-    tmp = G3d_malloc(sizeof(G3D_cache));
+    tmp = G3d_malloc(sizeof(RASTER3D_cache));
     if (tmp == NULL) {
 	G3d_error("G3d_cache_new: error in G3d_malloc");
 	return (void *)NULL;
@@ -135,7 +135,7 @@ void *G3d_cache_new(int nofElts, int sizeOfElts, int nofNames,
 /*---------------------------------------------------------------------------*/
 
 void
-G3d_cache_set_removeFun(G3D_cache * c, int (*eltRemoveFun) (),
+G3d_cache_set_removeFun(RASTER3D_cache * c, int (*eltRemoveFun) (),
 			void *eltRemoveFunData)
 {
     c->eltRemoveFun = eltRemoveFun;
@@ -145,7 +145,7 @@ G3d_cache_set_removeFun(G3D_cache * c, int (*eltRemoveFun) (),
 /*---------------------------------------------------------------------------*/
 
 void
-G3d_cache_set_loadFun(G3D_cache * c, int (*eltLoadFun) (),
+G3d_cache_set_loadFun(RASTER3D_cache * c, int (*eltLoadFun) (),
 		      void *eltLoadFunData)
 {
     c->eltLoadFun = eltLoadFun;
@@ -163,7 +163,7 @@ void *G3d_cache_new_read(int nofElts, int sizeOfElts, int nofNames,
 
 /*---------------------------------------------------------------------------*/
 
-static void cache_queue_dequeue(G3D_cache * c, int index)
+static void cache_queue_dequeue(RASTER3D_cache * c, int index)
 {
     if (IS_NOT_IN_QUEUE_ELT(index))
 	G3d_fatalError("cache_queue_dequeue: index not in queue");
@@ -183,7 +183,7 @@ static void cache_queue_dequeue(G3D_cache * c, int index)
 
 /*---------------------------------------------------------------------------*/
 
-static void cache_queue_enqueue(G3D_cache * c, int left, int index)
+static void cache_queue_enqueue(RASTER3D_cache * c, int left, int index)
 {
     if (IS_IN_QUEUE_ELT(index))
 	G3d_fatalError("cache_queue_enqueue: index already in queue");
@@ -224,7 +224,7 @@ static void cache_queue_enqueue(G3D_cache * c, int left, int index)
 
 /*---------------------------------------------------------------------------*/
 
-static int cache_queue_get_top(G3D_cache * c)
+static int cache_queue_get_top(RASTER3D_cache * c)
 {
     int top;
 
@@ -237,14 +237,14 @@ static int cache_queue_get_top(G3D_cache * c)
 
 /*---------------------------------------------------------------------------*/
 
-static void cache_queue_append(G3D_cache * c, int index)
+static void cache_queue_append(RASTER3D_cache * c, int index)
 {
     cache_queue_enqueue(c, c->last, index);
 }
 
 /*---------------------------------------------------------------------------*/
 
-static void cache_queue_preppend(G3D_cache * c, int index)
+static void cache_queue_preppend(RASTER3D_cache * c, int index)
 {
     cache_queue_enqueue(c, -1, index);
 }
@@ -259,7 +259,7 @@ static void cache_queue_preppend(G3D_cache * c, int index)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_lock(G3D_cache * c, int name)
+int G3d_cache_lock(RASTER3D_cache * c, int name)
 {
     int index;
 
@@ -284,7 +284,7 @@ int G3d_cache_lock(G3D_cache * c, int name)
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_cache_lock_intern(G3D_cache * c, int index)
+void G3d_cache_lock_intern(RASTER3D_cache * c, int index)
 {
     if (IS_LOCKED_ELT(index))
 	return;
@@ -295,7 +295,7 @@ void G3d_cache_lock_intern(G3D_cache * c, int index)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_unlock(G3D_cache * c, int name)
+int G3d_cache_unlock(RASTER3D_cache * c, int name)
 {
     int index;
 
@@ -316,7 +316,7 @@ int G3d_cache_unlock(G3D_cache * c, int name)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_unlock_all(G3D_cache * c)
+int G3d_cache_unlock_all(RASTER3D_cache * c)
 {
     int index;
 
@@ -332,7 +332,7 @@ int G3d_cache_unlock_all(G3D_cache * c)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_lock_all(G3D_cache * c)
+int G3d_cache_lock_all(RASTER3D_cache * c)
 {
     int index;
 
@@ -345,28 +345,28 @@ int G3d_cache_lock_all(G3D_cache * c)
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_cache_autolock_on(G3D_cache * c)
+void G3d_cache_autolock_on(RASTER3D_cache * c)
 {
     c->autoLock = 1;
 }
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_cache_autolock_off(G3D_cache * c)
+void G3d_cache_autolock_off(RASTER3D_cache * c)
 {
     c->autoLock = 0;
 }
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_cache_set_minUnlock(G3D_cache * c, int nofMinUnLocked)
+void G3d_cache_set_minUnlock(RASTER3D_cache * c, int nofMinUnLocked)
 {
     c->minUnlocked = nofMinUnLocked;
 }
 
 /*---------------------------------------------------------------------------*/
 
-static int cache_remove_elt(G3D_cache * c, int name, int doFlush)
+static int cache_remove_elt(RASTER3D_cache * c, int name, int doFlush)
 {
     int index;
 
@@ -401,7 +401,7 @@ static int cache_remove_elt(G3D_cache * c, int name, int doFlush)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_remove_elt(G3D_cache * c, int name)
+int G3d_cache_remove_elt(RASTER3D_cache * c, int name)
 {
     if (!cache_remove_elt(c, name, 0)) {
 	G3d_error("G3d_cache_remove_elt: error in cache_remove_elt");
@@ -413,7 +413,7 @@ int G3d_cache_remove_elt(G3D_cache * c, int name)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_flush(G3D_cache * c, int name)
+int G3d_cache_flush(RASTER3D_cache * c, int name)
 {
     if (!cache_remove_elt(c, name, 1)) {
 	G3d_error("G3d_cache_flush: error in cache_remove_elt");
@@ -425,7 +425,7 @@ int G3d_cache_flush(G3D_cache * c, int name)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_remove_all(G3D_cache * c)
+int G3d_cache_remove_all(RASTER3D_cache * c)
 {
     int index;
 
@@ -442,7 +442,7 @@ int G3d_cache_remove_all(G3D_cache * c)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_flush_all(G3D_cache * c)
+int G3d_cache_flush_all(RASTER3D_cache * c)
 {
     int index;
 
@@ -458,7 +458,7 @@ int G3d_cache_flush_all(G3D_cache * c)
 
 /*---------------------------------------------------------------------------*/
 
-void *G3d_cache_elt_ptr(G3D_cache * c, int name)
+void *G3d_cache_elt_ptr(RASTER3D_cache * c, int name)
 {
     int index, oldName, doUnlock;
 
@@ -508,7 +508,7 @@ void *G3d_cache_elt_ptr(G3D_cache * c, int name)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_load(G3D_cache * c, int name)
+int G3d_cache_load(RASTER3D_cache * c, int name)
 {
     if (G3d_cache_elt_ptr(c, name) == NULL) {
 	G3d_error("G3d_cache_load: error in G3d_cache_elt_ptr");
@@ -520,7 +520,7 @@ int G3d_cache_load(G3D_cache * c, int name)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_get_elt(G3D_cache * c, int name, void *dst)
+int G3d_cache_get_elt(RASTER3D_cache * c, int name, void *dst)
 {
     const void *elt;
 
@@ -537,7 +537,7 @@ int G3d_cache_get_elt(G3D_cache * c, int name, void *dst)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_cache_put_elt(G3D_cache * c, int name, const void *src)
+int G3d_cache_put_elt(RASTER3D_cache * c, int name, const void *src)
 {
     void *elt;
 
@@ -562,7 +562,7 @@ int G3d_cache_put_elt(G3D_cache * c, int name, const void *src)
 
 /*---------------------------------------------------------------------------*/
 
-static void cache_test_print(G3D_cache * c)
+static void cache_test_print(RASTER3D_cache * c)
 {
     int i, al;
     int *a;
@@ -630,12 +630,12 @@ static void cache_test_add(void *c, int name, int val)
     static int firstTime = 1;
 
     if (firstTime) {
-	ctd.value = G3d_malloc(((G3D_cache *) c)->eltSize * sizeof(int));
+	ctd.value = G3d_malloc(((RASTER3D_cache *) c)->eltSize * sizeof(int));
 	firstTime = 0;
     }
 
     ctd.value[17] = val;
-    ctd.size = ((G3D_cache *) c)->eltSize;
+    ctd.size = ((RASTER3D_cache *) c)->eltSize;
 
     G3d_cache_load(c, name);
 }

lib/raster3d/cats.c

@@ -35,7 +35,7 @@ int G3d_writeCats(const char *name, struct Categories *cats)
     DCELL val1, val2;
     char str1[100], str2[100];
 
-    fd = G_fopen_new_misc(G3D_DIRECTORY, G3D_CATS_ELEMENT, name);
+    fd = G_fopen_new_misc(RASTER3D_DIRECTORY, RASTER3D_CATS_ELEMENT, name);
     if (!fd)
 	return -1;
 
@@ -86,7 +86,7 @@ read_cats(const char *name, const char *mapset, struct Categories *pcats)
     int old;
     long num = -1;
 
-    fd = G_fopen_old_misc(G3D_DIRECTORY, G3D_CATS_ELEMENT, name, mapset);
+    fd = G_fopen_old_misc(RASTER3D_DIRECTORY, RASTER3D_CATS_ELEMENT, name, mapset);
     if (!fd)
 	return -2;
 

lib/raster3d/changeprecision.c

@@ -25,7 +25,7 @@ void G3d_changePrecision(void *map, int precision, const char *nameOut)
     void *map2;
     int x, y, z, savePrecision, saveCompression, saveLzw, saveRle;
     char *data;
-    G3D_Region region;
+    RASTER3D_Region region;
     int typeIntern;
     int nx, ny, nz;
     int tileXsave, tileYsave, tileZsave, tileX, tileY, tileZ, saveType;
@@ -34,7 +34,7 @@ void G3d_changePrecision(void *map, int precision, const char *nameOut)
     /*   G3d_setFileType (G3d_fileTypeMap (map)); */
     G3d_getCompressionMode(&saveCompression, &saveLzw, &saveRle,
 			   &savePrecision);
-    G3d_setCompressionMode(G3D_COMPRESSION, saveLzw, saveRle, precision);
+    G3d_setCompressionMode(RASTER3D_COMPRESSION, saveLzw, saveRle, precision);
     G3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
     G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
     G3d_setTileDimension(tileX, tileY, tileZ);
@@ -43,7 +43,7 @@ void G3d_changePrecision(void *map, int precision, const char *nameOut)
     G3d_getRegionStructMap(map, &region);
 
     map2 =
-	G3d_openCellNew(nameOut, typeIntern, G3D_USE_CACHE_DEFAULT, &region);
+	G3d_openCellNew(nameOut, typeIntern, RASTER3D_USE_CACHE_DEFAULT, &region);
     if (map2 == NULL)
 	G3d_fatalError("G3d_changePrecision: error in G3d_openCellNew");
 

lib/raster3d/changetype.c

@@ -26,7 +26,7 @@ void G3d_changeType(void *map, const char *nameOut)
     void *map2;
     int x, y, z, saveType;
     void *data, *data2;
-    G3D_Region region;
+    RASTER3D_Region region;
     int tileSize;
     int tileX, tileY, tileZ, typeIntern, typeIntern2;
     int tileXsave, tileYsave, tileZsave, nx, ny, nz;
@@ -40,7 +40,7 @@ void G3d_changeType(void *map, const char *nameOut)
 
     G3d_getRegionStructMap(map, &region);
     map2 =
-	G3d_openCellNew(nameOut, FCELL_TYPE, G3D_USE_CACHE_DEFAULT, &region);
+	G3d_openCellNew(nameOut, FCELL_TYPE, RASTER3D_USE_CACHE_DEFAULT, &region);
 
     if (map2 == NULL)
 	G3d_fatalError("G3d_changeType: error in G3d_openCellNew");

lib/raster3d/close.c

@@ -12,7 +12,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_closeNew(G3D_Map * map)
+static int G3d_closeNew(RASTER3D_Map * map)
 {
     char path[GPATH_MAX];
     struct Categories cats;
@@ -40,7 +40,7 @@ static int G3d_closeNew(G3D_Map * map)
     close(map->data_fd);
 
     /* finally move tempfile to data file */
-    G3d_filename(path, G3D_CELL_ELEMENT, map->fileName, map->mapset);
+    G3d_filename(path, RASTER3D_CELL_ELEMENT, map->fileName, map->mapset);
 #ifdef __MINGW32__
     if (CopyFile(map->tempName, path, FALSE) == 0) {
 #else
@@ -61,7 +61,7 @@ static int G3d_closeNew(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_closeCellNew(G3D_Map * map)
+static int G3d_closeCellNew(RASTER3D_Map * map)
 {
     long ltmp;
 
@@ -107,7 +107,7 @@ static int G3d_closeCellNew(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_closeOld(G3D_Map * map)
+static int G3d_closeOld(RASTER3D_Map * map)
 {
     if (close(map->data_fd) != 0) {
 	G3d_error("G3d_closeOld: could not close file");
@@ -119,7 +119,7 @@ static int G3d_closeOld(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_closeCellOld(G3D_Map * map)
+static int G3d_closeCellOld(RASTER3D_Map * map)
 {
     if (!G3d_closeOld(map) != 0) {
 	G3d_error("G3d_closeCellOld: error in G3d_closeOld");
@@ -144,9 +144,9 @@ static int G3d_closeCellOld(G3D_Map * map)
  *          0 ...  otherwise.
  */
 
-int G3d_closeCell(G3D_Map * map)
+int G3d_closeCell(RASTER3D_Map * map)
 {
-    if (map->operation == G3D_WRITE_DATA) {
+    if (map->operation == RASTER3D_WRITE_DATA) {
 	if (!G3d_closeCellNew(map)) {
 	    G3d_error("G3d_closeCell: error in G3d_closeCellNew");
 	    return 0;
@@ -171,7 +171,7 @@ int G3d_closeCell(G3D_Map * map)
     else
 	G3d_free(map->data);
 
-    if (map->operation == G3D_WRITE_DATA)
+    if (map->operation == RASTER3D_WRITE_DATA)
 	if (!G3d_writeHeader(map,
 			     map->region.proj, map->region.zone,
 			     map->region.north, map->region.south,

lib/raster3d/color.c

@@ -22,7 +22,7 @@ static int read_old_colors(FILE *, struct Colors *);
 int G3d_removeColor(const char *name)
  /* adapted from G_remove_colr */
 {
-    return G_remove_misc(G3D_DIRECTORY, G3D_COLOR_ELEMENT, name);
+    return G_remove_misc(RASTER3D_DIRECTORY, RASTER3D_COLOR_ELEMENT, name);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -67,7 +67,7 @@ static int read_colors(const char *name, const char *mapset,
     int stat;
     char buf[1024];
 
-    fd = G_fopen_old_misc(G3D_DIRECTORY, G3D_COLOR_ELEMENT, name, mapset);
+    fd = G_fopen_old_misc(RASTER3D_DIRECTORY, RASTER3D_COLOR_ELEMENT, name, mapset);
     if (!fd)
 	return -2;
 
@@ -334,7 +334,7 @@ G3d_writeColors(const char *name, const char *mapset, struct Colors *colors)
 	return -1;
     }
 
-    fd = G_fopen_new_misc(G3D_DIRECTORY, G3D_COLOR_ELEMENT, name);
+    fd = G_fopen_new_misc(RASTER3D_DIRECTORY, RASTER3D_COLOR_ELEMENT, name);
     if (!fd)
 	return -1;
 

lib/raster3d/defaults.c

@@ -5,61 +5,61 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define G3D_NO_DEFAULT -10
-
-#define G3D_COMPRESSION_DEFAULT G3D_COMPRESSION
-#define G3D_USE_LZW_DEFAULT G3D_NO_LZW
-#define G3D_USE_RLE_DEFAULT G3D_USE_RLE
-#define G3D_PRECISION_DEFAULT G3D_MAX_PRECISION
-#define G3D_CACHE_SIZE_DEFAULT 1000
-#define G3D_CACHE_SIZE_MAX_DEFAULT 16777216
-#define G3D_FILE_TYPE_DEFAULT DCELL_TYPE
-#define G3D_TILE_X_DEFAULT 16
-#define G3D_TILE_Y_DEFAULT 16
-#define G3D_TILE_Z_DEFAULT 8
-#define G3D_ERROR_FUN_DEFAULT G3d_skipError
-#define G3D_UNIT_DEFAULT "none"
+#define RASTER3D_NO_DEFAULT -10
+
+#define RASTER3D_COMPRESSION_DEFAULT RASTER3D_COMPRESSION
+#define RASTER3D_USE_LZW_DEFAULT RASTER3D_NO_LZW
+#define RASTER3D_USE_RLE_DEFAULT RASTER3D_USE_RLE
+#define RASTER3D_PRECISION_DEFAULT RASTER3D_MAX_PRECISION
+#define RASTER3D_CACHE_SIZE_DEFAULT 1000
+#define RASTER3D_CACHE_SIZE_MAX_DEFAULT 16777216
+#define RASTER3D_FILE_TYPE_DEFAULT DCELL_TYPE
+#define RASTER3D_TILE_X_DEFAULT 16
+#define RASTER3D_TILE_Y_DEFAULT 16
+#define RASTER3D_TILE_Z_DEFAULT 8
+#define RASTER3D_ERROR_FUN_DEFAULT G3d_skipError
+#define RASTER3D_UNIT_DEFAULT "none"
 
 /*---------------------------------------------------------------------------*/
 
-#define G3D_COMPRESSION_ENV_VAR_YES "G3D_USE_COMPRESSION"
-#define G3D_COMPRESSION_ENV_VAR_NO "G3D_NO_COMPRESSION"
+#define RASTER3D_COMPRESSION_ENV_VAR_YES "RASTER3D_USE_COMPRESSION"
+#define RASTER3D_COMPRESSION_ENV_VAR_NO "RASTER3D_NO_COMPRESSION"
 
-#define G3D_LZW_ENV_VAR_YES "G3D_USE_LZW"
-#define G3D_LZW_ENV_VAR_NO "G3D_NO_LZW"
+#define RASTER3D_LZW_ENV_VAR_YES "RASTER3D_USE_LZW"
+#define RASTER3D_LZW_ENV_VAR_NO "RASTER3D_NO_LZW"
 
-#define G3D_RLE_ENV_VAR_YES "G3D_USE_RLE"
-#define G3D_RLE_ENV_VAR_NO "G3D_NO_RLE"
+#define RASTER3D_RLE_ENV_VAR_YES "RASTER3D_USE_RLE"
+#define RASTER3D_RLE_ENV_VAR_NO "RASTER3D_NO_RLE"
 
-#define G3D_PRECISION_ENV_VAR "G3D_PRECISION"
-#define G3D_PRECISION_ENV_VAR_MAX "G3D_MAX_PRECISION"
+#define RASTER3D_PRECISION_ENV_VAR "RASTER3D_PRECISION"
+#define RASTER3D_PRECISION_ENV_VAR_MAX "RASTER3D_MAX_PRECISION"
 
-#define G3D_CACHE_SIZE_ENV_VAR "G3D_DEFAULT_CACHE_SIZE"
-#define G3D_CACHE_SIZE_MAX_ENV_VAR "G3D_MAX_CACHE_SIZE"
+#define RASTER3D_CACHE_SIZE_ENV_VAR "RASTER3D_DEFAULT_CACHE_SIZE"
+#define RASTER3D_CACHE_SIZE_MAX_ENV_VAR "RASTER3D_MAX_CACHE_SIZE"
 
-#define G3D_FILE_FLOAT_ENV_VAR "G3D_WRITE_FLOAT"
-#define G3D_FILE_DOUBLE_ENV_VAR "G3D_WRITE_DOUBLE"
+#define RASTER3D_FILE_FLOAT_ENV_VAR "RASTER3D_WRITE_FLOAT"
+#define RASTER3D_FILE_DOUBLE_ENV_VAR "RASTER3D_WRITE_DOUBLE"
 
-#define G3D_TILE_DIM_X_ENV_VAR "G3D_TILE_DIMENSION_X"
-#define G3D_TILE_DIM_Y_ENV_VAR "G3D_TILE_DIMENSION_Y"
-#define G3D_TILE_DIM_Z_ENV_VAR "G3D_TILE_DIMENSION_Z"
+#define RASTER3D_TILE_DIM_X_ENV_VAR "RASTER3D_TILE_DIMENSION_X"
+#define RASTER3D_TILE_DIM_Y_ENV_VAR "RASTER3D_TILE_DIMENSION_Y"
+#define RASTER3D_TILE_DIM_Z_ENV_VAR "RASTER3D_TILE_DIMENSION_Z"
 
-#define G3D_FATAL_ERROR_ENV_VAR "G3D_USE_FATAL_ERROR"
-#define G3D_PRINT_ERROR_ENV_VAR "G3D_USE_PRINT_ERROR"
+#define RASTER3D_FATAL_ERROR_ENV_VAR "RASTER3D_USE_FATAL_ERROR"
+#define RASTER3D_PRINT_ERROR_ENV_VAR "RASTER3D_USE_PRINT_ERROR"
 
-#define G3D_DEFAULT_WINDOW3D "G3D_DEFAULT_WINDOW3D"
+#define RASTER3D_DEFAULT_WINDOW3D "RASTER3D_DEFAULT_WINDOW3D"
 
 /*---------------------------------------------------------------------------*/
 
-int g3d_do_compression = G3D_NO_DEFAULT;
-int g3d_do_lzw_compression = G3D_NO_DEFAULT;
-int g3d_do_rle_compression = G3D_NO_DEFAULT;
-int g3d_precision = G3D_NO_DEFAULT;
-int g3d_cache_default = G3D_NO_DEFAULT;
-int g3d_cache_max = G3D_NO_DEFAULT;
-int g3d_file_type = G3D_NO_DEFAULT;
+int g3d_do_compression = RASTER3D_NO_DEFAULT;
+int g3d_do_lzw_compression = RASTER3D_NO_DEFAULT;
+int g3d_do_rle_compression = RASTER3D_NO_DEFAULT;
+int g3d_precision = RASTER3D_NO_DEFAULT;
+int g3d_cache_default = RASTER3D_NO_DEFAULT;
+int g3d_cache_max = RASTER3D_NO_DEFAULT;
+int g3d_file_type = RASTER3D_NO_DEFAULT;
 int g3d_tile_dimension[3] =
-    { G3D_NO_DEFAULT, G3D_NO_DEFAULT, G3D_NO_DEFAULT };
+    { RASTER3D_NO_DEFAULT, RASTER3D_NO_DEFAULT, RASTER3D_NO_DEFAULT };
 void (*g3d_error_fun) (const char *) = NULL;
 char *g3d_unit_default = NULL;
 
@@ -69,9 +69,9 @@ char *g3d_unit_default = NULL;
 /*!
  * \brief 
  *
- * <em>doCompress</em> should be one of G3D_NO_COMPRESSION and
- * G3D_COMPRESSION, <em>doRle</em> should be either G3D_NO_RLE or
- * G3D_USE_RLE, and <em>precision</em> should be either G3D_MAX_PRECISION or
+ * <em>doCompress</em> should be one of RASTER3D_NO_COMPRESSION and
+ * RASTER3D_COMPRESSION, <em>doRle</em> should be either RASTER3D_NO_RLE or
+ * RASTER3D_USE_RLE, and <em>precision</em> should be either RASTER3D_MAX_PRECISION or
  * a positive integer.
  *
  *  \param doCompress
@@ -84,18 +84,18 @@ char *g3d_unit_default = NULL;
 void
 G3d_setCompressionMode(int doCompress, int doLzw, int doRle, int precision)
 {
-    if ((doCompress != G3D_NO_COMPRESSION) && (doCompress != G3D_COMPRESSION))
+    if ((doCompress != RASTER3D_NO_COMPRESSION) && (doCompress != RASTER3D_COMPRESSION))
 	G3d_fatalError("G3d_setCompressionMode: wrong value for doCompress.");
 
     g3d_do_compression = doCompress;
 
-    if (doCompress == G3D_NO_COMPRESSION)
+    if (doCompress == RASTER3D_NO_COMPRESSION)
 	return;
 
-    if ((doLzw != G3D_NO_LZW) && (doLzw != G3D_USE_LZW))
+    if ((doLzw != RASTER3D_NO_LZW) && (doLzw != RASTER3D_USE_LZW))
 	G3d_fatalError("G3d_setCompressionMode: wrong value for doLzw.");
 
-    if ((doRle != G3D_NO_RLE) && (doRle != G3D_USE_RLE))
+    if ((doRle != RASTER3D_NO_RLE) && (doRle != RASTER3D_USE_RLE))
 	G3d_fatalError("G3d_setCompressionMode: wrong value for doRle.");
 
     if (precision < -1)
@@ -337,7 +337,7 @@ void G3d_setUnit(const char *unit)
  * \brief 
  *
  *  Initializes the default values described
- * in G3D Defaults.  Applications have to use this function only if they need to
+ * in RASTER3D Defaults.  Applications have to use this function only if they need to
  * query the default values before the first file (either old or new) has been
  * opened.
  *
@@ -348,62 +348,62 @@ void G3d_initDefaults(void)
 {
     static int firstTime = 1;
     const char *value, *windowName;
-    G3D_Region window;
+    RASTER3D_Region window;
 
     if (!firstTime)
 	return;
     firstTime = 0;
 
-    if (g3d_do_compression == G3D_NO_DEFAULT) {
-	if (NULL != getenv(G3D_COMPRESSION_ENV_VAR_YES)) {
-	    g3d_do_compression = G3D_COMPRESSION;
+    if (g3d_do_compression == RASTER3D_NO_DEFAULT) {
+	if (NULL != getenv(RASTER3D_COMPRESSION_ENV_VAR_YES)) {
+	    g3d_do_compression = RASTER3D_COMPRESSION;
 	}
 	else {
-	    if (NULL != getenv(G3D_COMPRESSION_ENV_VAR_NO)) {
-		g3d_do_compression = G3D_NO_COMPRESSION;
+	    if (NULL != getenv(RASTER3D_COMPRESSION_ENV_VAR_NO)) {
+		g3d_do_compression = RASTER3D_NO_COMPRESSION;
 	    }
 	    else {
-		g3d_do_compression = G3D_COMPRESSION_DEFAULT;
+		g3d_do_compression = RASTER3D_COMPRESSION_DEFAULT;
 	    }
 	}
     }
 
-    if (g3d_do_lzw_compression == G3D_NO_DEFAULT) {
-	if (NULL != getenv(G3D_LZW_ENV_VAR_YES)) {
-	    g3d_do_lzw_compression = G3D_USE_LZW;
+    if (g3d_do_lzw_compression == RASTER3D_NO_DEFAULT) {
+	if (NULL != getenv(RASTER3D_LZW_ENV_VAR_YES)) {
+	    g3d_do_lzw_compression = RASTER3D_USE_LZW;
 	}
 	else {
-	    if (NULL != getenv(G3D_LZW_ENV_VAR_NO)) {
-		g3d_do_lzw_compression = G3D_NO_LZW;
+	    if (NULL != getenv(RASTER3D_LZW_ENV_VAR_NO)) {
+		g3d_do_lzw_compression = RASTER3D_NO_LZW;
 	    }
 	    else {
-		g3d_do_lzw_compression = G3D_USE_LZW_DEFAULT;
+		g3d_do_lzw_compression = RASTER3D_USE_LZW_DEFAULT;
 	    }
 	}
     }
 
-    if (g3d_do_rle_compression == G3D_NO_DEFAULT) {
-	if (NULL != getenv(G3D_RLE_ENV_VAR_YES)) {
-	    g3d_do_rle_compression = G3D_USE_RLE;
+    if (g3d_do_rle_compression == RASTER3D_NO_DEFAULT) {
+	if (NULL != getenv(RASTER3D_RLE_ENV_VAR_YES)) {
+	    g3d_do_rle_compression = RASTER3D_USE_RLE;
 	}
 	else {
-	    if (NULL != getenv(G3D_RLE_ENV_VAR_NO)) {
-		g3d_do_rle_compression = G3D_NO_RLE;
+	    if (NULL != getenv(RASTER3D_RLE_ENV_VAR_NO)) {
+		g3d_do_rle_compression = RASTER3D_NO_RLE;
 	    }
 	    else {
-		g3d_do_rle_compression = G3D_USE_RLE_DEFAULT;
+		g3d_do_rle_compression = RASTER3D_USE_RLE_DEFAULT;
 	    }
 	}
     }
 
-    if (g3d_precision == G3D_NO_DEFAULT) {
-	if (NULL != getenv(G3D_PRECISION_ENV_VAR_MAX)) {
-	    g3d_precision = G3D_MAX_PRECISION;
+    if (g3d_precision == RASTER3D_NO_DEFAULT) {
+	if (NULL != getenv(RASTER3D_PRECISION_ENV_VAR_MAX)) {
+	    g3d_precision = RASTER3D_MAX_PRECISION;
 	}
 	else {
-	    value = getenv(G3D_PRECISION_ENV_VAR);
+	    value = getenv(RASTER3D_PRECISION_ENV_VAR);
 	    if (value == NULL) {
-		g3d_precision = G3D_PRECISION_DEFAULT;
+		g3d_precision = RASTER3D_PRECISION_DEFAULT;
 	    }
 	    else {
 		if (sscanf(value, "%d", &g3d_precision) != 1) {
@@ -420,25 +420,25 @@ void G3d_initDefaults(void)
 	}
     }
 
-    if (g3d_file_type == G3D_NO_DEFAULT) {
-	if (NULL != getenv(G3D_FILE_FLOAT_ENV_VAR)) {
+    if (g3d_file_type == RASTER3D_NO_DEFAULT) {
+	if (NULL != getenv(RASTER3D_FILE_FLOAT_ENV_VAR)) {
 	    g3d_file_type = FCELL_TYPE;
 	}
 	else {
-	    if (NULL != getenv(G3D_FILE_DOUBLE_ENV_VAR)) {
+	    if (NULL != getenv(RASTER3D_FILE_DOUBLE_ENV_VAR)) {
 		g3d_file_type = DCELL_TYPE;
 	    }
 	    else {
-		g3d_file_type = G3D_FILE_TYPE_DEFAULT;
+		g3d_file_type = RASTER3D_FILE_TYPE_DEFAULT;
 	    }
 	}
     }
 
-    if (g3d_cache_default == G3D_NO_DEFAULT) {
-	value = getenv(G3D_CACHE_SIZE_ENV_VAR);
+    if (g3d_cache_default == RASTER3D_NO_DEFAULT) {
+	value = getenv(RASTER3D_CACHE_SIZE_ENV_VAR);
 
 	if (value == NULL) {
-	    g3d_cache_default = G3D_CACHE_SIZE_DEFAULT;
+	    g3d_cache_default = RASTER3D_CACHE_SIZE_DEFAULT;
 	}
 	else {
 	    if (sscanf(value, "%d", &g3d_cache_default) != 1) {
@@ -452,11 +452,11 @@ void G3d_initDefaults(void)
 	}
     }
 
-    if (g3d_cache_max == G3D_NO_DEFAULT) {
-	value = getenv(G3D_CACHE_SIZE_MAX_ENV_VAR);
+    if (g3d_cache_max == RASTER3D_NO_DEFAULT) {
+	value = getenv(RASTER3D_CACHE_SIZE_MAX_ENV_VAR);
 
 	if (value == NULL) {
-	    g3d_cache_max = G3D_CACHE_SIZE_MAX_DEFAULT;
+	    g3d_cache_max = RASTER3D_CACHE_SIZE_MAX_DEFAULT;
 	}
 	else {
 	    if (sscanf(value, "%d", &g3d_cache_max) != 1) {
@@ -470,11 +470,11 @@ void G3d_initDefaults(void)
 	}
     }
 
-    if (g3d_tile_dimension[0] == G3D_NO_DEFAULT) {
-	value = getenv(G3D_TILE_DIM_X_ENV_VAR);
+    if (g3d_tile_dimension[0] == RASTER3D_NO_DEFAULT) {
+	value = getenv(RASTER3D_TILE_DIM_X_ENV_VAR);
 
 	if (value == NULL) {
-	    g3d_tile_dimension[0] = G3D_TILE_X_DEFAULT;
+	    g3d_tile_dimension[0] = RASTER3D_TILE_X_DEFAULT;
 	}
 	else {
 	    if (sscanf(value, "%d", g3d_tile_dimension) != 1) {
@@ -487,10 +487,10 @@ void G3d_initDefaults(void)
 	    }
 	}
 
-	value = getenv(G3D_TILE_DIM_Y_ENV_VAR);
+	value = getenv(RASTER3D_TILE_DIM_Y_ENV_VAR);
 
 	if (value == NULL) {
-	    g3d_tile_dimension[1] = G3D_TILE_Y_DEFAULT;
+	    g3d_tile_dimension[1] = RASTER3D_TILE_Y_DEFAULT;
 	}
 	else {
 	    if (sscanf(value, "%d", g3d_tile_dimension + 1) != 1) {
@@ -503,10 +503,10 @@ void G3d_initDefaults(void)
 	    }
 	}
 
-	value = getenv(G3D_TILE_DIM_Z_ENV_VAR);
+	value = getenv(RASTER3D_TILE_DIM_Z_ENV_VAR);
 
 	if (value == NULL) {
-	    g3d_tile_dimension[2] = G3D_TILE_Z_DEFAULT;
+	    g3d_tile_dimension[2] = RASTER3D_TILE_Z_DEFAULT;
 	}
 	else {
 	    if (sscanf(value, "%d", g3d_tile_dimension + 2) != 1) {
@@ -521,29 +521,29 @@ void G3d_initDefaults(void)
     }
 
     if (g3d_error_fun == NULL) {
-	value = getenv(G3D_FATAL_ERROR_ENV_VAR);
+	value = getenv(RASTER3D_FATAL_ERROR_ENV_VAR);
 
 	if (value != NULL) {
 	    g3d_error_fun = G3d_fatalError_noargs;
 	}
 	else {
-	    value = getenv(G3D_PRINT_ERROR_ENV_VAR);
+	    value = getenv(RASTER3D_PRINT_ERROR_ENV_VAR);
 
 	    if (value != NULL) {
 		g3d_error_fun = G3d_printError;
 	    }
 	    else {
-		g3d_error_fun = G3D_ERROR_FUN_DEFAULT;
+		g3d_error_fun = RASTER3D_ERROR_FUN_DEFAULT;
 	    }
 	}
     }
 
     if (g3d_unit_default == NULL)
-	g3d_unit_default = G_store(G3D_UNIT_DEFAULT);
+	g3d_unit_default = G_store(RASTER3D_UNIT_DEFAULT);
 
     windowName = G3d_getWindowParams();
     if (windowName == NULL) {
-	value = getenv(G3D_DEFAULT_WINDOW3D);
+	value = getenv(RASTER3D_DEFAULT_WINDOW3D);
 	if (value != NULL)
 	    if (*value != 0)
 		windowName = value;

lib/raster3d/doubleio.c

@@ -12,13 +12,13 @@ int G3d_writeDoubles(int fd, int useXdr, const double *i, int nofNum)
 {
     int firstTime = 1;
     XDR xdrEncodeStream;
-    char xdrDoubleBuf[G3D_XDR_DOUBLE_LENGTH * 1024];
+    char xdrDoubleBuf[RASTER3D_XDR_DOUBLE_LENGTH * 1024];
     u_int n;
 
     if (nofNum <= 0)
 	G3d_fatalError("G3d_writeDoubles: nofNum out of range");
 
-    if (useXdr == G3D_NO_XDR) {
+    if (useXdr == RASTER3D_NO_XDR) {
 	if (write(fd, i, sizeof(double) * nofNum) != sizeof(double) * nofNum) {
 	    G3d_error("G3d_writeDoubles: writing to file failed");
 	    return 0;
@@ -31,7 +31,7 @@ int G3d_writeDoubles(int fd, int useXdr, const double *i, int nofNum)
 
     if (firstTime) {
 	xdrmem_create(&xdrEncodeStream, xdrDoubleBuf,
-		      G3D_XDR_DOUBLE_LENGTH * 1024, XDR_ENCODE);
+		      RASTER3D_XDR_DOUBLE_LENGTH * 1024, XDR_ENCODE);
 	firstTime = 1;
     }
 
@@ -51,8 +51,8 @@ int G3d_writeDoubles(int fd, int useXdr, const double *i, int nofNum)
 	    return 0;
 	}
 
-	if (write(fd, xdrDoubleBuf, G3D_XDR_DOUBLE_LENGTH * n) !=
-	    G3D_XDR_DOUBLE_LENGTH * n) {
+	if (write(fd, xdrDoubleBuf, RASTER3D_XDR_DOUBLE_LENGTH * n) !=
+	    RASTER3D_XDR_DOUBLE_LENGTH * n) {
 	    G3d_error("G3d_writeDoubles: writing xdr to file failed");
 	    return 0;
 	}
@@ -70,13 +70,13 @@ int G3d_readDoubles(int fd, int useXdr, double *i, int nofNum)
 {
     int firstTime = 1;
     XDR xdrDecodeStream;
-    char xdrDoubleBuf[G3D_XDR_DOUBLE_LENGTH * 1024];
+    char xdrDoubleBuf[RASTER3D_XDR_DOUBLE_LENGTH * 1024];
     u_int n;
 
     if (nofNum <= 0)
 	G3d_fatalError("G3d_readDoubles: nofNum out of range");
 
-    if (useXdr == G3D_NO_XDR) {
+    if (useXdr == RASTER3D_NO_XDR) {
 	if (read(fd, i, sizeof(double) * nofNum) != sizeof(double) * nofNum) {
 	    G3d_error("G3d_readDoubles: reading from file failed");
 	    return 0;
@@ -88,7 +88,7 @@ int G3d_readDoubles(int fd, int useXdr, double *i, int nofNum)
 
     if (firstTime) {
 	xdrmem_create(&xdrDecodeStream, xdrDoubleBuf,
-		      G3D_XDR_DOUBLE_LENGTH * 1024, XDR_DECODE);
+		      RASTER3D_XDR_DOUBLE_LENGTH * 1024, XDR_DECODE);
 	firstTime = 1;
     }
 
@@ -97,8 +97,8 @@ int G3d_readDoubles(int fd, int useXdr, double *i, int nofNum)
 	if (n == 0)
 	    n = 1024;
 
-	if (read(fd, xdrDoubleBuf, G3D_XDR_DOUBLE_LENGTH * n) !=
-	    G3D_XDR_DOUBLE_LENGTH * n) {
+	if (read(fd, xdrDoubleBuf, RASTER3D_XDR_DOUBLE_LENGTH * n) !=
+	    RASTER3D_XDR_DOUBLE_LENGTH * n) {
 	    G3d_error("G3d_readDoubles: reading xdr from file failed");
 	    return 0;
 	}

lib/raster3d/filecompare.c

@@ -398,15 +398,15 @@ G3d_compareFiles(const char *f1, const char *mapset1, const char *f2,
 
     printf("\nComparing %s and %s\n", f1, f2);
 
-    map = G3d_openCellOld(f1, mapset1, G3D_DEFAULT_WINDOW,
-			  G3D_TILE_SAME_AS_FILE, G3D_USE_CACHE_DEFAULT);
+    map = G3d_openCellOld(f1, mapset1, RASTER3D_DEFAULT_WINDOW,
+			  RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
     if (map == NULL)
 	G3d_fatalError("G3d_compareFiles: error in G3d_openCellOld");
 
     G3d_printHeader(map);
 
-    map2 = G3d_openCellOld(f2, mapset2, G3D_DEFAULT_WINDOW,
-			   G3D_TILE_SAME_AS_FILE, G3D_USE_CACHE_DEFAULT);
+    map2 = G3d_openCellOld(f2, mapset2, RASTER3D_DEFAULT_WINDOW,
+			   RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
     if (map2 == NULL)
 	G3d_fatalError("G3d_compareFiles: error in G3d_openCellOld");
 

lib/raster3d/filename.c

@@ -10,5 +10,5 @@ void
 G3d_filename(char *path, const char *elementName, const char *mapName,
 	     const char *mapset)
 {
-    G_file_name_misc(path, G3D_DIRECTORY, elementName, mapName, mapset);
+    G_file_name_misc(path, RASTER3D_DIRECTORY, elementName, mapName, mapset);
 }

lib/raster3d/fpcompress.c

@@ -720,10 +720,10 @@ G_fpcompress_writeXdrNums(int fd, char *src, int nofNum, int precision,
     G_lzw_set_bits(9);
 #endif
 
-    if (useRle == G3D_USE_RLE)
+    if (useRle == RASTER3D_USE_RLE)
 	rleLength = G_rle_count_only(compressBuf + 1, offsetMantissa, 1);
 
-    if ((useRle == G3D_USE_RLE) && (rleLength < offsetMantissa)) {
+    if ((useRle == RASTER3D_USE_RLE) && (rleLength < offsetMantissa)) {
 
 	G_rle_encode(compressBuf + 1, src, offsetMantissa, 1);
 	srcStop = src + rleLength;
@@ -733,7 +733,7 @@ G_fpcompress_writeXdrNums(int fd, char *src, int nofNum, int precision,
 
 	*(compressBuf + offsetMantissa - rleLength) = 1;
 
-	if (useLzw == G3D_USE_LZW)
+	if (useLzw == RASTER3D_USE_LZW)
 #ifdef USE_LZW_COMPRESSION
 	    status = G_lzw_write(fd, compressBuf + offsetMantissa - rleLength,
 				 nBytes - offsetMantissa + rleLength + 1);
@@ -764,7 +764,7 @@ G_fpcompress_writeXdrNums(int fd, char *src, int nofNum, int precision,
     else {
 
 	*compressBuf = 0;
-	if (useLzw == G3D_USE_LZW)
+	if (useLzw == RASTER3D_USE_LZW)
 #ifdef USE_LZW_COMPRESSION
 	    status = G_lzw_write(fd, compressBuf, nBytes + 1);
 #else

lib/raster3d/fpxdr.c

@@ -64,7 +64,7 @@ void G3d_setXdrNullFloat(float *f)
 
 XDR xdrEncodeStream, xdrDecodeStream;	/* xdr support structures */
 
-int G3d_initFpXdr(G3D_Map * map, int misuseBytes)
+int G3d_initFpXdr(RASTER3D_Map * map, int misuseBytes)
 
 
 
@@ -76,7 +76,7 @@ int G3d_initFpXdr(G3D_Map * map, int misuseBytes)
     doAlloc = 0;
 
     if (xdr == NULL) {
-	xdrLength = map->tileSize * G3D_MAX(map->numLengthExtern,
+	xdrLength = map->tileSize * RASTER3D_MAX(map->numLengthExtern,
 					    map->numLengthIntern) +
 	    misuseBytes;
 	xdr = G3d_malloc(xdrLength);
@@ -87,10 +87,10 @@ int G3d_initFpXdr(G3D_Map * map, int misuseBytes)
 
 	doAlloc = 1;
     }
-    else if (map->tileSize * G3D_MAX(map->numLengthExtern,
+    else if (map->tileSize * RASTER3D_MAX(map->numLengthExtern,
 				     map->numLengthIntern) + misuseBytes
 	     > xdrLength) {
-	xdrLength = map->tileSize * G3D_MAX(map->numLengthExtern,
+	xdrLength = map->tileSize * RASTER3D_MAX(map->numLengthExtern,
 					    map->numLengthIntern) +
 	    misuseBytes;
 	xdr = G3d_realloc(xdr, xdrLength);
@@ -118,13 +118,13 @@ static int (*xdrFun) ();
 static XDR *xdrs;
 static double tmpValue, *tmp;
 
-int G3d_initCopyToXdr(G3D_Map * map, int sType)
+int G3d_initCopyToXdr(RASTER3D_Map * map, int sType)
 {
     xdrTmp = xdr;
     useXdr = map->useXdr;
     srcType = sType;
 
-    if (map->useXdr == G3D_USE_XDR) {
+    if (map->useXdr == RASTER3D_USE_XDR) {
 	if (!xdr_setpos(&(xdrEncodeStream), 0)) {
 	    G3d_error("G3d_InitCopyToXdr: positioning xdr failed");
 	    return 0;
@@ -151,7 +151,7 @@ int G3d_copyToXdr(const void *src, int nofNum)
 {
     int i;
 
-    if (useXdr == G3D_NO_XDR) {
+    if (useXdr == RASTER3D_NO_XDR) {
 	G3d_copyValues(src, 0, srcType, xdrTmp, 0, type, nofNum);
 	xdrTmp = G_incr_void_ptr(xdrTmp, nofNum * G3d_externLength(type));
 	return 1;
@@ -193,13 +193,13 @@ int G3d_copyToXdr(const void *src, int nofNum)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_initCopyFromXdr(G3D_Map * map, int dType)
+int G3d_initCopyFromXdr(RASTER3D_Map * map, int dType)
 {
     xdrTmp = xdr;
     useXdr = map->useXdr;
     dstType = dType;
 
-    if (useXdr == G3D_USE_XDR) {
+    if (useXdr == RASTER3D_USE_XDR) {
 	if (!xdr_setpos(&(xdrDecodeStream), 0)) {
 	    G3d_error("G3d_initCopyFromXdr: positioning xdr failed");
 	    return 0;
@@ -226,7 +226,7 @@ int G3d_copyFromXdr(int nofNum, void *dst)
 {
     int i;
 
-    if (useXdr == G3D_NO_XDR) {
+    if (useXdr == RASTER3D_NO_XDR) {
 	G3d_copyValues(xdrTmp, 0, type, dst, 0, dstType, nofNum);
 	xdrTmp = G_incr_void_ptr(xdrTmp, nofNum * G3d_externLength(type));
 	return 1;

lib/raster3d/getblock.c

@@ -9,7 +9,7 @@
 /*---------------------------------------------------------------------------*/
 
 void
-G3d_getBlockNocache(G3D_Map * map, int x0, int y0, int z0, int nx, int ny,
+G3d_getBlockNocache(RASTER3D_Map * map, int x0, int y0, int z0, int nx, int ny,
 		    int nz, void *block, int type)
 {
     void *tile;
@@ -102,7 +102,7 @@ G3d_getBlockNocache(G3D_Map * map, int x0, int y0, int z0, int nx, int ny,
  */
 
 void
-G3d_getBlock(G3D_Map * map, int x0, int y0, int z0, int nx, int ny, int nz,
+G3d_getBlock(RASTER3D_Map * map, int x0, int y0, int z0, int nx, int ny, int nz,
 	     void *block, int type)
 {
     int x, y, z, nNull, x1, y1, z1, length;
@@ -112,9 +112,9 @@ G3d_getBlock(G3D_Map * map, int x0, int y0, int z0, int nx, int ny, int nz,
 	return;
     }
 
-    x1 = G3D_MIN(x0 + nx, map->region.cols);
-    y1 = G3D_MIN(y0 + ny, map->region.rows);
-    z1 = G3D_MIN(z0 + nz, map->region.depths);
+    x1 = RASTER3D_MIN(x0 + nx, map->region.cols);
+    y1 = RASTER3D_MIN(y0 + ny, map->region.rows);
+    z1 = RASTER3D_MIN(z0 + nz, map->region.depths);
 
     length = G3d_length(type);
 

lib/raster3d/getvalue.c

@@ -19,7 +19,7 @@
  *  \return void
  */
 
-void G3d_getValue(G3D_Map * map, int x, int y, int z, void *value, int type)
+void G3d_getValue(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
 {
     /* get the resampled value */
     map->resampleFun(map, x, y, z, value, type);
@@ -40,7 +40,7 @@ void G3d_getValue(G3D_Map * map, int x, int y, int z, void *value, int type)
  *  \return float
  */
 
-float G3d_getFloat(G3D_Map * map, int x, int y, int z)
+float G3d_getFloat(RASTER3D_Map * map, int x, int y, int z)
 {
     float value;
 
@@ -63,7 +63,7 @@ float G3d_getFloat(G3D_Map * map, int x, int y, int z)
  *  \return double
  */
 
-double G3d_getDouble(G3D_Map * map, int x, int y, int z)
+double G3d_getDouble(RASTER3D_Map * map, int x, int y, int z)
 {
     double value;
 
@@ -91,7 +91,7 @@ double G3d_getDouble(G3D_Map * map, int x, int y, int z)
  */
 
 void
-G3d_getWindowValue(G3D_Map * map, double north, double east, double top,
+G3d_getWindowValue(RASTER3D_Map * map, double north, double east, double top,
 		   void *value, int type)
 {
     int col, row, depth;
@@ -128,7 +128,7 @@ G3d_getWindowValue(G3D_Map * map, double north, double east, double top,
  */
 
 void
-G3d_getRegionValue(G3D_Map * map, double north, double east, double top,
+G3d_getRegionValue(RASTER3D_Map * map, double north, double east, double top,
 		   void *value, int type)
 {
     int row, col, depth;
@@ -162,7 +162,7 @@ G3d_getRegionValue(G3D_Map * map, double north, double east, double top,
  *  \return float
  */
 
-float G3d_getFloatRegion(G3D_Map * map, int x, int y, int z)
+float G3d_getFloatRegion(RASTER3D_Map * map, int x, int y, int z)
 {
     int tileIndex, offs;
     float *tile;
@@ -195,7 +195,7 @@ float G3d_getFloatRegion(G3D_Map * map, int x, int y, int z)
  *  \return double
  */
 
-double G3d_getDoubleRegion(G3D_Map * map, int x, int y, int z)
+double G3d_getDoubleRegion(RASTER3D_Map * map, int x, int y, int z)
 {
     int tileIndex, offs;
     double *tile;
@@ -234,7 +234,7 @@ double G3d_getDoubleRegion(G3D_Map * map, int x, int y, int z)
  */
 
 void
-G3d_getValueRegion(G3D_Map * map, int x, int y, int z, void *value, int type)
+G3d_getValueRegion(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
 {
     if (type == FCELL_TYPE) {
 	*((float *)value) = G3d_getFloatRegion(map, x, y, z);

lib/raster3d/header.c

@@ -16,18 +16,18 @@ int xdrLength;
 
 /*---------------------------------------------------------------------------*/
 
-#define G3D_HEADER_TILEX "TileDimensionX"
-#define G3D_HEADER_TILEY "TileDimensionY"
-#define G3D_HEADER_TILEZ "TileDimensionZ"
-#define G3D_HEADER_TYPE "CellType"
-#define G3D_HEADER_COMPRESSION "useCompression"
-#define G3D_HEADER_USERLE "useRle"
-#define G3D_HEADER_USELZW "useLzw"
-#define G3D_HEADER_PRECISION "Precision"
-#define G3D_HEADER_DATA_OFFSET "nofHeaderBytes"
-#define G3D_HEADER_USEXDR "useXdr"
-#define G3D_HEADER_HASINDEX "hasIndex"
-#define G3D_HEADER_UNIT "Units"
+#define RASTER3D_HEADER_TILEX "TileDimensionX"
+#define RASTER3D_HEADER_TILEY "TileDimensionY"
+#define RASTER3D_HEADER_TILEZ "TileDimensionZ"
+#define RASTER3D_HEADER_TYPE "CellType"
+#define RASTER3D_HEADER_COMPRESSION "useCompression"
+#define RASTER3D_HEADER_USERLE "useRle"
+#define RASTER3D_HEADER_USELZW "useLzw"
+#define RASTER3D_HEADER_PRECISION "Precision"
+#define RASTER3D_HEADER_DATA_OFFSET "nofHeaderBytes"
+#define RASTER3D_HEADER_USEXDR "useXdr"
+#define RASTER3D_HEADER_HASINDEX "hasIndex"
+#define RASTER3D_HEADER_UNIT "Units"
 
 /*---------------------------------------------------------------------------*/
 
@@ -59,45 +59,45 @@ G3d_readWriteHeader(struct Key_Value *headerKeys, int doRead, int *proj,
     }
 
     returnVal = 1;
-    returnVal &= headerInt(headerKeys, G3D_REGION_PROJ, proj);
-    returnVal &= headerInt(headerKeys, G3D_REGION_ZONE, zone);
+    returnVal &= headerInt(headerKeys, RASTER3D_REGION_PROJ, proj);
+    returnVal &= headerInt(headerKeys, RASTER3D_REGION_ZONE, zone);
 
-    returnVal &= headerDouble(headerKeys, G3D_REGION_NORTH, north);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_SOUTH, south);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_EAST, east);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_WEST, west);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_TOP, top);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_BOTTOM, bottom);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_NORTH, north);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_SOUTH, south);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_EAST, east);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_WEST, west);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_TOP, top);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_BOTTOM, bottom);
 
-    returnVal &= headerInt(headerKeys, G3D_REGION_ROWS, rows);
-    returnVal &= headerInt(headerKeys, G3D_REGION_COLS, cols);
-    returnVal &= headerInt(headerKeys, G3D_REGION_DEPTHS, depths);
+    returnVal &= headerInt(headerKeys, RASTER3D_REGION_ROWS, rows);
+    returnVal &= headerInt(headerKeys, RASTER3D_REGION_COLS, cols);
+    returnVal &= headerInt(headerKeys, RASTER3D_REGION_DEPTHS, depths);
 
-    returnVal &= headerDouble(headerKeys, G3D_REGION_NSRES, ns_res);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_EWRES, ew_res);
-    returnVal &= headerDouble(headerKeys, G3D_REGION_TBRES, tb_res);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_NSRES, ns_res);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_EWRES, ew_res);
+    returnVal &= headerDouble(headerKeys, RASTER3D_REGION_TBRES, tb_res);
 
-    returnVal &= headerInt(headerKeys, G3D_HEADER_TILEX, tileX);
-    returnVal &= headerInt(headerKeys, G3D_HEADER_TILEY, tileY);
-    returnVal &= headerInt(headerKeys, G3D_HEADER_TILEZ, tileZ);
+    returnVal &= headerInt(headerKeys, RASTER3D_HEADER_TILEX, tileX);
+    returnVal &= headerInt(headerKeys, RASTER3D_HEADER_TILEY, tileY);
+    returnVal &= headerInt(headerKeys, RASTER3D_HEADER_TILEZ, tileZ);
 
-    returnVal &= headerValue(headerKeys, G3D_HEADER_TYPE,
+    returnVal &= headerValue(headerKeys, RASTER3D_HEADER_TYPE,
 			     "double", "float", DCELL_TYPE, FCELL_TYPE, type);
-    returnVal &= headerValue(headerKeys, G3D_HEADER_COMPRESSION,
+    returnVal &= headerValue(headerKeys, RASTER3D_HEADER_COMPRESSION,
 			     "0", "1", 0, 1, compression);
-    returnVal &= headerValue(headerKeys, G3D_HEADER_USERLE,
+    returnVal &= headerValue(headerKeys, RASTER3D_HEADER_USERLE,
 			     "0", "1", 0, 1, useRle);
-    returnVal &= headerValue(headerKeys, G3D_HEADER_USELZW,
+    returnVal &= headerValue(headerKeys, RASTER3D_HEADER_USELZW,
 			     "0", "1", 0, 1, useLzw);
 
-    returnVal &= headerInt(headerKeys, G3D_HEADER_PRECISION, precision);
-    returnVal &= headerInt(headerKeys, G3D_HEADER_DATA_OFFSET, dataOffset);
+    returnVal &= headerInt(headerKeys, RASTER3D_HEADER_PRECISION, precision);
+    returnVal &= headerInt(headerKeys, RASTER3D_HEADER_DATA_OFFSET, dataOffset);
 
-    returnVal &= headerValue(headerKeys, G3D_HEADER_USEXDR,
+    returnVal &= headerValue(headerKeys, RASTER3D_HEADER_USEXDR,
 			     "0", "1", 0, 1, useXdr);
-    returnVal &= headerValue(headerKeys, G3D_HEADER_HASINDEX,
+    returnVal &= headerValue(headerKeys, RASTER3D_HEADER_HASINDEX,
 			     "0", "1", 0, 1, hasIndex);
-    returnVal &= headerString(headerKeys, G3D_HEADER_UNIT, unit);
+    returnVal &= headerString(headerKeys, RASTER3D_HEADER_UNIT, unit);
 
     if (returnVal)
 	return 1;
@@ -109,7 +109,7 @@ G3d_readWriteHeader(struct Key_Value *headerKeys, int doRead, int *proj,
 /*---------------------------------------------------------------------------*/
 
 int
-G3d_readHeader(G3D_Map * map, int *proj, int *zone, double *north,
+G3d_readHeader(RASTER3D_Map * map, int *proj, int *zone, double *north,
 	       double *south, double *east, double *west, double *top,
 	       double *bottom, int *rows, int *cols, int *depths,
 	       double *ew_res, double *ns_res, double *tb_res, int *tileX,
@@ -120,7 +120,7 @@ G3d_readHeader(G3D_Map * map, int *proj, int *zone, double *north,
     struct Key_Value *headerKeys;
     char path[GPATH_MAX];
 
-    G3d_filename(path, G3D_HEADER_ELEMENT, map->fileName, map->mapset);
+    G3d_filename(path, RASTER3D_HEADER_ELEMENT, map->fileName, map->mapset);
     if (access(path, R_OK) != 0) {
 	G3d_error("G3d_readHeader: unable to find [%s]", path);
 	return 0;
@@ -148,7 +148,7 @@ G3d_readHeader(G3D_Map * map, int *proj, int *zone, double *north,
 /*---------------------------------------------------------------------------*/
 
 int
-G3d_writeHeader(G3D_Map * map, int proj, int zone, double north, double south,
+G3d_writeHeader(RASTER3D_Map * map, int proj, int zone, double north, double south,
 		double east, double west, double top, double bottom, int rows,
 		int cols, int depths, double ew_res, double ns_res,
 		double tb_res, int tileX, int tileY, int tileZ, int type,
@@ -174,7 +174,7 @@ G3d_writeHeader(G3D_Map * map, int proj, int zone, double north, double south,
 	return 0;
     }
 
-    G3d_filename(path, G3D_HEADER_ELEMENT, map->fileName, map->mapset);
+    G3d_filename(path, RASTER3D_HEADER_ELEMENT, map->fileName, map->mapset);
     G3d_makeMapsetMapDirectory(map->fileName);
     G_write_key_value_file(path, headerKeys);
 
@@ -194,15 +194,15 @@ G3d_writeHeader(G3D_Map * map, int proj, int zone, double north, double south,
  * to specify the size of the cache.
  * If <em>cacheCode</em> is the size (in tiles) of the cache the function returns
  * <em>cacheCode * n</em>.
- * If <em>cacheCode</em> is G3D_USE_CACHE_DEFAULT the function returns
- * G3D_USE_CACHE_DEFAULT.
- * If <em>cacheCode</em> is G3D_USE_CACHE_??? the function returns a value
- * encoding G3D_USE_CACHE_??? and <em>n</em>. Here G3D_USE_CACHE_??? is one
- * of G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
- * G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ, or
- * G3D_USE_CACHE_XYZ, where e.g.  G3D_USE_CACHE_X specifies that the cache
+ * If <em>cacheCode</em> is RASTER3D_USE_CACHE_DEFAULT the function returns
+ * RASTER3D_USE_CACHE_DEFAULT.
+ * If <em>cacheCode</em> is RASTER3D_USE_CACHE_??? the function returns a value
+ * encoding RASTER3D_USE_CACHE_??? and <em>n</em>. Here RASTER3D_USE_CACHE_??? is one
+ * of RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+ * RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ, or
+ * RASTER3D_USE_CACHE_XYZ, where e.g.  RASTER3D_USE_CACHE_X specifies that the cache
  * should store as many tiles as there exist in one row along the x-axis of the
- * tile cube, and G3D_USE_CACHE_XY specifies that the cache should store as
+ * tile cube, and RASTER3D_USE_CACHE_XY specifies that the cache should store as
  * many tiles as there exist in one slice of the tile cube with constant Z
  * coordinate.
  *
@@ -213,12 +213,12 @@ G3d_writeHeader(G3D_Map * map, int proj, int zone, double north, double south,
 
 int G3d_cacheSizeEncode(int cacheCode, int n)
 {
-    if (cacheCode >= G3D_NO_CACHE)
+    if (cacheCode >= RASTER3D_NO_CACHE)
 	return cacheCode * n;
-    if (cacheCode == G3D_USE_CACHE_DEFAULT)
+    if (cacheCode == RASTER3D_USE_CACHE_DEFAULT)
 	return cacheCode;
 
-    if (cacheCode < G3D_USE_CACHE_XYZ)
+    if (cacheCode < RASTER3D_USE_CACHE_XYZ)
 	G3d_fatalError("G3d_cacheSizeEncode: invalid cache code");
 
     return n * (-10) + cacheCode;
@@ -226,47 +226,47 @@ int G3d_cacheSizeEncode(int cacheCode, int n)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d__computeCacheSize(G3D_Map * map, int cacheCode)
+int G3d__computeCacheSize(RASTER3D_Map * map, int cacheCode)
 {
     int n, size;
 
-    if (cacheCode >= G3D_NO_CACHE)
+    if (cacheCode >= RASTER3D_NO_CACHE)
 	return cacheCode;
-    if (cacheCode == G3D_USE_CACHE_DEFAULT)
-	return G3D_MIN(g3d_cache_default, map->nTiles);
+    if (cacheCode == RASTER3D_USE_CACHE_DEFAULT)
+	return RASTER3D_MIN(g3d_cache_default, map->nTiles);
 
     n = -(cacheCode / 10);
-    n = G3D_MAX(1, n);
+    n = RASTER3D_MAX(1, n);
     cacheCode = -((-cacheCode) % 10);
 
-    if (cacheCode == G3D_USE_CACHE_X)
+    if (cacheCode == RASTER3D_USE_CACHE_X)
 	size = map->nx * n;
-    else if (cacheCode == G3D_USE_CACHE_Y)
+    else if (cacheCode == RASTER3D_USE_CACHE_Y)
 	size = map->ny * n;
-    else if (cacheCode == G3D_USE_CACHE_Z)
+    else if (cacheCode == RASTER3D_USE_CACHE_Z)
 	size = map->nz * n;
-    else if (cacheCode == G3D_USE_CACHE_XY)
+    else if (cacheCode == RASTER3D_USE_CACHE_XY)
 	size = map->nxy * n;
-    else if (cacheCode == G3D_USE_CACHE_XZ)
+    else if (cacheCode == RASTER3D_USE_CACHE_XZ)
 	size = map->nx * map->nz * n;
-    else if (cacheCode == G3D_USE_CACHE_YZ)
+    else if (cacheCode == RASTER3D_USE_CACHE_YZ)
 	size = map->ny * map->nz * n;
-    else if (cacheCode == G3D_USE_CACHE_XYZ)
+    else if (cacheCode == RASTER3D_USE_CACHE_XYZ)
 	size = map->nTiles;
     else
 	G3d_fatalError("G3d__computeCacheSize: invalid cache code");
 
-    return G3D_MIN(size, map->nTiles);
+    return RASTER3D_MIN(size, map->nTiles);
 }
 
 /*---------------------------------------------------------------------------*/
 
 /* this function does actually more than filling the header fields of the */
-/* G3D-Map structure. It also allocates memory for compression and xdr, */
+/* RASTER3D-Map structure. It also allocates memory for compression and xdr, */
 /* and initializes the index and cache. This function should be taken apart. */
 
 int
-G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
+G3d_fillHeader(RASTER3D_Map * map, int operation, int compression, int useRle,
 	       int useLzw, int type, int precision, int cache, int hasIndex,
 	       int useXdr, int typeIntern, int nofHeaderBytes, int tileX,
 	       int tileY, int tileZ, int proj, int zone, double north,
@@ -274,7 +274,7 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
 	       double bottom, int rows, int cols, int depths, double ew_res,
 	       double ns_res, double tb_res, char *unit)
 {
-    if (!G3D_VALID_OPERATION(operation))
+    if (!RASTER3D_VALID_OPERATION(operation))
 	G3d_fatalError("G3d_fillHeader: operation not valid\n");
 
     map->operation = operation;
@@ -334,7 +334,7 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
 	G3d_fatalError("G3d_fillHeader: invalid type");
     map->typeIntern = typeIntern;
 
-    if (!G3D_VALID_XDR_OPTION(useXdr))
+    if (!RASTER3D_VALID_XDR_OPTION(useXdr))
 	G3d_fatalError("G3d_fillHeader: invalid xdr option");
     map->useXdr = useXdr;
 
@@ -345,7 +345,7 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
 	return 0;
     }
 
-    map->useCache = (cache != G3D_NO_CACHE);
+    map->useCache = (cache != RASTER3D_NO_CACHE);
 
     map->numLengthIntern = G3d_length(map->typeIntern);
     map->numLengthExtern = G3d_externLength(map->type);
@@ -357,10 +357,10 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
 
 #define RLE_STATUS_BYTES 2
 
-    if (map->compression != G3D_NO_COMPRESSION) {
+    if (map->compression != RASTER3D_NO_COMPRESSION) {
 	if (tmpCompress == NULL) {
 	    tmpCompressLength = map->tileSize *
-		G3D_MAX(map->numLengthIntern, map->numLengthExtern) +
+		RASTER3D_MAX(map->numLengthIntern, map->numLengthExtern) +
 		RLE_STATUS_BYTES;
 	    tmpCompress = G3d_malloc(tmpCompressLength);
 	    if (tmpCompress == NULL) {
@@ -369,10 +369,10 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
 	    }
 	}
 	else if (map->tileSize *
-		 G3D_MAX(map->numLengthIntern, map->numLengthExtern)
+		 RASTER3D_MAX(map->numLengthIntern, map->numLengthExtern)
 		 + RLE_STATUS_BYTES > tmpCompressLength) {
 	    tmpCompressLength = map->tileSize *
-		G3D_MAX(map->numLengthIntern, map->numLengthExtern) +
+		RASTER3D_MAX(map->numLengthIntern, map->numLengthExtern) +
 		RLE_STATUS_BYTES;
 	    tmpCompress = G3d_realloc(tmpCompress, tmpCompressLength);
 	    if (tmpCompress == NULL) {
@@ -390,7 +390,7 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
     }
 
     if ((!map->useCache) ||
-	((cache == G3D_USE_CACHE_DEFAULT) && (g3d_cache_default == 0))) {
+	((cache == RASTER3D_USE_CACHE_DEFAULT) && (g3d_cache_default == 0))) {
 	map->useCache = 0;
 	map->cache = NULL;
 	/* allocate one tile buffer */
@@ -403,8 +403,8 @@ G3d_fillHeader(G3D_Map * map, int operation, int compression, int useRle,
     }
     else {
 	if (!G3d_initCache(map,
-			   G3D_MAX(1,
-				   G3D_MIN(G3d__computeCacheSize(map, cache),
+			   RASTER3D_MAX(1,
+				   RASTER3D_MIN(G3d__computeCacheSize(map, cache),
 					   g3d_cache_max /
 					   map->tileSize /
 					   map->numLengthIntern)))) {

lib/raster3d/headerinfo.c

@@ -16,7 +16,7 @@
  *  \return void
  */
 
-void G3d_getCoordsMap(G3D_Map * map, int *rows, int *cols, int *depths)
+void G3d_getCoordsMap(RASTER3D_Map * map, int *rows, int *cols, int *depths)
 {
     *rows = map->region.rows;
     *cols = map->region.cols;
@@ -25,7 +25,7 @@ void G3d_getCoordsMap(G3D_Map * map, int *rows, int *cols, int *depths)
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_getCoordsMapWindow(G3D_Map * map, int *rows, int *cols, int *depths)
+void G3d_getCoordsMapWindow(RASTER3D_Map * map, int *rows, int *cols, int *depths)
 {
     *rows = map->window.rows;
     *cols = map->window.cols;
@@ -48,7 +48,7 @@ void G3d_getCoordsMapWindow(G3D_Map * map, int *rows, int *cols, int *depths)
  *  \return void
  */
 
-void G3d_getNofTilesMap(G3D_Map * map, int *nx, int *ny, int *nz)
+void G3d_getNofTilesMap(RASTER3D_Map * map, int *nx, int *ny, int *nz)
 {
     *nx = map->nx;
     *ny = map->ny;
@@ -74,7 +74,7 @@ void G3d_getNofTilesMap(G3D_Map * map, int *nx, int *ny, int *nz)
  */
 
 void
-G3d_getRegionMap(G3D_Map * map, double *north, double *south, double *east,
+G3d_getRegionMap(RASTER3D_Map * map, double *north, double *south, double *east,
 		 double *west, double *top, double *bottom)
 {
     *north = map->region.north;
@@ -88,7 +88,7 @@ G3d_getRegionMap(G3D_Map * map, double *north, double *south, double *east,
 /*---------------------------------------------------------------------------*/
 
 void
-G3d_getWindowMap(G3D_Map * map, double *north, double *south, double *east,
+G3d_getWindowMap(RASTER3D_Map * map, double *north, double *south, double *east,
 		 double *west, double *top, double *bottom)
 {
     *north = map->window.north;
@@ -112,14 +112,14 @@ G3d_getWindowMap(G3D_Map * map, double *north, double *south, double *east,
  *  \return void
  */
 
-void G3d_getRegionStructMap(G3D_Map * map, G3D_Region * region)
+void G3d_getRegionStructMap(RASTER3D_Map * map, RASTER3D_Region * region)
 {
     G3d_regionCopy(region, &(map->region));
 }
 
 /*---------------------------------------------------------------------------*/
 
-void G3d_getWindowStructMap(G3D_Map * map, G3D_Region * window)
+void G3d_getWindowStructMap(RASTER3D_Map * map, RASTER3D_Region * window)
 {
     G3d_regionCopy(window, &(map->window));
 }
@@ -139,7 +139,7 @@ void G3d_getWindowStructMap(G3D_Map * map, G3D_Region * window)
  *  \return void
  */
 
-void G3d_getTileDimensionsMap(G3D_Map * map, int *x, int *y, int *z)
+void G3d_getTileDimensionsMap(RASTER3D_Map * map, int *x, int *y, int *z)
 {
     *x = map->tileX;
     *y = map->tileY;
@@ -158,7 +158,7 @@ void G3d_getTileDimensionsMap(G3D_Map * map, int *x, int *y, int *z)
  *  \return int
  */
 
-int G3d_tileTypeMap(G3D_Map * map)
+int G3d_tileTypeMap(RASTER3D_Map * map)
 {
     return map->typeIntern;
 }
@@ -175,7 +175,7 @@ int G3d_tileTypeMap(G3D_Map * map)
  *  \return int
  */
 
-int G3d_fileTypeMap(G3D_Map * map)
+int G3d_fileTypeMap(RASTER3D_Map * map)
 {
     return map->type;
 }
@@ -192,7 +192,7 @@ int G3d_fileTypeMap(G3D_Map * map)
  *  \return int
  */
 
-int G3d_tilePrecisionMap(G3D_Map * map)
+int G3d_tilePrecisionMap(RASTER3D_Map * map)
 {
     return map->precision;
 }
@@ -209,7 +209,7 @@ int G3d_tilePrecisionMap(G3D_Map * map)
  *  \return int
  */
 
-int G3d_tileUseCacheMap(G3D_Map * map)
+int G3d_tileUseCacheMap(RASTER3D_Map * map)
 {
     return map->useCache;
 }
@@ -225,13 +225,13 @@ int G3d_tileUseCacheMap(G3D_Map * map)
  *  \return void
  */
 
-void G3d_printHeader(G3D_Map * map)
+void G3d_printHeader(RASTER3D_Map * map)
 {
     double rangeMin, rangeMax;
 
     printf("File %s open for %sing:\n", map->fileName,
-	   (map->operation == G3D_WRITE_DATA ? "writ" :
-	    (map->operation == G3D_READ_DATA ? "read" : "unknown")));
+	   (map->operation == RASTER3D_WRITE_DATA ? "writ" :
+	    (map->operation == RASTER3D_READ_DATA ? "read" : "unknown")));
     printf("  Fd = %d, Unit %s, Type: %s, ", map->data_fd,
 	   map->unit,
 	   (map->type == FCELL_TYPE ? "float" :
@@ -239,7 +239,7 @@ void G3d_printHeader(G3D_Map * map)
     printf("Type intern: %s\n",
 	   (map->typeIntern == FCELL_TYPE ? "float" :
 	    (map->typeIntern == DCELL_TYPE ? "double" : "unknown")));
-    if (map->compression == G3D_NO_COMPRESSION)
+    if (map->compression == RASTER3D_NO_COMPRESSION)
 	printf("  Compression: none\n");
     else {
 	printf("  Compression:%s%s Precision: %s",
@@ -253,7 +253,7 @@ void G3d_printHeader(G3D_Map * map)
 	printf("  Cache: none\n");
     else {
 	printf("  Cache: used%s\n",
-	       (map->operation == G3D_WRITE_DATA ? ", File Cache used" : ""));
+	       (map->operation == RASTER3D_WRITE_DATA ? ", File Cache used" : ""));
     }
 
     G3d_range_min_max(map, &rangeMin, &rangeMax);

lib/raster3d/history.c

@@ -67,7 +67,7 @@ int G3d_readHistory(const char *name, const char *mapset, struct History *hist)
 
     G_zero(hist, sizeof(struct History));
 
-    fp = G_fopen_old_misc(G3D_DIRECTORY, G3D_HISTORY_ELEMENT, name, mapset);
+    fp = G_fopen_old_misc(RASTER3D_DIRECTORY, RASTER3D_HISTORY_ELEMENT, name, mapset);
     if (!fp)
 	return -2;
 
@@ -97,7 +97,7 @@ int G3d_readHistory(const char *name, const char *mapset, struct History *hist)
 int G3d_writeHistory(const char *name, struct History *hist)
 /* This function is adapted from Rast_write_history */
 {
-    FILE *fp = G_fopen_new_misc(G3D_DIRECTORY, G3D_HISTORY_ELEMENT, name);
+    FILE *fp = G_fopen_new_misc(RASTER3D_DIRECTORY, RASTER3D_HISTORY_ELEMENT, name);
     if (!fp)
 	return -1;
 

lib/raster3d/index.c

@@ -7,7 +7,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_readIndex(G3D_Map * map)
+static int G3d_readIndex(RASTER3D_Map * map)
 {
     unsigned char *tmp, *tmp2;
     int dummy1, dummy2, indexLength, tileIndex;
@@ -75,7 +75,7 @@ static int G3d_readIndex(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_flushIndex(G3D_Map * map)
+int G3d_flushIndex(RASTER3D_Map * map)
 {
     int sizeCompressed, indexLength, tileIndex;
     unsigned char *tmp;
@@ -152,7 +152,7 @@ static int indexSortCompare(const void *a, const void *b)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_initIndex(G3D_Map * map, int hasIndex)
+int G3d_initIndex(RASTER3D_Map * map, int hasIndex)
 {
     int tile;
     int i0, i1, i2, i3, i4, i5, offset, nofElts;
@@ -167,7 +167,7 @@ int G3d_initIndex(G3D_Map * map, int hasIndex)
 	return 0;
     }
 
-    if (map->operation == G3D_WRITE_DATA) {
+    if (map->operation == RASTER3D_WRITE_DATA) {
 	for (tile = 0; tile < map->nTiles; tile++)
 	    map->index[tile] = -1;
 	return 1;

lib/raster3d/intio.c

@@ -12,13 +12,13 @@ int G3d_writeInts(int fd, int useXdr, const int *i, int nofNum)
 {
     int firstTime = 1;
     XDR xdrEncodeStream;
-    char xdrIntBuf[G3D_XDR_INT_LENGTH * 1024];
+    char xdrIntBuf[RASTER3D_XDR_INT_LENGTH * 1024];
     u_int n;
 
     if (nofNum <= 0)
 	G3d_fatalError("G3d_writeInts: nofNum out of range");
 
-    if (useXdr == G3D_NO_XDR) {
+    if (useXdr == RASTER3D_NO_XDR) {
 	if (write(fd, i, sizeof(int) * nofNum) != sizeof(int) * nofNum) {
 	    G3d_error("G3d_writeInts: writing to file failed");
 	    return 0;
@@ -29,7 +29,7 @@ int G3d_writeInts(int fd, int useXdr, const int *i, int nofNum)
     }
 
     if (firstTime) {
-	xdrmem_create(&xdrEncodeStream, xdrIntBuf, G3D_XDR_INT_LENGTH * 1024,
+	xdrmem_create(&xdrEncodeStream, xdrIntBuf, RASTER3D_XDR_INT_LENGTH * 1024,
 		      XDR_ENCODE);
 	firstTime = 1;
     }
@@ -50,8 +50,8 @@ int G3d_writeInts(int fd, int useXdr, const int *i, int nofNum)
 	    return 0;
 	}
 
-	if (write(fd, xdrIntBuf, G3D_XDR_INT_LENGTH * n) !=
-	    G3D_XDR_INT_LENGTH * n) {
+	if (write(fd, xdrIntBuf, RASTER3D_XDR_INT_LENGTH * n) !=
+	    RASTER3D_XDR_INT_LENGTH * n) {
 	    G3d_error("G3d_writeInts: writing xdr to file failed");
 	    return 0;
 	}
@@ -69,13 +69,13 @@ int G3d_readInts(int fd, int useXdr, int *i, int nofNum)
 {
     int firstTime = 1;
     XDR xdrDecodeStream;
-    char xdrIntBuf[G3D_XDR_INT_LENGTH * 1024];
+    char xdrIntBuf[RASTER3D_XDR_INT_LENGTH * 1024];
     u_int n;
 
     if (nofNum <= 0)
 	G3d_fatalError("G3d_readInts: nofNum out of range");
 
-    if (useXdr == G3D_NO_XDR) {
+    if (useXdr == RASTER3D_NO_XDR) {
 	if (read(fd, i, sizeof(int) * nofNum) != sizeof(int) * nofNum) {
 	    G3d_error("G3d_readInts: reading from file failed");
 	    return 0;
@@ -86,7 +86,7 @@ int G3d_readInts(int fd, int useXdr, int *i, int nofNum)
     }
 
     if (firstTime) {
-	xdrmem_create(&xdrDecodeStream, xdrIntBuf, G3D_XDR_INT_LENGTH * 1024,
+	xdrmem_create(&xdrDecodeStream, xdrIntBuf, RASTER3D_XDR_INT_LENGTH * 1024,
 		      XDR_DECODE);
 	firstTime = 1;
     }
@@ -96,8 +96,8 @@ int G3d_readInts(int fd, int useXdr, int *i, int nofNum)
 	if (n == 0)
 	    n = 1024;
 
-	if (read(fd, xdrIntBuf, G3D_XDR_INT_LENGTH * n) !=
-	    G3D_XDR_INT_LENGTH * n) {
+	if (read(fd, xdrIntBuf, RASTER3D_XDR_INT_LENGTH * n) !=
+	    RASTER3D_XDR_INT_LENGTH * n) {
 	    G3d_error("G3d_readInts: reading xdr from file failed");
 	    return 0;
 	}

lib/raster3d/lib.dox

@@ -16,7 +16,7 @@ Authors: Roman Waupotitsch and Michael Shapiro, Helena Mitasova,
 <b>Overview</b>
 
 The Grid3D raster volume Library is used for the r3.* and vector
-volume tools. The G3D library uses a tile cache based approach to store floating point
+volume tools. The RASTER3D library uses a tile cache based approach to store floating point
  values in abritrary order in a volume. The coordinate system of a volume is 
 column and row compatible to the raster library and counts from the bottom to the top
 of the cube.
@@ -25,7 +25,7 @@ of the cube.
 <img src=g3d_volume_layout.png border=0><BR>
 <table border=0 width=700>
 <tr><td><center>
-<i>The volume coordinate system and tile layout of the G3D library</i>
+<i>The volume coordinate system and tile layout of the RASTER3D library</i>
 </center></td></tr>
 </table>
 </center>
@@ -105,7 +105,7 @@ other method (for variables of type long only).
 \section Tile_Data_NULL_values Tile Data NULL-values
 
 <P>
-G3D uses the same functions as <EM>2d</EM> GRASS to set and test NULL-values.  The
+RASTER3D uses the same functions as <EM>2d</EM> GRASS to set and test NULL-values.  The
 storage in the file is different though.  NULL-values are stored with a special
 bit-pattern if maximum precision is chosen.  They are stored by adding an
 additional bit if the precision is smaller.
@@ -256,7 +256,7 @@ not be modified. The precision value -1 indicates that maximum
 precision is used.
 <BR>
 <P>
-Binary files not in G3D format can be read by the library. The
+Binary files not in RASTER3D format can be read by the library. The
 following actions have to be taken: 
 
 <P>
@@ -322,7 +322,7 @@ typedef struct{
     int proj;  /* Projection (see gis.h) */
     int zone;  /* Projection zone (see gis.h) */
 
-} G3D\_Region;
+} RASTER3D\_Region;
 \endverbatim
 
 <P>
@@ -378,7 +378,7 @@ performed every time it is being accessed.
 \section Masks Masks
 
 <P>
-G3D provides a mask for the <EM>3d</EM> region.  The mask structure is
+RASTER3D provides a mask for the <EM>3d</EM> region.  The mask structure is
 automatically initialized at the time the first file is opened. The same
 structure is used for all the files. The default for every file is that the
 mask is turned off. If masking should be performed, the application program has
@@ -402,11 +402,11 @@ of disk space and the access time for the mask.
 \section Include_File Include File
 
 <P>
-Exported G3D constants and structures can be found in <EM>G3d.h</EM>.
+Exported RASTER3D constants and structures can be found in <EM>G3d.h</EM>.
 
 <P>
 
-\section G3D_Defaults G3D Defaults
+\section RASTER3D_Defaults RASTER3D Defaults
 
 <P>
 There are three methods to set default variables. First, the default can be set
@@ -432,11 +432,11 @@ The limit is specified in bytes. It is a limit on the size of cell-data stored
 in the cache and does not include the support structure.
 
 <P>
-Default G3D_CACHE_SIZE_MAX_DEFAULT. This is currently set to 16meg and can
+Default RASTER3D_CACHE_SIZE_MAX_DEFAULT. This is currently set to 16meg and can
 be changed at compilation time of the library.
 
 <P>
-Environment variable G3D_MAX_CACHE_SIZE.
+Environment variable RASTER3D_MAX_CACHE_SIZE.
 
 <P>
 void G3d_setCacheLimit(int nBytes)Set cache limit
@@ -450,16 +450,16 @@ int G3d_getCacheLimit(int nBytes)Get cache limit
 
 <P>
 This value specifies the number of tiles stored in the cache. It is the value
-used if at opening time of a map G3D_USE_CACHE_DEFAULT is used for the cache
+used if at opening time of a map RASTER3D_USE_CACHE_DEFAULT is used for the cache
 mode. Any other value used at opening time will supersede the default value. A
 default value of 0 indicates that non-cache mode should be used by default.
 
 <P>
-Default G3D_CACHE_SIZE_DEFAULT. This is currently set to 1000 and can be
+Default RASTER3D_CACHE_SIZE_DEFAULT. This is currently set to 1000 and can be
 changed at compilation time of the library.
 
 <P>
-Environment variable G3D_DEFAULT_CACHE_SIZE.
+Environment variable RASTER3D_DEFAULT_CACHE_SIZE.
 
 <P>
 void G3d_setCacheSize(int nTiles)
@@ -478,11 +478,11 @@ This value specifies whether compression should be used while writing a new
 map. It does not have any effect on old maps.
 
 <P>
-Default G3D_COMPRESSION_DEFAULT. This is set to G3D_COMPRESSION. This
+Default RASTER3D_COMPRESSION_DEFAULT. This is set to RASTER3D_COMPRESSION. This
 default should not be changed.
 
 <P>
-Environment variables G3D_USE_COMPRESSION and G3D_NO_COMPRESSION.
+Environment variables RASTER3D_USE_COMPRESSION and RASTER3D_NO_COMPRESSION.
 
 <P>
 See functions G3d_setCompressionMode() (cf. 
@@ -497,11 +497,11 @@ This value specifies whether RLE compression should be used (in addition to
 precision).
 
 <P>
-Default G3D_USE_RLE_DEFAULT. This is currently set to G3D_USE_RLE and can
+Default RASTER3D_USE_RLE_DEFAULT. This is currently set to RASTER3D_USE_RLE and can
 be changed at compilation time of the library.
 
 <P>
-Environment variables G3D_USE_RLE and G3D_NO_RLE.
+Environment variables RASTER3D_USE_RLE and RASTER3D_NO_RLE.
 
 <P>
 See functions G3d_setCompressionMode() (cf. 
@@ -511,21 +511,21 @@ Section 22.3.2.3) and G3d_getCompressionMode() (cf. Section 22.3.2.3).
 
 <P>
 This number specifies how many mantissa bits should be used when writing a cell
-value. The minimum value is 0. The maximum value is 23 or G3D_MAX_PRECISION
-for type FCELL_TYPE, it is 52 or G3D_MAX_PRECISION for type DCELL_TYPE.
+value. The minimum value is 0. The maximum value is 23 or RASTER3D_MAX_PRECISION
+for type FCELL_TYPE, it is 52 or RASTER3D_MAX_PRECISION for type DCELL_TYPE.
 
 <P>
-Default G3D_PRECISION_DEFAULT. This is set to G3D_MAX_PRECISION. This
+Default RASTER3D_PRECISION_DEFAULT. This is set to RASTER3D_MAX_PRECISION. This
 default should not be changed.
 
 <P>
-Environment variables G3D_PRECISION and G3D_MAX_PRECISION.
+Environment variables RASTER3D_PRECISION and RASTER3D_MAX_PRECISION.
 
 <P>
 void G3d_setCompressionMode(int doCompress, int doLzw, int doRle, int
-  precision) <EM>doCompress</EM> should be one of G3D_NO_COMPRESSION and
-  G3D_COMPRESSION, <EM>doRle</EM> should be either G3D_NO_RLE or
-  G3D_USE_RLE, and <EM>precision</EM> should be either G3D_MAX_PRECISION or
+  precision) <EM>doCompress</EM> should be one of RASTER3D_NO_COMPRESSION and
+  RASTER3D_COMPRESSION, <EM>doRle</EM> should be either RASTER3D_NO_RLE or
+  RASTER3D_USE_RLE, and <EM>precision</EM> should be either RASTER3D_MAX_PRECISION or
   a positive integer.
 
 <P>
@@ -542,13 +542,13 @@ void G3d_getCompressionMode(int *doCompress, int *doLzw, int *doRle,
 The dimensions are specified in number of cell.
 
 <P>
-Defaults G3D_TILE_X_DEFAULT, G3D_TILE_Y_DEFAULT, and
-G3D_TILE_Z_DEFAULT. These are currently set to 8 and can be changed at
+Defaults RASTER3D_TILE_X_DEFAULT, RASTER3D_TILE_Y_DEFAULT, and
+RASTER3D_TILE_Z_DEFAULT. These are currently set to 8 and can be changed at
 compilation time of the library.
 
 <P>
-Environment variables G3D_TILE_DIMENSION_X, G3D_TILE_DIMENSION_Y, and
-G3D_TILE_DIMENSION_Z.
+Environment variables RASTER3D_TILE_DIMENSION_X, RASTER3D_TILE_DIMENSION_Y, and
+RASTER3D_TILE_DIMENSION_Z.
 
 <P>
 void G3d_setTileDimension(int tileX, int tileY, int tileZ)
@@ -565,11 +565,11 @@ Specifies which type is used to write cell-values on file. This type can be
 chosen independently of the type used to store cell-values in memory.
 
 <P>
-Default G3D_FILE_TYPE_DEFAULT. This is set to DCELL_TYPE. This default
+Default RASTER3D_FILE_TYPE_DEFAULT. This is set to DCELL_TYPE. This default
 should not be changed.
 
 <P>
-Environment variables G3D_WRITE_FLOAT and G3D_WRITE_DOUBLE.
+Environment variables RASTER3D_WRITE_FLOAT and RASTER3D_WRITE_DOUBLE.
 
 <P>
 void G3d_setFileType(int type)
@@ -598,7 +598,7 @@ specify the default window name in the (current)
 mapset but rather a window file in the window database of the (current) mapset.
 
 <P>
-Environment variable G3D_DEFAULT_WINDOW3D.
+Environment variable RASTER3D_DEFAULT_WINDOW3D.
 
 <P>
 See functions 
@@ -641,7 +641,7 @@ return value.
 Default <TT>G3d_skipError</TT>.
 
 <P>
-Environment variables G3D_USE_FATAL_ERROR and G3D_USE_PRINT_ERROR.
+Environment variables RASTER3D_USE_FATAL_ERROR and RASTER3D_USE_PRINT_ERROR.
 
 <P>
 void G3d_setErrorFun(void (*fun)(char *))
@@ -664,25 +664,25 @@ void G3d_fatalError(char (*msg)(char *)) This function prints the
 
 <P>
 
-\section G3D_Function_Index G3D Function Index
+\section RASTER3D_Function_Index RASTER3D Function Index
 
-\subsection Opening_and_Closing_G3D_Files Opening and Closing G3D Files
+\subsection Opening_and_Closing_RASTER3D_Files Opening and Closing RASTER3D Files
 
 <P>
-void  *G3d_openCellOld(char *name, char *mapset, G3D_Region *window,
+void  *G3d_openCellOld(char *name, char *mapset, RASTER3D_Region *window,
   int type, int cache)Opens existing g3d-file <EM>name</EM> in <EM>mapset</EM>.
 
 <P>
 Tiles are stored in memory with <EM>type</EM> which must be any of FCELL_TYPE,
-  DCELL_TYPE, or G3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies the
-  cache-mode used and must be either G3D_NO_CACHE, G3D_USE_CACHE_DEFAULT,
-  G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
-  G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ,
-  G3D_USE_CACHE_XYZ, the result of <TT>G3d_cacheSizeEncode()</TT> (cf. 
+  DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies the
+  cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
+  RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+  RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
+  RASTER3D_USE_CACHE_XYZ, the result of <TT>G3d_cacheSizeEncode()</TT> (cf. 
   Section 22.4.6), or any positive integer which
   specifies the number of tiles buffered in the cache.  <EM>window</EM> sets the
   window-region for the map. It is either a pointer to a window structure or
-  G3D_DEFAULT_WINDOW, which uses the window stored at initialization time or
+  RASTER3D_DEFAULT_WINDOW, which uses the window stored at initialization time or
   set via <TT>G3d_setWindow()</TT> (cf. Section 22.4.16).
   To modify the window for the map after it has already been opened use
   <TT>G3d_setWindowMap()</TT> (cf. Section 22.4.16).
@@ -692,14 +692,14 @@ Returns a pointer to the cell structure ... if successful, NULL ...
   otherwise.
 
 <P>
-void  *G3d_openCellNew(char *name, int type, int cache, G3D_Region
+void  *G3d_openCellNew(char *name, int type, int cache, RASTER3D_Region
   *region)Opens new g3d-file with <EM>name</EM> in the current mapset. Tiles
   are stored in memory with <EM>type</EM> which must be one of FCELL_TYPE,
-  DCELL_TYPE, or G3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies the
-  cache-mode used and must be either G3D_NO_CACHE, G3D_USE_CACHE_DEFAULT,
-  G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
-  G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ,
-  G3D_USE_CACHE_XYZ, the result of <TT>G3d_cacheSizeEncode()</TT> (cf. 
+  DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies the
+  cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
+  RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+  RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
+  RASTER3D_USE_CACHE_XYZ, the result of <TT>G3d_cacheSizeEncode()</TT> (cf. 
   Section 22.4.6), or any positive integer which
   specifies the number of tiles buffered in the cache.  <EM>region</EM> specifies
   the 3d region.  
@@ -710,14 +710,14 @@ Returns a pointer to the cell structure ... if successful,
 
 <P>
 void  *G3d_openCellNewParam(char *name, int typeIntern, int cache,
-  G3D_Region *region, int type, int doLzw, int doRle, int precision, int tileX,
+  RASTER3D_Region *region, int type, int doLzw, int doRle, int precision, int tileX,
   int tileY, int tileZ)Opens new g3d-file with <EM>name</EM> in the current
   mapset. Tiles are stored in memory with <EM>typeIntern</EM> which must be one of
-  FCELL_TYPE, DCELL_TYPE, or G3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies
-  the cache-mode used and must be either G3D_NO_CACHE,
-  G3D_USE_CACHE_DEFAULT, G3D_USE_CACHE_X, G3D_USE_CACHE_Y,
-  G3D_USE_CACHE_Z, G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ,
-  G3D_USE_CACHE_YZ, G3D_USE_CACHE_XYZ, the result of
+  FCELL_TYPE, DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies
+  the cache-mode used and must be either RASTER3D_NO_CACHE,
+  RASTER3D_USE_CACHE_DEFAULT, RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y,
+  RASTER3D_USE_CACHE_Z, RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ,
+  RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of
   <TT>G3d_cacheSizeEncode()</TT> (cf. 
   Section 22.4.6), or any positive integer which
   specifies the number of tiles buffered in the cache.  <EM>region</EM> specifies
@@ -1046,9 +1046,9 @@ void G3d_minUnlocked(void *map, int minUnlocked) Sets the minimum
   new minimum is larger than the actual number of unlocked tiles.
 
 <P>
-<EM>minUnlocked</EM> must be one of G3D_USE_CACHE_X, G3D_USE_CACHE_Y,
-  G3D_USE_CACHE_Z, G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ,
-  G3D_USE_CACHE_YZ, G3D_USE_CACHE_XYZ, the result of G3d_cacheSizeEncode()
+<EM>minUnlocked</EM> must be one of RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y,
+  RASTER3D_USE_CACHE_Z, RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ,
+  RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of G3d_cacheSizeEncode()
   (cf. Section 22.4.6), or any positive integer
   which explicitly specifies the number of tiles.
 
@@ -1080,17 +1080,17 @@ If <EM>cacheCode</EM> is the size (in tiles) of the cache the function returns
   <EM>cacheCode * n</EM>.
 
 <P>
-If <EM>cacheCode</EM> is G3D_USE_CACHE_DEFAULT the function returns
-  G3D_USE_CACHE_DEFAULT.
+If <EM>cacheCode</EM> is RASTER3D_USE_CACHE_DEFAULT the function returns
+  RASTER3D_USE_CACHE_DEFAULT.
 
 <P>
-If <EM>cacheCode</EM> is G3D_USE_CACHE_??? the function returns a value
-  encoding G3D_USE_CACHE_??? and <EM>n</EM>. Here G3D_USE_CACHE_??? is one
-  of G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
-  G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ, or
-  G3D_USE_CACHE_XYZ, where e.g.  G3D_USE_CACHE_X specifies that the cache
+If <EM>cacheCode</EM> is RASTER3D_USE_CACHE_??? the function returns a value
+  encoding RASTER3D_USE_CACHE_??? and <EM>n</EM>. Here RASTER3D_USE_CACHE_??? is one
+  of RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+  RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ, or
+  RASTER3D_USE_CACHE_XYZ, where e.g.  RASTER3D_USE_CACHE_X specifies that the cache
   should store as many tiles as there exist in one row along the x-axis of the
-  tile cube, and G3D_USE_CACHE_XY specifies that the cache should store as
+  tile cube, and RASTER3D_USE_CACHE_XY specifies that the cache should store as
   many tiles as there exist in one slice of the tile cube with constant Z
   coordinate.
 
@@ -1177,7 +1177,7 @@ Is equivalent to <TT>G3d_free (tiles);</TT>
 
 <P>
 
-\subsection G3D_Null_Value_Support G3D Null Value Support
+\subsection RASTER3D_Null_Value_Support RASTER3D Null Value Support
 
 <P>
 void G3d_isNullValueNum(void *n, int type)
@@ -1201,7 +1201,7 @@ Is equivalent to G3d_setNullTileType (map, tile, G3d_fileTypeMap (map)).
 
 <P>
 
-\subsection G3D_Map_Header_Information G3D Map Header Information
+\subsection RASTER3D_Map_Header_Information RASTER3D Map Header Information
 
 <P>
 void G3d_getCoordsMap(void *map, int *rows, int *cols, int *depths)
@@ -1212,7 +1212,7 @@ void G3d_getRegionMap(void *map, int *north, int *south, int *east,
   int *west, int *top, int *bottom)Returns the size of the region.
 
 <P>
-void G3d_getRegionStructMap(void *map, G3D_Region *region)
+void G3d_getRegionStructMap(void *map, RASTER3D_Region *region)
 Returns in <EM>region</EM> the region of <EM>map</EM>.
 
 <P>
@@ -1246,7 +1246,7 @@ Prints the header information of <EM>map</EM>.
 
 <P>
 
-\subsection G3D_Tile_Math G3D Tile Math
+\subsection RASTER3D_Tile_Math RASTER3D Tile Math
 
 <P>
 void G3d_tileIndex2tile(void *map, int tileIndex, int *xTile, int
@@ -1317,10 +1317,10 @@ int G3d_computeClippedTileDimensions(void *map, int tileIndex, int
 
 <P>
 
-\subsection G3D_Range_Support G3D Range Support
+\subsection RASTER3D_Range_Support RASTER3D Range Support
 
 <P>
-The map structure of G3D provides storage for the range.  The range of a map is
+The map structure of RASTER3D provides storage for the range.  The range of a map is
 updated every time a cell is written to the file. When an old map is opened the
 range is not automatically loaded. The application has to invoke
 <TT>G3d_range_load()</TT> (cf. Section 22.4.12)
@@ -1354,7 +1354,7 @@ Returns
 
 <P>
 
-\subsection G3D_Color_Support G3D Color Support
+\subsection RASTER3D_Color_Support RASTER3D Color Support
 
 <P>
 Applications can use the standard grass functions to work with colors, except
@@ -1383,7 +1383,7 @@ int G3d_writeColors(char *name, char *mapset, struct Colors
 
 <P>
 
-\subsection G3D_Categories_Support G3D Categories Support
+\subsection RASTER3D_Categories_Support RASTER3D Categories Support
 
 <P>
 Applications can use the standard grass functions to work with categories, 
@@ -1404,7 +1404,7 @@ int G3d_writeCats(char *name, struct Categories *cats) Writes the
 <P>
 
 
-\subsection G3D_History_Support G3D History Support
+\subsection RASTER3D_History_Support RASTER3D History Support
 
 <P>
 Applications can use the standard grass functions to work with histories, 
@@ -1425,7 +1425,7 @@ int G3d_writeHistory(char *name, struct History *hist)
 
 <P>
 
-\subsection G3D_Mask_Support G3D Mask Support
+\subsection RASTER3D_Mask_Support RASTER3D Mask Support
 
 <P>
 void G3d_maskOn(void *map) Turns on the mask for <EM>map</EM>. Do
@@ -1504,20 +1504,20 @@ cells of the tile and not on the status of the mask for <EM>map</EM>
 
 <P>
 
-\subsection G3D_Window_Support G3D Window Support
+\subsection RASTER3D_Window_Support RASTER3D Window Support
 
 <P>
-void G3d_setWindowMap(void *map, G3D_Region *window)
+void G3d_setWindowMap(void *map, RASTER3D_Region *window)
 Sets the window for <EM>map</EM> to <EM>window</EM>.
 Can be used multiple times for the same map.
 
 <P>
-void G3d_setWindow(G3D_Region *window)
+void G3d_setWindow(RASTER3D_Region *window)
 Sets the default window used for every map opened later in the program.
 Can be used multiple times in the same program.
 
 <P>
-void G3d_getWindow(G3D_Region *window)
+void G3d_getWindow(RASTER3D_Region *window)
 Stores the current default window in <EM>window</EM>.
 
 <P>
@@ -1527,7 +1527,7 @@ Returns a pointer to the current default window. This pointer should not be
 provided to pass a window pointer when opening a map.
 
 <P>
-int G3d_readWindow(G3D_Region *window, char *windowName) Reads
+int G3d_readWindow(RASTER3D_Region *window, char *windowName) Reads
   <EM>window</EM> from the file specified by <EM>windowName</EM>. The name is
   converted by the rules defined in window defaults. A NULL pointer indicates
   the <EM>WIND3</EM> file in the current mapset.
@@ -1538,7 +1538,7 @@ Returns
         0 ... otherwise.
 
 <P>
-int G3d_writeWindow(G3D_Region *window, char *windowName)
+int G3d_writeWindow(RASTER3D_Region *window, char *windowName)
         Writes <EM>window</EM> to the file specified by <EM>windowName</EM>. The name
         is converted by the rules defined in window defaults. A NULL pointer
         indicates the <EM>WIND3</EM> file in the current mapset.
@@ -1586,29 +1586,29 @@ void G3d_getNearestNeighborFunPtr(void (**nnFunPtr)()) Returns
 
 <P>
 
-\subsection G3D_Region G3D Region
+\subsection RASTER3D_Region RASTER3D Region
 
 <P>
-void G3d_extract2dRegion(G3D_Region *region3d, struct Cell_head
+void G3d_extract2dRegion(RASTER3D_Region *region3d, struct Cell_head
   *region2d) Returns in <EM>region2d</EM> the <EM>2d</EM> portion of <EM>region3d</EM>.
 
 <P>
-void G3d_incorporate2dRegion(struct Cell_head *region2d, G3D_Region
+void G3d_incorporate2dRegion(struct Cell_head *region2d, RASTER3D_Region
   *region3d) Replaces the <EM>2d</EM> portion of <EM>region3d</EM> with the
   values stored in <EM>region2d</EM>.
 
 <P>
-void G3d_adjustRegion(G3D_Region *region)
+void G3d_adjustRegion(RASTER3D_Region *region)
 Computes an adjusts the resolutions in the region structure from the region
 boundaries and number of cells per dimension.
 
 <P>
-void G3d_adjustRegionRes(G3D_Region *region)
+void G3d_adjustRegionRes(RASTER3D_Region *region)
 Computes an adjusts the number of cells per dimension in the region
 structure from the region boundaries and resolutions.
 
 <P>
-void G3d_regionCopy(G3D_Region *regionDest, G3D_Region *regionSrc)
+void G3d_regionCopy(RASTER3D_Region *regionDest, RASTER3D_Region *regionSrc)
 Copies the values of <EM>regionSrc</EM> into <EM>regionDst</EM>.
 (The unfortunate order of parameters was chosen in order to conform to the
 order used in <EM>G_copy()</EM>).
@@ -1621,7 +1621,7 @@ void G3d_getRegionValue(void *map, double north, double east, double
   <EM>value</EM> is of <EM>type</EM>.
 
 <P>
-void G3d_readRegionMap(char *name, char *mapset, G3D_Region *region)
+void G3d_readRegionMap(char *name, char *mapset, RASTER3D_Region *region)
 Returns in <EM>region</EM> the region information for 3d cell <EM>name@mapset</EM>.
 
 <P>
@@ -1630,11 +1630,11 @@ Returns in <EM>region</EM> the region information for 3d cell <EM>name@mapset</E
 
 <P>
 void G3d_g3dType2cellType(int g3dType) Returns the GRASS floating
-  point type which is equivalent to the G3D type of <EM>g3dType</EM>.
+  point type which is equivalent to the RASTER3D type of <EM>g3dType</EM>.
 
 <P>
 void G3d_initDefaults() Initializes the default values described
-  in G3D Defaults.  Applications have to use this function only if they need to
+  in RASTER3D Defaults.  Applications have to use this function only if they need to
   query the default values before the first file (either old or new) has been
   opened.
 
@@ -1647,7 +1647,7 @@ void G3d_setStandard3dInputParams()
   command line arguments provided are the <EM>type</EM> of the cell values, the
   <EM>precision</EM>, the properties of the <EM>compression</EM>, and the dimension
   of the tiles (<EM>tiledimension</EM>). Every of these values defaults to the
-  value described in G3D Defaults.
+  value described in RASTER3D Defaults.
 
 <P>
 This function has to be used in conjunction with
@@ -1691,7 +1691,7 @@ routines (reading, writing grid3d timestamps).
 
 <P>
 
-\section Sample_G3D_Applications Sample G3D Applications
+\section Sample_RASTER3D_Applications Sample RASTER3D Applications
 
 <P>
 These functions were implemented to test the library. They are not very

lib/raster3d/long.c

@@ -8,7 +8,7 @@ int G3d_longEncode(long *source, unsigned char *dst, int nofNums)
     int eltLength, nBytes;
     unsigned char *dstStop, tmp;
 
-    eltLength = G3D_LONG_LENGTH;
+    eltLength = RASTER3D_LONG_LENGTH;
     nBytes = 8;
 
     d = 1;
@@ -20,14 +20,14 @@ int G3d_longEncode(long *source, unsigned char *dst, int nofNums)
 	while (dst != dstStop) {
 	    tmp = ((*src++ / d) % 256);
 	    if (tmp != 0)
-		nBytes = G3D_MIN(nBytes, eltLength);
+		nBytes = RASTER3D_MIN(nBytes, eltLength);
 	    *dst++ = tmp;
 	}
 
 	d *= 256;
     }
 
-    return G3D_LONG_LENGTH - nBytes;
+    return RASTER3D_LONG_LENGTH - nBytes;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -49,7 +49,7 @@ G3d_longDecode(unsigned char *source, long *dst, int nofNums, int longNbytes)
     dest += nofNums - 1;
     while (source != srcStop) {
 	*dest = *source--;
-	if ((eltLength >= G3D_LONG_LENGTH) && (*dest != 0))
+	if ((eltLength >= RASTER3D_LONG_LENGTH) && (*dest != 0))
 	    G3d_fatalError("G3d_longDecode: decoded long too long");
 	dest--;
     }
@@ -61,7 +61,7 @@ G3d_longDecode(unsigned char *source, long *dst, int nofNums, int longNbytes)
 	while (source != srcStop) {
 	    *dest *= 256;
 	    *dest += *source--;
-	    if ((eltLength >= G3D_LONG_LENGTH) && (*dest != 0))
+	    if ((eltLength >= RASTER3D_LONG_LENGTH) && (*dest != 0))
 		G3d_fatalError("G3d_longDecode: decoded long too long");
 	    dest--;
 	}

lib/raster3d/mapset.c

@@ -8,8 +8,8 @@
 
 void G3d_makeMapsetMapDirectory(const char *mapName)
 {
-    char buf[GNAME_MAX + sizeof(G3D_DIRECTORY) + 2];
+    char buf[GNAME_MAX + sizeof(RASTER3D_DIRECTORY) + 2];
 
-    sprintf(buf, "%s/%s", G3D_DIRECTORY, mapName);
+    sprintf(buf, "%s/%s", RASTER3D_DIRECTORY, mapName);
     G__make_mapset_element(buf);
 }

lib/raster3d/mask.c

@@ -13,7 +13,7 @@
 /*--------------------------------------------------------------------------*/
 
 static int G3d_maskMapExistsVar = 0;
-static G3D_Map *G3d_maskMap;
+static RASTER3D_Map *G3d_maskMap;
 
 /*--------------------------------------------------------------------------*/
 static void dummy(void)
@@ -22,13 +22,13 @@ static void dummy(void)
 }
 
 
-static float G3D_MASKNUMmaskValue;
+static float RASTER3D_MASKNUMmaskValue;
 
 /* Call to dummy() to match void return type of G3d_setNullValue() */
-#define G3D_MASKNUM(map,Xmask,Ymask,Zmask,VALUEmask,TYPEmask) \
+#define RASTER3D_MASKNUM(map,Xmask,Ymask,Zmask,VALUEmask,TYPEmask) \
 \
-   (G3D_MASKNUMmaskValue = G3d_getMaskFloat (map, Xmask, Ymask, Zmask), \
-    ((G3d_isNullValueNum (&G3D_MASKNUMmaskValue, FCELL_TYPE)) ? \
+   (RASTER3D_MASKNUMmaskValue = G3d_getMaskFloat (map, Xmask, Ymask, Zmask), \
+    ((G3d_isNullValueNum (&RASTER3D_MASKNUMmaskValue, FCELL_TYPE)) ? \
       G3d_setNullValue (VALUEmask, 1, TYPEmask) : dummy()))
 
 /*--------------------------------------------------------------------------*/
@@ -63,16 +63,16 @@ int G3d_maskClose()
 
 int G3d_maskFileExists(void)
 {
-    return G_find_file_misc(G3D_DIRECTORY, G3D_CELL_ELEMENT, G3D_MASK_MAP, G_mapset()) != NULL;
+    return G_find_file_misc(RASTER3D_DIRECTORY, RASTER3D_CELL_ELEMENT, RASTER3D_MASK_MAP, G_mapset()) != NULL;
 }
 
 /*--------------------------------------------------------------------------*/
 
-static int maskOpenOldCacheDefault = G3D_USE_CACHE_DEFAULT;
+static int maskOpenOldCacheDefault = RASTER3D_USE_CACHE_DEFAULT;
 
 int G3d_maskOpenOld(void)
 {
-    G3D_Region region;
+    RASTER3D_Region region;
 
     /* No Idea if this is correct return value */
     if (G3d_maskMapExistsVar)
@@ -83,8 +83,8 @@ int G3d_maskOpenOld(void)
     if (!G3d_maskMapExistsVar)
 	return 1;
 
-    if ((G3d_maskMap = G3d_openCellOld(G3D_MASK_MAP, G_mapset(),
-				       G3D_DEFAULT_WINDOW, FCELL_TYPE,
+    if ((G3d_maskMap = G3d_openCellOld(RASTER3D_MASK_MAP, G_mapset(),
+				       RASTER3D_DEFAULT_WINDOW, FCELL_TYPE,
 				       maskOpenOldCacheDefault))
 	== NULL) {
 	G3d_error("G3d_maskOpenOld: cannot open mask");
@@ -100,7 +100,7 @@ int G3d_maskOpenOld(void)
 
 /*--------------------------------------------------------------------------*/
 
-static float G3d_getMaskFloat(G3D_Map * map, int x, int y, int z)
+static float G3d_getMaskFloat(RASTER3D_Map * map, int x, int y, int z)
 {
     double north, east, top;
     float value;
@@ -170,13 +170,13 @@ int G3d_maskReopen(int cache)
  *  \return int
  */
 
-int G3d_isMasked(G3D_Map * map, int x, int y, int z)
+int G3d_isMasked(RASTER3D_Map * map, int x, int y, int z)
 {
     if (!G3d_maskMapExistsVar)
 	return 0;
 
-    G3D_MASKNUMmaskValue = G3d_getMaskFloat(map, x, y, z);
-    return (G3d_isNullValueNum(&G3D_MASKNUMmaskValue, FCELL_TYPE));
+    RASTER3D_MASKNUMmaskValue = G3d_getMaskFloat(map, x, y, z);
+    return (G3d_isNullValueNum(&RASTER3D_MASKNUMmaskValue, FCELL_TYPE));
 }
 
 /*--------------------------------------------------------------------------*/
@@ -197,11 +197,11 @@ int G3d_isMasked(G3D_Map * map, int x, int y, int z)
  *  \return void
  */
 
-void G3d_maskNum(G3D_Map * map, int x, int y, int z, void *value, int type)
+void G3d_maskNum(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
 {
     if (!G3d_maskMapExistsVar)
 	return;
-    G3D_MASKNUM(map, x, y, z, value, type);
+    RASTER3D_MASKNUM(map, x, y, z, value, type);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -219,11 +219,11 @@ void G3d_maskNum(G3D_Map * map, int x, int y, int z, void *value, int type)
  *  \return void
  */
 
-void G3d_maskFloat(G3D_Map * map, int x, int y, int z, float *value)
+void G3d_maskFloat(RASTER3D_Map * map, int x, int y, int z, float *value)
 {
     if (!G3d_maskMapExistsVar)
 	return;
-    G3D_MASKNUM(map, x, y, z, value, FCELL_TYPE);
+    RASTER3D_MASKNUM(map, x, y, z, value, FCELL_TYPE);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -241,11 +241,11 @@ void G3d_maskFloat(G3D_Map * map, int x, int y, int z, float *value)
  *  \return void
  */
 
-void G3d_maskDouble(G3D_Map * map, int x, int y, int z, double *value)
+void G3d_maskDouble(RASTER3D_Map * map, int x, int y, int z, double *value)
 {
     if (!G3d_maskMapExistsVar)
 	return;
-    G3D_MASKNUM(map, x, y, z, value, DCELL_TYPE);
+    RASTER3D_MASKNUM(map, x, y, z, value, DCELL_TYPE);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -268,7 +268,7 @@ void G3d_maskDouble(G3D_Map * map, int x, int y, int z, double *value)
  *  \return void
  */
 
-void G3d_maskTile(G3D_Map * map, int tileIndex, void *tile, int type)
+void G3d_maskTile(RASTER3D_Map * map, int tileIndex, void *tile, int type)
 {
     int nofNum, rows, cols, depths, xRedundant, yRedundant, zRedundant;
     int x, y, z, xLength, yLength, dx, dy, dz, length;
@@ -305,7 +305,7 @@ void G3d_maskTile(G3D_Map * map, int tileIndex, void *tile, int type)
     for (dz = z; dz < depths; dz++) {
 	for (dy = y; dy < rows; dy++) {
 	    for (dx = x; dx < cols; dx++) {
-		G3D_MASKNUM(map, dx, dy, dz, tile, type);
+		RASTER3D_MASKNUM(map, dx, dy, dz, tile, type);
 		tile += length;
 	    }
 
@@ -329,7 +329,7 @@ void G3d_maskTile(G3D_Map * map, int tileIndex, void *tile, int type)
  *  \return void
  */
 
-void G3d_maskOn(G3D_Map * map)
+void G3d_maskOn(RASTER3D_Map * map)
 {
     map->useMask = 1;
 }
@@ -346,7 +346,7 @@ void G3d_maskOn(G3D_Map * map)
  *  \return void
  */
 
-void G3d_maskOff(G3D_Map * map)
+void G3d_maskOff(RASTER3D_Map * map)
 {
     map->useMask = 0;
 }
@@ -362,7 +362,7 @@ void G3d_maskOff(G3D_Map * map)
  *  \return int
  */
 
-int G3d_maskIsOn(G3D_Map * map)
+int G3d_maskIsOn(RASTER3D_Map * map)
 {
     return map->useMask;
 }
@@ -377,7 +377,7 @@ int G3d_maskIsOn(G3D_Map * map)
  *  \return int
  */
 
-int G3d_maskIsOff(G3D_Map * map)
+int G3d_maskIsOff(RASTER3D_Map * map)
 {
     return !map->useMask;
 }
@@ -393,7 +393,7 @@ int G3d_maskIsOff(G3D_Map * map)
 
 const char *G3d_maskFile(void)
 {
-    return G3D_MASK_MAP;
+    return RASTER3D_MASK_MAP;
 }
 
 

lib/raster3d/misc.c

@@ -79,7 +79,7 @@ G3d_copyValues(const void *src, int offsSrc, int typeSrc, void *dst,
 
 int G3d_length(int t)
 {
-    if (!G3D_IS_CORRECT_TYPE(t))
+    if (!RASTER3D_IS_CORRECT_TYPE(t))
 	G3d_fatalError("G3d_length: invalid type");
 
     if (t == FCELL_TYPE)
@@ -91,12 +91,12 @@ int G3d_length(int t)
 
 int G3d_externLength(int t)
 {
-    if (!G3D_IS_CORRECT_TYPE(t))
+    if (!RASTER3D_IS_CORRECT_TYPE(t))
 	G3d_fatalError("G3d_externLength: invalid type");
 
     if (t == FCELL_TYPE)
-	return G3D_XDR_FLOAT_LENGTH;
+	return RASTER3D_XDR_FLOAT_LENGTH;
     if (t == DCELL_TYPE)
-	return G3D_XDR_DOUBLE_LENGTH;
+	return RASTER3D_XDR_DOUBLE_LENGTH;
     return 0;
 }

lib/raster3d/open.c

@@ -11,7 +11,7 @@
 
 void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
 {
-    G3D_Map *map;
+    RASTER3D_Map *map;
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 
     G3d_initDefaults();
@@ -21,7 +21,7 @@ void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
 	return (void *)NULL;
     }
 
-    map = G3d_malloc(sizeof(G3D_Map));
+    map = G3d_malloc(sizeof(RASTER3D_Map));
     if (map == NULL) {
 	G3d_error(_("G3d_openCellOldNoHeader: error in G3d_malloc"));
 	return (void *)NULL;
@@ -32,7 +32,7 @@ void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
     map->fileName = G_store(xname);
     map->mapset = G_store(xmapset);
 
-    map->data_fd = G_open_old_misc(G3D_DIRECTORY, G3D_CELL_ELEMENT, xname, xmapset);
+    map->data_fd = G_open_old_misc(RASTER3D_DIRECTORY, RASTER3D_CELL_ELEMENT, xname, xmapset);
     if (map->data_fd < 0) {
 	G3d_error(_("G3d_openCellOldNoHeader: error in G_open_old"));
 	return (void *)NULL;
@@ -52,14 +52,14 @@ void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
  *
  * Opens existing g3d-file <em>name</em> in <em>mapset</em>.
  * Tiles are stored in memory with <em>type</em> which must be any of FCELL_TYPE,
- * DCELL_TYPE, or G3D_TILE_SAME_AS_FILE. <em>cache</em> specifies the
- * cache-mode used and must be either G3D_NO_CACHE, G3D_USE_CACHE_DEFAULT,
- * G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
- * G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ,
- * G3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt> (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
+ * DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <em>cache</em> specifies the
+ * cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
+ * RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+ * RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt> (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
  * specifies the number of tiles buffered in the cache.  <em>window</em> sets the
  * window-region for the map. It is either a pointer to a window structure or
- * G3D_DEFAULT_WINDOW, which uses the window stored at initialization time or
+ * RASTER3D_DEFAULT_WINDOW, which uses the window stored at initialization time or
  * set via <tt>G3d_setWindow ()</tt> (cf.{g3d:G3d.setWindow}).
  * To modify the window for the map after it has already been opened use
  * <tt>G3d_setWindowMap ()</tt> (cf.{g3d:G3d.setWindowMap}).
@@ -75,9 +75,9 @@ void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
  */
 
 void *G3d_openCellOld(const char *name, const char *mapset,
-		      G3D_Region * window, int typeIntern, int cache)
+		      RASTER3D_Region * window, int typeIntern, int cache)
 {
-    G3D_Map *map;
+    RASTER3D_Map *map;
     int proj, zone;
     int compression, useRle, useLzw, type, tileX, tileY, tileZ;
     int rows, cols, depths, precision;
@@ -109,7 +109,7 @@ void *G3d_openCellOld(const char *name, const char *mapset,
 	return 0;
     }
 
-    if (window == G3D_DEFAULT_WINDOW)
+    if (window == RASTER3D_DEFAULT_WINDOW)
 	window = G3d_windowPtr();
 
     if (proj != window->proj) {
@@ -124,7 +124,7 @@ void *G3d_openCellOld(const char *name, const char *mapset,
     map->useXdr = useXdr;
 
     if (hasIndex) {
-	/* see G3D_openCell_new () for format of header */
+	/* see RASTER3D_openCell_new () for format of header */
 	if ((!G3d_readInts(map->data_fd, map->useXdr,
 			   &(map->indexLongNbytes), 1)) ||
 	    (!G3d_readInts(map->data_fd, map->useXdr,
@@ -155,10 +155,10 @@ void *G3d_openCellOld(const char *name, const char *mapset,
 
     nofHeaderBytes = dataOffset;
 
-    if (typeIntern == G3D_TILE_SAME_AS_FILE)
+    if (typeIntern == RASTER3D_TILE_SAME_AS_FILE)
 	typeIntern = type;
 
-    if (!G3d_fillHeader(map, G3D_READ_DATA, compression, useRle, useLzw,
+    if (!G3d_fillHeader(map, RASTER3D_READ_DATA, compression, useRle, useLzw,
 			type, precision, cache,
 			hasIndex, map->useXdr, typeIntern,
 			nofHeaderBytes, tileX, tileY, tileZ,
@@ -184,11 +184,11 @@ void *G3d_openCellOld(const char *name, const char *mapset,
  *
  * Opens new g3d-file with <em>name</em> in the current mapset. Tiles
  * are stored in memory with <em>type</em> which must be one of FCELL_TYPE,
- * DCELL_TYPE, or G3D_TILE_SAME_AS_FILE. <em>cache</em> specifies the
- * cache-mode used and must be either G3D_NO_CACHE, G3D_USE_CACHE_DEFAULT,
- * G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
- * G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ,
- * G3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
+ * DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <em>cache</em> specifies the
+ * cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
+ * RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+ * RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
  * (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
  * specifies the number of tiles buffered in the cache.  <em>region</em> specifies
  * the 3d region.  
@@ -203,9 +203,9 @@ void *G3d_openCellOld(const char *name, const char *mapset,
  */
 
 void *G3d_openCellNew(const char *name, int typeIntern, int cache,
-		      G3D_Region * region)
+		      RASTER3D_Region * region)
 {
-    G3D_Map *map;
+    RASTER3D_Map *map;
     int nofHeaderBytes, dummy = 0, compression, precision;
     long ldummy = 0;
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
@@ -219,7 +219,7 @@ void *G3d_openCellNew(const char *name, int typeIntern, int cache,
     compression = g3d_do_compression;
     precision = g3d_precision;
 
-    map = G3d_malloc(sizeof(G3D_Map));
+    map = G3d_malloc(sizeof(RASTER3D_Map));
     if (map == NULL) {
 	G3d_error(_("G3d_openCellNew: error in G3d_malloc"));
 	return (void *)NULL;
@@ -242,7 +242,7 @@ void *G3d_openCellNew(const char *name, int typeIntern, int cache,
 
     G3d_makeMapsetMapDirectory(map->fileName);
 
-    map->useXdr = G3D_USE_XDR;
+    map->useXdr = RASTER3D_USE_XDR;
 
     if (g3d_file_type == FCELL_TYPE) {
 	if (precision > 23)
@@ -260,15 +260,15 @@ void *G3d_openCellNew(const char *name, int typeIntern, int cache,
 	if (precision == -1)
 	    precision = 23;
 	else
-	    precision = G3D_MIN(precision, 23);
+	    precision = RASTER3D_MIN(precision, 23);
     }
 
-    if (compression == G3D_NO_COMPRESSION)
-	precision = G3D_MAX_PRECISION;
-    if (compression == G3D_COMPRESSION)
-	map->useXdr = G3D_USE_XDR;
+    if (compression == RASTER3D_NO_COMPRESSION)
+	precision = RASTER3D_MAX_PRECISION;
+    if (compression == RASTER3D_COMPRESSION)
+	map->useXdr = RASTER3D_USE_XDR;
 
-    if (G3D_HAS_INDEX) {
+    if (RASTER3D_HAS_INDEX) {
 	map->indexLongNbytes = sizeof(long);
 
 	/* at the beginning of the file write */
@@ -297,9 +297,9 @@ void *G3d_openCellNew(const char *name, int typeIntern, int cache,
     G3d_range_init(map);
     G3d_adjustRegion(region);
 
-    if (!G3d_fillHeader(map, G3D_WRITE_DATA, compression,
+    if (!G3d_fillHeader(map, RASTER3D_WRITE_DATA, compression,
 			g3d_do_rle_compression, g3d_do_lzw_compression,
-			g3d_file_type, precision, cache, G3D_HAS_INDEX,
+			g3d_file_type, precision, cache, RASTER3D_HAS_INDEX,
 			map->useXdr, typeIntern, nofHeaderBytes,
 			g3d_tile_dimension[0], g3d_tile_dimension[1],
 			g3d_tile_dimension[2],

lib/raster3d/open2.c

@@ -8,11 +8,11 @@
  *
  * Opens new g3d-file with <em>name</em> in the current mapset. Tiles
  * are stored in memory with <em>typeIntern</em> which must be one of FCELL_TYPE,
- * DCELL_TYPE, or G3D_TILE_SAME_AS_FILE. <em>cache</em> specifies the
- * cache-mode used and must be either G3D_NO_CACHE, G3D_USE_CACHE_DEFAULT,
- * G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
- * G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ,
- * G3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
+ * DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <em>cache</em> specifies the
+ * cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
+ * RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+ * RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
  * (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
  * specifies the number of tiles buffered in the cache.  <em>region</em> specifies
  * the 3d region.  
@@ -30,7 +30,7 @@
  *  \param type The type of the map (FCELL_TYPE, or DCELL_TYPE)
  *  \param doLzw Use the LZW compression algorithm  
  *  \param doRle Use the Run-Length-Encoding algroithm for compression
- *  \param precision The precision used for the mantissa (0 - 52) or G3D_MAX_PRECISION
+ *  \param precision The precision used for the mantissa (0 - 52) or RASTER3D_MAX_PRECISION
  *  \param tileX The number of cells in X direction of a tile
  *  \param tileY The number of cells in Y direction of a tile
  *  \param tileZ The number of cells in Z direction of a tile
@@ -39,7 +39,7 @@
 
 
 void *G3d_openNewParam(const char *name, int typeIntern, int cache,
-		       G3D_Region * region, int type, int doLzw, int doRle,
+		       RASTER3D_Region * region, int type, int doLzw, int doRle,
 		       int precision, int tileX, int tileY, int tileZ)
 {
     void *map;
@@ -74,11 +74,11 @@ void *G3d_openNewParam(const char *name, int typeIntern, int cache,
  *
  * Opens new g3d-file with <em>name</em> in the current mapset. This method tries to compute 
  * optimal tile size based on the number of rows, cols and depths and the maximum allowed tile size in KB. 
- * Tiles are stored in memory using G3D_TILE_SAME_AS_FILE method. <em>cache</em> specifies the
- * cache-mode used and must be either G3D_NO_CACHE, G3D_USE_CACHE_DEFAULT,
- * G3D_USE_CACHE_X, G3D_USE_CACHE_Y, G3D_USE_CACHE_Z,
- * G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ, G3D_USE_CACHE_YZ,
- * G3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
+ * Tiles are stored in memory using RASTER3D_TILE_SAME_AS_FILE method. <em>cache</em> specifies the
+ * cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
+ * RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
+ * RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
  * (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
  * specifies the number of tiles buffered in the cache.  <em>region</em> specifies
  * the 3d region.  
@@ -95,7 +95,7 @@ void *G3d_openNewParam(const char *name, int typeIntern, int cache,
  */
 
 
-void *G3d_openNewOptTileSize(const char *name, int cache, G3D_Region * region, int type, int maxSize)
+void *G3d_openNewOptTileSize(const char *name, int cache, RASTER3D_Region * region, int type, int maxSize)
 {
     void *map;
     int oldTileX, oldTileY, oldTileZ, oldType;
@@ -113,7 +113,7 @@ void *G3d_openNewOptTileSize(const char *name, int cache, G3D_Region * region, i
     oldType = G3d_getFileType();
     G3d_setFileType(type);
 
-    map = G3d_openCellNew(name, G3D_TILE_SAME_AS_FILE, cache, region);
+    map = G3d_openCellNew(name, RASTER3D_TILE_SAME_AS_FILE, cache, region);
 
     G3d_setTileDimension(oldTileX, oldTileY, oldTileZ);
     G3d_setFileType(oldType);

lib/raster3d/param.c

@@ -31,7 +31,7 @@ static G3d_paramType *param;
  * command line arguments provided are the <em>type</em> of the cell values, the
  * <em>precision</em>, the properties of the <em>compression</em>, and the dimension
  * of the tiles (<em>tiledimension</em>). Every of these values defaults to the
- * value described in G3D Defaults.
+ * value described in RASTER3D Defaults.
  * This function has to be used in conjunction with
  * G3d_getStandard3dInputParams() (cf.{g3d:G3d.getStandard3dInputParams}).
  *
@@ -93,20 +93,20 @@ int G3d_getStandard3dParams(int *useTypeDefault, int *type,
 
     if (strcmp(param->compression->answer, "default") != 0) {
 	if (strcmp(param->compression->answer, "rle") == 0) {
-	    *doRle = G3D_USE_RLE;
-	    *doLzw = G3D_NO_LZW;
+	    *doRle = RASTER3D_USE_RLE;
+	    *doLzw = RASTER3D_NO_LZW;
 	}
 	else if (strcmp(param->compression->answer, "lzw") == 0) {
-	    *doRle = G3D_NO_RLE;
-	    *doLzw = G3D_USE_LZW;
+	    *doRle = RASTER3D_NO_RLE;
+	    *doLzw = RASTER3D_USE_LZW;
 	}
 	else if (strcmp(param->compression->answer, "rle+lzw") == 0) {
-	    *doRle = G3D_USE_RLE;
-	    *doLzw = G3D_USE_LZW;
+	    *doRle = RASTER3D_USE_RLE;
+	    *doLzw = RASTER3D_USE_LZW;
 	}
 	else {
-	    *doRle = G3D_NO_RLE;
-	    *doLzw = G3D_NO_LZW;
+	    *doRle = RASTER3D_NO_RLE;
+	    *doLzw = RASTER3D_NO_LZW;
 	}
     }
     else
@@ -151,7 +151,7 @@ char *G3d_getWindowParams(void)
 	return NULL;
     if (windowParam->answer == NULL)
 	return NULL;
-    if (strcmp(windowParam->answer, G3D_WINDOW_ELEMENT) == 0)
-	return G_store(G3D_WINDOW_ELEMENT);
+    if (strcmp(windowParam->answer, RASTER3D_WINDOW_ELEMENT) == 0)
+	return G_store(RASTER3D_WINDOW_ELEMENT);
     return G_store(windowParam->answer);
 }

lib/raster3d/putvalue.c

@@ -15,7 +15,7 @@
  *  \return int
  */
 
-int G3d_putFloat(G3D_Map * map, int x, int y, int z, float value)
+int G3d_putFloat(RASTER3D_Map * map, int x, int y, int z, float value)
 {
     int tileIndex, offs;
     float *tile;
@@ -55,7 +55,7 @@ int G3d_putFloat(G3D_Map * map, int x, int y, int z, float value)
  *  \return int
  */
 
-int G3d_putDouble(G3D_Map * map, int x, int y, int z, double value)
+int G3d_putDouble(RASTER3D_Map * map, int x, int y, int z, double value)
 {
     int tileIndex, offs;
     double *tile;
@@ -99,7 +99,7 @@ int G3d_putDouble(G3D_Map * map, int x, int y, int z, double value)
  */
 
 int
-G3d_putValue(G3D_Map * map, int x, int y, int z, const void *value, int type)
+G3d_putValue(RASTER3D_Map * map, int x, int y, int z, const void *value, int type)
 {
     if (type == FCELL_TYPE) {
 	if (!G3d_putFloat(map, x, y, z, *((float *)value))) {

lib/raster3d/range.c

@@ -14,7 +14,7 @@
 /*---------------------------------------------------------------------------*/
 
 void
-G3d_range_updateFromTile(G3D_Map * map, const void *tile, int rows, int cols,
+G3d_range_updateFromTile(RASTER3D_Map * map, const void *tile, int rows, int cols,
 			 int depths, int xRedundant, int yRedundant,
 			 int zRedundant, int nofNum, int type)
 {
@@ -70,19 +70,19 @@ G3d_readRange(const char *name, const char *mapset, struct FPRange *drange)
 
     fd = -1;
 
-    fd = G_open_old_misc(G3D_DIRECTORY, G3D_RANGE_ELEMENT, name, mapset);
+    fd = G_open_old_misc(RASTER3D_DIRECTORY, RASTER3D_RANGE_ELEMENT, name, mapset);
     if (fd < 0) {
 	G_warning(_("Unable to open range file for [%s in %s]"), name, mapset);
 	return -1;
     }
 
-    if (read(fd, xdr_buf, 2 * G3D_XDR_DOUBLE_LENGTH) != 2 * G3D_XDR_DOUBLE_LENGTH) {
+    if (read(fd, xdr_buf, 2 * RASTER3D_XDR_DOUBLE_LENGTH) != 2 * RASTER3D_XDR_DOUBLE_LENGTH) {
 	close(fd);
 	G_warning(_("Error reading range file for [%s in %s]"), name, mapset);
 	return 2;
     }
 
-    xdrmem_create(&xdr_str, xdr_buf, (u_int) G3D_XDR_DOUBLE_LENGTH * 2,
+    xdrmem_create(&xdr_str, xdr_buf, (u_int) RASTER3D_XDR_DOUBLE_LENGTH * 2,
 		  XDR_DECODE);
 
     /* if the f_range file exists, but empty */
@@ -111,9 +111,9 @@ G3d_readRange(const char *name, const char *mapset, struct FPRange *drange)
  *          0 ... otherwise.
  */
 
-int G3d_range_load(G3D_Map * map)
+int G3d_range_load(RASTER3D_Map * map)
 {
-    if (map->operation == G3D_WRITE_DATA)
+    if (map->operation == RASTER3D_WRITE_DATA)
 	return 1;
     if (G3d_readRange(map->fileName, map->mapset, &(map->range)) == -1) {
 	return 0;
@@ -137,7 +137,7 @@ int G3d_range_load(G3D_Map * map)
  *  \return void
  */
 
-void G3d_range_min_max(G3D_Map * map, double *min, double *max)
+void G3d_range_min_max(RASTER3D_Map * map, double *min, double *max)
 {
     Rast_get_fp_range_min_max(&(map->range), min, max);
 }
@@ -151,7 +151,7 @@ static int writeRange(const char *name, struct FPRange *range)
     int fd;
     XDR xdr_str;
 
-    fd = G_open_new_misc(G3D_DIRECTORY, G3D_RANGE_ELEMENT, name);
+    fd = G_open_new_misc(RASTER3D_DIRECTORY, RASTER3D_RANGE_ELEMENT, name);
     if (fd < 0) {
 	G_warning(_("Unable to open range file for <%s>"), name);
 	return -1;
@@ -163,7 +163,7 @@ static int writeRange(const char *name, struct FPRange *range)
 	return 0;
     }
 
-    xdrmem_create(&xdr_str, xdr_buf, (u_int) G3D_XDR_DOUBLE_LENGTH * 2,
+    xdrmem_create(&xdr_str, xdr_buf, (u_int) RASTER3D_XDR_DOUBLE_LENGTH * 2,
 		  XDR_ENCODE);
 
     if (!xdr_double(&xdr_str, &(range->min)))
@@ -171,7 +171,7 @@ static int writeRange(const char *name, struct FPRange *range)
     if (!xdr_double(&xdr_str, &(range->max)))
 	goto error;
 
-    if (write(fd, xdr_buf, G3D_XDR_DOUBLE_LENGTH * 2) != G3D_XDR_DOUBLE_LENGTH * 2)
+    if (write(fd, xdr_buf, RASTER3D_XDR_DOUBLE_LENGTH * 2) != RASTER3D_XDR_DOUBLE_LENGTH * 2)
 	goto error;
 
     close(fd);
@@ -179,7 +179,7 @@ static int writeRange(const char *name, struct FPRange *range)
 
   error:
     close(fd);
-    G_remove_misc(G3D_DIRECTORY, G3D_RANGE_ELEMENT, name);	/* remove the old file with this name */
+    G_remove_misc(RASTER3D_DIRECTORY, RASTER3D_RANGE_ELEMENT, name);	/* remove the old file with this name */
     G_warning("can't write range file for [%s in %s]", name, G_mapset());
     return -1;
 }
@@ -198,11 +198,11 @@ static int writeRange(const char *name, struct FPRange *range)
  *          0 ... otherwise.
  */
 
-int G3d_range_write(G3D_Map * map)
+int G3d_range_write(RASTER3D_Map * map)
 {
     char path[GPATH_MAX];
 
-    G3d_filename(path, G3D_RANGE_ELEMENT, map->fileName, map->mapset);
+    G3d_filename(path, RASTER3D_RANGE_ELEMENT, map->fileName, map->mapset);
     remove(path);
 
     if (writeRange(map->fileName, &(map->range)) == -1) {
@@ -215,7 +215,7 @@ int G3d_range_write(G3D_Map * map)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d_range_init(G3D_Map * map)
+int G3d_range_init(RASTER3D_Map * map)
 {
     Rast_init_fp_range(&(map->range));
     return 0;

lib/raster3d/raster3d_intern.h

@@ -8,30 +8,30 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define G3D_LONG_LENGTH sizeof (long)
+#define RASTER3D_LONG_LENGTH sizeof (long)
 
-#define G3D_XDR_INT_LENGTH 4
-#define G3D_XDR_DOUBLE_LENGTH 8
-#define G3D_XDR_FLOAT_LENGTH 4
+#define RASTER3D_XDR_INT_LENGTH 4
+#define RASTER3D_XDR_DOUBLE_LENGTH 8
+#define RASTER3D_XDR_FLOAT_LENGTH 4
 
-#define G3D_IS_CORRECT_TYPE(t) (((t) == FCELL_TYPE) || ((t) == DCELL_TYPE))
+#define RASTER3D_IS_CORRECT_TYPE(t) (((t) == FCELL_TYPE) || ((t) == DCELL_TYPE))
 
-#define G3D_WRITE_DATA 1
-#define G3D_READ_DATA 0
+#define RASTER3D_WRITE_DATA 1
+#define RASTER3D_READ_DATA 0
 
-#define G3D_VALID_OPERATION(o) \
-                           (((o) == G3D_WRITE_DATA) || ((o) == G3D_READ_DATA))
+#define RASTER3D_VALID_OPERATION(o) \
+                           (((o) == RASTER3D_WRITE_DATA) || ((o) == RASTER3D_READ_DATA))
 
-#define G3D_MIN(a,b) ((a) <= (b) ? (a) : (b))
-#define G3D_MAX(a,b) ((a) >= (b) ? (a) : (b))
+#define RASTER3D_MIN(a,b) ((a) <= (b) ? (a) : (b))
+#define RASTER3D_MAX(a,b) ((a) >= (b) ? (a) : (b))
 
-#define G3D_HAS_INDEX 1
-#define G3D_NO_INDEX 0
+#define RASTER3D_HAS_INDEX 1
+#define RASTER3D_NO_INDEX 0
 
-#define G3D_USE_XDR 1
-#define G3D_NO_XDR 0
+#define RASTER3D_USE_XDR 1
+#define RASTER3D_NO_XDR 0
 
-#define G3D_VALID_XDR_OPTION(o) (((o) == G3D_USE_XDR) || ((o) == G3D_NO_XDR))
+#define RASTER3D_VALID_XDR_OPTION(o) (((o) == RASTER3D_USE_XDR) || ((o) == RASTER3D_NO_XDR))
 
 /*---------------------------------------------------------------------------*/
 
@@ -46,10 +46,10 @@ extern int xdrLength;		/* in bytes */
 
 /* global variables */
 
-extern int g3d_do_compression;	/* G3D_NO_COMPRESSION or G3D_COMPRESSION */
-extern int g3d_do_lzw_compression;	/* G3D_USE_LZW or G3D_NO_LZW */
-extern int g3d_do_rle_compression;	/* G3D_USE_RLE or G3D_NO_RLE */
-extern int g3d_precision;	/* G3D_ALLOW_PRECISION or G3D_NO_PRECISION */
+extern int g3d_do_compression;	/* RASTER3D_NO_COMPRESSION or RASTER3D_COMPRESSION */
+extern int g3d_do_lzw_compression;	/* RASTER3D_USE_LZW or RASTER3D_NO_LZW */
+extern int g3d_do_rle_compression;	/* RASTER3D_USE_RLE or RASTER3D_NO_RLE */
+extern int g3d_precision;	/* RASTER3D_ALLOW_PRECISION or RASTER3D_NO_PRECISION */
 extern int g3d_cache_default;	/* in number of tiles; 0 ==> no cache */
 extern int g3d_cache_max;	/* in bytes */
 extern int g3d_file_type;	/* FCELL_TYPE or DCELL_TYPE */
@@ -57,7 +57,7 @@ extern int g3d_tile_dimension[3];
 extern void (*g3d_error_fun) (const char *);
 extern char *g3d_unit_default;
 
-extern G3D_Region g3d_window;
+extern RASTER3D_Region g3d_window;
 
 /*---------------------------------------------------------------------------*/
 
@@ -68,17 +68,17 @@ extern void G3d_fatalError_noargs(const char * /* msg */ );
 
 /*---------------------------------------------------------------------------*/
 
-#define G3D_REGION_NORTH "North"
-#define G3D_REGION_SOUTH "South"
-#define G3D_REGION_EAST "East"
-#define G3D_REGION_WEST "West"
-#define G3D_REGION_TOP "Top"
-#define G3D_REGION_BOTTOM "Bottom"
-#define G3D_REGION_ROWS "nofRows"
-#define G3D_REGION_COLS "nofCols"
-#define G3D_REGION_DEPTHS "nofDepths"
-#define G3D_REGION_PROJ "Proj"
-#define G3D_REGION_ZONE "Zone"
-#define G3D_REGION_EWRES "e-w resol"
-#define G3D_REGION_NSRES "n-s resol"
-#define G3D_REGION_TBRES "t-b resol"
+#define RASTER3D_REGION_NORTH "North"
+#define RASTER3D_REGION_SOUTH "South"
+#define RASTER3D_REGION_EAST "East"
+#define RASTER3D_REGION_WEST "West"
+#define RASTER3D_REGION_TOP "Top"
+#define RASTER3D_REGION_BOTTOM "Bottom"
+#define RASTER3D_REGION_ROWS "nofRows"
+#define RASTER3D_REGION_COLS "nofCols"
+#define RASTER3D_REGION_DEPTHS "nofDepths"
+#define RASTER3D_REGION_PROJ "Proj"
+#define RASTER3D_REGION_ZONE "Zone"
+#define RASTER3D_REGION_EWRES "e-w resol"
+#define RASTER3D_REGION_NSRES "n-s resol"
+#define RASTER3D_REGION_TBRES "t-b resol"

lib/raster3d/region.c

@@ -19,7 +19,7 @@
  *  \return void
  */
 
-void G3d_extract2dRegion(G3D_Region * region3d, struct Cell_head *region2d)
+void G3d_extract2dRegion(RASTER3D_Region * region3d, struct Cell_head *region2d)
 {
     region2d->proj = region3d->proj;
     region2d->zone = region3d->zone;
@@ -46,7 +46,7 @@ void G3d_extract2dRegion(G3D_Region * region3d, struct Cell_head *region2d)
  *  \return void
  */
 
-void G3d_regionToCellHead(G3D_Region * region3d, struct Cell_head *region2d)
+void G3d_regionToCellHead(RASTER3D_Region * region3d, struct Cell_head *region2d)
 {
     region2d->proj = region3d->proj;
     region2d->zone = region3d->zone;
@@ -86,7 +86,7 @@ void G3d_regionToCellHead(G3D_Region * region3d, struct Cell_head *region2d)
  */
 
 void
-G3d_incorporate2dRegion(struct Cell_head *region2d, G3D_Region * region3d)
+G3d_incorporate2dRegion(struct Cell_head *region2d, RASTER3D_Region * region3d)
 {
     region3d->proj = region2d->proj;
     region3d->zone = region2d->zone;
@@ -115,7 +115,7 @@ G3d_incorporate2dRegion(struct Cell_head *region2d, G3D_Region * region3d)
  */
 
 void
-G3d_regionFromToCellHead(struct Cell_head *region2d, G3D_Region * region3d)
+G3d_regionFromToCellHead(struct Cell_head *region2d, RASTER3D_Region * region3d)
 {
     region3d->proj = region2d->proj;
     region3d->zone = region2d->zone;
@@ -149,7 +149,7 @@ G3d_regionFromToCellHead(struct Cell_head *region2d, G3D_Region * region3d)
  *  \return void
  */
 
-void G3d_adjustRegion(G3D_Region * region)
+void G3d_adjustRegion(RASTER3D_Region * region)
 {
     struct Cell_head region2d;
 
@@ -175,7 +175,7 @@ void G3d_adjustRegion(G3D_Region * region)
  *  \return void
  */
 
-void G3d_adjustRegionRes(G3D_Region * region)
+void G3d_adjustRegionRes(RASTER3D_Region * region)
 {
     struct Cell_head region2d;
 
@@ -205,7 +205,7 @@ void G3d_adjustRegionRes(G3D_Region * region)
  *  \return void
  */
 
-void G3d_regionCopy(G3D_Region * regionDest, G3D_Region * regionSrc)
+void G3d_regionCopy(RASTER3D_Region * regionDest, RASTER3D_Region * regionSrc)
 {
     *regionDest = *regionSrc;
 }
@@ -214,17 +214,17 @@ void G3d_regionCopy(G3D_Region * regionDest, G3D_Region * regionSrc)
 /*---------------------------------------------------------------------------*/
 
 int
-G3d_readRegionMap(const char *name, const char *mapset, G3D_Region * region)
+G3d_readRegionMap(const char *name, const char *mapset, RASTER3D_Region * region)
 {
     char fullName[GPATH_MAX];
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 
     if (G_name_is_fully_qualified(name, xname, xmapset))
-	G3d_filename(fullName, G3D_HEADER_ELEMENT, xname, xmapset);
+	G3d_filename(fullName, RASTER3D_HEADER_ELEMENT, xname, xmapset);
     else {
 	if (!mapset || !*mapset)
 	    mapset = G_find_grid3(name, "");
-	G3d_filename(fullName, G3D_HEADER_ELEMENT, name, mapset);
+	G3d_filename(fullName, RASTER3D_HEADER_ELEMENT, name, mapset);
     }
     return G3d_readWindow(region, fullName);
 }
@@ -245,7 +245,7 @@ G3d_readRegionMap(const char *name, const char *mapset, G3D_Region * region)
  *  \return int
  */
 
-int G3d_isValidLocation(G3D_Region *region, double north, double east, double top)
+int G3d_isValidLocation(RASTER3D_Region *region, double north, double east, double top)
 {
     return ((north >= region->south) && (north <= region->north) &&
 	    (east >= region->west) && (east <= region->east) &&
@@ -272,7 +272,7 @@ int G3d_isValidLocation(G3D_Region *region, double north, double east, double to
  */
 
 void
-G3d_location2coord(G3D_Region *region, double north, double east, double top,
+G3d_location2coord(RASTER3D_Region *region, double north, double east, double top,
 		   int *x, int *y, int *z)
 {
     double col, row, depth;
@@ -311,7 +311,7 @@ G3d_location2coord(G3D_Region *region, double north, double east, double top,
  */
 
 void
-G3d_location2coord2(G3D_Region *region, double north, double east, double top,
+G3d_location2coord2(RASTER3D_Region *region, double north, double east, double top,
 		   int *x, int *y, int *z)
 {
     if (!G3d_isValidLocation(region, north, east, top))
@@ -354,7 +354,7 @@ G3d_location2coord2(G3D_Region *region, double north, double east, double top,
  */
 
 void
-G3d_coord2location(G3D_Region * region, double x, double y, double z, double *north, double *east, double *top)
+G3d_coord2location(RASTER3D_Region * region, double x, double y, double z, double *north, double *east, double *top)
 {
     *north = region->north - y * region->ns_res;
     *east = region->west + x * region->ew_res;

lib/raster3d/resample.c

@@ -22,7 +22,7 @@
  */
 
 void
-G3d_nearestNeighbor(G3D_Map * map, int x, int y, int z, void *value,
+G3d_nearestNeighbor(RASTER3D_Map * map, int x, int y, int z, void *value,
 		    int type)
 {
     double north, east, top;
@@ -59,7 +59,7 @@ G3d_nearestNeighbor(G3D_Map * map, int x, int y, int z, void *value,
  *  \return void
  */
 
-void G3d_setResamplingFun(G3D_Map * map, void (*resampleFun) ())
+void G3d_setResamplingFun(RASTER3D_Map * map, void (*resampleFun) ())
 {
     map->resampleFun = resampleFun;
 }
@@ -77,7 +77,7 @@ void G3d_setResamplingFun(G3D_Map * map, void (*resampleFun) ())
  *  \return void
  */
 
-void G3d_getResamplingFun(G3D_Map * map, void (**resampleFun) ())
+void G3d_getResamplingFun(RASTER3D_Map * map, void (**resampleFun) ())
 {
     *resampleFun = map->resampleFun;
 }

lib/raster3d/retile.c

@@ -14,7 +14,7 @@ retileNocache(void *map, const char *nameOut, int tileX, int tileY, int tileZ)
     int typeIntern;
     void *data;
     int tileXsave, tileYsave, tileZsave;
-    G3D_Region region;
+    RASTER3D_Region region;
 
     saveType = G3d_getFileType();
     G3d_setFileType(G3d_fileTypeMap(map));
@@ -23,7 +23,7 @@ retileNocache(void *map, const char *nameOut, int tileX, int tileY, int tileZ)
     typeIntern = G3d_tileTypeMap(map);
     G3d_getRegionStructMap(map, &region);
 
-    map2 = G3d_openCellNew(nameOut, typeIntern, G3D_NO_CACHE, &region);
+    map2 = G3d_openCellNew(nameOut, typeIntern, RASTER3D_NO_CACHE, &region);
 
     if (map2 == NULL)
 	G3d_fatalError("G3d_retile: error in G3d_openCellNew");
@@ -85,7 +85,7 @@ G3d_retile(void *map, const char *nameOut, int tileX, int tileY, int tileZ)
     int xTile, yTile, zTile;
     int xOffs, yOffs, zOffs, prev;
     int tileXsave, tileYsave, tileZsave;
-    G3D_Region region;
+    RASTER3D_Region region;
 
     if (!G3d_tileUseCacheMap(map)) {
 	retileNocache(map, nameOut, tileX, tileY, tileZ);
@@ -101,7 +101,7 @@ G3d_retile(void *map, const char *nameOut, int tileX, int tileY, int tileZ)
     G3d_getRegionStructMap(map, &region);
 
     map2 =
-	G3d_openCellNew(nameOut, typeIntern, G3D_USE_CACHE_DEFAULT, &region);
+	G3d_openCellNew(nameOut, typeIntern, RASTER3D_USE_CACHE_DEFAULT, &region);
     if (map2 == NULL)
 	G3d_fatalError("G3d_retile: error in G3d_openCellNew");
 

lib/raster3d/test/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../../..
 
 PGM=test.g3d.lib
 
-LIBES = $(GISLIB) $(G3DLIB) 
-DEPENDENCIES = $(GISDEP) $(G3DDEP)
+LIBES = $(GISLIB) $(RASTER3DLIB) 
+DEPENDENCIES = $(GISDEP) $(RASTER3DDEP)
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd

lib/raster3d/test/test_coordinate_transform.c

@@ -36,8 +36,8 @@ int test_coordinate_transform(void)
     double north, east, top;
     int col = 0, row = 0, depth = 0;
     
-    G3D_Region region, default_region;
-    G3D_Map *map = NULL;
+    RASTER3D_Region region, default_region;
+    RASTER3D_Map *map = NULL;
     
     /* We need to set up a specific region for the new g3d map.
      * First we safe the default region. */
@@ -56,7 +56,7 @@ int test_coordinate_transform(void)
         
     G3d_adjustRegion(&region);
     
-    map = G3d_openNewOptTileSize("test_coordinate_transform", G3D_USE_CACHE_XYZ, &region, FCELL_TYPE, 32);
+    map = G3d_openNewOptTileSize("test_coordinate_transform", RASTER3D_USE_CACHE_XYZ, &region, FCELL_TYPE, 32);
         
     /* The window is the same as the map region ... of course */
     G3d_setWindowMap(map, &region);
@@ -155,7 +155,7 @@ int test_coordinate_transform(void)
 int test_region(void)
 {
     int sum = 0;
-    G3D_Region region, new_region;
+    RASTER3D_Region region, new_region;
     
     G3d_getWindow(&region);
     region.bottom = 0.0;

lib/raster3d/test/test_g3d_lib.h

@@ -15,8 +15,8 @@
 *
 *****************************************************************************/
 
-#ifndef _TEST_G3D_LIB_H_
-#define _TEST_G3D_LIB_H_
+#ifndef _TEST_RASTER3D_LIB_H_
+#define _TEST_RASTER3D_LIB_H_
 
 #include <grass/raster3d.h>
 #include <grass/gis.h>

lib/raster3d/test/test_put_get_value.c

@@ -22,9 +22,9 @@
 static int test_put_get_value_dcell(void);
 static int test_put_get_value_fcell(void);
 static int test_put_get_value_resampling(void);
-static int test_resampling_dcell(G3D_Map *map, double north, double east, double 
+static int test_resampling_dcell(RASTER3D_Map *map, double north, double east, double 
                                  top, int col, int row, int depth, int fact);
-static int test_resampling_fcell(G3D_Map *map, double north, double east, double 
+static int test_resampling_fcell(RASTER3D_Map *map, double north, double east, double 
                                  top, int col, int row, int depth, int fact);
 
 /* *************************************************************** */
@@ -63,8 +63,8 @@ int test_put_get_value_dcell(void)
     double north, east, top;
     int col, row, depth;
     
-    G3D_Region region;
-    G3D_Map *map = NULL;
+    RASTER3D_Region region;
+    RASTER3D_Map *map = NULL;
     
     /* We need to set up a specific region for the new g3d map.
      * First we safe the default region. */
@@ -82,7 +82,7 @@ int test_put_get_value_dcell(void)
         
     G3d_adjustRegion(&region);
         
-    map = G3d_openNewOptTileSize("test_put_get_value_dcell", G3D_USE_CACHE_XY, &region, DCELL_TYPE, 32);
+    map = G3d_openNewOptTileSize("test_put_get_value_dcell", RASTER3D_USE_CACHE_XY, &region, DCELL_TYPE, 32);
     
     /* The window is the same as the map region ... of course */
     G3d_setWindowMap(map, &region);
@@ -203,8 +203,8 @@ int test_put_get_value_fcell(void)
     double north, east, top;
     int col, row, depth;
     
-    G3D_Region region;
-    G3D_Map *map = NULL;
+    RASTER3D_Region region;
+    RASTER3D_Map *map = NULL;
     
     /* We need to set up a specific region for the new g3d map.
      * First we safe the default region. */
@@ -222,7 +222,7 @@ int test_put_get_value_fcell(void)
         
     G3d_adjustRegion(&region);
         
-    map = G3d_openNewOptTileSize("test_put_get_value_dcell", G3D_USE_CACHE_XY, &region, FCELL_TYPE, 32);
+    map = G3d_openNewOptTileSize("test_put_get_value_dcell", RASTER3D_USE_CACHE_XY, &region, FCELL_TYPE, 32);
     
     /* The window is the same as the map region ... of course */
     G3d_setWindowMap(map, &region);
@@ -324,9 +324,9 @@ int test_put_get_value_resampling(void)
     double north, east, top;
     int col, row, depth;
     
-    G3D_Region region;
-    G3D_Region window;
-    G3D_Map *map = NULL;
+    RASTER3D_Region region;
+    RASTER3D_Region window;
+    RASTER3D_Map *map = NULL;
     
     /* We need to set up a specific region for the new g3d map.
      * First we safe the default region. */
@@ -344,7 +344,7 @@ int test_put_get_value_resampling(void)
         
     G3d_adjustRegion(&region);
     
-    map = G3d_openNewOptTileSize("test_put_get_value_resample", G3D_USE_CACHE_XY, &region, DCELL_TYPE, 32);
+    map = G3d_openNewOptTileSize("test_put_get_value_resample", RASTER3D_USE_CACHE_XY, &region, DCELL_TYPE, 32);
     
     /* We modify the window for resampling tests */
     G3d_regionCopy(&window, &region);
@@ -444,7 +444,7 @@ int test_put_get_value_resampling(void)
 
 /* *************************************************************** */
 
-int test_resampling_dcell(G3D_Map *map, double north, double east, double top, int col, int row, int depth, int fact)
+int test_resampling_dcell(RASTER3D_Map *map, double north, double east, double top, int col, int row, int depth, int fact)
 {
     int sum = 0;
     DCELL value;
@@ -480,7 +480,7 @@ int test_resampling_dcell(G3D_Map *map, double north, double east, double top, i
 
 /* *************************************************************** */
 
-int test_resampling_fcell(G3D_Map *map, double north, double east, double top, int col, int row, int depth, int fact)
+int test_resampling_fcell(RASTER3D_Map *map, double north, double east, double top, int col, int row, int depth, int fact)
 {
     int sum = 0;
     FCELL value;

lib/raster3d/tilealloc.c

@@ -23,7 +23,7 @@
  *                   NULL ... otherwise.
  */
 
-void *G3d_allocTilesType(G3D_Map * map, int nofTiles, int type)
+void *G3d_allocTilesType(RASTER3D_Map * map, int nofTiles, int type)
 {
     void *tiles;
 
@@ -49,7 +49,7 @@ void *G3d_allocTilesType(G3D_Map * map, int nofTiles, int type)
  *  \return void * 
  */
 
-void *G3d_allocTiles(G3D_Map * map, int nofTiles)
+void *G3d_allocTiles(RASTER3D_Map * map, int nofTiles)
 {
     void *tiles;
 

lib/raster3d/tileio.c

@@ -68,7 +68,7 @@
  *                 NULL ... otherwise.
  */
 
-void *G3d_getTilePtr(G3D_Map * map, int tileIndex)
+void *G3d_getTilePtr(RASTER3D_Map * map, int tileIndex)
 {
     void *ptr;
 
@@ -112,7 +112,7 @@ void *G3d_getTilePtr(G3D_Map * map, int tileIndex)
  *          0 ... otherwise.
  */
 
-int G3d_tileLoad(G3D_Map * map, int tileIndex)
+int G3d_tileLoad(RASTER3D_Map * map, int tileIndex)
 {
     if (G3d_getTilePtr(map, tileIndex) == NULL) {
 	G3d_error("G3d_tileLoad: error in G3d_getTilePtr");
@@ -124,7 +124,7 @@ int G3d_tileLoad(G3D_Map * map, int tileIndex)
 
 /*---------------------------------------------------------------------------*/
 
-int G3d__removeTile(G3D_Map * map, int tileIndex)
+int G3d__removeTile(RASTER3D_Map * map, int tileIndex)
 {
     if (!map->useCache)
 	return 1;

lib/raster3d/tilemath.c

@@ -22,7 +22,7 @@
  */
 
 void
-G3d_tileIndex2tile(G3D_Map * map, int tileIndex, int *xTile, int *yTile,
+G3d_tileIndex2tile(RASTER3D_Map * map, int tileIndex, int *xTile, int *yTile,
 		   int *zTile)
 {
     int tileIndex2d;
@@ -49,7 +49,7 @@ G3d_tileIndex2tile(G3D_Map * map, int tileIndex, int *xTile, int *yTile,
  *  \return int
  */
 
-int G3d_tile2tileIndex(G3D_Map * map, int xTile, int yTile, int zTile)
+int G3d_tile2tileIndex(RASTER3D_Map * map, int xTile, int yTile, int zTile)
 {
     return map->nxy * zTile + map->nx * yTile + xTile;
 }
@@ -75,7 +75,7 @@ int G3d_tile2tileIndex(G3D_Map * map, int xTile, int yTile, int zTile)
  */
 
 void
-G3d_tileCoordOrigin(G3D_Map * map, int xTile, int yTile, int zTile, int *x,
+G3d_tileCoordOrigin(RASTER3D_Map * map, int xTile, int yTile, int zTile, int *x,
 		    int *y, int *z)
 {
     *x = map->tileX * xTile;
@@ -100,7 +100,7 @@ G3d_tileCoordOrigin(G3D_Map * map, int xTile, int yTile, int zTile, int *x,
  *  \return void
  */
 
-void G3d_tileIndexOrigin(G3D_Map * map, int tileIndex, int *x, int *y, int *z)
+void G3d_tileIndexOrigin(RASTER3D_Map * map, int tileIndex, int *x, int *y, int *z)
 {
     int xTile, yTile, zTile;
 
@@ -133,7 +133,7 @@ void G3d_tileIndexOrigin(G3D_Map * map, int tileIndex, int *x, int *y, int *z)
  */
 
 void
-G3d_coord2tileCoord(G3D_Map * map, int x, int y, int z, int *xTile,
+G3d_coord2tileCoord(RASTER3D_Map * map, int x, int y, int z, int *xTile,
 		    int *yTile, int *zTile, int *xOffs, int *yOffs,
 		    int *zOffs)
 {
@@ -164,7 +164,7 @@ G3d_coord2tileCoord(G3D_Map * map, int x, int y, int z, int *xTile,
  */
 
 void
-G3d_coord2tileIndex(G3D_Map * map, int x, int y, int z, int *tileIndex,
+G3d_coord2tileIndex(RASTER3D_Map * map, int x, int y, int z, int *tileIndex,
 		    int *offset)
 {
     int xTile, yTile, zTile, xOffs, yOffs, zOffs;
@@ -192,7 +192,7 @@ G3d_coord2tileIndex(G3D_Map * map, int x, int y, int z, int *tileIndex,
  *  \return int
  */
 
-int G3d_coordInRange(G3D_Map * map, int x, int y, int z)
+int G3d_coordInRange(RASTER3D_Map * map, int x, int y, int z)
 {
     return (x >= 0) && (x < map->region.cols) && (y >= 0) &&
 	(y < map->region.rows) && (z >= 0) && (z < map->region.depths);
@@ -212,7 +212,7 @@ int G3d_coordInRange(G3D_Map * map, int x, int y, int z)
  *  \return int
  */
 
-int G3d_tileIndexInRange(G3D_Map * map, int tileIndex)
+int G3d_tileIndexInRange(RASTER3D_Map * map, int tileIndex)
 {
     return (tileIndex < map->nTiles) && (tileIndex >= 0);
 }
@@ -234,7 +234,7 @@ int G3d_tileIndexInRange(G3D_Map * map, int tileIndex)
  *  \return int
  */
 
-int G3d_tileInRange(G3D_Map * map, int x, int y, int z)
+int G3d_tileInRange(RASTER3D_Map * map, int x, int y, int z)
 {
     return (x >= 0) && (x < map->nx) && (y >= 0) && (y < map->ny) &&
 	(z >= 0) && (z < map->nz);
@@ -264,7 +264,7 @@ int G3d_tileInRange(G3D_Map * map, int x, int y, int z)
  */
 
 int
-G3d_computeClippedTileDimensions(G3D_Map * map, int tileIndex, int *rows,
+G3d_computeClippedTileDimensions(RASTER3D_Map * map, int tileIndex, int *rows,
 				 int *cols, int *depths, int *xRedundant,
 				 int *yRedundant, int *zRedundant)
 {
@@ -329,7 +329,7 @@ G3d_computeClippedTileDimensions(G3D_Map * map, int tileIndex, int *rows,
  */
 
 void
-G3d_computeOptimalTileDimension(G3D_Region *region, int type, int *tileX, int *tileY, int *tileZ, int maxSize)
+G3d_computeOptimalTileDimension(RASTER3D_Region *region, int type, int *tileX, int *tileY, int *tileZ, int maxSize)
 {
    int size = 0;
    int x, y, z;

lib/raster3d/tilenull.c

@@ -20,7 +20,7 @@
  *  \return void
  */
 
-void G3d_setNullTileType(G3D_Map * map, void *tile, int type)
+void G3d_setNullTileType(RASTER3D_Map * map, void *tile, int type)
 {
     G3d_setNullValue(tile, map->tileSize, type);
 }
@@ -38,7 +38,7 @@ void G3d_setNullTileType(G3D_Map * map, void *tile, int type)
  *  \return void
  */
 
-void G3d_setNullTile(G3D_Map * map, void *tile)
+void G3d_setNullTile(RASTER3D_Map * map, void *tile)
 {
     G3d_setNullTileType(map, tile, map->typeIntern);
 }

lib/raster3d/tileread.c

@@ -9,7 +9,7 @@
 #include "raster3d_intern.h"
 
 static int
-G3d_xdrTile2tile(G3D_Map * map, void *tile, int rows, int cols, int depths,
+G3d_xdrTile2tile(RASTER3D_Map * map, void *tile, int rows, int cols, int depths,
 		 int xRedundant, int yRedundant, int zRedundant, int nofNum,
 		 int type)
 {
@@ -88,12 +88,12 @@ G3d_xdrTile2tile(G3D_Map * map, void *tile, int rows, int cols, int depths,
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_readTileUncompressed(G3D_Map * map, int tileIndex, int nofNum)
+static int G3d_readTileUncompressed(RASTER3D_Map * map, int tileIndex, int nofNum)
 {
     int nofBytes;
 
     nofBytes = nofNum * map->numLengthExtern;
-    nofBytes = G3D_MIN(nofBytes, map->fileEndPtr - map->index[tileIndex]);
+    nofBytes = RASTER3D_MIN(nofBytes, map->fileEndPtr - map->index[tileIndex]);
 
     if (read(map->data_fd, xdr, nofBytes) != nofBytes) {
 	G3d_error("G3d_readTileUncompressed: can't read file");
@@ -105,7 +105,7 @@ static int G3d_readTileUncompressed(G3D_Map * map, int tileIndex, int nofNum)
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_readTileCompressed(G3D_Map * map, int tileIndex, int nofNum)
+static int G3d_readTileCompressed(RASTER3D_Map * map, int tileIndex, int nofNum)
 {
     if (!G_fpcompress_readXdrNums(map->data_fd, xdr, nofNum,
 				  map->tileLength[tileIndex],
@@ -144,7 +144,7 @@ static int G3d_readTileCompressed(G3D_Map * map, int tileIndex, int nofNum)
  *          0 ... otherwise.
  */
 
-int G3d_readTile(G3D_Map * map, int tileIndex, void *tile, int type)
+int G3d_readTile(RASTER3D_Map * map, int tileIndex, void *tile, int type)
 {
     int nofNum, rows, cols, depths, xRedundant, yRedundant, zRedundant;
 
@@ -166,7 +166,7 @@ int G3d_readTile(G3D_Map * map, int tileIndex, void *tile, int type)
 	return 0;
     }
 
-    if (map->compression == G3D_NO_COMPRESSION) {
+    if (map->compression == RASTER3D_NO_COMPRESSION) {
 	if (!G3d_readTileUncompressed(map, tileIndex, nofNum)) {
 	    G3d_error("G3d_readTile: error in G3d_readTileUncompressed");
 	    return 0;
@@ -204,7 +204,7 @@ int G3d_readTile(G3D_Map * map, int tileIndex, void *tile, int type)
  *  \return int
  */
 
-int G3d_readTileFloat(G3D_Map * map, int tileIndex, void *tile)
+int G3d_readTileFloat(RASTER3D_Map * map, int tileIndex, void *tile)
 {
     if (!G3d_readTile(map, tileIndex, tile, FCELL_TYPE)) {
 	G3d_error("G3d_readTileFloat: error in G3d_readTile");
@@ -228,7 +228,7 @@ int G3d_readTileFloat(G3D_Map * map, int tileIndex, void *tile)
  *  \return int
  */
 
-int G3d_readTileDouble(G3D_Map * map, int tileIndex, void *tile)
+int G3d_readTileDouble(RASTER3D_Map * map, int tileIndex, void *tile)
 {
     if (!G3d_readTile(map, tileIndex, tile, DCELL_TYPE)) {
 	G3d_error("G3d_readTileDouble: error in G3d_readTile");
@@ -258,7 +258,7 @@ int G3d_readTileDouble(G3D_Map * map, int tileIndex, void *tile)
  *          0 ... otherwise.
  */
 
-int G3d_lockTile(G3D_Map * map, int tileIndex)
+int G3d_lockTile(RASTER3D_Map * map, int tileIndex)
 {
     if (!map->useCache)
 	G3d_fatalError("G3d_lockTile: function invalid in non-cache mode");
@@ -285,7 +285,7 @@ int G3d_lockTile(G3D_Map * map, int tileIndex)
  *          0 ... otherwise.
  */
 
-int G3d_unlockTile(G3D_Map * map, int tileIndex)
+int G3d_unlockTile(RASTER3D_Map * map, int tileIndex)
 {
     if (!map->useCache)
 	G3d_fatalError("G3d_unlockTile: function invalid in non-cache mode");
@@ -311,7 +311,7 @@ int G3d_unlockTile(G3D_Map * map, int tileIndex)
  *          0 ... otherwise.
  */
 
-int G3d_unlockAll(G3D_Map * map)
+int G3d_unlockAll(RASTER3D_Map * map)
 {
     if (!map->useCache)
 	G3d_fatalError("G3d_unlockAll: function invalid in non-cache mode");
@@ -336,7 +336,7 @@ int G3d_unlockAll(G3D_Map * map)
  *  \return void
  */
 
-void G3d_autolockOn(G3D_Map * map)
+void G3d_autolockOn(RASTER3D_Map * map)
 {
     if (!map->useCache)
 	G3d_fatalError("G3d_autoLockOn: function invalid in non-cache mode");
@@ -356,7 +356,7 @@ void G3d_autolockOn(G3D_Map * map)
  *  \return void
  */
 
-void G3d_autolockOff(G3D_Map * map)
+void G3d_autolockOff(RASTER3D_Map * map)
 {
     if (!map->useCache)
 	G3d_fatalError("G3d_autoLockOff: function invalid in non-cache mode");
@@ -374,9 +374,9 @@ void G3d_autolockOff(G3D_Map * map)
  * number of unlocked tiles to <em>minUnlocked</em>.  This function should be used
  * in combination with <tt>G3d_unlockAll ()</tt> in order to avoid situations where the
  * new minimum is larger than the actual number of unlocked tiles.
- * <em>minUnlocked</em> must be one of G3D_USE_CACHE_X, G3D_USE_CACHE_Y,
- * G3D_USE_CACHE_Z, G3D_USE_CACHE_XY, G3D_USE_CACHE_XZ,
- * G3D_USE_CACHE_YZ, G3D_USE_CACHE_XYZ, the result of G3d_cacheSizeEncode()
+ * <em>minUnlocked</em> must be one of RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y,
+ * RASTER3D_USE_CACHE_Z, RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ,
+ * RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of G3d_cacheSizeEncode()
  * (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer
  * which explicitly specifies the number of tiles.
  *
@@ -385,7 +385,7 @@ void G3d_autolockOff(G3D_Map * map)
  *  \return void
  */
 
-void G3d_minUnlocked(G3D_Map * map, int minUnlocked)
+void G3d_minUnlocked(RASTER3D_Map * map, int minUnlocked)
 {
     if (!map->useCache)
 	G3d_fatalError("G3d_autoLockOff: function invalid in non-cache mode");
@@ -407,7 +407,7 @@ void G3d_minUnlocked(G3D_Map * map, int minUnlocked)
  *          0 ... otherwise.
  */
 
-int G3d_beginCycle(G3D_Map * map)
+int G3d_beginCycle(RASTER3D_Map * map)
 {
     if (!G3d_unlockAll(map)) {
 	G3d_fatalError("G3d_beginCycle: error in G3d_unlockAll");
@@ -431,7 +431,7 @@ int G3d_beginCycle(G3D_Map * map)
  *          0 ... otherwise.
  */
 
-int G3d_endCycle(G3D_Map * map)
+int G3d_endCycle(RASTER3D_Map * map)
 {
     G3d_autolockOff(map);
     return 1;

lib/raster3d/tilewrite.c

@@ -12,7 +12,7 @@
 /*---------------------------------------------------------------------------*/
 
 static int
-G3d_tile2xdrTile(G3D_Map * map, const void *tile, int rows, int cols,
+G3d_tile2xdrTile(RASTER3D_Map * map, const void *tile, int rows, int cols,
 		 int depths, int xRedundant, int yRedundant, int zRedundant,
 		 int nofNum, int type)
 {
@@ -70,7 +70,7 @@ G3d_tile2xdrTile(G3D_Map * map, const void *tile, int rows, int cols,
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_writeTileUncompressed(G3D_Map * map, int nofNum)
+static int G3d_writeTileUncompressed(RASTER3D_Map * map, int nofNum)
 {
     if (write(map->data_fd, xdr, map->numLengthExtern * nofNum) !=
 	map->numLengthExtern * nofNum) {
@@ -83,7 +83,7 @@ static int G3d_writeTileUncompressed(G3D_Map * map, int nofNum)
 
 /*---------------------------------------------------------------------------*/
 
-static int G3d_writeTileCompressed(G3D_Map * map, int nofNum)
+static int G3d_writeTileCompressed(RASTER3D_Map * map, int nofNum)
 {
     if (!G_fpcompress_writeXdrNums(map->data_fd, xdr, nofNum, map->precision,
 				   tmpCompress, map->type == FCELL_TYPE,
@@ -127,7 +127,7 @@ static int G3d_writeTileCompressed(G3D_Map * map, int nofNum)
  *          0 ... otherwise.
  */
 
-int G3d_writeTile(G3D_Map * map, int tileIndex, const void *tile, int type)
+int G3d_writeTile(RASTER3D_Map * map, int tileIndex, const void *tile, int type)
 {
     int rows, cols, depths, xRedundant, yRedundant, zRedundant, nofNum;
 
@@ -161,7 +161,7 @@ int G3d_writeTile(G3D_Map * map, int tileIndex, const void *tile, int type)
 	return 0;
     }
 
-    if (map->compression == G3D_NO_COMPRESSION) {
+    if (map->compression == RASTER3D_NO_COMPRESSION) {
 	if (!G3d_writeTileUncompressed(map, nofNum)) {
 	    G3d_error("G3d_writeTile: error in G3d_writeTileUncompressed");
 	    return 0;
@@ -193,7 +193,7 @@ int G3d_writeTile(G3D_Map * map, int tileIndex, const void *tile, int type)
  *  \return int
  */
 
-int G3d_writeTileFloat(G3D_Map * map, int tileIndex, const void *tile)
+int G3d_writeTileFloat(RASTER3D_Map * map, int tileIndex, const void *tile)
 {
     int status;
 
@@ -218,7 +218,7 @@ int G3d_writeTileFloat(G3D_Map * map, int tileIndex, const void *tile)
  *  \return int
  */
 
-int G3d_writeTileDouble(G3D_Map * map, int tileIndex, const void *tile)
+int G3d_writeTileDouble(RASTER3D_Map * map, int tileIndex, const void *tile)
 {
     int status;
 
@@ -253,7 +253,7 @@ int G3d_writeTileDouble(G3D_Map * map, int tileIndex, const void *tile)
  *          0 ... otherwise.
  */
 
-int G3d_flushTile(G3D_Map * map, int tileIndex)
+int G3d_flushTile(RASTER3D_Map * map, int tileIndex)
 {
     const void *tile;
 
@@ -305,7 +305,7 @@ int G3d_flushTile(G3D_Map * map, int tileIndex)
  */
 
 int
-G3d_flushTileCube(G3D_Map * map, int xMin, int yMin, int zMin, int xMax,
+G3d_flushTileCube(RASTER3D_Map * map, int xMin, int yMin, int zMin, int xMax,
 		  int yMax, int zMax)
 {
     int x, y, z;
@@ -351,7 +351,7 @@ G3d_flushTileCube(G3D_Map * map, int xMin, int yMin, int zMin, int xMax,
  */
 
 int
-G3d_flushTilesInCube(G3D_Map * map, int xMin, int yMin, int zMin, int xMax,
+G3d_flushTilesInCube(RASTER3D_Map * map, int xMin, int yMin, int zMin, int xMax,
 		     int yMax, int zMax)
 {
     int xTileMin, yTileMin, zTileMin, xTileMax, yTileMax, zTileMax;

lib/raster3d/volume.c

@@ -216,7 +216,7 @@ G3d_makeAlignedVolumeFile(void *map, const char *fileName,
     void *volumeBuf;
     void *mapVolume;
     int x, y, z, eltLength;
-    G3D_Region region;
+    RASTER3D_Region region;
 
     volumeBuf = G3d_malloc(nx * ny * nz * sizeof(G3d_getFileType()));
     if (volumeBuf == NULL)
@@ -239,7 +239,7 @@ G3d_makeAlignedVolumeFile(void *map, const char *fileName,
     region.depths = nz;
 
     mapVolume = G3d_openCellNew(fileName, G3d_getFileType(),
-				G3D_USE_CACHE_DEFAULT, &region);
+				RASTER3D_USE_CACHE_DEFAULT, &region);
     if (mapVolume == NULL)
 	G3d_fatalError("G3d_makeAlignedVolumeFile: error in G3d_openCellNew");
 

lib/raster3d/window.c

@@ -5,7 +5,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-G3D_Region g3d_window;
+RASTER3D_Region g3d_window;
 
 /*---------------------------------------------------------------------------*/
 
@@ -21,7 +21,7 @@ G3D_Region g3d_window;
  *  \return void
  */
 
-void G3d_setWindowMap(G3D_Map * map, G3D_Region * window)
+void G3d_setWindowMap(RASTER3D_Map * map, RASTER3D_Region * window)
 {
     G3d_regionCopy(&(map->window), window);
     G3d_adjustRegion(&(map->window));
@@ -40,7 +40,7 @@ void G3d_setWindowMap(G3D_Map * map, G3D_Region * window)
  *  \return void
  */
 
-void G3d_setWindow(G3D_Region * window)
+void G3d_setWindow(RASTER3D_Region * window)
 {
     G3d_regionCopy(&g3d_window, window);
     G3d_adjustRegion(&g3d_window);
@@ -58,14 +58,14 @@ void G3d_setWindow(G3D_Region * window)
  *  \return void
  */
 
-void G3d_getWindow(G3D_Region * window)
+void G3d_getWindow(RASTER3D_Region * window)
 {
     G3d_regionCopy(window, &g3d_window);
 }
 
 /*---------------------------------------------------------------------------*/
 
-G3D_Region *G3d_windowPtr()
+RASTER3D_Region *G3d_windowPtr()
 {
     return &g3d_window;
 }
@@ -87,7 +87,7 @@ G3D_Region *G3d_windowPtr()
  *  \return int
  */
 
-int G3d_isValidLocationWindow(G3D_Map * map, double north, double east, double top)
+int G3d_isValidLocationWindow(RASTER3D_Map * map, double north, double east, double top)
 {
     return ((north >= map->window.south) && (north <= map->window.north) &&
 	    (east >= map->window.west) && (east <= map->window.east) &&

lib/raster3d/windowio.c

@@ -29,23 +29,23 @@ G3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, int *proj,
     }
 
     returnVal = 1;
-    returnVal &= windowInt(windowKeys, G3D_REGION_PROJ, proj);
-    returnVal &= windowInt(windowKeys, G3D_REGION_ZONE, zone);
+    returnVal &= windowInt(windowKeys, RASTER3D_REGION_PROJ, proj);
+    returnVal &= windowInt(windowKeys, RASTER3D_REGION_ZONE, zone);
 
-    returnVal &= windowDouble(windowKeys, G3D_REGION_NORTH, north);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_SOUTH, south);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_EAST, east);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_WEST, west);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_TOP, top);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_BOTTOM, bottom);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_NORTH, north);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_SOUTH, south);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_EAST, east);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_WEST, west);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_TOP, top);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_BOTTOM, bottom);
 
-    returnVal &= windowInt(windowKeys, G3D_REGION_ROWS, rows);
-    returnVal &= windowInt(windowKeys, G3D_REGION_COLS, cols);
-    returnVal &= windowInt(windowKeys, G3D_REGION_DEPTHS, depths);
+    returnVal &= windowInt(windowKeys, RASTER3D_REGION_ROWS, rows);
+    returnVal &= windowInt(windowKeys, RASTER3D_REGION_COLS, cols);
+    returnVal &= windowInt(windowKeys, RASTER3D_REGION_DEPTHS, depths);
 
-    returnVal &= windowDouble(windowKeys, G3D_REGION_EWRES, ew_res);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_NSRES, ns_res);
-    returnVal &= windowDouble(windowKeys, G3D_REGION_TBRES, tb_res);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_EWRES, ew_res);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_NSRES, ns_res);
+    returnVal &= windowDouble(windowKeys, RASTER3D_REGION_TBRES, tb_res);
 
     if (returnVal)
 	return 1;
@@ -55,15 +55,15 @@ G3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, int *proj,
 }
 
 /*
- * If windowName == NULL -> G3D_WINDOW_ELEMENT ("$MAPSET/WIND3")
- * otherwise G3D_WINDOW_DATABASE ("$MAPSET/windows3d/$NAME")
+ * If windowName == NULL -> RASTER3D_WINDOW_ELEMENT ("$MAPSET/WIND3")
+ * otherwise RASTER3D_WINDOW_DATABASE ("$MAPSET/windows3d/$NAME")
  */
 static void G3d_getFullWindowPath(char *path, const char *windowName)
 {
     char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 
     if (windowName == NULL) {
-	G_file_name(path, "", G3D_WINDOW_ELEMENT, G_mapset());
+	G_file_name(path, "", RASTER3D_WINDOW_ELEMENT, G_mapset());
 	return;
     }
 
@@ -76,11 +76,11 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
     }
 
     if (G_name_is_fully_qualified(windowName, xname, xmapset)) {
-	G_file_name(path, G3D_WINDOW_DATABASE, xname, xmapset);
+	G_file_name(path, RASTER3D_WINDOW_DATABASE, xname, xmapset);
 	return;
     }
 
-    G_file_name(path, G3D_WINDOW_DATABASE, windowName, G_mapset());
+    G_file_name(path, RASTER3D_WINDOW_DATABASE, windowName, G_mapset());
 }
 
 /*---------------------------------------------------------------------------*/
@@ -104,9 +104,9 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
 
    if ((*windowName != '/') && (*windowName != '.')) {
    if (G_name_is_fully_qualified (windowName, xname, xmapset)) 
-   G_file_name (path, G3D_WINDOW_DATABASE, xname, xmapset);
+   G_file_name (path, RASTER3D_WINDOW_DATABASE, xname, xmapset);
    else
-   G_file_name (path, G3D_WINDOW_DATABASE, windowName, G_mapset ());
+   G_file_name (path, RASTER3D_WINDOW_DATABASE, windowName, G_mapset ());
    } else
    sprintf (path, windowName);
    p = path;
@@ -136,7 +136,7 @@ static void G3d_getFullWindowPath(char *path, const char *windowName)
  *          0 ... otherwise.
  */
 
-int G3d_readWindow(G3D_Region * window, const char *windowName)
+int G3d_readWindow(RASTER3D_Region * window, const char *windowName)
 {
     struct Cell_head win;
     struct Key_Value *windowKeys;
@@ -252,7 +252,7 @@ int G3d_readWindow(G3D_Region * window, const char *windowName)
    int
    G3d_writeWindow (window, windowName)
 
-   G3D_Region *window;
+   RASTER3D_Region *window;
    char *windowName;
 
    {

locale/po/grasslibs_de.po

@@ -4902,26 +4902,26 @@ msgstr "Schreibe 2D Array in die Rasterkarte <%s>"
 #: ../lib/gpde/N_arrays_io.c:273
 #, c-format
 msgid "Requested g3d map <%s> not found"
-msgstr "Angeforderte G3D Karte <%s> nicht gefunden"
+msgstr "Angeforderte RASTER3D Karte <%s> nicht gefunden"
 
 #: ../lib/gpde/N_arrays_io.c:281 ../lib/gpde/N_arrays_io.c:420
 #, c-format
 msgid "Error opening g3d map <%s>"
-msgstr "Fehler beim Öffnen der G3D-Rasterkarte <%s>."
+msgstr "Fehler beim Öffnen der RASTER3D-Rasterkarte <%s>."
 
 #: ../lib/gpde/N_arrays_io.c:309
 #, c-format
 msgid "Read g3d map <%s> into the memory"
-msgstr "Lese G3D-Karte <%s> in den Speicher"
+msgstr "Lese RASTER3D-Karte <%s> in den Speicher"
 
 #: ../lib/gpde/N_arrays_io.c:364 ../lib/gpde/N_arrays_io.c:464
 msgid "Error closing g3d file"
-msgstr "Fehler beim Schließen der G3D-Datei."
+msgstr "Fehler beim Schließen der RASTER3D-Datei."
 
 #: ../lib/gpde/N_arrays_io.c:422
 #, c-format
 msgid "Write 3d array to g3d map <%s>"
-msgstr "Schreibe 3D Array in die G3D-Karte <%s>"
+msgstr "Schreibe 3D Array in die RASTER3D-Karte <%s>"
 
 #: ../lib/gpde/test/test_heat.c:33
 msgid ""

locale/po/grassmods_ar.po

@@ -10042,7 +10042,7 @@ msgstr "وصل الفئات...\n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -28875,7 +28875,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -30423,12 +30423,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "تغلب على الخريطة المخرجة"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -32855,7 +32855,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -32909,7 +32909,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33040,7 +33040,7 @@ msgid "Grid3 <%s> not found %s"
 msgstr "غير موجودة <%s> المنطقة"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -33080,12 +33080,12 @@ msgstr "خريطة مخرجة حيث ستكتب النقاط"
 
 #: ../raster3d/r3.cross.rast/main.c:337
 #, fuzzy
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr "نوع التخزين للخريطة الراسترية الناتجة "
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "<%s>لم يتم العثور على الخريطة المدخلة\n"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -33234,7 +33234,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -33250,7 +33250,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33422,7 +33422,7 @@ msgstr "اسم الخريطة الراسترية الناتجة"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grassmods_cs.po

@@ -10068,10 +10068,10 @@ msgstr "P
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Interpoluje bodová data do G3D volume za pou¾ití regularized spline with "
+"Interpoluje bodová data do RASTER3D volume za pou¾ití regularized spline with "
 "tension (RST)"
 
 #: ../vector/v.vol.rst/main.c:253
@@ -29113,8 +29113,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Pou¾ít masku G3D (pokud existuje) s výstupní mapovou vrstvou"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Pou¾ít masku RASTER3D (pokud existuje) s výstupní mapovou vrstvou"
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -29157,7 +29157,7 @@ msgstr "Chyba p
 #: ../raster/r.out.vtk/parameters.c:34
 #, fuzzy
 msgid "Raster map(s) to be converted to VTK-ASCII data format"
-msgstr "G3D mapa(y) pro konverzi do datového formátu VTK-ASCII"
+msgstr "RASTER3D mapa(y) pro konverzi do datového formátu VTK-ASCII"
 
 #: ../raster/r.out.vtk/parameters.c:41 ../raster3d/r3.out.vtk/parameters.c:34
 msgid "Name for VTK-ASCII output file"
@@ -30681,12 +30681,12 @@ msgstr "Pou
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Pou¾ít masku G3D (pokud existuje) s vstupní mapou"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Pou¾ít masku RASTER3D (pokud existuje) s vstupní mapou"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
-msgstr "Chyba pøi zápisu G3D dat s plovoucí desetinnou èárkou"
+msgid "Error writing RASTER3D double data"
+msgstr "Chyba pøi zápisu RASTER3D dat s plovoucí desetinnou èárkou"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
 #: ../raster3d/r3.in.v5d/main.c:195 ../raster3d/r3.retile/main.c:103
@@ -33158,8 +33158,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "Pou¾ít masku G3D (pokud existuje)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Pou¾ít masku RASTER3D (pokud existuje)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -33211,7 +33211,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33334,8 +33334,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> nebyl nalezen %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "Nemohl jsem uzavøít G3D mapu"
+msgid "Could not close RASTER3D map"
+msgstr "Nemohl jsem uzavøít RASTER3D mapu"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -33351,7 +33351,7 @@ msgstr "V
 
 #: ../raster3d/r3.cross.rast/main.c:109
 msgid "Use g3d mask (if exists) with input map"
-msgstr "Pou¾ít masku G3D (pokud existuje) se vstupní mapou"
+msgstr "Pou¾ít masku RASTER3D (pokud existuje) se vstupní mapou"
 
 #: ../raster3d/r3.cross.rast/main.c:232
 msgid ""
@@ -33371,13 +33371,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Výstupní mapa ji¾ existuje. Mapa bude pøepsána!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "Chybný G3D datový typ! Nelze vytvoøit rastrové mapy."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "Chybný RASTER3D datový typ! Nelze vytvoøit rastrové mapy."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Nemohl jsem uzavøít mapu G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Nemohl jsem uzavøít mapu RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -33522,10 +33522,10 @@ msgstr "Seznam hodnot bun
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Nelze vytvoøit soubor s maskou: G3D_MASK ji¾ existuje!\n"
-" Pro odstranìní existující masky pou¾ijte 'g.remove rast3d=G3D_MASK'."
+"Nelze vytvoøit soubor s maskou: RASTER3D_MASK ji¾ existuje!\n"
+" Pro odstranìní existující masky pou¾ijte 'g.remove rast3d=RASTER3D_MASK'."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -33540,8 +33540,8 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr "write_vtk_unstructured_grid_header: Zapisuji hlavièku VTK"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "G3D mapa(y) pro konverzi do datového formátu VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "RASTER3D mapa(y) pro konverzi do datového formátu VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -33584,7 +33584,7 @@ msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:117
 msgid "Use g3d mask (if exists) with input maps"
-msgstr "Pou¾ít masku G3D (pokud existuje) se vstupními mapami"
+msgstr "Pou¾ít masku RASTER3D (pokud existuje) se vstupními mapami"
 
 #: ../raster3d/r3.out.vtk/parameters.c:122
 msgid "Scale factor effects the origin"
@@ -33721,10 +33721,10 @@ msgstr "Z
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Pou¾ij stejné rozli¹ení jako je vstupní G3D mapa pro 2d výstupní mapu, "
+"Pou¾ij stejné rozli¹ení jako je vstupní RASTER3D mapa pro 2d výstupní mapu, "
 "nezávisle na aktuálním rozli¹ení"
 
 #: ../raster3d/r3.to.rast/main.c:209
@@ -36018,8 +36018,8 @@ msgstr "Uspo
 #~ msgid "Redraw all frames"
 #~ msgstr "Vytiskni celkový rozsah ploch"
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Pøevede 3D rastrové mapy (G3D) do formátu VTK-Ascii"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Pøevede 3D rastrové mapy (RASTER3D) do formátu VTK-Ascii"
 
 #~ msgid "Import GDAL supported raster file into a binary raster map layer."
 #~ msgstr "Import rastrových souborù podporovaných knihovnou GDAL."
@@ -38149,11 +38149,11 @@ msgstr "Uspo
 #~ msgstr "Pøímá choleskyho analýza nepracuje s øídkou maticí"
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "Nelze vytvoøit soubor s maskou: G3D_MASK ji¾ existuje!\n"
-#~ " Pro odstranìní existující masky pou¾ijte 'g.remove rast3d=G3D_MASK'."
+#~ "Nelze vytvoøit soubor s maskou: RASTER3D_MASK ji¾ existuje!\n"
+#~ " Pro odstranìní existující masky pou¾ijte 'g.remove rast3d=RASTER3D_MASK'."
 
 #~ msgid "raster, resample"
 #~ msgstr "rastr, pøevzorkování"

locale/po/grassmods_de.po

@@ -10283,10 +10283,10 @@ msgstr "F
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Interpoliert Punkte zu einem G3D Grid Volumen unter Verwendung des "
+"Interpoliert Punkte zu einem RASTER3D Grid Volumen unter Verwendung des "
 "regularized spline with tension (RST) Algorithmus."
 
 #: ../vector/v.vol.rst/main.c:253
@@ -10356,27 +10356,27 @@ msgstr "Ausgabe-g3d-Datei mit H
 
 #: ../vector/v.vol.rst/main.c:393
 msgid "Output gradient magnitude g3d-file"
-msgstr "Ausgabe-G3D-Datei mit Größenordnungen der Gradienten"
+msgstr "Ausgabe-RASTER3D-Datei mit Größenordnungen der Gradienten"
 
 #: ../vector/v.vol.rst/main.c:403
 msgid "Output gradient horizontal angle g3d-file"
-msgstr "Ausgabe-G3D-Datei mit horizontalen Winkeln der Gradienten"
+msgstr "Ausgabe-RASTER3D-Datei mit horizontalen Winkeln der Gradienten"
 
 #: ../vector/v.vol.rst/main.c:412
 msgid "Output gradient vertical angle g3d-file"
-msgstr "Ausgabe-G3D-Datei mit vertikalen Winkeln der Gradienten"
+msgstr "Ausgabe-RASTER3D-Datei mit vertikalen Winkeln der Gradienten"
 
 #: ../vector/v.vol.rst/main.c:421
 msgid "Output change of gradient g3d-file"
-msgstr "Ausgabe-G3D-Datei mit Änderung der Gradienten"
+msgstr "Ausgabe-RASTER3D-Datei mit Änderung der Gradienten"
 
 #: ../vector/v.vol.rst/main.c:430
 msgid "Output gaussian curvature g3d-file"
-msgstr "Ausgabe-G3D-Datei mit Gauss'scher Krümmung"
+msgstr "Ausgabe-RASTER3D-Datei mit Gauss'scher Krümmung"
 
 #: ../vector/v.vol.rst/main.c:439
 msgid "Output mean curvature g3d-file"
-msgstr "Ausgabe-G3D-Datei mit mittleren Krümmung"
+msgstr "Ausgabe-RASTER3D-Datei mit mittleren Krümmung"
 
 #: ../vector/v.vol.rst/main.c:445
 msgid "Perform a cross-validation procedure without volume interpolation"
@@ -25750,14 +25750,14 @@ msgstr ""
 #: ../raster/r.univar/r3.univar_main.c:186 ../raster3d/r3.stats/main.c:612
 #, c-format
 msgid "Requested g3d map <%s> not found"
-msgstr "Angeforderte G3D Karte <%s> nicht gefunden."
+msgstr "Angeforderte RASTER3D Karte <%s> nicht gefunden."
 
 #: ../raster/r.univar/r3.univar_main.c:154
 #: ../raster/r.univar/r3.univar_main.c:193 ../raster3d/r3.gwflow/main.c:370
 #: ../raster3d/r3.stats/main.c:619
 #, c-format
 msgid "Error opening g3d map <%s>"
-msgstr "Fehler beim Öffnen der G3D-Rasterkarte <%s>."
+msgstr "Fehler beim Öffnen der RASTER3D-Rasterkarte <%s>."
 
 #: ../raster/r.univar/r3.univar_main.c:163
 #, fuzzy
@@ -29432,8 +29432,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Benutzt G3D Maske (falls existent) für die Ausgabekarte."
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Benutzt RASTER3D Maske (falls existent) für die Ausgabekarte."
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -29450,7 +29450,7 @@ msgid ""
 "The 2d and 3d region settings are different. I will use the g3d settings to "
 "adjust the 2d region."
 msgstr ""
-"Die 2D und 3D Regions Parameter sind unterschiedlich. Ich werde die G3D "
+"Die 2D und 3D Regions Parameter sind unterschiedlich. Ich werde die RASTER3D "
 "Parameter verwenden, um die 2D Region anzupassen."
 
 #: ../raster/r.to.rast3/main.c:262
@@ -29478,7 +29478,7 @@ msgstr "Fehler beim Schlie
 #: ../raster/r.out.vtk/parameters.c:34
 #, fuzzy
 msgid "Raster map(s) to be converted to VTK-ASCII data format"
-msgstr "G3D Karte(n), die in das VTL-ASCII-Format konvertiert werden."
+msgstr "RASTER3D Karte(n), die in das VTL-ASCII-Format konvertiert werden."
 
 #: ../raster/r.out.vtk/parameters.c:41 ../raster3d/r3.out.vtk/parameters.c:34
 msgid "Name for VTK-ASCII output file"
@@ -31013,12 +31013,12 @@ msgstr "Verwende die Werte der Eingabekarte, um die unteren Zellen zu f
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Benutzt G3D Maske (falls existent) mit der Eingabekarte"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Benutzt RASTER3D Maske (falls existent) mit der Eingabekarte"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
-msgstr "Fehler beim Schreiben der G3D double-Daten."
+msgid "Error writing RASTER3D double data"
+msgstr "Fehler beim Schreiben der RASTER3D double-Daten."
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
 #: ../raster3d/r3.in.v5d/main.c:195 ../raster3d/r3.retile/main.c:103
@@ -33464,8 +33464,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "Benutzte G3D Maske (falls existent)."
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Benutzte RASTER3D Maske (falls existent)."
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -33493,11 +33493,11 @@ msgstr ""
 #: ../raster3d/r3.gwflow/main.c:372
 #, c-format
 msgid "Write the result to g3d map <%s>"
-msgstr "Schreibe das Ergebnis in die G3D-Karte <%s>."
+msgstr "Schreibe das Ergebnis in die RASTER3D-Karte <%s>."
 
 #: ../raster3d/r3.gwflow/main.c:419
 msgid "Error closing g3d file"
-msgstr "Fehler beim Schließen der G3D-Datei."
+msgstr "Fehler beim Schließen der RASTER3D-Datei."
 
 #: ../raster3d/r3.in.v5d/main.c:197
 #, fuzzy
@@ -33519,13 +33519,13 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
 #, c-format
 msgid "Open 3d raster map <%s>"
-msgstr "Öffne G3D Rasterkarte <%s>."
+msgstr "Öffne RASTER3D Rasterkarte <%s>."
 
 #: ../raster3d/r3.retile/main.c:132
 #, fuzzy, c-format
@@ -33644,8 +33644,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> wurde nicht gefunden %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "Konnte G3D Karte nicht schließen"
+msgid "Could not close RASTER3D map"
+msgstr "Konnte RASTER3D Karte nicht schließen"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -33661,7 +33661,7 @@ msgstr "Resultierende 2D Cross-Sektions-Karte."
 
 #: ../raster3d/r3.cross.rast/main.c:109
 msgid "Use g3d mask (if exists) with input map"
-msgstr "Benutzt G3D Maske (falls existent) mit der Eingabekarte."
+msgstr "Benutzt RASTER3D Maske (falls existent) mit der Eingabekarte."
 
 #: ../raster3d/r3.cross.rast/main.c:232
 msgid ""
@@ -33683,13 +33683,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Ausgabekarte existiert bereits. Sie wird überschrieben!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "Falscher G3D Datentyp. Kann die Rasterkarte nicht erzeugen."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "Falscher RASTER3D Datentyp. Kann die Rasterkarte nicht erzeugen."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Konnte G3D Karte <%s> nicht schließen."
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Konnte RASTER3D Karte <%s> nicht schließen."
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -33802,7 +33802,7 @@ msgstr "makeMask: Fehler beim
 
 #: ../raster3d/base/r3.mask.main.c:75
 msgid "makeMask: error opening g3d mask file"
-msgstr "makeMask: Fehler beim Öffnen der G3D-Maskendatei."
+msgstr "makeMask: Fehler beim Öffnen der RASTER3D-Maskendatei."
 
 #: ../raster3d/base/r3.mask.main.c:104
 msgid "makeMask: error flushing tiles in cube"
@@ -33814,7 +33814,7 @@ msgstr "makeMask: Fehler beim Sp
 
 #: ../raster3d/base/r3.mask.main.c:117
 msgid "makeMask: error closing g3d mask file"
-msgstr "makeMask: Fehler beim Schließen der G3D-Maskendatei."
+msgstr "makeMask: Fehler beim Schließen der RASTER3D-Maskendatei."
 
 #: ../raster3d/base/r3.mask.main.c:119
 msgid "makeMask: error closing map"
@@ -33834,10 +33834,10 @@ msgstr "Liste von Zellenwerten, die ausmaskiert werden sollen."
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Kann keine Maskendatei erzeugen: G3D_MASK existiert bereits.\n"
-"Benutzen Sie 'g.remove rast3d=G3D_MASK' um die existierende Maske zu löschen."
+"Kann keine Maskendatei erzeugen: RASTER3D_MASK existiert bereits.\n"
+"Benutzen Sie 'g.remove rast3d=RASTER3D_MASK' um die existierende Maske zu löschen."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -33853,8 +33853,8 @@ msgstr ""
 "write_vtk_unstructured_grid_header: Schreibe VTKUnstructuredGrid-Header"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "G3D Karte(n), die in das VTL-ASCII-Format konvertiert werden."
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "RASTER3D Karte(n), die in das VTL-ASCII-Format konvertiert werden."
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -33896,7 +33896,7 @@ msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:117
 msgid "Use g3d mask (if exists) with input maps"
-msgstr "Benutze G3D Maske (falls existent) mit der Eingabekarte."
+msgstr "Benutze RASTER3D Maske (falls existent) mit der Eingabekarte."
 
 #: ../raster3d/r3.out.vtk/parameters.c:122
 msgid "Scale factor effects the origin"
@@ -33919,32 +33919,32 @@ msgstr "Untere Rasterkarte <%s> nicht gefunden."
 #: ../raster3d/r3.out.vtk/main.c:142
 #, c-format
 msgid "Requested 3d raster map <%s> not found"
-msgstr "Angeforderte G3D Rasterkarte <%s> nicht gefunden."
+msgstr "Angeforderte RASTER3D Rasterkarte <%s> nicht gefunden."
 
 #: ../raster3d/r3.out.vtk/main.c:152
 #, c-format
 msgid "Requested g3d RGB map <%s> not found"
-msgstr "Angeforderte G3D RGB Karte <%s> nicht gefunden."
+msgstr "Angeforderte RASTER3D RGB Karte <%s> nicht gefunden."
 
 #: ../raster3d/r3.out.vtk/main.c:155
 msgid "Please provide three g3d RGB maps"
-msgstr "Bitte geben Sie drei G3D RGB Karten an."
+msgstr "Bitte geben Sie drei RASTER3D RGB Karten an."
 
 #: ../raster3d/r3.out.vtk/main.c:165
 #, c-format
 msgid "Requested g3d vector map <%s> not found"
-msgstr "Angeforderte G3D Vektorkarte <%s> nicht gefunden."
+msgstr "Angeforderte RASTER3D Vektorkarte <%s> nicht gefunden."
 
 #: ../raster3d/r3.out.vtk/main.c:168
 msgid "Please provide three g3d vector maps [x,y,z]"
-msgstr "Bitte geben Sie drei G3D Vektorkarten an [x,y,z]."
+msgstr "Bitte geben Sie drei RASTER3D Vektorkarten an [x,y,z]."
 
 #: ../raster3d/r3.out.vtk/main.c:175
 msgid ""
 "No g3d data, RGB or xyz-vector maps are provided! Will only write the "
 "geometry."
 msgstr ""
-"Keine G3D-Daten, RGB oder xyz-Vektorkarten wurden angegeben! Werde nur die "
+"Keine RASTER3D-Daten, RGB oder xyz-Vektorkarten wurden angegeben! Werde nur die "
 "Geometrien schreiben."
 
 #: ../raster3d/r3.out.vtk/main.c:196
@@ -33958,7 +33958,7 @@ msgstr "RGB-Daten werden nicht erzeugt."
 
 #: ../raster3d/r3.out.vtk/main.c:252
 msgid "Error closing g3d rgb map."
-msgstr "Fehler beim Schließen der G3D-RGB-Datei."
+msgstr "Fehler beim Schließen der RASTER3D-RGB-Datei."
 
 #: ../raster3d/r3.out.vtk/main.c:294
 msgid "No vector data will be created."
@@ -33966,7 +33966,7 @@ msgstr "Vektordaten werden nicht erzeugt."
 
 #: ../raster3d/r3.out.vtk/main.c:338
 msgid "Error closing g3d vector map."
-msgstr "Fehler beim Schließen der G3D-Vektorkarte."
+msgstr "Fehler beim Schließen der RASTER3D-Vektorkarte."
 
 #: ../raster3d/r3.out.vtk/main.c:380
 #, fuzzy
@@ -33982,7 +33982,7 @@ msgid ""
 "The 2d and 3d region settings are different. The g3d settings are used to "
 "adjust the 2d region."
 msgstr ""
-"Die 2D und 3D Regions Parameter sind unterschiedlich. Die G3D-Parameter "
+"Die 2D und 3D Regions Parameter sind unterschiedlich. Die RASTER3D-Parameter "
 "werden verwendet, um die 2D Region anzupassen."
 
 #: ../raster3d/r3.out.vtk/main.c:540
@@ -34036,10 +34036,10 @@ msgstr "Basisname f
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Verwende dieselbe Auflösung wie die G3D-Eingabekarte für die 2D-"
+"Verwende dieselbe Auflösung wie die RASTER3D-Eingabekarte für die 2D-"
 "Ausgabekarten. Dies ist unabhängig von der Auflösung der aktuellen Region. "
 
 #: ../raster3d/r3.to.rast/main.c:209
@@ -34636,8 +34636,8 @@ msgstr "Sortiere Nicht-NULL-Werte."
 #~ msgid "Could not open map %s"
 #~ msgstr "Kann die Karte %s nicht öffnen."
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Konvertiert eine 3D-Rasterkarte (G3D) in das VTK-ASCII-Format."
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Konvertiert eine 3D-Rasterkarte (RASTER3D) in das VTK-ASCII-Format."
 
 #~ msgid "unable to close top raster map"
 #~ msgstr "Kann die obere Rasterkarte nicht schließen."
@@ -34702,11 +34702,11 @@ msgstr "Sortiere Nicht-NULL-Werte."
 #~ msgstr "3D-Raster, Voxel, Statistik"
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "Kann keine Maskendatei erzeugen: G3D_MASK existiert bereits.\n"
-#~ "Benutzen Sie 'g.remove rast3d=G3D_MASK' um die existierende Maske zu "
+#~ "Kann keine Maskendatei erzeugen: RASTER3D_MASK existiert bereits.\n"
+#~ "Benutzen Sie 'g.remove rast3d=RASTER3D_MASK' um die existierende Maske zu "
 #~ "löschen."
 
 #~ msgid "Export of GRASS 3D raster map to 3-dimensional Vis5D file."

locale/po/grassmods_el.po

@@ -9521,7 +9521,7 @@ msgstr ""
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -27447,7 +27447,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -28928,11 +28928,11 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "×ñçóéìïðïéÞóôå G3D mask (áí õðÜñ÷åé) ìå åéóáãþìåíï ÷Üñôç"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "×ñçóéìïðïéÞóôå RASTER3D mask (áí õðÜñ÷åé) ìå åéóáãþìåíï ÷Üñôç"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -31245,8 +31245,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "×ñçóéìïðïéÞóôå G3D ìÜóêá (åÜí õðÜñ÷åé)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "×ñçóéìïðïéÞóôå RASTER3D ìÜóêá (åÜí õðÜñ÷åé)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 msgid "groundwater"
@@ -31295,7 +31295,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -31415,7 +31415,7 @@ msgid "Grid3 <%s> not found %s"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "Äåí ãßíåôáé íá êëåßóåé ï G3Ä ÷Üñôçò"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -31454,13 +31454,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Ï åîáãþìåíïò ÷Üñôçò Þäç õðÜñ÷åé. Èá áíôéêáôáóôáèåß!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "ËÜèïò G3D ôýðïò! Äåí ìðïñåß íá äçìéïõñãçèåß ñÜóôåñ ÷Üñôçò."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "ËÜèïò RASTER3D ôýðïò! Äåí ìðïñåß íá äçìéïõñãçèåß ñÜóôåñ ÷Üñôçò."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Äåí ìðïñåß íá êëåßóåé ï G3D ÷Üñôçò <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Äåí ìðïñåß íá êëåßóåé ï RASTER3D ÷Üñôçò <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -31605,7 +31605,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -31621,7 +31621,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -31787,7 +31787,7 @@ msgstr ""
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 
@@ -32252,7 +32252,7 @@ msgstr "
 
 #, fuzzy
 #~ msgid "Could not open <%s>"
-#~ msgstr "Äåí ìðïñåß íá êëåßóåé ï G3D ÷Üñôçò <%s>"
+#~ msgstr "Äåí ìðïñåß íá êëåßóåé ï RASTER3D ÷Üñôçò <%s>"
 
 #, fuzzy
 #~ msgid "Unable to read header of raster map <%s> "

locale/po/grassmods_es.po

@@ -10219,10 +10219,10 @@ msgstr "Adjuntando centroides..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Interpola datos de puntos a volumen de cuadrícula G3D usando spline "
+"Interpola datos de puntos a volumen de cuadrícula RASTER3D usando spline "
 "regularizado con algoritmo de tensión (RST)."
 
 #: ../vector/v.vol.rst/main.c:253
@@ -10288,31 +10288,31 @@ msgstr "Opciones de salida"
 
 #: ../vector/v.vol.rst/main.c:385
 msgid "Output elevation g3d-file"
-msgstr "Producir archivo G3D de elevación"
+msgstr "Producir archivo RASTER3D de elevación"
 
 #: ../vector/v.vol.rst/main.c:393
 msgid "Output gradient magnitude g3d-file"
-msgstr "Producir archivo G3D de magnitud de gradiente"
+msgstr "Producir archivo RASTER3D de magnitud de gradiente"
 
 #: ../vector/v.vol.rst/main.c:403
 msgid "Output gradient horizontal angle g3d-file"
-msgstr "Producir archivo G3D de ángulo horizontal de gradiente"
+msgstr "Producir archivo RASTER3D de ángulo horizontal de gradiente"
 
 #: ../vector/v.vol.rst/main.c:412
 msgid "Output gradient vertical angle g3d-file"
-msgstr "Producir archivo G3D de ángulo vertical de gradiente"
+msgstr "Producir archivo RASTER3D de ángulo vertical de gradiente"
 
 #: ../vector/v.vol.rst/main.c:421
 msgid "Output change of gradient g3d-file"
-msgstr "Producir archivo G3D de cambio de gradiente"
+msgstr "Producir archivo RASTER3D de cambio de gradiente"
 
 #: ../vector/v.vol.rst/main.c:430
 msgid "Output gaussian curvature g3d-file"
-msgstr "Producir archivo G3D de curvatura gausiana"
+msgstr "Producir archivo RASTER3D de curvatura gausiana"
 
 #: ../vector/v.vol.rst/main.c:439
 msgid "Output mean curvature g3d-file"
-msgstr "Producir archivo G3D de curvatura media"
+msgstr "Producir archivo RASTER3D de curvatura media"
 
 #: ../vector/v.vol.rst/main.c:445
 msgid "Perform a cross-validation procedure without volume interpolation"
@@ -25676,14 +25676,14 @@ msgstr ""
 #: ../raster/r.univar/r3.univar_main.c:186 ../raster3d/r3.stats/main.c:612
 #, c-format
 msgid "Requested g3d map <%s> not found"
-msgstr "Mapa G3D <%s> solicitado no encontrado"
+msgstr "Mapa RASTER3D <%s> solicitado no encontrado"
 
 #: ../raster/r.univar/r3.univar_main.c:154
 #: ../raster/r.univar/r3.univar_main.c:193 ../raster3d/r3.gwflow/main.c:370
 #: ../raster3d/r3.stats/main.c:619
 #, c-format
 msgid "Error opening g3d map <%s>"
-msgstr "Error al abrir el mapa G3D <%s>"
+msgstr "Error al abrir el mapa RASTER3D <%s>"
 
 #: ../raster/r.univar/r3.univar_main.c:163
 #, fuzzy
@@ -29354,8 +29354,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Usar máscara G3D (si existe) con el mapa de salida"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Usar máscara RASTER3D (si existe) con el mapa de salida"
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -29372,7 +29372,7 @@ msgid ""
 "adjust the 2d region."
 msgstr ""
 "Las configuraciones de la región 2D y 3D son diferentes. Usaré las "
-"configuraciones G3D para ajustar la región 2D."
+"configuraciones RASTER3D para ajustar la región 2D."
 
 #: ../raster/r.to.rast3/main.c:262
 #, c-format
@@ -29399,7 +29399,7 @@ msgstr "Error cerrando mapa raster 3d"
 #: ../raster/r.out.vtk/parameters.c:34
 #, fuzzy
 msgid "Raster map(s) to be converted to VTK-ASCII data format"
-msgstr "Mapa(s) G3D a convertir al formato de datos VTK-ASCII"
+msgstr "Mapa(s) RASTER3D a convertir al formato de datos VTK-ASCII"
 
 #: ../raster/r.out.vtk/parameters.c:41 ../raster3d/r3.out.vtk/parameters.c:34
 msgid "Name for VTK-ASCII output file"
@@ -30940,12 +30940,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Usar máscara G3D (si existe) con el mapa de entrada"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Usar máscara RASTER3D (si existe) con el mapa de entrada"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
-msgstr "Error al escribir datos dobles G3D"
+msgid "Error writing RASTER3D double data"
+msgstr "Error al escribir datos dobles RASTER3D"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
 #: ../raster3d/r3.in.v5d/main.c:195 ../raster3d/r3.retile/main.c:103
@@ -33385,8 +33385,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "Usar máscara G3D (si existe)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Usar máscara RASTER3D (si existe)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -33414,11 +33414,11 @@ msgstr ""
 #: ../raster3d/r3.gwflow/main.c:372
 #, c-format
 msgid "Write the result to g3d map <%s>"
-msgstr "Escribir el resultado al mapa G3D <%s>"
+msgstr "Escribir el resultado al mapa RASTER3D <%s>"
 
 #: ../raster3d/r3.gwflow/main.c:419
 msgid "Error closing g3d file"
-msgstr "Error al cerrar archivo G3D"
+msgstr "Error al cerrar archivo RASTER3D"
 
 #: ../raster3d/r3.in.v5d/main.c:197
 #, fuzzy
@@ -33439,7 +33439,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33565,8 +33565,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> no encontrado %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "No se pudo cerrar el mapa G3D"
+msgid "Could not close RASTER3D map"
+msgstr "No se pudo cerrar el mapa RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -33582,7 +33582,7 @@ msgstr "Mapa r
 
 #: ../raster3d/r3.cross.rast/main.c:109
 msgid "Use g3d mask (if exists) with input map"
-msgstr "Usar máscara G3D (si existe) con el mapar de entrada"
+msgstr "Usar máscara RASTER3D (si existe) con el mapar de entrada"
 
 #: ../raster3d/r3.cross.rast/main.c:232
 msgid ""
@@ -33604,13 +33604,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "El mapa de salida ya existe. ¡Se sobrescribirá!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "¡Tipo de datos G3D incorrecto! No se puede crear el mapa ráster."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "¡Tipo de datos RASTER3D incorrecto! No se puede crear el mapa ráster."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "No se pudo cerrar el mapa G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "No se pudo cerrar el mapa RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -33755,10 +33755,10 @@ msgstr "Lista de valores de celda para ser enmascarados"
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"No se puede crear archivo de máscara: ¡G3D_MASK ya existe!\n"
-" Usa 'g.remove rast3d=G3D_MASK' para eliminar la máscara existente."
+"No se puede crear archivo de máscara: ¡RASTER3D_MASK ya existe!\n"
+" Usa 'g.remove rast3d=RASTER3D_MASK' para eliminar la máscara existente."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -33779,8 +33779,8 @@ msgstr ""
 "Cabecera"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "Mapa(s) G3D a convertir al formato de datos VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "Mapa(s) RASTER3D a convertir al formato de datos VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -33823,7 +33823,7 @@ msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:117
 msgid "Use g3d mask (if exists) with input maps"
-msgstr "Usar máscara G3D (si existe) con los mapas de entrada"
+msgstr "Usar máscara RASTER3D (si existe) con los mapas de entrada"
 
 #: ../raster3d/r3.out.vtk/parameters.c:122
 msgid "Scale factor effects the origin"
@@ -33851,27 +33851,27 @@ msgstr "Mapa r
 #: ../raster3d/r3.out.vtk/main.c:152
 #, c-format
 msgid "Requested g3d RGB map <%s> not found"
-msgstr "Mapa RGB G3D <%s> solicitado no encontrado"
+msgstr "Mapa RGB RASTER3D <%s> solicitado no encontrado"
 
 #: ../raster3d/r3.out.vtk/main.c:155
 msgid "Please provide three g3d RGB maps"
-msgstr "Por favor, proporciona tres mapas RGB G3D"
+msgstr "Por favor, proporciona tres mapas RGB RASTER3D"
 
 #: ../raster3d/r3.out.vtk/main.c:165
 #, c-format
 msgid "Requested g3d vector map <%s> not found"
-msgstr "Mapa vectorial G3D <%s> solicitado no encontrado"
+msgstr "Mapa vectorial RASTER3D <%s> solicitado no encontrado"
 
 #: ../raster3d/r3.out.vtk/main.c:168
 msgid "Please provide three g3d vector maps [x,y,z]"
-msgstr "Por favor, proporciona tres mapas vectoriales G3D [x,y,z]"
+msgstr "Por favor, proporciona tres mapas vectoriales RASTER3D [x,y,z]"
 
 #: ../raster3d/r3.out.vtk/main.c:175
 msgid ""
 "No g3d data, RGB or xyz-vector maps are provided! Will only write the "
 "geometry."
 msgstr ""
-"¡No se ha proporcionado ningún mapa de datos G3D, RGB o vectorial xyz! Sólo "
+"¡No se ha proporcionado ningún mapa de datos RASTER3D, RGB o vectorial xyz! Sólo "
 "se escribirá la geometría."
 
 #: ../raster3d/r3.out.vtk/main.c:196
@@ -33885,7 +33885,7 @@ msgstr "No se crear
 
 #: ../raster3d/r3.out.vtk/main.c:252
 msgid "Error closing g3d rgb map."
-msgstr "Error al cerrar mapa RGB G3D."
+msgstr "Error al cerrar mapa RGB RASTER3D."
 
 #: ../raster3d/r3.out.vtk/main.c:294
 msgid "No vector data will be created."
@@ -33893,7 +33893,7 @@ msgstr "No se crear
 
 #: ../raster3d/r3.out.vtk/main.c:338
 msgid "Error closing g3d vector map."
-msgstr "Error al cerrar mapa vectorial G3D."
+msgstr "Error al cerrar mapa vectorial RASTER3D."
 
 #: ../raster3d/r3.out.vtk/main.c:380
 #, fuzzy
@@ -33910,7 +33910,7 @@ msgid ""
 "adjust the 2d region."
 msgstr ""
 "Las configuraciones de la región 2D y 3D son diferentes. Se usan las "
-"configuraciones G3D para ajustar la región 2D."
+"configuraciones RASTER3D para ajustar la región 2D."
 
 #: ../raster3d/r3.out.vtk/main.c:540
 msgid "Error closing 3d raster map, the VTK file may be incomplete."
@@ -33962,10 +33962,10 @@ msgstr "Nombre base para los mapas de rodajas r
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Usar la misma resolución que en mapa G3D de entrada para los mapas 2D de "
+"Usar la misma resolución que en mapa RASTER3D de entrada para los mapas 2D de "
 "salida, independientemente de la configuración de la región actual"
 
 #: ../raster3d/r3.to.rast/main.c:209
@@ -35710,8 +35710,8 @@ msgstr "Ordenar valores no nulos"
 #~ msgid "Unable to access table <%s>"
 #~ msgstr "No se puede acceder a la tabla <%s>"
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Convierte mapas ráster 3D (G3D) en formato VTK-ASCII"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Convierte mapas ráster 3D (RASTER3D) en formato VTK-ASCII"
 
 #~ msgid "Import GDAL supported raster file into a binary raster map layer."
 #~ msgstr ""
@@ -39867,11 +39867,11 @@ msgstr "Ordenar valores no nulos"
 #~ msgstr "Imprimir la matriz de transformación a stdout"
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "No se puede crear archivo de máscara: ¡G3D_MASK ya existe!\n"
-#~ " Usa 'g.remove rast3d=G3D_MASK' para eliminar la máscara existente."
+#~ "No se puede crear archivo de máscara: ¡RASTER3D_MASK ya existe!\n"
+#~ " Usa 'g.remove rast3d=RASTER3D_MASK' para eliminar la máscara existente."
 
 #~ msgid "Name of terrain raster map (DEM)"
 #~ msgstr "Nombre del mapa raster de terreno (MDT)"

locale/po/grassmods_fr.po

@@ -10717,7 +10717,7 @@ msgstr "Rattachement des cat
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -26834,7 +26834,7 @@ msgstr "Activer le retour d'information du cache"
 #: ../raster/r.what/main.c:196
 #, fuzzy, c-format
 msgid "can only do up to %d raster maps"
-msgstr "Nom du fichier grille G3D en sortie"
+msgstr "Nom du fichier grille RASTER3D en sortie"
 
 #: ../raster/r.what/main.c:212
 #, fuzzy, c-format
@@ -31019,7 +31019,7 @@ msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
 #, fuzzy
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr "Utilisez le masque raster 3D (s'il existe) sur la couche en entrée"
 
 #: ../raster/r.to.rast3/main.c:201
@@ -31067,7 +31067,7 @@ msgstr "Erreur de fermeture du fichier raster 3D"
 #: ../raster/r.out.vtk/parameters.c:34
 #, fuzzy
 msgid "Raster map(s) to be converted to VTK-ASCII data format"
-msgstr "Couche(s) G3D à convertir au format de données VTK-ASCII"
+msgstr "Couche(s) RASTER3D à convertir au format de données VTK-ASCII"
 
 #: ../raster/r.out.vtk/parameters.c:41 ../raster3d/r3.out.vtk/parameters.c:34
 msgid "Name for VTK-ASCII output file"
@@ -32707,12 +32707,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr "Utilisez le masque raster 3D (s'il existe) sur la couche en entrée"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "Erreur de lecture des cellules de données"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -32730,7 +32730,7 @@ msgstr ""
 #, fuzzy
 msgid "Creates a 3D volume map based on 2D elevation and value raster maps."
 msgstr ""
-"Crée une couche raster de coupe 2D à partir du raster volumique G3D à partir "
+"Crée une couche raster de coupe 2D à partir du raster volumique RASTER3D à partir "
 "d'une couche de relief 2D"
 
 #: ../raster/r.to.rast3elev/main.c:400
@@ -35261,7 +35261,7 @@ msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
 #, fuzzy
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr "Utilisez le masque raster 3D (s'il existe) sur la couche en entrée"
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -35315,7 +35315,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 # c-format
@@ -35452,8 +35452,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "couche 3D <%s> non trouvée %s\n"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "Impossible de fermer la couche G3D"
+msgid "Could not close RASTER3D map"
+msgstr "Impossible de fermer la couche RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -35476,7 +35476,7 @@ msgid ""
 "Creates cross section 2D raster map from 3d raster map based on 2D elevation "
 "map"
 msgstr ""
-"Crée une couche raster de coupe 2D à partir du raster volumique G3D à partir "
+"Crée une couche raster de coupe 2D à partir du raster volumique RASTER3D à partir "
 "d'une couche de relief 2D"
 
 #: ../raster3d/r3.cross.rast/main.c:278 ../raster3d/r3.out.vtk/main.c:207
@@ -35496,14 +35496,14 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "La couche de sortie existe déjà. Ce fichier va être écrasé!\n"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr ""
-"Erreur sur le type de raster G3D! Impossible de créer la couche raster."
+"Erreur sur le type de raster RASTER3D! Impossible de créer la couche raster."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Impossible de fermer la couche G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Impossible de fermer la couche RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -35662,10 +35662,10 @@ msgstr "Liste de valeurs de cellules
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Impossible de créer un fichier masque : G3D_MASK existe déjà!\n"
-"Utilisez 'g.remove rast3d=G3D_MASK' pour supprimer le masque existant."
+"Impossible de créer un fichier masque : RASTER3D_MASK existe déjà!\n"
+"Utilisez 'g.remove rast3d=RASTER3D_MASK' pour supprimer le masque existant."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 #, fuzzy
@@ -35683,8 +35683,8 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr "writeVTKStructuredElevationHeader: Ecriture de l'en-tête VTK"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "Couche(s) G3D à convertir au format de données VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "Couche(s) RASTER3D à convertir au format de données VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -35797,7 +35797,7 @@ msgstr "Ouvrir le fichier raster 3D %s"
 #, fuzzy
 msgid "No RGB Data will be created."
 msgstr ""
-"Erreur d'ouverture du fichier G3D <%s>. Aucune données RGB ne sera créée."
+"Erreur d'ouverture du fichier RASTER3D <%s>. Aucune données RGB ne sera créée."
 
 #: ../raster3d/r3.out.vtk/main.c:252
 #, fuzzy
@@ -35832,7 +35832,7 @@ msgstr ""
 #: ../raster3d/r3.out.vtk/main.c:540
 msgid "Error closing 3d raster map, the VTK file may be incomplete."
 msgstr ""
-"Erreur de fermeture de la couche de données G3D, le fichier VTK risque "
+"Erreur de fermeture de la couche de données RASTER3D, le fichier VTK risque "
 "d'être incomplet."
 
 #: ../raster3d/r3.out.vtk/errorHandling.c:65
@@ -35867,7 +35867,7 @@ msgstr "writeVTKData: Ecriture de donn
 #: ../raster3d/r3.out.vtk/writeVTKData.c:441
 msgid "Wrong 3d raster map values! Values should in between 0 and 255!\n"
 msgstr ""
-"Valeurs de couches G3D erronées! Les valeurs doivent être comprises entre 0 "
+"Valeurs de couches RASTER3D erronées! Les valeurs doivent être comprises entre 0 "
 "et 255!\n"
 
 #: ../raster3d/r3.out.vtk/writeVTKData.c:470
@@ -35884,7 +35884,7 @@ msgstr "Racine du nom des tranches rasters cr
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 
@@ -37633,7 +37633,7 @@ msgstr "Pas de valeurs non-null"
 #~ msgid "Unable to access table <%s>"
 #~ msgstr "impossible de créer la sortie <%s>"
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
 #~ msgstr "Convertit une couche raster 3D au format VTK-ASCII"
 
 #, fuzzy
@@ -42697,7 +42697,7 @@ msgstr "Pas de valeurs non-null"
 #~ msgstr "[%s] n'est pas un nom légal\n"
 
 #~ msgid "Requested 3d raster map not found <%s>"
-#~ msgstr "Le fichier raster G3D <%s> demandé n'a pas été trouvé"
+#~ msgstr "Le fichier raster RASTER3D <%s> demandé n'a pas été trouvé"
 
 #, fuzzy
 #~ msgid "Could not open output map"
@@ -43837,7 +43837,7 @@ msgstr "Pas de valeurs non-null"
 #, fuzzy
 #~ msgid "raster_to_g3d: Writing %i raster maps with rows %i cols."
 #~ msgstr ""
-#~ "RasterToG3D(Raster vers Raster 3D) : créer %i couches rasters de "
+#~ "RasterToRASTER3D(Raster vers Raster 3D) : créer %i couches rasters de "
 #~ "dimensions lignes %i colonnes"
 
 #~ msgid "Writing g3d slice %i\n"
@@ -43866,7 +43866,7 @@ msgstr "Pas de valeurs non-null"
 #~ "elev_raster_to_g3d: Writing 3D raster map with depths %i rows %i cols %i "
 #~ "and count %i."
 #~ msgstr ""
-#~ "RasterToG3D(Raster vers Raster 3D) : créer %i couches rasters de "
+#~ "RasterToRASTER3D(Raster vers Raster 3D) : créer %i couches rasters de "
 #~ "dimensions lignes %i colonnes"
 
 # c-format
@@ -44361,11 +44361,11 @@ msgstr "Pas de valeurs non-null"
 #~ msgstr "Lecteur du fichier raster..."
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "Impossible de créer un fichier masque : G3D_MASK existe déjà!\n"
-#~ "Utilisez 'g.remove rast3d=G3D_MASK' pour supprimer le masque existant."
+#~ "Impossible de créer un fichier masque : RASTER3D_MASK existe déjà!\n"
+#~ "Utilisez 'g.remove rast3d=RASTER3D_MASK' pour supprimer le masque existant."
 
 #~ msgid "Export of GRASS 3D raster map to 3-dimensional Vis5D file."
 #~ msgstr "Exporter une couche raster 3D GRASS vers un fichier 3D VIS-5D"
@@ -45743,7 +45743,7 @@ msgstr "Pas de valeurs non-null"
 #~ msgstr "Ligne d'historique trop longue : tronquée à %d caractères"
 
 #~ msgid "Name of output 3d raster map"
-#~ msgstr "Nom du fichier grille G3D en sortie"
+#~ msgstr "Nom du fichier grille RASTER3D en sortie"
 
 #, fuzzy
 #~ msgid "input layer name"

locale/po/grassmods_hi.po

@@ -10135,7 +10135,7 @@ msgstr "n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -29280,7 +29280,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -30876,12 +30876,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "त्रुटि."
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -33350,7 +33350,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -33403,7 +33403,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33539,7 +33539,7 @@ msgstr "नहीं n"
 
 #: ../raster3d/r3.cross.rast/main.c:55
 #, fuzzy
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "नहीं"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -33580,12 +33580,12 @@ msgstr "i n"
 
 #: ../raster3d/r3.cross.rast/main.c:337
 #, fuzzy
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr "डाटाटाइप."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "नहीं"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -33752,7 +33752,7 @@ msgstr "का"
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 "\n"
 " जी."
@@ -33773,7 +33773,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr "बिन्दु"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33957,7 +33957,7 @@ msgstr "के लिए"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grassmods_it.po

@@ -9941,7 +9941,7 @@ msgstr "Sto attaccando i centroidi..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -28508,7 +28508,7 @@ msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
 #, fuzzy
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr "Usa una mask G3d (se esiste) con la mappa di output"
 
 #: ../raster/r.to.rast3/main.c:201
@@ -30069,11 +30069,11 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -32465,8 +32465,8 @@ msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
 #, fuzzy
-msgid "Use G3D mask (if exists)"
-msgstr "Usa una mask G3D (se esiste)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Usa una mask RASTER3D (se esiste)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -32519,7 +32519,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -32651,8 +32651,8 @@ msgstr "Grid3 <%s> non trovato %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
 #, fuzzy
-msgid "Could not close G3D map"
-msgstr "Impossibile chiudere la mappa G3D"
+msgid "Could not close RASTER3D map"
+msgstr "Impossibile chiudere la mappa RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -32689,13 +32689,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Mappa in uscita già esistente. Sarà sovrascritta!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "impossibile chiudere la mappa G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "impossibile chiudere la mappa RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -32843,10 +32843,10 @@ msgstr "Elenco dei valori del raster da mascherare"
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Impossibile creare la mask. MASK G3D già esistente!\n"
-"Usa il comando 'g.remove rast3d=G3D MASK' per rimuovere la maschera esistente"
+"Impossibile creare la mask. MASK RASTER3D già esistente!\n"
+"Usa il comando 'g.remove rast3d=RASTER3D MASK' per rimuovere la maschera esistente"
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -32861,8 +32861,8 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "Mappa/e G3D da convertire nel formato VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "Mappa/e RASTER3D da convertire nel formato VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 #, fuzzy
@@ -32901,7 +32901,7 @@ msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:117
 msgid "Use g3d mask (if exists) with input maps"
-msgstr "Utilizza maschera G3D (se esiste) con le mappe di input"
+msgstr "Utilizza maschera RASTER3D (se esiste) con le mappe di input"
 
 #: ../raster3d/r3.out.vtk/parameters.c:122
 msgid "Scale factor effects the origin"
@@ -33043,10 +33043,10 @@ msgstr ""
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Utilizza la stessa risoluzione della map G3D di input per la mappa output "
+"Utilizza la stessa risoluzione della map RASTER3D di input per la mappa output "
 "2D, indipendentemente dalle impostazioni attuali della region"
 
 #: ../raster3d/r3.to.rast/main.c:209
@@ -33423,8 +33423,8 @@ msgstr "Ordina valori non nulli"
 #~ msgid "Could not open map %s"
 #~ msgstr "Impossibile aprire la mappa %s"
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Converte una mappa raster 3D (G3D) nel formato VTK-Ascii"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Converte una mappa raster 3D (RASTER3D) nel formato VTK-Ascii"
 
 #, fuzzy
 #~ msgid "unable to close top raster map"
@@ -33447,11 +33447,11 @@ msgstr "Ordina valori non nulli"
 #~ msgstr "raster, statistica, riclassificazione"
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "Impossibile creare la mask. MASK G3D già esistente!\n"
-#~ "Usa il comando 'g.remove rast3d=G3D MASK' per rimuovere la maschera "
+#~ "Impossibile creare la mask. MASK RASTER3D già esistente!\n"
+#~ "Usa il comando 'g.remove rast3d=RASTER3D MASK' per rimuovere la maschera "
 #~ "esistente"
 
 #~ msgid "Export of GRASS 3D raster map to 3-dimensional Vis5D file."

locale/po/grassmods_ja.po

@@ -9945,7 +9945,7 @@ msgstr "セントロイドを添付しています、、、"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 "テンション (RST) アルゴリズムの正規化スプライン曲線を使って，ポイントデータを"
@@ -28593,8 +28593,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "出力マップとともにG3Dマスク（もしあれば）を使用してください"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "出力マップとともにRASTER3Dマスク（もしあれば）を使用してください"
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -30139,11 +30139,11 @@ msgstr "入力マップの値を使ってローワーセルを埋める  "
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr "入力マップに3Dグリッドマスクを使う"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "エラー:3Dグリッド倍精度浮動小数点値データを書き込めません"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -32519,7 +32519,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr "（可能であれば）3Dグリッドマスクの使用"
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -32571,7 +32571,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -32692,7 +32692,7 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> が見つかりません %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "3Dグリッドマップを閉じれません"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -32731,12 +32731,12 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "出力マップが存在しています。上書きされます！"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr "3Dグリッドのデータタイプが不正です。ラスターマップが作成できません"
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "3Dグリッドマップ <%s> が閉じれません"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -32881,7 +32881,7 @@ msgid "List of cell values to be masked out"
 msgstr "マスクするセル値一覧"
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -32899,7 +32899,7 @@ msgstr ""
 "write_vtk_unstructured_grid_header: VTK非構造グリッドのヘッダを書出します"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr " VTK-ASCII データフォーマットに変換する3Dグリッドマップ"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33078,7 +33078,7 @@ msgstr "結果ラスタースライスマップのベース名"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 "現在の領域の設定とは無関係に、出力する2Dマップに入力3Dグリッドマップと同じ解"

locale/po/grassmods_ko.po

@@ -9663,7 +9663,7 @@ msgstr ""
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -27759,7 +27759,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -29251,11 +29251,11 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -31591,7 +31591,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -31642,7 +31642,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -31762,7 +31762,7 @@ msgid "Grid3 <%s> not found %s"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -31799,12 +31799,12 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr ""
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -31947,7 +31947,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -31963,7 +31963,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -32129,7 +32129,7 @@ msgstr ""
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grassmods_lv.po

@@ -10037,7 +10037,7 @@ msgstr "Pievieno kategorijas...\n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -28762,7 +28762,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -30301,12 +30301,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "Nevarēja atrast rastra failu %s"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -32710,7 +32710,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -32763,7 +32763,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -32890,7 +32890,7 @@ msgid "Grid3 <%s> not found %s"
 msgstr "reģions <%s> nav atrasts"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -32928,12 +32928,12 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Izejas karte kurā tiks ierakstīti punkti"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr ""
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -33078,7 +33078,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -33097,7 +33097,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr "Unix fails, kurš satur koordinātes"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33264,7 +33264,7 @@ msgstr ""
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grassmods_mr.po

@@ -9761,7 +9761,7 @@ msgstr "'%s'. ड्राइवर चालू होत नाही"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -27964,7 +27964,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -29465,11 +29465,11 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -31827,7 +31827,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -31879,7 +31879,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -32001,7 +32001,7 @@ msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:55
 #, fuzzy
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "'%s'. ड्राइवर चालू होत नाही"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -32039,12 +32039,12 @@ msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:337
 #, fuzzy
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr "'%s'. ड्राइवर चालू होत नाही"
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "'%s'. ड्राइवर चालू होत नाही"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -32187,7 +32187,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -32203,7 +32203,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -32372,7 +32372,7 @@ msgstr ""
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grassmods_pl.po

@@ -9902,7 +9902,7 @@ msgstr "Dołączanie centroidów..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -28761,7 +28761,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -28858,7 +28858,7 @@ msgstr ""
 #: ../raster/r.out.vtk/main.c:61
 #, fuzzy
 msgid "Converts raster maps into the VTK-ASCII format."
-msgstr "Konwertuje mapy rastrowe 3D GRASS-a (G3D) do formatu VTK-Ascii."
+msgstr "Konwertuje mapy rastrowe 3D GRASS-a (RASTER3D) do formatu VTK-Ascii."
 
 #: ../raster/r.out.vtk/main.c:72
 msgid ""
@@ -30305,12 +30305,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr "Użyj maski 3D (jeżeli istnieje) dla mapy wejściowej"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "błąd podczas odczytu danych rastrowych"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -32712,7 +32712,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr "Użyj maski 3D (jeżeli istnieje)"
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -32766,7 +32766,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -32889,7 +32889,7 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Mapa rastrowa 3D <%s> nie została znaleziona w %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "Nie można zamknąć rastrowej mapy 3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -32928,13 +32928,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Mapa wyjściowa istnieje i zostanie nadpisana"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr ""
 "Błędny typ danych w mapie rastrowej 3D. Nie można utworzyć mapy rastrowej"
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "Nie można zamknąć mapy rastrowej 3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -33079,7 +33079,7 @@ msgid "List of cell values to be masked out"
 msgstr "Lista wartości do wymaskowania"
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -33095,7 +33095,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr "write_vtk_unstructured_grid_header: Zapis VTKUnstructuredGrid-Header"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr "Mapa(y) rastrowa 3D do konwersji na format VTK ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33211,7 +33211,7 @@ msgstr "Błąd podczas zamykania mapy wektorowej 3D"
 #: ../raster3d/r3.out.vtk/main.c:380
 #, fuzzy
 msgid "Converts 3D raster maps into the VTK-ASCII format."
-msgstr "Konwertuje mapy rastrowe 3D GRASS-a (G3D) do formatu VTK-Ascii."
+msgstr "Konwertuje mapy rastrowe 3D GRASS-a (RASTER3D) do formatu VTK-Ascii."
 
 #: ../raster3d/r3.out.vtk/main.c:391
 msgid "failed to interpret dp as an integer"
@@ -33273,7 +33273,7 @@ msgstr "Nazwa bazowa wyjściowych map rastrowych"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 "Dla map wyjściowych 2D użyj takiej samej rozdzielczości jak w mapach "

locale/po/grassmods_pt.po

@@ -10357,7 +10357,7 @@ msgstr "Anexando categorias...\n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -25849,7 +25849,7 @@ msgstr "Habilitar relat
 #: ../raster/r.what/main.c:196
 #, fuzzy, c-format
 msgid "can only do up to %d raster maps"
-msgstr "Nome do arquivo G3D de saída"
+msgstr "Nome do arquivo RASTER3D de saída"
 
 #: ../raster/r.what/main.c:212
 #, fuzzy, c-format
@@ -29913,8 +29913,8 @@ msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
 #, fuzzy
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster/r.to.rast3/main.c:201
 #, fuzzy
@@ -31539,12 +31539,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "Erro lendo coringa."
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -34025,8 +34025,8 @@ msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
 #, fuzzy
-msgid "Use G3D mask (if exists)"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -34079,7 +34079,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -34200,7 +34200,7 @@ msgstr "Mostra/adiciona/remove carimbo de data em um mapa raster 3D."
 #: ../raster3d/r3.timestamp/r3.timestamp.main.c:53
 #, fuzzy
 msgid "Input grid3 filename"
-msgstr "Nome do G3D para entrada"
+msgstr "Nome do RASTER3D para entrada"
 
 #: ../raster3d/r3.timestamp/r3.timestamp.main.c:60
 msgid "Datetime, datetime1/datetime2, or none"
@@ -34213,7 +34213,7 @@ msgstr "grid3 <%s> n
 
 #: ../raster3d/r3.cross.rast/main.c:55
 #, fuzzy
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "Não consegui fechar o mapa"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -34234,7 +34234,7 @@ msgstr "Mapa raster resultante"
 #: ../raster3d/r3.cross.rast/main.c:109
 #, fuzzy
 msgid "Use g3d mask (if exists) with input map"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster3d/r3.cross.rast/main.c:232
 #, fuzzy
@@ -34257,12 +34257,12 @@ msgstr "Mapa de sa
 
 #: ../raster3d/r3.cross.rast/main.c:337
 #, fuzzy
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "Tipo de dado G3D errado! Não consegui criar arquivo raster."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "Tipo de dado RASTER3D errado! Não consegui criar arquivo raster."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "Não consegui fechar o mapa"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -34417,10 +34417,10 @@ msgstr "Lista de valores de c
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Não consegui criar arqivo máscara: G3D_MASK já existe!\n"
-" Use 'g.remove rast3d=G3D_MASK' para remover a máscara existente."
+"Não consegui criar arqivo máscara: RASTER3D_MASK já existe!\n"
+" Use 'g.remove rast3d=RASTER3D_MASK' para remover a máscara existente."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 #, fuzzy
@@ -34439,7 +34439,7 @@ msgstr "writeVTKStructuredElevationHeader: Escrevendo cabe
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
 #, fuzzy
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr "Mapa 3dcell para converter para formato VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -34487,7 +34487,7 @@ msgstr ""
 #: ../raster3d/r3.out.vtk/parameters.c:117
 #, fuzzy
 msgid "Use g3d mask (if exists) with input maps"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster3d/r3.out.vtk/parameters.c:122
 #, fuzzy
@@ -34635,7 +34635,7 @@ msgstr "Nome do mapa raster resultante"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 
@@ -36286,8 +36286,8 @@ msgstr "N
 #~ msgid "Unable to access table <%s>"
 #~ msgstr "Não consegui abrir arquivo de saída <%s>."
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Converte mapas raster 3D (G3D) para o formato VTK-ASCII"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Converte mapas raster 3D (RASTER3D) para o formato VTK-ASCII"
 
 #, fuzzy
 #~ msgid "Import GDAL supported raster file into a binary raster map layer."
@@ -38821,27 +38821,27 @@ msgstr "N
 
 #, fuzzy
 #~ msgid "A (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "B (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "C (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "D (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "E (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "F (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "Name for output grid3D volume"
@@ -41976,7 +41976,7 @@ msgstr "N
 
 #, fuzzy
 #~ msgid "raster_to_g3d: Writing %i raster maps with rows %i cols."
-#~ msgstr "RasterToG3D: Escrevendo %i mapas raster com linhas %i colunas."
+#~ msgstr "RasterToRASTER3D: Escrevendo %i mapas raster com linhas %i colunas."
 
 #~ msgid "Writing g3d slice %i\n"
 #~ msgstr "Escrevendo fatia g3d %i\n"
@@ -42001,7 +42001,7 @@ msgstr "N
 #~ msgid ""
 #~ "elev_raster_to_g3d: Writing 3D raster map with depths %i rows %i cols %i "
 #~ "and count %i."
-#~ msgstr "RasterToG3D: Escrevendo %i mapas raster com linhas %i colunas."
+#~ msgstr "RasterToRASTER3D: Escrevendo %i mapas raster com linhas %i colunas."
 
 #, fuzzy
 #~ msgid "Open 3d raster map %s\n"
@@ -42322,11 +42322,11 @@ msgstr "N
 #~ msgstr "Lendo arquivo dig_att...\n"
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "Não consegui criar arqivo máscara: G3D_MASK já existe!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' para remover a máscara existente."
+#~ "Não consegui criar arqivo máscara: RASTER3D_MASK já existe!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' para remover a máscara existente."
 
 #~ msgid "Export of GRASS 3D raster map to 3-dimensional Vis5D file."
 #~ msgstr "Exporta um raster 3D do GRASS para um arquivo Vis5D"
@@ -43723,7 +43723,7 @@ msgstr "N
 #~ msgstr "Histórico para"
 
 #~ msgid "Name of output 3d raster map"
-#~ msgstr "Nome do arquivo G3D de saída"
+#~ msgstr "Nome do arquivo RASTER3D de saída"
 
 #, fuzzy
 #~ msgid "input layer name"

locale/po/grassmods_pt_br.po

@@ -10369,7 +10369,7 @@ msgstr "Anexando categorias...\n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -25858,7 +25858,7 @@ msgstr "Habilitar relat
 #: ../raster/r.what/main.c:196
 #, fuzzy, c-format
 msgid "can only do up to %d raster maps"
-msgstr "Nome do arquivo G3D de saída"
+msgstr "Nome do arquivo RASTER3D de saída"
 
 #: ../raster/r.what/main.c:212
 #, fuzzy, c-format
@@ -29847,8 +29847,8 @@ msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
 #, fuzzy
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster/r.to.rast3/main.c:201
 #, fuzzy
@@ -31457,12 +31457,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Usa máscara G3D (se existir) com o mapa de entrada"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Usa máscara RASTER3D (se existir) com o mapa de entrada"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "Erro lendo coringa."
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -33922,8 +33922,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "Usa máscara G3D (se existir)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Usa máscara RASTER3D (se existir)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -33974,7 +33974,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -34098,8 +34098,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> não encontrada %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "Não consegui fechar o mapa G3D"
+msgid "Could not close RASTER3D map"
+msgstr "Não consegui fechar o mapa RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 #, fuzzy
@@ -34141,13 +34141,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Mapa de saída já existe. Será sobreescrito!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "Tipo de dado G3D errado! Não consegui criar mapa raster."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "Tipo de dado RASTER3D errado! Não consegui criar mapa raster."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Não consegui fechar mapa G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Não consegui fechar mapa RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -34293,10 +34293,10 @@ msgstr "Lista de valores de c
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Não consegui criar arqivo máscara: G3D_MASK já existe!\n"
-" Use 'g.remove rast3d=G3D_MASK' para remover a máscara existente."
+"Não consegui criar arqivo máscara: RASTER3D_MASK já existe!\n"
+" Use 'g.remove rast3d=RASTER3D_MASK' para remover a máscara existente."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -34313,8 +34313,8 @@ msgstr ""
 "write_vtk_unstructured_grid_header: Escrevendo VTKUnstructuredGrid-Header"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "Mapa(s) G3D para serem convertidos para formato de dados VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "Mapa(s) RASTER3D para serem convertidos para formato de dados VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -34494,10 +34494,10 @@ msgstr "Basename para mapas slice raster resultantes"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Use a mesma resolução do mapa G3D de entrada para os mapas 2d de saída, "
+"Use a mesma resolução do mapa RASTER3D de entrada para os mapas 2d de saída, "
 "independente das cofigurações da região atual"
 
 #: ../raster3d/r3.to.rast/main.c:209
@@ -35071,8 +35071,8 @@ msgstr "Ordenar valores n
 #~ msgid "Could not open map %s"
 #~ msgstr "Não consegui abrir mapa %s"
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Converte mapas raster 3D (G3D) para o formato VTK-ASCII"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Converte mapas raster 3D (RASTER3D) para o formato VTK-ASCII"
 
 #~ msgid "unable to close top raster map"
 #~ msgstr "Não consegui fechar mapa raster de topo"
@@ -35096,11 +35096,11 @@ msgstr "Ordenar valores n
 #~ msgstr "raster3d, voxel, estatísticas"
 
 #~ msgid ""
-#~ "Cannot create mask file: G3D_MASK already exists!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' to remove the existing mask."
+#~ "Cannot create mask file: RASTER3D_MASK already exists!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' to remove the existing mask."
 #~ msgstr ""
-#~ "Não consegui criar arqivo máscara: G3D_MASK já existe!\n"
-#~ " Use 'g.remove rast3d=G3D_MASK' para remover a máscara existente."
+#~ "Não consegui criar arqivo máscara: RASTER3D_MASK já existe!\n"
+#~ " Use 'g.remove rast3d=RASTER3D_MASK' para remover a máscara existente."
 
 #~ msgid "Export of GRASS 3D raster map to 3-dimensional Vis5D file."
 #~ msgstr "Exporta um raster 3D do GRASS para um arquivo Vis5D"
@@ -39258,27 +39258,27 @@ msgstr "Ordenar valores n
 
 #, fuzzy
 #~ msgid "A (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "B (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "C (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "D (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "E (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "F (grid3D file)"
-#~ msgstr "Nome do G3D para entrada"
+#~ msgstr "Nome do RASTER3D para entrada"
 
 #, fuzzy
 #~ msgid "Name for output grid3D volume"

locale/po/grassmods_ru.po

@@ -10150,10 +10150,10 @@ msgstr "Назначаются центроиды..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Интерполировать точечные данные в G3D объемный грид, используя алгоритм "
+"Интерполировать точечные данные в RASTER3D объемный грид, используя алгоритм "
 "сплайн-интерполяции (RST) ."
 
 #: ../vector/v.vol.rst/main.c:253
@@ -29231,8 +29231,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Использовать маску G3D (если существует) для выходного слоя"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Использовать маску RASTER3D (если существует) для выходного слоя"
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -30804,12 +30804,12 @@ msgstr "Использовать значения исходного слоя д
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Использовать маску G3D (если существует) для вставляемого слоя"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Использовать маску RASTER3D (если существует) для вставляемого слоя"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
-msgstr "Ошибка записи данных G3D double"
+msgid "Error writing RASTER3D double data"
+msgstr "Ошибка записи данных RASTER3D double"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
 #: ../raster3d/r3.in.v5d/main.c:195 ../raster3d/r3.retile/main.c:103
@@ -33255,8 +33255,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "Используйте G3D маски (если есть)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Используйте RASTER3D маски (если есть)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -33309,7 +33309,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33433,8 +33433,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "   Grid3 <%s> не найден %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "Не закрыта карта G3D"
+msgid "Could not close RASTER3D map"
+msgstr "Не закрыта карта RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -33472,13 +33472,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Выводимая карта уже существует. Она будет перезаписана!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "Ошибочный G3D тип данных! Невозможно создать растровый слой."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "Ошибочный RASTER3D тип данных! Невозможно создать растровый слой."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Не был закрыт слой G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Не был закрыт слой RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -33624,10 +33624,10 @@ msgstr "Список маскируемых значений ячеек"
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Невозможно создать файл маски: G3D_MASK уже существует!\n"
-"Используйте 'g.remove rast3d=G3D_MASK' для удаления существующей маски."
+"Невозможно создать файл маски: RASTER3D_MASK уже существует!\n"
+"Используйте 'g.remove rast3d=RASTER3D_MASK' для удаления существующей маски."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -33644,8 +33644,8 @@ msgstr ""
 "write_vtk_structured_elevation_header: Запись VTKUnstructuredGrid-Header"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "G3D слой(-и) будет(-ут)  преобразован(ы) в формат данных VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "RASTER3D слой(-и) будет(-ут)  преобразован(ы) в формат данных VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -33823,10 +33823,10 @@ msgstr "Шаблон имени для выходной серии растро
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Использовать такое же разрешение, как у входящего G3D слоя, для выходных 2D "
+"Использовать такое же разрешение, как у входящего RASTER3D слоя, для выходных 2D "
 "слоев; независимо от параметров областей"
 
 #: ../raster3d/r3.to.rast/main.c:209

locale/po/grassmods_sl.po

@@ -10090,7 +10090,7 @@ msgstr "Pripajam kategorije...\n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -29078,7 +29078,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -30648,12 +30648,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "Ne najdem vhodne datoteke %s\n"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -33134,7 +33134,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -33188,7 +33188,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33323,7 +33323,7 @@ msgstr "ne najdem regije <%s>"
 
 #: ../raster3d/r3.cross.rast/main.c:55
 #, fuzzy
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "Ne morem najti vhodne datoteke <%s>\n"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -33366,12 +33366,12 @@ msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:337
 #, fuzzy
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr "Tip zapisa izhodnega rastrskega sloja"
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "Ne morem najti vhodne datoteke <%s>\n"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -33520,7 +33520,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -33536,7 +33536,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33711,7 +33711,7 @@ msgstr "Ime izhodnega rastrskega sloja"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 
@@ -35078,7 +35078,7 @@ msgstr ""
 #~ msgstr "ne morem odpreti <%s>"
 
 #, fuzzy
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
 #~ msgstr "Preoblikuje rastrski sloj v vektorskega."
 
 #, fuzzy

locale/po/grassmods_th.po

@@ -10015,10 +10015,10 @@ msgstr "กำลังแนบ จุดศูนย์ถ่วง ..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"ข้อมูลจุดไม่เหมาะสม กับค่า G3D กริด ใช้ regularized spline กับ tension (RST) "
+"ข้อมูลจุดไม่เหมาะสม กับค่า RASTER3D กริด ใช้ regularized spline กับ tension (RST) "
 "algorithm."
 
 #: ../vector/v.vol.rst/main.c:253
@@ -28849,8 +28849,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "ใช้ G3D mask (ถ้ามี โดยไม่ต้องใช้แผนที่) "
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "ใช้ RASTER3D mask (ถ้ามี โดยไม่ต้องใช้แผนที่) "
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -28893,7 +28893,7 @@ msgstr "ผิดพลาด ขณะปิด แผนที่เชิง
 #: ../raster/r.out.vtk/parameters.c:34
 #, fuzzy
 msgid "Raster map(s) to be converted to VTK-ASCII data format"
-msgstr "แผนที่ G3D ที่จะแปลง ไปเป็นแบบ  VTK-ASCII"
+msgstr "แผนที่ RASTER3D ที่จะแปลง ไปเป็นแบบ  VTK-ASCII"
 
 #: ../raster/r.out.vtk/parameters.c:41 ../raster3d/r3.out.vtk/parameters.c:34
 msgid "Name for VTK-ASCII output file"
@@ -30385,12 +30385,12 @@ msgstr "ใช้ค่าของแผนที่ที่นำเข้า
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "ใช้  G3D mask (ถ้ามี) กับแผนที่นำเข้า"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "ใช้  RASTER3D mask (ถ้ามี) กับแผนที่นำเข้า"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
-msgstr "ผิดพลาดขณะอ่าน ข้อมูล G3D double"
+msgid "Error writing RASTER3D double data"
+msgstr "ผิดพลาดขณะอ่าน ข้อมูล RASTER3D double"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
 #: ../raster3d/r3.in.v5d/main.c:195 ../raster3d/r3.retile/main.c:103
@@ -32841,8 +32841,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "ใช้ G3D mask (ถ้ามี)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "ใช้ RASTER3D mask (ถ้ามี)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -32894,7 +32894,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33016,8 +33016,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> ไม่พบ %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "ไม่สามารถปิดแผนที่ G3D"
+msgid "Could not close RASTER3D map"
+msgstr "ไม่สามารถปิดแผนที่ RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -33053,13 +33053,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "แผนที่ผลลัพธื มีอยู่แล้ว. จะเขียนทับ!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "G3D ผิดชนิด! ไม่สามารถสร้างแผนที่เชิงภาพ."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "RASTER3D ผิดชนิด! ไม่สามารถสร้างแผนที่เชิงภาพ."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "ไม่สามารถ ปิด แผนที่ G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "ไม่สามารถ ปิด แผนที่ RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -33202,10 +33202,10 @@ msgstr "รายการของค่า  cell ที่จะใช้ท
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"ไม่สามารถสร้าง mask ไฟล์: G3D_MASK มีอยู่แล้ว!\n"
-" ใช้ 'g.remove rast3d=G3D_MASK'  เพื่อที่จะเอา mask ออก."
+"ไม่สามารถสร้าง mask ไฟล์: RASTER3D_MASK มีอยู่แล้ว!\n"
+" ใช้ 'g.remove rast3d=RASTER3D_MASK'  เพื่อที่จะเอา mask ออก."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 #, fuzzy
@@ -33223,8 +33223,8 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr "write_vtk_structured_elevation_header: กำลังเขียน  VTK-Header"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "แผนที่ G3D ที่จะแปลง ไปเป็นแบบ  VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "แผนที่ RASTER3D ที่จะแปลง ไปเป็นแบบ  VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -33391,10 +33391,10 @@ msgstr "ชื่อฐาน สำหรับ ผลลัพธ์ แผน
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"ใช้ความละเอียดเดียวกับ แผนที่ G3D สำหรับ แผนที่ผลลัพธ์ 2 มิติ, "
+"ใช้ความละเอียดเดียวกับ แผนที่ RASTER3D สำหรับ แผนที่ผลลัพธ์ 2 มิติ, "
 "โดยไม่ขึ้นอยู่กับการกำหนดขอบเขตปัจจุบัน"
 
 #: ../raster3d/r3.to.rast/main.c:209

locale/po/grassmods_tr.po

@@ -9732,7 +9732,7 @@ msgstr "Alan merkezleri ekleniyor..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -28136,7 +28136,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -29633,11 +29633,11 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -31963,7 +31963,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -32015,7 +32015,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -32136,8 +32136,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "G3D haritası kapatılamıyor"
+msgid "Could not close RASTER3D map"
+msgstr "RASTER3D haritası kapatılamıyor"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -32173,13 +32173,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Çıktı harita zaten mevcut. Üzerine yazılacak!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
 msgstr ""
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "<%s> G3D haritası kapatılamıyor"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "<%s> RASTER3D haritası kapatılamıyor"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -32321,7 +32321,7 @@ msgid "List of cell values to be masked out"
 msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
@@ -32337,7 +32337,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -32503,7 +32503,7 @@ msgstr ""
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grassmods_vi.po

@@ -10111,10 +10111,10 @@ msgstr "Đang gắn các trọng tâm..."
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Nội suy dữ liệu điểm thành thể tích lưới G3D bằng cách dùng thuật toán đường "
+"Nội suy dữ liệu điểm thành thể tích lưới RASTER3D bằng cách dùng thuật toán đường "
 "spline chính tắc có sức căng (RST)."
 
 #: ../vector/v.vol.rst/main.c:253
@@ -25294,7 +25294,7 @@ msgstr "Bật báo cáo bộ nhớ đệm (cache)"
 #: ../raster/r.what/main.c:196
 #, fuzzy, c-format
 msgid "can only do up to %d raster maps"
-msgstr "Tên của tập tin lưới G3D đầu ra"
+msgstr "Tên của tập tin lưới RASTER3D đầu ra"
 
 #: ../raster/r.what/main.c:212
 #, fuzzy, c-format
@@ -29238,8 +29238,8 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
-msgstr "Dùng mặt nạ G3D (nếu có) với bản đồ đầu ra"
+msgid "Use RASTER3D mask (if exists) with output map"
+msgstr "Dùng mặt nạ RASTER3D (nếu có) với bản đồ đầu ra"
 
 #: ../raster/r.to.rast3/main.c:201
 msgid "Converts 2D raster map slices to one 3D raster volume map."
@@ -29283,7 +29283,7 @@ msgstr "Lỗi đóng bản đồ raster 3d"
 #: ../raster/r.out.vtk/parameters.c:34
 #, fuzzy
 msgid "Raster map(s) to be converted to VTK-ASCII data format"
-msgstr "Bản đồ G3D cần được đổi thành định dạng dữ liệu VTK-ASCII"
+msgstr "Bản đồ RASTER3D cần được đổi thành định dạng dữ liệu VTK-ASCII"
 
 #: ../raster/r.out.vtk/parameters.c:41 ../raster3d/r3.out.vtk/parameters.c:34
 msgid "Name for VTK-ASCII output file"
@@ -30805,12 +30805,12 @@ msgstr "Dùng các giá trị bản đồ đầu vào để lấp đầy các ô
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
-msgstr "Dùng mặt nạ G3D (nếu có) với bản đồ đầu vào"
+msgid "Use RASTER3D mask (if exists) with input map"
+msgstr "Dùng mặt nạ RASTER3D (nếu có) với bản đồ đầu vào"
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
-msgid "Error writing G3D double data"
-msgstr "Lỗi khi đang ghi dữ liệu G3D kiểu double"
+msgid "Error writing RASTER3D double data"
+msgstr "Lỗi khi đang ghi dữ liệu RASTER3D kiểu double"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
 #: ../raster3d/r3.in.v5d/main.c:195 ../raster3d/r3.retile/main.c:103
@@ -33245,8 +33245,8 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
-msgstr "Dùng mặt nạ G3D (nếu có)"
+msgid "Use RASTER3D mask (if exists)"
+msgstr "Dùng mặt nạ RASTER3D (nếu có)"
 
 #: ../raster3d/r3.gwflow/main.c:162
 #, fuzzy
@@ -33299,7 +33299,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33421,8 +33421,8 @@ msgid "Grid3 <%s> not found %s"
 msgstr "Grid3 <%s> không thấy %s"
 
 #: ../raster3d/r3.cross.rast/main.c:55
-msgid "Could not close G3D map"
-msgstr "Không thể đóng bản đồ G3D"
+msgid "Could not close RASTER3D map"
+msgstr "Không thể đóng bản đồ RASTER3D"
 
 #: ../raster3d/r3.cross.rast/main.c:90
 msgid "Input 3D raster map for cross section."
@@ -33460,13 +33460,13 @@ msgid "Output map already exists. Will be overwritten!"
 msgstr "Bản đồ đầu ra đã có. Sẽ bị ghi đè!"
 
 #: ../raster3d/r3.cross.rast/main.c:337
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "Kiểu dữ liệu G3D bị sai! Không thể tạo bản đồ raster."
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "Kiểu dữ liệu RASTER3D bị sai! Không thể tạo bản đồ raster."
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, c-format
-msgid "Could not close G3D map <%s>"
-msgstr "Không thể đóng bản đồ G3D <%s>"
+msgid "Could not close RASTER3D map <%s>"
+msgstr "Không thể đóng bản đồ RASTER3D <%s>"
 
 #: ../raster3d/r3.mkdspf/main.c:82
 msgid ""
@@ -33611,10 +33611,10 @@ msgstr "Liệt kê các giá trị ô bị loại bỏ bởi mặt nạ"
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"Không thể tạo tập tin mặt nạ: G3D_MASK đã tồn tại!\n"
-" Dùng 'g.remove rast3d=G3D_MASK' để loại bỏ mặt nạ hiện có."
+"Không thể tạo tập tin mặt nạ: RASTER3D_MASK đã tồn tại!\n"
+" Dùng 'g.remove rast3d=RASTER3D_MASK' để loại bỏ mặt nạ hiện có."
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -33630,8 +33630,8 @@ msgstr ""
 "write_vtk_unstructured_grid_header: Đang ghi VTKUnstructuredGrid-Header"
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
-msgstr "Bản đồ G3D cần được đổi thành định dạng dữ liệu VTK-ASCII"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
+msgstr "Bản đồ RASTER3D cần được đổi thành định dạng dữ liệu VTK-ASCII"
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
 msgid "Float value to represent no data cell/points"
@@ -33807,10 +33807,10 @@ msgstr "Tên gốc cho các bản đồ phiến raster tạo thành"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
-"Dùng cùng độ phân giải với bản đồ G3D đầu vào cho các bản đồ 2D đầu ra, "
+"Dùng cùng độ phân giải với bản đồ RASTER3D đầu vào cho các bản đồ 2D đầu ra, "
 "không phụ thuộc vào thiết lập vùng hiện tại."
 
 #: ../raster3d/r3.to.rast/main.c:209

locale/po/grassmods_zh.po

@@ -10115,7 +10115,7 @@ msgstr "分类...\n"
 
 #: ../vector/v.vol.rst/main.c:245
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 
@@ -25079,7 +25079,7 @@ msgstr "开启缓存报告"
 #: ../raster/r.what/main.c:196
 #, fuzzy, c-format
 msgid "can only do up to %d raster maps"
-msgstr "输出的 G3D grid 文件名称"
+msgstr "输出的 RASTER3D grid 文件名称"
 
 #: ../raster/r.what/main.c:212
 #, fuzzy, c-format
@@ -28994,7 +28994,7 @@ msgid "The maximum tile size in kilo bytes. Default is 32KB."
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:93
-msgid "Use G3D mask (if exists) with output map"
+msgid "Use RASTER3D mask (if exists) with output map"
 msgstr ""
 
 #: ../raster/r.to.rast3/main.c:201
@@ -30587,12 +30587,12 @@ msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:194 ../raster3d/r3.out.ascii/main.c:124
 #: ../raster3d/r3.to.rast/main.c:91
-msgid "Use G3D mask (if exists) with input map"
+msgid "Use RASTER3D mask (if exists) with input map"
 msgstr ""
 
 #: ../raster/r.to.rast3elev/main.c:287 ../raster/r.to.rast3elev/main.c:320
 #, fuzzy
-msgid "Error writing G3D double data"
+msgid "Error writing RASTER3D double data"
 msgstr "读取地图 %s 时发生错误"
 
 #: ../raster/r.to.rast3elev/main.c:363 ../raster3d/r3.gwflow/main.c:160
@@ -33024,7 +33024,7 @@ msgid ""
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:127
-msgid "Use G3D mask (if exists)"
+msgid "Use RASTER3D mask (if exists)"
 msgstr ""
 
 #: ../raster3d/r3.gwflow/main.c:162
@@ -33078,7 +33078,7 @@ msgid "retile"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:104
-msgid "Retiles an existing G3D map with user defined x, y and z tile size"
+msgid "Retiles an existing RASTER3D map with user defined x, y and z tile size"
 msgstr ""
 
 #: ../raster3d/r3.retile/main.c:113 ../raster3d/r3.to.rast/main.c:218
@@ -33210,7 +33210,7 @@ msgstr "grid3 <%s> 未找到 %s\n"
 
 #: ../raster3d/r3.cross.rast/main.c:55
 #, fuzzy
-msgid "Could not close G3D map"
+msgid "Could not close RASTER3D map"
 msgstr "无法关闭地图"
 
 #: ../raster3d/r3.cross.rast/main.c:90
@@ -33250,12 +33250,12 @@ msgstr "栅格地图 %i 文件名成： %s 已经存在。它将被覆盖！\n"
 
 #: ../raster3d/r3.cross.rast/main.c:337
 #, fuzzy
-msgid "Wrong G3D Datatype! Cannot create raster map."
-msgstr "错误的 G3D 数据类型！无法创建栅格地图。"
+msgid "Wrong RASTER3D Datatype! Cannot create raster map."
+msgstr "错误的 RASTER3D 数据类型！无法创建栅格地图。"
 
 #: ../raster3d/r3.cross.rast/main.c:342
 #, fuzzy, c-format
-msgid "Could not close G3D map <%s>"
+msgid "Could not close RASTER3D map <%s>"
 msgstr "无法关闭地图"
 
 #: ../raster3d/r3.mkdspf/main.c:82
@@ -33405,10 +33405,10 @@ msgstr ""
 
 #: ../raster3d/base/r3.mask.main.c:158
 #, fuzzy
-msgid "Cannot create mask file: G3D_MASK already exists"
+msgid "Cannot create mask file: RASTER3D_MASK already exists"
 msgstr ""
-"无法生成掩模文件：G3D_MASK 已经存在！\n"
-"请先使用 'g.remove rast3d=G3D_MASK' 删除已有的掩模文件。"
+"无法生成掩模文件：RASTER3D_MASK 已经存在！\n"
+"请先使用 'g.remove rast3d=RASTER3D_MASK' 删除已有的掩模文件。"
 
 #: ../raster3d/r3.out.vtk/writeVTKHead.c:40
 msgid "write_vtk_structured_point_header: Writing VTKStructuredPoint-Header"
@@ -33423,7 +33423,7 @@ msgid "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:30
-msgid "G3D map(s) to be converted to VTK-ASCII data format"
+msgid "RASTER3D map(s) to be converted to VTK-ASCII data format"
 msgstr ""
 
 #: ../raster3d/r3.out.vtk/parameters.c:41
@@ -33601,7 +33601,7 @@ msgstr "生成的栅格分块地图的基础名称"
 
 #: ../raster3d/r3.to.rast/main.c:96
 msgid ""
-"Use the same resolution as the input G3D map for the 2d output maps, "
+"Use the same resolution as the input RASTER3D map for the 2d output maps, "
 "independent of the current region settings"
 msgstr ""
 

locale/po/grasswxpy_cs.po

@@ -4723,10 +4723,10 @@ msgstr "Interpolovat 3D rastrovou vrstvu z vektorov
 
 #: ../gui/wxpython/menustrings.py:803
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Interpoluje bodová data do G3D 3D rastrové grid vrstvy za pou¾ití "
+"Interpoluje bodová data do RASTER3D 3D rastrové grid vrstvy za pou¾ití "
 "regularized spline with tension (RST)"
 
 #: ../gui/wxpython/menustrings.py:804
@@ -14048,8 +14048,8 @@ msgstr "Soubor nebyl nalezen."
 #~ "Exportuje GRASS rastr do formátu TIFF 8/24bit v rozli¹ení daném aktuálním "
 #~ "regionem."
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Pøevede 3D rastrové mapy (G3D) do formátu VTK-Ascii"
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Pøevede 3D rastrové mapy (RASTER3D) do formátu VTK-Ascii"
 
 #~ msgid ""
 #~ "Makes each cell value a function of the attribute values assigned to the "

locale/po/grasswxpy_de.po

@@ -1716,7 +1716,7 @@ msgstr ""
 #: ../gui/wxpython/menustrings.py:147
 #, fuzzy
 msgid "Converts 3D raster maps into the VTK-ASCII format."
-msgstr "Konvertiert eine 3D-Rasterkarte (G3D) in das VTK-ASCII-Format."
+msgstr "Konvertiert eine 3D-Rasterkarte (RASTER3D) in das VTK-ASCII-Format."
 
 #: ../gui/wxpython/menustrings.py:148
 msgid "Export database table"
@@ -4747,10 +4747,10 @@ msgstr "Interpoliere Volumen aus Punkten"
 
 #: ../gui/wxpython/menustrings.py:803
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Interpoliert Punkte zu einem G3D Grid Volumen unter Verwendung des "
+"Interpoliert Punkte zu einem RASTER3D Grid Volumen unter Verwendung des "
 "regularized spline with tension (RST) Algorithmus."
 
 #: ../gui/wxpython/menustrings.py:804
@@ -13255,8 +13255,8 @@ msgstr "Datei nicht gefunden"
 #~ msgstr ""
 #~ "Exportiert eine GRASS 3D Rasterkarte in eine 3-dimensionale Vis5D Datei"
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Konvertiert eine 3D-Rasterkarte (G3D) in das VTK-ASCII-Format."
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Konvertiert eine 3D-Rasterkarte (RASTER3D) in das VTK-ASCII-Format."
 
 #~ msgid "Multiple export formats using OGR"
 #~ msgstr "Vektorexport über OGR"

locale/po/grasswxpy_el.po

@@ -4324,7 +4324,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:803
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
 

locale/po/grasswxpy_es.po

@@ -4786,10 +4786,10 @@ msgstr "Interpolar un volumen a partir de puntos."
 
 #: ../gui/wxpython/menustrings.py:803
 msgid ""
-"Interpolates point data to a G3D grid volume using regularized spline with "
+"Interpolates point data to a RASTER3D grid volume using regularized spline with "
 "tension (RST) algorithm."
 msgstr ""
-"Interpola datos de puntos a volumen de cuadrícula G3D usando una spline "
+"Interpola datos de puntos a volumen de cuadrícula RASTER3D usando una spline "
 "regularizada con el algoritmo de tensión (RST)."
 
 #: ../gui/wxpython/menustrings.py:804
@@ -13822,8 +13822,8 @@ msgstr "No se ha encontrado el archivo."
 #~ "Exporta un mapa raster de GRASS a una imagen TIFF de 8/24 bits a la "
 #~ "resolución de píxel de la región definida actualmente."
 
-#~ msgid "Converts 3D raster maps (G3D) into the VTK-Ascii format"
-#~ msgstr "Convierte mapas raster 3D (G3D) al formato VTK-ASCII."
+#~ msgid "Converts 3D raster maps (RASTER3D) into the VTK-Ascii format"
+#~ msgstr "Convierte mapas raster 3D (RASTER3D) al formato VTK-ASCII."
 
 #~ msgid ""
 #~ "Makes each cell value a function of the attribute values assigned to the "