Skip to content

Commit

Permalink
r.horizon manual - fix typo (OSGeo#2794)
Browse files Browse the repository at this point in the history
  • Loading branch information
@a0x8o
a0x8o committed Jan 31, 2023
1 parent 6104ec7 commit f130b43
Show file tree
Hide file tree
Showing 1,386 changed files with 19,634 additions and 8,768 deletions.
38 changes: 19 additions & 19 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ DOCUMENTATION

GUI
- Radim Blazek <blazek itc it>: primary author of d.m and v.digit
- Michael Barton <michael.barton asu edu>: tcltkgrass menu system
- Michael Barton <michael.barton asu edu>: tcltkgrass menu system
partial rewrite and integration into d.m
- Multibyte FreeType Font Support: www.FOSS4G.org team

Expand All @@ -168,7 +168,7 @@ INTERNATIONALIZATION
- Arabic: Dr. Alaa Masoud
- Chinese: Zhang Jun
- Czech: Martin Landa, Jachym Cepicky, Michal Bil, Radim Blazek
- German: Stephan Holl
- German: Stephan Holl
- French: Emmanuel Saracco, Daniel Calvelo, Laurent Courty
- Italian: Maurizio Napolitano, Luciano Montanaro, Lorenzo Moretti
- Japanese: Susumu Nonogaki
Expand Down Expand Up @@ -221,7 +221,7 @@ VECTOR
- Radim Blazek <blazek itc it>: vector engine core developer
- David D Gray: vector engine contributions
- modules: see individual authors and ./contributors.csv

DBMI
- based on original code from GRASS 5.0 (developer unknown, CERL?)
- Radim Blazek <blazek itc it>: core developer of 5.7 enhancements
Expand All @@ -233,7 +233,7 @@ DGLib: vector networking
network analysis

FORMS library
- Radim Blazek <blazek itc it>: core developer
- Radim Blazek <blazek itc it>: core developer

RASTER
- Modules: see 5.4 authors below + individual modules
Expand Down Expand Up @@ -273,8 +273,8 @@ GRASS GIS 5.4 Author List
Please check additionally the GRASS 1.x-5.0 credits list at:
https://grass.osgeo.org/about/credits/

While it is impossible for us to give credit to everyone (past
and present) who has contributed to GRASS, the following is the
While it is impossible for us to give credit to everyone (past
and present) who has contributed to GRASS, the following is the
incomplete official list for GRASS 5.0-5.4:

Institutions:
Expand All @@ -285,31 +285,31 @@ Institutions:

GRASS 5 Core Team (most have CVS write access):
Michael Barton <michael.barton asu edu> (tcltkgrass menus)
Roger Bivand <Roger.Bivand nhh.no> ("R" statistical language
Roger Bivand <Roger.Bivand nhh.no> ("R" statistical language
support)
Radim Blazek <blazek itc.it> (DBMS support, ps.map, d.dm)
Hamish Bowman <hamish.bowman otago.ac.nz> (ps.map,display,rasters, ...)
Huidae Cho <grass4u gmail.com> (FreeType,r.topmodel,r.topidx, ..)
Glynn Clements <glynn gclements.plus.com> (Code portability, ...)
Bob Covill <bcovill tekmap.ns.ca> (NVIZ export formats,
Bob Covill <bcovill tekmap.ns.ca> (NVIZ export formats,
r.in|out.bin)
Jaro Hofierka <hofierka geomodel.sk> (NVIZ port, grid3D and related)
Paul Kelly <paul-grass stjohnspoint.co.uk> (PROJ4, datum trafo, IRIX ...)
Lubos Mitas <lmitas ncsa.uiuc.edu> (multivariate spline
interpolation (RST)
interpolation (RST)
and erosion modeling)
Helena Mitasova <hmitaso unity.ncsu.edu> (interpolation modules, NVIZ,
RASTER3D, erosion modelling)
Eric G. Miller <egm2 jps.net> (sites format, new autoconf
Eric G. Miller <egm2 jps.net> (sites format, new autoconf
system, bugfixes etc.)
Roger S. Miller <rgrmill rt66.com> (raster modules, r.drain etc.)
Markus Neteler <neteler itc.it> (GRASS 5 coordination, this&that ...)
Bernhard Reiter <bernhard intevation.de> (License, CVS, Bugfixes, RT)
Alexander Shevlakov <sixote yahoo.com> (PostgreSQL/GRASS interface)
Mike Thomas <miketh brisbane.paradigmgeo.com> (generic Windows driver)
Jan-Oliver Wagner <jan intevation.de> (XML-support,
Jan-Oliver Wagner <jan intevation.de> (XML-support,
Module descriptions)
Frank Warmerdam <warmerdam pobox.com> (GDAL, SHAPE implementation,
Frank Warmerdam <warmerdam pobox.com> (GDAL, SHAPE implementation,
new GRASS I/O library)
Michel Wurtz <mw teledetection.fr> (ESRI E00 support)

Expand All @@ -320,11 +320,11 @@ Former programmers (GRASS 5.0):
Malcolm Blue <mblue nb.sympatico.ca> (Windows NT/Cygnus port)
Jacques Bouchard <bouchard onera.fr> (tcltkgrass, bugfixes)
David D. Gray <ddgray armadce.demon.co.uk>(Vector, SQL support)
Justin Hickey <jhickey hpcc.nectec.or.th> (GRASS initialization,
Justin Hickey <jhickey hpcc.nectec.or.th> (GRASS initialization,
new env var handling, SGI)
John Huddleston <jhudd lamar.colostate.edu> (Windows NT/Cygnus port)
Bill Hughes <bhughes grasshoppernet.com> (64bit compliance)
Andreas Lange <Andreas.Lange Rhein-Main.de> (SGI/Irix compliance,
Andreas Lange <Andreas.Lange Rhein-Main.de> (SGI/Irix compliance,
Proj/Datum support)
Brook Milligan <brook trillium.NMSU.Edu> (initial autoconf implementation)
Phisan Santitamnont <fsvpss eng.chula.ac.th> (initial Linux compilation
Expand Down Expand Up @@ -364,12 +364,12 @@ Former GRASS 4 development (1984 to 1995):
Former Institutions
- University of Illinois at Urbana-Champaign, USA
Helena Mitasova <hmitaso unity.ncsu.edu> (interpolation modules, NVIZ, RASTER3D)
William Brown <brown gis.uiuc.edu> (libraries, interpolation modules,
William Brown <brown gis.uiuc.edu> (libraries, interpolation modules,
NVIZ, RASTER3D)

- National Center for Supercomputing Applications, USA
Lubos Mitas (multivariate spline interpolation (RST) and erosion modeling)

- High Performance Computing Center, Thailand
National Electronics and Computer Technology Center
Bangkok, Thailand
Expand All @@ -386,9 +386,9 @@ development team, listed below, as many are still active in the
project and GRASS GIS owes much of itself to the generosity of their
bright minds.

GRASS 6.0 was made up of entirely new code for much of the vector and
database management subsystems. The raster, display, and projection
subsystems are largely directly inherited from GRASS 5.4 without change.
GRASS 6.0 was made up of entirely new code for much of the vector and
database management subsystems. The raster, display, and projection
subsystems are largely directly inherited from GRASS 5.4 without change.
The core GIS, GUI, and build subsystems are a hybrid of old and new code.


Expand Down
2 changes: 1 addition & 1 deletion COPYING
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GRASS Development Team at the following address:
GRASS Development Team
c/o Markus Neteler
mundialis GmbH & Co. KG
Kölnstrasse 99
Kölnstrasse 99
53111 Bonn, Germany
neteler AT osgeo.org

Expand Down
14 changes: 14 additions & 0 deletions INSTALL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@ Please read _all_ text below.

The install order matters. GRASS needs at least two libraries
which have to be installed before installing/compiling GRASS:
<<<<<<< HEAD
For links to the software, see ./REQUIREMENTS.html in this
directory:
=======
For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this
directory.
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
Installation order:

Expand Down Expand Up @@ -70,7 +75,11 @@ The command,
```

explains the options used to disable the compilation of non-mandatory
<<<<<<< HEAD
GRASS modules. See REQUIREMENTS.html for details on dependencies.
=======
GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies.
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
Detailed Wiki notes for various operating systems (MS-Windows, GNU/Linux
distributions, FreeBSD, AIX, etc) are available at:
<https://grasswiki.osgeo.org/wiki/Compile_and_Install>
Expand Down Expand Up @@ -282,7 +291,12 @@ better settings to us):
CFLAGS="-mcpu=athlon -O2" # AMD Athlon processor with code optimisations
CFLAGS="-mcpu=pentium" # Intel Pentium processor
CFLAGS="-mcpu=pentium4" # Intel Pentium4 processor
<<<<<<< HEAD
CFLAGS="-O2 -msse -msse2 -mfpmath=sse -minline-all-stringops" # Intel XEON 64bit processor
=======
CFLAGS="-O2 -msse -msse2 -mfpmath=sse \
-minline-all-stringops" # Intel XEON 64bit processor
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
CFLAGS="-mtune=nocona -m64 -minline-all-stringops" # Intel Pentium 64bit processor
```
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ DIRS = \

SUBDIRS = $(DIRS)

<<<<<<< HEAD
FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html contributors.csv contributors_extra.csv translators.csv
=======
FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
FILES_DST = $(patsubst %,$(ARCH_DISTDIR)/%,$(FILES))

default:
Expand Down Expand Up @@ -106,7 +110,7 @@ libs:
$(MAKE) subdirs SUBDIRS=$(LIBDIRS)
$(MAKE) $(FILES_DST)

cleandistdirs:
cleandistdirs:
-rm -rf $(ARCH_DISTDIR)
-rm -rf $(ARCH_BINDIR)

Expand Down
34 changes: 34 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ a Geographic Information System used for geospatial data management and
analysis, image processing, graphics/map production, spatial modeling, and
visualization.

<<<<<<< HEAD
Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below:
=======
Launch this repository in Binder and experiment with GRASS's Python API in
Jupyter Notebooks by clicking the button below:
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
[![Binder](https://camo.githubusercontent.com/581c077bdbc6ca6899c86d0acc6145ae85e9d80e6f805a1071793dbe48917982/68747470733a2f2f6d7962696e6465722e6f72672f62616467655f6c6f676f2e737667)](https://mybinder.org/v2/gh/OSGeo/grass/main?urlpath=lab%2Ftree%2Fdoc%2Fnotebooks%2Fjupyter_example.ipynb)

Expand All @@ -36,13 +41,24 @@ Want to become a core developer? See

> See the INSTALL.md file.
<<<<<<< HEAD
Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are detailed [compile instructions](https://grasswiki.osgeo.org/wiki/Compile_and_Install) in the Wiki.
=======
Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are
detailed [compile instructions](https://grasswiki.osgeo.org/wiki/Compile_and_Install)
in the Wiki.
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
## Docker

Build a docker image using the downloaded source code (run this in the directory
containing the source code):

<<<<<<< HEAD
=======
A. Docker image **without graphical user interface - wxGUI**.

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
```bash
docker build -t grassgis .
```
Expand Down Expand Up @@ -76,6 +92,24 @@ docker run -it --rm --user=$(id -u):$(id -g) \
--location nc_basic_spm_grass7 --location-type nc
```

B. Docker image **with graphical user interface - wxGUI**.

```bash
docker build -t grassgis -f docker/ubuntu_wxgui/Dockerfile .
```

Note that the first `grassgis` is the name of the image while the second
`grass` is the name of the executable.

```bash
xhost local:$(id -u)
docker run -it --privileged --user=$(id -u):$(id -g) --rm \
--volume="$(pwd)/:/data" --volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \
--env HOME=/data/ --env DISPLAY=$DISPLAY \
--device="/dev/dri/card0:/dev/dri/card0" \
grassgis grass --gui
```

Note: If you compiled locally before building the Docker image, you may
encounter problems as the local configuration and the locally compiled files
are copied to and used in the Docker image. To make sure you don't have
Expand Down
Loading

0 comments on commit f130b43

Please sign in to comment.