Skip to content

v0.2.49..v0.2.50 changeset OsmGeoJsonWriterTest.cpp

Garret Voltz edited this page Nov 6, 2019 · 1 revision
diff --git a/hoot-core-test/src/test/cpp/hoot/core/io/OsmGeoJsonWriterTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/io/OsmGeoJsonWriterTest.cpp
index 0113c60..6554a9b 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/io/OsmGeoJsonWriterTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/io/OsmGeoJsonWriterTest.cpp
@@ -63,12 +63,16 @@ public:
 
   void runAllDataTypesTest()
   {
-    runTest("test-files/conflate/unified/AllDataTypesA.osm", "AllDataTypes.geojson");
+    Settings s;
+    s.set(ConfigOptions::getJsonFormatHootenannyKey(), false);
+    runTest("test-files/conflate/unified/AllDataTypesA.osm", "AllDataTypes.geojson", &s);
   }
 
   void runDcTigerTest()
   {
-    runTest("test-files/DcTigerRoads.osm", "DcTigerRoads.geojson");
+    Settings s;
+    s.set(ConfigOptions::getJsonFormatHootenannyKey(), false);
+    runTest("test-files/DcTigerRoads.osm", "DcTigerRoads.geojson", &s);
   }
 
   void runBostonSubsetRoadBuildingTest()
@@ -78,21 +82,23 @@ public:
     Log::WarningLevel logLevel = Log::getInstance().getLevel();
     if (Log::getInstance().getLevel() >= Log::Info)
       Log::getInstance().setLevel(Log::Error);
-    runTest("test-files/BostonSubsetRoadBuilding_FromOsm.osm", "BostonSubsetRoadBuilding.geojson");
+    Settings s;
+    s.set(ConfigOptions::getJsonFormatHootenannyKey(), false);
+    runTest("test-files/BostonSubsetRoadBuilding_FromOsm.osm", "BostonSubsetRoadBuilding.geojson", &s);
     Log::getInstance().setLevel(logLevel);
   }
 
   void runObjectGeoJsonTest()
   {
-    runTest(_inputPath + "SampleObjectsWriter.osm", "SampleObjectsWriter.geojson");
+    Settings s;
+    s.set(ConfigOptions::getJsonFormatHootenannyKey(), false);
+    runTest(_inputPath + "SampleObjectsWriter.osm", "SampleObjectsWriter.geojson", &s);
   }
 
   void runObjectGeoJsonHootTest()
   {
     Settings s;
     s.set(ConfigOptions::getJsonPrettyPrintKey(), true);
-    s.set(ConfigOptions::getJsonFormatHootenannyKey(), true);
-
     runTest(_inputPath + "SampleObjectsWriter.osm", "SampleObjectsWriterHoot.geojson", &s);
   }
 
Clone this wiki locally