From 5233aaac0fe03d91cb8abda12aca984a29cdbd8c Mon Sep 17 00:00:00 2001 From: Scott Crosby Date: Tue, 14 Dec 2010 11:24:58 -0600 Subject: [PATCH] Remap how we handle compression. --- src.java/crosby/binary/test/BuildTestFile.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src.java/crosby/binary/test/BuildTestFile.java b/src.java/crosby/binary/test/BuildTestFile.java index 998abff..4abc78d 100644 --- a/src.java/crosby/binary/test/BuildTestFile.java +++ b/src.java/crosby/binary/test/BuildTestFile.java @@ -119,10 +119,9 @@ public class BuildTestFile { } - BuildTestFile(String name, boolean compress) throws IOException { + BuildTestFile(String name, String compress) throws IOException { output = new BlockOutputStream(new FileOutputStream(name)); - if (compress) - output.setCompress("deflate"); + output.setCompress(compress); HeaderBlock.Builder b = HeaderBlock.newBuilder(); b.addRequiredFeatures("OsmSchema-V0.6").addRequiredFeatures("DenseNodes").setSource("QuickBrownFox"); output.write(FileBlock.newInstance("OSMHeader",b.build().toByteString(),null)); @@ -131,15 +130,15 @@ public class BuildTestFile { public static void main(String [] args) { try { - BuildTestFile out1a = new BuildTestFile("TestFile1-deflate.osm.pbf",true); + BuildTestFile out1a = new BuildTestFile("TestFile1-deflate.osm.pbf","deflate"); out1a.makeSimpleFileBlock1(); out1a.output.close(); - BuildTestFile out1b = new BuildTestFile("TestFile1-none.osm.pbf",false); + BuildTestFile out1b = new BuildTestFile("TestFile1-none.osm.pbf","none"); out1b.makeSimpleFileBlock1(); out1b.output.close(); - BuildTestFile out2 = new BuildTestFile("TestFile2-uncom.osm.pbf",true); + BuildTestFile out2 = new BuildTestFile("TestFile2-uncom.osm.pbf","deflate"); out2.makeGranFileBlock1(); out2.output.close();