Skip to content

Commit

Permalink
Followup OSGeo/PROJ#1337
Browse files Browse the repository at this point in the history 
Add remaining mapping of old QGIS ellipsoid codes to PROJ db codes
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 27, 2019
1 parent 163f046 commit 8daf4ba
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 8 deletions.
13 changes: 12 additions & 1 deletion src/core/qgsellipsoidutils.cpp
View file
Expand Up @@ -147,7 +147,18 @@ const QMap< QString, QString > sProj6EllipsoidAcronymMap
{"engelis", "EPSG:7054"},
{"evrst56", "EPSG:7044"},
{"SEasia", "ESRI:107004"},
{"SGS85", "EPSG:7054"}
{"SGS85", "EPSG:7054"},
{"andrae", "PROJ:ANDRAE"},
{"clrk80", "EPSG:7034"},
{"CPM", "PROJ:CPM"},
{"delmbr", "PROJ:DELMBR"},
{"Earth2000", "PROJ:EARTH2000"},
{"kaula", "PROJ:KAULA"},
{"lerch", "PROJ:LERCH"},
{"MERIT", "PROJ:MERIT"},
{"mprts", "PROJ:MPRTS"},
{"new_intl", "PROJ:NEW_INTL"},
{"WGS60", "PROJ:WGS60"}
};

QgsEllipsoidUtils::EllipsoidParameters QgsEllipsoidUtils::ellipsoidParameters( const QString &e )
Expand Down
92 changes: 85 additions & 7 deletions tests/src/python/test_qgsellipsoidutils.py
View file
Expand Up @@ -68,15 +68,17 @@ def testParams(self):
self.assertEqual(params.semiMinor, 6356256.909237285)
self.assertEqual(params.inverseFlattening, 299.3249646)
self.assertFalse(params.useCustomParameters)
self.assertEqual(params.crs.toProj4(), '+proj=longlat +a=6377563.3959999997 +rf=299.32496459999999 +no_defs')
self.assertEqual(params.crs.toProj4(),
'+proj=longlat +a=6377563.3959999997 +rf=299.32496459999999 +no_defs')

params = QgsEllipsoidUtils.ellipsoidParameters("EPSG:7008")
self.assertTrue(params.valid)
self.assertEqual(params.semiMajor, 6378206.4)
self.assertEqual(params.semiMinor, 6356583.8)
self.assertEqual(params.inverseFlattening, 294.9786982138982)
self.assertFalse(params.useCustomParameters)
self.assertEqual(params.crs.toProj4(), '+proj=longlat +a=6378206.4000000004 +b=6356583.7999999998 +no_defs')
self.assertEqual(params.crs.toProj4(),
'+proj=longlat +a=6378206.4000000004 +b=6356583.7999999998 +no_defs')

# using parameters
for i in range(2):
Expand All @@ -95,22 +97,98 @@ def testParams(self):

def testAcronyms(self):
self.assertTrue('WGS84' if QgsProjUtils.projVersionMajor() < 6 else 'EPSG:7030' in QgsEllipsoidUtils.acronyms())
self.assertTrue('Ganymede2000' if QgsProjUtils.projVersionMajor() < 6 else 'ESRI:107916' in QgsEllipsoidUtils.acronyms())
self.assertTrue(
'Ganymede2000' if QgsProjUtils.projVersionMajor() < 6 else 'ESRI:107916' in QgsEllipsoidUtils.acronyms())

def testDefinitions(self):
defs = QgsEllipsoidUtils.definitions()

