v0.2.48..v0.2.49 changeset MapIoJs.cpp

diff --git a/hoot-js/src/main/cpp/hoot/js/io/MapIoJs.cpp b/hoot-js/src/main/cpp/hoot/js/io/MapIoJs.cpp
index 478d613..ca87670 100644
--- a/hoot-js/src/main/cpp/hoot/js/io/MapIoJs.cpp
+++ b/hoot-js/src/main/cpp/hoot/js/io/MapIoJs.cpp
@@ -29,6 +29,7 @@
 // hoot
 #include <hoot/core/util/MapProjector.h>
 #include <hoot/core/io/OsmXmlReader.h>
+#include <hoot/core/io/OsmGeoJsonReader.h>
 #include <hoot/core/io/OsmMapReaderFactory.h>
 #include <hoot/core/io/OsmMapWriterFactory.h>
 #include <hoot/core/util/ConfigOptions.h>
@@ -55,6 +56,8 @@ void MapIoJs::Init(Handle<Object> exports)
                FunctionTemplate::New(current, loadMap)->GetFunction());
   exports->Set(String::NewFromUtf8(current, "loadMapFromString"),
                FunctionTemplate::New(current, loadMapFromString)->GetFunction());
+  exports->Set(String::NewFromUtf8(current, "loadGeoJsonFromString"),
+               FunctionTemplate::New(current, loadGeoJsonFromString)->GetFunction());
   exports->Set(String::NewFromUtf8(current, "loadMapFromStringPreserveIdAndStatus"),
                FunctionTemplate::New(current, loadMapFromStringPreserveIdAndStatus)->GetFunction());
   exports->Set(String::NewFromUtf8(current, "saveMap"),
@@ -119,6 +122,31 @@ void MapIoJs::loadMapFromString(const FunctionCallbackInfo<Value>& args)
   args.GetReturnValue().SetUndefined();
 }
 
+void MapIoJs::loadGeoJsonFromString(const FunctionCallbackInfo<Value>& args)
+{
+  Isolate* current = args.GetIsolate();
+  HandleScope scope(current);
+
+  OsmMapJs* map = ObjectWrap::Unwrap<OsmMapJs>(args[0]->ToObject());
+  QString mapGeoJson = toCpp<QString>(args[1]);
+
+  OsmGeoJsonReader reader;
+  if (args.Length() >= 3)
+  {
+    reader.setUseDataSourceIds(toCpp<bool>(args[2]));
+  }
+  Status status = Status::Invalid;
+  if (args.Length() >= 4)
+  {
+    status = (Status::Type)args[3]->ToInteger()->Value();
+    reader.setDefaultStatus(status);
+  }
+  reader.loadFromString(mapGeoJson, map->getMap());
+
+  args.GetReturnValue().SetUndefined();
+}
+
+
 void MapIoJs::loadMapFromStringPreserveIdAndStatus(const FunctionCallbackInfo<Value>& args)
 {
   Isolate* current = args.GetIsolate();