From 8b428fb7a39608bb3dd134aa60b3947b7634fd89 Mon Sep 17 00:00:00 2001 From: Vaclav Petras Date: Tue, 15 Aug 2023 21:24:21 -0400 Subject: [PATCH] lib/parser: Use project for G_OPT_M_LOCATION Standard option G_OPT_M_LOCATION which creates option named location now creates option named location. Each module using G_OPT_M_LOCATION without further modifications has its own entry in in the renamed options file for backwards compatibility. --- lib/gis/parser_standard_options.c | 6 +++--- lib/gis/renamed_options | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/gis/parser_standard_options.c b/lib/gis/parser_standard_options.c index 8edf3e5d78c..87182e2ec72 100644 --- a/lib/gis/parser_standard_options.c +++ b/lib/gis/parser_standard_options.c @@ -694,12 +694,12 @@ struct Option *G_define_standard_option(int opt) break; case G_OPT_M_LOCATION: - Opt->key = "location"; + Opt->key = "project"; Opt->type = TYPE_STRING; Opt->required = NO; Opt->multiple = NO; - Opt->label = _("Location name"); - Opt->description = _("Location name (not location path)"); + Opt->label = _("Project (location) name"); + Opt->description = _("Project name (not path to project)"); Opt->gisprompt = "old,location,location"; Opt->key_desc = "name"; break; diff --git a/lib/gis/renamed_options b/lib/gis/renamed_options index 686f45e879a..61062f74c5f 100644 --- a/lib/gis/renamed_options +++ b/lib/gis/renamed_options @@ -718,3 +718,10 @@ v.what.vect|qvector:query_map v.what.vect|qlayer:query_layer v.what.vect|qcolumn:query_column v.what.vect|vector:map +### Renamed options for location to project rename (8.3->8.4) +############################################################# +g.mapset|location:project +r.proj|location:project +i.ortho.elev|location:project +g.download.location|location:project +v.proj|location:project