G_find_grid3 moved from raster3d to gislib

gislib: find_cell.c renamed to find_rast.c


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

general/g.region/main.c

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

gui/wxpython/gui_modules/wxnviz.py

@@ -421,7 +421,7 @@ class Nviz(object):
         @return object id
         @return -1 on failure
         """
-        mapset = G_find_grid3(name, "")
+        mapset = G_find_raster3d(name, "")
         if mapset is None:
             G_warning(_("3d raster map <%s> not found"),
                       name)
@@ -433,7 +433,7 @@ class Nviz(object):
                               self.data)
         
         if color_name:      # check for color map
-            mapset = G_find_grid3(color_name, "")
+            mapset = G_find_raster3d(color_name, "")
             if mapset is None:
                 G_warning(_("3d raster map <%s> not found"),
                           color_name)

include/gisdefs.h

@@ -221,10 +221,6 @@ char *G_file_name(char *, const char *, const char *, const char *);
 char *G_file_name_misc(char *, const char *, const char *, const char *,
 		       const char *);
 
-/* find_cell.c */
-const char *G_find_raster(char *, const char *);
-const char *G_find_raster2(const char *, const char *);
-
 /* find_file.c */
 const char *G_find_file(const char *, char *, const char *);
 const char *G_find_file2(const char *, const char *, const char *);
@@ -235,6 +231,13 @@ const char *G_find_file2_misc(const char *, const char *, const char *,
 /* find_etc.c */
 char *G_find_etc(const char *);
 
+/* find_rast.c */
+const char *G_find_raster(char *, const char *);
+const char *G_find_raster2(const char *, const char *);
+
+/* find_rast3d.c */
+const char *G_find_raster3d(const char *, const char *);
+
 /* find_vect.c */
 const char *G_find_vector(char *, const char *);
 const char *G_find_vector2(const char *, const char *);

include/raster3ddefs.h

@@ -45,9 +45,6 @@ void Rast3d_compare_files(const char *, const char *, const char *, const char *
 /* filename.c */
 void Rast3d_filename(char *, const char *, const char *, const char *);
 
-/* find_grid3.c */
-char *G_find_grid3(const char *, const char *);
-
 /* fpcompress.c */
 void Rast3d_fpcompress_print_binary(char *, int);
 void Rast3d_fpcompress_dissect_xdr_double(unsigned char *);

lib/gis/find_rast3d.c

@@ -0,0 +1,31 @@
+/*!
+  \file lib/gis/find_rast3d.c
+  
+  \brief GIS library - Find a 3D raster map
+  
+  (C) 2001-2009, 2011 by the GRASS Development Team
+  
+`  This program is free software under the GNU General Public License
+  (>=v2). Read the file COPYING that comes with GRASS for details.
+
+  \author Original author CERL
+*/
+
+#include <grass/gis.h>
+
+/*!
+  \brief Search for a 3D raster map in current search path or
+  in a specified mapset.
+
+  Note: rejects all names that begin with '.'
+
+  \param name map name
+  \param mapset  mapset to search. ("" for search path)
+  
+  \return pointer to a string with name of mapset where the map was found
+  \return NULL if not found
+*/
+const char *G_find_raster3d(const char *name, const char *mapset)
+{
+    return G_find_file2_misc("grid3", "cell", name, mapset);
+}

lib/gpde/N_arrays_io.c

@@ -269,12 +269,12 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d * array,
     depths = region.depths;
 
 
-    if (NULL == G_find_grid3(name, ""))
+    if (NULL == G_find_raster3d(name, ""))
 	Rast3d_fatal_error(_("Requested g3d map <%s> not found"), name);
 
     /*Open all maps with default region */
     map =
-	Rast3d_open_cell_old(name, G_find_grid3(name, ""), RASTER3D_DEFAULT_WINDOW,
+	Rast3d_open_cell_old(name, G_find_raster3d(name, ""), RASTER3D_DEFAULT_WINDOW,
 			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)

lib/manage/do_remove.c

@@ -74,7 +74,7 @@ int M_do_remove(int n, const char *old)
 	}
 
 	if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
-	    if ((mapset = G_find_grid3(old, "")) == NULL)
+	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 	}
 

lib/manage/do_rename.c

@@ -72,7 +72,7 @@ int M_do_rename(int n, const char *old, const char *new)
 	}
 
 	if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
-	    if ((mapset = G_find_grid3(old, "")) == NULL)
+	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 	}
 

lib/ogsf/Gvl3.c

@@ -36,7 +36,7 @@ int Gvl_load_colors_data(void **color_data, const char *name)
     const char *mapset;
     struct Colors *colors;
 
-    if (NULL == (mapset = G_find_grid3(name, ""))) {
+    if (NULL == (mapset = G_find_raster3d(name, ""))) {
 	G_warning(_("3D raster map <%s> not found"), name);
 	return (-1);
     }

lib/ogsf/gvl_file.c

@@ -423,7 +423,7 @@ void *open_g3d_file(const char *filename, IFLAG * type, double *min,
     void *map;
 
     /* search for g3d file a return his mapset */
-    mapset = G_find_grid3(filename, "");
+    mapset = G_find_raster3d(filename, "");
     if (!mapset) {
 	G_warning(_("3D raster map <%s> not found"), filename);
 	return (NULL);

lib/raster3d/find_grid3.c

@@ -1,24 +0,0 @@
-#include <grass/gis.h>
-
-/*     
- * \brief
- *      searches for a grid3 file from the mapset search list
- *      or in a specified mapset.
- *      returns the mapset name where the cell file was found.
- *
- *  note:
- *      rejects all names that begin with '.'
- *      if name is of the form nnn in ppp then
- *      name = nnn and mapset = ppp
- *
- *  \param const char *name       file name to look for
- *  \param const char *mapset     mapset to search. if mapset is ""
- *                                will search in mapset search list
- *  \return char *  pointer to a string with name of mapset
- *              where cell file was found, or NULL if not found
- */
-
-const char *G_find_grid3(const char *name, const char *mapset)
-{
-    return G_find_file2_misc("grid3", "cell", name, mapset);
-}

lib/raster3d/region.c

@@ -223,7 +223,7 @@ Rast3d_read_region_map(const char *name, const char *mapset, RASTER3D_Region * r
 	Rast3d_filename(fullName, RASTER3D_HEADER_ELEMENT, xname, xmapset);
     else {
 	if (!mapset || !*mapset)
-	    mapset = G_find_grid3(name, "");
+	    mapset = G_find_raster3d(name, "");
 	Rast3d_filename(fullName, RASTER3D_HEADER_ELEMENT, name, mapset);
     }
     return Rast3d_read_window(region, fullName);

raster/r.colors/edit_colors.c

@@ -174,7 +174,7 @@ int edit_colors(int argc, char **argv, int type, const char *maptype,
         rules = NULL;
     /* Switch between raster and volume */
     if (type == RASTER3D_TYPE) {
-        mapset = G_find_grid3(name, "");
+        mapset = G_find_raster3d(name, "");
     } else {
         mapset = G_find_raster2(name, "");
     }
@@ -270,7 +270,7 @@ int edit_colors(int argc, char **argv, int type, const char *maptype,
             if (Rast_read_colors(cmap, cmapset, &colors) < 0)
                 G_fatal_error(_("Unable to read color table for raster map <%s>"), cmap);
         } else {
-            cmapset = G_find_grid3(cmap, "");
+            cmapset = G_find_raster3d(cmap, "");
             if (cmapset == NULL)
                 G_fatal_error(_("Raster3d map <%s> not found"), cmap);
 

raster/r.mapcalc/map3.c

@@ -392,7 +392,7 @@ int map_type(const char *name, int mod)
     switch (mod) {
     case 'M':
 	tmpname = G_store((char *)name);
-	mapset = G_find_grid3(tmpname, "");
+	mapset = G_find_raster3d(tmpname, "");
 	if (mapset) {
 	    void *handle;
 
@@ -440,7 +440,7 @@ int open_map(const char *name, int mod, int row, int col)
 	max_col = col;
 
     tmpname = G_store((char *)name);
-    mapset = G_find_grid3(tmpname, "");
+    mapset = G_find_raster3d(tmpname, "");
     G_free(tmpname);
 
     if (!mapset)
@@ -571,7 +571,7 @@ void close_maps(void)
 
 int check_output_map(const char *name)
 {
-    return !!G_find_grid3(name, G_mapset());
+    return !!G_find_raster3d(name, G_mapset());
 }
 
 int open_output_map(const char *name, int res_type)

raster/r.univar/r3.univar_main.c

@@ -143,11 +143,11 @@ int main(int argc, char *argv[])
 
     /* open 3D zoning raster with default region */
     if ((zonemap = param.zonefile->answer) != NULL) {
-	if (NULL == (mapset = G_find_grid3(zonemap, "")))
+	if (NULL == (mapset = G_find_raster3d(zonemap, "")))
 	    Rast3d_fatal_error(_("Requested g3d map <%s> not found"), zonemap);
 
 	zmap =
-	    Rast3d_open_cell_old(zonemap, G_find_grid3(zonemap, ""), &region,
+	    Rast3d_open_cell_old(zonemap, G_find_raster3d(zonemap, ""), &region,
 			    RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
 	if (zmap == NULL)
@@ -182,11 +182,11 @@ int main(int argc, char *argv[])
     /* Open 3D input raster with default region */
     infile = param.inputfile->answer;
 
-    if (NULL == G_find_grid3(infile, ""))
+    if (NULL == G_find_raster3d(infile, ""))
 	Rast3d_fatal_error(_("Requested g3d map <%s> not found"), infile);
 
     map =
-	Rast3d_open_cell_old(infile, G_find_grid3(infile, ""), &region,
+	Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), &region,
 			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)

raster3d/r3.cross.rast/main.c

@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
 
     G_debug(3, "Open 3D raster map %s", param.input->answer);
 
-    if (NULL == G_find_grid3(param.input->answer, ""))
+    if (NULL == G_find_raster3d(param.input->answer, ""))
         Rast3d_fatal_error(_("3d raster map <%s> not found"),
                        param.input->answer);
 
@@ -270,7 +270,7 @@ int main(int argc, char *argv[])
 
     /*******************/
     map = Rast3d_open_cell_old(param.input->answer,
-                          G_find_grid3(param.input->answer, ""),
+                          G_find_raster3d(param.input->answer, ""),
                           &region, RASTER3D_TILE_SAME_AS_FILE,
                           RASTER3D_USE_CACHE_DEFAULT);
 

raster3d/r3.info/r3.info.main.c

@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
     name = G_store(opt1->answer);
 
-    if ((mapset = G_find_grid3(name, "")) == NULL)
+    if ((mapset = G_find_raster3d(name, "")) == NULL)
 	G_fatal_error(_("3D Raster map <%s> not found"), name);
 
     /*We need to open the map */

raster3d/r3.mask/main.c

@@ -53,7 +53,7 @@ static void makeMask(char *name, d_Mask * maskRules)
 
     cacheSize = Rast3d_cache_size_encode(RASTER3D_USE_CACHE_XY, 1);
 
-    if (NULL == G_find_grid3(name, ""))
+    if (NULL == G_find_raster3d(name, ""))
 	Rast3d_fatal_error(_("3D raster map <%s> not found"), name);
 
     map = Rast3d_open_cell_old(name, G_mapset(), RASTER3D_DEFAULT_WINDOW,

raster3d/r3.mkdspf/r3_find.c

@@ -30,7 +30,7 @@ int g3_find_dsp_file(const char *cell, const char *file, const char *mset)
 /* return NULL on error: otherwise returns dspout */
 const char *check_get_any_dspname(const char *dspf, const char *g3f, const char *mset)
 {
-    if (!G_find_grid3(g3f, ""))
+    if (!G_find_raster3d(g3f, ""))
 	G_fatal_error("[%s] 3D raster map not found", g3f);
 
     if (mset) {			/* otherwise must be reading only  */

raster3d/r3.null/main.c

@@ -98,7 +98,7 @@ modifyNull(char *name, d_Mask * maskRules, int changeNull, double newNullVal)
 
     cacheSize = Rast3d_cache_size_encode(RASTER3D_USE_CACHE_XY, 1);
 
-    if (NULL == G_find_grid3(name, ""))
+    if (NULL == G_find_raster3d(name, ""))
 	Rast3d_fatal_error(_("3D raster map <%s> not found"), name);
 
     fprintf(stderr, "name %s Mapset %s \n", name, G_mapset());

raster3d/r3.out.ascii/main.c

@@ -326,7 +326,7 @@ int main(int argc, char *argv[])
         param.row->answer = 0;
     }
 
-    if (NULL == G_find_grid3(input, ""))
+    if (NULL == G_find_raster3d(input, ""))
         Rast3d_fatal_error(_("Requested 3d raster map not found"));
 
     /* Initiate the default settings */
@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
     Rast3d_get_window(&region);
 
     /* Open the map and use XY cache mode */
-    map = Rast3d_open_cell_old(input, G_find_grid3(input, ""), &region,
+    map = Rast3d_open_cell_old(input, G_find_raster3d(input, ""), &region,
                           RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)

raster3d/r3.out.v5d/main.c

@@ -308,10 +308,10 @@ int main(int argc, char *argv[])
 
     trueCoords = coords->answer;
 
-    if (NULL == G_find_grid3(input, ""))
+    if (NULL == G_find_raster3d(input, ""))
 	Rast3d_fatal_error(_("Requested 3d raster map not found"));
 
-    map = Rast3d_open_cell_old(input, G_find_grid3(input, ""), RASTER3D_DEFAULT_WINDOW,
+    map = Rast3d_open_cell_old(input, G_find_raster3d(input, ""), RASTER3D_DEFAULT_WINDOW,
 			  RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
     if (map == NULL)
 	Rast3d_fatal_error(_("Error opening 3d raster map"));

raster3d/r3.out.vtk/main.c

@@ -138,7 +138,7 @@ void check_input_maps(void)
     /*If input maps are provided, check them */
     if (param.input->answers != NULL) {
         for (i = 0; param.input->answers[i] != NULL; i++) {
-            if (NULL == G_find_grid3(param.input->answers[i], ""))
+            if (NULL == G_find_raster3d(param.input->answers[i], ""))
                 Rast3d_fatal_error(_("Requested 3d raster map <%s> not found"),
                                param.input->answers[i]);
         }
@@ -148,7 +148,7 @@ void check_input_maps(void)
     if (param.rgbmaps->answers != NULL) {
         for (i = 0; i < 3; i++) {
             if (param.rgbmaps->answers[i] != NULL) {
-                if (NULL == G_find_grid3(param.rgbmaps->answers[i], ""))
+                if (NULL == G_find_raster3d(param.rgbmaps->answers[i], ""))
                     Rast3d_fatal_error(_("Requested g3d RGB map <%s> not found"),
                                    param.rgbmaps->answers[i]);
             } else {
@@ -161,7 +161,7 @@ void check_input_maps(void)
     if (param.vectormaps->answers != NULL) {
         for (i = 0; i < 3; i++) {
             if (param.vectormaps->answers[i] != NULL) {
-                if (NULL == G_find_grid3(param.vectormaps->answers[i], ""))
+                if (NULL == G_find_raster3d(param.vectormaps->answers[i], ""))
                     Rast3d_fatal_error(_("Requested g3d vector map <%s> not found"),
                                    param.vectormaps->answers[i]);
             } else {
@@ -200,7 +200,7 @@ void open_write_rgb_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
             /*Open the map */
             maprgb =
                 Rast3d_open_cell_old(param.rgbmaps->answers[i],
-                                G_find_grid3(param.rgbmaps->answers[i], ""),
+                                G_find_raster3d(param.rgbmaps->answers[i], ""),
                                 &region, RASTER3D_TILE_SAME_AS_FILE,
                                 RASTER3D_USE_CACHE_DEFAULT);
             if (maprgb == NULL) {
@@ -285,7 +285,7 @@ void open_write_vector_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
             /*Open the map */
             mapvect =
                 Rast3d_open_cell_old(param.vectormaps->answers[i],
-                                G_find_grid3(param.vectormaps->answers[i],
+                                G_find_raster3d(param.vectormaps->answers[i],
                                              ""), &region,
                                 RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
             if (mapvect == NULL) {
@@ -504,7 +504,7 @@ int main(int argc, char *argv[])
             /*Open the map */
             in->map =
                 Rast3d_open_cell_old(param.input->answers[i],
-                                G_find_grid3(param.input->answers[i], ""),
+                                G_find_raster3d(param.input->answers[i], ""),
                                 &region, RASTER3D_TILE_SAME_AS_FILE,
                                 RASTER3D_USE_CACHE_DEFAULT);
             if (in->map == NULL) {

raster3d/r3.retile/main.c

@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
 
     G_debug(3, _("Open 3d raster map <%s>"), param.input->answer);
 
-    mapset = G_find_grid3(param.input->answer, "");
+    mapset = G_find_raster3d(param.input->answer, "");
     
     if (mapset == NULL)
         Rast3d_fatal_error(_("3d raster map <%s> not found"),

raster3d/r3.showdspf/r3_find.c

@@ -35,7 +35,7 @@ char *check_get_any_dspname(dspf, g3f, mset)
     char element[200], question[200];
     static char dspout[200];
 
-    if (!G_find_grid3(g3f, "")) {
+    if (!G_find_raster3d(g3f, "")) {
 	fprintf(stderr, "[%s] 3D raster map not found\n", g3f);
 	return (NULL);
     }

raster3d/r3.stats/main.c

@@ -608,11 +608,11 @@ int main(int argc, char *argv[])
 
     infile = inputfile->answer;
 
-    if (NULL == G_find_grid3(infile, ""))
+    if (NULL == G_find_raster3d(infile, ""))
 	Rast3d_fatal_error(_("3D raster map <%s> not found"), infile);
 
     map =
-	Rast3d_open_cell_old(infile, G_find_grid3(infile, ""), &region,
+	Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), &region,
 			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)

raster3d/r3.timestamp/r3.timestamp.main.c

@@ -67,9 +67,9 @@ int main(int argc, char *argv[])
     modify = date->answer != NULL;
 
     if (modify)
-	mapset = G_find_grid3(name, G_mapset());
+	mapset = G_find_raster3d(name, G_mapset());
     else
-	mapset = G_find_grid3(name, "");
+	mapset = G_find_raster3d(name, "");
 
     if (mapset == NULL) {
 	G_fatal_error(_("Grid3 <%s> not found %s"), name,

raster3d/r3.to.rast/main.c

@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
 
     G_debug(3, _("Open 3D raster map <%s>"), param.input->answer);
 
-    if (NULL == G_find_grid3(param.input->answer, ""))
+    if (NULL == G_find_raster3d(param.input->answer, ""))
         Rast3d_fatal_error(_("3D raster map <%s> not found"),
                        param.input->answer);
 
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
 
         /*Open the map with current region */
         map = Rast3d_open_cell_old(param.input->answer,
-                              G_find_grid3(param.input->answer, ""),
+                              G_find_raster3d(param.input->answer, ""),
                               RASTER3D_DEFAULT_WINDOW, RASTER3D_TILE_SAME_AS_FILE,
                               RASTER3D_USE_CACHE_DEFAULT);
         if (map == NULL)
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
 
         /*Open the 3d raster map */
         map = Rast3d_open_cell_old(param.input->answer,
-                              G_find_grid3(param.input->answer, ""),
+                              G_find_raster3d(param.input->answer, ""),
                               &region, RASTER3D_TILE_SAME_AS_FILE,
                               RASTER3D_USE_CACHE_DEFAULT);
 

vector/v.colors/main.c

@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
             if (Rast_read_colors(cmap, cmapset, &colors) < 0)
                 G_fatal_error(_("Unable to read color table for raster map <%s>"), cmap);
         } else {
-            cmapset = G_find_grid3(cmap, "");
+            cmapset = G_find_raster3d(cmap, "");
             if (!cmapset)
                 G_fatal_error(_("3D raster map <%s> not found"), cmap);
 

visualization/nviz2/cmd/volume.c

@@ -37,7 +37,7 @@ int load_rasters3d(const struct GParams *params, nv_data *data)
     nvol = opt_get_num_answers(params->volume);
 
     for (i = 0; i < nvol; i++) {
-	mapset = G_find_grid3(params->volume->answers[i], "");
+	mapset = G_find_raster3d(params->volume->answers[i], "");
 	if (mapset == NULL) {
 	    G_fatal_error(_("3d raster map <%s> not found"),
 			  params->volume->answers[i]);
@@ -119,7 +119,7 @@ int add_isosurfs(const struct GParams *params, nv_data *data)
 	ncolor_const = opt_get_num_answers(params->isosurf_color_const);
 
 	if (i < ncolor_map && strcmp(params->isosurf_color_map->answers[i], "")) {
-	    mapset = G_find_grid3(params->isosurf_color_map->answers[i], "");
+	    mapset = G_find_raster3d(params->isosurf_color_map->answers[i], "");
 
 	    if (mapset == NULL) {
 		G_fatal_error(_("3d raster map <%s> not found"),