r.in.gdal: rename option location to project #3575
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -131,14 +131,14 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, | |||||
| /* do not create a xy location if an existing SRS was unreadable */ | ||||||
| if (proj_trouble == 2) { | ||||||
| G_fatal_error(_("Unable to convert input map projection to GRASS " | ||||||
| "format; cannot create new project.")); | ||||||
| } | ||||||
| else { | ||||||
| if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, | ||||||
| srid, wkt)) { | ||||||
| G_fatal_error(_("Unable to create new project <%s>"), outloc); | ||||||
| } | ||||||
| G_message(_("Project <%s> created"), outloc); | ||||||
|
|
||||||
| G_unset_window(); /* new location, projection, and window */ | ||||||
| G_get_window(cellhd); | ||||||
|
|
@@ -197,13 +197,13 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, | |||||
| int i_value; | ||||||
|
|
||||||
| strcpy(error_msg, _("Projection of dataset does not" | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| " appear to match current project.\n\n")); | ||||||
|
|
||||||
| /* TODO: output this info sorted by key: */ | ||||||
| if (loc_wind.proj != cellhd->proj || err != -2) { | ||||||
| /* error in proj_info */ | ||||||
| if (loc_proj_info != NULL) { | ||||||
| strcat(error_msg, _("Project PROJ_INFO is:\n")); | ||||||
| for (i_value = 0; i_value < loc_proj_info->nitems; | ||||||
| i_value++) | ||||||
| sprintf(error_msg + strlen(error_msg), "%s: %s\n", | ||||||
|
|
@@ -212,22 +212,22 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, | |||||
| strcat(error_msg, "\n"); | ||||||
| } | ||||||
| else { | ||||||
| strcat(error_msg, _("Project PROJ_INFO is:\n")); | ||||||
| if (loc_wind.proj == PROJECTION_XY) | ||||||
| sprintf(error_msg + strlen(error_msg), | ||||||
| "Project proj = %d (unreferenced/unknown)\n", | ||||||
| loc_wind.proj); | ||||||
| else if (loc_wind.proj == PROJECTION_LL) | ||||||
| sprintf(error_msg + strlen(error_msg), | ||||||
| "Project proj = %d (lat/long)\n", | ||||||
| loc_wind.proj); | ||||||
| else if (loc_wind.proj == PROJECTION_UTM) | ||||||
| sprintf(error_msg + strlen(error_msg), | ||||||
| "Project proj = %d (UTM), zone = %d\n", | ||||||
| loc_wind.proj, cellhd->zone); | ||||||
| else | ||||||
| sprintf(error_msg + strlen(error_msg), | ||||||
| "Project proj = %d (unknown), zone = %d\n", | ||||||
| loc_wind.proj, cellhd->zone); | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -301,7 +301,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, | |||||
| else { | ||||||
| /* error in proj_units */ | ||||||
| if (loc_proj_units != NULL) { | ||||||
| strcat(error_msg, "Project PROJ_UNITS is:\n"); | ||||||
| for (i_value = 0; i_value < loc_proj_units->nitems; | ||||||
| i_value++) | ||||||
| sprintf(error_msg + strlen(error_msg), "%s: %s\n", | ||||||
|
|
@@ -322,10 +322,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, | |||||
| strcat(error_msg, _("\nIn case of no significant differences " | ||||||
| "in the projection definitions," | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| " use the -o flag to ignore them and use" | ||||||
| " current project definition.\n")); | ||||||
| strcat(error_msg, _("Consider generating a new location from " | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| "the input dataset using " | ||||||
| "the 'project' parameter.\n")); | ||||||
| } | ||||||
|
|
||||||
| if (check_only) | ||||||
|
|
@@ -343,7 +343,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, | |||||
| msg_fn = G_message; | ||||||
| else | ||||||
| msg_fn = G_verbose_message; | ||||||
| msg_fn(_("Projection of input dataset and current project " | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| "appear to match")); | ||||||
| if (check_only) { | ||||||
| GDALClose(hDS); | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -144,7 +144,7 @@ <h3>Location Creation</h3> | |
| If the user wishes to import the data with the full projection definition, | ||
| it is possible to have r.in.gdal automatically create a new location based | ||
| on the projection and extents of the file being read. This is accomplished | ||
| by passing the name to be used for the new location via the <b>project</b> | ||
| parameter. Upon completion of the command, a new location will have been | ||
| created (with only a PERMANENT mapset), and the raster will have been | ||
| imported with the indicated <b>output</b> name into the PERMANENT mapset. | ||
|
|
@@ -263,7 +263,7 @@ <h3>Error Messages</h3> | |
| <i>"ERROR: Projection of dataset does not appear to match the current location."</i><br> | ||
|
|
||
| You need to create a location whose projection matches the data you | ||
| wish to import. Try using <b>project</b> parameter to create a new | ||
| location based upon the projection information in the file. If desired, | ||
| you can then re-project it to another location with <em>r.proj</em>. | ||
| Alternatively you can override this error by using the <b>-o</b> flag. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -106,8 +106,8 @@ | |||||||||
| # %end | ||||||||||
| # %flag | ||||||||||
| # % key: o | ||||||||||
| # % label: Override projection check (use current project's projection) | ||||||||||
| # % description: Assume that the dataset has the same projection as the current project | ||||||||||
|
Comment on lines
+109
to
+110
There was a problem hiding this comment.
Suggested change
|
||||||||||
| # %end | ||||||||||
| # %rules | ||||||||||
| # % required: output,-e | ||||||||||
|
|
@@ -215,7 +215,7 @@ def main(): | |||||||||
| # make sure target is not xy | ||||||||||
| if grass.parse_command("g.proj", flags="g")["name"] == "xy_location_unprojected": | ||||||||||
| grass.fatal( | ||||||||||
| _("Coordinate reference system not available for current project <%s>") | ||||||||||
| % tgtloc | ||||||||||
| ) | ||||||||||
|
|
||||||||||
|
|
@@ -228,7 +228,7 @@ def main(): | |||||||||
| SRCGISRC, src_env = grass.create_environment(GISDBASE, TMPLOC, "PERMANENT") | ||||||||||
|
|
||||||||||
| # create temp location from input without import | ||||||||||
| grass.verbose(_("Creating temporary project for <%s>...") % GDALdatasource) | ||||||||||
| # creating a new location with r.in.gdal requires a sanitized env | ||||||||||
| env = os.environ.copy() | ||||||||||
| env = grass.sanitize_mapset_environment(env) | ||||||||||
|
|
@@ -238,7 +238,7 @@ def main(): | |||||||||
| memory=memory, | ||||||||||
| flags="c", | ||||||||||
| title=title, | ||||||||||
| project=TMPLOC, | ||||||||||
| quiet=True, | ||||||||||
| ) | ||||||||||
| if bands: | ||||||||||
|
|
@@ -271,7 +271,7 @@ def main(): | |||||||||
| ) | ||||||||||
|
|
||||||||||
| # import into temp location | ||||||||||
| grass.verbose(_("Importing <%s> to temporary project...") % GDALdatasource) | ||||||||||
| parameters = dict( | ||||||||||
| input=GDALdatasource, | ||||||||||
| output=output, | ||||||||||
|
|
@@ -387,7 +387,7 @@ def main(): | |||||||||
| if grass.vector_info_topo(vreg, env=src_env)["areas"] != 1: | ||||||||||
| grass.fatal(_("Please check the 'extent' parameter")) | ||||||||||
| except CalledModuleError: | ||||||||||
| grass.fatal(_("Unable to reproject to source project")) | ||||||||||
|
|
||||||||||
| # set region from region vector | ||||||||||
| grass.run_command("g.region", raster=outfile, env=src_env) | ||||||||||
|
|
||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.