9d11522599
Removed some more unused local vars
2013-09-08 12:20:01 -07:00
96fd5557f9
Removed a ton of unused local vars
2013-09-08 08:05:16 -07:00
5649c0af9d
Fixed "indentation is not a multiple of four" pep8 issues.
2013-09-03 14:22:21 -04:00
11cd7388f7
Fixed #20989 -- Removed useless explicit list comprehensions.
2013-08-30 10:57:51 -04:00
c7d0ff0cad
Fixed #20989 -- Removed explicit list comprehension inside dict() and tuple()
...
Thanks jeroen.pulles at redslider.net for the suggestion and
helper script.
2013-08-29 12:11:03 -04:00
3e0eb2d788
Fixed a number of lint warnings, particularly around unused variables.
2013-08-04 09:17:10 -07:00
cfcf4b3605
Stopped using django.utils.unittest in the test suite.
...
Refs #20680 .
2013-07-01 14:29:33 +02:00
ffcf24c9ce
Removed several unused imports.
2013-06-19 17:18:40 +02:00
0fa8d43e74
Replaced `and...or...` constructs with PEP 308 conditional expressions.
2013-05-26 23:47:50 -03:00
9012833af8
Fixed #17365 , #17366 , #18727 -- Switched to discovery test runner.
...
Thanks to Preston Timmons for the bulk of the work on the patch, especially
updating Django's own test suite to comply with the requirements of the new
runner. Thanks also to Jannis Leidel and Mahdi Yusuf for earlier work on the
patch and the discovery runner.
Refs #11077 , #17032 , and #18670 .
2013-05-10 23:08:45 -04:00
ddfc68379f
Changed a deprecated warn() call in libgeos
2013-04-11 11:01:17 +02:00
747f7d2549
Fixed #20036 -- Improved GEOS version string parsing
...
Thanks chikiro.spam at gmail.com for the report.
2013-03-13 09:52:33 +01:00
360217fc87
Fixed #19171 -- Allowed coordinate transforms with custom SRIDs
...
Thanks reidpr at lanl.gov for the report.
2013-03-09 17:46:20 +01:00
5e80571bf9
Fixed #16594 -- Added wkt 3D support for GEOS geometries
...
This requires GEOS >= 3.3.0 to function properly. On previous
versions, the Z dimension will simply not appear in the wkt.
Disabled OpenLayers editing for 3D geometries (unsupported).
2013-03-09 12:02:22 +01:00
87854b0bdf
Fixed geos test to prevent random failure
...
Points in the test fixtures have 20 as max coordinate.
2013-02-15 20:13:36 +01:00
ee26797cff
Fixed typos in docs and comments
2013-01-29 10:55:55 -07:00
cc3c4a9d55
Fixed #19366 -- Prevented GEOSIndexError when comparing geometries
...
Thanks Craig de Stigter for the report and collaboration on the
patch.
2012-11-28 22:34:02 +01:00
950e6183c6
Need to catch `ImproperlyConfigured` to be freed from the schackles of `DJANGO_SETTINGS_MODULE`.
2012-10-05 14:38:01 -07:00
53c8b2c0c5
Fixed #17959 -- Silenced output during GIS tests
2012-10-04 22:41:03 +02:00
ffdd6595ea
Fixed #18919 -- Stopped dropping Z attribute when transforming geometries
...
Previously, the wkb of geometries was dropping the Z attribute.
Thanks luizvital for the report and tests and georger.silva@gmail.com
for the tests.
2012-09-29 12:33:18 +02:00
2f6e00a840
Fixed #11948 -- Added interpolate and project linear referencing methods
...
Thanks novalis for the report and the initial patch, and Anssi
Kääriäinen and Justin Bronn for the review.
2012-09-29 11:22:28 +02:00
5330cd50cd
[py3] Fixed GEOS/GDAL tests
2012-09-23 19:59:27 +02:00
8cdc84726e
[py3] Added buffer/memoryview compatibility
...
Even if buffer and memoryview are not strictly identical, it should
be safe to consider them equivalent for GIS support.
Thanks Aymeric Augustin for the review.
2012-09-23 19:55:53 +02:00
7e5ebcce53
Fixed #18795 -- Fixed failing GeoDjango tests
...
Proj.4 and SRS strings may slightly vary depending on the installed
libraries. Made some tests pass again with recent Proj.4/GDAL lib
versions.
2012-09-13 16:20:11 +02:00
fbd4b3a518
[py3] Fixed GeoDjango mutable list tests
2012-09-12 16:13:58 +02:00
c2c8d4044e
Made minimal changes to make gis test suite start with Python 3
2012-09-12 15:03:46 +02:00
a84d79f572
[py3] Added Python 3 compatibility for xrange.
2012-07-22 09:29:56 +02:00
ca07fda2ef
[py3] Switched to Python 3-compatible imports.
...
xrange/range will be dealt with in a separate commit due to the huge
number of changes.
2012-07-22 09:29:56 +02:00
bdca5ea345
[py3] Replaced unicode/str by six.text_type/bytes.
2012-07-22 09:29:54 +02:00
3cb2457f46
[py3] Replaced basestring by six.string_types.
2012-07-22 09:29:54 +02:00
56dbe924a6
[py3] Removed longs.
2012-07-22 09:29:53 +02:00
cdcdd131da
Dropped support for GDAL < 1.5
...
GDAL 1.5 has been released in December 2007.
2012-07-15 21:10:32 +02:00
17824e2b74
Fixed #17736 -- Kept maximal floating-point accuracy in from_bbox
...
When constructing a polygon with Polygon.from_bbox, do not convert
parameters to strings at this stage (str defaults to 12 significant
digits).
Thanks tdihp@hotmail.com for the report and David Eklung for the patch.
2012-06-06 10:09:32 +02:00
5ef599c7b3
Used skipUnless decorator to skip tests in geos tests.
2012-06-04 20:39:54 +02:00
a768b1d94a
Removed numbering of GEOS tests.
2012-05-28 11:15:31 +02:00
817535d73e
Replaced types.NoneType occurrences
...
In Python 3, types.NoneType is no more available.
2012-05-23 12:20:03 +02:00
02eca6c0e2
Added more relative imports in contrib.gis.
2012-05-18 17:06:25 +02:00
d04f72fb31
Got rid of old __cmp__methods replaced by rich comparison.
...
The __cmp__ methods are unsupported in Python 3.
_doctest.py has been left untouched because it is likely it will
not be migrated to Python 3.
2012-05-18 14:52:24 +02:00
169b1a404c
Replaced foo.next() by next(foo).
...
This new syntax for next() has been introduced in Python 2.6 and is
compatible with Python 3.
2012-05-10 20:15:49 +02:00
d7dfab59ea
Replaced cStringIO.StringIO by io.BytesIO.
...
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
2012-05-05 21:41:44 +02:00
865cd35c9b
Made more extensive usage of context managers with open.
2012-05-05 14:06:36 +02:00
596cb9c7e2
Replaced print statement by print function (forward compatibility syntax).
2012-04-30 20:45:03 +02:00
844e56e21a
Fixed #18039 -- Changed geometry transform without a SRID raise a GEOSException.
...
This was planned in the official deprecation timeline for 1.5.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-12 16:35:28 +00:00
771fce45b4
Fixed #17212 -- Made GEOS version regular expression more robust. Thanks, strk.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 17:09:18 +00:00
20c8aa2a20
Fixed various dodgy behaviours
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 17:37:24 +00:00
f97a574196
Fixed #16864 -- WKT regex now allows negative SRIDs. Thanks, Marcel Dancak for bug report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-16 21:19:30 +00:00
bce890ace4
Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:14:15 +00:00
24f4764a48
Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-13 09:35:51 +00:00
a87be3554f
Removed a bunch of Python 2.4 workarounds now that we don't support it. Refs #15702 -- thanks to jonash for the patch. Splitting this over muliple commits to make it more manageable.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 01:40:43 +00:00
4da019ea19
Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:44:26 +00:00
afd040d4d3
Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:
...
assert_ -> assertTrue
assertEquals -> assertEqual
failUnless -> assertTrue
For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 15:04:39 +00:00
553adfa6d1
Fixed #13488 -- No longer generate unhandled exceptions that may occur when destructors of global GEOS I/O objects are called on process termination.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 20:11:19 +00:00
5fddfda559
Fixed #13788 -- `GEOSGeometry.transform` no longer silently no-ops when GDAL isn't available. Thanks, Rob Coup.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 17:43:30 +00:00
0b2fef5dd3
Fixed brittle test case for `GEOSGeometry.valid_reason`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 16:41:53 +00:00
cabc21ca60
Fixed #14318 -- Added `GEOSGeometry.valid_reason` property. Thanks, Rob Coup.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 01:29:37 +00:00
315ae1ce6e
Fixed regression introduced in r13755 that prevented the running of the GEOS/GDAL test suites without configuring Django settings; moved reference geometry data from Python module to compressed JSON fixture; put in workaround in tests for GDAL bug #3783 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 21:56:48 +00:00
121d2e3678
Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 12:55:17 +00:00
2fa2cf0a09
No longer use the deprecated GEOS C API function `GEOSGeomFromWKB_buf` when unpickling `GEOSGeometry` objects.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 18:55:52 +00:00
25f47bbbb6
Applied DRY and centralized geometry input regular expressions; `OGRGeometry` may now consume and output EWKT.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-27 03:32:30 +00:00
32e0117abb
Fixed #10923 -- The GEOS bindings now use the thread-safe API, when applicable. Thanks, Tuure Laurinolli, for assistance in developing this patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 18:40:54 +00:00
5ceed0a053
Changed a whole bunch of places to raise exception instances instead of old-style raising exception classes plus a comma. Good for the future Python 3 conversion
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:36:20 +00:00
2b9d216ffc
When `GEOSFree` is not available on NT platforms, have to specifically use the MS C library.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-29 10:39:08 +00:00
f58fb383fb
Fixed #12450 -- `GEOSFree` was really added in GEOS 3.1.1, not 3.1.0. Thanks, jpwatts for the bug report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-27 08:07:08 +00:00
474fb8c3ae
Fixed #12438 -- now use `GEOSFree` to free string pointers allocated within GEOS when available; now parse out subminor version, and added a `GEOS_VERSION` tuple.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 14:53:51 +00:00
574eafe4c0
Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:06:41 +00:00
32d0730b89
Fixed #11433 -- 3D geometry fields are now supported with PostGIS; EWKB is now used by `PostGISAdaptor`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-16 18:49:00 +00:00
3f8f3f8411
Now raise an exception when trying to export 3D (HEX)EWKB when using GEOS 3.0 due to bug in that underlying library version.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-10 17:28:20 +00:00
36fe303e35
Added `ewkb` and `hexewkb` properties to `GEOSGeometry`. Refs #11433 , #12010 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-10 03:35:25 +00:00
55968a6edd
Fixed GEOS & GDAL C function prototypes to explicitly use a subclass of `c_char_p` as the return type on routines that return strings. This prevents crashes on some 64-bit platforms, like FreeBSD. Thanks to wilsaj for discovering the problem. Refs #9747 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-09 02:00:40 +00:00
50745cc31e
Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:45:28 +00:00
5e58810e21
Applied latest changes to `ListMixin` from Aryeh Leib Taurog and added him to AUTHORS; fixed memory leak introduced in r10174 -- no longer call `ListMixin.__init__` and set methods manually because it created references that prevented garbage collection; fixed several routines that had no need to be class methods.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 18:32:17 +00:00
19d1450929
Tweaked a GIS expected test failure.
...
The test was only checking for geos version 3.0.0, but it failed for all
3.0.x versions. This change makes the version check skip the test for
anything 3.0-ish.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-04 03:20:39 +00:00
f0b7cc4a23
Cleanup, bug fixes, and new tests for the GEOS I/O objects and `GEOSBase` object.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-28 16:36:48 +00:00
0b9a855bed
Fixed #10620 -- removed carriage returns in a GEOS tests module; fixed other errata such as unnecessary `pymutable_geometries` module and not having `GEOSGeometry` call `__init__`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-26 02:07:11 +00:00
66e1670efa
Refactored the GEOS interface. Improvements include:
...
* Geometries now allow list-like manipulation, e.g., can add, insert, delete vertexes (or other geometries in collections) like Python lists. Thanks, Aryeh Leib Taurog.
* Added support for GEOS prepared geometries via `prepared` property. Prepared geometries significantly speed up certain operations.
* Added support for GEOS cascaded union as `MultiPolygon.cascaded_union` property.
* Added support for GEOS line merge as `merged` property on `LineString`, and `MultiLineString` geometries. Thanks, Paul Smith.
* No longer use the deprecated C API for serialization to/from WKB and WKT. Now use the GEOS I/O classes, which are now exposed as `WKTReader`, `WKTWriter`, `WKBReader`, and `WKBWriter` (which supports 3D and SRID inclusion)
* Moved each type of geometry to their own module, eliminating the cluttered `geometries.py`.
* Internally, all C API methods are explicitly called from a module rather than a star import.
Fixed #9557 , #9877 , #10222
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-24 00:12:21 +00:00
d39540af92
Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-26 16:02:45 +00:00
6590c0bcf5
Fixed #9747 -- now explicitly set response type on C functions that return WKB and WKT.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 14:29:06 +00:00
1142dd430f
Fixed #9566 -- made GeoJSON regex more robust.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-11 17:21:43 +00:00
cc971910a9
Changed [8727] to use ImportError, which seems to actually work. Not sure what
...
I was smoking when I tested this 10 minutes ago. Refs #8680 . Thanks to gkelly
for cleaning up after me.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29 23:03:12 +00:00
4184d6348e
Fixed #8680 -- Changed a couple of GEOExceptions to Python's RuntimeError so
...
that help() works. Without this change, even if you didn't use the gis stuff,
just using Python 2.5's help() system would crash when searching for model
names.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29 22:51:01 +00:00
79e68c225b
Merged the gis branch into trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-05 18:13:06 +00:00
Alex Gaynor
Tim Graham
Simon Charette
Aymeric Augustin
Ramiro Morales
Carl Meyer
Claude Paroz
Justin Bronn
Adrian Holovaty
Jannis Leidel
Russell Keith-Magee
Jacob Kaplan-Moss
Karen Tracey
Malcolm Tredinnick