Merge pull request #6153 from agiudiceandrea/patch-1

nyalldawson · web-flow · commit 141be446aa19 · 2018-01-25T11:36:21.000+11:00
Fixes a typo in syncDb() that improperly set "Imported from GDAL" as name for all geogcs imported from GDAL/PROJ
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1807,7 +1807,7 @@ int QgsCoordinateReferenceSystem::syncDb()
         ellps = ellipseRegExp.cap( 1 );
       }
 
-      QString name( OSRIsGeographic( crs ) ? OSRGetAttrValue( crs, "GEOCS", 0 ) : OSRGetAttrValue( crs, "PROJCS", 0 ) );
+      QString name( OSRIsGeographic( crs ) ? OSRGetAttrValue( crs, "GEOGCS", 0 ) : OSRGetAttrValue( crs, "PROJCS", 0 ) );
       if ( name.isEmpty() )
         name = QObject::tr( "Imported from GDAL" );
 

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ int QgsCoordinateReferenceSystem::syncDb()`
`1807`	`1807`	`ellps = ellipseRegExp.cap( 1 );`
`1808`	`1808`	`}`
`1809`	`1809`
`1810`		`- QString name( OSRIsGeographic( crs ) ? OSRGetAttrValue( crs, "GEOCS", 0 ) : OSRGetAttrValue( crs, "PROJCS", 0 ) );`
	`1810`	`+ QString name( OSRIsGeographic( crs ) ? OSRGetAttrValue( crs, "GEOGCS", 0 ) : OSRGetAttrValue( crs, "PROJCS", 0 ) );`
`1811`	`1811`	`if ( name.isEmpty() )`
`1812`	`1812`	`name = QObject::tr( "Imported from GDAL" );`
`1813`	`1813`