Use the CT type for geographic/projected projections distinguishing

+ code cleanup

src/data/geojsonparser.cpp

@@ -7,6 +7,9 @@
 #define MARKER_SIZE_SMALL  8
 #define MARKER_SIZE_LARGE  16
 
+#define PROJ(object, parent) \
+	((object).isNull() ? (parent) : (object))
+
 static int markerSize(const QString &str)
 {
 	if (str == "small")
@@ -110,7 +113,7 @@ static bool isWS(char c)
 	return (c == 0x20 || c == 0x09 || c == 0x0A || c == 0x0D) ? true : false;
 }
 
-static bool isJSONObject(QFile *file)
+static bool possiblyJSONObject(QFile *file)
 {
 	char c;
 
@@ -126,12 +129,21 @@ static bool isJSONObject(QFile *file)
 	return false;
 }
 
-static Coordinates coordinates(const QJsonArray &data, const Projection &proj)
+bool GeoJSONParser::a2c(const QJsonArray &data, const Projection &proj,
+  Coordinates &c)
 {
-	if (data.count() >= 2 && data.at(0).isDouble() && data.at(1).isDouble())
+	c = (data.count() >= 2 && data.at(0).isDouble() && data.at(1).isDouble())
-		return proj.xy2ll(PointD(data.at(0).toDouble(), data.at(1).toDouble()));
+	  ? proj.xy2ll(PointD(data.at(0).toDouble(), data.at(1).toDouble()))
-	else
+	  : Coordinates();
-		return Coordinates();
+
+	if (c.isValid())
+		return true;
+	else {
+		QJsonDocument doc(QJsonDocument::fromVariant(data.toVariantList()));
+		_errorString = QString("%1: invalid coordinates")
+		  .arg(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
+		return false;
+	}
 }
 
 bool GeoJSONParser::crs(const QJsonObject &object, Projection &proj)
@@ -197,11 +209,9 @@ bool GeoJSONParser::point(const QJsonObject &object, const Projection &parent,
 	if (!crs(object, proj))
 		return false;
 
-	Coordinates c(::coordinates(coordinates, proj.isNull() ? parent : proj));
+	Coordinates c;
-	if (!c.isValid()) {
+	if (!a2c(coordinates, PROJ(proj, parent), c))
-		_errorString = "Invalid Point coordinates";
 		return false;
-	}
 
 	Waypoint waypoint(c);
 	if (coordinates.count() == 3 && coordinates.at(2).isDouble())
@@ -226,6 +236,7 @@ bool GeoJSONParser::multiPoint(const QJsonObject &object,
 	Projection proj;
 	if (!crs(object, proj))
 		return false;
+	Coordinates c;
 
 	for (int i = 0; i < coordinates.size(); i++) {
 		if (!coordinates.at(i).isArray()) {
@@ -233,11 +244,8 @@ bool GeoJSONParser::multiPoint(const QJsonObject &object,
 			return false;
 		} else {
 			QJsonArray data(coordinates.at(i).toArray());
-			Coordinates c(::coordinates(data, proj.isNull() ? parent : proj));
+			if (!a2c(data, PROJ(proj, parent), c))
-			if (!c.isValid()) {
-				_errorString = "Invalid MultiPoint coordinates";
 				return false;
-			}
 
 			Waypoint waypoint(c);
 			if (data.count() == 3 && data.at(2).isDouble())
@@ -266,7 +274,8 @@ bool GeoJSONParser::lineString(const QJsonObject &object,
 	Projection proj;
 	if (!crs(object, proj))
 		return false;
-	SegmentData sd;
+	SegmentData segment;
+	Coordinates c;
 
 	for (int i = 0; i < coordinates.size(); i++) {
 		if (!coordinates.at(i).isArray()) {
@@ -275,19 +284,16 @@ bool GeoJSONParser::lineString(const QJsonObject &object,
 		}
 
 		QJsonArray data(coordinates.at(i).toArray());
-		Coordinates c(::coordinates(data, proj.isNull() ? parent : proj));
+		if (!a2c(data, PROJ(proj, parent), c))
-		if (!c.isValid()) {
-			_errorString = "Invalid LineString coordinates";
 			return false;
-		}
 
 		Trackpoint t(c);
 		if (data.count() == 3 && data.at(2).isDouble())
 			t.setElevation(data.at(2).toDouble());
-		sd.append(t);
+		segment.append(t);
 	}
 
-	TrackData track(sd);
+	TrackData track(segment);
 	setTrackProperties(track, properties);
 	tracks.append(track);
 
@@ -311,6 +317,7 @@ bool GeoJSONParser::multiLineString(const QJsonObject &object,
 	if (!crs(object, proj))
 		return false;
 	TrackData track;
+	Coordinates c;
 
 	for (int i = 0; i < coordinates.size(); i++) {
 		if (!coordinates.at(i).isArray()) {
@@ -327,11 +334,8 @@ bool GeoJSONParser::multiLineString(const QJsonObject &object,
 				}
 
 				QJsonArray data(ls.at(j).toArray());
-				Coordinates c(::coordinates(data, proj.isNull() ? parent : proj));
+				if (!a2c(data, PROJ(proj, parent), c))
-				if (!c.isValid()) {
-					_errorString = "Invalid MultiLineString coordinates";
 					return false;
-				}
 
 				Trackpoint t(c);
 				if (data.count() == 3 && data.at(2).isDouble())
@@ -364,7 +368,8 @@ bool GeoJSONParser::polygon(const QJsonObject &object, const Projection &parent,
 	Projection proj;
 	if (!crs(object, proj))
 		return false;
-	::Polygon pg;
+	::Polygon poly;
+	Coordinates c;
 
 	for (int i = 0; i < coordinates.size(); i++) {
 		if (!coordinates.at(i).isArray()) {
@@ -382,18 +387,16 @@ bool GeoJSONParser::polygon(const QJsonObject &object, const Projection &parent,
 			}
 
 			QJsonArray point(lr.at(j).toArray());
-			Coordinates c(::coordinates(point, proj.isNull() ? parent : proj));
+			if (!a2c(point, PROJ(proj, parent), c))
-			if (!c.isValid()) {
-				_errorString = "Invalid Polygon linear ring coordinates";
 				return false;
-			}
+
 			data.append(c);
 		}
 
-		pg.append(data);
+		poly.append(data);
 	}
 
-	Area area(pg);
+	Area area(poly);
 	setAreaProperties(area, properties);
 	areas.append(area);
 
@@ -416,14 +419,14 @@ bool GeoJSONParser::multiPolygon(const QJsonObject &object,
 	if (!crs(object, proj))
 		return false;
 	Area area;
-
+	Coordinates c;
 
 	for (int i = 0; i < coordinates.size(); i++) {
 		if (!coordinates.at(i).isArray()) {
 			_errorString = "Invalid MultiPolygon data";
 			return false;
 		} else {
-			::Polygon pg;
+			::Polygon poly;
 
 			QJsonArray polygon(coordinates.at(i).toArray());
 			for (int j = 0; j < polygon.size(); j++) {
@@ -442,18 +445,16 @@ bool GeoJSONParser::multiPolygon(const QJsonObject &object,
 					}
 
 					QJsonArray point(lr.at(k).toArray());
-					Coordinates c(::coordinates(point, proj.isNull() ? parent : proj));
+					if (!a2c(point, PROJ(proj, parent), c))
-					if (!c.isValid()) {
-						_errorString = "Invalid MultiPolygon linear ring coordinates";
 						return false;
-					}
+
 					data.append(c);
 				}
 
-				pg.append(data);
+				poly.append(data);
 			}
 
-			area.append(pg);
+			area.append(poly);
 		}
 	}
 
@@ -482,37 +483,36 @@ bool GeoJSONParser::geometryCollection(const QJsonObject &object,
 
 		switch (type(geometry)) {
 			case Point:
-				if (!point(geometry, proj.isNull() ? parent : proj, properties,
+				if (!point(geometry, PROJ(proj, parent), properties,
 				  waypoints))
 					return false;
 				break;
 			case MultiPoint:
-				if (!multiPoint(geometry, proj.isNull() ? parent : proj,
+				if (!multiPoint(geometry, PROJ(proj, parent), properties,
-				  properties, waypoints))
+				  waypoints))
 					return false;
 				break;
 			case LineString:
-				if (!lineString(geometry, proj.isNull() ? parent : proj,
+				if (!lineString(geometry, PROJ(proj, parent), properties,
-				  properties, tracks))
+				  tracks))
 					return false;
 				break;
 			case MultiLineString:
-				if (!multiLineString(geometry, proj.isNull() ? parent : proj,
+				if (!multiLineString(geometry, PROJ(proj, parent), properties,
-				  properties, tracks))
+				  tracks))
 					return false;
 				break;
 			case Polygon:
-				if (!polygon(geometry, proj.isNull() ? parent : proj, properties,
+				if (!polygon(geometry, PROJ(proj, parent), properties, areas))
-				  areas))
 					return false;
 				break;
 			case MultiPolygon:
-				if (!multiPolygon(geometry, proj.isNull() ? parent : proj,
+				if (!multiPolygon(geometry, PROJ(proj, parent), properties,
-				  properties, areas))
+				  areas))
 					return false;
 				break;
 			case GeometryCollection:
-				if (!geometryCollection(geometry, proj.isNull() ? parent : proj,
+				if (!geometryCollection(geometry, PROJ(proj, parent),
 				  properties, tracks, areas, waypoints))
 					return false;
 				break;
@@ -542,26 +542,22 @@ bool GeoJSONParser::feature(const QJsonObject &object, const Projection &parent,
 
 	switch (type(geometry)) {
 		case Point:
-			return point(geometry, proj.isNull() ? parent : proj, properties,
+			return point(geometry, PROJ(proj, parent), properties, waypoints);
-			  waypoints);
 		case MultiPoint:
-			return multiPoint(geometry, proj.isNull() ? parent : proj,
+			return multiPoint(geometry, PROJ(proj, parent), properties,
-			  properties, waypoints);
+			  waypoints);
 		case LineString:
-			return lineString(geometry, proj.isNull() ? parent : proj,
+			return lineString(geometry, PROJ(proj, parent), properties, tracks);
-			  properties, tracks);
 		case MultiLineString:
-			return multiLineString(geometry, proj.isNull() ? parent : proj,
+			return multiLineString(geometry, PROJ(proj, parent), properties,
-			  properties, tracks);
+			  tracks);
 		case GeometryCollection:
-			return geometryCollection(geometry, proj.isNull() ? parent : proj,
+			return geometryCollection(geometry, PROJ(proj, parent), properties,
-			  properties, tracks, areas, waypoints);
+			  tracks, areas, waypoints);
 		case Polygon:
-			return polygon(geometry, proj.isNull() ? parent : proj, properties,
+			return polygon(geometry, PROJ(proj, parent), properties, areas);
-			  areas);
 		case MultiPolygon:
-			return multiPolygon(geometry, proj.isNull() ? parent : proj,
+			return multiPolygon(geometry, PROJ(proj, parent), properties, areas);
-			  properties, areas);
 		default:
 			_errorString = geometry["type"].toString()
 			  + ": invalid/missing Feature geometry";
@@ -584,8 +580,8 @@ bool GeoJSONParser::featureCollection(const QJsonObject &object,
 		return false;
 
 	for (int i = 0; i < features.size(); i++)
-		if (!feature(features.at(i).toObject(), proj.isNull() ? parent : proj,
+		if (!feature(features.at(i).toObject(), PROJ(proj, parent), tracks,
-		  tracks, areas, waypoints))
+		  areas, waypoints))
 			return false;
 
 	return true;
@@ -597,8 +593,8 @@ bool GeoJSONParser::parse(QFile *file, QList<TrackData> &tracks,
 {
 	Q_UNUSED(routes);
 
-	if (!isJSONObject(file)) {
+	if (!possiblyJSONObject(file)) {
-		_errorString = "Not a JSON file";
+		_errorString = "Not a GeoJSON file";
 		return false;
 	} else
 		file->reset();
@@ -607,8 +603,8 @@ bool GeoJSONParser::parse(QFile *file, QList<TrackData> &tracks,
 	QJsonDocument doc(QJsonDocument::fromJson(file->readAll(), &error));
 
 	if (doc.isNull()) {
-		_errorString = "JSON parse error: " + error.errorString() + " ["
+		_errorString = QString("JSON parse error on offset %1: %2")
-		  + QString::number(error.offset) + "]";
+		  .arg(QString::number(error.offset), error.errorString());
 		return false;
 	}
 

src/data/geojsonparser.h

@@ -30,6 +30,7 @@ private:
 		FeatureCollection
 	};
 
+	bool a2c(const QJsonArray &data, const Projection &proj, Coordinates &c);
 	Type type(const QJsonObject &json);
 	bool crs(const QJsonObject &object, Projection &proj);
 	bool point(const QJsonObject &object, const Projection &parent,

src/map/projection.cpp

@@ -8,7 +8,6 @@
 #include "proj/polarstereographic.h"
 #include "proj/obliquestereographic.h"
 #include "proj/polyconic.h"
-#include "proj/latlon.h"
 #include "datum.h"
 #include "gcs.h"
 #include "pcs.h"
@@ -40,7 +39,7 @@ Projection::Method::Method(int id)
 
 Projection::Projection(const PCS &pcs)
 	: _gcs(pcs.gcs()), _ct(0), _units(pcs.conversion().units()),
-	_cs(pcs.conversion().cs()), _geographic(false)
+	_cs(pcs.conversion().cs())
 {
 	const Ellipsoid &ellipsoid = _gcs.datum().ellipsoid();
 	const Projection::Setup &setup = pcs.conversion().setup();
@@ -115,7 +114,7 @@ Projection::Projection(const PCS &pcs)
 }
 
 Projection::Projection(const GCS &gcs, const CoordinateSystem &cs)
-  : _gcs(gcs), _units(LinearUnits(9001)), _cs(cs), _geographic(true)
+  : _gcs(gcs), _units(LinearUnits(9001)), _cs(cs)
 {
 	_ct = new LatLon(gcs.angularUnits());
 }
@@ -125,7 +124,6 @@ Projection::Projection(const Projection &p)
 	_gcs = p._gcs;
 	_units = p._units;
 	_ct = p._ct ? p._ct->clone() : 0;
-	_geographic = p._geographic;
 	_cs = p._cs;
 }
 
@@ -142,7 +140,6 @@ Projection &Projection::operator=(const Projection &p)
 		_gcs = p._gcs;
 		_units = p._units;
 		_ct = p._ct ? p._ct->clone() : 0;
-		_geographic = p._geographic;
 		_cs = p._cs;
 	}
 
@@ -155,7 +152,7 @@ bool Projection::operator==(const Projection &p) const
 		return false;
 
 	return (*_ct == *p._ct && _gcs == p._gcs && _units == p._units
-	  && _cs == p._cs && _geographic == p._geographic);
+	  && _cs == p._cs);
 }
 
 PointD Projection::ll2xy(const Coordinates &c) const

src/map/projection.h

@@ -7,6 +7,7 @@
 #include "linearunits.h"
 #include "coordinatesystem.h"
 #include "gcs.h"
+#include "proj/latlon.h"
 
 class PCS;
 class CT;
@@ -70,7 +71,7 @@ public:
 		int _id;
 	};
 
-	Projection() : _ct(0), _geographic(false) {}
+	Projection() : _ct(0) {}
 	Projection(const Projection &p);
 	Projection(const PCS &pcs);
 	Projection(const GCS &gcs, const CoordinateSystem &cs
@@ -90,7 +91,10 @@ public:
 		// and except of WMTS/WMS it is not needed.
 		return (_gcs.isValid() && _ct != 0 && _units.isValid());
 	}
-	bool isGeographic() const {return _geographic;}
+	bool isGeographic() const
+	{
+		return (dynamic_cast<const LatLon*>(_ct) != 0);
+	}
 
 	PointD ll2xy(const Coordinates &c) const;
 	Coordinates xy2ll(const PointD &p) const;
@@ -103,7 +107,6 @@ private:
 	const CT *_ct;
 	LinearUnits _units;
 	CoordinateSystem _cs;
-	bool _geographic;
 };
 
 #ifndef QT_NO_DEBUG