crstest.patch

Etienne Tourigny, 2012-05-29 01:59 PM

Download (2.76 KB)

View differences:

tests/src/core/testqgscoordinatereferencesystem.cpp
67 67
    QList<int> myGdalVersionOK;
68 68
    QStringList myFiles;
69 69
    QStringList myProj4Strings;
70
    QStringList myTOWGS84Strings;
70 71
    QStringList myAuthIdStrings;
71 72
    QString testESRIWkt( int i, QgsCoordinateReferenceSystem &theCrs );
72 73
};
......
164 165

  
165 166
  if ( ! myCrs.isValid() )
166 167
    return QString( "test %1 crs is invalid" );
167
  if ( myCrs.toProj4() != myProj4Strings[i] )
168
    return QString( "test %1 PROJ.4 = [ %2 ] expecting [ %3 ]"
169
                  ).arg( i ).arg( myCrs.toProj4() ).arg( myProj4Strings[i] );
168
  // if ( myCrs.toProj4() != myProj4Strings[i] )
169
  //   return QString( "test %1 PROJ.4 = [ %2 ] expecting [ %3 ]"
170
  //                 ).arg( i ).arg( myCrs.toProj4() ).arg( myProj4Strings[i] );
171
  if ( myCrs.toProj4().indexOf( myTOWGS84Strings[i] ) == -1 )
172
    return QString( "test %1 [%2] not found, PROJ.4 = [%3] expecting [%4]"
173
                  ).arg( i ).arg( myTOWGS84Strings[i] ).arg( myCrs.toProj4() ).arg( myProj4Strings[i] );
170 174
  if ( myCrs.authid() !=  myAuthIdStrings[i] )
171
    return QString( "test %1 AUTHID = [ %2 ] expecting [ %3 ]"
175
    return QString( "test %1 AUTHID = [%2] expecting [%3]"
172 176
                  ).arg( i ).arg( myCrs.authid() ).arg( myAuthIdStrings[i] );
173 177

  
174 178
  return "";
......
186 190
  myGdalVersionOK << 1800;
187 191
  myFiles << "bug5598.shp";
188 192
  myProj4Strings << "+proj=utm +zone=48 +a=6377276.345 +b=6356075.41314024 +towgs84=198,881,317,0,0,0,0 +units=m +no_defs";
193
  myTOWGS84Strings << "+towgs84=198,881,317,0,0,0,0";
189 194
  myAuthIdStrings << "EPSG:3148";
190 195

  
191 196
  // this example file taken from bug #5598 - geographic CRS only, supported since gdal 1.9
......
193 198
  myFiles << "";
194 199
  myGdalVersionOK << 1900;
195 200
  myProj4Strings << "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs84=198,881,317,0,0,0,0 +no_defs";
201
  myTOWGS84Strings << "+towgs84=198,881,317,0,0,0,y0";
196 202
  myAuthIdStrings << "EPSG:4131";
197 203

  
198 204
  // SAD69 geographic CRS, supported since gdal 1.9
......
200 206
  myFiles << "";
201 207
  myGdalVersionOK << 1900;
202 208
  myProj4Strings << "+proj=longlat +ellps=aust_SA +towgs84=-57,1,-41,0,0,0,0 +no_defs";
209
  myTOWGS84Strings << "+towgs84=-57,1,-41,0,0,0,0";
203 210
  myAuthIdStrings << "EPSG:4618";
204 211

  
205 212
  // do test with WKT definitions