p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed capitalization of "Spherical Mercator."

This commit is contained in:
Sergey Fedoseev 2017-09-09 16:21:24 +05:00 committed by Tim Graham
parent 0ab1dc0a8b
commit 63d2472b10
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/contrib/gis/admin.txt
View File

@ -67,7 +67,7 @@ GeoDjango's admin site
.. class:: OSMGeoAdmin .. 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. with `OpenStreetMap <https://www.openstreetmap.org/>`_ street data tiles.
See the :ref:`OSMGeoAdmin introduction <osmgeoadmin-intro>` See the :ref:`OSMGeoAdmin introduction <osmgeoadmin-intro>`
in the tutorial for a usage example. in the tutorial for a usage example.

1
docs/spelling_wordlist
View File

@ -393,7 +393,6 @@ MBR
memcache memcache
memcached memcached
mentorship mentorship
mercator
metaclass metaclass
metaclasses metaclasses
metadata metadata

2
tests/gis_tests/geoapp/test_functions.py
View File

@ -204,7 +204,7 @@ class GISFunctionsTests(TestCase):
@skipUnlessDBFeature("has_Difference_function", "has_Transform_function") @skipUnlessDBFeature("has_Difference_function", "has_Transform_function")
def test_difference_mixed_srid(self): def test_difference_mixed_srid(self):
"""Testing with mixed SRID (Country has default 4326).""" """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)) qs = Country.objects.annotate(difference=functions.Difference('mpoly', geom))
# Oracle does something screwy with the Texas geometry. # Oracle does something screwy with the Texas geometry.
if oracle: if oracle: