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

Try to group line layers

Browse source
This commit is contained in:
Komяpa 2011-04-03 00:45:45 +03:00
parent 6ddb5c86f0
commit 37faccd64a
2 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/komap.py
View file

@ -229,10 +229,14 @@ for zoom, zsheet in mapniksheet.iteritems():
else:
xml_nolayer()
## lines pass
sql_g = set()
there_are_dashed_lines = False
itags_g = set()
xml_g = ""
for zindex in ta:
## lines pass
sql = set()
there_are_dashed_lines = False
itags = set()
xml = xml_style_start()
for entry in zsheet[zindex]:
@ -270,34 +274,41 @@ for zoom, zsheet in mapniksheet.iteritems():
xml += xml_style_end()
sql.discard("()")
if sql:
mfile.write(xml)
sql = "(" + " OR ".join(sql) + ") and way && !bbox!"
if zlayer == 0 and full_layering:
sql = "("+ sql +') and ("layer" not in ('+ ", ".join(['\'%s\''%i for i in range(-5,6) if i != 0])+") or \"layer\" is NULL)"
elif zlayer <=5 and zlayer >= -5 and full_layering:
sql = "("+ sql +') and "layer" = \'%s\''%zlayer
oitags = itags
itags = add_numerics_to_itags(itags)
#### FIXME: Performance degrades painfully on large lines ST_Union. Gotta find workaround :(
#if layer_type == "polygon" and there_are_dashed_lines:
#itags = ", ".join(itags)
#oitags = '"'+ "\", \"".join(oitags) +'"'
#sqlz = """select %s, ST_LineMerge(ST_Union(way)) as way from
#(SELECT %s, ST_Boundary(ST_Buffer(way,0)) as way from
#(SELECT %s, way from planet_osm_polygon where (%s)) tex
#) p
#group by %s
#"""%(itags,oitags,sql,oitags)
##elif layer_type == "line" and there_are_dashed_lines:
## sqlz = """select %s, ST_Union(way) as way from (SELECT * from planet_osm_line where way &amp;&amp; !bbox! #and (%s)) as tex
## group by %s
## """%(itags,sql,oitags)
#mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz ))
#else:
mfile.write(xml_layer("postgis", layer_type, itags, sql ))
sql_g.update(sql)
xml_g += xml
itags_g.update(itags)
else:
xml_nolayer()
xml_nosubstyle()
sql = sql_g
if sql:
mfile.write(xml_g)
sql = "(" + " OR ".join(sql) + ") and way &amp;&amp; !bbox!"
if zlayer == 0 and full_layering:
sql = "("+ sql +') and ("layer" not in ('+ ", ".join(['\'%s\''%i for i in range(-5,6) if i != 0])+") or \"layer\" is NULL)"
elif zlayer <=5 and zlayer >= -5 and full_layering:
sql = "("+ sql +') and "layer" = \'%s\''%zlayer
oitags = itags
itags = add_numerics_to_itags(itags)
#### FIXME: Performance degrades painfully on large lines ST_Union. Gotta find workaround :(
#if layer_type == "polygon" and there_are_dashed_lines:
#itags = ", ".join(itags)
#oitags = '"'+ "\", \"".join(oitags) +'"'
#sqlz = """select %s, ST_LineMerge(ST_Union(way)) as way from
#(SELECT %s, ST_Boundary(ST_Buffer(way,0)) as way from
#(SELECT %s, way from planet_osm_polygon where (%s)) tex
#) p
#group by %s
#"""%(itags,oitags,sql,oitags)
##elif layer_type == "line" and there_are_dashed_lines:
## sqlz = """select %s, ST_Union(way) as way from (SELECT * from planet_osm_line where way &amp;&amp; !bbox! #and (%s)) as tex
## group by %s
## """%(itags,sql,oitags)
#mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz ))
#else:
mfile.write(xml_layer("postgis", layer_type, itags, sql ))
else:
xml_nolayer()
for layer_type, entry_types in [("point", ("node", "point")),("line",("way", "line")), ("polygon",("way","area"))]:
for zindex in ta:
## icons pass

5
src/libkomapnik.py
View file

@ -294,4 +294,7 @@ def xml_layer(type="postgis", geom="point", interesting_tags = "*", sql = "true"
</Layer>"""%(layer_id, db_proj, subs, world_bnd_path)
def xml_nolayer():
global substyles
substyles = []
substyles = []
def xml_nosubstyle():
global substyles
substyles = substyles[:-1]