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

Merge pull request #22 from MaksVasilev/master

Browse source 
Prepare to use SVG icons in style
This commit is contained in:
Darafei Praliaskouski 2015-08-11 16:22:09 +03:00
commit 860330c964
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/komap.py
View file

@ -530,7 +530,10 @@ if options.renderer == "mapnik":
except:
print >> sys.stderr, "Error writing to ", icons_path + "komap/" + fname
else:
xml += xml_linepatternsymbolizer(entry["style"]["pattern-image"])
if entry["style"].get("-x-kot-render", "none") == "svg":
xml += xml_linemarkerssymbolizer(entry["style"]["pattern-image"], entry["style"].get("spacing","100"), entry["style"].get("allow-overlap","false"))
else:
xml += xml_linepatternsymbolizer(entry["style"]["pattern-image"])
sql.add(entry["sql"])
itags.update(entry["chooser"].get_interesting_tags(entry["type"], zoom))
xml += xml_rule_end()

9
src/libkomapnik.py
View file

@ -88,7 +88,7 @@ def xml_pointsymbolizer(path="", width="", height="", opacity=1, overlap="false"
if height:
height = ' height="%s" ' % height
return """
<PointSymbolizer file="%s" %s %s opacity="%s" allow-overlap="%s" />"""\
<MarkersSymbolizer file="%s" %s %s opacity="%s" allow-overlap="%s" placement="point" />"""\
% (os.path.join(icons_path, path), width, height, opacity, overlap)
@ -131,7 +131,12 @@ def xml_polygonpatternsymbolizer(file=""):
def xml_linepatternsymbolizer(file=""):
return """
<LinePatternSymbolizer file="%s"/>""" % (os.path.join(icons_path, file))
<LinePatternSymbolizer file="%s" />""" % (os.path.join(icons_path, file))
def xml_linemarkerssymbolizer(file="", spacing="100", allow_overlap="false"):
return """
<MarkersSymbolizer file="%s" spacing="%s" allow-overlap="%s" placement="line"/>""" % (os.path.join(icons_path, file), spacing, allow_overlap)
def xml_textsymbolizer(