From bade924c036b2114b7265e7a8ef5538a4dee32d0 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 30 Sep 2016 09:07:10 -0400 Subject: [1.10.x] Confirmed support for PostGIS 2.3. Backport of 79c91070e5797f647347c2f8bdfc4c7a0f835fb3 from master --- docs/ref/contrib/gis/install/geolibs.txt | 3 ++- tests/gis_tests/geoapp/test_functions.py | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index b9d409d004..82f5684e78 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -12,7 +12,7 @@ Program Description Required `PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.9, 4.8, 4.7, 4.6, 4.5, 4.4 :doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes (SQLite only) 2.1, 2.0, 1.11, 1.10, 1.9, 1.8, 1.7 :doc:`GeoIP <../geoip>` IP-based geolocation library No 1.4 -`PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 2.2, 2.1, 2.0 +`PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 2.3, 2.2, 2.1, 2.0 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 4.3, 4.2, 4.1, 4.0, 3.0 ======================== ==================================== ================================ =================================== @@ -33,6 +33,7 @@ totally fine with GeoDjango. Your mileage may vary. PostGIS 2.0.0 2012-04-03 PostGIS 2.1.0 2013-08-17 PostGIS 2.2.0 2015-10-17 + PostGIS 2.3.0 2016-09-26 SpatiaLite 3.0.0 2011-12-30 SpatiaLite 4.0.0 2012-11-25 SpatiaLite 4.1.0 2013-06-04 diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index 1a1727dbbc..0e5f2ee693 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -147,13 +147,16 @@ class GISFunctionsTests(TestCase): @skipUnlessDBFeature("has_BoundingCircle_function") def test_bounding_circle(self): + # The weak precision in the assertions is because the BoundingCircle + # calculation changed on PostGIS 2.3. qs = Country.objects.annotate(circle=functions.BoundingCircle('mpoly')).order_by('name') - self.assertAlmostEqual(qs[0].circle.area, 168.89, 2) - self.assertAlmostEqual(qs[1].circle.area, 135.95, 2) + self.assertAlmostEqual(qs[0].circle.area, 169, 0) + self.assertAlmostEqual(qs[1].circle.area, 136, 0) qs = Country.objects.annotate(circle=functions.BoundingCircle('mpoly', num_seg=12)).order_by('name') - self.assertAlmostEqual(qs[0].circle.area, 168.44, 2) - self.assertAlmostEqual(qs[1].circle.area, 135.59, 2) + self.assertGreater(qs[0].circle.area, 168.4, 0) + self.assertLess(qs[0].circle.area, 169.5, 0) + self.assertAlmostEqual(qs[1].circle.area, 136, 0) @skipUnlessDBFeature("has_Centroid_function") def test_centroid(self): -- cgit v1.2.1