Commit Graph

439 Commits

Author SHA1 Message Date
Justin Bronn 5a64bd38e6 Forgot to import `unittest` from `django.utils`. 2012-10-05 15:51:45 -07:00
Justin Bronn 065b52f18e Updated `GeoSQLCompiler.get_default_columns`. 2012-10-05 15:43:04 -07:00
Justin Bronn 1c010ce41d Skip `LayerMapRouterTest` if there are not multiple databases. 2012-10-05 15:26:33 -07:00
Justin Bronn c1b06c8137 Lowered tolerance to fix failing distance test. 2012-10-05 14:55:15 -07:00
Justin Bronn db78086b45 Added comment in `geoapp` tests about PostGIS 2.0 change in ST_NumGeometries. 2012-10-05 14:47:04 -07:00
Justin Bronn 950e6183c6 Need to catch `ImproperlyConfigured` to be freed from the schackles of `DJANGO_SETTINGS_MODULE`. 2012-10-05 14:38:01 -07:00
Claude Paroz 53c8b2c0c5 Fixed #17959 -- Silenced output during GIS tests 2012-10-04 22:41:03 +02:00
Claude Paroz 0ad6d7e612 Removed unused and undocumented gdal_release_date function 2012-10-04 22:35:59 +02:00
Claude Paroz d25a599dca Fixed #19063 -- Fixed version parameter of gml GeoQuerySet method
Thanks lmisek@go2.pl for the report.
2012-10-03 13:32:26 +02:00
Claude Paroz 864a0514b8 Cared for PostGIS 2 renamed operations 2012-09-30 22:54:01 +02:00
Flavio Curella 92b5341b19 Fixed #16455 -- Added support for PostGIS 2.0
Thanks ckarrie for the report and the initial patches, Flavio Curella
for updating the patch, and Anssi Kääriäinen for testing. See ticket
for other valuable contributors.
2012-09-30 22:49:41 +02:00
Claude Paroz 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
Claude Paroz 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
Claude Paroz 6eda8d784a Enlarged exception catching when testing for GDAL presence
Other import errors than ImportError can happen during import of
GDAL files (e.g. OGRException). Some further auditing may be needed
if we want to restrict the catched exceptions at a later stage.
Thanks Ramiro Morales for raising the issue.
2012-09-24 16:06:04 +02:00
Claude Paroz 54c81a1c93 [py3] Allowed bytes in get_prep_value for a Geometry 2012-09-23 22:49:22 +02:00
Claude Paroz 43c7f8c3a3 [py3] Fixed unicode string in geoapp test 2012-09-23 22:11:46 +02:00
Claude Paroz 874908e3bb [py3] Updated PostGIS adapter 2012-09-23 20:32:52 +02:00
Claude Paroz 799786a7b6 [py3] Fixed outdated map() call in GIS sql compiler 2012-09-23 20:32:52 +02:00
Claude Paroz 5330cd50cd [py3] Fixed GEOS/GDAL tests 2012-09-23 19:59:27 +02:00
Claude Paroz 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
Brian Galey 0ab8c58ca8 Fixed #18968 -- Only use separate GML regex for SpatiaLite < 3.0 2012-09-22 15:10:42 +02:00
Claude Paroz 59afc18f37 Made geo3d tests independent from each other 2012-09-22 11:39:53 +02:00
Claude Paroz 89136b2725 Fixed #16577 -- Added a map_creation block in openlayers.js template 2012-09-20 10:31:37 +02:00
Claude Paroz 7e32dab3a6 Fixed #17687 -- Made LayerMapping router-aware
Thanks nosamanuel@gmail.com for the report and the initial patch.
2012-09-20 10:12:47 +02:00
Claude Paroz 65793d714c Used ST_AsText for testing PostGIS raw query
AsText will not be supported in further versions of PostGIS (>=2).
2012-09-15 12:02:28 +02:00
Claude Paroz 690170a8b9 Removed unused quoting/encoding in gis db backend 2012-09-13 20:17:52 +02:00
Claude Paroz 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
Claude Paroz fbd4b3a518 [py3] Fixed GeoDjango mutable list tests 2012-09-12 16:13:58 +02:00
Claude Paroz c2c8d4044e Made minimal changes to make gis test suite start with Python 3 2012-09-12 15:03:46 +02:00
Malcolm Tredinnick c4aa26a983 Internal refactoring; moving LOOKUP_SEP up one level.
In an ideal world, nothing except django.db.models.query should have to
import stuff from django.models.sql.*. A few things were needing to get
hold of sql.constants.LOOKUP_SEP, so this commit moves it up to
django.db.models.constants.LOOKUP_SEP.

