organicmaps/kothic
13
Fork 0
Code Issues Pull requests 2 Projects Releases Wiki Activity Actions

poly merging fix

Browse source
This commit is contained in:
Komzpa 2012-01-31 16:37:22 +03:00
parent 07d9460007
commit 18e2a4622e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/komap.py
View file

@ -844,8 +844,9 @@ if options.renderer == "mapnik":
ttext = " OR ".join(['"'+i+ "\" is not NULL " for i in texttags])
itags = [columnmap.get(i, (i,))[0] for i in itags]
itags = add_numerics_to_itags(itags, escape = False)
itags = add_numerics_to_itags(itags)
if placement == "center" and layer_type == "polygon" and snap_to_street == 'false':
sqlz = " OR ".join(sql)
itags = ", ".join(itags)
if not order:
@ -858,6 +859,7 @@ if options.renderer == "mapnik":
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:
itags = add_numerics_to_itags(itags, escape = False) # for complex polygons, no escapng needed
sqlz = """select %s, way
from (
select (ST_Dump(ST_Multi(ST_Buffer(ST_Collect(p.way),%s)))).geom as way, %s