[GRASS-SVN] r38969 - grass/trunk/vector/v.out.ogr

[svn_grass at osgeo.org]

Author: benducke
Date: 2009-09-04 11:29:27 -0400 (Fri, 04 Sep 2009)
New Revision: 38969

Modified:
   grass/trunk/vector/v.out.ogr/main.c
Log:
Fixed export of centroids only.
Added some type checks that make sure no action is performed if there is actually nothing to export.
Added infrastructure for GV_VOLUME (but no functionality and not exposed to user yet).
Fixed counting of areas (was counted like a primitive type, which it is not).

Modified: grass/trunk/vector/v.out.ogr/main.c
===================================================================
--- grass/trunk/vector/v.out.ogr/main.c	2009-09-04 14:20:51 UTC (rev 38968)
+++ grass/trunk/vector/v.out.ogr/main.c	2009-09-04 15:29:27 UTC (rev 38969)
@@ -39,6 +39,7 @@
 int main(int argc, char *argv[])
 {
     int i, j, k, centroid, otype, donocat;
+    int num_to_export;
     int field;
     struct GModule *module;
     struct Option *in_opt, *dsn_opt, *layer_opt, *type_opt, *frmt_opt,
@@ -196,6 +197,8 @@
 	wkbtype = wkbPolygon;
     else if (otype & GV_FACE)
 	wkbtype = wkbPolygon25D;
+    else if (otype & GV_VOLUME)
+	wkbtype = wkbPolygon25D;
 
     if (poly_flag->answer)
 	wkbtype = wkbPolygon;
@@ -445,21 +448,94 @@
 		   "Verify 'type' parameter."), Vect_get_num_primitives(&In,
 									GV_CENTROID));
 
-    if (Vect_get_num_primitives(&In, GV_AREA) > 0 && !(otype & GV_AREA))
+    if (Vect_get_num_areas(&In) > 0 && !(otype & GV_AREA))
 	G_warning(_("%d areas found, but not requested to be exported. "
-		    "Verify 'type' parameter."), Vect_get_num_primitives(&In,
-									 GV_AREA));
+		    "Verify 'type' parameter."), Vect_get_num_areas(&In));
 
     if (Vect_get_num_primitives(&In, GV_FACE) > 0 && !(otype & GV_FACE))
 	G_warning(_("%d faces found, but not requested to be exported. "
 		    "Verify 'type' parameter."), Vect_get_num_primitives(&In,
 									 GV_FACE));
 
-    /* add? GV_KERNEL */
+    if (Vect_get_num_volumes(&In) > 0 && !(otype & GV_VOLUME))
+	G_warning(_("%d volume(s) found, but not requested to be exported. "
+		    "Verify 'type' parameter."), Vect_get_num_volumes(&In));
 
+    /* warn and eventually abort if there is nothing to be exported */
+    num_to_export = 0;
+    if (Vect_get_num_primitives(&In, GV_POINT) < 1 && (otype & GV_POINTS)) {
+        G_warning(_("No points found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_POINT )
+            num_to_export = num_to_export + Vect_get_num_primitives(&In, GV_POINT);
+    }
+
+    if (Vect_get_num_primitives(&In, GV_LINE) < 1 && (otype & GV_LINE)) {
+        G_warning(_("No lines found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_LINE )
+            num_to_export = num_to_export + Vect_get_num_primitives(&In, GV_LINE);
+    }
+
+    if (Vect_get_num_primitives(&In, GV_BOUNDARY) < 1 && (otype & GV_BOUNDARY)) {
+        G_warning(_("No boundaries found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_BOUNDARY )
+            num_to_export = num_to_export + Vect_get_num_primitives(&In, GV_BOUNDARY);
+    }
+
+    if (Vect_get_num_areas(&In) < 1 && (otype & GV_AREA)) {
+        G_warning(_("No areas found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_AREA )
+            num_to_export = num_to_export + Vect_get_num_areas(&In);
+    }
+
+    if (Vect_get_num_primitives(&In, GV_CENTROID) < 1 && (otype & GV_CENTROID)) {
+        G_warning(_("No centroids found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_CENTROID )
+            num_to_export = num_to_export + Vect_get_num_primitives(&In, GV_CENTROID);
+    }
+
+    if (Vect_get_num_primitives(&In, GV_FACE) < 1 && (otype & GV_FACE)) {
+        G_warning(_("No faces found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_FACE )
+            num_to_export = num_to_export + Vect_get_num_primitives(&In, GV_FACE);
+    }
+
+    if (Vect_get_num_primitives(&In, GV_KERNEL) < 1 && (otype & GV_KERNEL)) {
+        G_warning(_("No kernels found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_KERNEL )
+            num_to_export = num_to_export + Vect_get_num_primitives(&In, GV_KERNEL);
+    }
+
+    if (Vect_get_num_volumes(&In) < 1 && (otype & GV_VOLUME)) {
+        G_warning(_("No volumes found, but requested to be exported. "
+		    "Will skip this geometry type."));
+    } else {
+        if ( otype & GV_VOLUME )
+            num_to_export = num_to_export + Vect_get_num_volumes(&In);
+    }
+
+    G_debug(1, "Requested to export %d geometries", num_to_export);
+
+    if ( num_to_export < 1 ) {
+        G_fatal_error(_("Nothing to export. Aborting."));
+    }
+
     /* Lines (run always to count features of different type) */
     if ((otype & GV_POINTS) || (otype & GV_LINES)) {
-	G_message(_("Exporting %i points/lines..."), Vect_get_num_lines(&In));
+	G_message(_("Exporting %i geometries..."), Vect_get_num_lines(&In));
 	for (i = 1; i <= Vect_get_num_lines(&In); i++) {
 
 	    G_percent(i, Vect_get_num_lines(&In), 1);