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

autopep8

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-02-27 23:46:58 +03:00
parent 7525083abe
commit 846615d644
2 changed files with 227 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

230
src/backend/postgis/__init__.py
View file

@ -20,132 +20,132 @@ from twms import projections
import psycopg2
import shapely.wkb
class Empty:
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
return a
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
return a
class Way:
def __init__(self, tags, geom):
def __init__(self, tags, geom):
self.cs = []
#print [x.split("=") for x in tags.split(";")]
self.tags = tags
# calculating center point
#c= geom
#sumz = [(c[0],c[1])]
#for k in range(2, len(c), 2):
# sumz.append((c[k], c[k + 1]))
self.coords = geom
# left for the better times:
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)
self.cs = []
#print [x.split("=") for x in tags.split(";")]
self.tags = tags
# calculating center point
#c= geom
#sumz = [(c[0],c[1])]
#for k in range(2, len(c), 2):
# sumz.append((c[k], c[k + 1]))
self.coords = geom
# left for the better times:
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)
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
return a
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
return a
class PostGisBackend:
"""
A class that gives out vector data on demand.
"""
def __init__(self,database = "dbname=gis user=mapz host=komzpa.net",max_zoom = 16,proj = "EPSG:3857", path = "tiles", lang = "ru", ):
# debug("Bakend created")
self.database=database
self.max_zoom = max_zoom # no better tiles available
self.path = path # path to tile files
self.lang = lang # map language to use
self.tiles = {} # loaded vector tiles go here
self.proj = proj # which projection used to cut map in tiles
self.keep_tiles = 190 # a number of tiles to cache in memory
self.tile_load_log = [] # used when selecting which tile to unload
def get_vectors (self, bbox, zoom, sql_hint = None, tags_hint = None):
"""
Fetches vectors for given bbox.
sql_hint is a list of sets of (key, sql_for_key)
A class that gives out vector data on demand.
"""
a = psycopg2.connect(self.database)
b = a.cursor()
bbox = tuple(projections.from4326(bbox,self.proj))
### FIXME: hardcoded EPSG:3857 in database
tables = ("planet_osm_line","planet_osm_polygon") # FIXME: points
resp = {}
for table in tables:
add = ""
taghint = "*"
if sql_hint:
adp = []
for tp in sql_hint:
add = []
b.execute("SELECT * FROM %s LIMIT 1;"%table)
names = [q[0] for q in b.description]
for j in tp[0]:
if j not in names:
break
else:
add.append(tp[1])
if add:
add = " OR ".join(add)
add = "("+add+")"
adp.append(add)
if tags_hint:
taghint = ", ".join(['"'+j+'"' for j in tags_hint if j in names])+ ", way, osm_id"
adp = " OR ".join(adp)
def __init__(self,database = "dbname=gis user=mapz host=komzpa.net",max_zoom = 16,proj = "EPSG:3857", path = "tiles", lang = "ru", ):
req = "SELECT %s FROM %s WHERE (%s) and way && SetSRID('BOX3D(%s %s,%s %s)'::box3d,900913);"%(taghint,table,adp,bbox[0],bbox[1],bbox[2],bbox[3])
print req
b.execute(req)
names = [q[0] for q in b.description]
# debug("Bakend created")
self.database=database
self.max_zoom = max_zoom # no better tiles available
self.path = path # path to tile files
self.lang = lang # map language to use
self.tiles = {} # loaded vector tiles go here
self.proj = proj # which projection used to cut map in tiles
self.keep_tiles = 190 # a number of tiles to cache in memory
self.tile_load_log = [] # used when selecting which tile to unload
for row in b.fetchall():
def get_vectors (self, bbox, zoom, sql_hint = None, tags_hint = None):
"""
Fetches vectors for given bbox.
sql_hint is a list of sets of (key, sql_for_key)
"""
a = psycopg2.connect(self.database)
b = a.cursor()
bbox = tuple(projections.from4326(bbox,self.proj))
### FIXME: hardcoded EPSG:3857 in database
tables = ("planet_osm_line","planet_osm_polygon") # FIXME: points
resp = {}
for table in tables:
add = ""
taghint = "*"
if sql_hint:
adp = []
row_dict = dict(map(None,names,row))
for k,v in row_dict.items():
if not v:
del row_dict[k]
geom = shapely.wkb.loads(row_dict["way"].decode('hex'))
### FIXME: a dirty hack to basically support polygons, needs lots of rewrite
try:
geom = list(geom.coords)
except NotImplementedError:
"trying polygons"
try:
geom = geom.boundary
geom = list(geom.coords)
row_dict[":area"] = "yes"
except NotImplementedError:
"multipolygon"
continue
### FIXME
#geom = projections.to4326(geom, self.proj)
del row_dict["way"]
oid = row_dict["osm_id"]
del row_dict["osm_id"]
w = Way(row_dict, geom)
#print row_dict
resp[oid] = w
a.close()
del a
return resp
for tp in sql_hint:
add = []
b.execute("SELECT * FROM %s LIMIT 1;"%table)
names = [q[0] for q in b.description]
for j in tp[0]:
if j not in names:
break
else:
add.append(tp[1])
if add:
add = " OR ".join(add)
add = "("+add+")"
adp.append(add)
if tags_hint:
taghint = ", ".join(['"'+j+'"' for j in tags_hint if j in names])+ ", way, osm_id"
adp = " OR ".join(adp)
req = "SELECT %s FROM %s WHERE (%s) and way && SetSRID('BOX3D(%s %s,%s %s)'::box3d,900913);"%(taghint,table,adp,bbox[0],bbox[1],bbox[2],bbox[3])
print req
b.execute(req)
names = [q[0] for q in b.description]
for row in b.fetchall():
row_dict = dict(map(None,names,row))
for k,v in row_dict.items():
if not v:
del row_dict[k]
geom = shapely.wkb.loads(row_dict["way"].decode('hex'))
### FIXME: a dirty hack to basically support polygons, needs lots of rewrite
try:
geom = list(geom.coords)
except NotImplementedError:
"trying polygons"
try:
geom = geom.boundary
geom = list(geom.coords)
row_dict[":area"] = "yes"
except NotImplementedError:
"multipolygon"
continue
### FIXME
#geom = projections.to4326(geom, self.proj)
del row_dict["way"]
oid = row_dict["osm_id"]
del row_dict["osm_id"]
w = Way(row_dict, geom)
#print row_dict
resp[oid] = w
a.close()
del a
return resp

