Skip to content

Commit a935717

Browse files
authored
doc: Use GeoTIFF consistently (#8296)
1 parent 1a8fd95 commit a935717

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

doc/examples/ex52/ex52.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gmt begin ex52
1515
# We will create an intensity grid based on a pixel-registered DEM so that we can see structures in the oceans
1616
gmt grdgradient @earth_relief_${res}_p -Nt0.5 -A45 -Gintens.grd
1717

18-
# Blend the earth_day and earth_night geotiffs using the weights, so that when w is 1
18+
# Blend the earth_day and earth_night GeoTIFFs using the weights, so that when w is 1
1919
# we get the earth_day, and then adjust colors based on the intensity.
2020

2121
gmt grdmix @earth_day_${res} @earth_night_${res} -Ww.grd -Iintens.grd -Gview.tif

doc/rst/source/changes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ Enhancements in GMT 6.3
244244
* Allow trailing comments in custom symbol files (`#5610 <https://github.com/GenericMappingTools/gmt/pull/5610>`_)
245245
* Let -d set starting column via modifier (`#5966 <https://github.com/GenericMappingTools/gmt/pull/5966>`_)
246246
* Let -f\ *col* explicitly set start of input trailing text (`#5370 <https://github.com/GenericMappingTools/gmt/pull/5370>`_)
247-
* Let multi-layer geotiff files be cut via *gdal_translate* (`#5819 <https://github.com/GenericMappingTools/gmt/pull/5819>`_)
247+
* Let multi-layer GeoTIFF files be cut via *gdal_translate* (`#5819 <https://github.com/GenericMappingTools/gmt/pull/5819>`_)
248248

249249
Documentation updates in GMT 6.3
250250
--------------------------------

doc/rst/source/gallery/ex52.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
This example highlights how GMT can be used to manipulate images
77
in conjunction with grids, using :doc:`grdmix </grdmix>` (as well
8-
as :doc:`grdmath </grdmath>`). We start with two geotiff images for the
8+
as :doc:`grdmath </grdmath>`). We start with two GeoTIFF images for the
99
day (@earth_day) and night (@earth_night) Earth views and compute
1010
a day/night smoothed grid to reflect the state on June 22, 2000
1111
at midnight in Hawaii. The day/night grid is used to blend between

doc/rst/source/grdcut.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ its bounding box for sub-region or set grid nodes inside or outside the polygon
4444
to NaN. Finally, if the input is a 3-D netCDF cube then you can make a vertical
4545
slice through existing nodes. **Note**: If the input grid is actually an image (gray-scale,
4646
RGB, or RGBA), then options |-N| and |-Z| are unavailable, while for multi-layer
47-
Geotiff files only options |-R|, |-S| and |-G| are supported, i.e., you can cut out
47+
GeoTIFF files only options |-R|, |-S| and |-G| are supported, i.e., you can cut out
4848
a sub-region only (which we do via *gdal_translate* if you have multiple bands).
4949
Complementary to **grdcut** there is :doc:`grdpaste`, which will join together
5050
two grid files (not images) along a common edge.
@@ -203,16 +203,16 @@ from the 3-D model seis3D.nc, try::
203203
Notes
204204
-----
205205

206-
If the input file is a geotiff with multiple data bands then the output format will
206+
If the input file is a GeoTIFF with multiple data bands then the output format will
207207
depend on your selection (if any) of the bands to keep: If you do not specify
208208
any bands (which means we consider all the available bands) or you select more
209-
than one band, then the output file can either be another geotiff (if you give
209+
than one band, then the output file can either be another GeoTIFF (if you give
210210
a .tif[f] extension) or it can be a multiband netCDF file (if you give a .nc or .grd
211-
extension). If you select a single band from the input geotiff then GMT will
211+
extension). If you select a single band from the input GeoTIFF then GMT will
212212
normally read that in as a single grid layer and thus write a netCDF grid (unless
213213
you append another grid format specifier). However, if your output filename has
214-
a .tif[f] extension then we will instead write it as a one-band geotiff.
215-
All geotiff output operations are done via GDAL's *gdal_translate*.
214+
a .tif[f] extension then we will instead write it as a one-band GeoTIFF.
215+
All GeoTIFF output operations are done via GDAL's *gdal_translate*.
216216

217217
See Also
218218
--------

doc/rst/source/grdimage.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Optional Arguments
9797
documentation for available drivers. Append a **+c**\ *options* string where *options* is a list of
9898
one or more concatenated number of GDAL **-co** options. For example, to write a GeoPDF with the
9999
TerraGo format use *=PDF+cGEO_ENCODING=OGC_BP*. Notes: (1) If a tiff file (.tif) is selected
100-
then we will write a GeoTiff image if the GMT projection syntax translates into a PROJ syntax,
100+
then we will write a GeoTIFF image if the GMT projection syntax translates into a PROJ syntax,
101101
otherwise a plain tiff file is produced. (2) Any vector elements will be lost. **Note**: The **-B**
102102
option is not compatible with |-A| since no PostScript output is allowed.
103103

@@ -113,7 +113,7 @@ Optional Arguments
113113
.. _-D:
114114

