libogsf: fix thematic mapping of features without category or without DB link

m.nviz.image: update module


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

lib/ogsf/GP2.c

@@ -295,7 +295,7 @@ int GP_set_style(int id, int color, int width, float size, int symbol)
    Updates also style for each geopoint.
    
    \param id point set id
-   \param layer layer number for thematic mapping
+   \param layer layer number for thematic mapping (-1 for undefined)
    \param color icon color column name
    \param width icon line width column name
    \param size icon size column name

lib/ogsf/Gp3.c

@@ -173,7 +173,7 @@ int Gp_load_sites_thematic(geosite *gp, struct Colors *colors)
     struct Map_info Map;
     struct field_info *Fi;
     
-    int nvals, cat, npts;
+    int nvals, cat, npts, nskipped;
     int red, blu, grn;
     const char *str;
     const char *mapset;
@@ -196,18 +196,19 @@ int Gp_load_sites_thematic(geosite *gp, struct Colors *colors)
     }
     
     Fi = Vect_get_field(&Map, gp->tstyle->layer);
-    if (!Fi)
-	G_fatal_error(_("Database connection not defined for layer %d"),
-		      gp->tstyle->layer);
-    
-    driver = db_start_driver_open_database(Fi->driver, Fi->database);
-    if (!driver)
-	G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
-		      Fi->database, Fi->driver);
-    
+    if (!Fi) {
+	G_warning(_("Database connection not defined for layer %d"),
+		  gp->tstyle->layer);
+    }
+    else {
+	driver = db_start_driver_open_database(Fi->driver, Fi->database);
+	if (!driver)
+	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+			  Fi->database, Fi->driver);
+    }
     G_message(_("Loading thematic points layer <%s>..."),
 	      G_fully_qualified_name(gp->filename, mapset));
-    npts = 0;
+    npts = nskipped = 0;
     for(gpt = gp->points; gpt; gpt = gpt->next) {
 	gpt->style = (gvstyle *) G_malloc(sizeof(gvstyle));
 	G_zero(gpt->style, sizeof(gvstyle));
@@ -218,9 +219,13 @@ int Gp_load_sites_thematic(geosite *gp, struct Colors *colors)
 	gpt->style->size   = gp->style->size;
 	gpt->style->width  = gp->style->width;
 	
-	Vect_cat_get(gpt->cats, gp->tstyle->layer, &cat);
-	if (cat < 0)
+	cat = -1;
+	if (gpt->cats)
+	    Vect_cat_get(gpt->cats, gp->tstyle->layer, &cat);
+	if (cat < 0) {
+	    nskipped++;
 	    continue;
+	}
 
 	/* color */
 	if (colors) {
@@ -275,5 +280,9 @@ int Gp_load_sites_thematic(geosite *gp, struct Colors *colors)
 	npts++;
     }
     
+    if (nskipped > 0)
+	G_warning(_("%d points without category. "
+		    "Unable to determine color rules for features without category."),
+		  nskipped);
     return npts;
 }

lib/ogsf/Gv3.c

@@ -309,7 +309,7 @@ int Gv_load_vect_thematic(geovect *gv, struct Colors *colors)
     struct Map_info Map;
     struct field_info *Fi;
     
-    int nvals, cat, nlines;
+    int nvals, cat, nlines, nskipped;
     int red, blu, grn;
     const char *str;
     const char *mapset;
@@ -332,18 +332,19 @@ int Gv_load_vect_thematic(geovect *gv, struct Colors *colors)
     }
     
     Fi = Vect_get_field(&Map, gv->tstyle->layer);
-    if (!Fi)
-	G_fatal_error(_("Database connection not defined for layer %d"),
-		      gv->tstyle->layer);
-    
-    driver = db_start_driver_open_database(Fi->driver, Fi->database);
-    if (!driver)
-	G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
-		      Fi->database, Fi->driver);
-    
+    if (!Fi) {
+	G_warning(_("Database connection not defined for layer %d"),
+		  gv->tstyle->layer);
+    }
+    else {
+      driver = db_start_driver_open_database(Fi->driver, Fi->database);
+      if (!driver)
+	  G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+			Fi->database, Fi->driver);
+    }
     G_message(_("Loading thematic vector layer <%s>..."),
 	      G_fully_qualified_name(gv->filename, mapset));
-    nlines = 0;
+    nlines = nskipped = 0;
     for(gvt = gv->lines; gvt; gvt = gvt->next) {
 	gvt->style = (gvstyle *) G_malloc(sizeof(gvstyle));
 	G_zero(gvt->style, sizeof(gvstyle));
@@ -353,11 +354,15 @@ int Gv_load_vect_thematic(geovect *gv, struct Colors *colors)
 	gvt->style->symbol = gv->style->symbol;
 	gvt->style->size   = gv->style->size;
 	gvt->style->width  = gv->style->width;
-	
-	Vect_cat_get(gvt->cats, gv->tstyle->layer, &cat);
-	if (cat < 0)
-	    continue;
 
+	cat = -1;
+	if (gvt->cats)
+	    Vect_cat_get(gvt->cats, gv->tstyle->layer, &cat);
+	if (cat < 0) {
+	    nskipped++;
+	    continue;
+	}
+	
 	/* color */
 	if (colors) {
 	    if (!Rast_get_c_color((const CELL *) &cat, &red, &grn, &blu, colors)) {
@@ -394,6 +399,11 @@ int Gv_load_vect_thematic(geovect *gv, struct Colors *colors)
 
 	nlines++;
     }
+
+    if (nskipped > 0)
+	G_warning(_("%d features without category. "
+		    "Unable to determine color rules for features without category."),
+		  nskipped);
     
     return nlines;
 }

misc/m.nviz.image/vector.c

@@ -223,6 +223,8 @@ int check_thematic(const struct GParams *params, int vlines)
     dbDriver *driver;
     dbColumn *column;
     
+    Fi = NULL;
+    
     if (vlines) {
 	map    = params->vlines;
 	layer  = params->vline_layer;
@@ -244,9 +246,7 @@ int check_thematic(const struct GParams *params, int vlines)
 	    G_fatal_error(_("Unable to open vector map <%s>"), map->answers[i]);
 	Fi = Vect_get_field2(&Map, layer->answers[i]);
 	if (!Fi)
-	    G_fatal_error(_("Database connection not defined for layer %s"),
-			  layer->answers[i]);
-
+	    continue;
 	driver = db_start_driver_open_database(Fi->driver, Fi->database);
 	if (!driver)
 	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
@@ -293,5 +293,8 @@ int check_thematic(const struct GParams *params, int vlines)
 	}
     }
     
-    return Fi->number;
+    if (Fi) 
+	return Fi->number;
+    
+    return 1;
 }