summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/location/geojson_viewer/main.cpp5
-rw-r--r--src/location/labs/qgeojson.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/examples/location/geojson_viewer/main.cpp b/examples/location/geojson_viewer/main.cpp
index 3995ff08..91c926a0 100644
--- a/examples/location/geojson_viewer/main.cpp
+++ b/examples/location/geojson_viewer/main.cpp
@@ -158,8 +158,11 @@ public:
}
features.append(entry);
}
- if (nodeType.isEmpty()) // Dirty hack to handle (=skip) the first MIV used to process the fictitious list with 1 element
+ if (nodeType.isEmpty()) { // Dirty hack to handle (=skip) the first MIV used to process the fictitious list with 1 element
+ if (features.isEmpty())
+ return root;
return features.first().toMap();
+ }
root["data"] = features;
return root;
}
diff --git a/src/location/labs/qgeojson.cpp b/src/location/labs/qgeojson.cpp
index 99e612d1..423615ad 100644
--- a/src/location/labs/qgeojson.cpp
+++ b/src/location/labs/qgeojson.cpp
@@ -1236,6 +1236,8 @@ static QString printQvariant(const QVariant v, int tabs = 0) {
readable form.
*/
QString toString(const QVariantList &geoData) {
+ if (geoData.isEmpty())
+ return QString();
return printQvariant(geoData.first(), 0);
}