Correct extruding of polygons
This commit is contained in:
Komяpa
parent
386efa8bdc
commit
562c4087ff
5 changed files with 63 additions and 27 deletions
|
|
@ -62,7 +62,7 @@ class Renderer(threading.Thread):
|
|||
class Navigator:
|
||||
def __init__(self, comm):
|
||||
self.comm = comm
|
||||
self.center_coord = (27.6749791, 53.8621394)
|
||||
self.center_coord = (27.6549791, 53.8698)
|
||||
self.width, self.height = 800, 480
|
||||
self.zoom = 17.
|
||||
self.data_projection = "EPSG:4326"
|
||||
|
|
@ -78,7 +78,7 @@ class Navigator:
|
|||
self.f = True
|
||||
undef = None
|
||||
self.style = Styling()
|
||||
self.style.parse(open("styles/default.mapcss","r").read())
|
||||
self.style.parse(open("styles/openstreetinfo.mapcss","r").read())
|
||||
|
||||
da = gtk.DrawingArea()
|
||||
da.add_events(gtk.gdk.BUTTON1_MOTION_MASK)
|
||||
|
|
@ -104,7 +104,7 @@ class Navigator:
|
|||
if self.drag:
|
||||
self.dx = event.x - self.drag_x
|
||||
self.dy = event.y - self.drag_y
|
||||
if((abs(self.dx) > 1 or abs(self.dy) > 1) and self.f):
|
||||
if((abs(self.dx) > 3 or abs(self.dy) > 3) and self.f):
|
||||
# self.redraw()
|
||||
# self.request_d = (self.dx, self.dy)
|
||||
# self.f = False
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class StyleChooser:
|
|||
|
||||
# // Update the current StyleList from this StyleChooser
|
||||
|
||||
def updateStyles(self,sl,type, tags, zoom):
|
||||
def updateStyles(self,sl,type, tags, zoom, scale, zscale):
|
||||
# // Are any of the ruleChains fulfilled?
|
||||
# // FIXME: needs to cope with min/max zoom
|
||||
w = 0
|
||||
|
|
@ -76,7 +76,7 @@ class StyleChooser:
|
|||
if b.strip()[:5] == "eval(":
|
||||
ev = Eval(b)
|
||||
## FIXME: properties && metrics
|
||||
b = ev.compute(tags,{})
|
||||
b = ev.compute(tags,{}, scale, zscale)
|
||||
ra[a] = b
|
||||
r = ra
|
||||
ra = {}
|
||||
|
|
@ -95,7 +95,8 @@ class StyleChooser:
|
|||
"these things are arrays of float's or not in table at all"
|
||||
try:
|
||||
b = b.split(",")
|
||||
b = [float(x) for x in b]
|
||||
b = [int(x) for x in b]
|
||||
ra[a]= b
|
||||
except ValueError:
|
||||
pass
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -107,14 +107,14 @@ class MapCSS():
|
|||
else:
|
||||
logging.error("unparsed zoom: %s" %s)
|
||||
|
||||
def get_style (self, type, tags, zoom):
|
||||
def get_style (self, type, tags, zoom, scale, zscale):
|
||||
"""
|
||||
Kothic styling API
|
||||
"""
|
||||
style = []
|
||||
#return [{"width": 1, "color":(0,0,0), "layer": 1}, {"width": 3, "color":(1,1,1), "layer":0}]
|
||||
for chooser in self.choosers:
|
||||
style = chooser.updateStyles(style, type, tags, zoom)
|
||||
style = chooser.updateStyles(style, type, tags, zoom, scale, zscale)
|
||||
return style
|
||||
|
||||
def parse(self, css):
|
||||
|
|
|
|||
|
|
@ -100,9 +100,9 @@ def main ():
|
|||
print "Ways read:", WAYS_READ
|
||||
|
||||
mzoom = 1
|
||||
tags = style.filter_tags(tags)
|
||||
#tags = style.filter_tags(tags)
|
||||
if tags:
|
||||
if style.get_style("way", tags, True): # if way is stylized
|
||||
if True:#style.get_style("way", tags, True): # if way is stylized
|
||||
towrite = ";".join(["%s=%s"%x for x in tags.iteritems()]) ### TODO: sanitize keys and values
|
||||
#print towrite
|
||||
way_simplified = {MAXZOOM: curway}
|
||||
|
|
|
|||
|
|
@ -81,10 +81,12 @@ class RasterTile:
|
|||
print self.zoom, self.zoomlevel
|
||||
self.bbox = bbox
|
||||
self.bbox_p = projections.from4326(bbox,self.proj)
|
||||
|
||||
print self.bbox_p
|
||||
scale = abs(self.w/(self.bbox_p[0] - self.bbox_p[2])/math.cos(math.pi*(self.bbox[0]+self.bbox[1])/2/180))
|
||||
zscale = 0.5*scale
|
||||
cr = cairo.Context(self.surface)
|
||||
# getting and setting canvas properties
|
||||
bgs = style.get_style("canvas", {}, self.zoom)
|
||||
bgs = style.get_style("canvas", {}, self.zoom, scale, zscale)
|
||||
if not bgs:
|
||||
bgs = [{}]
|
||||
bgs = bgs[0]
|
||||
|
|
@ -114,8 +116,10 @@ class RasterTile:
|
|||
datatimer = Timer("Asking backend and styling")
|
||||
vectors = self.data.get_vectors(bbox,self.zoom).values()
|
||||
ww = []
|
||||
|
||||
for way in vectors:
|
||||
st = style.get_style("way", way.tags, self.zoom)
|
||||
|
||||
st = style.get_style("way", way.tags, self.zoom, scale, zscale)
|
||||
if st:
|
||||
for fpt in st:
|
||||
#debug(fpt)
|
||||
|
|
@ -158,24 +162,13 @@ class RasterTile:
|
|||
|
||||
if not "extrude" in obj[1]:
|
||||
poly(cr, obj[0].cs)
|
||||
else:
|
||||
line(cr, obj[0].cs)
|
||||
if "extrude" in obj[1]:
|
||||
hgt = obj[1]["extrude"]
|
||||
print "extruding! %s" % hgt
|
||||
cr.set_line_width (1)
|
||||
excoords = [(a[0],a[1]-hgt) for a in obj[0].cs]
|
||||
for c in excoords:
|
||||
line(cr, [(c[0],c[1]),(c[0],c[1]+hgt)])
|
||||
poly(cr,excoords)
|
||||
#line(cr, obj[0].cs)
|
||||
|
||||
|
||||
|
||||
# - draw casings on layer
|
||||
for obj in data:
|
||||
### Extras: casing-linecap, casing-linejoin
|
||||
if "casing-width" in obj[1] or "casing-color" in obj[1]:
|
||||
if "casing-width" in obj[1] or "casing-color" in obj[1] and "extrude" not in obj[1]:
|
||||
cr.set_dash(obj[1].get("casing-dashes",obj[1].get("dashes", [])))
|
||||
cr.set_line_join(linejoin.get(obj[1].get("casing-linejoin",obj[1].get("linejoin", "round")),1))
|
||||
color = obj[1].get("casing-color", (0,0,0))
|
||||
|
|
@ -184,12 +177,13 @@ class RasterTile:
|
|||
## Probable solution: render casing, render way as mask and put casing with mask chopped out onto image
|
||||
|
||||
|
||||
cr.set_line_width (obj[1].get("casing-width", obj[1].get("width",0)+1 ))
|
||||
cr.set_line_width (obj[1].get("width",0)+obj[1].get("casing-width", 1 ))
|
||||
cr.set_line_cap(linecaps.get(obj[1].get("casing-linecap", obj[1].get("linecap", "butt")),0))
|
||||
line(cr, obj[0].cs)
|
||||
|
||||
# - draw line centers
|
||||
for obj in data:
|
||||
if "width" in obj[1] or "color" in obj[1]:
|
||||
if "width" in obj[1] or "color" in obj[1] and "extrude" not in obj[1]:
|
||||
cr.set_dash(obj[1].get("dashes", []))
|
||||
cr.set_line_join(linejoin.get(obj[1].get("linejoin", "round"),1))
|
||||
color = obj[1].get("color", (0,0,0))
|
||||
|
|
@ -199,6 +193,47 @@ class RasterTile:
|
|||
cr.set_line_width (obj[1].get("width", 1))
|
||||
cr.set_line_cap(linecaps.get(obj[1].get("linecap", "butt"),0))
|
||||
line(cr, obj[0].cs)
|
||||
|
||||
# - fill polygons
|
||||
for obj in data:
|
||||
if "extrude" in obj[1]:
|
||||
def face_to_poly(face, hgt):
|
||||
"""
|
||||
Converts a line into height-up extruded poly
|
||||
"""
|
||||
return [face[0], face[1], (face[1][0], face[1][1]-hgt), (face[0][0], face[0][1]-hgt), face[0]]
|
||||
hgt = obj[1]["extrude"]
|
||||
|
||||
# print "extruding! %s" % hgt
|
||||
color = obj[1].get("extrude-edge-color", obj[1].get("color", (0,0,0) ))
|
||||
cr.set_source_rgba(color[0], color[1], color[2], obj[1].get("extrude-edge-opacity", obj[1].get("opacity", 1)))
|
||||
cr.set_line_width (0.5)
|
||||
excoords = [(a[0],a[1]-hgt) for a in obj[0].cs]
|
||||
faces = []
|
||||
p_coord = obj[0].cs[-1]
|
||||
for coord in obj[0].cs:
|
||||
faces.append([coord, p_coord])
|
||||
p_coord = coord
|
||||
faces.sort(lambda x,y:cmp(min([x1[1] for x1 in x]), min([x1[1] for x1 in y])))
|
||||
for face in faces:
|
||||
ply = face_to_poly(face,hgt)
|
||||
color = obj[1].get("extrude-face-color", obj[1].get("color", (0,0,0) ))
|
||||
cr.set_source_rgba(color[0], color[1], color[2], obj[1].get("extrude-face-opacity", obj[1].get("opacity", 1)))
|
||||
poly(cr, ply)
|
||||
color = obj[1].get("extrude-edge-color", obj[1].get("color", (0,0,0) ))
|
||||
cr.set_source_rgba(color[0], color[1], color[2], obj[1].get("extrude-edge-opacity", obj[1].get("opacity", 1)))
|
||||
cr.set_line_width (0.5)
|
||||
line(cr, ply)
|
||||
|
||||
|
||||
color = obj[1]["fill-color"]
|
||||
cr.set_source_rgba(color[0], color[1], color[2], obj[1].get("fill-opacity", 1))
|
||||
poly(cr,excoords)
|
||||
color = obj[1].get("extrude-edge-color", obj[1].get("color", (0,0,0) ))
|
||||
cr.set_source_rgba(color[0], color[1], color[2], obj[1].get("extrude-edge-opacity", obj[1].get("opacity", 1)))
|
||||
line(cr,excoords)
|
||||
|
||||
|
||||
# - render text labels
|
||||
texttimer = Timer("Text rendering")
|
||||
cr.set_line_join(1) # setting linejoin to "round" to get less artifacts on halo render
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue