Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

start fixing spelling #2343

Merged
merged 25 commits into from Sep 11, 2019
Merged

start fixing spelling #2343

merged 25 commits into from Sep 11, 2019

Conversation

@ianturton
Copy link
Member

ianturton commented Apr 5, 2019

Make use of the Sphinx spell checker at https://sphinxcontrib-spelling.readthedocs.io/en/latest/install.html

I have opted for US spelling over GB/Canadian/Aust as otherwise method and class names get broken.

Copy link
Contributor

bradh left a comment

Thanks for starting the work on this. A few minor suggestions.

docs/user/build/install/index.rst Outdated Show resolved Hide resolved
docs/user/build/install/jdk.rst Show resolved Hide resolved
docs/user/build/install/mvn.rst Outdated Show resolved Hide resolved
docs/user/build/maven/build.rst Outdated Show resolved Hide resolved
ianturton added 5 commits Apr 7, 2019
@aaime

This comment has been minimized.

Copy link
Member

aaime commented Apr 11, 2019

@ianturton

This comment has been minimized.

Copy link
Member Author

ianturton commented Apr 11, 2019

ianturton added 3 commits Apr 30, 2019
Copy link

piomar123 left a comment

My few cents

@@ -89,7 +89,7 @@ The above code is wrong for two reasons described below:

If you are tempted to fetch different coefficients in an affine transform according some conditions, it is worth to take a paper and a pencil, write down the matrix and see if the equations can be written in some form invariant to rotation, flipping or axis swapping. This is often possible and leads to more robust and generic code.

It may sound like paranoiac, but it is not. Old Geotools code was assuming (longitude,latitude) axis order in all cases, for example through unconditional calls to AffineTransform.getScaleX(). It required a great amount of energy from nice volunter in order to handle the (latitude,longitude) axis order as well. Unfortunatly the initial fix for this axis order issue, based on the "Axis Interchange with Modal Code" approach, has just pushed the problem a little bit further away. The code will fails for the next great Geotools step: 3D-Coverage. Users will want to see 2D slices using a wide range axis that are not longitude or latitude. It is better to make the best possible use of affine transform mathematic early than revisiting again the whole Geotools code base as in the "axis order issue" case.
It may sound like paranoiac, but it is not. Old GeoTools code was assuming (longitude,latitude) axis order in all cases, for example through unconditional calls to AffineTransform.getScaleX(). It required a great amount of energy from nice volunter in order to handle the (latitude,longitude) axis order as well. Unfortunatly the initial fix for this axis order issue, based on the "Axis Interchange with Modal Code" approach, has just pushed the problem a little bit further away. The code will fails for the next great GeoTools step: 3D-Coverage. Users will want to see 2D slices using a wide range axis that are not longitude or latitude. It is better to make the best possible use of affine transform mathematic early than revisiting again the whole GeoTools code base as in the "axis order issue" case.

This comment has been minimized.

Copy link
@piomar123

piomar123 Jul 5, 2019

The code will fail for the next great (...)

Unfortunately, the initial fix for this axis order (...)

This comment has been minimized.

Copy link
@ianturton

ianturton Aug 4, 2019

Author Member

I've fixed this one, but in general you can make these one liner fixes directly in git.

@@ -82,14 +82,14 @@ Our build process does not include jar files inside the subversion repository, i

General utility open source projects, especially apache related

Take a look at these sites and some of the "mystery" out of how Maven works. You may notice that the directory structure matches the dependency entries that you see in the pom.xml files. If the dependency entry has a groupId tag then this will be the name of the folder, if it just has an id tag then this will be used for the name of the folder and the jar within it.
Take a look at these sites and some of the "mystery" out of how Maven works. You may notice that the directory structure matches the dependency entries that you see in the ``pom.xml`` files. If the dependency entry has a groupId tag then this will be the name of the folder, if it just has an id tag then this will be used for the name of the folder and the jar within it.

This comment has been minimized.

Copy link
@piomar123

piomar123 Jul 5, 2019

If the dependency entry has a groupId tag then

@@ -85,7 +85,7 @@ The modules/unsupported/ directory is there to welcome your experimental work; t

#. pom.xml

We start by getting the pom.xml configured since maven will need that to work against the module. The following will start you out:
We start by getting the ``pom.xml`` configured since maven will need that to work against the module. The following will start you out:

This comment has been minimized.

Copy link
@piomar123

piomar123 Jul 5, 2019

since Maven will need

@@ -244,7 +244,7 @@ of for rebasing include:

It is **critically important** that rebasing never occur on a shared or primary

This comment has been minimized.

Copy link
@piomar123

piomar123 Jul 5, 2019

