json->geojson

This commit is contained in:
Dane Springmeyer 2013-06-13 13:34:34 -07:00
parent 02cd44a142
commit ef15c45e65
9 changed files with 10 additions and 10 deletions

View file

@ -22,7 +22,7 @@
<Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="file">../json/points.json</Parameter>
<Parameter name="file">../json/points.geojson</Parameter>
<Parameter name="layer_by_index">0</Parameter>
<Parameter name="type">ogr</Parameter>
</Datasource>

View file

@ -20,7 +20,7 @@
<Layer name="line" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>2</StyleName>
<Datasource>
<Parameter name="file">../json/lines.json</Parameter>
<Parameter name="file">../json/lines.geojson</Parameter>
<Parameter name="layer_by_index">0</Parameter>
<Parameter name="type">ogr</Parameter>
</Datasource>
@ -29,7 +29,7 @@
<Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="file">../json/points.json</Parameter>
<Parameter name="file">../json/points.geojson</Parameter>
<Parameter name="layer_by_index">0</Parameter>
<Parameter name="type">ogr</Parameter>
</Datasource>

View file

@ -33,7 +33,7 @@ def test_total_feature_count_shp():
def test_total_feature_count_json():
if 'ogr' in mapnik.DatasourceCache.plugin_names():
ds = mapnik.Ogr(file='../data/json/points.json',layer_by_index=0)
ds = mapnik.Ogr(file='../data/json/points.geojson',layer_by_index=0)
desc = ds.describe()
eq_(desc['geometry_type'],mapnik.DataGeometryType.Point)
eq_(desc['name'],'ogr')
@ -56,7 +56,7 @@ def test_sqlite_reading():
eq_(num_feats, 245)
def test_reading_json_from_string():
json = open('../data/json/points.json','r').read()
json = open('../data/json/points.geojson','r').read()
if 'ogr' in mapnik.DatasourceCache.plugin_names():
ds = mapnik.Ogr(file=json,layer_by_index=0)
features = ds.all_features()

View file

@ -13,7 +13,7 @@ def setup():
if 'geojson' in mapnik.DatasourceCache.plugin_names():
def test_geojson_init():
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.json')
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.geojson')
e = ds.envelope()
assert_almost_equal(e.minx, -81.705583, places=7)
assert_almost_equal(e.miny, 41.480573, places=6)
@ -21,7 +21,7 @@ if 'geojson' in mapnik.DatasourceCache.plugin_names():
assert_almost_equal(e.maxy, 41.480573, places=3)
def test_geojson_properties():
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.json')
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.geojson')
f = ds.features_at_point(s.envelope().center()).features[0]
desc = ds.describe()
@ -36,7 +36,7 @@ if 'geojson' in mapnik.DatasourceCache.plugin_names():
eq_(f['NOM_FR'], u'Québec')
def test_geojson_properties():
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.json')
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.geojson')
f = ds.all_features()[0]
desc = ds.describe()
@ -53,7 +53,7 @@ if 'geojson' in mapnik.DatasourceCache.plugin_names():
# @raises(RuntimeError)
def test_that_nonexistant_query_field_throws(**kwargs):
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.json')
ds = mapnik.Datasource(type='geojson',file='../data/json/escaped.geojson')
eq_(len(ds.fields()),7)
# TODO - this sorting is messed up
#eq_(ds.fields(),['name', 'int', 'double', 'description', 'boolean', 'NOM_FR'])

View file

@ -56,7 +56,7 @@ if 'ogr' in mapnik.DatasourceCache.plugin_names():
# disabled because OGR prints an annoying error: ERROR 1: Invalid Point object. Missing 'coordinates' member.
#def test_handling_of_null_features():
# ds = mapnik.Ogr(file='../data/json/null_feature.json',layer_by_index=0)
# ds = mapnik.Ogr(file='../data/json/null_feature.geojson',layer_by_index=0)
# fs = ds.all_features()
# eq_(len(fs),1)