diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/gis/install/geolibs.txt | 5 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/install/spatialite.txt | 25 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/testing.txt | 18 | ||||
| -rw-r--r-- | docs/releases/1.8.txt | 2 |
4 files changed, 9 insertions, 41 deletions
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 03b5472dd8..669c5eea2f 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -12,10 +12,10 @@ Program Description Required ======================== ==================================== ================================ ========================== :ref:`GEOS <ref-geos>` Geometry Engine Open Source Yes 3.4, 3.3, 3.2 `PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.8, 4.7, 4.6, 4.5, 4.4 -:ref:`GDAL <ref-gdal>` Geospatial Data Abstraction Library No (but, required for SQLite) 1.10, 1.9, 1.8, 1.7 +:ref:`GDAL <ref-gdal>` Geospatial Data Abstraction Library Yes (SQLite only) 1.10, 1.9, 1.8, 1.7 :ref:`GeoIP <ref-geoip>` IP-based geolocation library No 1.4 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 2.1, 2.0, 1.5, 1.4, 1.3 -`SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 4.1, 4.0, 3.0, 2.4, 2.3 +`SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 4.1, 4.0, 3.0, 2.4 ======================== ==================================== ================================ ========================== Note that older or more recent versions of these libraries *may* also work @@ -35,7 +35,6 @@ totally fine with GeoDjango. Your mileage may vary. PostGIS 1.5.0 2010-02-04 PostGIS 2.0.0 2012-04-03 PostGIS 2.1.0 2013-08-17 - SpatiaLite 2.3.0 2009-04-06 Spatialite 2.4.0 2010-11-14 Spatialite 3.0.0 2011-12-30 Spatialite 4.0.0 2012-11-25 diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index bcb5ecd587..efcc7ca2b3 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -73,7 +73,7 @@ Prior to attempting to build, please read the important notes below to see if customization of the ``configure`` command is necessary. If not, then run the ``configure`` script, make, and install for the SpatiaLite library:: - $ cd libspatialite-amalgamation-2.3.1 + $ cd libspatialite-amalgamation-2.4.0-5 $ ./configure # May need to be modified, see notes below. $ make $ sudo make install @@ -83,7 +83,7 @@ customization of the ``configure`` command is necessary. If not, then run the Finally, do the same for the SpatiaLite tools:: - $ cd spatialite-tools-2.3.1 + $ cd spatialite-tools-2.4.0-5 $ ./configure # May need to be modified, see notes below. $ make $ sudo make install @@ -196,33 +196,18 @@ Creating a spatial database for SpatiaLite After you've installed SpatiaLite, you'll need to create a number of spatial metadata tables in your database in order to perform spatial queries. -If you're using SpatiaLite 2.4 or newer, use the ``spatialite`` utility to -call the ``InitSpatialMetaData()`` function, like this:: +Use the ``spatialite`` utility to call the ``InitSpatialMetaData()`` function, +like this:: $ spatialite geodjango.db "SELECT InitSpatialMetaData();" the SPATIAL_REF_SYS table already contains some row(s) InitSpatiaMetaData ()error:"table spatial_ref_sys already exists" 0 -You can safely ignore the error messages shown. When you've done this, you can -skip the rest of this section. - -If you're using SpatiaLite 2.3, you'll need to download a -database-initialization file and execute its SQL queries in your database. - -First, get it from the `SpatiaLite Resources`__ page:: - - $ wget http://www.gaia-gis.it/spatialite-2.3.1/init_spatialite-2.3.sql.gz - $ gunzip init_spatialite-2.3.sql.gz - -Then, use the ``spatialite`` command to initialize a spatial database:: - - $ spatialite geodjango.db < init_spatialite-2.3.sql +You can safely ignore the error messages shown. .. note:: The parameter ``geodjango.db`` is the *filename* of the SQLite database you want to use. Use the same in the :setting:`DATABASES` ``"name"`` key inside your ``settings.py``. - -__ http://www.gaia-gis.it/spatialite-2.3.1/resources.html diff --git a/docs/ref/contrib/gis/testing.txt b/docs/ref/contrib/gis/testing.txt index 4ef58f3934..1e3be5cc36 100644 --- a/docs/ref/contrib/gis/testing.txt +++ b/docs/ref/contrib/gis/testing.txt @@ -120,24 +120,6 @@ database, as described in :ref:`create_spatialite_db`. Then just do this:: $ python manage.py test -Settings --------- - -.. setting:: SPATIALITE_SQL - -``SPATIALITE_SQL`` -^^^^^^^^^^^^^^^^^^ - -Only relevant when using a SpatiaLite version 2.3. - -By default, the GeoDjango test runner looks for the :ref:`file containing the -SpatiaLite database-initialization SQL code <create_spatialite_db>` in the -same directory where it was invoked (by default the same directory where -``manage.py`` is located). To use a different location, add the following to -your settings:: - - SPATIALITE_SQL='/path/to/init_spatialite-2.3.sql' - .. _geodjango-tests: GeoDjango tests diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index 516e9d6b39..774d94d94d 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -280,6 +280,8 @@ Miscellaneous * The :tfilter:`length` template filter now returns ``0`` for an undefined variable, rather than an empty string. +* Support for SpatiaLite < 2.4 has been dropped. + .. _deprecated-features-1.8: Features deprecated in 1.8 |