[core] don't fail on invalid inline GeoJSON data

mapbox · Dec 12, 2015 · c4a01d5 · c4a01d5
1 parent b0bec13
commit c4a01d5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp
@@ -171,9 +171,16 @@ bool StyleParser::parseGeoJSONSource(Source& source, const JSVal& sourceVal) {
     } else if (dataVal.IsObject()) {
         // We need to parse dataVal as a GeoJSON object
         using namespace mapbox::geojsonvt;
-        source.info.geojsonvt = std::make_unique<GeoJSONVT>(Convert::convert(dataVal, 0));
+        try {
+            source.info.geojsonvt = std::make_unique<GeoJSONVT>(Convert::convert(dataVal, 0));
+        } catch (const std::exception& ex) {
+            Log::Error(Event::ParseStyle, "Failed to parse GeoJSON data: %s", ex.what());
+            // Create an empty GeoJSON VT object to make sure we're not infinitely waiting for
+            // tiles to load.
+            source.info.geojsonvt = std::make_unique<GeoJSONVT>(std::vector<ProjectedFeature>{});
+        }
     } else {
-        Log::Warning(Event::ParseStyle, "GeoJSON data must be a URL or an object");
+        Log::Error(Event::ParseStyle, "GeoJSON data must be a URL or an object");
         return false;
     }