Georeferencing: Use substitution for '+init=epsg:5514'

Fixes #542.

Author: dg0yt

src/core/georeferencing.cpp

@@ -114,6 +114,16 @@ namespace
 		*pj_get_errno_ref() = 0;
 		return pj_init_plus(spec_latin1);
 	}
+	
+	
+	/**
+	 * List of substitutions for specifications which are known to be broken in Proj.4.
+	 */
+	std::vector< std::pair<QString, QString> > spec_substitutions {
+		// #542, S-JTSK (Greenwich) / Krovak East North
+		{ "+init=epsg:5514", "+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 "
+		                     "+ellps=bessel +towgs84=542.5,89.2,456.9,5.517,2.275,5.516,6.96 +pm=greenwich +units=m +no_defs" },
+	};
 }
 
 
@@ -577,11 +587,20 @@ void Georeferencing::setTransformationDirectly(const QTransform& transform)
 	}
 }
 
-bool Georeferencing::setProjectedCRS(const QString& id, const QString& spec, std::vector< QString > params)
+bool Georeferencing::setProjectedCRS(const QString& id, QString spec, std::vector< QString > params)
 {
 	// Default return value if no change is neccessary
 	bool ok = (state == Normal || projected_crs_spec.isEmpty());
 
+	for (const auto& substitution : spec_substitutions)
+	{
+		if (substitution.first == spec)
+		{
+			spec = substitution.second;
+			break;
+		}
+	}
+	
 	// Changes in params shall already be recorded in spec
 	if (projected_crs_id != id
 	    || projected_crs_spec != spec

src/core/georeferencing.h

@@ -315,7 +315,7 @@ friend QDebug operator<<(QDebug dbg, const Georeferencing& georef);
 	 * @param params parameter values (ignore for empty spec)
 	 * @return true if the specification is valid or empty, false otherwise
 	 */
-	bool setProjectedCRS(const QString& id, const QString& spec = "", std::vector< QString > params = std::vector< QString >());
+	bool setProjectedCRS(const QString& id, QString spec = QString::null, std::vector< QString > params = std::vector< QString >());
 
 	/**
 	 * Calculates the meridian convergence at the reference point.

test/georeferencing_t.cpp

@@ -82,8 +82,6 @@ void GeoreferencingTest::testCRSTemplates()
 	QCOMPARE(epsg_template->parameters().size(), (std::size_t)1);
 
 	georef.setProjectedCRS("EPSG", epsg_template->specificationTemplate().arg("5514"), { "5514" });
-	if (PJ_VERSION < 490)
-		QEXPECT_FAIL("", "EPSG 5514 is undefined in specifications supplied by proj < 4.9.0", Continue);
 	QVERIFY(georef.isValid());
 }
 
@@ -122,8 +120,6 @@ void GeoreferencingTest::testProjection()
 #endif
 
 	QFETCH(QString, proj);
-	if (PJ_VERSION < 490)
-		QEXPECT_FAIL("EPSG 5514 ČÚZK Dolní Temenice", "EPSG 5514 is undefined in specifications supplied by proj < 4.9.0", Abort);
 	QVERIFY2(georef.setProjectedCRS(proj, proj), proj.toLatin1());
 	QCOMPARE(georef.getErrorText(), QString(""));
 
@@ -138,7 +134,6 @@ void GeoreferencingTest::testProjection()
 	QPointF proj_coord = georef.toProjectedCoords(lat_lon, &ok);
 	QVERIFY(ok);
 
-	QEXPECT_FAIL("EPSG 5514 ČÚZK Dolní Temenice", "EPSG 5514 is broken in proj-supplied specifications", Abort);
 	if (fabs(proj_coord.x() - easting) > max_dist_error)
 		QCOMPARE(QString::number(proj_coord.x(), 'f'), QString::number(easting, 'f'));
 	if (fabs(proj_coord.y() - northing) > max_dist_error)