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

Support for line casings in Komap

Browse source
This commit is contained in:
Komяpa 2010-09-28 18:56:39 +03:00
parent 8167dec572
commit bf6943a9cd
3 changed files with 96 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/komap.py
View file

@ -43,17 +43,18 @@ for zoom in range (minzoom, maxzoom):
mapniksheet[zoom] = {}
zsheet = mapniksheet[zoom]
for chooser in style.choosers:
styles = chooser.styles[0]
zindex = styles.get("z-index",0)
if zindex not in zsheet:
zsheet[zindex] = []
chooser_entry = {}
zsheet[zindex].append(chooser_entry)
chooser_entry["sql"] = chooser.get_sql_hints(chooser.ruleChains[0][0].subject, zoom)
chooser_entry["style"] = styles
chooser_entry["type"] = chooser.ruleChains[0][0].subject
chooser_entry["rule"] = [i.conditions for i in chooser.ruleChains[0]]
chooser_entry["chooser"] = chooser
if chooser.get_sql_hints(chooser.ruleChains[0][0].subject, zoom):
styles = chooser.styles[0]
zindex = styles.get("z-index",0)
if zindex not in zsheet:
zsheet[zindex] = []
chooser_entry = {}
zsheet[zindex].append(chooser_entry)
chooser_entry["sql"] = chooser.get_sql_hints(chooser.ruleChains[0][0].subject, zoom)
chooser_entry["style"] = styles
chooser_entry["type"] = chooser.ruleChains[0][0].subject
chooser_entry["rule"] = [i.conditions for i in chooser.ruleChains[0]]
chooser_entry["chooser"] = chooser
#print mapniksheet
@ -65,26 +66,55 @@ mfile.write(xml_start(style.get_style("canvas", {}, maxzoom)[0].get("fill-color"
for zoom, zsheet in mapniksheet.iteritems():
x_scale = xml_scaledenominator(zoom)
ta = zsheet.keys()
ta.sort()
ta.sort(key=float)
for zindex in ta:
#print zsheet[zindex]
## casings pass
sql = set()
itags = set()
xml = xml_style_start()
for entry in zsheet[zindex]:
if entry["type"] in ("way", "line"):
if "casing-width" in entry["style"]:
xml += xml_rule_start()
xml += x_scale
rulestring = " or ".join([rule[0].get_mapnik_filter() for rule in entry["rule"]])
xml += xml_filter(rulestring)
xml += xml_linesymbolizer(color=entry["style"].get("casing-color", "black"),
width=entry["style"].get("casing-width", "1"),
opacity=entry["style"].get("casing-opacity", "1"),
linecap=entry["style"].get("casing-linecap", entry["style"].get("linecap","butt")),
linejoin=entry["style"].get("casing-linejoin", entry["style"].get("linejoin", "round")))
sql.update(entry["sql"])
itags.update(entry["chooser"].get_interesting_tags(entry["type"], zoom))
xml += xml_rule_end()
sql = [i[1] for i in sql]
xml += xml_style_end()
if sql:
mfile.write(xml)
mfile.write(xml_layer("postgis", "line", itags, sql ))
else:
xml_nolayer()
## areas pass
sql = set()
itags = set()
mfile.write(xml_style_start())
xml = xml_style_start()
for entry in zsheet[zindex]:
if entry["type"] in ("way", "area", "polygon"):
if "fill-color" in entry["style"]:
mfile.write(xml_rule_start())
mfile.write(x_scale)
xml += xml_rule_start()
xml += x_scale
rulestring = " or ".join([rule[0].get_mapnik_filter() for rule in entry["rule"]])
mfile.write(xml_filter(rulestring))
mfile.write(xml_polygonsymbolizer(entry["style"].get("fill-color", "black"), entry["style"].get("fill-opacity", "1")))
xml += xml_filter(rulestring)
xml += xml_polygonsymbolizer(entry["style"].get("fill-color", "black"), entry["style"].get("fill-opacity", "1"))
sql.update(entry["sql"])
itags.update(entry["chooser"].get_interesting_tags(entry["type"], zoom))
mfile.write(xml_rule_end())
xml += xml_rule_end()
sql = [i[1] for i in sql]
#print sql, itags
mfile.write(xml_style_end())
mfile.write(xml_layer("postgis", "polygon", itags, sql ))
xml += xml_style_end()
if sql:
mfile.write(xml)
mfile.write(xml_layer("postgis", "polygon", itags, sql ))
else:
xml_nolayer()
mfile.write(xml_end())

15
src/libkomapnik.py
View file

@ -24,7 +24,7 @@ from mapcss.webcolors.webcolors import whatever_to_hex as nicecolor
map_proj = "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over"
db_proj = "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over"
table_prefix = "planet_osm_"
db_user = "mapz"
db_user = "gis"
db_name = "gis"
@ -48,6 +48,7 @@ def zoom_to_scaledenom(z1,z2=False):
s = 279541132.014
z1 = s/(2**z1-1)+100
z2 = s/(2**z2-1)-100
return 100000000000000, 1
return z1, z2
@ -61,7 +62,7 @@ def xml_linesymbolizer(color="#000000", width="1", opacity="1", linecap="butt",
<CssParameter name="stroke-opacity">%s</CssParameter>
<CssParameter name="stroke-linejoin">%s</CssParameter>
<CssParameter name="stroke-linecap">%s</CssParameter>
</LineSymbolizer>"""(color, float(width), float(opacity), linejoin, linecap)
</LineSymbolizer>"""%(color, float(width), float(opacity), linejoin, linecap)
def xml_polygonsymbolizer(color="#000000", opacity="1"):
@ -80,8 +81,8 @@ def xml_filter(string):
def xml_scaledenominator(z1, z2=False):
z1, z2 = zoom_to_scaledenom(z1,z2)
return """
<MaxScaleDenominator>%f</MaxScaleDenominator>
<MinScaleDenominator>%f</MinScaleDenominator>"""%(z1,z2)
<MaxScaleDenominator>%s</MaxScaleDenominator>
<MinScaleDenominator>%s</MinScaleDenominator>"""%(z1,z2)
def xml_start(bgcolor="#ffffff"):
bgcolor = nicecolor(bgcolor)
@ -139,4 +140,8 @@ def xml_layer(type="postgis", geom="point", interesting_tags = "*", sql = ["true
<Parameter name="user">%s</Parameter>
<Parameter name="dbname">%s</Parameter>
</Datasource>
</Layer>"""%(layer_id, db_proj, subs, interesting_tags, table_prefix, geom, sql, db_user, db_name)
</Layer>"""%(layer_id, db_proj, subs, interesting_tags, table_prefix, geom, sql, db_user, db_name)
def xml_nolayer():
global substyles
substyles = []

52
src/styles/osmosnimki-maps.mapcss
View file

@ -3,39 +3,55 @@
Osmosnimki maps style
*/
canvas {fill-color: #FAF8F8}
canvas {fill-color: #fcf8e4}
way[highway]
area[place=city]
{fill-color:#f3eceb; z-index:2}
area[place=town],
area[place=hamlet],
area[place=village],
area[place=locality]
{fill-color:#f4d7c7; z-index:2}
area[landuse=allotments],
area[leisure=garden],
area[landuse=orchard]
{fill-color:#edf2c1; z-index:3}
area[natural=forest], area[natural=wood],
area[landuse=forest], area[landuse=wood]
{fill-color: #d6f4c6; z-index:4}
area[landuse=grass], area[natural=grass] {fill-color: #f4ffe5;; z-index:5}
area[landuse=garages] {fill-color: #ddd8da; z-index:6}
/*way[highway]
{width: eval( any( metric(tag("width")), metric ( num(tag("lanes")) * 4), metric("7m")));
color:#ffffff;
text: name; text-position: line; text-color:#000000;text-halo-radius:2;text-halo-color:#ffffff;
casing-color: #D29D39;}
casing-color: #D29D39;}*/
way[highway=primary]
{z-index:1; width:9; color: #FCE57D; casing-width:1; casing-color: #CBB48B; }
{z-index:2; width:1; color: #FBCB7C;}
way[highway][area=yes]{fill-color: #ffffff;width:0}
/*area[highway]{fill-color: #ffffff;width:0}*/
/* With this eval, if bridge is applied to invisible line, no bridge renders */
way[bridge=yes] {casing-width:eval(min(3, num(prop("width"))/2 ));}
/*way[bridge=yes] {casing-width:eval(min(3, num(prop("width"))/2 ));}*/
way[natural=forest],
way[natural=wood],
way[landuse=forest],
way[landuse=wood]
{fill-color: #C5E9A5;}
way[landuse=grass],
way[natural=grass]{fill-color: #B9DE96;}
way[landuse=garages]
{fill-color: #d2e8ed; color: #cad4e1}
way[waterway=riverbank],
way[natural=water] {fill-color: #C4D4F5; color: #7281A0}
@ -45,8 +61,8 @@ way[waterway=stream]{color: #C4D4F5; casing-width: 1; casing-color: #7281A0 }
way[leisure=stadium]{fill-color: #d0ffff; casing-width: 2; casing-color: #00ccff;z-index:10;}
way[railway=tram]{width: eval( any( metric(tag("width")), metric("1.52m")));color: #ffffff; casing-color: #000000}
{width: eval( metric("2.7m")); color: #000000; dashes: 1,10; z-index:1; object-id: "shpala"}
/*way[railway=tram]{width: eval( any( metric(tag("width")), metric("1.52m")));color: #ffffff; casing-color: #000000}
{width: eval( metric("2.7m")); color: #000000; dashes: 1,10; z-index:1; object-id: "shpala"}*/
/*way[landuse=industrial] {fill-color: #855}*/
way[landuse=military] {fill-color: pink}