changeset 34:40df6ccdcda3 gmap2

Fixes.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 08 Jan 2011 17:30:17 +0200
parents 3285c01bc999
children 944ef23d4d61
files tools/makegmaps.php
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tools/makegmaps.php	Sat Jan 08 17:26:20 2011 +0200
+++ b/tools/makegmaps.php	Sat Jan 08 17:30:17 2011 +0200
@@ -141,7 +141,7 @@
     echo ".";
   }
 
-  echo "\n";
+  echo ": ".$outFilename."\n";
 
   if (imagepng($im, $outFilename) === FALSE) {
     echo "Error creating '".$outFilename."'\n";
@@ -159,9 +159,7 @@
 if ($data[4])
 {
   for ($zoom = 1; $zoom <= 5; $zoom++)
-  {
     makeMap($rawPath.$name.".txt", $cachePath.$name."_".($zoom + 4).".png", $zoom, $data);
-  }
 }
 
 
@@ -174,11 +172,11 @@
 if ($data[4])
 {
   $n = count($mapScales);
-  $inFilename = $cacheDir.$name."_".$n.".png";
+  $inFilename = $cachePath.$name."_".$n.".png";
 
   foreach ($mapScales as $scale) {
     $n--;
-    $outFilename = $cacheDir.$name."_".$n.".png";
+    $outFilename = $cachePath.$name."_".$n.".png";
     echo "* ".$inFilename." -> ".$outFilename."\n";
     $tmp = escapeshellcmd($convert)." ".escapeshellarg($inFilename)." -scale ".escapeshellarg($scale."%")." -type Palette ".escapeshellarg($outFilename);
     passthru($tmp) == 0 or die("Error executing: ".$tmp."\n");