Merge GH-1410

GDAL/OGR template/import improvement

Author: dg0yt

src/gdal/gdal_manager.cpp

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2018 Kai Pastor
+ *    Copyright 2016-2019 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -68,6 +68,9 @@ class GdalManager::GdalManagerPrivate
 	}
 
 	GdalManagerPrivate(const GdalManagerPrivate&) = delete;
+	GdalManagerPrivate(GdalManagerPrivate&&) = delete;
+	GdalManagerPrivate& operator=(const GdalManagerPrivate&) = delete;
+	GdalManagerPrivate&& operator=(GdalManagerPrivate&&) = delete;
 
 	void configure()
 	{

src/gdal/gdal_settings_page.cpp

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2018 Kai Pastor
+ *    Copyright 2016-2019 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -94,10 +94,8 @@ GdalSettingsPage::GdalSettingsPage(QWidget* parent)
 	connect(parameters, &QTableWidget::cellChanged, this, &GdalSettingsPage::cellChange);
 }
 
-GdalSettingsPage::~GdalSettingsPage()
-{
-	// nothing, not inlined
-}
+GdalSettingsPage::~GdalSettingsPage() = default;
+
 
 QString GdalSettingsPage::title() const
 {

src/gdal/ogr_file_format.cpp

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2018 Kai Pastor
+ *    Copyright 2016-2019 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -21,6 +21,7 @@
 #include "ogr_file_format_p.h"  // IWYU pragma: associated
 
 #include <algorithm>
+#include <cmath>
 #include <cstddef>
 #include <functional>
 #include <iterator>
@@ -413,7 +414,7 @@ namespace {
 	}
 
 
-	class AverageLatLon
+	class AverageCoords
 	{
 	private:
 		double x = 0;
@@ -452,14 +453,8 @@ namespace {
 		}
 
 	public:
-		AverageLatLon(OGRDataSourceH data_source)
+		AverageCoords(OGRDataSourceH data_source, OGRDataSourceH srs)
 		{
-			auto geo_srs = ogr::unique_srs { OSRNewSpatialReference(nullptr) };
-			OSRSetWellKnownGeogCS(geo_srs.get(), "WGS84");
-#if GDAL_VERSION_MAJOR >= 3
-			OSRSetAxisMappingStrategy(geo_srs.get(), OAMS_TRADITIONAL_GIS_ORDER);
-#endif
-			
 			auto num_layers = OGR_DS_GetLayerCount(data_source);
 			for (int i = 0; i < num_layers; ++i)
 			{
@@ -469,7 +464,7 @@ namespace {
 					if (!spatial_reference)
 						continue;
 
-					auto transformation = ogr::unique_transformation{ OCTNewCoordinateTransformation(spatial_reference, geo_srs.get()) };
+					auto transformation = ogr::unique_transformation{ OCTNewCoordinateTransformation(spatial_reference, srs) };
 					if (!transformation)
 						continue;
 
@@ -490,9 +485,9 @@ namespace {
 			}
 		}
 
-		operator LatLon() const
+		operator QPointF() const
 		{
-			return num_coords ? LatLon{ y / num_coords, x / num_coords } : LatLon{};
+			return num_coords ? QPointF{ x / num_coords, y / num_coords } : QPointF{};
 		}
 
 	};
@@ -546,7 +541,6 @@ OgrFileImport::OgrFileImport(const QString& path, Map* map, MapView* view, UnitT
  : Importer(path, map, view)
  , manager{ OGR_SM_Create(nullptr) }
  , unit_type{ unit_type }
- , georeferencing_import_enabled{ true }
 {
 	GdalManager().configure();
 
@@ -826,13 +820,16 @@ ogr::unique_srs OgrFileImport::importGeoreferencing(OGRDataSourceH data_source)
 	if (projected_srs_spec)
 	{
 		// Found a suitable projected SRS
+		auto center = calcAverageCoords(data_source, suitable_srs.get());
 		auto georef = map->getGeoreferencing();  // copy
 		georef.setProjectedCRS(QStringLiteral("PROJ.4"), QString::fromLatin1(projected_srs_spec));
+		georef.setProjectedRefPoint({std::round(center.x()), std::round(center.y())});
 		map->setGeoreferencing(georef);
 		CPLFree(projected_srs_spec);
 		return suitable_srs;
 	}
-	else if (suitable_srs)
+	
+	if (suitable_srs)
 	{
 		// Found a suitable SRS but it is not projected.
 		// Setting up a local orthographic projection.
@@ -850,18 +847,17 @@ ogr::unique_srs OgrFileImport::importGeoreferencing(OGRDataSourceH data_source)
 		map->setGeoreferencing(ortho_georef);
 		return srsFromMap();
 	}
-	else if (local_srs || no_srs)
+	
+	if (local_srs || no_srs)
 	{
 		auto georef = Georeferencing();
 		georef.setScaleDenominator(int(map->getScaleDenominator()));
 		georef.setDeclination(map->getGeoreferencing().getDeclination());
 		map->setGeoreferencing(georef);
 		return local_srs ? std::move(local_srs) : srsFromMap();
 	}
-	else
-	{
-		throw FileFormatException(tr("The geospatial data has no suitable spatial reference."));
-	}
+	
+	throw FileFormatException(tr("The geospatial data has no suitable spatial reference."));
 }
 
 
@@ -1003,7 +999,8 @@ Object* OgrFileImport::importPointGeometry(OGRFeatureH feature, OGRGeometryH geo
 		object->setPosition(toMapCoord(OGR_G_GetX(geometry, 0), OGR_G_GetY(geometry, 0)));
 		return object;
 	}
-	else if (symbol->getType() == Symbol::Text)
+	
+	if (symbol->getType() == Symbol::Text)
 	{
 		const auto& description = symbol->getDescription();
 		auto length = description.length();
@@ -1038,7 +1035,7 @@ Object* OgrFileImport::importPointGeometry(OGRFeatureH feature, OGRGeometryH geo
 				applyLabelAnchor(anchor, object);
 			}
 
-			auto angle = QStringRef(&description, 3, split-3).toFloat(&ok);
+			auto angle = QStringRef(&description, 3, split-3).toDouble(&ok);
 			if (ok)
 			{
 				object->setRotation(qDegreesToRadians(angle));
@@ -1124,7 +1121,7 @@ PathObject* OgrFileImport::importPolygonGeometry(OGRFeatureH feature, OGRGeometr
 
 Symbol* OgrFileImport::getSymbol(Symbol::Type type, const char* raw_style_string)
 {
-	auto style_string = QByteArray::fromRawData(raw_style_string, qstrlen(raw_style_string));
+	auto style_string = QByteArray::fromRawData(raw_style_string, int(qstrlen(raw_style_string)));
 	Symbol* symbol = nullptr;
 	switch (type)
 	{
@@ -1167,7 +1164,7 @@ Symbol* OgrFileImport::getSymbol(Symbol::Type type, const char* raw_style_string
 
 MapColor* OgrFileImport::makeColor(OGRStyleToolH tool, const char* color_string)
 {
-	auto key = QByteArray::fromRawData(color_string, qstrlen(color_string));
+	auto key = QByteArray::fromRawData(color_string, int(qstrlen(color_string)));
 	auto color = colors.value(key);
 	if (!color)
 	{	
@@ -1372,7 +1369,7 @@ PointSymbol* OgrFileImport::getSymbolForOgrSymbol(OGRStyleToolH tool, const QByt
 		break;
 	default:
 		return nullptr;
-	};
+	}
 
 	int is_null;
 	auto color_string = OGR_ST_GetParamStr(tool, color_key, &is_null);
@@ -1415,7 +1412,7 @@ TextSymbol* OgrFileImport::getSymbolForLabel(OGRStyleToolH tool, const QByteArra
 
 	// Don't use the style string as a key: The style contains the label.
 	QByteArray key;
-	key.reserve(qstrlen(color_string) + qstrlen(font_size_string) + 1);
+	key.reserve(int(qstrlen(color_string) + qstrlen(font_size_string) + 1));
 	key.append(color_string);
 	key.append(font_size_string);
 	auto text_symbol = static_cast<TextSymbol*>(text_symbols.value(key));
@@ -1449,7 +1446,7 @@ TextSymbol* OgrFileImport::getSymbolForLabel(OGRStyleToolH tool, const QByteArra
 		angle = 0.0;
 
 	QString description;
-	description.reserve(qstrlen(label_string) + 100);
+	description.reserve(int(qstrlen(label_string) + 100));
 	description.append(QString::number(100 + anchor));
 	description.append(QString::number(angle, 'g', 1));
 	description.append(QLatin1Char(' '));
@@ -1464,7 +1461,7 @@ LineSymbol* OgrFileImport::getSymbolForPen(OGRStyleToolH tool, const QByteArray&
 	Q_ASSERT(OGR_ST_GetType(tool) == OGRSTCPen);
 
 	auto raw_tool_key = OGR_ST_GetStyleString(tool);
-	auto tool_key = QByteArray::fromRawData(raw_tool_key, qstrlen(raw_tool_key));
+	auto tool_key = QByteArray::fromRawData(raw_tool_key, int(qstrlen(raw_tool_key)));
 	auto symbol = line_symbols.value(tool_key);
 	if (symbol && symbol->getType() == Symbol::Line)
 		return static_cast<LineSymbol*>(symbol);
@@ -1496,7 +1493,7 @@ AreaSymbol* OgrFileImport::getSymbolForBrush(OGRStyleToolH tool, const QByteArra
 	Q_ASSERT(OGR_ST_GetType(tool) == OGRSTCBrush);
 
 	auto raw_tool_key = OGR_ST_GetStyleString(tool);
-	auto tool_key = QByteArray::fromRawData(raw_tool_key, qstrlen(raw_tool_key));
+	auto tool_key = QByteArray::fromRawData(raw_tool_key, int(qstrlen(raw_tool_key)));
 	auto symbol = area_symbols.value(tool_key);
 	if (symbol && symbol->getType() == Symbol::Area)
 		return static_cast<AreaSymbol*>(symbol);
@@ -1608,9 +1605,24 @@ LatLon OgrFileImport::calcAverageLatLon(const QString& path)
 // static
 LatLon OgrFileImport::calcAverageLatLon(OGRDataSourceH data_source)
 {
-	return AverageLatLon(data_source);
+	auto geo_srs = ogr::unique_srs { OSRNewSpatialReference(nullptr) };
+	OSRSetWellKnownGeogCS(geo_srs.get(), "WGS84");
+#if GDAL_VERSION_MAJOR >= 3
+	OSRSetAxisMappingStrategy(geo_srs.get(), OAMS_TRADITIONAL_GIS_ORDER);
+#endif
+	
+	auto const average = calcAverageCoords(data_source, geo_srs.get());
+	return {average.y(), average.x()};
 }
 
+
+// static
+QPointF OgrFileImport::calcAverageCoords(OGRDataSourceH data_source, OGRDataSourceH srs)
+{
+	return QPointF{AverageCoords(data_source, srs)};
+}
+
+
 // ### OgrFileExport ###
 
 OgrFileExport::OgrFileExport(const QString& path, const Map* map, const MapView* view)
@@ -1997,7 +2009,7 @@ void OgrFileExport::addTextToLayer(OGRLayerH layer, const std::function<bool (co
 		{
 			// There is no label field, or the text is too long.
 			// Put the text directly in the label.
-			text.replace(QRegularExpression(QLatin1String("([\"\\\\])"), QRegularExpression::MultilineOption), QLatin1String("\\\\1"));
+			text.replace(QRegularExpression(QLatin1String(R"((["\\]))"), QRegularExpression::MultilineOption), QLatin1String("\\\\1"));
 			style.replace("{Name}", text.toUtf8());
 		}
 		OGR_F_SetStyleString(po_feature.get(), style);
@@ -2016,7 +2028,7 @@ void OgrFileExport::addLinesToLayer(OGRLayerH layer, const std::function<bool (c
 	auto add_feature = [&](const Object* object) {
 		const auto* symbol = object->getSymbol();
 		const auto* path = object->asPath();
-		if (path->parts().size() < 1)
+		if (path->parts().empty())
 			return;
 
 		QString sym_name = symbol->getPlainTextName();
@@ -2057,7 +2069,7 @@ void OgrFileExport::addAreasToLayer(OGRLayerH layer, const std::function<bool (c
 	auto add_feature = [&](const Object* object) {
 		const auto* symbol = object->getSymbol();
 		const auto* path = object->asPath();
-		if (path->parts().size() < 1)
+		if (path->parts().empty())
 			return;
 
 		auto po_feature = ogr::unique_feature(OGR_F_Create(OGR_L_GetLayerDefn(layer)));

src/gdal/ogr_file_format_p.h

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2017 Kai Pastor
+ *    Copyright 2016-2019 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -42,6 +42,8 @@
 #include "core/symbols/symbol.h"
 #include "fileformats/file_import_export.h"
 
+class QPointF;
+
 namespace OpenOrienteering {
 
 class AreaSymbol;
@@ -291,6 +293,8 @@ class OgrFileImport : public Importer
 
 	static LatLon calcAverageLatLon(OGRDataSourceH data_source);
 
+	static QPointF calcAverageCoords(OGRDataSourceH data_source, OGRDataSourceH srs);
+	
 
 private:
 	Symbol* getSymbolForPointGeometry(const QByteArray& style_string);
@@ -323,15 +327,15 @@ class OgrFileImport : public Importer
 
 	ogr::unique_stylemanager manager;
 
-	int empty_geometries;
-	int no_transformation;
-	int failed_transformation;
-	int unsupported_geometry_type;
-	int too_few_coordinates;
+	int empty_geometries = 0;
+	int no_transformation = 0;
+	int failed_transformation = 0;
+	int unsupported_geometry_type = 0;
+	int too_few_coordinates = 0;
 
 	UnitType unit_type;
 
-	bool georeferencing_import_enabled;
+	bool georeferencing_import_enabled = true;
 };
 
 

src/gdal/ogr_template.cpp

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2018 Kai Pastor
+ *    Copyright 2016-2019 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -328,7 +328,7 @@ try
 
 				if (!explicit_georef)
 				{
-					explicit_georef.reset(new Georeferencing());
+					explicit_georef = std::make_unique<Georeferencing>();
 					explicit_georef->setScaleDenominator(int(map_georef.getScaleDenominator()));
 					explicit_georef->setProjectedCRS(QString{}, projected_crs_spec);
 					explicit_georef->setProjectedRefPoint({}, false);
@@ -506,7 +506,7 @@ bool OgrTemplate::loadTypeSpecificTemplateConfiguration(QXmlStreamReader& xml)
 {
 	if (xml.name() == literal::georeferencing)
 	{
-		explicit_georef.reset(new Georeferencing());
+		explicit_georef = std::make_unique<Georeferencing>();
 		explicit_georef->load(xml, false);
 	}
 	else if (xml.name() == literal::crs_spec)