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

mapnik2 interior placements

Browse source
This commit is contained in:
Komzpa 2012-01-31 15:39:11 +03:00
parent c64ee744ba
commit c227987e2b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/komap.py
View file

@ -844,12 +844,12 @@ if options.renderer == "mapnik":
else:
order += ", "
if zoom >= 11 or zoom < 6:
sqlz = """select %s, ST_PointOnSurface(ST_Buffer(way,0)) as way
sqlz = """select %s, way) as way
from planet_osm_%s
where (%s) and (%s) and (way_area > %s) and way &amp;&amp; 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
sqlz = """select %s, way
from (
select (ST_Dump(ST_Multi(ST_Buffer(ST_Collect(p.way),0)))).geom as way, %s
from (

4
src/libkomapnik.py
View file

@ -135,7 +135,7 @@ def xml_textsymbolizer(
size = size.split(",")[0]
placement = {"center": "point"}.get(placement.lower(), placement)
placement = {"center": "interior"}.get(placement.lower(), placement)
align = {"center": "middle"}.get(align.lower(), align)
dy = int(float(offset))
dx = 0
@ -144,7 +144,7 @@ def xml_textsymbolizer(
dy = 0
return """
<TextSymbolizer name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dx="%s" dy="%s" max_char_angle_delta="17" allow_overlap="%s" wrap_width="%s" min_distance="%s" vertical_alignment="middle" horizontal_alignment="%s" opacity="%s" placement-type="simple" placements="%s" text-transform="%s" />
<TextSymbolizer name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dx="%s" dy="%s" max_char_angle_delta="17" allow_overlap="%s" wrap_width="%s" min_distance="%s" vertical_alignment="middle" horizontal_alignment="%s" opacity="%s" placement-type="simple" placements="%s" text-transform="%s" minimum-path-length="2" />
"""%(text,face,int(float(size)),color,halo_color,halo_radius,placement,dx,dy,overlap,wrap_width,distance,align,opacity,pos, transform)
def xml_shieldsymbolizer(path="", width="", height="",