There are still a couple of places (admin) poking into sql.* to get
QUERY_TERMS, which is unfortunate, but a slightly different issue and
harder to adjust.
2012-09-08 19:51:36 -04:00
Claude Paroz ebc773ada3 Replaced many smart_bytes by force_bytes
In all those occurrences, we didn't care about preserving the
lazy status of the strings, but we really wanted to obtain a
real bytestring.
2012-08-29 11:20:32 +02:00
Claude Paroz 62e1c5a441 Fixed #17448 -- Improved test and documented raw-sql gis query 2012-08-25 14:39:52 +02:00
Claude Paroz d7a2e816a1 Added a GeoDjango test with a raw query (Refs #17448)
Thanks David Eklund for the initial patch.
2012-08-25 11:12:43 +02:00
Aymeric Augustin 5301a9d7b1 [py3] Removed duplicate imports.
Fixed #18837. Refs #18791.
2012-08-23 10:16:16 +02:00
Julien Phalip 675431dfaa Fixed #17278 -- Enabled the spatialite GIS tests to run without having to specify a database name in the settings. Thanks to Aymeric for the report and to Ramiro for the initial patch. 2012-08-19 02:17:45 -07:00
Anssi Kääriäinen 5d01f3caea [py3] Removed map() calls used for side-effects only 2012-08-15 13:23:41 +03:00
Aymeric Augustin d4a0b27838 [py3] Refactored __unicode__ to __str__.
* Renamed the __unicode__ methods
* Applied the python_2_unicode_compatible decorator
* Removed the StrAndUnicode mix-in that is superseded by
  python_2_unicode_compatible
* Kept the __unicode__ methods in classes that specifically
  test it under Python 2
2012-08-12 14:44:40 +02:00
Alex Gaynor 4c97101b1f remove a bunch of unnescesarry iterkeys() calls 2012-08-08 07:33:15 -07:00
Claude Paroz 2da3af23aa [py3] Made gis.measure Python 3-compatible 2012-08-08 14:43:16 +02:00
Aymeric Augustin 9e0a10ba77 [py3] Minor fix in django.contrib.gis. 2012-08-07 12:00:24 +02:00
Aymeric Augustin c5ef65bcf3 [py3] Ported django.utils.encoding.
* Renamed smart_unicode to smart_text (but kept the old name under
  Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
  and smart_bytes under Python 2 (which is backwards compatible).
  Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
  want a str.
2012-08-07 12:00:22 +02:00
Aymeric Augustin ee191715ea [py3] Fixed access to dict keys/values/items. 2012-08-07 12:00:22 +02:00
Justin Bronn 1c3464e809 Fixed testing on SpatiaLite 2.4, which has support for `InitSpatialMetaData`. 2012-08-04 18:10:34 -07:00
Claude Paroz 2407c45c18 Removed some pre-1.3.0 postgis compatibility code 2012-08-03 11:27:31 +02:00
Claude Paroz c5d6f6d682 Reorganized geoapp gis tests
Removed the numbering of tests and moved lookup/geoqueryset tests
in their own test class.
2012-08-03 10:53:30 +02:00
Aymeric Augustin a84d79f572 [py3] Added Python 3 compatibility for xrange. 2012-07-22 09:29:56 +02:00
Aymeric Augustin 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
Aymeric Augustin bdca5ea345 [py3] Replaced unicode/str by six.text_type/bytes. 2012-07-22 09:29:54 +02:00
Aymeric Augustin 3cb2457f46 [py3] Replaced basestring by six.string_types. 2012-07-22 09:29:54 +02:00
Aymeric Augustin 56dbe924a6 [py3] Removed longs. 2012-07-22 09:29:53 +02:00
Claude Paroz 35ddeee455 Removed debugging line left in previous commit 2012-07-15 21:19:23 +02:00
Claude Paroz cdcdd131da Dropped support for GDAL < 1.5
GDAL 1.5 has been released in December 2007.
2012-07-15 21:10:32 +02:00
Luke Plant b0eee0ba4b Removed various unnecessary instances of mark_safe applied to URLs
Also fixed some test breakages introduced in last commit
2012-07-03 22:20:12 +01:00
Luke Plant a92e7f37c4 Changed a lot of internal code to use 'format_html' where appropriate/possible 2012-07-03 22:20:12 +01:00
Claude Paroz 41eb70f762 Fixed #15271 -- Defined a to_python method for GeometryField
Thanks volrath and copelco for their work on the patch.
2012-06-19 14:55:40 +02:00
danger 45a1a54b0b Added support for gdal 1.9. 2012-06-19 11:33:27 +02:00
Florian Apolloner ac1b9ae630 Fixed GIS testsuite.
Moved HAS_SPATIALREFSYS back into the tests namespace since it only operates
on the default database and isn't a global flag like HAS_GDAL.
2012-06-17 11:39:02 +02:00
Julien Phalip 1794e36fa1 Skip GeometryFieldTest if there's no spacial database. 2012-06-16 13:57:33 -07:00
Claude Paroz 023b70415b Executed SpatialRefSysTest only with spatial backend 2012-06-14 21:44:08 +02:00
Claude Paroz 88601bad84 Discovered some geodjango tests with standard mechanism
No need to special case tests discovery for regular first-level
gis tests.
2012-06-14 21:10:30 +02:00
Claude Paroz 4d46106f8c Fixed #17754 -- Refactored gis.measure
This refactoring does allow much easier MeasureBase subclassing.
Many thanks to Ricardo di Virgilio for the initial patch.
2012-06-14 15:32:42 +02:00
Claude Paroz aa423575e7 Fixed #17760 -- Implemented callable database features as cached properties
This does remove the requirement to call features.confirm() method
before checking the properties.
Thanks cdestiger and Ramiro Morales for their work on the patch.
2012-06-09 15:59:52 +02:00
Claude Paroz 4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
Claude Paroz 9c096ab981 Fixed #17328 -- Added OpenLayersWidget _has_changed method
Thanks Will Hardy for the report and the patch.
2012-06-06 10:42:14 +02:00
Claude Paroz 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
Claude Paroz 5ef599c7b3 Used skipUnless decorator to skip tests in geos tests. 2012-06-04 20:39:54 +02:00
Claude Paroz a768b1d94a Removed numbering of GEOS tests. 2012-05-28 11:15:31 +02:00
Claude Paroz c2139bbcef Updated WMS URL in geoadmin test. 2012-05-26 00:02:15 +02:00
Claude Paroz ce8f874b88 Fixed #14886 -- Added wms_options dict to GeoModelAdmin.
It is now possible to set WMS options by overriding wms_options
in a subclass of GeoModelAdmin.
Thanks slinkp for the report and the initial patch.
2012-05-25 21:00:44 +02:00
Claude Paroz f4abba5200 Fixed #18367 -- Allowed LayerMapping to store strings in TextField.
Thanks geoffhing@gmail.com for the report.
2012-05-24 09:57:22 +02:00
Claude Paroz f1ebcdc7c2 Modernized contrib.gis layermapping tests.
In particular, make tests independent of each other.
2012-05-24 09:52:06 +02:00
Claude Paroz 817535d73e Replaced types.NoneType occurrences
In Python 3, types.NoneType is no more available.
2012-05-23 12:20:03 +02:00
Claude Paroz 02eca6c0e2 Added more relative imports in contrib.gis. 2012-05-18 17:06:25 +02:00
Claude Paroz 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
Claude Paroz 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
Claude Paroz 1aae1cba99 Imported zip from future_builtins instead of itertools.izip.
In Python 3, itertools.izip is not available any more (behaviour
integrated in standard zip).
2012-05-07 17:25:12 +02:00
Claude Paroz 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
Claude Paroz 865cd35c9b Made more extensive usage of context managers with open. 2012-05-05 14:06:36 +02:00
Claude Paroz b52672d778 Replaced deprecated TestCase methods. Refs #17049. 2012-05-03 16:39:16 +02:00
Aymeric Augustin e84f79f051 Fixed #18042 -- Advanced deprecation warnings.
Thanks Ramiro for the patch.
2012-05-03 15:27:01 +02:00
Claude Paroz 596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Alex Gaynor d5a277ba4d Switch a datastructure internal to the ORM to be a set, instead of a dictionary. 2012-04-29 22:18:30 -04:00
Adrian Holovaty 6ff118cdb9 Fixed #17644 -- Changed Query.alias_map to use namedtuples
This makes the code easier to understand and may even have a benefit in memory usage (namedtuples instead of dicts). Thanks, lrekucki and akaariai
2012-04-29 17:50:48 -05:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions.
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Aymeric Augustin cec6bd5a59 Fixed #18023 -- Removed bundled simplejson.
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
2012-04-29 19:58:00 +02:00
Claude Paroz 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
Claude Paroz 5c53e30607 Fixed #18035 -- Removed deprecated AdminMediaHandler, as per official deprecation timeline. Thanks Jannis Leidel and Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-08 21:13:32 +00:00
Ramiro Morales 7d5979f953 Removed broken function-based custom test runner in GeoDjango
We forgot to delete it during the 1.4 development cycle.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-01 21:03:50 +00:00
Jannis Leidel 5370b94d41 Pulled gis translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:06:20 +00:00
Claude Paroz b452439a6e Fixed #17915 -- Switched GeoModelAdmin default WMS layer URL from Metacarta to OSGeo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-17 20:13:06 +00:00
Claude Paroz 6974886435 Fixed #10625 -- Fixed a Javascript regex in openlayers.js. Thanks timlinux for the report and Aymeric Augustin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-17 16:20:04 +00:00
Jannis Leidel 9d1d1f06db Added Tatar translation. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:15:31 +00:00
Jannis Leidel e540f27475 Added Swahili translation. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:14:48 +00:00
Jannis Leidel 830900c24a Added Nepali translation. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:14:07 +00:00
Jannis Leidel 661139a29e Added Kazakh translation. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:13:24 +00:00
Jannis Leidel e47b92dad7 Added Esperanto to the list of languages. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:12:43 +00:00
Jannis Leidel 43daea5390 Pulled the gis translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:03:19 +00:00
Justin Bronn 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
Ramiro Morales ecc8208f88 Removed executable bits from some files that don't need them.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-09 12:13:31 +00:00
Jannis Leidel 2002ed9e09 Updated gis base translation files with new strings. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 02:24:14 +00:00