115115
**-D**\ [**r**]
116-
GMT will automatically detect standard image files (Geotiff, TIFF,
116+
GMT will automatically detect standard image files (GeoTIFF, TIFF,
117117
JPG, PNG, GIF, etc.) and will read those via GDAL. For very
118118
obscure image formats you may need to explicitly set |-D|, which
119119
specifies that the grid is in fact an image file to be read via
@@ -291,7 +291,7 @@ Image formats recognized
291291
------------------------
292292

293293
We automatically recognize image formats via their magic bytes. For formats
294-
that could contain either an image or a data set (e.g., geotiff) we determine
294+
that could contain either an image or a data set (e.g., GeoTIFF) we determine
295295
which case it is and act accordingly. If your favorite image format is not
296296
automatically detected then please let us know its magic bytes so we can add it.
297297

doc/rst/source/grdmath.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ where we store and recall the normalized radial arguments in radians by::
642642

643643
gmt grdmath -R0/10/0/10 -I0.25 5 5 CDIST 2 MUL PI MUL 5 DIV STO@r COS @r SIN MUL = wave.nc
644644

645-
To create a dumb file saved as a 32 bits float GeoTiff using GDAL, run::
645+
To create a dumb file saved as a 32 bits float GeoTIFF using GDAL, run::
646646

647647
gmt grdmath -Rd -I10 X Y MUL = lixo.tiff=gd:GTiff
648648

@@ -656,7 +656,7 @@ per node of all the grids matching the name model_*.grd using::
656656

657657
gmt grdmath model_*.grd -S STD = std_of_models.grd
658658

659-
To create a geotiff with resolution 0.5x0.5 degrees with distances in km from the coast line, use::
659+
To create a GeoTIFF with resolution 0.5x0.5 degrees with distances in km from the coast line, use::
660660

661661
gmt grdmath -RNO,IS -Dc -I.5 LDISTG = distance.tif=gd:GTIFF
662662

doc/rst/source/psconvert.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ size of the resulting images is determined by the BoundingBox (or
4444
HiResBoundingBox, if present). As an option, a tight (HiRes)BoundingBox
4545
may be computed first. As another option, it can compute ESRI type world
4646
files used to reference, for instance, tif files and make them be
47-
recognized as geotiff. **Note**: If the PostScript file calls on any of
47+
recognized as GeoTIFF. **Note**: If the PostScript file calls on any of
4848
the Adobe PDF transparency extensions *and* PDF is not the selected output
4949
format, then the file will first be converted to a temporary PDF file
5050
(for the transparency to take effect) before converting the PDF to the
@@ -219,7 +219,7 @@ Optional Arguments
219219

220220
**-W**\ [**+a**\ *altmode*\ [*alt*]][**+c**][**+f**\ *minfade/maxfade*][**+g**][**+k**][**+l**\ *minLOD/maxLOD*][**+n**\ *layername*][**+o**\ *foldername*][**+t**\ *docname*][**+u**\ *URL*]
221221
Write an ESRI type world file suitable to make .tif files be
222-
recognized as geotiff by software that know how to do it. Be aware,
222+
recognized as GeoTIFF by software that know how to do it. Be aware,
223223
however, that different results are obtained depending on the image
224224
contents and if the |-B| option has been used or not. The trouble
225225
with the |-B| option is that it creates a frame and very likely
@@ -236,8 +236,8 @@ Optional Arguments
236236
Together with |-V| it prints on screen the *gdal_translate*
237237
(*gdal_translate* is a command line tool from the `GDAL package <https://gdal.org/>`_)
238238
command that reads the raster + world file and creates a true
239-
geotiff file. Append **+g** to do a system call to *gdal_translate*
240-
and create a geoTIFF image right away. The output file will have a
239+
GeoTIFF file. Append **+g** to do a system call to *gdal_translate*
240+
and create a GeoTIFF image right away. The output file will have a
241241
.tiff extension.
242242

243243
The world file naming follows the convention of jamming a 'w' in the
@@ -277,7 +277,7 @@ Optional Arguments
277277

278278
Further notes on the creation of georeferenced rasters.
279279
**psconvert** can create a georeferenced raster image with a world
280-
file OR uses GDAL to convert the GMT PostScript file to geotiff.
280+
file OR uses GDAL to convert the GMT PostScript file to GeoTIFF.
281281
GDAL uses `PROJ <https://proj.org/>`_ for its projection library. To provide with the
282282
information it needs to do the georeferencing, GMT embeds a
283283
comment near the start of the PostScript file defining the
@@ -387,12 +387,12 @@ To create a simple linear map with :doc:`coast` and convert it to tif with a
387387
gmt psconvert cara.ps -Tt -W
388388

389389
To create a Mercator version of the above example and use GDAL to
390-
produce a true geotiff file::
390+
produce a true GeoTIFF file::
391391

392392
gmt coast -JM0/12c -R-10/-4/37/43 -W1 -Di -Bg30m -G200 --MAP_FRAME_TYPE=inside -ps cara
393393
gdalwarp -s_srs +proj=merc cara.tif carageo.tiff
394394

395-
To create a Polar Stereographic geotiff file of Patagonia::
395+
To create a Polar Stereographic GeoTIFF file of Patagonia::
396396

397397
gmt coast -JS-55/-60/15c -R-77/-55/-57.5/-48+r -Di -Gred -Bg2 --MAP_FRAME_TYPE=inside -ps patagonia
398398
gmt psconvert patagonia.ps -Tt -W+g -V

0 commit comments

Comments
 (0)