Make geo_explode_collections option work with FileGDB import

This option did not work with FileGDB imports, as there was an extra level of layer type checking which was not taking the option into account.
heavyai · Jul 29, 2020 · d65e85d · d65e85d
1 parent bb1f3aa
commit d65e85d
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/ImportExport/Importer.cpp b/ImportExport/Importer.cpp
@@ -4340,6 +4340,14 @@ void Importer::readMetadataSampleGDAL(
         case wkbPolygon:
         case wkbMultiPolygon:
           break;
+        case wkbMultiPoint:
+        case wkbMultiLineString:
+          // supported if geo_explode_collections is specified
+          if (!copy_params.geo_explode_collections) {
+            throw std::runtime_error("Unsupported geometry type: " +
+                                     std::string(poGeometry->getGeometryName()));
+          }
+          break;
         default:
           throw std::runtime_error("Unsupported geometry type: " +
                                    std::string(poGeometry->getGeometryName()));
@@ -4690,6 +4698,13 @@ std::vector<Importer::GeoFileLayerInfo> Importer::gdalGetLayersInGeoFile(
             // layer has supported geo
             contents = GeoFileLayerContents::GEO;
             break;
+          case wkbMultiPoint:
+          case wkbMultiLineString:
+            // supported if geo_explode_collections is specified
+            contents = copy_params.geo_explode_collections
+                           ? GeoFileLayerContents::GEO
+                           : GeoFileLayerContents::UNSUPPORTED_GEO;
+            break;
           default:
             // layer has unsupported geometry
             contents = GeoFileLayerContents::UNSUPPORTED_GEO;