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,898 Commits 29 Branches 451 Tags
Commit Graph

2898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Bronn
f66ee9d006 gis: added get_srid() spatial backend utility that takes into account -1 SRID values; removed from_hex flag from GEOS initialization; added tests for SRID values, and changed test_gdal module docstring. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-22 23:37:26 +00:00
Justin Bronn
aed1db8266 gis: Fixed #5779, thanks tlp; added type checking to SpatialReference.__getitem__. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-21 04:27:22 +00:00
Justin Bronn
712df76528 gis: Added preliminary spatial backend for MySQL (which only supports MBR queries), and added limited test suite for it; updated a few comments in the Oracle backend. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-19 00:34:29 +00:00
Justin Bronn
58fc789765 Merged revisions 6442-6524 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-16 16:54:23 +00:00
Justin Bronn
ba9fa9844c gis: Added preliminary spatial backend for Oracle; added GEOS routine fromfile. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-16 06:41:16 +00:00
Justin Bronn
189335acaa gis: removed import to the PostGIS proxy module. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-14 20:48:33 +00:00
Justin Bronn
c049672a74 gis: spatial-backend enhancements: 
(1) GEOS no longer has psycopg2-specific routines, functionality now part of PostGIS adaptor in the spatial backend.
 (2) ST_GeomFromWKB() now used to enhance performance.
 (3) Moved GeometryProxy back to its original location.
 (4) Should resolve #5498, but not yet confirmed.
 (5) Test-sql files are now backend-specific.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-14 20:13:11 +00:00
Justin Bronn
b6c8bba5b6 gis: spatial-database compatibility and usability changes: 
(1) The SpatialRefSys and GeometryColumns models and GeometryProxy have been moved to the PostGIS backend because their functionality depends on the spatial databse.
 (2) The GeoMixin is no longer required, as all the functionality contributed by the extra instance methods has been moved to the GeometryProxy.
 (3) The `_post_create_sql` field now returns a tuple of SQL statements, instead of a string.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-08 18:18:17 +00:00
Justin Bronn
5d7fd63423 gis: geos: Fixed #5630 with patch from rcoup; added the ogr and srs properties. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-07 22:42:26 +00:00
Justin Bronn
ddc9361d93 gis: gdal: added support exporting/creating geometries to/from WKB and HEX. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-07 20:29:59 +00:00
Justin Bronn
ad3e9e99a2 gis: gdal: The OGRGeometry srs property is now mutable, and added the srid property. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-07 04:21:31 +00:00
Justin Bronn
acbc766894 gis: Merged revisions 6394-6441 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-01 03:58:05 +00:00
Justin Bronn
41709bf315 gis: Added the gml() and union() GeoQuerySet routines w/tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-30 17:44:13 +00:00
Justin Bronn
091ba8c2ea gis: gdal: fixed GML property, and added tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-30 15:16:22 +00:00
Justin Bronn
867a74495f gis: PostGIS backend improvements: test spatial databases may now be created on NT platforms; changed exception style. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-30 04:19:31 +00:00
Justin Bronn
53a0514e2b gis: Fixed #5629 with patch from rcoup. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-30 02:30:06 +00:00
Justin Bronn
9eb115e304 gis: gdal: OSGeo sprint -- cleaned up spatial references associated with geometries (fixed a segfault); cleaned up Envelope module (thanks to ww for help), and added tests; added a test module for invoking all gdal tests; changed exception style. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-29 14:02:41 +00:00
Justin Bronn
cfb807a1fb gis: SpatialRefSys model now uses HAS_GDAL flag, no longer uses _cache_osr(), and improved docstrings. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-27 16:42:20 +00:00
Justin Bronn
e835868621 gis: renamed inspect_data and sample() to ogrinfo, and now displays the extent and field type information. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-25 06:14:01 +00:00
Justin Bronn
d0a4c6634f gis: Added the encoding keyword for string fields in OGR data sources; improved docstrings. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-25 04:25:04 +00:00
Justin Bronn
ea0ae54756 gis: gdal: The feature and layer modules now uses OGRIndexError. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-25 03:55:29 +00:00
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