Browse files

gis: Fixed #7540 -- fixed the GeoJSON regex to accept minus signs. Th…

…anks, Kenichi Ueda.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent f83b8ef commit 9fcc6c305a562b2e622049d4ce8b6148a2c617ca @jbronn jbronn committed Jun 26, 2008
Showing with 2 additions and 1 deletion.
  1. +1 −1 django/contrib/gis/gdal/geometries.py
  2. +1 −0 django/contrib/gis/tests/geometries.py
View
2 django/contrib/gis/gdal/geometries.py
@@ -62,7 +62,7 @@
# Regular expressions for recognizing HEXEWKB and WKT.
hex_regex = re.compile(r'^[0-9A-F]+$', re.I)
wkt_regex = re.compile(r'^(?P<type>POINT|LINESTRING|LINEARRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)[ACEGIMLONPSRUTY\d,\.\-\(\) ]+$', re.I)
-json_regex = re.compile(r'^\{[\s\w,\.\"\'\:\[\]]+\}$')
+json_regex = re.compile(r'^\{[\s\w,\-\.\"\'\:\[\]]+\}$')
#### OGRGeometry Class ####
class OGRGeometry(object):
View
1 django/contrib/gis/tests/geometries.py
@@ -152,5 +152,6 @@ def __init__(self, wkt, **kwargs):
)
json_geoms = (TestGeom('POINT(100 0)', json='{ "type": "Point", "coordinates": [ 100.000000, 0.000000 ] }'),
+ TestGeom('POLYGON((0 0, -10 0, -10 -10, 0 -10, 0 0))', json='{ "type": "Polygon", "coordinates": [ [ [ 0.000000, 0.000000 ], [ -10.000000, 0.000000 ], [ -10.000000, -10.000000 ], [ 0.000000, -10.000000 ], [ 0.000000, 0.000000 ] ] ] }'),
TestGeom('MULTIPOLYGON(((102 2, 103 2, 103 3, 102 3, 102 2)), ((100.0 0.0, 101.0 0.0, 101.0 1.0, 100.0 1.0, 100.0 0.0), (100.2 0.2, 100.8 0.2, 100.8 0.8, 100.2 0.8, 100.2 0.2)))', json='{ "type": "MultiPolygon", "coordinates": [ [ [ [ 102.000000, 2.000000 ], [ 103.000000, 2.000000 ], [ 103.000000, 3.000000 ], [ 102.000000, 3.000000 ], [ 102.000000, 2.000000 ] ] ], [ [ [ 100.000000, 0.000000 ], [ 101.000000, 0.000000 ], [ 101.000000, 1.000000 ], [ 100.000000, 1.000000 ], [ 100.000000, 0.000000 ] ], [ [ 100.200000, 0.200000 ], [ 100.800000, 0.200000 ], [ 100.800000, 0.800000 ], [ 100.200000, 0.800000 ], [ 100.200000, 0.200000 ] ] ] ] }'),
)

0 comments on commit 9fcc6c3

Please sign in to comment.