diff options
| -rwxr-xr-x | maketiles/packtiles | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/maketiles/packtiles b/maketiles/packtiles index f14a151c4..dd12ae94f 100755 --- a/maketiles/packtiles +++ b/maketiles/packtiles @@ -8,7 +8,7 @@ # Email: chris@mysociety.org; WWW: http://www.mysociety.org/ # -my $rcsid = ''; $rcsid .= '$Id: packtiles,v 1.2 2006-09-20 13:30:48 chris Exp $'; +my $rcsid = ''; $rcsid .= '$Id: packtiles,v 1.3 2006-09-20 14:57:42 chris Exp $'; use strict; @@ -111,20 +111,21 @@ $C->finish(); debug("done\n"); debug("packing individual tile directories...\n"); -my $n = 0; +$n = 0; +mkdir("$outputdir/tiles"); for (my $u = 0; $u < 4096; ++$u) { my $subpath = sprintf('%x/%x/%x', $u & 0xf, ($u >> 4) & 0xf, $u >> 8); - next unless (-d "$inputdir/$subpath"); + next unless (-d "$inputdir/tiles/$subpath"); # Ensure the path exists. foreach my $p (qw(1 3 5)) { - my $d = "$outputdir/" . substr($subpath, 0, $p); + my $d = "$outputdir/tiles/" . substr($subpath, 0, $p); die "$d: mkdir: $!" if (!mkdir($d) && !$!{EEXIST}); } - my $in = "$inputdir/$subpath"; - my $out = "$outputdir/$subpath"; + my $in = "$inputdir/tiles/$subpath"; + my $out = "$outputdir/tiles/$subpath"; my $f = new IO::File("$out/tiles", O_WRONLY | O_CREAT | O_TRUNC, 0644) or die "$out/tiles: open: $!"; @@ -141,7 +142,7 @@ for (my $u = 0; $u < 4096; ++$u) { my $rec = sprintf('%x:%x', $f->tell(), length($buf)); $C->insert($id, $rec); - die "$out/tiles: write: $!" if ($len != $f->write($buf, $len)); + $f->print($buf) or die "$out/tiles: $!"; ++$n; } |