[OSM-dev] [OSM-talk] Tiles at home Update

[Dirk-Lüder Kreie]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Hart schrieb:

> As frollo is not an essential step of the render perhaps we could do what
> we've done with lines2curves and make tiles at Home fall back to the original
> data if frollo dies.

I added the code to the current version.

Sorry, but I expected this to be on the dev list.

Dirk-Lüder "Deelkar" Kreie


- ------------------
Index: tilesGen.pl
===================================================================
- --- tilesGen.pl    (revision 2306)
+++ tilesGen.pl    (working copy)
@@ -543,15 +543,25 @@
    "frollo1.xsl",
    "$dataFile",
    "temp-$PID.osm");
- -  runCommand("Frolloizing (part I) ...", $Cmd);

- -  my $Cmd = sprintf("%s \"%s\" tr %s %s > \"%s\"",
- -    $Config{Niceness},
- -    $Config{XmlStarlet},
- -    "frollo2.xsl",
- -    "temp-$PID.osm",
- -    "$dataFile");
- -  runCommand("Frolloizing (part II) ...", $Cmd);
+  if(runCommand("Frolloizing (part I) ...", $Cmd)){
+      my $Cmd = sprintf("%s \"%s\" tr %s %s > \"%s\"",
+            $Config{Niceness},
+            $Config{XmlStarlet},
+            "frollo2.xsl",
+            "temp-$PID.osm",
+            "temp2-$PID.osm");
+      if(runCommand("Frolloizing (part II) ...", $Cmd)){
+      copy("temp2-$PID.osm","$dataFile");
+      statusMessage("Frollification successful");
+      } else {
+      statusMessage("Frollotation failure (part II)");
+      killafile("temp2-$PID.osm");
+      }
+  } else {
+      statusMessage("Failure of Frollotron (part I)");
+      killafile("temp-$PID.osm");
+  }
}

#-----------------------------------------------------------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGAwbqFUbODdpRVDwRAhdiAJ4w3/Ul30sFJkZp4UvhWYRALh9AdACghox0
Q85039Ysy9P8cA/PUy4hLII=
=1pE5
-----END PGP SIGNATURE-----