224
src/backend/vtile/__init__.py
View file

@ -20,127 +20,127 @@ from twms import projections
import twms.bbox
class Empty:
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
a.bbox = self.bbox
return a
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
a.bbox = self.bbox
return a
class Way:
def __init__(self, tags, coords):
def __init__(self, tags, coords):
self.cs = []
#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])]
for k in range(2, len(c), 2):
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]), self.coords)
self.center = (self.center[0]/len(self.coords),self.center[1]/len(self.coords))
self.bbox = reduce(lambda x,y: (min(x[0],y[0]),min(x[1],y[1]),max(x[2],y[0]),max(x[3],y[1])), self.coords, (9999,9999,-9999,-9999))
#debug(self.center)
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
a.bbox = self.bbox
return a
self.cs = []
#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])]
for k in range(2, len(c), 2):
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]), self.coords)
self.center = (self.center[0]/len(self.coords),self.center[1]/len(self.coords))
self.bbox = reduce(lambda x,y: (min(x[0],y[0]),min(x[1],y[1]),max(x[2],y[0]),max(x[3],y[1])), self.coords, (9999,9999,-9999,-9999))
#debug(self.center)
def copy(self):
a = Empty()
a.tags = self.tags.copy()
a.coords = self.coords[:]
a.center = self.center
a.cs = self.cs[:]
a.bbox = self.bbox
return a
class QuadTileBackend:
"""
A class that gives out vector data on demand.
"""
def __init__(self,max_zoom = 16,proj = "EPSG:4326", path = "tiles", lang = "ru"):
self.max_zoom = max_zoom # no better tiles available
self.path = path # path to tile files
self.lang = lang # map language to use
self.tiles = {} # loaded vector tiles go here
self.proj = proj # which projection used to cut map in tiles
self.keep_tiles = 15 # a number of tiles to cache in memory
self.tile_load_log = [] # used when selecting which tile to unload
def filename(self, (z,x,y)):
return "%s/z%s/%s/x%s/%s/y%s.vtile"%(self.path, z, x/1024, x, y/1024, y)
def load_tile(self, k):
#debug("loading tile: %s"% (k,))
try:
f = open(self.filename(k))
except IOError:
print ( "Failed open: '%s'" % self.filename(k) )
return {}
t = {}
for line in f:
#debug(line)
a = line.split(" ")
w = Way(a[0], [float(x) for x in a[2:]])
t[int(a[1])] = w
f.close()
return t
def collect_garbage(self):
"""
Cleans up some RAM by removing least accessed tiles.
A class that gives out vector data on demand.
"""
if len(self.tiles) > self.keep_tiles:
#debug("Now %s tiles cached, trying to kill %s"%(len(self.tiles),len(self.tiles)-self.keep_tiles))
for tile in self.tile_load_log[0:len(self.tiles)-self.keep_tiles]:
def __init__(self,max_zoom = 16,proj = "EPSG:4326", path = "tiles", lang = "ru"):
self.max_zoom = max_zoom # no better tiles available
self.path = path # path to tile files
self.lang = lang # map language to use
self.tiles = {} # loaded vector tiles go here
self.proj = proj # which projection used to cut map in tiles
self.keep_tiles = 15 # a number of tiles to cache in memory
self.tile_load_log = [] # used when selecting which tile to unload
def filename(self, (z,x,y)):
return "%s/z%s/%s/x%s/%s/y%s.vtile"%(self.path, z, x/1024, x, y/1024, y)
def load_tile(self, k):
#debug("loading tile: %s"% (k,))
try:
del self.tiles[tile]
self.tile_load_log.remove(tile)
#debug ("killed tile: %s" % (tile,))
except KeyError, ValueError:
pass
#debug ("tile killed not by us: %s" % (tile,))
f = open(self.filename(k))
except IOError:
print ( "Failed open: '%s'" % self.filename(k) )
return {}
t = {}
for line in f:
#debug(line)
a = line.split(" ")
w = Way(a[0], [float(x) for x in a[2:]])
t[int(a[1])] = w
f.close()
return t
def collect_garbage(self):
"""
Cleans up some RAM by removing least accessed tiles.
"""
if len(self.tiles) > self.keep_tiles:
#debug("Now %s tiles cached, trying to kill %s"%(len(self.tiles),len(self.tiles)-self.keep_tiles))
for tile in self.tile_load_log[0:len(self.tiles)-self.keep_tiles]:
try:
del self.tiles[tile]
self.tile_load_log.remove(tile)
#debug ("killed tile: %s" % (tile,))
except KeyError, ValueError:
pass
#debug ("tile killed not by us: %s" % (tile,))
def get_vectors (self, bbox, zoom, sql_hint = None, itags = None):
zoom = int(zoom)
zoom = min(zoom, self.max_zoom) ## If requested zoom is better than the best, take the best
zoom = max(zoom, 0) ## Negative zooms are nonsense
a,d,c,b = [int(x) for x in projections.tile_by_bbox(bbox,zoom, self.proj)]
resp = {}
hint = set()
for j in [x[0] for x in sql_hint]:
hint.update(j)
def get_vectors (self, bbox, zoom, sql_hint = None, itags = None):
zoom = int(zoom)
zoom = min(zoom, self.max_zoom) ## If requested zoom is better than the best, take the best
zoom = max(zoom, 0) ## Negative zooms are nonsense
a,d,c,b = [int(x) for x in projections.tile_by_bbox(bbox,zoom, self.proj)]
resp = {}
for tile in set([(zoom,i,j) for i in range(a, c+1) for j in range(b, d+1)]):
# Loading current vector tile
try:
ti = self.tiles[tile]
except KeyError:
ti = self.load_tile(tile)
self.tiles[tile] = ti
try:
self.tile_load_log.remove(tile)
except ValueError:
pass
self.tile_load_log.append(tile)
for obj in ti:
"filling response with interesting-tagged objects"
need = False
for tag in ti[obj].tags:
#if tag in hint:
need = True
break
if need:
if twms.bbox.bbox_is_in(bbox, ti[obj].bbox, fully=False):
resp[obj] = ti[obj]
hint = set()
for j in [x[0] for x in sql_hint]:
hint.update(j)
self.collect_garbage()
return resp
for tile in set([(zoom,i,j) for i in range(a, c+1) for j in range(b, d+1)]):
# Loading current vector tile
try:
ti = self.tiles[tile]
except KeyError:
ti = self.load_tile(tile)
self.tiles[tile] = ti
try:
self.tile_load_log.remove(tile)
except ValueError:
pass
self.tile_load_log.append(tile)
for obj in ti:
"filling response with interesting-tagged objects"
need = False
for tag in ti[obj].tags:
#if tag in hint:
need = True
break
if need:
if twms.bbox.bbox_is_in(bbox, ti[obj].bbox, fully=False):
resp[obj] = ti[obj]
self.collect_garbage()
return resp