xyzz
/
onomatopoeia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format() is evil

master
Ilya Zhuravlev 2012-12-31 20:13:35 +04:00
parent 63a0ee261b
commit 8073b1dbe2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mapper.py
View File

@ -144,10 +144,10 @@ def dummyMakeTile(row, col):
def saveTile(tile, row, col, zoom=5): def saveTile(tile, row, col, zoom=5):
path = os.path.join("data", "{}".format(zoom), "{}".format(row)) path = os.path.join("data", str(zoom), str(row))
if not os.path.exists(path): if not os.path.exists(path):
os.makedirs(path) os.makedirs(path)
tile.save(os.path.join(path, "{}.png".format(col))) tile.save(os.path.join(path, "%d.png" % col))
cnt = 0 cnt = 0
done = set() done = set()
@ -159,7 +159,7 @@ def stupidMakeTiles(x, z):
step = 0 step = 0
last = 0 last = 0
while True: while True:
print("tiling {} {}".format(x + step, z + step)) print("tiling %d %d" % (x + step, z + step))
row, col = coordsToGrid(x + step, z + step) row, col = coordsToGrid(x + step, z + step)
y = chunks3(canvas, x + step, z + step, step) y = chunks3(canvas, x + step, z + step, step)
#canvas.save("step_{}.png".format(step)) #canvas.save("step_{}.png".format(step))
@ -172,7 +172,7 @@ def stupidMakeTiles(x, z):
cnt += 1 cnt += 1
done.add((x + step, z + step)) done.add((x + step, z + step))
step += 1 step += 1
print("y is {}".format(y)) print("y is %d" % y)
if y == -1: if y == -1:
break break
@ -188,7 +188,7 @@ coords.sort()
for coord in coords: for coord in coords:
if coord in done: if coord in done:
continue continue
print("{}% done".format(100.0 * cnt / len(coords))) print("{0}% done".format(100.0 * cnt / len(coords)))
stupidMakeTiles(*coord) stupidMakeTiles(*coord)
""" """
@ -227,16 +227,16 @@ for zoom in range(4, -1, -1):
#print("join {} {}".format(row, col)) #print("join {} {}".format(row, col))
R = row / 2 R = row / 2
C = col / 2 C = col / 2
path = os.path.join("data", "{}".format(zoom), "{}".format(R)) path = os.path.join("data", str(zoom), str(R))
if not os.path.exists(path): if not os.path.exists(path):
os.makedirs(path) os.makedirs(path)
canvas = Image.new("RGBA", (BLOCK_SIZE, BLOCK_SIZE)) canvas = Image.new("RGBA", (BLOCK_SIZE, BLOCK_SIZE))
for dx in range(0, 2): for dx in range(0, 2):
for dz in range(0, 2): for dz in range(0, 2):
try: try:
tile = Image.open(os.path.join("data", "{}".format(zoom + 1), "{}".format(row + dx), "{}.png".format(col + dz))).convert("RGBA") tile = Image.open(os.path.join("data", str(zoom + 1), str(row + dx), "%d.png" % (col + dz))).convert("RGBA")
except IOError: except IOError:
tile = Image.new("RGBA", (BLOCK_SIZE, BLOCK_SIZE)) tile = Image.new("RGBA", (BLOCK_SIZE, BLOCK_SIZE))
tile = tile.resize((BLOCK_SIZE/2, BLOCK_SIZE/2)) tile = tile.resize((BLOCK_SIZE/2, BLOCK_SIZE/2))
canvas.paste(tile, (dz * BLOCK_SIZE/2, dx * BLOCK_SIZE/2), tile) canvas.paste(tile, (dz * BLOCK_SIZE/2, dx * BLOCK_SIZE/2), tile)
canvas.save(os.path.join(path, "{}.png".format(C))) canvas.save(os.path.join(path, "%d.png" % C))