gany_id = 'Ganymede2000' if QgsProjUtils.projVersionMajor() < 6 else 'ESRI:107916'
gany_defs = [d for d in defs if d.acronym == gany_id][0]
self.assertEqual(gany_defs.acronym, gany_id)
self.assertEqual(gany_defs.description, 'Ganymede2000' if QgsProjUtils.projVersionMajor() < 6 else 'Ganymede 2000 IAU IAG (ESRI:107916)')
self.assertEqual(gany_defs.description,
'Ganymede2000' if QgsProjUtils.projVersionMajor() < 6 else 'Ganymede 2000 IAU IAG (ESRI:107916)')
self.assertTrue(gany_defs.parameters.valid)
self.assertEqual(gany_defs.parameters.semiMajor, 2632400.0 if QgsProjUtils.projVersionMajor() < 6 else 2632345.0)
self.assertEqual(gany_defs.parameters.semiMinor, 2632350.0 if QgsProjUtils.projVersionMajor() < 6 else 2632345.0)
self.assertEqual(gany_defs.parameters.inverseFlattening, 52648.0 if QgsProjUtils.projVersionMajor() < 6 else 0.0)
self.assertEqual(gany_defs.parameters.semiMajor,
2632400.0 if QgsProjUtils.projVersionMajor() < 6 else 2632345.0)
self.assertEqual(gany_defs.parameters.semiMinor,
2632350.0 if QgsProjUtils.projVersionMajor() < 6 else 2632345.0)
self.assertEqual(gany_defs.parameters.inverseFlattening,
52648.0 if QgsProjUtils.projVersionMajor() < 6 else 0.0)
self.assertFalse(gany_defs.parameters.useCustomParameters)
self.assertEqual(gany_defs.parameters.crs.authid(), '')