that rebasing never occurs on a shared

@@ -29,7 +29,7 @@ Versions and revisions

When performing a release we don't require a "code freeze" in which no developers can commit to the repository. Instead we release from a revision that is known to pass all tests, including unit/integration tests as well as CITE tests on the GeoServer side. These instructions are valid in case you are making a release in combination with GeoServer, if you are making a stand alone release it's up to you to choose the proper GIT revision number for the GeoTools released to be picked from.

To obtain the GeoServer and Geotools revisions that have passed the `CITE test <https://build.geoserver.org/view/testing-cite/>`_, navigate to the latest Jenkins run of the CITE test and view it's console output and select to view its full log. For example:
To obtain the GeoServer and GeoTools revisions that have passed the `CITE test <https://build.geoserver.org/view/testing-cite/>`_, navigate to the latest Jenkins run of the CITE test and view it's console output and select to view its full log. For example:

This comment has been minimized.

Copy link
@piomar123

piomar123 Jul 5, 2019

and view its console output

instead and it will correctly merge the ``META-INF/services`` files from each of
the GeoTools modules used by your application.

The pom below will create an executable jar for the GeoTools :doc:`/tutorial/quickstart/index` module which includes all of the required

This comment has been minimized.

Copy link
@piomar123

piomar123 Jul 5, 2019

What about:
The POM below will create an executable JAR for the GeoTools
?

ianturton added 12 commits Jul 15, 2019
ianturton added 2 commits Sep 10, 2019
@ianturton ianturton marked this pull request as ready for review Sep 10, 2019
@ianturton ianturton merged commit 26953c2 into geotools:master Sep 11, 2019
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@backporting

This comment has been minimized.

Copy link

backporting bot commented Sep 11, 2019

The backport to 20.x failed:

Commits ["fbb303f6cc4212f58d4171c36bbb24c67311beb1","843c3e0aa12a28376a0ce1888ff18ae39d641548","88cb434d6354b9dc457b8cb627d042579ba99865","0817583f4b634701f438e8925a64c83c133457b0","f64c0bbf7d2dff268553d17d51e1db1eb977a1d5","814b19be124ce2fd869b27398f61a57a9f61c312","924ff4d9cae5aa3ac6d1935638c1cf7336ca4df6","6556a763f17c27d4ea900e080f5acde6a8dc27ae","0d9a32a0f1a420457a337fa1d96d265583f038ea","af8e3c3eb993742709b37d089ce4861785483fbb","ed642cf276db1412e7ecced065b673ae2ac41169","19c24d6f2851c778975e9647dc2a002df442104c","0fdd6a95181ef442f2678eb5910ce9504c11a80b","79d65ef7946980184f2881d9a76c88f170050820","89ed1afc666d2c009ed4bb588aeffec6b430a6b0","83179c737838f6a5b1dd80fc345ba9d791d8084c","f58af83d038619eb896aaa1f20596852fa138965","e231851d2a3aea03804e0ee4100bfcdfcee5c2eb","e7c4821fce258e481d6234be2f7c29302ad6dd3b","c6f192295cb79a0f72c594ff5c4da38f58062ce6","7027bb1f7f09dff18d990f9e7fac8f874e5bd833","d1ddb39617ec9c20816b4d52a04e19a3e4b35347","31ae6f9a40f22d46522a47b5ddf99b890aa11a65","f8c1e37dfeadebc9be28d6766c1fed6b199da122","862274b8adf466ad33d49bd27926cccccd5451e5"] could not be cherry-picked on top of 20.x

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 20.x
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick fbb303f6cc4212f58d4171c36bbb24c67311beb1 843c3e0aa12a28376a0ce1888ff18ae39d641548 88cb434d6354b9dc457b8cb627d042579ba99865 0817583f4b634701f438e8925a64c83c133457b0 f64c0bbf7d2dff268553d17d51e1db1eb977a1d5 814b19be124ce2fd869b27398f61a57a9f61c312 924ff4d9cae5aa3ac6d1935638c1cf7336ca4df6 6556a763f17c27d4ea900e080f5acde6a8dc27ae 0d9a32a0f1a420457a337fa1d96d265583f038ea af8e3c3eb993742709b37d089ce4861785483fbb ed642cf276db1412e7ecced065b673ae2ac41169 19c24d6f2851c778975e9647dc2a002df442104c 0fdd6a95181ef442f2678eb5910ce9504c11a80b 79d65ef7946980184f2881d9a76c88f170050820 89ed1afc666d2c009ed4bb588aeffec6b430a6b0 83179c737838f6a5b1dd80fc345ba9d791d8084c f58af83d038619eb896aaa1f20596852fa138965 e231851d2a3aea03804e0ee4100bfcdfcee5c2eb e7c4821fce258e481d6234be2f7c29302ad6dd3b c6f192295cb79a0f72c594ff5c4da38f58062ce6 7027bb1f7f09dff18d990f9e7fac8f874e5bd833 d1ddb39617ec9c20816b4d52a04e19a3e4b35347 31ae6f9a40f22d46522a47b5ddf99b890aa11a65 f8c1e37dfeadebc9be28d6766c1fed6b199da122 862274b8adf466ad33d49bd27926cccccd5451e5
# Create a new branch with these backported commits.
git checkout -b backport-2343-to-20.x
# Push it to GitHub.
git push --set-upstream origin backport-2343-to-20.x
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is 20.x and the compare/head branch is backport-2343-to-20.x.

