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

support foe scaling text (closes #2)

Browse source
This commit is contained in:
Darafei Praliaskouski 2012-07-13 12:06:41 +03:00
parent c217264c40
commit 6b639f4b7d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/komap.py
View file

@ -64,6 +64,8 @@ parser.add_option("-p", "--osm2pgsql-style", dest="osm2pgsqlstyle", default="-",
help="osm2pgsql stylesheet filename", metavar="FILE")
parser.add_option("-b", "--background-only", dest="bgonly", action="store_true", default=False,
help="Skip rendering of icons and labels", metavar="BOOL")
parser.add_option("-T", "--text-scale", dest="textscale", default=1, type="float",
help="text size scale", metavar="SCALE")
parser.add_option("-c", "--config", dest="conffile", default="komap.conf",
help="config file name", metavar="FILE")
@ -85,6 +87,7 @@ libkomapnik.cleantopo_dem_path = config.get("mapnik", "cleantopo_dem_path")
libkomapnik.srtm_dem_path = config.get("mapnik", "srtm_dem_path")
libkomapnik.cleantopo_hs_path = config.get("mapnik", "cleantopo_hs_path")
libkomapnik.srtm_hs_path = config.get("mapnik", "srtm_hs_path")
libkomapnik.text_scale = options.textscale
from libkomapnik import *

8
src/libkomapnik.py
View file

@ -34,7 +34,7 @@ cleantopo_dem_path = ""
srtm_dem_path = ""
cleantopo_hs_path = ""
srtm_hs_path = ""
text_scale = 1
substyles = []
@ -132,9 +132,9 @@ def xml_textsymbolizer(
color = nicecolor(color)
halo_color = nicecolor(halo_color)
pos = pos.replace("exact", "X").replace("any","S, E, X, N, W, NE, SE, NW, SW").split(",")
pos.extend([str(int(float(x))) for x in size.split(",")])
pos.extend([str(int(float(x)*text_scale)) for x in size.split(",")])
pos = ",".join(pos)
size = size.split(",")[0]
size = str(int(float(size.split(",")[0])*text_scale))
placement = {"center": "interior"}.get(placement.lower(), placement)
@ -163,7 +163,7 @@ def xml_shieldsymbolizer(path="", width="", height="",
return """
<ShieldSymbolizer file="%s%s" %s %s name="%s" fontset_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dy="%s" allow_overlap="%s" wrap_width="%s" min_distance="%s" horizontal_alignment="%s" opacity="%s" text-transform="%s" unlock-image="%s" spacing="%s" />
"""%(icons_path, \
path, width, height,text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity, transform, unlock_image, spacing )
path, width, height,text,face,int(float(size)*text_scale),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity, transform, unlock_image, spacing )
def xml_filter(string):
return """