mirror of
https://github.com/django/django.git
synced 2025-08-03 18:38:50 +00:00
[1.5.x] Fixed #19516 - Fixed remaining broken links.
Added -n to sphinx builds to catch issues going forward.
Backport of 9b5f64cc6e
from master.
This commit is contained in:
parent
61c861546b
commit
be1e006c58
84 changed files with 721 additions and 604 deletions
|
@ -4,20 +4,23 @@
|
|||
GeoDjango Database API
|
||||
======================
|
||||
|
||||
.. module:: django.contrib.gis.db.models
|
||||
:synopsis: GeoDjango's database API.
|
||||
|
||||
.. _spatial-backends:
|
||||
|
||||
Spatial Backends
|
||||
================
|
||||
|
||||
.. module:: django.contrib.gis.db.backends
|
||||
:synopsis: GeoDjango's spatial database backends.
|
||||
|
||||
GeoDjango currently provides the following spatial database backends:
|
||||
|
||||
* :mod:`django.contrib.gis.db.backends.postgis`
|
||||
* :mod:`django.contrib.gis.db.backends.mysql`
|
||||
* :mod:`django.contrib.gis.db.backends.oracle`
|
||||
* :mod:`django.contrib.gis.db.backends.spatialite`
|
||||
* ``django.contrib.gis.db.backends.postgis``
|
||||
* ``django.contrib.gis.db.backends.mysql``
|
||||
* ``django.contrib.gis.db.backends.oracle``
|
||||
* ``django.contrib.gis.db.backends.spatialite``
|
||||
|
||||
.. module:: django.contrib.gis.db.models
|
||||
:synopsis: GeoDjango's database API.
|
||||
|
||||
.. _mysql-spatial-limitations:
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ API Reference
|
|||
.. class:: Feed
|
||||
|
||||
In addition to methods provided by
|
||||
the :class:`django.contrib.syndication.feeds.Feed`
|
||||
the :class:`django.contrib.syndication.views.Feed`
|
||||
base class, GeoDjango's ``Feed`` class provides
|
||||
the following overrides. Note that these overrides may be done in multiple ways::
|
||||
|
||||
|
@ -71,11 +71,11 @@ API Reference
|
|||
can be a ``GEOSGeometry`` instance, or a tuple that represents a
|
||||
point coordinate or bounding box. For example::
|
||||
|
||||
class ZipcodeFeed(Feed):
|
||||
class ZipcodeFeed(Feed):
|
||||
|
||||
def item_geometry(self, obj):
|
||||
# Returns the polygon.
|
||||
return obj.poly
|
||||
def item_geometry(self, obj):
|
||||
# Returns the polygon.
|
||||
return obj.poly
|
||||
|
||||
``SyndicationFeed`` Subclasses
|
||||
------------------------------
|
||||
|
|
|
@ -683,7 +683,7 @@ Keyword Argument Description
|
|||
a method name clashes with an existing
|
||||
``GeoQuerySet`` method -- if you wanted to use the
|
||||
``area()`` method on model with a ``PolygonField``
|
||||
named ``area``, for example.
|
||||
named ``area``, for example.
|
||||
===================== =====================================================
|
||||
|
||||
Measurement
|
||||
|
@ -1043,7 +1043,7 @@ Keyword Argument Description
|
|||
===================== =====================================================
|
||||
``relative`` If set to ``True``, the path data will be implemented
|
||||
in terms of relative moves. Defaults to ``False``,
|
||||
meaning that absolute moves are used instead.
|
||||
meaning that absolute moves are used instead.
|
||||
|
||||
``precision`` This keyword may be used to specify the number of
|
||||
significant digits for the coordinates in the SVG
|
||||
|
|
|
@ -142,10 +142,9 @@ Geometry Objects
|
|||
|
||||
.. class:: GEOSGeometry(geo_input[, srid=None])
|
||||
|
||||
:param geo_input: Geometry input value
|
||||
:type geo_input: string or buffer
|
||||
:param geo_input: Geometry input value (string or buffer)
|
||||
:param srid: spatial reference identifier
|
||||
:type srid: integer
|
||||
:type srid: int
|
||||
|
||||
This is the base class for all GEOS geometry objects. It initializes on the
|
||||
given ``geo_input`` argument, and then assumes the proper geometry subclass
|
||||
|
@ -800,7 +799,7 @@ Example::
|
|||
:param string: string that contains spatial data
|
||||
:type string: string
|
||||
:param srid: spatial reference identifier
|
||||
:type srid: integer
|
||||
:type srid: int
|
||||
:rtype: a :class:`GEOSGeometry` corresponding to the spatial data in the string
|
||||
|
||||
Example::
|
||||
|
@ -966,3 +965,10 @@ location (e.g., ``/home/bob/lib/libgeos_c.so``).
|
|||
|
||||
The setting must be the *full* path to the **C** shared library; in
|
||||
other words you want to use ``libgeos_c.so``, not ``libgeos.so``.
|
||||
|
||||
Exceptions
|
||||
==========
|
||||
|
||||
.. exception:: GEOSException
|
||||
|
||||
The base GEOS exception, indicates a GEOS-related error.
|
||||
|
|
|
@ -530,6 +530,6 @@ Finally, :ref:`install Django <installing-official-release>` on your system.
|
|||
|
||||
.. rubric:: Footnotes
|
||||
.. [#] GeoDjango uses the :func:`~ctypes.util.find_library` routine from
|
||||
:mod:`ctypes.util` to locate shared libraries.
|
||||
``ctypes.util`` to locate shared libraries.
|
||||
.. [#] The ``psycopg2`` Windows installers are packaged and maintained by
|
||||
`Jason Erickson <http://www.stickpeople.com/projects/python/win-psycopg/>`_.
|
||||
|
|
|
@ -226,7 +226,7 @@ model to represent this data::
|
|||
|
||||
class WorldBorder(models.Model):
|
||||
# Regular Django fields corresponding to the attributes in the
|
||||
# world borders shapefile.
|
||||
# world borders shapefile.
|
||||
name = models.CharField(max_length=50)
|
||||
area = models.IntegerField()
|
||||
pop2005 = models.IntegerField('Population 2005')
|
||||
|
@ -236,13 +236,13 @@ model to represent this data::
|
|||
un = models.IntegerField('United Nations Code')
|
||||
region = models.IntegerField('Region Code')
|
||||
subregion = models.IntegerField('Sub-Region Code')
|
||||
lon = models.FloatField()
|
||||
lat = models.FloatField()
|
||||
lon = models.FloatField()
|
||||
lat = models.FloatField()
|
||||
|
||||
# GeoDjango-specific: a geometry field (MultiPolygonField), and
|
||||
# GeoDjango-specific: a geometry field (MultiPolygonField), and
|
||||
# overriding the default manager with a GeoManager instance.
|
||||
mpoly = models.MultiPolygonField()
|
||||
objects = models.GeoManager()
|
||||
mpoly = models.MultiPolygonField()
|
||||
objects = models.GeoManager()
|
||||
|
||||
# Returns the string representation of the model.
|
||||
def __unicode__(self):
|
||||
|
@ -250,7 +250,7 @@ model to represent this data::
|
|||
|
||||
Please note two important things:
|
||||
|
||||
1. The ``models`` module is imported from :mod:`django.contrib.gis.db`.
|
||||
1. The ``models`` module is imported from ``django.contrib.gis.db``.
|
||||
2. You must override the model's default manager with
|
||||
:class:`~django.contrib.gis.db.models.GeoManager` to perform spatial queries.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue