Skip to content

Commit cf3cf5f

Browse files
committed
Fixed spelling mistakes and made tutorials clearer
1 parent e21075e commit cf3cf5f

File tree

18 files changed

+337
-107
lines changed

18 files changed

+337
-107
lines changed

docs/_templates/sidebar/extra.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="sidebar-extra" style="text-align:left; margin-top:0px; margin-bottom:5px ;">
2-
<p style="font-size:14px; margin-bottom:10px;">GeodePy is a package of tools for manipulating goespatial datasets using Python.</p>
2+
<p style="font-size:14px; margin-bottom:10px;">GeodePy is a python package for precise geodetic and survey computations.</p>
33
<a href="https://github.com/GeoscienceAustralia/GeodePy" target="_blank">
44
<img src="https://img.shields.io/badge/GitHub-GeodePy-blue?logo=github" alt="GitHub Badge" />
55
</a>

docs/community/contributing.rst

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,62 @@
11
Contributing
22
==================
33

4-
We welcome contributions from the community to help improve GeodePy! Whether you're fixing bugs, adding new features, or enhancing documentation, your input is valuable. Open source projects live and die based on the support they recieve.
4+
We welcome contributions from the community to help improve GeodePy! Whether you're fixing bugs,
5+
adding new features, or enhancing documentation, your input is valuable. Open source projects
6+
live and die based on the support they recieve.
57

68
This document outlines some of the guidlines and advice for contributing to GeodePy.
79

810
Code of Conduct
911
----------------
1012

11-
By participating in this project, you agree to abide by the `Python Software Foundation Code of Conduct <https://policies.python.org/python.org/code-of-conduct/>`_. Please read it to understand the expectations for behavior when contributing to this project.
13+
By participating in this project, you agree to abide by the
14+
`Python Software Foundation Code of Conduct <https://policies.python.org/python.org/code-of-conduct/>`_.
15+
Please read it to understand the expectations for behavior when contributing to this project.
16+
17+
Coding Style Guide
18+
------------------
19+
20+
GeodePy uses `Black <https://github.com/psf/black>`_ to keep coding style consistent while still being accessable to all.
21+
Black uses `PEP 8 <https://peps.python.org/pep-0008/>`_ coding style, an industry standard for python code. Before
22+
any commits to GeodePy ensure Black has been used.
23+
24+
.. _code:
25+
26+
Code Contributions
27+
------------------
28+
29+
When contributing code please follow these steps:
30+
31+
1. Fork the repository on `GitHub <https://github.com/GeoscienceAustralia/GeodePy>`_.
32+
2. Run tests on current code to ensure it works on your system (See :ref:`Testing <testing>`)
33+
3. Create tests that demonstrate your bug or feature.
34+
4. Make changes, ensuring coding sytle guide is abided by.
35+
5. Run all tests again including one added and ensure all tests pass.
36+
6. Send a Github Pull Request to the repository's **master** branch
37+
38+
Our project maintainers have the last word on if contributions are suitable or not. If your contribution is rejected dont despair!
39+
Following the guidlines above will give you the best chance of getting accpeted.
40+
41+
Documentation Contributions
42+
---------------------------
43+
44+
Documentation imporvements are always welcome! We understand that good documentation is important for all users of a package.
45+
The documentation files can be found in the docs/ folder. They are written in `reStructedText <http://docutils.sourceforge.net/rst.html>`_,
46+
and use `Sphinx <http://sphinx-doc.org/index.html>`_ to generate the documentation.
47+
48+
When contributing documentation please follow the style of current documentation, having a semi-formal yet friendly approach.
49+
Ensure any code in documentation is well commeneted to ensure parameters are well understood.
50+
51+
Bug Reports
52+
------------
53+
54+
We welcome all bug reports! Before you raise one though please check the `GitHub issues <https://github.com/GeoscienceAustralia/GeodePy/issues>`_,
55+
both open and closed, to confirm the bug hastn been reported before. If you do submit a bug report ensure that the bug is clearly described,
56+
giving the situation that caused the bug and some repeatable code for testing.
57+
58+
Feature Requests
59+
----------------
60+
61+
If you believe a feature is missing, feel free to raise a feature request. Keep in mind that being an open source project requested features may
62+
or may not be implemented. If there is a feature you really need consider creating it yourself and :ref:`submitting the code <code>`.

docs/features/angles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ GeodePy supports Angular Notation in 9 different formats
3232

3333
Conversion between all formats is supported as shown below:
3434

35-
* Radians to/from Decimal Degrees via builtin math.radians and math.degrees
35+
* Radians to/from Decimal Degrees via built in math.radians and math.degrees
3636

3737
* Formats as floats to all other types via functions in the form abrv2abrv
3838

docs/features/constants.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ For :class:`~geodepy.constants.Transformation`:
132132
+-----------------------------+---------------------+-------------------------------------------------------------+
133133

134134

135-
All other combinations of ITRF transofmrations are available.
135+
All other combinations of ITRF transformations are available.
136136

137137
IERS to GeodePy Transformation
138138
------------------------------

docs/features/gnss.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ Reading Sinex Files
3232
.. autofunction:: geodepy.gnss.read_sinex_solution_matrix_estimate_block
3333
.. autofunction:: geodepy.gnss.read_sinex_solution_matrix_apriori_block
3434

35-
Converting Sinex Data to DataFrames
36-
------------------------------------
37-
38-
.. autofunction:: geodepy.gnss.matrix2dataframe_solution_matrix_estimate
39-
.. autofunction:: geodepy.gnss.sinex2dataframe_solution_estimate
40-
.. autofunction:: geodepy.gnss.sinex2dataframe_solution_apriori
41-
.. autofunction:: geodepy.gnss.sinex2dataframe_solution_matrix_estimate
42-
4335
Writing Sinex Files
4436
--------------------
4537

@@ -52,6 +44,14 @@ Writing Sinex Files
5244
.. autofunction:: geodepy.gnss.dataframe2sinex_solution_matrix_estimate
5345
.. autofunction:: geodepy.gnss.writeSINEX
5446

47+
Converting Sinex Data to DataFrames
48+
------------------------------------
49+
50+
.. autofunction:: geodepy.gnss.matrix2dataframe_solution_matrix_estimate
51+
.. autofunction:: geodepy.gnss.sinex2dataframe_solution_estimate
52+
.. autofunction:: geodepy.gnss.sinex2dataframe_solution_apriori
53+
.. autofunction:: geodepy.gnss.sinex2dataframe_solution_matrix_estimate
54+
5555
Specific Sinex Functions
5656
--------------------------
5757

docs/features/survey.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Surveying Calculations
44
=======================
55

6-
This module provides various surveying calculation functions commonly used in geodetic and surveying applications.
6+
This module provides various surveying calculation commonly used in geodetic and surveying applications.
77

88
EDM Corrections
99
-----------------

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Release v0.6.0
1919
:target: https://www.anzlic.gov.au/ICSM
2020
:alt: Paper Badge
2121

22-
**GeodePy** is a package of tools for manipulating geospatial datasets using Python.
22+
**GeodePy** is a python package for precise geodetic and survey computations.
2323

2424
-------------------
2525

docs/installation.rst

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This section contains instructions for installing GeodePy.
77

88
Installing via pip
99
--------------------
10-
The recommended way to install GeodePy is via pip. You can do this by running the following command in your terminal:
10+
The recommended way to install GeodePy is via pip. You can do this by running the following command in terminal:
1111

1212
.. code:: bash
1313
@@ -16,18 +16,49 @@ The recommended way to install GeodePy is via pip. You can do this by running th
1616
1717
Installing from source
1818
----------------------
19-
If you prefer to install GeodePy from source, you can clone the repository from GitHub and install it manually. Here are the steps:
19+
If you prefer to install GeodePy from source, you can clone the repository from GitHub and use the python files:
2020

2121
.. code:: bash
2222
2323
git clone https://github.com/GeoscienceAustralia/GeodePy.git
2424
2525
.. _updating:
2626

27+
Requirements
28+
------------
29+
30+
GeodePy has some requirements that also need to be installed. Not all packages will be used for all modules.
31+
The requirements can be seen below.
32+
33+
.. code::
34+
35+
NumPy
36+
SciPy
37+
GDAL #only needed for height module
38+
39+
GDAL is only used for the heights module and sometimes can be difficult to install. For more information on
40+
installing GDAL see the `GDAL pypi <https://pypi.org/project/GDAL/>`_ page.
41+
2742
Updating GeodePy
2843
-----------------
29-
To update GeodePy to the latest version, you can use pip with the --upgrade flag:
44+
To update GeodePy to the latest version, you can use pip with the upgrade flag:
3045

3146
.. code:: bash
3247
33-
pip install --upgrade geodepy
48+
pip install --upgrade geodepy
49+
50+
.. _testing:
51+
52+
Testing GeodePy
53+
-----------------
54+
55+
GeodePy can be tested using the a unit test. This can be run as seen below.
56+
57+
.. caution:: The directory may need to be changed to point to the correct test folder
58+
59+
.. code:: python
60+
61+
python3 -m unittest discover GeodePy/geodepy/tests --verbose
62+
63+
All tests should complete successfully. If not you may need to install some required
64+
packages.

docs/tutorials/anglestut.rst

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To initalise a dec class:
6666

