v.to.rast: fix https://trac.osgeo.org/grass/ticket/175

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

vector/v.to.rast/do_areas.c

@@ -21,7 +21,7 @@ static int compare(const void *, const void *);
 
 
 int do_areas(struct Map_info *Map, struct line_pnts *Points,
-	     dbCatValArray * Cvarr, int ctype, int field, int use,
+	     dbCatValArray * Cvarr, int ctype, int use,
 	     double value, int value_type)
 {
     int i;

vector/v.to.rast/local.h

@@ -27,7 +27,7 @@
 
 
 /* do_areas.c */
-int do_areas(struct Map_info *, struct line_pnts *, dbCatValArray *, int, int,
+int do_areas(struct Map_info *, struct line_pnts *, dbCatValArray *, int,
 	     int, double, int);
 int sort_areas(struct Map_info *, struct line_pnts *, int);
 

vector/v.to.rast/main.c

@@ -145,6 +145,6 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
     }
 
-    G_done_msg("");
+    G_done_msg(" ");
     exit(EXIT_SUCCESS);
 }

vector/v.to.rast/support.c

@@ -277,6 +277,7 @@ int update_labels(const char *rast_name, const char *vector_map, int field,
 	    Rast_set_cats_title("Labels", &rast_cats);
 
 	    /* open vector map and database driver */
+	    Vect_set_open_level(1);
 	    Vect_open_old(&Map, vector_map, G_find_vector2(vector_map, ""));
 
 	    db_CatValArray_init(&cvarr);
@@ -284,6 +285,8 @@ int update_labels(const char *rast_name, const char *vector_map, int field,
 		G_fatal_error(_("Database connection not defined for layer %d"),
 			      field);
 
+	    Vect_close(&Map);
+
 	    if (!
 		(Driver =
 		 db_start_driver_open_database(Fi->driver, Fi->database)))
@@ -418,33 +421,119 @@ int update_labels(const char *rast_name, const char *vector_map, int field,
 	    RASTER_MAP_TYPE map_type;
 	    long count;
 
-	    fd = Rast_open_old(rast_name, G_mapset());
+	    if (label_column) {
 
-	    map_type = Rast_map_type(rast_name, G_mapset());
+		Rast_set_cats_title("Labels", &rast_cats);
 
-	    rowbuf = Rast_allocate_buf(map_type);
+		/* open vector map and database driver */
+		Vect_set_open_level(1);
+		Vect_open_old(&Map, vector_map, G_find_vector2(vector_map, ""));
 
-	    Rast_init_cell_stats(&stats);
-	    Rast_set_cats_title("Categories", &rast_cats);
+		db_CatValArray_init(&cvarr);
+		if (!(Fi = Vect_get_field(&Map, field)))
+		    G_fatal_error(_("Database connection not defined for layer %d"),
+				  field);
 
-	    rows = Rast_window_rows();
+		Vect_close(&Map);
 
-	    for (row = 0; row < rows; row++) {
-		Rast_get_row(fd, rowbuf, row, map_type);
-		Rast_update_cell_stats(rowbuf, Rast_window_cols(), &stats);
-	    }
+		if (!
+		    (Driver =
+		     db_start_driver_open_database(Fi->driver, Fi->database)))
+		    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+				  Fi->database, Fi->driver);
 
-	    Rast_rewind_cell_stats(&stats);
+		/* get number of records in label_column */
+		if ((nrec =
+		     db_select_CatValArray(Driver, Fi->table, Fi->key,
+					   label_column, NULL, &cvarr)) == -1)
+		    G_fatal_error(_("Unknown column <%s> in table <%s>"),
+				  label_column, Fi->table);
 
-	    while (Rast_next_cell_stat(&n, &count, &stats)) {
-		char msg[80];
+		if (nrec < 0)
+		    G_fatal_error(_("No records selected from table <%s>"),
+				  Fi->table);
 
-		sprintf(msg, "Category %d", n);
-		Rast_set_cat(&n, &n, msg, &rast_cats, map_type);
+		G_debug(3, "nrec = %d", nrec);
+
+		my_labels_rules =
+		    (struct My_labels_rule *)
+		    G_malloc(sizeof(struct My_labels_rule) * nrec);
+
+		/* get column type */
+		if ((col_type =
+		     db_column_Ctype(Driver, Fi->table,
+				     label_column)) == -1) {
+		    G_fatal_error(_("Column <%s> not found"), label_column);
+		}
+
+		/* close the database driver */
+		db_close_database_shutdown_driver(Driver);
+
+		/* for each attribute */
+		for (i = 0; i < cvarr.n_values; i++) {
+		    char tmp[2000];
+		    int cat = cvarr.value[i].cat;
+		    labels_n_values++;
+
+		    db_init_string(&my_labels_rules[i].label);
+
+		    /* switch the column type */
+		    switch (col_type) {
+		    case DB_C_TYPE_DOUBLE:
+			sprintf(tmp, "%lf", cvarr.value[i].val.d);
+			db_set_string(&my_labels_rules[i].label, tmp);
+			break;
+		    case DB_C_TYPE_INT:
+			sprintf(tmp, "%d", cvarr.value[i].val.i);
+			db_set_string(&my_labels_rules[i].label, tmp);
+			break;
+		    case DB_C_TYPE_STRING:
+			db_set_string(&my_labels_rules[i].label,
+				      db_get_string(cvarr.value[i].val.s));
+			break;
+		    default:
+			G_warning(_("Column type (%s) not supported"),
+				  db_sqltype_name(col_type));
+		    }
+
+		    /* add the raster category to label */
+		    my_labels_rules[i].i = cat;
+
+		    Rast_set_c_cat(&(my_labels_rules[i].i),
+				 &(my_labels_rules[i].i),
+				 db_get_string(&my_labels_rules[i].label),
+				 &rast_cats);
+		}			/* for each value in database */
 	    }
+	    else  {
+		fd = Rast_open_old(rast_name, G_mapset());
+
+		map_type = Rast_map_type(rast_name, G_mapset());
 
-	    Rast_close(fd);
-	    G_free(rowbuf);
+		rowbuf = Rast_allocate_buf(map_type);
+
+		Rast_init_cell_stats(&stats);
+		Rast_set_cats_title("Categories", &rast_cats);
+
+		rows = Rast_window_rows();
+
+		for (row = 0; row < rows; row++) {
+		    Rast_get_row(fd, rowbuf, row, map_type);
+		    Rast_update_cell_stats(rowbuf, Rast_window_cols(), &stats);
+		}
+
+		Rast_rewind_cell_stats(&stats);
+
+		while (Rast_next_cell_stat(&n, &count, &stats)) {
+		    char msg[80];
+
+		    sprintf(msg, "Category %d", n);
+		    Rast_set_cat(&n, &n, msg, &rast_cats, map_type);
+		}
+
+		Rast_close(fd);
+		G_free(rowbuf);
+	    }
 	}
 	break;
     case USE_D:

vector/v.to.rast/vect2rast.c

@@ -152,7 +152,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map, const char *fie
 
 	if ((use != USE_Z && use != USE_D) && nareas) {
 	    if (do_areas
-		(&Map, Points, &cvarr, ctype, field, use, value,
+		(&Map, Points, &cvarr, ctype, use, value,
 		 value_type) < 0) {
 		G_warning(_("Problem processing areas from vector map <%s>, continuing..."),
 			  vector_map);