fixed bug in area sorting

This commit is contained in:
Komzpa 2011-08-22 12:43:30 +03:00
parent 5ae6555a87
commit 7348153812

View file

@ -543,8 +543,8 @@ if options.renderer == "mapnik":
if zoom >= 10:
sqlz = """select %s, ST_PointOnSurface(ST_Buffer(way,0)) as way
from planet_osm_%s
where (%s) and (%s) and (way_area > %s) and way && ST_Expand(!bbox!,3000) %s way_area
"""%(itags,layer_type,ttext,sqlz,pixel_size_at_zoom(zoom,5)**2, order)
where (%s) and (%s) and (way_area > %s) and way && ST_Expand(!bbox!,3000) %s way_area desc
"""%(itags,layer_type,ttext,sqlz,pixel_size_at_zoom(zoom,3)**2, order)
else:
sqlz = """select %s, ST_PointOnSurface(ST_Buffer(way,0)) as way
from (
@ -553,7 +553,7 @@ if options.renderer == "mapnik":
select ST_Buffer(way, %s) as way, %s
from planet_osm_%s p
where (%s) and way_area > %s and p.way && ST_Expand(!bbox!,%s) and (%s)) p
group by %s) p %s ST_Area(p.way)
group by %s) p %s ST_Area(p.way) desc
"""%(itags,oitags,pixel_size_at_zoom(zoom,10),oitags,layer_type,ttext,pixel_size_at_zoom(zoom,5)**2,max(pixel_size_at_zoom(zoom,20),3000),sqlz,oitags,order)
mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz, oitags ))
elif layer_type == "line" and zoom < 15: