Initial proj4 support. Breaks UI.
This commit is contained in:
Komяpa
parent
c15f861e90
commit
16fc2ecec3
5 changed files with 100 additions and 62 deletions
37
src/generate_image.py
Normal file
37
src/generate_image.py
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
# This file is part of kothic, the realtime map renderer.
|
||||
|
||||
# kothic is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# kothic is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with kothic. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
from debug import debug, Timer
|
||||
from vtiles_backend import QuadTileBackend as DataBackend
|
||||
from style import Styling
|
||||
from render import RasterTile
|
||||
|
||||
|
||||
|
||||
bbox = (27.115768874532,53.740327031764,28.028320754378,54.067187302158)
|
||||
|
||||
w,h = 630,364
|
||||
z = 14
|
||||
|
||||
db = DataBackend()
|
||||
style = Styling()
|
||||
|
||||
res = RasterTile(w, h, z, db)
|
||||
res.update_surface(bbox, z, style)
|
||||
|
||||
res.surface.write_to_png("test.png")
|
||||
|
|
@ -46,7 +46,6 @@ class Renderer(threading.Thread):
|
|||
threading.Thread.__init__(self)
|
||||
def run(self):
|
||||
debug("Thread started")
|
||||
self.tc = {}
|
||||
while(True):
|
||||
while(True):
|
||||
request = self.comm[0].get()
|
||||
|
|
@ -54,7 +53,7 @@ class Renderer(threading.Thread):
|
|||
break
|
||||
#debug (" got request:", request)
|
||||
res = RasterTile(request.size[0], request.size[1], request.zoomlevel, request.data_backend)
|
||||
res.update_surface(request.center_lonlat, request.zoom, self.tc, request.style)
|
||||
res.update_surface_by_center(request.center_lonlat, request.zoom, request.style)
|
||||
comm[1].put(res)
|
||||
comm[0].task_done()
|
||||
comm[2].queue_draw()
|
||||
|
|
@ -75,7 +74,6 @@ class Navigator:
|
|||
self.drag_x = 0
|
||||
self.drag_y = 0
|
||||
self.drag = False
|
||||
self.tilecache = {}
|
||||
self.rastertile = None
|
||||
self.f = True
|
||||
undef = None
|
||||
|
|
@ -128,15 +126,10 @@ class Navigator:
|
|||
debug("Stop drag")
|
||||
self.drag = False
|
||||
self.timer.stop()
|
||||
# debug("ll:", self.latcenter, self.loncenter)
|
||||
debug("LL before: %s, %s" % self.center_coord)
|
||||
debug("dd: %s,%s "%(self.dx, self.dy))
|
||||
self.center_coord = self.rastertile.screen2lonlat(self.rastertile.w/2 - self.dx, self.rastertile.h/2 - self.dy);
|
||||
#self.dx = self.dy = 0
|
||||
self.f = True
|
||||
debug("LL after: %s, %s" % self.center_coord)
|
||||
self.redraw()
|
||||
#widget.queue_draw()
|
||||
def scroll_ev(self, widget, event):
|
||||
# Zoom test :3
|
||||
if event.direction == gtk.gdk.SCROLL_UP:
|
||||
|
|
@ -174,7 +167,7 @@ class Navigator:
|
|||
self.rastertile = None
|
||||
if self.rastertile is None:
|
||||
self.rastertile = RasterTile(self.width*3, self.height*3, self.zoomlevel, self.data)
|
||||
self.rastertile.update_surface(self.center_coord, self.zoom, self.tilecache, self.style, None)
|
||||
self.rastertile.update_surface_by_center(self.center_coord, self.zoom, self.style, None)
|
||||
nrt = None
|
||||
while(not self.comm[1].empty()):
|
||||
nrt = self.comm[1].get()
|
||||
|
|
|
|||
|
|
@ -16,20 +16,21 @@
|
|||
# along with kothic. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from debug import debug, Timer
|
||||
from twms import projections
|
||||
import cairo
|
||||
import math
|
||||
|
||||
|
||||
def line(cr, c):
|
||||
cr.move_to(c[0], c[1])
|
||||
for k in range(2, len(c), 2):
|
||||
cr.line_to(c[k], c[k + 1])
|
||||
cr.move_to(*c[0])
|
||||
for k in c:
|
||||
cr.line_to(*k)
|
||||
cr.stroke()
|
||||
|
||||
def poly(cr, c):
|
||||
cr.move_to(c[0], c[1])
|
||||
for k in range(2, len(c), 2):
|
||||
cr.line_to(c[k], c[k + 1])
|
||||
cr.move_to(*c[0])
|
||||
for k in c:
|
||||
cr.line_to(*k)
|
||||
cr.fill()
|
||||
|
||||
|
||||
|
|
@ -37,33 +38,52 @@ def poly(cr, c):
|
|||
|
||||
|
||||
class RasterTile:
|
||||
def __init__(self, width, height, zoom, data_backend):
|
||||
def __init__(self, width, height, zoomlevel, data_backend, raster_proj="EPSG:3395"):
|
||||
self.w = width
|
||||
self.h = height
|
||||
self.surface = cairo.ImageSurface(cairo.FORMAT_RGB24, self.w, self.h)
|
||||
self.offset_x = 0
|
||||
self.offset_y = 0
|
||||
self.center_coord = None
|
||||
self.zoomlevel = zoom
|
||||
self.bbox = (0.,0.,0.,0.)
|
||||
self.bbox_p = (0.,0.,0.,0.)
|
||||
self.zoomlevel = zoomlevel
|
||||
self.zoom = None
|
||||
self.data = data_backend
|
||||
def screen2lonlat(self, x, y):
|
||||
return (x - self.w/2)/(math.cos(self.center_coord[1]*math.pi/180)*self.zoom) + self.center_coord[0], -(y - self.h/2)/self.zoom + self.center_coord[1]
|
||||
self.proj = raster_proj
|
||||
def screen2lonlat(self, lon, lat):
|
||||
lo1, la1, lo2, la2 = self.bbox_p
|
||||
return projections.to4326(((lon)*(self.w-1)*abs(lo2-lo1)+lo1, la2+((lat)/(self.h-1)*(la2-la1))),self.proj)
|
||||
# return (x - self.w/2)/(math.cos(self.center_coord[1]*math.pi/180)*self.zoom) + self.center_coord[0], -(y - self.h/2)/self.zoom + self.center_coord[1]
|
||||
def lonlat2screen(self, (lon, lat)):
|
||||
return (lon - self.center_coord[0])*self.lcc*self.zoom + self.w/2, -(lat - self.center_coord[1])*self.zoom + self.h/2
|
||||
def update_surface(self, lonlat, zoom, tilecache, style, lock = None):
|
||||
lo1, la1, lo2, la2 = self.bbox_p
|
||||
return ((lon-lo1)*(self.w-1)/abs(lo2-lo1), ((la2-lat)*(self.h-1)/(la2-la1)))
|
||||
# return (lon - self.center_coord[0])*self.lcc*self.zoom + self.w/2, -(lat - self.center_coord[1])*self.zoom + self.h/2
|
||||
def update_surface_by_center(self, lonlat, zoom, style, lock = None):
|
||||
self.zoom = zoom
|
||||
self.zoom = 0.1
|
||||
xy = projections.from4326(lonlat, self.proj)
|
||||
xy1 = projections.to4326((xy[0]-self.w/2/self.zoom, xy[1]-self.h/2/self.zoom), self.proj)
|
||||
xy2 = projections.to4326((xy[0]+self.w/2/self.zoom, xy[1]+self.h/2/self.zoom), self.proj)
|
||||
bbox = (xy1[0],xy1[1],xy2[0],xy2[1])
|
||||
debug (bbox)
|
||||
return self.update_surface(bbox, zoom, style, lock)
|
||||
|
||||
|
||||
def update_surface(self, bbox, zoom, style, lock = None):
|
||||
rendertimer = Timer("Rendering image")
|
||||
timer = Timer("Gettimg data")
|
||||
self.zoom = zoom
|
||||
self.center_coord = lonlat
|
||||
self.bbox = bbox
|
||||
self.bbox_p = projections.from4326(bbox,self.proj)
|
||||
|
||||
|
||||
cr = cairo.Context(self.surface)
|
||||
cr.rectangle(0, 0, self.w, self.h)
|
||||
cr.set_source_rgb(0.7, 0.7, 0.7)
|
||||
#cr.set_source_rgb(0.7, 0.7, 0.7)
|
||||
cr.set_source_rgb(0, 0, 0)
|
||||
cr.fill()
|
||||
lonmin, latmin = self.screen2lonlat(0, self.h)
|
||||
lonmax, latmax = self.screen2lonlat(self.w, 0)
|
||||
datatimer = Timer("Asking backend and styling")
|
||||
ww = [ (x, style.get_style("way", x.tags)) for x in self.data.get_vectors((lonmin,latmin,lonmax,latmax),self.zoomlevel).values()]
|
||||
ww = [ (x, style.get_style("way", x.tags)) for x in self.data.get_vectors(bbox,self.zoomlevel).values()]
|
||||
datatimer.stop()
|
||||
ww1 = []
|
||||
for way in ww:
|
||||
|
|
@ -75,20 +95,10 @@ class RasterTile:
|
|||
if lock is not None:
|
||||
lock.acquire()
|
||||
lock.release()
|
||||
self.lcc = math.cos(self.center_coord[1]*math.pi/180)
|
||||
|
||||
|
||||
#debug(objs_by_layers)
|
||||
#ww = [x[0] for x in ww]
|
||||
|
||||
lcc = math.cos(self.center_coord[1]*math.pi/180)
|
||||
for w in ww:
|
||||
cs = []
|
||||
for k in range(0, len(w[0].coords), 2):
|
||||
x, y = self.lonlat2screen((w[0].coords[k], w[0].coords[k+1]));
|
||||
cs.append(x)
|
||||
cs.append(y)
|
||||
w[0].cs = cs
|
||||
w[0].cs = [self.lonlat2screen(coord) for coord in projections.from4326(w[0].coords, self.proj)]
|
||||
#debug(w[0].cs)
|
||||
|
||||
|
||||
ww.sort(key=lambda x: x[1]["layer"])
|
||||
layers = list(set([int(x[1]["layer"]/100.) for x in ww]))
|
||||
|
|
@ -122,15 +132,10 @@ class RasterTile:
|
|||
line(cr, obj[0].cs)
|
||||
if "extrude" in obj[1]:
|
||||
hgt = obj[1]["extrude"]
|
||||
c = obj[0].cs
|
||||
excoords = [c[0], c[1]-hgt]
|
||||
#pp = (c[0],c[1])
|
||||
cr.set_line_width (1)
|
||||
for k in range(2, len(c), 2):
|
||||
excoords.append(c[k])
|
||||
excoords.append(c[k + 1]-hgt)
|
||||
|
||||
line(cr, [c[k],c[k+1],c[k],c[k+1]-hgt],)
|
||||
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)
|
||||
|
||||
|
|
@ -201,4 +206,5 @@ class RasterTile:
|
|||
texttimer.stop()
|
||||
|
||||
timer.stop()
|
||||
rendertimer.stop()
|
||||
rendertimer.stop()
|
||||
debug(self.bbox)
|
||||
13
src/style.py
13
src/style.py
|
|
@ -32,9 +32,9 @@ class Styling():
|
|||
self.Selectors["node"] = []
|
||||
self.Selectors["relation"] = []
|
||||
if not stylefile:
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("building",),(None) ) ] ),{"fill-color": "#f00"} ))
|
||||
# self.Selectors["way"].append(StyleSelector( ( [ ( ("building",),(None) ) ] ),{"fill-color": "#00f"} ))
|
||||
|
||||
if stylefile=="zzzz":
|
||||
#if stylefile=="zzzz":
|
||||
### using "builtin" styling
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("area",),("yes") ) ] ),{"fill-color": "#ff0000"} ))
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("highway",),(None) ) ] ),{"width":1,"color":"#ff0000","text": "name", "text-position":"line"} ))
|
||||
|
|
@ -56,7 +56,7 @@ class Styling():
|
|||
self.Selectors["way"].append(StyleSelector( ( [ ( ("highway",),("footway","pedestrian","path" )) ] ),{"width":2.5, "color":"#655", "dashes": [3,1],"z-index":3} ))
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("bridge",),("yes") ) ] ),{"casing-width":10} ))
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("power",),("line",)) ] ),{"width": 1, "color":"#ccc",} ))
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("building",),(None) ) ] ),{"fill-color": "#522","z-index": 1, "text": "addr:housenumber","text-halo-radius":2,"extrude":10,"z-index":100} ))
|
||||
self.Selectors["way"].append(StyleSelector( ( [ ( ("building",),(None) ) ] ),{"fill-color": "#522","text": "addr:housenumber","text-halo-radius":2,"z-index":100} ))#"extrude":10,
|
||||
|
||||
self.stylefile = stylefile
|
||||
self.useful_keys = set(["layer"])
|
||||
|
|
@ -85,12 +85,15 @@ class Styling():
|
|||
return True
|
||||
if not nodata and resp:
|
||||
#debug((tags, tags.get("layer",0)), )
|
||||
resp["layer"] = int(tags.get("layer",0))*100+resp.get("z-index",0)+1000
|
||||
try:
|
||||
resp["layer"] = int(tags.get("layer",0))*100+resp.get("z-index",0)+1000
|
||||
except ValueError:
|
||||
resp["layer"] = 1000000
|
||||
|
||||
if "text" in resp: # unpacking text
|
||||
if resp["text"] in tags:
|
||||
resp["text"] = tags[resp["text"]]
|
||||
debug("text: %s"%resp["text"])
|
||||
#debug("text: %s"%resp["text"])
|
||||
else:
|
||||
del resp["text"]
|
||||
return resp
|
||||
|
|
|
|||
|
|
@ -20,20 +20,19 @@ from twms import projections
|
|||
|
||||
class Way:
|
||||
def __init__(self, tags, coords):
|
||||
self.coords = coords
|
||||
|
||||
self.cs = None
|
||||
#print [x.split("=") for x in tags.split(";")]
|
||||
self.tags = dict((x.split("=") for x in tags.split(";")))
|
||||
# calculating center point
|
||||
c= coords
|
||||
sumz = [c[0],c[1]]
|
||||
c= coords
|
||||
sumz = [(c[0],c[1])]
|
||||
for k in range(2, len(c), 2):
|
||||
sumz[0] += c[k]
|
||||
sumz[1] += c[k + 1]
|
||||
self.center = sumz
|
||||
sumz.append((c[k], c[k + 1]))
|
||||
self.coords = sumz
|
||||
# left for the better times:
|
||||
#self.center = reduce(lambda x, y: (x[0]+y[0],x[1]+y[1]), coords)
|
||||
self.center = (self.center[0]/len(self.coords)*2,self.center[1]/len(self.coords)*2)
|
||||
self.center = reduce(lambda x, y: (x[0]+y[0],x[1]+y[1]), self.coords)
|
||||
self.center = (self.center[0]/len(self.coords),self.center[1]/len(self.coords))
|
||||
#debug(self.center)
|
||||
|
||||
class QuadTileBackend:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue