Merge GH-1407

Fix OGR georeferencing setup

Author: dg0yt

src/gdal/ogr_file_format.cpp

@@ -456,6 +456,9 @@ namespace {
 		{
 			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)

src/gdal/ogr_template.cpp

@@ -71,25 +71,12 @@ namespace {
 	}
 
 
-	std::unique_ptr<Georeferencing> getDataGeoreferencing(const QString& path, const Georeferencing& initial_georef)
-	{
-		Map tmp_map;
-		tmp_map.setGeoreferencing(initial_georef);
-		OgrFileImport importer{ path, &tmp_map, nullptr, OgrFileImport::UnitOnGround};
-		importer.setGeoreferencingImportEnabled(true);
-		importer.setLoadSymbolsOnly(true);
-		if (!importer.doImport())
-			return {};  // failure
-		
-		return std::make_unique<Georeferencing>(tmp_map.getGeoreferencing());  // success
-	}
-	
-	
 	bool preserveRefPoints(Georeferencing& data_georef, const Georeferencing& initial_georef)
 	{
 		// Keep a configured local reference point from initial_georef?
 		auto data_crs_spec = data_georef.getProjectedCRSSpec();
 		if ((!initial_georef.isValid() || initial_georef.isLocal())
+		    && initial_georef.getProjectedRefPoint() != QPointF{}
 		    && data_georef.isValid()
 		    && !data_georef.isLocal()
 		    && data_georef.getProjectedRefPoint() == QPointF{}
@@ -119,6 +106,20 @@ const std::vector<QByteArray>& OgrTemplate::supportedExtensions()
 }
 
 
+std::unique_ptr<Georeferencing> OgrTemplate::getDataGeoreferencing(const QString& path, const Georeferencing& initial_georef)
+{
+	Map tmp_map;
+	tmp_map.setGeoreferencing(initial_georef);
+	OgrFileImport importer{ path, &tmp_map, nullptr, OgrFileImport::UnitOnGround};
+	importer.setGeoreferencingImportEnabled(true);
+	importer.setLoadSymbolsOnly(true);
+	if (!importer.doImport())
+		return {};  // failure
+	
+	return std::make_unique<Georeferencing>(tmp_map.getGeoreferencing());  // success
+}
+
+
 OgrTemplate::OgrTemplate(const QString& path, Map* map)
 : TemplateMap(path, map)
 {

src/gdal/ogr_template.h

@@ -49,6 +49,8 @@ Q_OBJECT
 public:
 	static const std::vector<QByteArray>& supportedExtensions();
 
+	static std::unique_ptr<Georeferencing> getDataGeoreferencing(const QString& path, const Georeferencing& initial_georef);
+	
 
 	OgrTemplate(const QString& path, Map* map);
 

test/data/templates/map.osm

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6" generator="dg0yt" copyright="OpenOrienteering" attribution="2019 OpenOrienteering" license="GPL-3+">
+ <bounds minlat="50.0008100" minlon="7.9994900" maxlat="50.0009000" maxlon="7.9996600"/>
+ <node id="1" visible="true" version="1" changeset="234" timestamp="2010-10-26T11:11:11Z" user="dg0yt" uid="3456" lat="50.00082" lon="7.99965"/>
+ <node id="2" visible="true" version="1" changeset="234" timestamp="2010-10-26T11:11:11Z" user="dg0yt" uid="3456" lat="50.00089" lon="7.99965"/>
+ <node id="3" visible="true" version="1" changeset="234" timestamp="2010-10-26T11:11:11Z" user="dg0yt" uid="3456" lat="50.00089" lon="7.99950"/>
+ <node id="4" visible="true" version="1" changeset="234" timestamp="2010-10-26T11:11:11Z" user="dg0yt" uid="3456" lat="50.00082" lon="7.99950"/>
+ <way id="5" visible="true" version="1" changeset="234" timestamp="2010-10-26T11:11:11Z" user="dg0yt" uid="3456">
+  <nd ref="1"/>
+  <nd ref="2"/>
+  <nd ref="3"/>
+  <nd ref="4"/>
+  <nd ref="1"/>
+  <tag k="building" v="yes"/>
+  <tag k="name" v="Virtual Building"/>
+ </way>
+</osm>

test/template_t.cpp

@@ -34,6 +34,7 @@
 #include "core/map.h"
 #include "core/map_view.h"
 #include "fileformats/xml_file_format_p.h"
+#include "gdal/ogr_template.h"
 #include "templates/template.h"
 #include "templates/world_file.h"
 
@@ -200,6 +201,18 @@ private slots:
 #endif
 	}
 
+#ifdef MAPPER_USE_GDAL
+	void ogrTemplateGeoreferencingTest()
+	{
+		auto const osm_fileinfo = QFileInfo(QStringLiteral("testdata:templates/map.osm"));
+		QVERIFY(osm_fileinfo.exists());
+		auto georef = OgrTemplate::getDataGeoreferencing(osm_fileinfo.absoluteFilePath(), Georeferencing{});
+		QVERIFY(georef);
+		auto latlon = georef->getGeographicRefPoint();
+		QCOMPARE(qRound(latlon.latitude()), 50);
+		QCOMPARE(qRound(latlon.longitude()), 8);
+	}
+#endif
 };