From c1905c215ca45eef7d301f0e641525311f2baa49 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 16 Jul 2024 07:18:58 +1000 Subject: [PATCH] Revert "[grass] Use better approach to retrieve CRS information for mapsets" This reverts commit 40e97102e00ea4584b7c0b5dd661c2e183c83eae. --- src/providers/grass/qgis.g.info.c | 27 +----------- src/providers/grass/qgsgrass.cpp | 41 ++---------------- .../grass/webmerc/PERMANENT/DEFAULT_WIND | 18 -------- .../grass/webmerc/PERMANENT/PROJ_INFO | 12 ----- .../grass/webmerc/PERMANENT/PROJ_SRID | 1 - .../grass/webmerc/PERMANENT/PROJ_UNITS | 3 -- .../testdata/grass/webmerc/PERMANENT/PROJ_WKT | 1 - tests/testdata/grass/webmerc/PERMANENT/WIND | 18 -------- tests/testdata/grass/webmerc/webmerc/WIND | 18 -------- .../grass/webmerc/webmerc/vector/ff/coor | Bin 47 -> 0 bytes .../grass/webmerc/webmerc/vector/ff/dbln | 0 .../grass/webmerc/webmerc/vector/ff/head | 10 ----- .../grass/webmerc/webmerc/vector/ff/hist | 4 -- 13 files changed, 5 insertions(+), 148 deletions(-) delete mode 100644 tests/testdata/grass/webmerc/PERMANENT/DEFAULT_WIND delete mode 100644 tests/testdata/grass/webmerc/PERMANENT/PROJ_INFO delete mode 100644 tests/testdata/grass/webmerc/PERMANENT/PROJ_SRID delete mode 100644 tests/testdata/grass/webmerc/PERMANENT/PROJ_UNITS delete mode 100644 tests/testdata/grass/webmerc/PERMANENT/PROJ_WKT delete mode 100644 tests/testdata/grass/webmerc/PERMANENT/WIND delete mode 100644 tests/testdata/grass/webmerc/webmerc/WIND delete mode 100644 tests/testdata/grass/webmerc/webmerc/vector/ff/coor delete mode 100644 tests/testdata/grass/webmerc/webmerc/vector/ff/dbln delete mode 100644 tests/testdata/grass/webmerc/webmerc/vector/ff/head delete mode 100644 tests/testdata/grass/webmerc/webmerc/vector/ff/hist diff --git a/src/providers/grass/qgis.g.info.c b/src/providers/grass/qgis.g.info.c index a73570a393b4..462bed9067ad 100644 --- a/src/providers/grass/qgis.g.info.c +++ b/src/providers/grass/qgis.g.info.c @@ -53,7 +53,7 @@ int main( int argc, char **argv ) info_opt->key = "info"; info_opt->type = TYPE_STRING; info_opt->description = "info key"; - info_opt->options = "proj,wkt,srid,window,size,query,info,colors,stats"; + info_opt->options = "proj,window,size,query,info,colors,stats"; rast_opt = G_define_standard_option( G_OPT_R_INPUT ); rast_opt->key = "rast"; @@ -107,6 +107,7 @@ int main( int argc, char **argv ) if ( strcmp( "proj", info_opt->answer ) == 0 ) { G_get_window( &window ); + /* code from g.proj */ if ( window.proj != PROJECTION_XY ) { struct Key_Value *projinfo, *projunits; @@ -117,30 +118,6 @@ int main( int argc, char **argv ) fprintf( stdout, "%s", wkt ); } } - else if ( strcmp( "wkt", info_opt->answer ) == 0 ) - { - G_get_window( &window ); - if ( window.proj != PROJECTION_XY ) - { - char *wkt = G_get_projwkt(); - if ( wkt ) - { - fprintf( stdout, "%s", wkt ); - } - } - } - else if ( strcmp( "srid", info_opt->answer ) == 0 ) - { - G_get_window( &window ); - if ( window.proj != PROJECTION_XY ) - { - char *srid = G_get_projsrid(); - if ( srid ) - { - fprintf( stdout, "%s", srid ); - } - } - } else if ( strcmp( "window", info_opt->answer ) == 0 ) { if ( rast_opt->answer ) diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp index a3cf5fd9d632..079cd10d2231 100644 --- a/src/providers/grass/qgsgrass.cpp +++ b/src/providers/grass/qgsgrass.cpp @@ -2068,48 +2068,13 @@ QgsCoordinateReferenceSystem QgsGrass::crs( const QString &gisdbase, const QStri QString &error ) { QgsDebugMsgLevel( QStringLiteral( "gisdbase = %1 location = %2" ).arg( gisdbase, location ), 2 ); - QgsCoordinateReferenceSystem crs; - - // try getting SRID directly first - try - { - const QString srid = getInfo( QStringLiteral( "srid" ), gisdbase, location ); - QgsDebugMsgLevel( QStringLiteral( "srid: %1" ).arg( srid ), 2 ); - crs = QgsCoordinateReferenceSystem( srid ); - if ( crs.isValid() ) - return crs; - } - catch ( QgsGrass::Exception &e ) - { - error = tr( "Cannot get SRID" ) + "\n" + e.what(); - QgsDebugError( error ); - } - - // else try WKT + QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem(); try { - const QString wkt = getInfo( QStringLiteral( "wkt" ), gisdbase, location ); - QgsDebugMsgLevel( QStringLiteral( "wkt: %1" ).arg( wkt ), 2 ); + QString wkt = getInfo( QStringLiteral( "proj" ), gisdbase, location ); + QgsDebugMsgLevel( "wkt: " + wkt, 2 ); crs = QgsCoordinateReferenceSystem::fromWkt( wkt ); QgsDebugMsgLevel( "crs.toWkt: " + crs.toWkt(), 2 ); - if ( crs.isValid() ) - return crs; - } - catch ( QgsGrass::Exception &e ) - { - error = tr( "Cannot get projection" ) + "\n" + e.what(); - QgsDebugError( error ); - } - - //else try lossy old proj properties approach - try - { - const QString wktFromProjString = getInfo( QStringLiteral( "proj" ), gisdbase, location ); - QgsDebugMsgLevel( QStringLiteral( "WKT from proj string: %1" ).arg( wktFromProjString ), 2 ); - crs = QgsCoordinateReferenceSystem::fromWkt( wktFromProjString ); - QgsDebugMsgLevel( "crs.toWkt: " + crs.toWkt(), 2 ); - if ( crs.isValid() ) - return crs; } catch ( QgsGrass::Exception &e ) { diff --git a/tests/testdata/grass/webmerc/PERMANENT/DEFAULT_WIND b/tests/testdata/grass/webmerc/PERMANENT/DEFAULT_WIND deleted file mode 100644 index 88faf91ab3f1..000000000000 --- a/tests/testdata/grass/webmerc/PERMANENT/DEFAULT_WIND +++ /dev/null @@ -1,18 +0,0 @@ -proj: 99 -zone: 0 -north: 20048966.104 -south: -20048966.104 -east: 20037508.3428 -west: -20037508.3428 -cols: 1000 -rows: 1000 -e-w resol: 40075.0166856 -n-s resol: 40075.0166856 -top: 1.000000000000000 -bottom: 0.000000000000000 -cols3: 10000 -rows3: 10005 -depths: 1 -e-w resol3: 4007.50166856 -n-s resol3: 4007.50166856 -t-b resol: 1 diff --git a/tests/testdata/grass/webmerc/PERMANENT/PROJ_INFO b/tests/testdata/grass/webmerc/PERMANENT/PROJ_INFO deleted file mode 100644 index 5ab7ea71fa47..000000000000 --- a/tests/testdata/grass/webmerc/PERMANENT/PROJ_INFO +++ /dev/null @@ -1,12 +0,0 @@ -name: WGS 84 / Pseudo-Mercator -a: 6378137 -es: 0 -proj: merc -lat_ts: 0 -lon_0: 0 -x_0: 0 -y_0: 0 -k: 1 -nadgrids: @null -wktext: defined -no_defs: defined diff --git a/tests/testdata/grass/webmerc/PERMANENT/PROJ_SRID b/tests/testdata/grass/webmerc/PERMANENT/PROJ_SRID deleted file mode 100644 index f44fca47398a..000000000000 --- a/tests/testdata/grass/webmerc/PERMANENT/PROJ_SRID +++ /dev/null @@ -1 +0,0 @@ -EPSG:3857 diff --git a/tests/testdata/grass/webmerc/PERMANENT/PROJ_UNITS b/tests/testdata/grass/webmerc/PERMANENT/PROJ_UNITS deleted file mode 100644 index 28243d2cf275..000000000000 --- a/tests/testdata/grass/webmerc/PERMANENT/PROJ_UNITS +++ /dev/null @@ -1,3 +0,0 @@ -unit: meter -units: meters -meters: 1 diff --git a/tests/testdata/grass/webmerc/PERMANENT/PROJ_WKT b/tests/testdata/grass/webmerc/PERMANENT/PROJ_WKT deleted file mode 100644 index 56bed5ca76b0..000000000000 --- a/tests/testdata/grass/webmerc/PERMANENT/PROJ_WKT +++ /dev/null @@ -1 +0,0 @@ -PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] diff --git a/tests/testdata/grass/webmerc/PERMANENT/WIND b/tests/testdata/grass/webmerc/PERMANENT/WIND deleted file mode 100644 index 88faf91ab3f1..000000000000 --- a/tests/testdata/grass/webmerc/PERMANENT/WIND +++ /dev/null @@ -1,18 +0,0 @@ -proj: 99 -zone: 0 -north: 20048966.104 -south: -20048966.104 -east: 20037508.3428 -west: -20037508.3428 -cols: 1000 -rows: 1000 -e-w resol: 40075.0166856 -n-s resol: 40075.0166856 -top: 1.000000000000000 -bottom: 0.000000000000000 -cols3: 10000 -rows3: 10005 -depths: 1 -e-w resol3: 4007.50166856 -n-s resol3: 4007.50166856 -t-b resol: 1 diff --git a/tests/testdata/grass/webmerc/webmerc/WIND b/tests/testdata/grass/webmerc/webmerc/WIND deleted file mode 100644 index 88faf91ab3f1..000000000000 --- a/tests/testdata/grass/webmerc/webmerc/WIND +++ /dev/null @@ -1,18 +0,0 @@ -proj: 99 -zone: 0 -north: 20048966.104 -south: -20048966.104 -east: 20037508.3428 -west: -20037508.3428 -cols: 1000 -rows: 1000 -e-w resol: 40075.0166856 -n-s resol: 40075.0166856 -top: 1.000000000000000 -bottom: 0.000000000000000 -cols3: 10000 -rows3: 10005 -depths: 1 -e-w resol3: 4007.50166856 -n-s resol3: 4007.50166856 -t-b resol: 1 diff --git a/tests/testdata/grass/webmerc/webmerc/vector/ff/coor b/tests/testdata/grass/webmerc/webmerc/vector/ff/coor deleted file mode 100644 index 0f70f641183063f8917cf3b3dd33b14a91bf414e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 pcmZQ&WMyO!VgLdV0m5vIKmvwm6&%eHp77>C#k)1P!>cbj003Fh38er4 diff --git a/tests/testdata/grass/webmerc/webmerc/vector/ff/dbln b/tests/testdata/grass/webmerc/webmerc/vector/ff/dbln deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testdata/grass/webmerc/webmerc/vector/ff/head b/tests/testdata/grass/webmerc/webmerc/vector/ff/head deleted file mode 100644 index bb255d6ee696..000000000000 --- a/tests/testdata/grass/webmerc/webmerc/vector/ff/head +++ /dev/null @@ -1,10 +0,0 @@ -ORGANIZATION: -DIGIT DATE: -DIGIT NAME: nyall -MAP NAME: -MAP DATE: Thu Jul 11 11:54:19 2024 -MAP SCALE: 1 -OTHER INFO: -PROJ: 99 -ZONE: 0 -MAP THRESH: 0.000000 diff --git a/tests/testdata/grass/webmerc/webmerc/vector/ff/hist b/tests/testdata/grass/webmerc/webmerc/vector/ff/hist deleted file mode 100644 index 6af280dcd049..000000000000 --- a/tests/testdata/grass/webmerc/webmerc/vector/ff/hist +++ /dev/null @@ -1,4 +0,0 @@ ---------------------------------------------------------------------------------- -COMMAND: QGIS --quiet -GISDBASE: /home/nyall/grassdata -LOCATION: webmerc MAPSET: webmerc USER: nyall DATE: Thu Jul 11 11:54:19 2024