diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2017-09-09 16:21:24 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-09-09 09:35:30 -0400 |
| commit | 63d2472b1066c6a2038c5e903aafb5437f78a415 (patch) | |
| tree | 312f7dc174cf816f3e2a2c8d78d3c928825686e3 | |
| parent | 0ab1dc0a8bfc580e92ad4af413ab3fd3797f0d2a (diff) | |
Fixed capitalization of "Spherical Mercator."
| -rw-r--r-- | docs/ref/contrib/gis/admin.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 | ||||
| -rw-r--r-- | tests/gis_tests/geoapp/test_functions.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/docs/ref/contrib/gis/admin.txt b/docs/ref/contrib/gis/admin.txt index 01a936ef0f..036bff6d14 100644 --- a/docs/ref/contrib/gis/admin.txt +++ b/docs/ref/contrib/gis/admin.txt @@ -67,7 +67,7 @@ GeoDjango's admin site .. class:: OSMGeoAdmin - A subclass of :class:`GeoModelAdmin` that uses a spherical mercator projection + A subclass of :class:`GeoModelAdmin` that uses a Spherical Mercator projection with `OpenStreetMap <https://www.openstreetmap.org/>`_ street data tiles. See the :ref:`OSMGeoAdmin introduction <osmgeoadmin-intro>` in the tutorial for a usage example. diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index 5efec10714..4cfdc65906 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -393,7 +393,6 @@ MBR memcache memcached mentorship -mercator metaclass metaclasses metadata diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index 0e644cefd6..bb13d9e37f 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -204,7 +204,7 @@ class GISFunctionsTests(TestCase): @skipUnlessDBFeature("has_Difference_function", "has_Transform_function") def test_difference_mixed_srid(self): """Testing with mixed SRID (Country has default 4326).""" - geom = Point(556597.4, 2632018.6, srid=3857) # Spherical mercator + geom = Point(556597.4, 2632018.6, srid=3857) # Spherical Mercator qs = Country.objects.annotate(difference=functions.Difference('mpoly', geom)) # Oracle does something screwy with the Texas geometry. if oracle: |