Add multitype option to force use of Multi* geometries

Author: bartnv

src/main.rs

@@ -58,7 +58,8 @@ struct Column<'a> {
   replace: Option<&'a str>,
   consol: Option<&'a str>,
   subtable: Option<Table<'a>>,
-  bbox: Option<BBox>
+  bbox: Option<BBox>,
+  multitype: bool
 }
 impl std::fmt::Debug for Column<'_> {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -99,10 +100,10 @@ impl BBox {
   }
 }
 
-fn gml_to_ewkb(cell: &RefCell<String>, coll: &[Geometry], bbox: Option<&BBox>) -> bool {
+fn gml_to_ewkb(cell: &RefCell<String>, coll: &[Geometry], bbox: Option<&BBox>, multitype: bool) -> bool {
   let mut ewkb: Vec<u8> = vec![];
 
-  if coll.len() > 1 {
+  if multitype || coll.len() > 1 {
     let multitype = coll.first().unwrap().gtype+3;
     ewkb.extend_from_slice(&[1, multitype, 0, 0, 0]);
     ewkb.extend_from_slice(&(coll.len() as u32).to_le_bytes());
@@ -126,7 +127,7 @@ fn gml_to_ewkb(cell: &RefCell<String>, coll: &[Geometry], bbox: Option<&BBox>) -
       for ring in geom.rings.iter() {
         if geom.gtype != 1 { ewkb.extend_from_slice(&((ring.len() as u32)/geom.dims as u32).to_le_bytes()); } // Points don't have multiple vertices
         for (i, pos) in ring.iter().enumerate() {
-          if overlap == true { }
+          if overlap { }
           else if geom.dims == 2 {
             if i%2 == 0 {
               overlapx = false;
@@ -144,7 +145,7 @@ fn gml_to_ewkb(cell: &RefCell<String>, coll: &[Geometry], bbox: Option<&BBox>) -
           ewkb.extend_from_slice(&pos.to_le_bytes());
         }
       }
-      if overlap == false { return false; }
+      if !overlap { return false; }
     }
     else {
       for ring in geom.rings.iter() {
@@ -185,7 +186,8 @@ fn add_table<'a>(rowpath: &str, outfile: Option<&str>, filemode: &str, skip: Opt
     let find = col["find"].as_str();
     let replace = col["repl"].as_str();
     let consol = col["cons"].as_str();
-    let bbox = col["bbox"].as_str().and_then(|str| BBox::from(str));
+    let bbox = col["bbox"].as_str().and_then(BBox::from);
+    let multitype = col["mult"].as_bool().unwrap_or(false);
 
     if convert.is_some() && !vec!("xml-to-text", "gml-to-ewkb").contains(&convert.unwrap()) {
       panic!("Option 'convert' contains invalid value {}", convert.unwrap());
@@ -205,7 +207,7 @@ fn add_table<'a>(rowpath: &str, outfile: Option<&str>, filemode: &str, skip: Opt
       eprintln!("Warning: the bbox option has no function without conversion type 'gml-to-ekwb'");
     }
 
-    let column = Column { name: name.to_string(), path, value: RefCell::new(String::new()), attr, hide, include, exclude, convert, find, replace, consol, subtable, bbox };
+    let column = Column { name: name.to_string(), path, value: RefCell::new(String::new()), attr, hide, include, exclude, convert, find, replace, consol, subtable, bbox, multitype };
     table.columns.push(column);
   }
   table
@@ -499,7 +501,7 @@ fn main() -> std::io::Result<()> {
           for i in 0..table.columns.len() {
             if path == table.columns[i].path {
               gmltoewkb = false;
-              if !gml_to_ewkb(&table.columns[i].value, &gmlcoll, table.columns[i].bbox.as_ref()) {
+              if !gml_to_ewkb(&table.columns[i].value, &gmlcoll, table.columns[i].bbox.as_ref(), table.columns[i].multitype) {
                 filtered = true;
                 table.clear_columns();
               }