@backporting

This comment has been minimized.

Copy link

backporting bot commented Sep 11, 2019

The backport to 21.x failed:

Commits ["fbb303f6cc4212f58d4171c36bbb24c67311beb1","843c3e0aa12a28376a0ce1888ff18ae39d641548","88cb434d6354b9dc457b8cb627d042579ba99865","0817583f4b634701f438e8925a64c83c133457b0","f64c0bbf7d2dff268553d17d51e1db1eb977a1d5","814b19be124ce2fd869b27398f61a57a9f61c312","924ff4d9cae5aa3ac6d1935638c1cf7336ca4df6","6556a763f17c27d4ea900e080f5acde6a8dc27ae","0d9a32a0f1a420457a337fa1d96d265583f038ea","af8e3c3eb993742709b37d089ce4861785483fbb","ed642cf276db1412e7ecced065b673ae2ac41169","19c24d6f2851c778975e9647dc2a002df442104c","0fdd6a95181ef442f2678eb5910ce9504c11a80b","79d65ef7946980184f2881d9a76c88f170050820","89ed1afc666d2c009ed4bb588aeffec6b430a6b0","83179c737838f6a5b1dd80fc345ba9d791d8084c","f58af83d038619eb896aaa1f20596852fa138965","e231851d2a3aea03804e0ee4100bfcdfcee5c2eb","e7c4821fce258e481d6234be2f7c29302ad6dd3b","c6f192295cb79a0f72c594ff5c4da38f58062ce6","7027bb1f7f09dff18d990f9e7fac8f874e5bd833","d1ddb39617ec9c20816b4d52a04e19a3e4b35347","31ae6f9a40f22d46522a47b5ddf99b890aa11a65","f8c1e37dfeadebc9be28d6766c1fed6b199da122","862274b8adf466ad33d49bd27926cccccd5451e5"] could not be cherry-picked on top of 21.x

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 21.x
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick fbb303f6cc4212f58d4171c36bbb24c67311beb1 843c3e0aa12a28376a0ce1888ff18ae39d641548 88cb434d6354b9dc457b8cb627d042579ba99865 0817583f4b634701f438e8925a64c83c133457b0 f64c0bbf7d2dff268553d17d51e1db1eb977a1d5 814b19be124ce2fd869b27398f61a57a9f61c312 924ff4d9cae5aa3ac6d1935638c1cf7336ca4df6 6556a763f17c27d4ea900e080f5acde6a8dc27ae 0d9a32a0f1a420457a337fa1d96d265583f038ea af8e3c3eb993742709b37d089ce4861785483fbb ed642cf276db1412e7ecced065b673ae2ac41169 19c24d6f2851c778975e9647dc2a002df442104c 0fdd6a95181ef442f2678eb5910ce9504c11a80b 79d65ef7946980184f2881d9a76c88f170050820 89ed1afc666d2c009ed4bb588aeffec6b430a6b0 83179c737838f6a5b1dd80fc345ba9d791d8084c f58af83d038619eb896aaa1f20596852fa138965 e231851d2a3aea03804e0ee4100bfcdfcee5c2eb e7c4821fce258e481d6234be2f7c29302ad6dd3b c6f192295cb79a0f72c594ff5c4da38f58062ce6 7027bb1f7f09dff18d990f9e7fac8f874e5bd833 d1ddb39617ec9c20816b4d52a04e19a3e4b35347 31ae6f9a40f22d46522a47b5ddf99b890aa11a65 f8c1e37dfeadebc9be28d6766c1fed6b199da122 862274b8adf466ad33d49bd27926cccccd5451e5
# Create a new branch with these backported commits.
git checkout -b backport-2343-to-21.x
# Push it to GitHub.
git push --set-upstream origin backport-2343-to-21.x
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is 21.x and the compare/head branch is backport-2343-to-21.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.