Changeset 1125

Show
Ignore:
Timestamp:
07/14/08 08:56:32
Author:
seang
Message:

Expose GeoJSONEncoder from geojson module

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • geojson/trunk/CHANGES.txt

    r1123 r1125  
    11Changes 
    22======= 
     3 
     41.0rc2 (2008-07-14) 
     5------------------- 
     6- 2nd release candidate. 
     7- Rename PyGFPEncoder to GeoJSONEncoder and expose it from the geojson module. 
    38 
    491.0rc1 (2008-07-11) 

  • geojson/trunk/geojson/codec.py

    r1115 r1125  
    1313 
    1414 
    15 class PyGFPEncoder(simplejson.JSONEncoder): 
     15class GeoJSONEncoder(simplejson.JSONEncoder): 
    1616 
    1717    def default(self, obj): 
    …… 
    3131# object creation hooks 
    3232 
    33 def dump(obj, fp, cls=PyGFPEncoder, **kwargs): 
     33def dump(obj, fp, cls=GeoJSONEncoder, **kwargs): 
    3434    return simplejson.dump(to_mapping(obj), fp, cls=cls, **kwargs) 
    3535 
    3636 
    37 def dumps(obj, cls=PyGFPEncoder, **kwargs): 
     37def dumps(obj, cls=GeoJSONEncoder, **kwargs): 
    3838    return simplejson.dumps(to_mapping(obj), cls=cls, **kwargs) 
    3939 
    …… 
    4646    return simplejson.loads(s, cls=cls, object_hook=object_hook, **kwargs) 
    4747 
     48# Backwards compatibility 
     49PyGFPEncoder = GeoJSONEncoder 

  • geojson/trunk/geojson/__init__.py

    r1115 r1125  
    11from codec import dump, dumps, load, loads 
     2from codec import GeoJSONEncoder 
    23from geometry import Point, LineString, Polygon 
    34from geometry import MultiLineString, MultiPoint, MultiPolygon 

  • geojson/trunk/VERSION.txt

    r1123 r1125  
    1 1.0rc1 
     11.0rc2