Skip to content

v0.2.48..v0.2.49 changeset OsmGeoJsonReader.cpp

Garret Voltz edited this page Oct 2, 2019 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/io/OsmGeoJsonReader.cpp b/hoot-core/src/main/cpp/hoot/core/io/OsmGeoJsonReader.cpp
index 2f07398..b8cd4d5 100644
--- a/hoot-core/src/main/cpp/hoot/core/io/OsmGeoJsonReader.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/io/OsmGeoJsonReader.cpp
@@ -117,12 +117,12 @@ void OsmGeoJsonReader::read(const OsmMapPtr& map)
   }
 }
 
-OsmMapPtr OsmGeoJsonReader::loadFromString(const QString& jsonStr)
+void OsmGeoJsonReader::loadFromString(const QString& jsonStr, const OsmMapPtr& map)
 {
   _loadJSON(jsonStr);
-  _map.reset(new OsmMap());
+  _map = map;
   _parseGeoJson();
-  return _map;
+  _map.reset();
 }
 
 OsmMapPtr OsmGeoJsonReader::loadFromFile(const QString& path)
Clone this wiki locally