[GRASS-SVN] r65684 - in grass/trunk: raster/r.external raster/r.in.gdal raster/r.in.lidar scripts/r.unpack scripts/v.unpack vector/v.in.lidar vector/v.in.ogr
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jul 20 03:04:36 PDT 2015
Author: annakrat
Date: 2015-07-20 03:04:36 -0700 (Mon, 20 Jul 2015)
New Revision: 65684
Modified:
grass/trunk/raster/r.external/proj.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.in.lidar/main.c
grass/trunk/scripts/r.unpack/r.unpack.py
grass/trunk/scripts/v.unpack/v.unpack.py
grass/trunk/vector/v.in.lidar/main.c
grass/trunk/vector/v.in.ogr/main.c
Log:
improve override projection message
Modified: grass/trunk/raster/r.external/proj.c
===================================================================
--- grass/trunk/raster/r.external/proj.c 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/raster/r.external/proj.c 2015-07-20 10:04:36 UTC (rev 65684)
@@ -104,8 +104,9 @@
cellhd->proj, cellhd->zone);
}
strcat(error_msg,
- _("\nYou can use the -o flag to r.external to override this check and "
- "use the location definition for the dataset.\n"));
+ _("\nIn case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition.\n"));
strcat(error_msg,
_("Consider generating a new location from the input dataset using "
"the 'location' parameter.\n"));
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/raster/r.in.gdal/main.c 2015-07-20 10:04:36 UTC (rev 65684)
@@ -502,8 +502,9 @@
cellhd.proj, cellhd.zone);
}
strcat(error_msg,
- _("\nYou can use the -o flag to r.in.gdal to override this check and "
- "use the location definition for the dataset.\n"));
+ _("\nIn case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition.\n"));
strcat(error_msg,
_("Consider generating a new location from the input dataset using "
"the 'location' parameter.\n"));
Modified: grass/trunk/raster/r.in.lidar/main.c
===================================================================
--- grass/trunk/raster/r.in.lidar/main.c 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/raster/r.in.lidar/main.c 2015-07-20 10:04:36 UTC (rev 65684)
@@ -445,8 +445,9 @@
}
}
sprintf(error_msg + strlen(error_msg),
- _("\nYou can use the -o flag to %s to override this projection check.\n"),
- G_program_name());
+ _("\nIn case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition.\n"));
strcat(error_msg,
_("Consider generating a new location with 'location' parameter"
" from input data set.\n"));
Modified: grass/trunk/scripts/r.unpack/r.unpack.py
===================================================================
--- grass/trunk/scripts/r.unpack/r.unpack.py 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/scripts/r.unpack/r.unpack.py 2015-07-20 10:04:36 UTC (rev 65684)
@@ -128,7 +128,10 @@
if diff_result_2:
grass.warning(_("Difference between PROJ_UNITS file of packed map "
"and of current location:\n{diff}").format(diff=''.join(diff_result_2)))
- grass.fatal(_("Projection information does not match. Aborting."))
+ grass.fatal(_("Projection of dataset does not appear to match current location."
+ " In case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition."))
# install in $MAPSET
for element in ['cats', 'cell', 'cellhd', 'cell_misc', 'colr', 'fcell', 'hist']:
Modified: grass/trunk/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/trunk/scripts/v.unpack/v.unpack.py 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/scripts/v.unpack/v.unpack.py 2015-07-20 10:04:36 UTC (rev 65684)
@@ -131,7 +131,10 @@
if diff_result_2:
grass.warning(_("Difference between PROJ_UNITS file of packed map "
"and of current location:\n{diff}").format(diff=''.join(diff_result_2)))
- grass.fatal(_("Projection information does not match. Aborting."))
+ grass.fatal(_("Projection of dataset does not appear to match current location."
+ " In case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition."))
# new db
fromdb = os.path.join(tmp_dir, 'db.sqlite')
Modified: grass/trunk/vector/v.in.lidar/main.c
===================================================================
--- grass/trunk/vector/v.in.lidar/main.c 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/vector/v.in.lidar/main.c 2015-07-20 10:04:36 UTC (rev 65684)
@@ -465,7 +465,9 @@
}
}
sprintf(error_msg + strlen(error_msg),
- _("\nYou can use the -o flag to %s to override this projection check.\n"),
+ _("\nIn case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition.\n"),
G_program_name());
strcat(error_msg,
_("Consider generating a new location with 'location' parameter"
Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c 2015-07-20 10:04:18 UTC (rev 65683)
+++ grass/trunk/vector/v.in.ogr/main.c 2015-07-20 10:04:36 UTC (rev 65684)
@@ -693,7 +693,9 @@
}
}
sprintf(error_msg + strlen(error_msg),
- _("\nYou can use the -o flag to %s to override this projection check.\n"),
+ _("\nIn case of no significant differences in the projection definitions,"
+ " use the -o flag to ignore them and use"
+ " current location definition.\n"),
G_program_name());
strcat(error_msg,
_("Consider generating a new location with 'location' parameter"
More information about the grass-commit
mailing list