Thelie/python-feedgen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a really dumb formatting issue for the geom_interface

Browse source 
Use the old formatting tag instead of the new when creating geom text
from the geo_interface. Tests updated as well
This commit is contained in:
Henry Walshaw 2019-07-08 15:16:20 +10:00
parent 8cd50bf768
commit b02278e536
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
feedgen/ext/geo_entry.py
View file

@ -294,7 +294,7 @@ class GeoEntryExtension(BaseEntryExtension):
if geojson['type'] == 'Point': if geojson['type'] == 'Point':
coords = '%f %f'.format( coords = '{:f} {:f}'.format(
geojson['coordinates'][1], # latitude is y geojson['coordinates'][1], # latitude is y
geojson['coordinates'][0] geojson['coordinates'][0]
) )
@ -303,7 +303,7 @@ class GeoEntryExtension(BaseEntryExtension):
elif geojson['type'] == 'LineString': elif geojson['type'] == 'LineString':
coords = ' '.join( coords = ' '.join(
'%f %f'.format(vertex[1], vertex[0]) '{:f} {:f}'.format(vertex[1], vertex[0])
for vertex in for vertex in
geojson['coordinates'] geojson['coordinates']
) )
@ -315,7 +315,7 @@ class GeoEntryExtension(BaseEntryExtension):
warnings.warn(GeoRSSPolygonInteriorWarning(geom)) warnings.warn(GeoRSSPolygonInteriorWarning(geom))
coords = ' '.join( coords = ' '.join(
'%f %f'.format(vertex[1], vertex[0]) '{:f} {:f}'.format(vertex[1], vertex[0])
for vertex in for vertex in
geojson['coordinates'][0] geojson['coordinates'][0]
) )

8
tests/test_extensions/test_geo.py
View file

@ -26,7 +26,7 @@ class Geom(object):
def __str__(self): def __str__(self):
if self.geom_type == 'Point': if self.geom_type == 'Point':
coords = '%f %f'.format( coords = '{:f} {:f}'.format(
self.coords[1], # latitude is y self.coords[1], # latitude is y
self.coords[0] self.coords[0]
) )
@ -35,7 +35,7 @@ class Geom(object):
elif self.geom_type == 'LineString': elif self.geom_type == 'LineString':
coords = ' '.join( coords = ' '.join(
'%f %f'.format(vertex[1], vertex[0]) '{:f} {:f}'.format(vertex[1], vertex[0])
for vertex in for vertex in
self.coords self.coords
) )
@ -44,7 +44,7 @@ class Geom(object):
elif self.geom_type == 'Polygon': elif self.geom_type == 'Polygon':
coords = ' '.join( coords = ' '.join(
'%f %f'.format(vertex[1], vertex[0]) '{:f} {:f}'.format(vertex[1], vertex[0])
for vertex in for vertex in
self.coords[0] self.coords[0]
) )
@ -54,7 +54,7 @@ class Geom(object):
# box not really supported by GeoJSON, but it's a handy cheat here # box not really supported by GeoJSON, but it's a handy cheat here
# for testing # for testing
coords = ' '.join( coords = ' '.join(
'%f %f'.format(vertex[1], vertex[0]) '{:f} {:f}'.format(vertex[1], vertex[0])
for vertex in for vertex in
self.coords self.coords
) )