@unittest.skipIf(QgsProjUtils.projVersionMajor() < 6, 'Not a proj6 build')
def testMappingEllipsoidsToProj6(self):
old_qgis_ellipsoids = {'Adrastea2000': 'Adrastea2000', 'airy': 'Airy 1830', 'Amalthea2000': 'Amalthea2000',
'Ananke2000': 'Ananke2000',
'andrae': 'Andrae 1876 (Den., Iclnd.)',
'Ariel2000': 'Ariel2000',
'Atlas2000': 'Atlas2000', 'aust_SA': 'Australian Natl & S. Amer. 1969',
'Belinda2000': 'Belinda2000',
'bessel': 'Bessel 1841', 'bess_nam': 'Bessel 1841 (Namibia)', 'Bianca2000': 'Bianca2000',
'Callisto2000': 'Callisto2000', 'Calypso2000': 'Calypso2000', 'Carme2000': 'Carme2000',
'Charon2000': 'Charon2000', 'clrk66': 'Clarke 1866', 'IGNF:ELG004': 'Clarke 1866',
'IGNF:ELG003': 'Clarke 1880 Anglais', 'IGNF:ELG010': 'Clarke 1880 IGN',
'clrk80': 'Clarke 1880 mod.',
'cape': 'Clarke 1880 mod.', 'CPM': 'Comm. des Poids et Mesures 1799',
'Cordelia2000': 'Cordelia2000',
'Cressida2000': 'Cressida2000', 'Deimos2000': 'Deimos2000',
'delmbr': 'Delambre 1810 (Belgium)',
'Desdemona2000': 'Desdemona2000', 'Despina2000': 'Despina2000', 'Dione2000': 'Dione2000',
'Earth2000': 'Earth2000', 'Elara2000': 'Elara2000', 'Enceladus2000': 'Enceladus2000',
'engelis': 'Engelis 1985',
'Epimetheus2000': 'Epimetheus2000', 'Europa2000': 'Europa2000',
'evrstSS': 'Everest (Sabah & Sarawak)',
'evrst30': 'Everest 1830', 'evrst48': 'Everest 1948', 'evrst56': 'Everest 1956',
'evrst69': 'Everest 1969',
'fschr60': 'Fischer (Mercury Datum) 1960', 'fschr68': 'Fischer 1968',
'GRS80': 'GRS 1980(IUGG, 1980)',
'GRS67': 'GRS 67(IUGG 1967)', 'Galatea2000': 'Galatea2000',
'Ganymede2000': 'Ganymede2000',
'Helene2000': 'Helene2000', 'helmert': 'Helmert 1906', 'Himalia2000': 'Himalia2000',
'hough': 'Hough',
'Hyperion2000': 'Hyperion2000', 'IGNF:ELG108': 'IAG GRS 1967',
'IGNF:ELG037': 'IAG GRS 1980',
'IAU76': 'IAU 1976', 'Iapetus2000': 'Iapetus2000',
'intl': 'International 1909 (Hayford)',
'IGNF:ELG001': 'International-Hayford 1909', 'Io2000': 'Io2000',
'Janus2000': 'Janus2000',
'Juliet2000': 'Juliet2000', 'Jupiter2000': 'Jupiter2000', 'kaula': 'Kaula 1961',
'krass': 'Krassovsky, 1942',
'Larissa2000': 'Larissa2000', 'Leda2000': 'Leda2000', 'lerch': 'Lerch 1979',
'Lysithea2000': 'Lysithea2000',
'MERIT': 'MERIT 1983', 'Mars2000': 'Mars2000', 'mprts': 'Maupertius 1738',
'Mercury2000': 'Mercury2000',
'Metis2000': 'Metis2000', 'Mimas2000': 'Mimas2000', 'Miranda2000': 'Miranda2000',
'mod_airy': 'Modified Airy',
'fschr60m': 'Modified Fischer 1960', 'Moon2000': 'Moon2000', 'Naiad2000': 'Naiad2000',
'NWL9D': 'Naval Weapons Lab., 1965', 'Neptune2000': 'Neptune2000',
'Nereid2000': 'Nereid2000',
'new_intl': 'New International 1967', 'sphere': 'Normal Sphere (r=6370997)',
'Oberon2000': 'Oberon2000',
'Ophelia2000': 'Ophelia2000', 'IGNF:ELG017': 'PLESSIS 1817', 'Pan2000': 'Pan2000',
'Pandora2000': 'Pandora2000',
'Pasiphae2000': 'Pasiphae2000', 'Phobos2000': 'Phobos2000', 'Phoebe2000': 'Phoebe2000',
'plessis': 'Plessis 1817 (France)', 'Pluto2000': 'Pluto2000', 'Portia2000': 'Portia2000',
'Prometheus2000': 'Prometheus2000', 'Proteus2000': 'Proteus2000', 'Puck2000': 'Puck2000',
'Rhea2000': 'Rhea2000',
'Rosalind2000': 'Rosalind2000', 'IGNF:ELG032': 'SPHERE PICARD',
'Saturn2000': 'Saturn2000',
'Sinope2000': 'Sinope2000', 'SEasia': 'Southeast Asia',
'SGS85': 'Soviet Geodetic System 85',
'Telesto2000': 'Telesto2000', 'Tethys2000': 'Tethys2000', 'Thalassa2000': 'Thalassa2000',
'Thebe2000': 'Thebe2000', 'Titan2000': 'Titan2000', 'Titania2000': 'Titania2000',
'Triton2000': 'Triton2000',
'Umbriel2000': 'Umbriel2000', 'Uranus2000': 'Uranus2000', 'Venus2000': 'Venus2000',
'WGS60': 'WGS 60',
'WGS66': 'WGS 66', 'WGS72': 'WGS 72', 'WGS84': 'WGS 84', 'IGNF:ELG052': 'WGS72',
'IGNF:ELG102': 'WGS72 (NWL-10F)', 'IGNF:ELG053': 'WGS84', 'walbeck': 'Walbeck'}

# ensure that all old QGIS custom ellipsoid definitions map across to new PROJ6 ones
for o in old_qgis_ellipsoids:
self.assertTrue(QgsEllipsoidUtils.ellipsoidParameters(o).valid, 'no defs for {}'.format(o))


if __name__ == '__main__':
unittest.main()

0 comments on commit 8daf4ba

Please sign in to comment.