mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity
2,927 Commits 29 Branches 451 Tags
Commit Graph

2927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Bronn
65b4cb2cca gis: utils module now only imports LayerMapping when GDAL is installed; the source_srs keyword lf LayerMapping may now take integer and string parameters (for SRID and WKT spatial references, respectively). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-24 22:18:00 +00:00
Justin Bronn
1025326602 gis: modifed tests and mixin to use the HAS_GDAL flag. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-24 20:29:27 +00:00
Justin Bronn
07963be5df gis: gdal: Changed name of OGRGeometryIndexError to OGRIndexError and moved to errors mdoule; added HAS_GDAL flag to module; improved docstrings in srs. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-24 20:28:23 +00:00
Justin Bronn
e95fda3e26 gis: fixed sqlall and sqlcustom commands for this branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-20 13:13:18 +00:00
Justin Bronn
7376474260 gis: Merged revisions 6021-6393 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-20 13:02:11 +00:00
Justin Bronn
69452d6237 gis: fixed improper import in utils module. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-20 02:31:10 +00:00
Justin Bronn
16305693c4 gis: Added the GeoIP utility for IP-based geolocation; got rid of camel case and fixed relative imports in utils module. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-17 12:09:54 +00:00
Justin Bronn
9c1714234a gis: Fixed #5434, GEOS simplify() may now preserve topologies via patch from rcoup. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 19:19:11 +00:00
Justin Bronn
101446dbda gis: Fixed #5440 with patches from rcoup; cleaned up notice handler in libgeos. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 18:56:35 +00:00
Justin Bronn
483a807c06 gis: Fixed #5438 with patches from rcoup. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 22:56:43 +00:00
Justin Bronn
d1d5cf7aa2 gis: Fixed #5437 with patch from rcoup. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 22:46:41 +00:00
Justin Bronn
57135b1cb7 gis: Fixed #5435 with patch from rcoup. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 22:40:13 +00:00
Justin Bronn
e0a665e121 gis: Fixed #5436, for Python 2.4 test runner compatibility with patch from rcoup; GDAL tests now print that IllegalArgumentException is expected. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 22:36:51 +00:00
Justin Bronn
7c79d21eb4 gis: Fixed #5433 -- GDAL is not a prerequisite. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 14:02:38 +00:00
Justin Bronn
bda33e69cc gis: fixed #5531. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-13 01:09:33 +00:00
Justin Bronn
b74f5ef66f gis: added the beginnings of a maps module, for generating mapping framework JavaScript; cleaned up the sitemaps module and KML templates; added shortcuts module. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-12 13:04:33 +00:00
Justin Bronn
ceac9c9645 gis: gdal: cleaned up the error module; got rid of relative imports in __init__; added the utility functions get_fields() and get_geoms() to Layer. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-07 04:52:02 +00:00
Justin Bronn
85ea950759 gis: fixed deprecated backend references in _get_sql_clause(); quote_name() no longer a GeoQuerySet attribute; PostGIS db creation now tries to use pg_config to obtain the POSTGIS_SQL_PATH. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-30 12:58:04 +00:00
Justin Bronn
f4203ef757 gis: geos: Memory-management refactor, changes include: 
(1) Moved GEOSPointer to its own module, and now tracks children geometries.  
 (2) Fixed 'deep-indexing' issues for nested rings in GeometryCollections/MultiPolygons (e.g., mpoly[0][1] = new_ring).
 (3) Added simplify() -- simplifies geometries using the Douglas-Peucker algorithm.
 (4) Conformed docstrings to Django coding style.
 (5) GEOSGeometry no longer uses `parent` and `input_type` keywords.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-30 01:38:44 +00:00
