Commit Graph

248 Commits

Author SHA1 Message Date
Sergey Fedoseev d453dfb1da Refs #28024 -- Optimized GEOSCoordSeq.tuple by avoiding superfluous index and dimension checks. 2017-04-11 12:46:41 -04:00
Sergey Fedoseev 12d0567aa5 Fixed #28020 -- Made GEOSGeometry.json use OGRGeometry.json for better performance. 2017-04-05 09:03:24 -04:00
Sergey Fedoseev 24023c6a8f Fixed #25874 -- Made GEOSGeometry read SRID from GeoJSON input. 2017-04-01 15:35:30 -04:00
Sergey Fedoseev 6ecccad711 Fixed #25873 -- Made GEOSGeometry handle the srid parameter more predictably. 2017-03-30 09:38:26 -04:00
Sergey Fedoseev 4bc355079c Fixed #27973 -- Fixed GeoJSON representation of LinearRing and custom GEOSGeometry subclasses. 2017-03-29 13:17:31 -04:00
Vytis Banaitis 3dcc351691 Refs #23919 -- Used yield from. 2017-02-23 20:06:01 -05:00
Anton Samarchyan 5411821e3b Refs #27656 -- Updated django.contrib docstring verb style according to PEP 257. 2017-02-04 16:39:28 -05:00
Vytis Banaitis 8838d4dd49 Refs #23919 -- Replaced kwargs.pop() with keyword-only arguments. 2017-02-01 11:41:56 -05:00
chillaranand d6eaf7c018 Refs #23919 -- Replaced super(ClassName, self) with super(). 2017-01-25 12:23:46 -05:00
Claude Paroz 042b7350a0 Refs #23919 -- Removed unneeded str() calls 2017-01-20 14:13:55 +01:00
Simon Charette cecc079168 Refs #23919 -- Stopped inheriting from object to define new style classes. 2017-01-19 08:39:46 +01:00
Aymeric Augustin eb422e476f Refs #23919 -- Removed obsolete __ne__() methods.
__ne__() defaults to the opposite of __eq__() on Python 3
when it doesn't return NotImplemented.
2017-01-18 21:44:00 -05:00
Claude Paroz 2b281cc35e Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
2017-01-18 21:33:28 +01:00
Claude Paroz 7b2f2e74ad Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
2017-01-18 20:18:46 +01:00
Claude Paroz d7b9aaa366 Refs #23919 -- Removed encoding preambles and future imports 2017-01-18 09:55:19 +01:00
Tim Graham 7e63e84572 Refs #25773 -- Removed deprecated geos.MultiPolygon.cascaded_union property. 2017-01-17 20:52:02 -05:00
Tim Graham 997c9f7099 Refs #25665 -- Removed deprecated getter/setter of Point.tuple. 2017-01-17 20:52:02 -05:00
Tim Graham 19d8e64ac3 Refs #25665 -- Removed deprecated getters/setters of Point coordinate properties. 2017-01-17 20:52:02 -05:00
Tim Graham a0149848f7 Refs #25665 -- Removed GEOSGeometry.get/set_srid() per deprecation timeline. 2017-01-17 20:52:01 -05:00
Sergey Fedoseev b01ceae843 Fixed #25938 -- Factored out CPointerBase base class for GEOSBase/GDALBase. 2016-12-15 16:59:08 -05:00
Sergey Fedoseev 9b79281e31 Fixed #27472 -- Fixed GEOSGeometry('POINT EMPTY').transform crash. 2016-12-08 10:24:05 -05:00
Sergey Fedoseev a413ef2155 Refs #27472 -- Fixed OGRGeometry('POINT EMPTY').geos crash. 2016-12-08 10:24:05 -05:00
Sergey Fedoseev 65a1f32319 Refs #27472 -- Fixed GEOSGeometry('POINT EMPTY').ogr crash. 2016-12-08 10:24:05 -05:00
Sergey Fedoseev b90d72facf Refs #26789 -- Fixed output of WKBWriter for empty points and polygons. 2016-12-06 13:58:22 -05:00
Claude Paroz cc9e429701 Fixed #27557 -- Casted GEOSGeometry only when necessary
Thanks Pete Flugstad for the report, and Tim Graham for the review.
2016-11-30 17:49:41 +01:00
Sergey Fedoseev 21322f9271 Fixed #27552 -- Added docs/test for GEOSGeometry.normalize(). 2016-11-30 07:39:03 -05:00
Jackie Leng 50613d957a Fixed #26920 -- Made GEOSGeometry equality check consider the srid 2016-11-23 09:23:06 +01:00
Ramin Farajpour Cami 967be82443 Fixed E305 flake8 warnings. 2016-11-14 12:30:46 -05:00
Sergey Fedoseev 5ce660cd65 Fixed #25940 -- Added OGRGeometry.from_gml() and GEOSGeometry.from_gml(). 2016-06-21 15:46:27 -04:00
Claude Paroz f7a363ee1d Fixed #26753 -- Made GDAL a required dependency for contrib.gis
Thanks Tim Graham for the review.
2016-06-18 10:58:02 +02:00
Nicolas Noé e158ec0ba0 Fixed #26333 -- Made GIS Geometry classes deconstructible. 2016-05-13 11:30:19 -04:00
Claude Paroz 9686c888d6 Fixed #25951 -- Trimmed default representation of GEOSGeometry
Thanks Sergey Fedoseev for the report.
2016-04-17 15:31:12 +02:00
Claude Paroz 10c53385f8 Fixed #26510 -- Allowed dim/trim/precision as WKTWriter init arguments
Thanks Tim Graham for the review.
2016-04-16 19:51:00 +02:00
Claude Paroz 05d08367d7 Set WKTWriter trim/precision only when changed 2016-04-16 19:51:00 +02:00
Claude Paroz d419b0c9bd Converted property syntax of WKBWriter 2016-04-16 19:51:00 +02:00
Tim Graham df8d8d4292 Fixed E128 flake8 warnings in django/. 2016-04-08 09:51:06 -04:00
Tim Graham 59ef6559a3 Reverted #25961 -- Removed handling of thread-non-safe GEOS functions.
This reverts commit 312fc1af7b as it seems
to cause segmentation faults as described in the ticket.
2016-01-07 18:54:41 -05:00
Ville Skyttä e6ca15c13f Passed logging message parameters as arguments instead of interpolating them. 2015-12-26 18:35:42 -05:00
Sergey Fedoseev 312fc1af7b Fixed #25961 -- Removed handling of thread-non-safe GEOS functions. 2015-12-23 08:02:37 -05:00
Sergey Fedoseev 5d348bba31 Fixed #25950 -- Added support for GEOSisClosed. 2015-12-22 16:54:02 -05:00
Sergey Fedoseev c984e2bc15 Fixed #25869 -- Added trim and precision properties to WKTWriter. 2015-12-18 19:44:43 +01:00
Sergey Fedoseev 5146e2cf98 Fixed #25662 -- Allowed creation of empty GEOS geometries. 2015-12-14 13:29:38 -05:00
Claude Paroz cd40d9e721 Fixed #25657 -- Ignored exceptions when destroying geometry objects
Due to randomness of garbage collection with geometry objects, it's
easier to simply ignore AttributeError/TypeError generally raised when
parts of objects are already garbage-collected.
Thanks Sergey Fedoseev and Tim Graham for reviewing the patch.
2015-12-08 22:06:34 +01:00
Claude Paroz b52b9cf6f2 Refs #25655 -- Made HAS_GEOS depend on a minimum version.
This skips some tests on systems with GEOS < 3.3 (the minimum
supported version).
2015-12-03 18:22:58 -05:00
Josh Soref 93452a70e8 Fixed many spelling mistakes in code, comments, and docs. 2015-12-03 12:48:24 -05:00
Sergey Fedoseev f920be7c32 Fixed #25773 -- Deprecated the geos.MultiPolygon.cascaded_union property. 2015-11-25 17:31:24 -05:00
Sergey Fedoseev 229fc793a0 Refs #25663 -- Fixed checking of the number of points for LineString if initialized from numpy.array. 2015-11-23 17:36:06 -05:00
Sergey Fedoseev ccc8f67b77 Fixed #25722 -- Added the GEOSGeometry.covers() method. 2015-11-20 12:36:03 -05:00
Sergey Fedoseev 034dfbfc05 Fixed #25654 -- Added the GEOSGeometry.unary_union property. 2015-11-18 19:17:16 -05:00
Sergey Fedoseev 1e35dd1a05 Fixed #25663 -- Added checking of the number of points for LinearRing and LineString. 2015-11-18 18:36:10 -05:00
Sergey Fedoseev 7a452c5ce2 Fixed #25665 -- Deprecated getter/setter of Point.tuple. 2015-11-18 12:06:03 -05:00
Sergey Fedoseev 7803f429a4 Refs #25665 -- Deprecated getters/setters of Point coordinate properties. 2015-11-18 11:57:26 -05:00
Sergey Fedoseev b7177cc2a4 Refs #25665 -- Deprecated getter/setter of GEOSGeometry.srid. 2015-11-18 11:49:48 -05:00
Claude Paroz 24c1605aa0 Fixed GIS test failures when GDAL is not installed
Thanks Iacopo Spalletti for the report and testing.
2015-11-07 15:12:54 +01:00
Sergey Fedoseev 1b598b4b42 Fixed #25661 -- Fixed checking number of points during list assignment for `LinearRing`. 2015-11-02 22:38:33 +01:00
Sergey Fedoseev 03c6ad7ad4 Fixed #25664 -- Fixed `dims` for `Point` 2015-11-02 19:52:16 +01:00
Sergey Fedoseev b78226cd3d Fixed #25655 -- Dropped support for GEOS < 3.3 2015-11-01 20:41:52 +01:00
Sergey Fedoseev a7bb5af50b Fixed #25583 -- Allowed calling `transform` with `CoordTransform` even if SRID is invalid. 2015-10-24 11:39:24 -04:00
Sergey Fedoseev a272db7008 Fixed #25580 -- Allowed `None` to be set as SRID value. 2015-10-21 09:35:17 +02:00
Tim Graham 197b187810 Fixed #25225 -- Simplified code to remove GEOSIndexError
The test is a regression for refs #4740 to show that the original
fix of GEOSIndexError is no longer needed.
2015-08-18 19:10:47 -04:00
Claude Paroz 1da170a203 Fixed #25141 -- Diminished GDAL dependence during geojson serialization
Only require GDAL if contained geometries need coordinate transformations.
Thanks drepo for the report and Tim Graham for the review.
2015-07-20 20:22:29 +02:00
Tim Graham 7da3923ba0 Sorted imports in __init__.py files. 2015-06-27 11:53:33 -04:00
Claude Paroz 60879a2193 Loaded real destructor functions before garbage time
This is an alternative patch to the unsuccessful b43b27bcd.
2015-06-26 13:41:48 +02:00
Claude Paroz ad82d0003b Revert "Reverted lazy initialization of GIS destroy functions"
This reverts commit b43b27bcdf.
This commit broke tests initialization on systems without GIS libraries.
2015-06-25 23:37:36 +02:00
Claude Paroz b43b27bcdf Reverted lazy initialization of GIS destroy functions
Partial revert of 61d09e61. At __del__ time, it might be to late to bind
those functions.
2015-06-25 21:05:48 +02:00
Tim Graham 4b600ed244 Removed django.utils.functional.total_ordering() 2015-06-15 13:15:24 -04:00
Piotr Jakimiak 4157c502a5 Removed unnecessary arguments in .get method calls 2015-05-13 20:51:18 +02:00
Tim Graham 783572abc4 Fixed #24750 -- Updated two contrib.gis comment links 2015-05-06 12:01:56 -04:00
Claude Paroz b695153852 Rearranged imports in geos files 2015-04-24 20:30:23 +02:00
Claude Paroz d9bcba9b29 Removed many HAS_GEOS conditional imports 2015-04-24 20:30:23 +02:00
Claude Paroz 61d09e61f5 Lazy loading of GEOS functions 2015-04-24 20:30:23 +02:00
Tim Graham ad0be620ae Moved contrib.gis tests out of contrib. 2015-02-11 10:29:54 -05:00
Daniel Wiesmann 32ed4c202f Moved numpy import helper to shortcuts
Numpy will be used in both the geos and gdal modules,
so the import should sit in the parent module gis.
2015-02-09 15:51:19 +01:00
Collin Anderson db77915c9f Fixed E265 comment style 2015-02-06 09:30:35 -05:00
Tim Graham 0ed7d15563 Sorted imports with isort; refs #23860. 2015-02-06 08:16:28 -05:00
Adam Taylor 039465a6a7 Fixed typos in code comments. 2015-01-20 12:18:03 -05:00
Claude Paroz b86107ced1 Fixed #24114 -- Improved error message in GEOSGeometry constructor 2015-01-10 18:53:55 +01:00
Michael Hall 895dc880eb Fixed #23812 -- Changed django.utils.six.moves.xrange imports to range 2014-12-13 12:45:58 -05:00
Jon Dufresne 4468c08d70 Fixed #23968 -- Replaced list comprehension with generators and dict comprehension 2014-12-08 07:58:23 -05:00
Berker Peksag f7969b0920 Fixed #23620 -- Used more specific assertions in the Django test suite. 2014-11-03 11:56:37 -05:00
Claude Paroz 2e5b2c612e Fixed #23579 -- Changed GEOSGeometry.__str__ to include the SRID
Thanks Tim Graham for the review.
2014-10-16 09:30:37 +02:00
Claude Paroz 3339605821 Added a dumpdata/loaddata test for geographic content 2014-10-01 21:31:35 +02:00
Claude Paroz 8f334e55be Fixed #13843 -- Prevented AttributeError during geometry objects deletion 2014-09-12 20:45:59 +02:00
Tim Graham 1101467ce0 Limited lines to 119 characters in django/
refs #23395.
2014-09-05 09:22:16 -04:00
Claude Paroz e97b7a2677 Fixed #22714 -- Made contrib.gis use six-provided memoryview type
Thanks Tim Graham for the report.
2014-05-28 09:24:08 +02:00
Claude Paroz c082f3c74c Fixed #22456 -- Replaced 900913 EPSG code by 3857 in some tests
3857 is now the official EPSG code for the Google spherical mercator
projection and some recent versions of GDAL do not recognize 900913
any longer.
Thanks Tim Graham for the report and initial patch.
2014-04-17 21:18:07 +02:00
Alex Gaynor 778ce245dd Corrected many style guide violations that the newest version of flake8 catches 2014-03-30 12:11:05 -07:00
Tim Graham 2cc8840397 Removed unused imports. 2014-03-29 08:54:30 -04:00
Claude Paroz c5d1df70a4 Dropped support for GEOS 3.1 2014-03-29 11:08:52 +01:00
Rodolfo Carvalho 0d91225892 Fixed many typos in comments and docstrings.
Thanks Piotr Kasprzyk for help with the patch.
2014-03-03 07:38:09 -05:00
Alex Gaynor dbe2fb632d Added a missing import and removed an unneeded import 2013-12-24 08:35:13 -08:00
Claude Paroz 9267fb88ef Added more spatial predicates for prepared geometries
GEOS 3.3 added crosses, disjoint, overlaps, touches and within
predicates on prepared geometries.
2013-12-24 16:53:09 +01:00
Claude Paroz d17404aa90 Dropped support for GEOS < 3.1 2013-12-24 15:57:13 +01:00
Claude Paroz 542198c1d0 Fixed #21662 -- Kept parent reference in prepared geometry
Thanks Robert Scott for the report.
2013-12-24 15:25:48 +01:00
Loic Bistuer 6685713869 Fixed E127 pep8 warnings. 2013-12-14 11:59:15 -05:00
Alex Gaynor c347f78cc1 Fixed all E226 violations 2013-11-03 10:08:55 -08:00
coagulant 3bc0d46a84 Fixed all E261 warnings 2013-11-02 18:20:39 -04:00
Alex Gaynor 7548aa8ffd More attacking E302 violators 2013-11-02 13:12:09 -07:00
Tim Graham 36ded01527 Fixed #21302 -- Fixed unused imports and import *. 2013-11-02 15:24:56 -04:00
Alex Gaynor 19256f300e Continue to attack E302 violations 2013-11-02 10:18:46 -07:00