6767
HP Notation (hpa)
6868
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
69-
Hemispheric Positive notation expresses latitude and longitude as positive values with hemisphere indicators.
69+
HP notation expresses latitude and longitude as positive values with hemisphere indicators.
7070

7171
- **Format:** ``ddd.mmssss``
7272
- **Example:** ``123.231524°``
@@ -97,7 +97,10 @@ To initalise a gona class:
9797
Using Angle Classes
9898
--------------------
9999

100-
First import GeodePy
100+
Angle classes can be used to hold angle variables, transform to different angle types and
101+
complete arthimitc. These will be explored below.
102+
103+
First import GeodePy.
101104

102105
.. code:: python
103106
@@ -124,7 +127,7 @@ Using this class we can get individual variables for degree minute and seconds c
124127
>>5
125128
>>42
126129
127-
The methods within the class can also be used to convert the angle into different types. This is seen below:
130+
The methods within the class can also be used to convert the angle into different types.
128131

129132
.. code:: python
130133
@@ -140,9 +143,10 @@ The methods within the class can also be used to convert the angle into differen
140143
>>30.0542
141144
>>0.5252568383876934
142145
143-
This can be completed with any of the 5 angle classes within GeodePy. To complete math on the angle classes the following can be completed.
146+
This can be completed with any of the 5 angle classes within GeodePy.
144147

145-
First a new angle needs to be defined. This will be done using the DDM Angle class
148+
Arthimitc can be completed on angle classes as seen below. First a new angle needs to be defined.
149+
This will be done using the DDM Angle class
146150

147151
.. code:: python
148152

docs/tutorials/coordtut.rst

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Classes
2121
Cartesian Coordinates
2222
^^^^^^^^^^^^^^^^^^^^^^
2323
Cartesian coordinates represent points in three dimensions (X, Y, Z), typically in an Earth-Centered, Earth-Fixed (ECEF) system.
24-
In this class an n value can also be added representing seperation between ellipsoid and geiod.
24+
In this class an "n" value can also be added representing seperation between ellipsoid and geiod.
2525

2626
- **Description:** Defines a point by its distance along three perpendicular axes.
2727
- **Format:** ``(X, Y, Z)`` in meters.
@@ -68,7 +68,10 @@ To initalise a transverse mercator coordinate class:
6868
Converting Between Classes
6969
--------------------------
7070

71-
First import GeodePy
71+
Coordinate classes can be used to hold coordinate variables and convert between different coordinate types.
72+
This will be explored here.
73+
74+
First import GeodePy.
7275

7376
.. code:: python
7477
@@ -79,7 +82,7 @@ We can now create a coordinate obect. For this example we will use a transverse
7982

8083
.. code:: python
8184
82-
coord1 = geodepy.coord.CoordTM(55, 696053.337, 6086610.13)
85+
coord1 = geodepy.coord.CoordTM(55, 696053.337, 6086610.13) #(zone, E, N)
8386
print(coord1)
8487
8588
>>CoordTM: Zone: 55 East: 696053.337 North: 6086610.13 Ell_Ht: None Orth_Ht: None Hemisphere: South
@@ -113,7 +116,7 @@ Instead of using classes, function can also be used to convert between coordinat
113116

114117
Both of these functions can be reversed to convert the other way.
115118

116-
To convert using function first geodepy needs to be imported
119+
To convert using functions first geodepy needs to be imported.
117120

118121
.. code:: python
119122
@@ -124,12 +127,17 @@ Now either of the functions can be used
124127

125128
.. code:: python
126129
127-
coordGeo = geodepy.convert.grid2geo(55, 696053.337, 6086610.13)
130+
coordGeo = geodepy.convert.grid2geo(55, 696053.337, 6086610.13) #zone, E, N
128131
print(coordGeo)
129132
130133
>>(-35.34455523, 149.15740394, 1.0000737, 1.2484390010290551)
131134
132-
coordllh = geodepy.convert.xyz2llh(-4471828.926838844, 2670252.9985762094, -3669113.8962611817)
135+
coordllh = geodepy.convert.xyz2llh(
136+
-4471828.926838844, #x
137+
2670252.9985762094, #y
138+
-3669113.8962611817 #z
139+
)
140+
133141
print(coordllh)
134142
135143
>>(-35.34455523, 149.15740394, 0)
@@ -138,7 +146,7 @@ These function can be used together to convert between grid and cartesian.
138146

139147
.. code:: python
140148
141-
coordGeo = geodepy.convert.grid2geo(55, 696053.337, 6086610.13)
149+
coordGeo = geodepy.convert.grid2geo(55, 696053.337, 6086610.13) #zone, E, N
142150
coordCart = geodepy.convert.llh2xyz(coordGeo[0],coordGeo[1])
143151
print(coordCart)
144152

0 commit comments

Comments
 (0)