Justin Bronn
cb64f5375c gis: Merged revisions 6000-6020 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-26 17:47:34 +00:00
Justin Bronn
2052b508eb gis: Made necessary modifications for unicode, manage refactor, backend refactor and merged 5584-6000 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-26 01:10:53 +00:00
Justin Bronn
a7297a255f gis: geos: added length property and distance method; no more relative imports in geos module; tamed unruly docstrings in base.py. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-21 03:24:22 +00:00
Justin Bronn
dcf2f144d1 gis: added transform() manager method; _get_sql_clause() moved to GeoQuerySet; cleaned up PostGIS backend for 1.3.0; added tests for 'equals' and 'relate' lookups. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-13 01:33:26 +00:00
Justin Bronn
fc1dbe70fe gis: geos: fixed 3d linestring constructor bug, and added tests; GEOM_FUNC_PREFIX no longer needed, since ST_Transform used. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-09 03:07:02 +00:00
Justin Bronn
d2ca3b8b8f gis: added tests, added precision keyword, and generally improved GeoQuerySet.kml(); commented, improved, and added tests for GeometryProxy. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-06 01:27:22 +00:00
Justin Bronn
e982954602 gis: geos: added support for KML; added coords property to Point. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-06 01:13:49 +00:00
Justin Bronn
5f4ffb369f gis: wktfield now takes advantage of lazy geometries; geos may take unicode input; fixed utils module 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-04 00:27:59 +00:00
Justin Bronn
056f87ab28 gis: geos: fully-mutable geometries have landed; fixed GEOSPointer boolean value; equivalence now uses equals_exact (vertex-by-vertex matching); added in-place set operations; improved tests; getquoted() will return ST_* for PostGIS 1.2.2+. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-02 05:31:10 +00:00
Justin Bronn
ffcc38ebe8 gis: created backend module, that will (in the future) allow for support of different spatial databases; improved postgis-specific code in preparation for PostGIS 1.2.2 (and beyond). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-29 19:58:24 +00:00
Justin Bronn
7a98b6128e gis: provenance: inserted notes about public domain sources of geographic test data fixtures. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-29 19:22:51 +00:00
Justin Bronn
68f9a8ee8e gis: fixed support for 'isnull' lookup type on geometry columns, and added corresponding tests; added tests for 'left' and 'right' lookup types; added interactive keyword to create_spatial_db(). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-28 18:59:44 +00:00
Justin Bronn
357ef5d975 gis: provenance: measure module is released under BSD license, assent given by Robert Coup in email correspondence dated 7/25/2007; math imports not used, and ensured that default unit is string when passed in. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-28 18:51:47 +00:00
Justin Bronn
a2c4f2f61e gis: geographic models may now be tested; started test geographic application to test geographic queries and lookup types. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-26 02:27:17 +00:00
Justin Bronn
3754b13bec gis: geographic queries may now take geos geometry objects as an argument and geometry objects with different srid's are automatically transformed to the srid of the field; synced up parse_lookup() and lookup_inner() to r5609; minor change in GeometryProxy. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-26 02:18:26 +00:00
Justin Bronn
df45fba3ea gis: added spatial database creation utility and fixed a bug in gdal geomtype module. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-26 02:00:38 +00:00
Justin Bronn
1c2a08d2d7 gis: geos: added srid keyword and added psycopg2 adaptor routines. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-26 01:55:37 +00:00
Justin Bronn
6be9797bee gis: added get_placeholder() routine for the Field class; fixed bug in management _post_create_sql() hook and added _post_delete_sql() hook. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-26 01:44:09 +00:00
Justin Bronn
add0689d56 gis: fixed utils bugs related to gdal module name changes. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-24 23:53:35 +00:00
Justin Bronn
179a2c45c3 gis: gdal: fixed area function, place field pointer within class, integer and float fields return None when empty. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-24 03:20:42 +00:00
Jeremy Dunck
8f644283ee gis: Added KML sitemap support. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-23 08:47:40 +00:00
Justin Bronn
0be7b58460 gis: got rid of CamelCase module names and made minor improvements in gdal; made srid a mutable property in geos geometries 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-22 05:13:22 +00:00
Justin Bronn
265bb46dd9 gis: made gdal srs tests less brittle for platforms with different proj.4 versions 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-22 04:54:29 +00:00
Justin Bronn
e922445186 gis: big changes within in GEOS internals: 
(1) All Geometry types and Collections now have their own constructor (e.g., Polygon(LinearRing(..)), MultiPoint(Point(..), Point(..)))
   (2) Memory management improved, laying the foundation for fully mutable geometries.
   (3) Added set-like operations (|, &, -, ^)
   (4) Added & improved tests.
   (5) docstring changes


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-21 17:39:09 +00:00
Justin Bronn
8162e3543c gis: fixed OGR bug and removed unnecessary imports from GeoMixin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-12 12:26:40 +00:00
Justin Bronn
abccccc095 gis: lazy-geometry support has landed -- thanks Robert Coup! 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-12 06:47:40 +00:00
Justin Bronn
5292d44806 gis: the geometry objects and collections were placed into these modules, missing in the last commit. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-12 06:10:14 +00:00
Justin Bronn
382632a26e gis: no more camelcase module names; GEOSGeometry now autodetects WKT or HEXEWKB (hex). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-12 06:05:42 +00:00
Justin Bronn
342dbc6738 gis: GEOS library has been re-factored to, changes include: 
(1) allow write-access to Geometries (for future lazy-geometries)
 (2) Point, LineString, LinearRing have their own constructors (e.g., p = Point(5, 17))
 (3) improved ctypes memory management (as part of writability enhancements)
 (4) improved tests and comments
 (5) numpy support


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-09 06:16:06 +00:00
Jeremy Dunck
c31d20858d gis: Added django.contrib.gis.measure, closing #4797. Thanks, Robert. 
Also removed dead test_with_swig suite and re-worked django.contrib.gis.tests.__init__ to drive tests a little more easily.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-08 08:56:29 +00:00
Jeremy Dunck
d92f68f14b gis LayerMapping now supports loading while mapping ForeignKey to other tables. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-08 07:07:36 +00:00