innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,691 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

134 Commits

Author SHA1 Message Date
Karen Tracey e0679ef165 [1.1.X] Removed more stray tabs in Python files. 
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-27 16:37:32 +00:00
Justin Bronn 231eb1d3ac [1.1.X] Fixed -- The table quoting function is now argument `get_geo_where_clause`. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 21:59:27 +00:00
Justin Bronn 49194df8c3 [1.1.X] Fixed -- `GeometryProxy` descriptor no longer chokes when accessed from a class rather than an instance, thanks yml and Tobu; removed unnecessary imports from `types` and cleaned up whitespace. 
Backport of r12584 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 21:26:11 +00:00
Justin Bronn 30c6021f80 [1.1.X] When `GEOSFree` is not available on NT platforms, have to specifically use the MS C library. 
Backport of r12024 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-29 10:41:44 +00:00
Justin Bronn db867be91e [1.1.X] Fixed -- Using `select_related()` on geographic fields with the Oracle spatial backend now works. 
Backport of r12022 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-29 10:35:59 +00:00
Justin Bronn f1fe7c00e2 [1.1.X] Fixed -- The `check_pointer` error checking routine and `GDALBase._set_ptr` are now able to handle the long pointer addresses used by some x86_64 platforms. Thanks, rmkemker, for the bug report. 
Backport of r12006 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-27 18:13:20 +00:00
Justin Bronn 90f7dfb461 [1.1.X] Fixed -- `GEOSFree` was really added in GEOS 3.1.1, not 3.1.0. Thanks, jpwatts for the bug report. 
Backport or r12004 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-27 08:13:37 +00:00
Justin Bronn 94b718915d [1.1.X] Fixed -- now use `GEOSFree` to free string pointers allocated within GEOS when available; now parse out subminor version, and added a `GEOS_VERSION` tuple. 
Backport of r11979 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-24 15:01:47 +00:00
Jacob Kaplan-Moss 321fe61f64 [1.1.X] Fixed - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck. 
Backport of [11901].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 22:11:39 +00:00
Justin Bronn de2c7d9fdd [1.1.X] Fixed -- `Distance` and `Area` objects now support multiplication when they are the right-hand side. 
Backport of r11898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 18:29:05 +00:00
Karen Tracey f4282336b3 [1.1.X] Fixed : Made built-in field type descriptions in admindocs translatable again. Many thanks to Ramiro for the problem report and patch. 
r11878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-16 18:17:18 +00:00
Karen Tracey fa59129753 [1.1.X] Fixed : Fixed admindocs to use docstrings instead of a static array to locate type information. Thanks J. Clifford Dyer. 
r11833 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 20:36:31 +00:00
Justin Bronn a9c816c41b [1.1.X] Fixed -- `OGRGeometry` does not need to create a clone of the `SpatialReference` object upon assignment. 
Backport of r11707 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-03 06:18:52 +00:00
Justin Bronn 30ebd268be [1.1.X] Fixed -- `LayerMapping` now takes into account model inheritance when looking for the geometry column; forgot to diable extent regression test on MySQL. 
Backport of r11703 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-02 02:24:01 +00:00
Justin Bronn 72bc0818dd [1.1.X] The `OGRGeometry.coord_dim` property may now be set; implemented a work-around for an OGR bug that changed geometries to 3D after transformation. Refs . 
Backport of r11628 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-17 17:46:44 +00:00
Justin Bronn 6febb7ef15 [1.1.X] Fixed : Can now calculate extent in Oracle on tables with one point. 
Backport of r11577 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 17:46:44 +00:00
Justin Bronn 5f68bf0182 [1.1.X] Fixed : `render_to_kmz` no longer balks on non-ASCII data. 
Backport of r11527 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 16:14:58 +00:00
Matt Boersma e263cc0dc5 Fixed : introspection on Oracle now identifies IntegerFields correctly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-21 21:42:39 +00:00
Justin Bronn 1707304bad Fixed test cases and `GeoQuerySet.geojson` to support PostGIS 1.4. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-27 04:21:31 +00:00
Justin Bronn 53b8809277 Fixed -- `GeoQuery.resolve_columns` now recognizes annotations; disabled problematic test cases on Oracle and added notes on why. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 22:38:22 +00:00
Justin Bronn 9c5075d125 Forgot to add `collect` to `GeoManager`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-15 02:20:51 +00:00
Justin Bronn 33ea28c2b2 Forgot to add the `collect` GeoQuerySet method to correspond to the `Collect` aggregate object; also added tests for this operation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 20:34:27 +00:00
Justin Bronn 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 . 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-09 02:00:40 +00:00
Justin Bronn 422adffa11 Fixed -- Update geographic admin to use OpenLayers 2.8 as OpenStreetMap does not support previous versions. Thanks, yourcelf for ticket and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 17:49:01 +00:00
Justin Bronn cb9cf01ff2 Fixed , -- Blocks may now be overridden again `google-map.js` template; now use GMaps `setUIToDefault` to use default controls. Thanks to ludifan and Peter Landry for the ttickets and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 17:17:45 +00:00
Justin Bronn fdcc0c774a Fixed -- `GeoManager` + `select_related` + nullable `ForeignKey` now works correctly. Thanks, bretthoerner for ticket and dgouldin for initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-29 16:31:21 +00:00
Justin Bronn 694a15ef72 Fixed support for GDAL 1.6 on Windows. Thanks to jtia for spotting this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-12 17:16:49 +00:00
Justin Bronn 4cb4086b2a Fixed , -- Fixed validity check of `GeoIP` pointers and leaking of their references; also clarified initialization, fixed a stale test, added comments about version compatibility, and did some whitespace cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-11 02:45:46 +00:00
Justin Bronn be907bcdcb Fixed -- Fixed the `Count` annotation when used with `GeoManager`. Thanks to dgouldin for ticket and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 04:49:16 +00:00
Justin Bronn 1ed5d8fc39 Fixed -- Now use a `set` data structure for `GoogleMap` icons so that they aren't repeated in rendered JavaScript. Thanks to ludifan for ticket and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-30 16:10:23 +00:00
Gary Wilson Jr bd58a3972b Fixed and -- Corrected a few typos, thanks buriy. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-29 04:35:10 +00:00
Karen Tracey 50745cc31e Fixed -- 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
Justin Bronn cb5e8e29f0 Removed module-level imports from `django.test` -- this prevented running the GEOS, GDAL tests from outside a Django environment (e.g., when there's no `settings.py`). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 16:17:36 +00:00
Brian Rosner 03047d4037 Added a missing ASCII 32 in a GIS form field error message. Thanks Alex Gaynor for catching it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-30 20:12:24 +00:00
Justin Bronn d2c4c02251 Fixed -- Geographic admin now supports new `list_editable` option. Thanks to Dane Springmeyer and Alex Gaynor for the solution. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-26 06:08:26 +00:00
Justin Bronn 1269f9a3e9 Fixed -- Made default zoom level for points in the admin more sensible. Thanks to oyvind for ticket and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-26 06:01:59 +00:00
Justin Bronn 66db0b43ad Fixed -- `GeometryField` no longer requires `srid`/`null` keywords, and now respects `required`; coordinate transformations now done inside `gis.forms.GeometryField` -- benefit being that `OSMGeoAdmin` no longer requires 900913 entry in `spatial_ref_sys` thus enabling it to work with MySQL/Oracle spatial backends; added tests for geographic forms. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-25 18:24:32 +00:00
Justin Bronn 8010e0c32e Removed references to deprecated `GeometryField` atribute in `GeoModelAdmin`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-24 20:34:48 +00:00
Justin Bronn 44c062344f Fixed -- May now insert NULL `GeometryField` values on Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-24 20:24:50 +00:00
Justin Bronn 037ce4318b Fixed -- `GeoQuery` now unpickles properly on Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 22:35:04 +00:00
Justin Bronn bfe36750b1 Fixed -- Correctly identify test spatial database creation errors to the user. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-19 23:31:14 +00:00
Justin Bronn be11bd40d4 Fixed -- now use `reorder_suite` in GeoDjango test runner, thanks seanl for ticket & patch; restored original ordering of GEOS tests, as placing last no longer necessary. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-19 23:07:24 +00:00
Justin Bronn aeaba06bf4 Fixed -- The GeoDjango test runner now respects the `--noinput` command-line option, thanks to seanl for ticket & patch; replaced docstring with URL to latest documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-19 22:49:15 +00:00
Justin Bronn ff9b9e530c Fixed -- `GeometryColumns` and `SpatialRefSys` models now play nice with the `AppCache` routines. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-16 22:25:01 +00:00
Justin Bronn 4eaf4155f8 Fixed -- Forgot to move import to to `where` module. Thanks, seanl for ticket & patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-16 14:16:16 +00:00
Justin Bronn bd8afb1894 Fixed - `GeoWhereNode` no longer passes `Constraint` objects to where they shouldn't go. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-14 19:14:32 +00:00
Adrian Holovaty ffd7b177c9 Added experimental support for a POSTGIS_VERSION setting for GeoDjango. If set, it will tell GeoDjango not to do the postgis_lib_version() query every time the server starts up (assuming a PostGIS backend). This is intentionally undocumented because Justin mentioned he might be refactoring the backends for Django 1.2 such that this setting would be unnecessary. Until then, people can use this hook. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-12 07:19:56 +00:00
Justin Bronn d7870d3444 Upgraded SpatiaLite default initialization SQL file name for 2.3 release. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-11 22:31:28 +00:00
Justin Bronn f146132831 No longer create tables for unnecessary applications when running the GeoDjango test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-10 19:19:19 +00:00
Justin Bronn 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