From e5d8ca836c319037c743c12eebbe3101c6998f7b Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Wed, 7 Sep 2016 11:17:41 -0400 Subject: [PATCH 001/245] Add logging when an error occurs in batch mode --- src/main/java/technology/tabula/CommandLineApp.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 940bb4d4..e2c94aba 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -113,7 +113,12 @@ public boolean accept(File dir, String name) { for (File pdfFile : pdfs) { File outputFile = new File(getOutputFilename(pdfFile)); - extractFileInto(pdfFile, outputFile); + try { + extractFileInto(pdfFile, outputFile); + } catch (ParseException e) { + System.err.println("Caught exception while processing file: " + pdfFile.toString()); + throw e; + } } } From a747549eb66bab9992a97957e0cbf98f8026a477 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Wed, 7 Sep 2016 12:57:23 -0400 Subject: [PATCH 002/245] Add -b option to README list of start-up mitagations --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 755497df..eed9b0ca 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ You can also integrate `tabula-java` with any JVM language. For Java examples, s JVM start-up time is a lot of the cost of the `tabula` command, so if you're trying to extract many tables from PDFs, you have a few options for speeding it up: + - the -b option, which allows you to convert all pdfs in a given directory - the [drip](https://github.com/ninjudd/drip) utility - the [Ruby](http://github.com/tabulapdf/tabula-extractor), [R](https://github.com/leeper/tabulizer), and [Node.js](https://github.com/ezodude/tabula-js) bindings - writing your own program in any JVM language (Java, JRuby, Scala) that imports tabula-java. From 6e1b540e8efdaeb6585ad7e13905cf58421111a1 Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Sat, 19 Nov 2016 16:08:35 -0500 Subject: [PATCH 003/245] rename spreadsheet/no-spreadsheet to lattice/stream to match web UI in CLI arguments and names of extraction algorithms --- src/main/java/technology/tabula/CommandLineApp.java | 6 ++++-- .../tabula/extractors/BasicExtractionAlgorithm.java | 2 +- .../tabula/extractors/SpreadsheetExtractionAlgorithm.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 70d72a58..93413d0d 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -248,8 +248,10 @@ public static Options buildOptions() { o.addOption("h", "help", false, "Print this help text."); o.addOption("g", "guess", false, "Guess the portion of the page to analyze per page."); o.addOption("d", "debug", false, "Print detected table areas instead of processing"); - o.addOption("r", "spreadsheet", false, "Force PDF to be extracted using spreadsheet-style extraction (if there are ruling lines separating each cell, as in a PDF of an Excel spreadsheet)"); - o.addOption("n", "no-spreadsheet", false, "Force PDF not to be extracted using spreadsheet-style extraction (if there are ruling lines separating each cell, as in a PDF of an Excel spreadsheet)"); + o.addOption("r", "spreadsheet", false, "[Deprecated in favor of -l/--lattice] Force PDF to be extracted using spreadsheet-style extraction (if there are ruling lines separating each cell, as in a PDF of an Excel spreadsheet)"); + o.addOption("n", "no-spreadsheet", false, "[Deprecated in favor of -t/--stream] Force PDF not to be extracted using spreadsheet-style extraction (if there are no ruling lines separating each cell)"); + o.addOption("l", "lattice", false, "Force PDF to be extracted using lattice-mode extraction (if there are ruling lines separating each cell, as in a PDF of an Excel spreadsheet)"); + o.addOption("t", "stream", false, "Force PDF to be extracted using stream-mode extraction (if there are no ruling lines separating each cell)"); o.addOption("i", "silent", false, "Suppress all stderr output."); o.addOption("u", "use-line-returns", false, "Use embedded line returns in cells. (Only in spreadsheet mode.)"); o.addOption("d", "debug", false, "Print detected table areas instead of processing."); diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index 5b83f0ed..3b22f44e 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -99,7 +99,7 @@ public int compare(TextChunk o1, TextChunk o2) { @Override public String toString() { - return "basic"; + return "stream"; } diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 321ee88a..532f95fe 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -336,7 +336,7 @@ public static List findSpreadsheetsFromCells(List Date: Fri, 16 Dec 2016 11:31:17 -0500 Subject: [PATCH 004/245] ignore area restrictions on blank page. closes #130 --- src/main/java/technology/tabula/Page.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index ab57d938..9e810d34 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -53,6 +53,7 @@ public Page(float top, float left, float width, float height, int rotation, int public Page getArea(Rectangle area) { List t = getText(area); + if (t.isEmpty()) return this; Page rv = new Page( (float) area.getTop(), (float) area.getLeft(), From 0cf4461789ae67fd9ef69d470449eb4cbd44aa0f Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Fri, 16 Dec 2016 11:32:23 -0500 Subject: [PATCH 005/245] adjust expected output to use lattice/stream instead of spreadsheet/basic names for extraction mehthod --- .../tabula/json/argentina_diputados_voting_record.json | 2 +- src/test/resources/technology/tabula/json/schools.json | 2 +- src/test/resources/technology/tabula/json/spanning_cells.json | 2 +- .../resources/technology/tabula/json/spanning_cells_basic.json | 2 +- src/test/resources/technology/tabula/json/twotables.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json index f9e9ae1e..57d0c634 100644 --- a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json +++ b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json @@ -1 +1 @@ -{"extraction_method":"basic","top":0.0,"left":0.0,"width":549.0399780273438,"height":782.0400390625,"data":[[{"top":279.11,"left":28.56,"width":175.21029663085938,"height":7.210000038146973,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.11,"left":213.72,"width":108.25027465820312,"height":7.210000038146973,"text":"Frente Cívico por Santiago"},{"top":279.83,"left":397.56,"width":79.69027709960938,"height":7.210000038146973,"text":"Santiago del Estero"},{"top":279.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":295.55,"left":28.56,"width":141.71029663085938,"height":7.210000038146973,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":295.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":296.39,"left":397.56,"width":41.6602783203125,"height":7.210000038146973,"text":"Rio Negro"},{"top":295.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":312.11,"left":28.56,"width":83.75028228759766,"height":7.210000038146973,"text":"ALONSO, María Luz"},{"top":312.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":312.83,"left":397.56,"width":42.250274658203125,"height":7.210000038146973,"text":"La Pampa"},{"top":312.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":328.55,"left":28.56,"width":84.25028228759766,"height":7.210000038146973,"text":"ARENA, Celia Isabel"},{"top":328.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":329.39,"left":397.56,"width":37.690277099609375,"height":7.210000038146973,"text":"Santa Fe"},{"top":328.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":345.11,"left":28.56,"width":110.29029846191406,"height":7.210000038146973,"text":"ARREGUI, Andrés Roberto"},{"top":345.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":345.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":345.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":361.55,"left":28.56,"width":115.69029235839844,"height":7.210000038146973,"text":"AVOSCAN, Herman Horacio"},{"top":361.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":362.39,"left":397.56,"width":41.6602783203125,"height":7.210000038146973,"text":"Rio Negro"},{"top":361.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":378.11,"left":28.56,"width":95.6902847290039,"height":7.210000038146973,"text":"BALCEDO, María Ester"},{"top":378.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":378.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":378.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":394.55,"left":28.56,"width":127.69029235839844,"height":7.210000038146973,"text":"BARRANDEGUY, Raúl Enrique"},{"top":394.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":395.39,"left":397.56,"width":43.6702880859375,"height":7.210000038146973,"text":"Entre Ríos"},{"top":394.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":411.11,"left":28.56,"width":106.69029235839844,"height":7.210000038146973,"text":"BASTERRA, Luis Eugenio"},{"top":411.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":411.83,"left":397.56,"width":36.73028564453125,"height":7.210000038146973,"text":"Formosa"},{"top":411.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":427.55,"left":28.56,"width":92.21028137207031,"height":7.210000038146973,"text":"BEDANO, Nora Esther"},{"top":427.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":428.39,"left":397.56,"width":35.6602783203125,"height":7.210000038146973,"text":"Córdoba"},{"top":427.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":444.11,"left":28.56,"width":100.69029235839844,"height":7.210000038146973,"text":"BERNAL, María Eugenia"},{"top":444.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":444.83,"left":397.56,"width":22.200286865234375,"height":7.210000038146973,"text":"Jujuy"},{"top":444.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":460.55,"left":28.56,"width":112.21029663085938,"height":7.210000038146973,"text":"BERTONE, Rosana Andrea"},{"top":460.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":461.39,"left":397.56,"width":67.21026611328125,"height":7.210000038146973,"text":"Tierra del Fuego"},{"top":460.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":477.11,"left":28.56,"width":114.73028564453125,"height":7.210000038146973,"text":"BIANCHI, María del Carmen"},{"top":477.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":477.83,"left":397.56,"width":74.6702880859375,"height":7.210000038146973,"text":"Cdad. Aut. Bs. As."},{"top":477.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":493.55,"left":28.56,"width":115.19029235839844,"height":7.210000038146973,"text":"BIDEGAIN, Gloria Mercedes"},{"top":493.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":494.39,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":493.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":510.11,"left":28.56,"width":66.25028228759766,"height":7.210000038146973,"text":"BRAWER, Mara"},{"top":510.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":510.83,"left":397.56,"width":74.6702880859375,"height":7.210000038146973,"text":"Cdad. Aut. Bs. As."},{"top":510.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":526.55,"left":28.56,"width":90.73028564453125,"height":7.210000038146973,"text":"BRILLO, José Ricardo"},{"top":526.55,"left":213.72,"width":121.81027221679688,"height":7.210000038146973,"text":"Movimiento Popular Neuquino"},{"top":527.39,"left":397.56,"width":37.700286865234375,"height":7.210000038146973,"text":"Neuquén"},{"top":526.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":543.11,"left":28.56,"width":120.73028564453125,"height":7.210000038146973,"text":"BROMBERG, Isaac Benjamín"},{"top":543.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":543.83,"left":397.56,"width":38.6602783203125,"height":7.210000038146973,"text":"Tucumán"},{"top":543.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":559.55,"left":28.56,"width":89.7702865600586,"height":7.210000038146973,"text":"BRUE, Daniel Agustín"},{"top":559.55,"left":213.72,"width":108.25027465820312,"height":7.210000038146973,"text":"Frente Cívico por Santiago"},{"top":560.39,"left":397.56,"width":79.69027709960938,"height":7.210000038146973,"text":"Santiago del Estero"},{"top":559.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":576.11,"left":28.56,"width":72.23028564453125,"height":7.210000038146973,"text":"CALCAGNO, Eric"},{"top":576.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":576.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":576.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":592.55,"left":28.56,"width":114.73028564453125,"height":7.210000038146973,"text":"CARLOTTO, Remo Gerardo"},{"top":592.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":593.39,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":592.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":609.11,"left":28.56,"width":122.1702880859375,"height":7.210000038146973,"text":"CARMONA, Guillermo Ramón"},{"top":609.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":609.83,"left":397.56,"width":38.1602783203125,"height":7.210000038146973,"text":"Mendoza"},{"top":609.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":625.55,"left":28.56,"width":124.73028564453125,"height":7.210000038146973,"text":"CATALAN MAGNI, Julio César"},{"top":625.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":626.39,"left":397.56,"width":67.21026611328125,"height":7.210000038146973,"text":"Tierra del Fuego"},{"top":625.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":642.11,"left":28.56,"width":88.6902847290039,"height":7.210000038146973,"text":"CEJAS, Jorge Alberto"},{"top":642.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":642.83,"left":397.56,"width":41.6602783203125,"height":7.210000038146973,"text":"Rio Negro"},{"top":642.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":658.55,"left":28.56,"width":89.7702865600586,"height":7.210000038146973,"text":"CHIENO, María Elena"},{"top":658.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":659.39,"left":397.56,"width":42.72027587890625,"height":7.210000038146973,"text":"Corrientes"},{"top":658.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":675.11,"left":28.56,"width":96.25028228759766,"height":7.210000038146973,"text":"CIAMPINI, José Alberto"},{"top":675.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":675.83,"left":397.56,"width":37.700286865234375,"height":7.210000038146973,"text":"Neuquén"},{"top":675.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":691.55,"left":28.56,"width":131.77029418945312,"height":7.210000038146973,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":691.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":692.39,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":691.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":708.11,"left":28.56,"width":62.15028381347656,"height":7.210000038146973,"text":"CLERI, Marcos"},{"top":708.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":708.83,"left":397.56,"width":37.690277099609375,"height":7.210000038146973,"text":"Santa Fe"},{"top":708.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":724.55,"left":28.56,"width":101.77029418945312,"height":7.210000038146973,"text":"COMELLI, Alicia Marcela"},{"top":724.55,"left":213.72,"width":121.81027221679688,"height":7.210000038146973,"text":"Movimiento Popular Neuquino"},{"top":725.39,"left":397.56,"width":37.700286865234375,"height":7.210000038146973,"text":"Neuquén"},{"top":724.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":741.11,"left":28.56,"width":88.1902847290039,"height":7.210000038146973,"text":"CONTI, Diana Beatriz"},{"top":741.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":741.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":741.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":757.55,"left":28.56,"width":98.75028228759766,"height":7.210000038146973,"text":"CORDOBA, Stella Maris"},{"top":757.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":758.39,"left":397.56,"width":38.6602783203125,"height":7.210000038146973,"text":"Tucumán"},{"top":757.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":774.11,"left":28.56,"width":105.25028991699219,"height":7.210000038146973,"text":"CURRILEN, Oscar Rubén"},{"top":774.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":774.83,"left":397.56,"width":30.2802734375,"height":7.210000038146973,"text":"Chubut"},{"top":774.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}]]} +{"extraction_method":"stream","top":0.0,"left":0.0,"width":549.0399780273438,"height":782.0400390625,"data":[[{"top":279.11,"left":28.56,"width":175.21029663085938,"height":7.210000038146973,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.11,"left":213.72,"width":108.25027465820312,"height":7.210000038146973,"text":"Frente Cívico por Santiago"},{"top":279.83,"left":397.56,"width":79.69027709960938,"height":7.210000038146973,"text":"Santiago del Estero"},{"top":279.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":295.55,"left":28.56,"width":141.71029663085938,"height":7.210000038146973,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":295.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":296.39,"left":397.56,"width":41.6602783203125,"height":7.210000038146973,"text":"Rio Negro"},{"top":295.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":312.11,"left":28.56,"width":83.75028228759766,"height":7.210000038146973,"text":"ALONSO, María Luz"},{"top":312.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":312.83,"left":397.56,"width":42.250274658203125,"height":7.210000038146973,"text":"La Pampa"},{"top":312.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":328.55,"left":28.56,"width":84.25028228759766,"height":7.210000038146973,"text":"ARENA, Celia Isabel"},{"top":328.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":329.39,"left":397.56,"width":37.690277099609375,"height":7.210000038146973,"text":"Santa Fe"},{"top":328.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":345.11,"left":28.56,"width":110.29029846191406,"height":7.210000038146973,"text":"ARREGUI, Andrés Roberto"},{"top":345.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":345.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":345.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":361.55,"left":28.56,"width":115.69029235839844,"height":7.210000038146973,"text":"AVOSCAN, Herman Horacio"},{"top":361.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":362.39,"left":397.56,"width":41.6602783203125,"height":7.210000038146973,"text":"Rio Negro"},{"top":361.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":378.11,"left":28.56,"width":95.6902847290039,"height":7.210000038146973,"text":"BALCEDO, María Ester"},{"top":378.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":378.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":378.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":394.55,"left":28.56,"width":127.69029235839844,"height":7.210000038146973,"text":"BARRANDEGUY, Raúl Enrique"},{"top":394.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":395.39,"left":397.56,"width":43.6702880859375,"height":7.210000038146973,"text":"Entre Ríos"},{"top":394.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":411.11,"left":28.56,"width":106.69029235839844,"height":7.210000038146973,"text":"BASTERRA, Luis Eugenio"},{"top":411.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":411.83,"left":397.56,"width":36.73028564453125,"height":7.210000038146973,"text":"Formosa"},{"top":411.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":427.55,"left":28.56,"width":92.21028137207031,"height":7.210000038146973,"text":"BEDANO, Nora Esther"},{"top":427.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":428.39,"left":397.56,"width":35.6602783203125,"height":7.210000038146973,"text":"Córdoba"},{"top":427.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":444.11,"left":28.56,"width":100.69029235839844,"height":7.210000038146973,"text":"BERNAL, María Eugenia"},{"top":444.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":444.83,"left":397.56,"width":22.200286865234375,"height":7.210000038146973,"text":"Jujuy"},{"top":444.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":460.55,"left":28.56,"width":112.21029663085938,"height":7.210000038146973,"text":"BERTONE, Rosana Andrea"},{"top":460.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":461.39,"left":397.56,"width":67.21026611328125,"height":7.210000038146973,"text":"Tierra del Fuego"},{"top":460.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":477.11,"left":28.56,"width":114.73028564453125,"height":7.210000038146973,"text":"BIANCHI, María del Carmen"},{"top":477.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":477.83,"left":397.56,"width":74.6702880859375,"height":7.210000038146973,"text":"Cdad. Aut. Bs. As."},{"top":477.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":493.55,"left":28.56,"width":115.19029235839844,"height":7.210000038146973,"text":"BIDEGAIN, Gloria Mercedes"},{"top":493.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":494.39,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":493.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":510.11,"left":28.56,"width":66.25028228759766,"height":7.210000038146973,"text":"BRAWER, Mara"},{"top":510.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":510.83,"left":397.56,"width":74.6702880859375,"height":7.210000038146973,"text":"Cdad. Aut. Bs. As."},{"top":510.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":526.55,"left":28.56,"width":90.73028564453125,"height":7.210000038146973,"text":"BRILLO, José Ricardo"},{"top":526.55,"left":213.72,"width":121.81027221679688,"height":7.210000038146973,"text":"Movimiento Popular Neuquino"},{"top":527.39,"left":397.56,"width":37.700286865234375,"height":7.210000038146973,"text":"Neuquén"},{"top":526.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":543.11,"left":28.56,"width":120.73028564453125,"height":7.210000038146973,"text":"BROMBERG, Isaac Benjamín"},{"top":543.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":543.83,"left":397.56,"width":38.6602783203125,"height":7.210000038146973,"text":"Tucumán"},{"top":543.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":559.55,"left":28.56,"width":89.7702865600586,"height":7.210000038146973,"text":"BRUE, Daniel Agustín"},{"top":559.55,"left":213.72,"width":108.25027465820312,"height":7.210000038146973,"text":"Frente Cívico por Santiago"},{"top":560.39,"left":397.56,"width":79.69027709960938,"height":7.210000038146973,"text":"Santiago del Estero"},{"top":559.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":576.11,"left":28.56,"width":72.23028564453125,"height":7.210000038146973,"text":"CALCAGNO, Eric"},{"top":576.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":576.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":576.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":592.55,"left":28.56,"width":114.73028564453125,"height":7.210000038146973,"text":"CARLOTTO, Remo Gerardo"},{"top":592.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":593.39,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":592.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":609.11,"left":28.56,"width":122.1702880859375,"height":7.210000038146973,"text":"CARMONA, Guillermo Ramón"},{"top":609.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":609.83,"left":397.56,"width":38.1602783203125,"height":7.210000038146973,"text":"Mendoza"},{"top":609.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":625.55,"left":28.56,"width":124.73028564453125,"height":7.210000038146973,"text":"CATALAN MAGNI, Julio César"},{"top":625.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":626.39,"left":397.56,"width":67.21026611328125,"height":7.210000038146973,"text":"Tierra del Fuego"},{"top":625.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":642.11,"left":28.56,"width":88.6902847290039,"height":7.210000038146973,"text":"CEJAS, Jorge Alberto"},{"top":642.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":642.83,"left":397.56,"width":41.6602783203125,"height":7.210000038146973,"text":"Rio Negro"},{"top":642.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":658.55,"left":28.56,"width":89.7702865600586,"height":7.210000038146973,"text":"CHIENO, María Elena"},{"top":658.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":659.39,"left":397.56,"width":42.72027587890625,"height":7.210000038146973,"text":"Corrientes"},{"top":658.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":675.11,"left":28.56,"width":96.25028228759766,"height":7.210000038146973,"text":"CIAMPINI, José Alberto"},{"top":675.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":675.83,"left":397.56,"width":37.700286865234375,"height":7.210000038146973,"text":"Neuquén"},{"top":675.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":691.55,"left":28.56,"width":131.77029418945312,"height":7.210000038146973,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":691.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":692.39,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":691.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":708.11,"left":28.56,"width":62.15028381347656,"height":7.210000038146973,"text":"CLERI, Marcos"},{"top":708.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":708.83,"left":397.56,"width":37.690277099609375,"height":7.210000038146973,"text":"Santa Fe"},{"top":708.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":724.55,"left":28.56,"width":101.77029418945312,"height":7.210000038146973,"text":"COMELLI, Alicia Marcela"},{"top":724.55,"left":213.72,"width":121.81027221679688,"height":7.210000038146973,"text":"Movimiento Popular Neuquino"},{"top":725.39,"left":397.56,"width":37.700286865234375,"height":7.210000038146973,"text":"Neuquén"},{"top":724.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":741.11,"left":28.56,"width":88.1902847290039,"height":7.210000038146973,"text":"CONTI, Diana Beatriz"},{"top":741.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":741.83,"left":397.56,"width":54.71026611328125,"height":7.210000038146973,"text":"Buenos Aires"},{"top":741.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":757.55,"left":28.56,"width":98.75028228759766,"height":7.210000038146973,"text":"CORDOBA, Stella Maris"},{"top":757.55,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":758.39,"left":397.56,"width":38.6602783203125,"height":7.210000038146973,"text":"Tucumán"},{"top":757.55,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}],[{"top":774.11,"left":28.56,"width":105.25028991699219,"height":7.210000038146973,"text":"CURRILEN, Oscar Rubén"},{"top":774.11,"left":213.72,"width":108.23028564453125,"height":7.210000038146973,"text":"Frente para la Victoria - PJ"},{"top":774.83,"left":397.56,"width":30.2802734375,"height":7.210000038146973,"text":"Chubut"},{"top":774.11,"left":494.04,"width":54.999969482421875,"height":7.210000038146973,"text":"AFIRMATIVO"}]]} diff --git a/src/test/resources/technology/tabula/json/schools.json b/src/test/resources/technology/tabula/json/schools.json index 154dc0e2..35d04371 100644 --- a/src/test/resources/technology/tabula/json/schools.json +++ b/src/test/resources/technology/tabula/json/schools.json @@ -1 +1 @@ -{"extraction_method":"spreadsheet","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91127014160156,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.5,"width":69.72000122070312,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91127014160156,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.5,"width":69.72000122070312,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91127014160156,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.5,"width":69.72000122070312,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91127014160156,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.5,"width":69.72000122070312,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91127014160156,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.5,"width":69.72000122070312,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91127014160156,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.5,"width":69.72000122070312,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91127014160156,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.5,"width":69.72000122070312,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91127014160156,"height":10.780029296875,"text":"Cohen"},{"top":397.86,"left":172.5,"width":69.72000122070312,"height":10.780029296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":408.64,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":408.64,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Commers"},{"top":408.64,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Beth"},{"top":408.64,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2294 Commonwealth Ave"},{"top":408.64,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":408.64,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":408.64,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":408.64,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Self Employed"},{"top":408.64,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Homemaker"},{"top":408.64,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/1/2012"},{"top":408.64,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91127014160156,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.5,"width":69.72000122070312,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91127014160156,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.5,"width":69.72000122070312,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91127014160156,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.5,"width":69.72000122070312,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91127014160156,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.5,"width":69.72000122070312,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91127014160156,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.5,"width":69.72000122070312,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91127014160156,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.5,"width":69.72000122070312,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91127014160156,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.5,"width":69.72000122070312,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91127014160156,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.5,"width":69.72000122070312,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91127014160156,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.5,"width":69.72000122070312,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} +{"extraction_method":"lattice","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91127014160156,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.5,"width":69.72000122070312,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91127014160156,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.5,"width":69.72000122070312,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91127014160156,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.5,"width":69.72000122070312,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91127014160156,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.5,"width":69.72000122070312,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91127014160156,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.5,"width":69.72000122070312,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91127014160156,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.5,"width":69.72000122070312,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91127014160156,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.5,"width":69.72000122070312,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91127014160156,"height":10.780029296875,"text":"Cohen"},{"top":397.86,"left":172.5,"width":69.72000122070312,"height":10.780029296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":408.64,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":408.64,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Commers"},{"top":408.64,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Beth"},{"top":408.64,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2294 Commonwealth Ave"},{"top":408.64,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":408.64,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":408.64,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":408.64,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Self Employed"},{"top":408.64,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Homemaker"},{"top":408.64,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/1/2012"},{"top":408.64,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91127014160156,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.5,"width":69.72000122070312,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91127014160156,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.5,"width":69.72000122070312,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91127014160156,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.5,"width":69.72000122070312,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91127014160156,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.5,"width":69.72000122070312,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91127014160156,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.5,"width":69.72000122070312,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91127014160156,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.5,"width":69.72000122070312,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91127014160156,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.5,"width":69.72000122070312,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91127014160156,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.5,"width":69.72000122070312,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91127014160156,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.5,"width":69.72000122070312,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} diff --git a/src/test/resources/technology/tabula/json/spanning_cells.json b/src/test/resources/technology/tabula/json/spanning_cells.json index 46984857..29431f4b 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells.json +++ b/src/test/resources/technology/tabula/json/spanning_cells.json @@ -1 +1 @@ -[{"extraction_method":"spreadsheet","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938674926757812,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.458,"left":119.78943,"width":121.92680358886719,"height":12.785385131835938,"text":"Volume servers in:"},{"top":159.458,"left":241.71623,"width":46.66426086425781,"height":12.785385131835938,"text":"2007"},{"top":159.458,"left":288.3805,"width":46.663482666015625,"height":12.785385131835938,"text":"2008"},{"top":159.458,"left":335.04398,"width":46.663818359375,"height":12.785385131835938,"text":"2009"},{"top":159.458,"left":381.7078,"width":46.663360595703125,"height":12.785385131835938,"text":"2010"},{"top":159.458,"left":428.37115,"width":46.73052978515625,"height":12.785385131835938,"text":"2011"}],[{"top":172.24338,"left":119.78943,"width":121.92680358886719,"height":12.832305908203125,"text":"Server closets"},{"top":172.24338,"left":241.71623,"width":46.66426086425781,"height":12.832305908203125,"text":"1,505"},{"top":172.24338,"left":288.3805,"width":46.663482666015625,"height":12.832305908203125,"text":"1,580"},{"top":172.24338,"left":335.04398,"width":46.663818359375,"height":12.832305908203125,"text":"1,643"},{"top":172.24338,"left":381.7078,"width":46.663360595703125,"height":12.832305908203125,"text":"1,673"},{"top":172.24338,"left":428.37115,"width":46.73052978515625,"height":12.832305908203125,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890426635742188,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890426635742188,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890426635742188,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890426635742188,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890426635742188,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890426635742188,"text":"1,693"}],[{"top":210.85715,"left":119.78943,"width":121.92680358886719,"height":12.890701293945312,"text":"Mid-tier data centers"},{"top":210.85715,"left":241.71623,"width":46.66426086425781,"height":12.890701293945312,"text":"1,512"},{"top":210.85715,"left":288.3805,"width":46.663482666015625,"height":12.890701293945312,"text":"1,586"},{"top":210.85715,"left":335.04398,"width":46.663818359375,"height":12.890701293945312,"text":"1,646"},{"top":210.85715,"left":381.7078,"width":46.663360595703125,"height":12.890701293945312,"text":"1,677"},{"top":210.85715,"left":428.37115,"width":46.73052978515625,"height":12.890701293945312,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785049438476562,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785049438476562,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785049438476562,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785049438476562,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785049438476562,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785049438476562,"text":"1,693"}],[{"top":236.5329,"left":119.78943,"width":355.312255859375,"height":13.102508544921875,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.891510009765625,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.891510009765625,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.891510009765625,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.891510009765625,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.891510009765625,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.891510009765625,"text":"1,371"}],[{"top":288.14426,"left":119.78943,"width":121.92680358886719,"height":12.89013671875,"text":"Localized data centers"},{"top":288.14426,"left":241.71623,"width":46.66426086425781,"height":12.89013671875,"text":"1,465"},{"top":288.14426,"left":288.3805,"width":46.663482666015625,"height":12.89013671875,"text":"1,471"},{"top":288.14426,"left":335.04398,"width":46.663818359375,"height":12.89013671875,"text":"1,426"},{"top":288.14426,"left":381.7078,"width":46.663360595703125,"height":12.89013671875,"text":"1,334"},{"top":288.14426,"left":428.37115,"width":46.73052978515625,"height":12.89013671875,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"spreadsheet","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66310119628906,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.4141,"width":46.663787841796875,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66310119628906,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.4141,"width":46.663787841796875,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66310119628906,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.4141,"width":46.663787841796875,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938674926757812,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.458,"left":119.78943,"width":121.92680358886719,"height":12.785385131835938,"text":"Volume servers in:"},{"top":159.458,"left":241.71623,"width":46.66426086425781,"height":12.785385131835938,"text":"2007"},{"top":159.458,"left":288.3805,"width":46.663482666015625,"height":12.785385131835938,"text":"2008"},{"top":159.458,"left":335.04398,"width":46.663818359375,"height":12.785385131835938,"text":"2009"},{"top":159.458,"left":381.7078,"width":46.663360595703125,"height":12.785385131835938,"text":"2010"},{"top":159.458,"left":428.37115,"width":46.73052978515625,"height":12.785385131835938,"text":"2011"}],[{"top":172.24338,"left":119.78943,"width":121.92680358886719,"height":12.832305908203125,"text":"Server closets"},{"top":172.24338,"left":241.71623,"width":46.66426086425781,"height":12.832305908203125,"text":"1,505"},{"top":172.24338,"left":288.3805,"width":46.663482666015625,"height":12.832305908203125,"text":"1,580"},{"top":172.24338,"left":335.04398,"width":46.663818359375,"height":12.832305908203125,"text":"1,643"},{"top":172.24338,"left":381.7078,"width":46.663360595703125,"height":12.832305908203125,"text":"1,673"},{"top":172.24338,"left":428.37115,"width":46.73052978515625,"height":12.832305908203125,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890426635742188,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890426635742188,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890426635742188,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890426635742188,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890426635742188,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890426635742188,"text":"1,693"}],[{"top":210.85715,"left":119.78943,"width":121.92680358886719,"height":12.890701293945312,"text":"Mid-tier data centers"},{"top":210.85715,"left":241.71623,"width":46.66426086425781,"height":12.890701293945312,"text":"1,512"},{"top":210.85715,"left":288.3805,"width":46.663482666015625,"height":12.890701293945312,"text":"1,586"},{"top":210.85715,"left":335.04398,"width":46.663818359375,"height":12.890701293945312,"text":"1,646"},{"top":210.85715,"left":381.7078,"width":46.663360595703125,"height":12.890701293945312,"text":"1,677"},{"top":210.85715,"left":428.37115,"width":46.73052978515625,"height":12.890701293945312,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785049438476562,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785049438476562,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785049438476562,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785049438476562,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785049438476562,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785049438476562,"text":"1,693"}],[{"top":236.5329,"left":119.78943,"width":355.312255859375,"height":13.102508544921875,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.891510009765625,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.891510009765625,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.891510009765625,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.891510009765625,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.891510009765625,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.891510009765625,"text":"1,371"}],[{"top":288.14426,"left":119.78943,"width":121.92680358886719,"height":12.89013671875,"text":"Localized data centers"},{"top":288.14426,"left":241.71623,"width":46.66426086425781,"height":12.89013671875,"text":"1,465"},{"top":288.14426,"left":288.3805,"width":46.663482666015625,"height":12.89013671875,"text":"1,471"},{"top":288.14426,"left":335.04398,"width":46.663818359375,"height":12.89013671875,"text":"1,426"},{"top":288.14426,"left":381.7078,"width":46.663360595703125,"height":12.89013671875,"text":"1,334"},{"top":288.14426,"left":428.37115,"width":46.73052978515625,"height":12.89013671875,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66310119628906,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.4141,"width":46.663787841796875,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66310119628906,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.4141,"width":46.663787841796875,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66310119628906,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.4141,"width":46.663787841796875,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] diff --git a/src/test/resources/technology/tabula/json/spanning_cells_basic.json b/src/test/resources/technology/tabula/json/spanning_cells_basic.json index b644b940..1ecfbaae 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells_basic.json +++ b/src/test/resources/technology/tabula/json/spanning_cells_basic.json @@ -1 +1 @@ -[{"extraction_method":"spreadsheet","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897994995117188,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.458,"left":119.789444,"width":121.92678833007812,"height":12.785385131835938,"text":"Volume servers in:"},{"top":159.458,"left":241.71623,"width":46.66426086425781,"height":12.785385131835938,"text":"2007"},{"top":159.458,"left":288.3805,"width":46.663482666015625,"height":12.785385131835938,"text":"2008"},{"top":159.458,"left":335.04398,"width":46.663818359375,"height":12.785385131835938,"text":"2009"},{"top":159.458,"left":381.7078,"width":46.663330078125,"height":12.785385131835938,"text":"2010"},{"top":159.458,"left":428.37112,"width":46.73773193359375,"height":12.785385131835938,"text":"2011"}],[{"top":172.24338,"left":119.789444,"width":121.92678833007812,"height":12.832305908203125,"text":"Server closets"},{"top":172.24338,"left":241.71623,"width":46.66426086425781,"height":12.832305908203125,"text":"1,505"},{"top":172.24338,"left":288.3805,"width":46.663482666015625,"height":12.832305908203125,"text":"1,580"},{"top":172.24338,"left":335.04398,"width":46.663818359375,"height":12.832305908203125,"text":"1,643"},{"top":172.24338,"left":381.7078,"width":46.663330078125,"height":12.832305908203125,"text":"1,673"},{"top":172.24338,"left":428.37112,"width":46.73773193359375,"height":12.832305908203125,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890426635742188,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890426635742188,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890426635742188,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890426635742188,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890426635742188,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890426635742188,"text":"1,693"}],[{"top":210.85715,"left":119.789444,"width":121.92678833007812,"height":12.890701293945312,"text":"Mid-tier data centers"},{"top":210.85715,"left":241.71623,"width":46.66426086425781,"height":12.890701293945312,"text":"1,512"},{"top":210.85715,"left":288.3805,"width":46.663482666015625,"height":12.890701293945312,"text":"1,586"},{"top":210.85715,"left":335.04398,"width":46.663818359375,"height":12.890701293945312,"text":"1,646"},{"top":210.85715,"left":381.7078,"width":46.663330078125,"height":12.890701293945312,"text":"1,677"},{"top":210.85715,"left":428.37112,"width":46.73773193359375,"height":12.890701293945312,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785079956054688,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785079956054688,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785079956054688,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785079956054688,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785079956054688,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785079956054688,"text":"1,693"}],[{"top":236.53293,"left":119.789444,"width":355.31939697265625,"height":13.102462768554688,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.891510009765625,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.891510009765625,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.891510009765625,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.891510009765625,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.891510009765625,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.891510009765625,"text":"1,371"}],[{"top":288.14426,"left":119.789444,"width":121.92678833007812,"height":12.89013671875,"text":"Localized data centers"},{"top":288.14426,"left":241.71623,"width":46.66426086425781,"height":12.89013671875,"text":"1,465"},{"top":288.14426,"left":288.3805,"width":46.663482666015625,"height":12.89013671875,"text":"1,471"},{"top":288.14426,"left":335.04398,"width":46.663818359375,"height":12.89013671875,"text":"1,426"},{"top":288.14426,"left":381.7078,"width":46.663330078125,"height":12.89013671875,"text":"1,334"},{"top":288.14426,"left":428.37112,"width":46.73773193359375,"height":12.89013671875,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"spreadsheet","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66310119628906,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.4141,"width":46.663787841796875,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66310119628906,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.4141,"width":46.663787841796875,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66310119628906,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.4141,"width":46.663787841796875,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897994995117188,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.458,"left":119.789444,"width":121.92678833007812,"height":12.785385131835938,"text":"Volume servers in:"},{"top":159.458,"left":241.71623,"width":46.66426086425781,"height":12.785385131835938,"text":"2007"},{"top":159.458,"left":288.3805,"width":46.663482666015625,"height":12.785385131835938,"text":"2008"},{"top":159.458,"left":335.04398,"width":46.663818359375,"height":12.785385131835938,"text":"2009"},{"top":159.458,"left":381.7078,"width":46.663330078125,"height":12.785385131835938,"text":"2010"},{"top":159.458,"left":428.37112,"width":46.73773193359375,"height":12.785385131835938,"text":"2011"}],[{"top":172.24338,"left":119.789444,"width":121.92678833007812,"height":12.832305908203125,"text":"Server closets"},{"top":172.24338,"left":241.71623,"width":46.66426086425781,"height":12.832305908203125,"text":"1,505"},{"top":172.24338,"left":288.3805,"width":46.663482666015625,"height":12.832305908203125,"text":"1,580"},{"top":172.24338,"left":335.04398,"width":46.663818359375,"height":12.832305908203125,"text":"1,643"},{"top":172.24338,"left":381.7078,"width":46.663330078125,"height":12.832305908203125,"text":"1,673"},{"top":172.24338,"left":428.37112,"width":46.73773193359375,"height":12.832305908203125,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890426635742188,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890426635742188,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890426635742188,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890426635742188,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890426635742188,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890426635742188,"text":"1,693"}],[{"top":210.85715,"left":119.789444,"width":121.92678833007812,"height":12.890701293945312,"text":"Mid-tier data centers"},{"top":210.85715,"left":241.71623,"width":46.66426086425781,"height":12.890701293945312,"text":"1,512"},{"top":210.85715,"left":288.3805,"width":46.663482666015625,"height":12.890701293945312,"text":"1,586"},{"top":210.85715,"left":335.04398,"width":46.663818359375,"height":12.890701293945312,"text":"1,646"},{"top":210.85715,"left":381.7078,"width":46.663330078125,"height":12.890701293945312,"text":"1,677"},{"top":210.85715,"left":428.37112,"width":46.73773193359375,"height":12.890701293945312,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785079956054688,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785079956054688,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785079956054688,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785079956054688,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785079956054688,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785079956054688,"text":"1,693"}],[{"top":236.53293,"left":119.789444,"width":355.31939697265625,"height":13.102462768554688,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.891510009765625,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.891510009765625,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.891510009765625,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.891510009765625,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.891510009765625,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.891510009765625,"text":"1,371"}],[{"top":288.14426,"left":119.789444,"width":121.92678833007812,"height":12.89013671875,"text":"Localized data centers"},{"top":288.14426,"left":241.71623,"width":46.66426086425781,"height":12.89013671875,"text":"1,465"},{"top":288.14426,"left":288.3805,"width":46.663482666015625,"height":12.89013671875,"text":"1,471"},{"top":288.14426,"left":335.04398,"width":46.663818359375,"height":12.89013671875,"text":"1,426"},{"top":288.14426,"left":381.7078,"width":46.663330078125,"height":12.89013671875,"text":"1,334"},{"top":288.14426,"left":428.37112,"width":46.73773193359375,"height":12.89013671875,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66310119628906,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.4141,"width":46.663787841796875,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66310119628906,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.4141,"width":46.663787841796875,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66310119628906,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.4141,"width":46.663787841796875,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] diff --git a/src/test/resources/technology/tabula/json/twotables.json b/src/test/resources/technology/tabula/json/twotables.json index 8d68a640..aca9787f 100644 --- a/src/test/resources/technology/tabula/json/twotables.json +++ b/src/test/resources/technology/tabula/json/twotables.json @@ -1 +1 @@ -[{"extraction_method":"spreadsheet","top":111.18451,"left":67.41156,"width":342.44476318359375,"height":174.07479858398438,"data":[[{"top":111.18451,"left":67.41156,"width":85.61141967773438,"height":28.53582763671875,"text":""},{"top":111.18451,"left":153.02298,"width":256.8333435058594,"height":14.266975402832031,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":125.451485,"left":153.02298,"width":51.367401123046875,"height":14.268852233886719,"text":"資本金"},{"top":125.451485,"left":204.39038,"width":51.36669921875,"height":14.268852233886719,"text":"資本剰余金"},{"top":125.451485,"left":255.75708,"width":51.3656005859375,"height":14.268852233886719,"text":"利益剰余金"},{"top":125.451485,"left":307.12268,"width":51.366668701171875,"height":14.268852233886719,"text":"自己株式"},{"top":125.451485,"left":358.48935,"width":51.366973876953125,"height":14.268852233886719,"text":"株主資本合計"}],[{"top":139.72034,"left":67.41156,"width":85.61141967773438,"height":14.268722534179688,"text":"当期首残高"},{"top":139.72034,"left":153.02298,"width":51.367401123046875,"height":14.268722534179688,"text":"5,664"},{"top":139.72034,"left":204.39038,"width":51.36669921875,"height":14.268722534179688,"text":"749"},{"top":139.72034,"left":255.75708,"width":51.3656005859375,"height":14.268722534179688,"text":"12,017"},{"top":139.72034,"left":307.12268,"width":51.366668701171875,"height":14.268722534179688,"text":"△747"},{"top":139.72034,"left":358.48935,"width":51.366973876953125,"height":14.268722534179688,"text":"17,683"}],[{"top":153.98906,"left":67.41156,"width":85.61141967773438,"height":14.268753051757812,"text":"当期変動額"},{"top":153.98906,"left":153.02298,"width":51.367401123046875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":204.39038,"width":51.36669921875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":255.75708,"width":51.3656005859375,"height":14.268753051757812,"text":""},{"top":153.98906,"left":307.12268,"width":51.366668701171875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":358.48935,"width":51.366973876953125,"height":14.268753051757812,"text":""}],[{"top":168.25781,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"剰余金の配当"},{"top":168.25781,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":"△525"},{"top":168.25781,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△525"}],[{"top":182.52675,"left":67.41156,"width":85.61141967773438,"height":14.265869140625,"text":"当期純利益"},{"top":182.52675,"left":153.02298,"width":51.367401123046875,"height":14.265869140625,"text":""},{"top":182.52675,"left":204.39038,"width":51.36669921875,"height":14.265869140625,"text":""},{"top":182.52675,"left":255.75708,"width":51.3656005859375,"height":14.265869140625,"text":"1,269"},{"top":182.52675,"left":307.12268,"width":51.366668701171875,"height":14.265869140625,"text":""},{"top":182.52675,"left":358.48935,"width":51.366973876953125,"height":14.265869140625,"text":"1,269"}],[{"top":196.79262,"left":67.41156,"width":85.61141967773438,"height":14.268966674804688,"text":"自己株式の取得"},{"top":196.79262,"left":153.02298,"width":51.367401123046875,"height":14.268966674804688,"text":""},{"top":196.79262,"left":204.39038,"width":51.36669921875,"height":14.268966674804688,"text":""},{"top":196.79262,"left":255.75708,"width":51.3656005859375,"height":14.268966674804688,"text":""},{"top":196.79262,"left":307.12268,"width":51.366668701171875,"height":14.268966674804688,"text":"△0"},{"top":196.79262,"left":358.48935,"width":51.366973876953125,"height":14.268966674804688,"text":"△0"}],[{"top":211.06158,"left":67.41156,"width":85.61141967773438,"height":22.830032348632812,"text":"持分法の適用範囲\rの変動"},{"top":211.06158,"left":153.02298,"width":51.367401123046875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":204.39038,"width":51.36669921875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":255.75708,"width":51.3656005859375,"height":22.830032348632812,"text":"85"},{"top":211.06158,"left":307.12268,"width":51.366668701171875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":358.48935,"width":51.366973876953125,"height":22.830032348632812,"text":"85"}],[{"top":233.89162,"left":67.41156,"width":85.61141967773438,"height":22.829788208007812,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":233.89162,"left":153.02298,"width":51.367401123046875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":204.39038,"width":51.36669921875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":255.75708,"width":51.3656005859375,"height":22.829788208007812,"text":""},{"top":233.89162,"left":307.12268,"width":51.366668701171875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":358.48935,"width":51.366973876953125,"height":22.829788208007812,"text":""}],[{"top":256.7214,"left":67.41156,"width":85.61141967773438,"height":14.268798828125,"text":"当期変動額合計"},{"top":256.7214,"left":153.02298,"width":51.367401123046875,"height":14.268798828125,"text":"―"},{"top":256.7214,"left":204.39038,"width":51.36669921875,"height":14.268798828125,"text":"―"},{"top":256.7214,"left":255.75708,"width":51.3656005859375,"height":14.268798828125,"text":"829"},{"top":256.7214,"left":307.12268,"width":51.366668701171875,"height":14.268798828125,"text":"△0"},{"top":256.7214,"left":358.48935,"width":51.366973876953125,"height":14.268798828125,"text":"829"}],[{"top":270.9902,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期末残高"},{"top":270.9902,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":"5,664"},{"top":270.9902,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":"749"},{"top":270.9902,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":"12,846"},{"top":270.9902,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":"△747"},{"top":270.9902,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":"18,512"}]]},{"extraction_method":"spreadsheet","top":311.64725,"left":67.41156,"width":445.17803955078125,"height":191.19354248046875,"data":[[{"top":311.64725,"left":67.41156,"width":85.61141967773438,"height":45.658660888671875,"text":""},{"top":311.64725,"left":153.02298,"width":256.8333435058594,"height":14.266693115234375,"text":"その他の包括利益累計額"},{"top":311.64725,"left":409.85632,"width":51.365631103515625,"height":45.658660888671875,"text":"少数株主持分"},{"top":311.64725,"left":461.22195,"width":51.367645263671875,"height":45.658660888671875,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":325.91394,"left":153.02298,"width":51.367401123046875,"height":31.3919677734375,"text":"その他有価証券\r評価差額金"},{"top":325.91394,"left":204.39038,"width":51.36669921875,"height":31.3919677734375,"text":"繰延ヘッジ\r損益"},{"top":325.91394,"left":255.75708,"width":51.3656005859375,"height":31.3919677734375,"text":"為替換算\r調整勘定"},{"top":325.91394,"left":307.12268,"width":51.366668701171875,"height":31.3919677734375,"text":"退職給付に係る\r調整累計額"},{"top":325.91394,"left":358.48935,"width":51.366973876953125,"height":31.3919677734375,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.3059,"left":67.41156,"width":85.61141967773438,"height":14.266754150390625,"text":"当期首残高"},{"top":357.3059,"left":153.02298,"width":51.367401123046875,"height":14.266754150390625,"text":"△669"},{"top":357.3059,"left":204.39038,"width":51.36669921875,"height":14.266754150390625,"text":"61"},{"top":357.3059,"left":255.75708,"width":51.3656005859375,"height":14.266754150390625,"text":"△109"},{"top":357.3059,"left":307.12268,"width":51.366668701171875,"height":14.266754150390625,"text":"―"},{"top":357.3059,"left":358.48935,"width":51.366973876953125,"height":14.266754150390625,"text":"△717"},{"top":357.3059,"left":409.85632,"width":51.365631103515625,"height":14.266754150390625,"text":"246"},{"top":357.3059,"left":461.22195,"width":51.367645263671875,"height":14.266754150390625,"text":"17,212"}],[{"top":371.57266,"left":67.41156,"width":85.61141967773438,"height":14.269073486328125,"text":"当期変動額"},{"top":371.57266,"left":153.02298,"width":51.367401123046875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":204.39038,"width":51.36669921875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":255.75708,"width":51.3656005859375,"height":14.269073486328125,"text":""},{"top":371.57266,"left":307.12268,"width":51.366668701171875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":358.48935,"width":51.366973876953125,"height":14.269073486328125,"text":""},{"top":371.57266,"left":409.85632,"width":51.365631103515625,"height":14.269073486328125,"text":""},{"top":371.57266,"left":461.22195,"width":51.367645263671875,"height":14.269073486328125,"text":""}],[{"top":385.84174,"left":67.41156,"width":85.61141967773438,"height":14.268402099609375,"text":"剰余金の配当"},{"top":385.84174,"left":153.02298,"width":51.367401123046875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":204.39038,"width":51.36669921875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":255.75708,"width":51.3656005859375,"height":14.268402099609375,"text":""},{"top":385.84174,"left":307.12268,"width":51.366668701171875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":358.48935,"width":51.366973876953125,"height":14.268402099609375,"text":""},{"top":385.84174,"left":409.85632,"width":51.365631103515625,"height":14.268402099609375,"text":""},{"top":385.84174,"left":461.22195,"width":51.367645263671875,"height":14.268402099609375,"text":"△525"}],[{"top":400.11014,"left":67.41156,"width":85.61141967773438,"height":14.26885986328125,"text":"当期純利益"},{"top":400.11014,"left":153.02298,"width":51.367401123046875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":204.39038,"width":51.36669921875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":255.75708,"width":51.3656005859375,"height":14.26885986328125,"text":""},{"top":400.11014,"left":307.12268,"width":51.366668701171875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":358.48935,"width":51.366973876953125,"height":14.26885986328125,"text":""},{"top":400.11014,"left":409.85632,"width":51.365631103515625,"height":14.26885986328125,"text":""},{"top":400.11014,"left":461.22195,"width":51.367645263671875,"height":14.26885986328125,"text":"1,269"}],[{"top":414.379,"left":67.41156,"width":85.61141967773438,"height":14.269195556640625,"text":"自己株式の取得"},{"top":414.379,"left":153.02298,"width":51.367401123046875,"height":14.269195556640625,"text":""},{"top":414.379,"left":204.39038,"width":51.36669921875,"height":14.269195556640625,"text":""},{"top":414.379,"left":255.75708,"width":51.3656005859375,"height":14.269195556640625,"text":""},{"top":414.379,"left":307.12268,"width":51.366668701171875,"height":14.269195556640625,"text":""},{"top":414.379,"left":358.48935,"width":51.366973876953125,"height":14.269195556640625,"text":""},{"top":414.379,"left":409.85632,"width":51.365631103515625,"height":14.269195556640625,"text":""},{"top":414.379,"left":461.22195,"width":51.367645263671875,"height":14.269195556640625,"text":"△0"}],[{"top":428.6482,"left":67.41156,"width":85.61141967773438,"height":22.829620361328125,"text":"持分法の適用範囲\rの変動"},{"top":428.6482,"left":153.02298,"width":51.367401123046875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":204.39038,"width":51.36669921875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":255.75708,"width":51.3656005859375,"height":22.829620361328125,"text":""},{"top":428.6482,"left":307.12268,"width":51.366668701171875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":358.48935,"width":51.366973876953125,"height":22.829620361328125,"text":""},{"top":428.6482,"left":409.85632,"width":51.365631103515625,"height":22.829620361328125,"text":""},{"top":428.6482,"left":461.22195,"width":51.367645263671875,"height":22.829620361328125,"text":"85"}],[{"top":451.4778,"left":67.41156,"width":85.61141967773438,"height":22.82977294921875,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":451.4778,"left":153.02298,"width":51.367401123046875,"height":22.82977294921875,"text":"556"},{"top":451.4778,"left":204.39038,"width":51.36669921875,"height":22.82977294921875,"text":"80"},{"top":451.4778,"left":255.75708,"width":51.3656005859375,"height":22.82977294921875,"text":"5"},{"top":451.4778,"left":307.12268,"width":51.366668701171875,"height":22.82977294921875,"text":"―"},{"top":451.4778,"left":358.48935,"width":51.366973876953125,"height":22.82977294921875,"text":"642"},{"top":451.4778,"left":409.85632,"width":51.365631103515625,"height":22.82977294921875,"text":"△0"},{"top":451.4778,"left":461.22195,"width":51.367645263671875,"height":22.82977294921875,"text":"642"}],[{"top":474.3076,"left":67.41156,"width":85.61141967773438,"height":14.268341064453125,"text":"当期変動額合計"},{"top":474.3076,"left":153.02298,"width":51.367401123046875,"height":14.268341064453125,"text":"556"},{"top":474.3076,"left":204.39038,"width":51.36669921875,"height":14.268341064453125,"text":"80"},{"top":474.3076,"left":255.75708,"width":51.3656005859375,"height":14.268341064453125,"text":"5"},{"top":474.3076,"left":307.12268,"width":51.366668701171875,"height":14.268341064453125,"text":"―"},{"top":474.3076,"left":358.48935,"width":51.366973876953125,"height":14.268341064453125,"text":"642"},{"top":474.3076,"left":409.85632,"width":51.365631103515625,"height":14.268341064453125,"text":"△0"},{"top":474.3076,"left":461.22195,"width":51.367645263671875,"height":14.268341064453125,"text":"1,471"}],[{"top":488.57593,"left":67.41156,"width":85.61141967773438,"height":14.264862060546875,"text":"当期末残高"},{"top":488.57593,"left":153.02298,"width":51.367401123046875,"height":14.264862060546875,"text":"△113"},{"top":488.57593,"left":204.39038,"width":51.36669921875,"height":14.264862060546875,"text":"142"},{"top":488.57593,"left":255.75708,"width":51.3656005859375,"height":14.264862060546875,"text":"△104"},{"top":488.57593,"left":307.12268,"width":51.366668701171875,"height":14.264862060546875,"text":"―"},{"top":488.57593,"left":358.48935,"width":51.366973876953125,"height":14.264862060546875,"text":"△75"},{"top":488.57593,"left":409.85632,"width":51.365631103515625,"height":14.264862060546875,"text":"245"},{"top":488.57593,"left":461.22195,"width":51.367645263671875,"height":14.264862060546875,"text":"18,683"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":111.18451,"left":67.41156,"width":342.44476318359375,"height":174.07479858398438,"data":[[{"top":111.18451,"left":67.41156,"width":85.61141967773438,"height":28.53582763671875,"text":""},{"top":111.18451,"left":153.02298,"width":256.8333435058594,"height":14.266975402832031,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":125.451485,"left":153.02298,"width":51.367401123046875,"height":14.268852233886719,"text":"資本金"},{"top":125.451485,"left":204.39038,"width":51.36669921875,"height":14.268852233886719,"text":"資本剰余金"},{"top":125.451485,"left":255.75708,"width":51.3656005859375,"height":14.268852233886719,"text":"利益剰余金"},{"top":125.451485,"left":307.12268,"width":51.366668701171875,"height":14.268852233886719,"text":"自己株式"},{"top":125.451485,"left":358.48935,"width":51.366973876953125,"height":14.268852233886719,"text":"株主資本合計"}],[{"top":139.72034,"left":67.41156,"width":85.61141967773438,"height":14.268722534179688,"text":"当期首残高"},{"top":139.72034,"left":153.02298,"width":51.367401123046875,"height":14.268722534179688,"text":"5,664"},{"top":139.72034,"left":204.39038,"width":51.36669921875,"height":14.268722534179688,"text":"749"},{"top":139.72034,"left":255.75708,"width":51.3656005859375,"height":14.268722534179688,"text":"12,017"},{"top":139.72034,"left":307.12268,"width":51.366668701171875,"height":14.268722534179688,"text":"△747"},{"top":139.72034,"left":358.48935,"width":51.366973876953125,"height":14.268722534179688,"text":"17,683"}],[{"top":153.98906,"left":67.41156,"width":85.61141967773438,"height":14.268753051757812,"text":"当期変動額"},{"top":153.98906,"left":153.02298,"width":51.367401123046875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":204.39038,"width":51.36669921875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":255.75708,"width":51.3656005859375,"height":14.268753051757812,"text":""},{"top":153.98906,"left":307.12268,"width":51.366668701171875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":358.48935,"width":51.366973876953125,"height":14.268753051757812,"text":""}],[{"top":168.25781,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"剰余金の配当"},{"top":168.25781,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":"△525"},{"top":168.25781,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△525"}],[{"top":182.52675,"left":67.41156,"width":85.61141967773438,"height":14.265869140625,"text":"当期純利益"},{"top":182.52675,"left":153.02298,"width":51.367401123046875,"height":14.265869140625,"text":""},{"top":182.52675,"left":204.39038,"width":51.36669921875,"height":14.265869140625,"text":""},{"top":182.52675,"left":255.75708,"width":51.3656005859375,"height":14.265869140625,"text":"1,269"},{"top":182.52675,"left":307.12268,"width":51.366668701171875,"height":14.265869140625,"text":""},{"top":182.52675,"left":358.48935,"width":51.366973876953125,"height":14.265869140625,"text":"1,269"}],[{"top":196.79262,"left":67.41156,"width":85.61141967773438,"height":14.268966674804688,"text":"自己株式の取得"},{"top":196.79262,"left":153.02298,"width":51.367401123046875,"height":14.268966674804688,"text":""},{"top":196.79262,"left":204.39038,"width":51.36669921875,"height":14.268966674804688,"text":""},{"top":196.79262,"left":255.75708,"width":51.3656005859375,"height":14.268966674804688,"text":""},{"top":196.79262,"left":307.12268,"width":51.366668701171875,"height":14.268966674804688,"text":"△0"},{"top":196.79262,"left":358.48935,"width":51.366973876953125,"height":14.268966674804688,"text":"△0"}],[{"top":211.06158,"left":67.41156,"width":85.61141967773438,"height":22.830032348632812,"text":"持分法の適用範囲\rの変動"},{"top":211.06158,"left":153.02298,"width":51.367401123046875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":204.39038,"width":51.36669921875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":255.75708,"width":51.3656005859375,"height":22.830032348632812,"text":"85"},{"top":211.06158,"left":307.12268,"width":51.366668701171875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":358.48935,"width":51.366973876953125,"height":22.830032348632812,"text":"85"}],[{"top":233.89162,"left":67.41156,"width":85.61141967773438,"height":22.829788208007812,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":233.89162,"left":153.02298,"width":51.367401123046875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":204.39038,"width":51.36669921875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":255.75708,"width":51.3656005859375,"height":22.829788208007812,"text":""},{"top":233.89162,"left":307.12268,"width":51.366668701171875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":358.48935,"width":51.366973876953125,"height":22.829788208007812,"text":""}],[{"top":256.7214,"left":67.41156,"width":85.61141967773438,"height":14.268798828125,"text":"当期変動額合計"},{"top":256.7214,"left":153.02298,"width":51.367401123046875,"height":14.268798828125,"text":"―"},{"top":256.7214,"left":204.39038,"width":51.36669921875,"height":14.268798828125,"text":"―"},{"top":256.7214,"left":255.75708,"width":51.3656005859375,"height":14.268798828125,"text":"829"},{"top":256.7214,"left":307.12268,"width":51.366668701171875,"height":14.268798828125,"text":"△0"},{"top":256.7214,"left":358.48935,"width":51.366973876953125,"height":14.268798828125,"text":"829"}],[{"top":270.9902,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期末残高"},{"top":270.9902,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":"5,664"},{"top":270.9902,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":"749"},{"top":270.9902,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":"12,846"},{"top":270.9902,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":"△747"},{"top":270.9902,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":"18,512"}]]},{"extraction_method":"lattice","top":311.64725,"left":67.41156,"width":445.17803955078125,"height":191.19354248046875,"data":[[{"top":311.64725,"left":67.41156,"width":85.61141967773438,"height":45.658660888671875,"text":""},{"top":311.64725,"left":153.02298,"width":256.8333435058594,"height":14.266693115234375,"text":"その他の包括利益累計額"},{"top":311.64725,"left":409.85632,"width":51.365631103515625,"height":45.658660888671875,"text":"少数株主持分"},{"top":311.64725,"left":461.22195,"width":51.367645263671875,"height":45.658660888671875,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":325.91394,"left":153.02298,"width":51.367401123046875,"height":31.3919677734375,"text":"その他有価証券\r評価差額金"},{"top":325.91394,"left":204.39038,"width":51.36669921875,"height":31.3919677734375,"text":"繰延ヘッジ\r損益"},{"top":325.91394,"left":255.75708,"width":51.3656005859375,"height":31.3919677734375,"text":"為替換算\r調整勘定"},{"top":325.91394,"left":307.12268,"width":51.366668701171875,"height":31.3919677734375,"text":"退職給付に係る\r調整累計額"},{"top":325.91394,"left":358.48935,"width":51.366973876953125,"height":31.3919677734375,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.3059,"left":67.41156,"width":85.61141967773438,"height":14.266754150390625,"text":"当期首残高"},{"top":357.3059,"left":153.02298,"width":51.367401123046875,"height":14.266754150390625,"text":"△669"},{"top":357.3059,"left":204.39038,"width":51.36669921875,"height":14.266754150390625,"text":"61"},{"top":357.3059,"left":255.75708,"width":51.3656005859375,"height":14.266754150390625,"text":"△109"},{"top":357.3059,"left":307.12268,"width":51.366668701171875,"height":14.266754150390625,"text":"―"},{"top":357.3059,"left":358.48935,"width":51.366973876953125,"height":14.266754150390625,"text":"△717"},{"top":357.3059,"left":409.85632,"width":51.365631103515625,"height":14.266754150390625,"text":"246"},{"top":357.3059,"left":461.22195,"width":51.367645263671875,"height":14.266754150390625,"text":"17,212"}],[{"top":371.57266,"left":67.41156,"width":85.61141967773438,"height":14.269073486328125,"text":"当期変動額"},{"top":371.57266,"left":153.02298,"width":51.367401123046875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":204.39038,"width":51.36669921875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":255.75708,"width":51.3656005859375,"height":14.269073486328125,"text":""},{"top":371.57266,"left":307.12268,"width":51.366668701171875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":358.48935,"width":51.366973876953125,"height":14.269073486328125,"text":""},{"top":371.57266,"left":409.85632,"width":51.365631103515625,"height":14.269073486328125,"text":""},{"top":371.57266,"left":461.22195,"width":51.367645263671875,"height":14.269073486328125,"text":""}],[{"top":385.84174,"left":67.41156,"width":85.61141967773438,"height":14.268402099609375,"text":"剰余金の配当"},{"top":385.84174,"left":153.02298,"width":51.367401123046875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":204.39038,"width":51.36669921875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":255.75708,"width":51.3656005859375,"height":14.268402099609375,"text":""},{"top":385.84174,"left":307.12268,"width":51.366668701171875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":358.48935,"width":51.366973876953125,"height":14.268402099609375,"text":""},{"top":385.84174,"left":409.85632,"width":51.365631103515625,"height":14.268402099609375,"text":""},{"top":385.84174,"left":461.22195,"width":51.367645263671875,"height":14.268402099609375,"text":"△525"}],[{"top":400.11014,"left":67.41156,"width":85.61141967773438,"height":14.26885986328125,"text":"当期純利益"},{"top":400.11014,"left":153.02298,"width":51.367401123046875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":204.39038,"width":51.36669921875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":255.75708,"width":51.3656005859375,"height":14.26885986328125,"text":""},{"top":400.11014,"left":307.12268,"width":51.366668701171875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":358.48935,"width":51.366973876953125,"height":14.26885986328125,"text":""},{"top":400.11014,"left":409.85632,"width":51.365631103515625,"height":14.26885986328125,"text":""},{"top":400.11014,"left":461.22195,"width":51.367645263671875,"height":14.26885986328125,"text":"1,269"}],[{"top":414.379,"left":67.41156,"width":85.61141967773438,"height":14.269195556640625,"text":"自己株式の取得"},{"top":414.379,"left":153.02298,"width":51.367401123046875,"height":14.269195556640625,"text":""},{"top":414.379,"left":204.39038,"width":51.36669921875,"height":14.269195556640625,"text":""},{"top":414.379,"left":255.75708,"width":51.3656005859375,"height":14.269195556640625,"text":""},{"top":414.379,"left":307.12268,"width":51.366668701171875,"height":14.269195556640625,"text":""},{"top":414.379,"left":358.48935,"width":51.366973876953125,"height":14.269195556640625,"text":""},{"top":414.379,"left":409.85632,"width":51.365631103515625,"height":14.269195556640625,"text":""},{"top":414.379,"left":461.22195,"width":51.367645263671875,"height":14.269195556640625,"text":"△0"}],[{"top":428.6482,"left":67.41156,"width":85.61141967773438,"height":22.829620361328125,"text":"持分法の適用範囲\rの変動"},{"top":428.6482,"left":153.02298,"width":51.367401123046875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":204.39038,"width":51.36669921875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":255.75708,"width":51.3656005859375,"height":22.829620361328125,"text":""},{"top":428.6482,"left":307.12268,"width":51.366668701171875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":358.48935,"width":51.366973876953125,"height":22.829620361328125,"text":""},{"top":428.6482,"left":409.85632,"width":51.365631103515625,"height":22.829620361328125,"text":""},{"top":428.6482,"left":461.22195,"width":51.367645263671875,"height":22.829620361328125,"text":"85"}],[{"top":451.4778,"left":67.41156,"width":85.61141967773438,"height":22.82977294921875,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":451.4778,"left":153.02298,"width":51.367401123046875,"height":22.82977294921875,"text":"556"},{"top":451.4778,"left":204.39038,"width":51.36669921875,"height":22.82977294921875,"text":"80"},{"top":451.4778,"left":255.75708,"width":51.3656005859375,"height":22.82977294921875,"text":"5"},{"top":451.4778,"left":307.12268,"width":51.366668701171875,"height":22.82977294921875,"text":"―"},{"top":451.4778,"left":358.48935,"width":51.366973876953125,"height":22.82977294921875,"text":"642"},{"top":451.4778,"left":409.85632,"width":51.365631103515625,"height":22.82977294921875,"text":"△0"},{"top":451.4778,"left":461.22195,"width":51.367645263671875,"height":22.82977294921875,"text":"642"}],[{"top":474.3076,"left":67.41156,"width":85.61141967773438,"height":14.268341064453125,"text":"当期変動額合計"},{"top":474.3076,"left":153.02298,"width":51.367401123046875,"height":14.268341064453125,"text":"556"},{"top":474.3076,"left":204.39038,"width":51.36669921875,"height":14.268341064453125,"text":"80"},{"top":474.3076,"left":255.75708,"width":51.3656005859375,"height":14.268341064453125,"text":"5"},{"top":474.3076,"left":307.12268,"width":51.366668701171875,"height":14.268341064453125,"text":"―"},{"top":474.3076,"left":358.48935,"width":51.366973876953125,"height":14.268341064453125,"text":"642"},{"top":474.3076,"left":409.85632,"width":51.365631103515625,"height":14.268341064453125,"text":"△0"},{"top":474.3076,"left":461.22195,"width":51.367645263671875,"height":14.268341064453125,"text":"1,471"}],[{"top":488.57593,"left":67.41156,"width":85.61141967773438,"height":14.264862060546875,"text":"当期末残高"},{"top":488.57593,"left":153.02298,"width":51.367401123046875,"height":14.264862060546875,"text":"△113"},{"top":488.57593,"left":204.39038,"width":51.36669921875,"height":14.264862060546875,"text":"142"},{"top":488.57593,"left":255.75708,"width":51.3656005859375,"height":14.264862060546875,"text":"△104"},{"top":488.57593,"left":307.12268,"width":51.366668701171875,"height":14.264862060546875,"text":"―"},{"top":488.57593,"left":358.48935,"width":51.366973876953125,"height":14.264862060546875,"text":"△75"},{"top":488.57593,"left":409.85632,"width":51.365631103515625,"height":14.264862060546875,"text":"245"},{"top":488.57593,"left":461.22195,"width":51.367645263671875,"height":14.264862060546875,"text":"18,683"}]]}] From a361735410b446b1a3c9cd49b3f8b3b0c0180f2e Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Fri, 30 Dec 2016 15:17:19 -0500 Subject: [PATCH 006/245] Revert "ignore area restrictions on blank page. closes #130" This reverts commit dfd5f2f2ebd27adf8afc73173d4aefb9c92e6451. --- src/main/java/technology/tabula/Page.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 9e810d34..ab57d938 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -53,7 +53,6 @@ public Page(float top, float left, float width, float height, int rotation, int public Page getArea(Rectangle area) { List t = getText(area); - if (t.isEmpty()) return this; Page rv = new Page( (float) area.getTop(), (float) area.getLeft(), From a3eb7a01c65c026edbe41178ac538d9320484333 Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Fri, 30 Dec 2016 16:17:41 -0500 Subject: [PATCH 007/245] fix and test for empty areas; which should have no text content --- src/main/java/technology/tabula/Page.java | 48 ++++++++++--------- .../technology/tabula/TestBasicExtractor.java | 14 ++++++ 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index ab57d938..7128d993 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -53,6 +53,21 @@ public Page(float top, float left, float width, float height, int rotation, int public Page getArea(Rectangle area) { List t = getText(area); + float min_char_width = 7; + float min_char_height = 7; + + if(t.size() > 0){ + min_char_width = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.width, te2.width); + }}).width; + min_char_height = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.height, te2.height); + }}).height; + } Page rv = new Page( (float) area.getTop(), (float) area.getLeft(), @@ -63,41 +78,30 @@ public Page getArea(Rectangle area) { pdPage, t, Ruling.cropRulingsToArea(getRulings(), area), - - Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.width, te2.width); - }}).width, - - Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.height, te2.height); - }}).height, - + min_char_width, + min_char_height, spatial_index); rv.addRuling(new Ruling( new Point2D.Double(rv.getLeft(), - rv.getTop()), + rv.getTop()), new Point2D.Double(rv.getRight(), - rv.getTop()))); + rv.getTop()))); rv.addRuling(new Ruling( new Point2D.Double(rv.getRight(), - rv.getTop()), + rv.getTop()), new Point2D.Double(rv.getRight(), - rv.getBottom()))); + rv.getBottom()))); rv.addRuling(new Ruling( new Point2D.Double(rv.getRight(), - rv.getBottom()), + rv.getBottom()), new Point2D.Double(rv.getLeft(), - rv.getBottom()))); + rv.getBottom()))); rv.addRuling(new Ruling( new Point2D.Double(rv.getLeft(), - rv.getBottom()), + rv.getBottom()), new Point2D.Double(rv.getLeft(), - rv.getTop()))); + rv.getTop()))); return rv; } @@ -221,7 +225,7 @@ public float getMinCharHeight() { } public PDPage getPDPage() { - return pdPage; + return pdPage; } public RectangleSpatialIndex getSpatialIndex() { diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index ba4ee047..4c300fad 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -157,6 +157,10 @@ public class TestBasicExtractor { {"AARON, MICHAEL, R","","","BROOKLYN, NY","MEALS","$65.92"} }; + private static final String[][] EXPECTED_EMPTY_TABLE = { + {""} + }; + @Test public void testRemoveSequentialSpaces() throws IOException { @@ -357,4 +361,14 @@ public void testRealLifeRTL2() throws IOException { assertEquals(expectedCsv, sb.toString()); } + + @Test + public void testEmptyRegion() throws IOException { + Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/indictb1h_14.pdf", 1, + 0.0f, 0.0f, 80.82f, 100.9f); // an empty area + BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); + Table table = bea.extract(page).get(0); + assertArrayEquals(EXPECTED_EMPTY_TABLE, UtilsForTesting.tableToArrayOfRows(table)); + } + } From ec26774414bdbf5d746ff45eb1803ab94ae126cf Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Fri, 30 Dec 2016 16:22:11 -0500 Subject: [PATCH 008/245] more consistent naming of avariable :) --- src/test/java/technology/tabula/TestRectangle.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/technology/tabula/TestRectangle.java b/src/test/java/technology/tabula/TestRectangle.java index e9dadd42..c763fcbc 100644 --- a/src/test/java/technology/tabula/TestRectangle.java +++ b/src/test/java/technology/tabula/TestRectangle.java @@ -79,17 +79,17 @@ public void testQuickSortRectangleList() { Rectangle third = new Rectangle(172.92999267578125f, 96.36000061035156f, 4.0f, 4.309999942779541f); //A Rectangle fourth = new Rectangle(175.72000122070312f, 100.31999969482422f, 1.6699999570846558f, 1.5199999809265137f); //, Rectangle fifth = new Rectangle(172.92999267578125f, 103.68000030517578f, 4.329999923706055f, 4.309999942779541f); //N - Rectangle six = new Rectangle(169.2100067138672f, 161.16000366210938f, 4.329999923706055f, 4.309999942779541f); //R + Rectangle sixth = new Rectangle(169.2100067138672f, 161.16000366210938f, 4.329999923706055f, 4.309999942779541f); //R List expectedList = new ArrayList(); expectedList.add(first); - expectedList.add(six); + expectedList.add(sixth); expectedList.add(second); expectedList.add(third); expectedList.add(fourth); expectedList.add(fifth); List toSortList = new ArrayList(); - toSortList.add(six); + toSortList.add(sixth); toSortList.add(second); toSortList.add(third); toSortList.add(fifth); From b301ac99db64a4a352b5ca10cb156ddab6d17e41 Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Tue, 3 Jan 2017 15:42:54 -0500 Subject: [PATCH 009/245] various additional null/empty checks to avoid exceptions when the user selects empty pages or regions --- .../extractors/SpreadsheetExtractionAlgorithm.java | 6 ++++++ .../java/technology/tabula/json/TableSerializer.java | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 532f95fe..78b039a9 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -146,6 +146,12 @@ else if (r.vertical()) { public boolean isTabular(Page page) { + // if there's no text at all on the page, it's not a table + // (we won't be able to do anything with it though) + if(page.getText().isEmpty()){ + return false; + } + // get minimal region of page that contains every character (in effect, // removes white "margins") Page minimalRegion = page.getArea(Utils.bounds(page.getText())); diff --git a/src/main/java/technology/tabula/json/TableSerializer.java b/src/main/java/technology/tabula/json/TableSerializer.java index 9e0538f2..970c7310 100644 --- a/src/main/java/technology/tabula/json/TableSerializer.java +++ b/src/main/java/technology/tabula/json/TableSerializer.java @@ -17,9 +17,13 @@ public class TableSerializer implements JsonSerializer { @Override public JsonElement serialize(Table table, Type type, JsonSerializationContext context) { - + JsonObject object = new JsonObject(); - object.addProperty("extraction_method", table.getExtractionAlgorithm().toString()); + if( table.getExtractionAlgorithm() == null){ + object.addProperty("extraction_method", ""); + }else{ + object.addProperty("extraction_method", (table.getExtractionAlgorithm()).toString()); + } object.addProperty("top", table.getTop()); object.addProperty("left", table.getLeft()); object.addProperty("width", table.getWidth()); @@ -37,4 +41,4 @@ public JsonElement serialize(Table table, Type type, return object; } -} \ No newline at end of file +} From 7bd4cf1ad685a8947e6792794bf424d2e813efe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 6 Jan 2017 19:55:40 -0300 Subject: [PATCH 010/245] Update acknowledgments --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 656f01c9..75f744cb 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,4 @@ Special thanks to the following users and organizations for generously supportin The John S. and James L. Knight Foundation +The Shuttleworth Foundation From 5130b30a0e6f6ca50336918120017a93b4336507 Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Tue, 24 Jan 2017 21:47:46 -0500 Subject: [PATCH 011/245] tabula 0.9.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5f326492..92d419e1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 0.9.1 + 0.9.2 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java @@ -36,7 +36,7 @@ scm:git:git@github.com:tabulapdf/tabula-java.git scm:git:git@github.com:tabulapdf/tabula-java.git git@github.com:tabulapdf/tabula-java.git - tabula-0.9.1 + tabula-0.9.2 From 37cc158fa6e321d21a70614dd38316655ecb3ff1 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Wed, 25 Jan 2017 17:13:25 -0500 Subject: [PATCH 012/245] update version --- README.md | 2 +- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 75f744cb..e4d20245 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Download a version of the tabula-java's jar, with all dependencies included, tha `tabula-java` provides a command line application: ``` -$ java -jar ./target/tabula-0.9.1-jar-with-dependencies.jar --help +$ java -jar ./target/tabula-0.9.2-jar-with-dependencies.jar --help usage: tabula [-a ] [-b ] [-c ] [-d] [-f ] [-g] [-h] [-i] [-n] [-o ] [-p ] [-r] [-s ] [-u] [-v] diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 76f42bdb..a9e381fa 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -32,7 +32,7 @@ public class CommandLineApp { - private static String VERSION = "0.9.1"; + private static String VERSION = "0.9.2"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2016 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; From 790182256b886241e1aa37a991ce43239a065244 Mon Sep 17 00:00:00 2001 From: "Christoph \"criztovyl\" Schulz" Date: Tue, 14 Feb 2017 19:21:24 +0100 Subject: [PATCH 013/245] -t/--stream, -l/--lattice in #whichExtractionMethod --- src/main/java/technology/tabula/CommandLineApp.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index a9e381fa..46bfe11d 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -224,11 +224,11 @@ private static List whichPages(CommandLine line) throws ParseException } private static ExtractionMethod whichExtractionMethod(CommandLine line) { - if (line.hasOption('r')) { + if (line.hasOption('r') || line.hasOption('l')) { // -r/--spreadsheet [deprecated; use -l] or -l/--lattice return ExtractionMethod.SPREADSHEET; } - - if (line.hasOption('n') || line.hasOption('c') || line.hasOption('g')) { + // -n/--no-spreadsheet [deprecated; use -t] or -c/--columns or -g/--guess or -t/--stream + if (line.hasOption('n') || line.hasOption('c') || line.hasOption('g') || line.hasOption('t')) { return ExtractionMethod.BASIC; } return ExtractionMethod.DECIDE; From d7a038255d8c2512df0ede058bfceef720dff6a2 Mon Sep 17 00:00:00 2001 From: "Christoph \"criztovyl\" Schulz" Date: Tue, 14 Feb 2017 19:28:15 +0100 Subject: [PATCH 014/245] Comment on line above --- src/main/java/technology/tabula/CommandLineApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 46bfe11d..0b0d2b83 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -224,9 +224,11 @@ private static List whichPages(CommandLine line) throws ParseException } private static ExtractionMethod whichExtractionMethod(CommandLine line) { - if (line.hasOption('r') || line.hasOption('l')) { // -r/--spreadsheet [deprecated; use -l] or -l/--lattice + // -r/--spreadsheet [deprecated; use -l] or -l/--lattice + if (line.hasOption('r') || line.hasOption('l')) { return ExtractionMethod.SPREADSHEET; } + // -n/--no-spreadsheet [deprecated; use -t] or -c/--columns or -g/--guess or -t/--stream if (line.hasOption('n') || line.hasOption('c') || line.hasOption('g') || line.hasOption('t')) { return ExtractionMethod.BASIC; From f4c094e69b960ce63be6f0b7bca60c92ebcb6665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 27 Mar 2017 10:21:59 -0400 Subject: [PATCH 015/245] [Monster PR] Upgrade to PDFBox 2.0 (#150) * Starting with upgrade to PDFBox 2.0 (#52) * 2.0 * little progress in upgrading to pdfbox 2 * upgrade to pdfbox 2 starting to show signs of life * Fix TextElement creation * fix tabs * Use the code from LegacyPDFStreamEngine to create the TextElements * Fix removeText function using the example: org.apache.pdfbox.examples.util.RemoveAllText * close the document * close removed text document * fix array serialization * add spanning cells test with CSV format * - Remove capheight calculation - Temporally set height * Test writer two tables checking the json result object instead of the string Add a test writer two tables for CSV output * Fix pageTransform when there is a rotation Add more csv tests * fix path iterator * update json tests * update json outputs * upgrade pdfbox version * back to the old implementation and catch the IndexOutOfBoundsException * Remove hardcoded code * Remove more hardcoded code * test all the elements of the detected table * Change the expected table top value * Increase the threshold factor to support a greater headings * Fix rectangle comparator. * fix wrong expected column size, 5 instead of 6. add more tests * update expected table, more spaces are expected to respect the alingment. * when the text value has length > 1, clean the spaces. * clean code * remove stackstrace * add log error * upgrade all dependencies * code formatting * setting pom to snapshot version --- pom.xml | 28 +- .../technology/tabula/CommandLineApp.java | 306 +++++------ .../technology/tabula/ObjectExtractor.java | 416 +------------- .../tabula/ObjectExtractorStreamEngine.java | 520 ++++++++++++++++++ .../java/technology/tabula/TextChunk.java | 227 ++++---- .../java/technology/tabula/TextElement.java | 194 +++---- src/main/java/technology/tabula/Utils.java | 89 +-- .../java/technology/tabula/debug/Debug.java | 193 +++---- .../detectors/NurminenDetectionAlgorithm.java | 184 ++++--- .../technology/tabula/writers/JSONWriter.java | 36 +- .../technology/tabula/TestBasicExtractor.java | 328 +++++------ .../technology/tabula/TestCommandLineApp.java | 197 +++---- .../tabula/TestObjectExtractor.java | 69 +-- .../tabula/TestSpreadsheetExtractor.java | 342 +++++++----- .../java/technology/tabula/TestWriters.java | 74 ++- .../technology/tabula/UtilsForTesting.java | 40 +- .../tabula/csv/frx_2012_disclosure.csv | 90 +++ .../technology/tabula/csv/indictb1h_14.csv | 72 +-- .../technology/tabula/csv/schools.csv | 45 ++ .../technology/tabula/csv/spanning_cells.csv | 25 + .../technology/tabula/csv/twotables.csv | 32 ++ .../technology/tabula/csv/us-020.csv | 50 ++ .../competition-dataset-eu/eu-027-reg.xml | 2 +- .../technology/tabula/json/schools.json | 3 +- .../tabula/json/spanning_cells.json | 2 +- .../tabula/json/spanning_cells_basic.json | 2 +- .../technology/tabula/json/twotables.json | 2 +- .../resources/technology/tabula/us-020.pdf | Bin 0 -> 122078 bytes 28 files changed, 2055 insertions(+), 1513 deletions(-) create mode 100644 src/main/java/technology/tabula/ObjectExtractorStreamEngine.java create mode 100644 src/test/resources/technology/tabula/csv/frx_2012_disclosure.csv create mode 100644 src/test/resources/technology/tabula/csv/schools.csv create mode 100644 src/test/resources/technology/tabula/csv/spanning_cells.csv create mode 100644 src/test/resources/technology/tabula/csv/twotables.csv create mode 100644 src/test/resources/technology/tabula/csv/us-020.csv create mode 100644 src/test/resources/technology/tabula/us-020.pdf diff --git a/pom.xml b/pom.xml index 92d419e1..6517f2b0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 0.9.2 + 1.0.0-SNAPSHOT Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java @@ -36,7 +36,7 @@ scm:git:git@github.com:tabulapdf/tabula-java.git scm:git:git@github.com:tabulapdf/tabula-java.git git@github.com:tabulapdf/tabula-java.git - tabula-0.9.2 + tabula-1.0.0-SNAPSHOT @@ -134,8 +134,8 @@ maven-compiler-plugin 3.1 - 1.6 - 1.6 + 1.7 + 1.7 @@ -222,31 +222,37 @@ org.slf4j slf4j-api - 1.7.21 + 1.7.25 org.slf4j slf4j-simple - 1.7.21 + 1.7.25 org.apache.pdfbox pdfbox - 1.8.12 + 2.0.5 + + + + org.apache.pdfbox + pdfbox-tools + 2.0.5 org.bouncycastle bcprov-jdk15on - 1.55 + 1.56 org.bouncycastle bcmail-jdk15on - 1.55 + 1.56 @@ -259,7 +265,7 @@ commons-cli commons-cli - 1.3.1 + 1.4 @@ -271,7 +277,7 @@ com.google.code.gson gson - 2.7 + 2.8.0 diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 0b0d2b83..44fb646b 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -32,8 +32,8 @@ public class CommandLineApp { - private static String VERSION = "0.9.2"; - private static String VERSION_STRING = String.format("tabula %s (c) 2012-2016 Manuel Aristarán", VERSION); + private static String VERSION = "1.0.0"; + private static String VERSION_STRING = String.format("tabula %s (c) 2012-2017 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; private Appendable defaultOutput; @@ -51,7 +51,7 @@ public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseEx this.tableExtractor = CommandLineApp.createExtractor(line); if (line.hasOption('s')) { - this.password = line.getOptionValue('s'); + this.password = line.getOptionValue('s'); } } @@ -59,7 +59,7 @@ public static void main(String[] args) { CommandLineParser parser = new GnuParser(); try { // parse the command line arguments - CommandLine line = parser.parse(buildOptions(), args ); + CommandLine line = parser.parse(buildOptions(), args); if (line.hasOption('h')) { printHelp(); @@ -72,7 +72,7 @@ public static void main(String[] args) { } new CommandLineApp(System.out, line).extractTables(line); - } catch(ParseException exp) { + } catch (ParseException exp) { System.err.println("Error: " + exp.getMessage()); System.exit(1); } @@ -81,16 +81,16 @@ public static void main(String[] args) { public void extractTables(CommandLine line) throws ParseException { if (line.hasOption('b')) { - if (line.getArgs().length != 0) { - throw new ParseException("Filename specified with batch\nTry --help for help"); - } - - File pdfDirectory = new File(line.getOptionValue('b')); - if (!pdfDirectory.isDirectory()) { - throw new ParseException("Directory does not exist or is not a directory"); - } - extractDirectoryTables(line, pdfDirectory); - return; + if (line.getArgs().length != 0) { + throw new ParseException("Filename specified with batch\nTry --help for help"); + } + + File pdfDirectory = new File(line.getOptionValue('b')); + if (!pdfDirectory.isDirectory()) { + throw new ParseException("Directory does not exist or is not a directory"); + } + extractDirectoryTables(line, pdfDirectory); + return; } if (line.getArgs().length != 1) { @@ -106,22 +106,22 @@ public void extractTables(CommandLine line) throws ParseException { public void extractDirectoryTables(CommandLine line, File pdfDirectory) throws ParseException { File[] pdfs = pdfDirectory.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) { - return name.endsWith(".pdf"); - } + public boolean accept(File dir, String name) { + return name.endsWith(".pdf"); + } }); for (File pdfFile : pdfs) { - File outputFile = new File(getOutputFilename(pdfFile)); - extractFileInto(pdfFile, outputFile); + File outputFile = new File(getOutputFilename(pdfFile)); + extractFileInto(pdfFile, outputFile); } } public void extractFileTables(CommandLine line, File pdfFile) throws ParseException { Appendable outFile = this.defaultOutput; if (!line.hasOption('o')) { - extractFile(pdfFile, this.defaultOutput); - return; + extractFile(pdfFile, this.defaultOutput); + return; } File outputFile = new File(line.getOptionValue('o')); @@ -169,23 +169,21 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException } catch (IOException e) { throw new ParseException(e.getMessage()); } finally { - try { - if (pdfDocument != null) { - pdfDocument.close(); - } - } catch (IOException e) { - System.out.println("Error in closing pdf document" + e); - } + try { + if (pdfDocument != null) { + pdfDocument.close(); + } + } catch (IOException e) { + System.out.println("Error in closing pdf document" + e); + } } } private PageIterator getPageIterator(PDDocument pdfDocument) throws IOException { - ObjectExtractor extractor = (this.password == null) ? - new ObjectExtractor(pdfDocument) : - new ObjectExtractor(pdfDocument, this.password); + ObjectExtractor extractor = new ObjectExtractor(pdfDocument); PageIterator pageIterator = (pages == null) ? - extractor.extract() : - extractor.extract(pages); + extractor.extract() : + extractor.extract(pages); return pageIterator; } @@ -208,7 +206,7 @@ private static OutputFormat whichOutputFormat(CommandLine line) throws ParseExce private static Rectangle whichArea(CommandLine line) throws ParseException { if (!line.hasOption('a')) { - return null; + return null; } List f = parseFloatList(line.getOptionValue('a')); @@ -237,15 +235,15 @@ private static ExtractionMethod whichExtractionMethod(CommandLine line) { } private static TableExtractor createExtractor(CommandLine line) throws ParseException { - TableExtractor extractor = new TableExtractor(); - extractor.setGuess(line.hasOption('g')); - extractor.setMethod(CommandLineApp.whichExtractionMethod(line)); - extractor.setUseLineReturns(line.hasOption('u')); - - if (line.hasOption('c')) { - extractor.setVerticalRulingPositions(parseFloatList(line.getOptionValue('c'))); - } - return extractor; + TableExtractor extractor = new TableExtractor(); + extractor.setGuess(line.hasOption('g')); + extractor.setMethod(CommandLineApp.whichExtractionMethod(line)); + extractor.setUseLineReturns(line.hasOption('u')); + + if (line.hasOption('c')) { + extractor.setVerticalRulingPositions(parseFloatList(line.getOptionValue('c'))); + } + return extractor; } // utilities, etc. @@ -284,127 +282,127 @@ public static Options buildOptions() { o.addOption("u", "use-line-returns", false, "Use embedded line returns in cells. (Only in spreadsheet mode.)"); o.addOption("d", "debug", false, "Print detected table areas instead of processing."); o.addOption(OptionBuilder.withLongOpt("batch") - .withDescription("Convert all .pdfs in the provided directory.") - .hasArg() - .withArgName("DIRECTORY") - .create("b")); + .withDescription("Convert all .pdfs in the provided directory.") + .hasArg() + .withArgName("DIRECTORY") + .create("b")); o.addOption(OptionBuilder.withLongOpt("outfile") - .withDescription("Write output to instead of STDOUT. Default: -") - .hasArg() - .withArgName("OUTFILE") - .create("o")); + .withDescription("Write output to instead of STDOUT. Default: -") + .hasArg() + .withArgName("OUTFILE") + .create("o")); o.addOption(OptionBuilder.withLongOpt("format") - .withDescription("Output format: (" + Utils.join(",", OutputFormat.formatNames()) + "). Default: CSV") - .hasArg() - .withArgName("FORMAT") - .create("f")); + .withDescription("Output format: (" + Utils.join(",", OutputFormat.formatNames()) + "). Default: CSV") + .hasArg() + .withArgName("FORMAT") + .create("f")); o.addOption(OptionBuilder.withLongOpt("password") - .withDescription("Password to decrypt document. Default is empty") - .hasArg() - .withArgName("PASSWORD") - .create("s")); + .withDescription("Password to decrypt document. Default is empty") + .hasArg() + .withArgName("PASSWORD") + .create("s")); o.addOption(OptionBuilder.withLongOpt("columns") - .withDescription("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3") - .hasArg() - .withArgName("COLUMNS") - .create("c")); + .withDescription("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3") + .hasArg() + .withArgName("COLUMNS") + .create("c")); o.addOption(OptionBuilder.withLongOpt("area") - .withDescription("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") - .hasArg() - .withArgName("AREA") - .create("a")); + .withDescription("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") + .hasArg() + .withArgName("AREA") + .create("a")); o.addOption(OptionBuilder.withLongOpt("pages") - .withDescription("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") - .hasArg() - .withArgName("PAGES") - .create("p")); + .withDescription("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") + .hasArg() + .withArgName("PAGES") + .create("p")); return o; } private static class TableExtractor { - private boolean guess = false; - private boolean useLineReturns = false; - private BasicExtractionAlgorithm basicExtractor = new BasicExtractionAlgorithm(); - private SpreadsheetExtractionAlgorithm spreadsheetExtractor = new SpreadsheetExtractionAlgorithm(); - private List verticalRulingPositions = null; - private ExtractionMethod method = ExtractionMethod.BASIC; - - public TableExtractor() { - } - - public void setVerticalRulingPositions(List positions) { - this.verticalRulingPositions = positions; - } - - public void setGuess(boolean guess) { - this.guess = guess; - } - - public void setUseLineReturns(boolean useLineReturns) { - this.useLineReturns = useLineReturns; - } - - public void setMethod(ExtractionMethod method) { - this.method = method; - } - - public List
extractTables(Page page) { - ExtractionMethod effectiveMethod = this.method; - if (effectiveMethod == ExtractionMethod.DECIDE) { - effectiveMethod = spreadsheetExtractor.isTabular(page) ? - ExtractionMethod.SPREADSHEET : - ExtractionMethod.BASIC; - } - switch(effectiveMethod) { - case BASIC: - return extractTablesBasic(page); - case SPREADSHEET: - return extractTablesSpreadsheet(page); - default: - return new ArrayList
(); - } - } - - public List
extractTablesBasic(Page page) { - if (guess) { - // guess the page areas to extract using a detection algorithm - // currently we only have a detector that uses spreadsheets to find table areas - DetectionAlgorithm detector = new NurminenDetectionAlgorithm(); - List guesses = detector.detect(page); - List
tables = new ArrayList
(); - - for (Rectangle guessRect : guesses) { - Page guess = page.getArea(guessRect); - tables.addAll(basicExtractor.extract(guess)); - } - return tables; + private boolean guess = false; + private boolean useLineReturns = false; + private BasicExtractionAlgorithm basicExtractor = new BasicExtractionAlgorithm(); + private SpreadsheetExtractionAlgorithm spreadsheetExtractor = new SpreadsheetExtractionAlgorithm(); + private List verticalRulingPositions = null; + private ExtractionMethod method = ExtractionMethod.BASIC; + + public TableExtractor() { + } + + public void setVerticalRulingPositions(List positions) { + this.verticalRulingPositions = positions; } - if (verticalRulingPositions != null) { - return basicExtractor.extract(page, verticalRulingPositions); + public void setGuess(boolean guess) { + this.guess = guess; } - return basicExtractor.extract(page); - } - public List
extractTablesSpreadsheet(Page page) { - // TODO add useLineReturns - return (List
)spreadsheetExtractor.extract(page); - } + public void setUseLineReturns(boolean useLineReturns) { + this.useLineReturns = useLineReturns; + } + + public void setMethod(ExtractionMethod method) { + this.method = method; + } + + public List
extractTables(Page page) { + ExtractionMethod effectiveMethod = this.method; + if (effectiveMethod == ExtractionMethod.DECIDE) { + effectiveMethod = spreadsheetExtractor.isTabular(page) ? + ExtractionMethod.SPREADSHEET : + ExtractionMethod.BASIC; + } + switch (effectiveMethod) { + case BASIC: + return extractTablesBasic(page); + case SPREADSHEET: + return extractTablesSpreadsheet(page); + default: + return new ArrayList
(); + } + } + + public List
extractTablesBasic(Page page) { + if (guess) { + // guess the page areas to extract using a detection algorithm + // currently we only have a detector that uses spreadsheets to find table areas + DetectionAlgorithm detector = new NurminenDetectionAlgorithm(); + List guesses = detector.detect(page); + List
tables = new ArrayList
(); + + for (Rectangle guessRect : guesses) { + Page guess = page.getArea(guessRect); + tables.addAll(basicExtractor.extract(guess)); + } + return tables; + } + + if (verticalRulingPositions != null) { + return basicExtractor.extract(page, verticalRulingPositions); + } + return basicExtractor.extract(page); + } + + public List
extractTablesSpreadsheet(Page page) { + // TODO add useLineReturns + return (List
) spreadsheetExtractor.extract(page); + } } private void writeTables(List
tables, Appendable out) throws IOException { Writer writer = null; switch (outputFormat) { - case CSV: - writer = new CSVWriter(); - break; - case JSON: - writer = new JSONWriter(); - break; - case TSV: - writer = new TSVWriter(); - break; + case CSV: + writer = new CSVWriter(); + break; + case JSON: + writer = new JSONWriter(); + break; + case TSV: + writer = new TSVWriter(); + break; } writer.write(out, tables); } @@ -412,15 +410,15 @@ private void writeTables(List
tables, Appendable out) throws IOException private String getOutputFilename(File pdfFile) { String extension = ".csv"; switch (outputFormat) { - case CSV: - extension = ".csv"; - break; - case JSON: - extension = ".json"; - break; - case TSV: - extension = ".tsv"; - break; + case CSV: + extension = ".csv"; + break; + case JSON: + extension = ".json"; + break; + case TSV: + extension = ".tsv"; + break; } return pdfFile.getPath().replaceFirst("(\\.pdf|)$", extension); } diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 0e30e2dd..92b12bf7 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -1,132 +1,45 @@ package technology.tabula; -import java.awt.Image; -import java.awt.Shape; -import java.awt.event.KeyEvent; -import java.awt.geom.AffineTransform; -import java.awt.geom.GeneralPath; -import java.awt.geom.Line2D; -import java.awt.geom.PathIterator; -import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import org.apache.pdfbox.exceptions.CryptographyException; -import org.apache.pdfbox.pdfviewer.PageDrawer; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; -import org.apache.pdfbox.pdmodel.common.PDRectangle; -import org.apache.pdfbox.pdmodel.common.PDStream; -import org.apache.pdfbox.pdmodel.encryption.BadSecurityHandlerException; -import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial; -import org.apache.pdfbox.pdmodel.font.PDFont; -import org.apache.pdfbox.pdmodel.font.PDType3Font; -import org.apache.pdfbox.pdmodel.graphics.PDGraphicsState; -import org.apache.pdfbox.pdmodel.text.PDTextState; -import org.apache.pdfbox.util.TextPosition; -public class ObjectExtractor extends org.apache.pdfbox.pdfviewer.PageDrawer { +public class ObjectExtractor { - private static final char[] spaceLikeChars = { ' ', '-', '1', 'i' }; - private static final String NBSP = "\u00A0"; + private PDDocument pdfDocument; - private float minCharWidth; - private float minCharHeight; - private List characters; - private List rulings; - private RectangleSpatialIndex spatialIndex; - private AffineTransform pageTransform; - public List clippingPaths; - private boolean debugClippingPaths; - private boolean extractRulingLines; - private final PDDocument pdf_document; - protected List pdf_document_pages; - - - public ObjectExtractor(PDDocument pdf_document) throws IOException { - this(pdf_document, null, true, false); + public ObjectExtractor(PDDocument pdfDocument) throws IOException { + this.pdfDocument = pdfDocument; } - public ObjectExtractor(PDDocument pdf_document, boolean debugClippingPaths) throws IOException { - this(pdf_document, null, true, debugClippingPaths); - } - - public ObjectExtractor(PDDocument pdf_document, String password) throws IOException { - this(pdf_document, password, true, false); - } - public ObjectExtractor(PDDocument pdf_document, String password, boolean extractRulingLines, boolean debugClippingPaths) - throws IOException { - super(); - - this.clippingPaths = new ArrayList(); - this.debugClippingPaths = debugClippingPaths; - this.extractRulingLines = extractRulingLines; - - this.initialize(); - - // patch PageDrawer: dummy Graphics2D context so some drawing operators don't complain - try { - Field field = PageDrawer.class.getDeclaredField("graphics"); - field.setAccessible(true); - field.set(this, new DummyGraphics2D()); - } - catch (Exception e1) { - } - - if (pdf_document.isEncrypted()) { - try { - pdf_document - .openProtection(new StandardDecryptionMaterial(password)); - } catch (BadSecurityHandlerException e) { - // TODO Auto-generated catch block - throw new IOException("BadSecurityHandler"); - } catch (CryptographyException e) { - throw new IOException("Document is encrypted"); - } + protected Page extractPage(Integer pageNumber) throws IOException { + + if (pageNumber > this.pdfDocument.getNumberOfPages() || pageNumber < 1) { + throw new java.lang.IndexOutOfBoundsException( + "Page number does not exist"); } - this.pdf_document = pdf_document; - this.pdf_document_pages = this.pdf_document.getDocumentCatalog() - .getAllPages(); - } + PDPage p = this.pdfDocument.getPage(pageNumber - 1); + ObjectExtractorStreamEngine se = new ObjectExtractorStreamEngine(p); + se.processPage(p); - protected Page extractPage(Integer page_number) throws IOException { + Utils.sort(se.characters); - if (page_number > this.pdf_document_pages.size() || page_number < 1) { - throw new java.lang.IndexOutOfBoundsException( - "Page number does not exist"); + float w, h; + int pageRotation = p.getRotation(); + if (Math.abs(pageRotation) == 90 || Math.abs(pageRotation) == 270) { + w = p.getCropBox().getHeight(); + h = p.getCropBox().getWidth(); + } else { + w = p.getCropBox().getWidth(); + h = p.getCropBox().getHeight(); } - this.initialize(); - PDPage pdPage = (PDPage) this.pdf_document_pages.get(page_number - 1); - pdPage = this.drawPage(pdPage); - - if(pdPage != null) { - - Utils.sort(this.characters); - - float w, h; - int pageRotation = pdPage.findRotation(); - if (Math.abs(pageRotation) == 90 || Math.abs(pageRotation) == 270) { - w = pdPage.findCropBox().getHeight(); - h = pdPage.findCropBox().getWidth(); - } - else { - w = pdPage.findCropBox().getWidth(); - h = pdPage.findCropBox().getHeight(); - } - - return new Page(0, 0, w, h, pageRotation, page_number, pdPage, this.characters, - this.rulings, this.minCharWidth, this.minCharHeight, - this.spatialIndex); - } - return null;//TODO: content is empty, return null? or empty Page? or exception? + return new Page(0, 0, w, h, pageRotation, pageNumber, p, se.characters, + se.rulings, se.minCharWidth, se.minCharHeight, se.spatialIndex); } public PageIterator extract(Iterable pages) { @@ -134,7 +47,7 @@ public PageIterator extract(Iterable pages) { } public PageIterator extract() { - return extract(Utils.range(1, this.pdf_document_pages.size() + 1)); + return extract(Utils.range(1, this.pdfDocument.getNumberOfPages() + 1)); } public Page extract(int pageNumber) { @@ -142,286 +55,7 @@ public Page extract(int pageNumber) { } public void close() throws IOException { - this.pdf_document.close(); - } - - private PDPage drawPage(PDPage p) throws IOException { - this.page = p; - PDStream contents = p.getContents(); - if (contents != null) { - ensurePageSize(); - this.processStream(p, p.findResources(), contents.getStream()); - return p; - } - return null; - } - - private void ensurePageSize() { - if (this.pageSize == null && this.page != null) { - PDRectangle cropBox = this.page.findCropBox(); - this.pageSize = cropBox == null ? null : cropBox - .createDimension(); - } - } - - private void initialize() { - this.characters = new ArrayList(); - this.rulings = new ArrayList(); - this.pageTransform = null; - this.spatialIndex = new RectangleSpatialIndex(); - this.minCharWidth = Float.MAX_VALUE; - this.minCharHeight = Float.MAX_VALUE; - } - - @Override - public void drawImage(Image awtImage, AffineTransform at) { - // we just ignore images (for now) - } - - public void strokeOrFillPath(boolean isFill) { - GeneralPath path = this.getLinePath(); - - if (!this.extractRulingLines) { - this.getLinePath().reset(); - return; - } - - PathIterator pi = path.getPathIterator(this.getPageTransform()); - float[] c = new float[6]; - int currentSegment; - - // skip paths whose first operation is not a MOVETO - // or contains operations other than LINETO, MOVETO or CLOSE - if ((pi.currentSegment(c) != PathIterator.SEG_MOVETO)) { - path.reset(); - return; - } - pi.next(); - while (!pi.isDone()) { - currentSegment = pi.currentSegment(c); - if (currentSegment != PathIterator.SEG_LINETO - && currentSegment != PathIterator.SEG_CLOSE - && currentSegment != PathIterator.SEG_MOVETO) { - path.reset(); - return; - } - pi.next(); - } - - // TODO: how to implement color filter? - - // skip the first path operation and save it as the starting position - float[] first = new float[6]; - pi = path.getPathIterator(this.getPageTransform()); - pi.currentSegment(first); - // last move - Point2D.Float start_pos = new Point2D.Float(Utils.round(first[0], 2), Utils.round(first[1], 2)); - Point2D.Float last_move = start_pos; - Point2D.Float end_pos = null; - Line2D.Float line; - PointComparator pc = new PointComparator(); - - while (!pi.isDone()) { - pi.next(); - currentSegment = pi.currentSegment(c); - switch (currentSegment) { - case PathIterator.SEG_LINETO: - end_pos = new Point2D.Float(c[0], c[1]); - - line = pc.compare(start_pos, end_pos) == -1 ? new Line2D.Float( - start_pos, end_pos) : new Line2D.Float(end_pos, - start_pos); - - if (line.intersects(this.currentClippingPath())) { - Ruling r = new Ruling(line.getP1(), line.getP2()) - .intersect(this.currentClippingPath()); - - if (r.length() > 0.01) { - this.rulings.add(r); - } - } - break; - case PathIterator.SEG_MOVETO: - last_move = new Point2D.Float(c[0], c[1]); - end_pos = last_move; - break; - case PathIterator.SEG_CLOSE: - // according to PathIterator docs: - // "the preceding subpath should be closed by appending a line - // segment - // back to the point corresponding to the most recent - // SEG_MOVETO." - line = pc.compare(end_pos, last_move) == -1 ? new Line2D.Float( - end_pos, last_move) : new Line2D.Float(last_move, - end_pos); - - if (line.intersects(this.currentClippingPath())) { - Ruling r = new Ruling(line.getP1(), line.getP2()) - .intersect(this.currentClippingPath()); - - if (r.length() > 0.01) { - this.rulings.add(r); - } - } - break; - } - start_pos = end_pos; - } - path.reset(); - } - - @Override - public void strokePath() throws IOException { - this.strokeOrFillPath(false); - } - - @Override - public void fillPath(int windingRule) throws IOException { - // - // float[] color_comps = - // this.getGraphicsState().getNonStrokingColor().getJavaColor().getRGBColorComponents(null); - // float[] color = this.getGraphicsState().getNonStrokingColor().getJavaColor().getComponents(null); - // TODO use color_comps as filter_by_color - this.strokeOrFillPath(true); - } - - private float currentSpaceWidth() { - PDGraphicsState gs = this.getGraphicsState(); - PDTextState ts = gs.getTextState(); - PDFont font = ts.getFont(); - float fontSizeText = ts.getFontSize(); - float horizontalScalingText = ts.getHorizontalScalingPercent() / 100.0f; - float spaceWidthText = 1000; - - if (font instanceof PDType3Font) { - // TODO WHAT? - } - - for (int i = 0; i < spaceLikeChars.length; i++) { - spaceWidthText = font.getFontWidth(spaceLikeChars[i]); - if (spaceWidthText > 0) - break; - } - - float ctm00 = gs.getCurrentTransformationMatrix().getValue(0, 0); - - return (float) ((spaceWidthText / 1000.0) * fontSizeText - * horizontalScalingText * (ctm00 == 0 ? 1 : ctm00)); - } - - @Override - protected void processTextPosition(TextPosition textPosition) { - String c = textPosition.getCharacter(); - - // if c not printable, return - if (!isPrintable(c)) { - return; - } - - Float h = textPosition.getHeightDir(); - - if (c.equals(NBSP)) { // replace non-breaking space for space - c = " "; - } - - float wos = textPosition.getWidthOfSpace(); - - TextElement te = new TextElement( - Utils.round(textPosition.getYDirAdj() - h, 2), - Utils.round(textPosition.getXDirAdj(), 2), - Utils.round(textPosition.getWidthDirAdj(), 2), - Utils.round(textPosition.getHeightDir(), 2), - textPosition.getFont(), - textPosition.getFontSize(), - c, - // workaround a possible bug in PDFBox: - // https://issues.apache.org/jira/browse/PDFBOX-1755 - (Float.isNaN(wos) || wos == 0) ? this.currentSpaceWidth() : wos, - textPosition.getDir()); - - if (this.currentClippingPath().intersects(te)) { - - this.minCharWidth = (float) Math.min(this.minCharWidth, te.getWidth()); - this.minCharHeight = (float) Math.min(this.minCharHeight, te.getHeight()); - - this.spatialIndex.add(te); - this.characters.add(te); - } - - if (this.isDebugClippingPaths() && !this.clippingPaths.contains(this.currentClippingPath())) { - this.clippingPaths.add(this.currentClippingPath()); - } - - } - - public AffineTransform getPageTransform() { - - if (this.pageTransform != null) { - return this.pageTransform; - } - - PDRectangle cb = page.findCropBox(); - int rotation = Math.abs(page.findRotation()); - - this.pageTransform = new AffineTransform(); - - if (rotation == 90 || rotation == 270) { - this.pageTransform = AffineTransform.getRotateInstance(rotation * (Math.PI / 180.0), 0, 0); - this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); - this.pageTransform.concatenate(AffineTransform.getTranslateInstance(0, cb.getHeight())); - this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); - } - return this.pageTransform; - } - - public Rectangle2D currentClippingPath() { - - Shape clippingPath = this.getGraphicsState().getCurrentClippingPath(); - Shape transformedClippingPath = this.getPageTransform() - .createTransformedShape(clippingPath); - Rectangle2D transformedClippingPathBounds = transformedClippingPath - .getBounds2D(); - - return transformedClippingPathBounds; - } - - public boolean isExtractRulingLines() { - return extractRulingLines; - } - - private static boolean isPrintable(String s) { - Character c = s.charAt(0); - Character.UnicodeBlock block = Character.UnicodeBlock.of(c); - return (!Character.isISOControl(c)) && c != KeyEvent.CHAR_UNDEFINED - && block != null && block != Character.UnicodeBlock.SPECIALS; - } - - public boolean isDebugClippingPaths() { - return debugClippingPaths; - } - - public int getPageCount() { - return this.pdf_document_pages.size(); - } - - class PointComparator implements Comparator { - @Override - public int compare(Point2D o1, Point2D o2) { - float o1X = Utils.round(o1.getX(), 2); - float o1Y = Utils.round(o1.getY(), 2); - float o2X = Utils.round(o2.getX(), 2); - float o2Y = Utils.round(o2.getY(), 2); - - if (o1Y > o2Y) - return 1; - if (o1Y < o2Y) - return -1; - if (o1X > o2X) - return 1; - if (o1X < o2X) - return -1; - return 0; - } + this.pdfDocument.close(); } } diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java new file mode 100644 index 00000000..f64a7dd7 --- /dev/null +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -0,0 +1,520 @@ +package technology.tabula; + +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.awt.geom.GeneralPath; +import java.awt.geom.Line2D; +import java.awt.geom.PathIterator; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import org.apache.fontbox.ttf.TrueTypeFont; +import org.apache.fontbox.util.BoundingBox; +import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine; +import org.apache.pdfbox.cos.COSName; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.common.PDRectangle; +import org.apache.pdfbox.pdmodel.font.PDCIDFont; +import org.apache.pdfbox.pdmodel.font.PDCIDFontType2; +import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDSimpleFont; +import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont; +import org.apache.pdfbox.pdmodel.font.PDType0Font; +import org.apache.pdfbox.pdmodel.font.PDType3Font; +import org.apache.pdfbox.pdmodel.font.encoding.GlyphList; +import org.apache.pdfbox.pdmodel.graphics.image.PDImage; +import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState; +import org.apache.pdfbox.text.TextPosition; +import org.apache.pdfbox.util.Matrix; +import org.apache.pdfbox.util.Vector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { + + private static final String NBSP = "\u00A0"; + + protected float minCharWidth; + protected float minCharHeight; + protected List characters; + protected List rulings; + protected RectangleSpatialIndex spatialIndex; + private AffineTransform pageTransform; + private boolean debugClippingPaths; + private boolean extractRulingLines = true; + private Logger log; + private int clipWindingRule = -1; + private GeneralPath currentPath = new GeneralPath(); + public List clippingPaths; + private int pageRotation; + private PDRectangle pageSize; + + private Matrix translateMatrix; + private GlyphList glyphList; + + protected ObjectExtractorStreamEngine(PDPage page) { + super(page); + + this.log = LoggerFactory.getLogger(ObjectExtractorStreamEngine.class); + + this.characters = new ArrayList(); + this.rulings = new ArrayList(); + this.pageTransform = null; + this.spatialIndex = new RectangleSpatialIndex(); + this.minCharWidth = Float.MAX_VALUE; + this.minCharHeight = Float.MAX_VALUE; + this.pageRotation = page.getRotation(); + this.pageSize = page.getCropBox(); + + // calculate page transform + PDRectangle cb = this.getPage().getCropBox(); + int rotation = this.getPage().getRotation(); + + this.pageTransform = new AffineTransform(); + + if (Math.abs(rotation) == 90 || Math.abs(rotation) == 270) { + this.pageTransform = AffineTransform.getRotateInstance(rotation * (Math.PI / 180.0), 0, 0); + this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); + } else { + this.pageTransform.concatenate(AffineTransform.getTranslateInstance(0, cb.getHeight())); + this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); + } + + // load additional glyph list for Unicode mapping + String path = "org/apache/pdfbox/resources/glyphlist/additional.txt"; + InputStream input = GlyphList.class.getClassLoader().getResourceAsStream(path); + this.glyphList = null; + try { + this.glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input); + } catch (IOException e) { + this.log.error("Error loading glyph list", e); + } + } + + @Override + protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode, Vector displacement) + throws IOException { + + TextPosition textPosition = getTextPosition(textRenderingMatrix, font, code, unicode, displacement); + + if (textPosition != null) { + + String c = textPosition.getUnicode(); + + // if c not printable, return + if (!isPrintable(c)) { + return; + } + + Float h = textPosition.getHeightDir(); + + if (c.equals(NBSP)) { // replace non-breaking space for space + c = " "; + } + + float wos = textPosition.getWidthOfSpace(); + + TextElement te = new TextElement(Utils.round(textPosition.getYDirAdj() - h, 2), + Utils.round(textPosition.getXDirAdj(), 2), Utils.round(textPosition.getWidthDirAdj(), 2), + Utils.round(textPosition.getHeightDir(), 2), textPosition.getFont(), textPosition.getFontSize(), c, + // workaround a possible bug in PDFBox: + // https://issues.apache.org/jira/browse/PDFBOX-1755 + wos, textPosition.getDir()); + + if (this.currentClippingPath().intersects(te)) { + + this.minCharWidth = (float) Math.min(this.minCharWidth, te.getWidth()); + this.minCharHeight = (float) Math.min(this.minCharHeight, te.getHeight()); + + this.spatialIndex.add(te); + this.characters.add(te); + } + + if (this.isDebugClippingPaths() && !this.clippingPaths.contains(this.currentClippingPath())) { + this.clippingPaths.add(this.currentClippingPath()); + } + } + + } + + @Override + public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) throws IOException { + currentPath.moveTo((float) p0.getX(), (float) p0.getY()); + currentPath.lineTo((float) p1.getX(), (float) p1.getY()); + currentPath.lineTo((float) p2.getX(), (float) p2.getY()); + currentPath.lineTo((float) p3.getX(), (float) p3.getY()); + + currentPath.closePath(); + } + + @Override + public void clip(int windingRule) throws IOException { + // the clipping path will not be updated until the succeeding painting + // operator is called + clipWindingRule = windingRule; + } + + @Override + public void closePath() throws IOException { + currentPath.closePath(); + } + + @Override + public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) throws IOException { + currentPath.curveTo(x1, y1, x2, y2, x3, y3); + } + + @Override + public void drawImage(PDImage arg0) throws IOException { + // TODO Auto-generated method stub + + } + + @Override + public void endPath() throws IOException { + if (clipWindingRule != -1) { + currentPath.setWindingRule(clipWindingRule); + getGraphicsState().intersectClippingPath(currentPath); + clipWindingRule = -1; + } + currentPath.reset(); + } + + @Override + public void fillAndStrokePath(int arg0) throws IOException { + strokeOrFillPath(true); + } + + @Override + public void fillPath(int arg0) throws IOException { + strokeOrFillPath(true); + } + + @Override + public Point2D getCurrentPoint() throws IOException { + return currentPath.getCurrentPoint(); + } + + @Override + public void lineTo(float x, float y) throws IOException { + currentPath.lineTo(x, y); + } + + @Override + public void moveTo(float x, float y) throws IOException { + currentPath.moveTo(x, y); + } + + @Override + public void shadingFill(COSName arg0) throws IOException { + // TODO Auto-generated method stub + + } + + @Override + public void strokePath() throws IOException { + strokeOrFillPath(false); + } + + private void strokeOrFillPath(boolean isFill) { + GeneralPath path = this.currentPath; + + if (!this.extractRulingLines) { + this.currentPath.reset(); + return; + } + + PathIterator pi = path.getPathIterator(this.getPageTransform()); + float[] c = new float[6]; + int currentSegment; + + // skip paths whose first operation is not a MOVETO + // or contains operations other than LINETO, MOVETO or CLOSE + if ((pi.currentSegment(c) != PathIterator.SEG_MOVETO)) { + path.reset(); + return; + } + pi.next(); + while (!pi.isDone()) { + currentSegment = pi.currentSegment(c); + if (currentSegment != PathIterator.SEG_LINETO && currentSegment != PathIterator.SEG_CLOSE + && currentSegment != PathIterator.SEG_MOVETO) { + path.reset(); + return; + } + pi.next(); + } + + // TODO: how to implement color filter? + + // skip the first path operation and save it as the starting position + float[] first = new float[6]; + pi = path.getPathIterator(this.getPageTransform()); + pi.currentSegment(first); + // last move + Point2D.Float start_pos = new Point2D.Float(Utils.round(first[0], 2), Utils.round(first[1], 2)); + Point2D.Float last_move = start_pos; + Point2D.Float end_pos = null; + Line2D.Float line; + PointComparator pc = new PointComparator(); + while (!pi.isDone()) { + pi.next(); + // This can be the last segment, when pi.isDone, but we need to + // process it + // otherwise us-017.pdf fails the last value. + try { + currentSegment = pi.currentSegment(c); + } catch (IndexOutOfBoundsException ex) { + continue; + } + switch (currentSegment) { + case PathIterator.SEG_LINETO: + end_pos = new Point2D.Float(c[0], c[1]); + + line = pc.compare(start_pos, end_pos) == -1 ? new Line2D.Float(start_pos, end_pos) + : new Line2D.Float(end_pos, start_pos); + + if (line.intersects(this.currentClippingPath())) { + Ruling r = new Ruling(line.getP1(), line.getP2()).intersect(this.currentClippingPath()); + + if (r.length() > 0.01) { + this.rulings.add(r); + } + } + break; + case PathIterator.SEG_MOVETO: + last_move = new Point2D.Float(c[0], c[1]); + end_pos = last_move; + break; + case PathIterator.SEG_CLOSE: + // according to PathIterator docs: + // "the preceding subpath should be closed by appending a line + // segment + // back to the point corresponding to the most recent + // SEG_MOVETO." + line = pc.compare(end_pos, last_move) == -1 ? new Line2D.Float(end_pos, last_move) + : new Line2D.Float(last_move, end_pos); + + if (line.intersects(this.currentClippingPath())) { + Ruling r = new Ruling(line.getP1(), line.getP2()).intersect(this.currentClippingPath()); + + if (r.length() > 0.01) { + this.rulings.add(r); + } + } + break; + } + start_pos = end_pos; + } + path.reset(); + } + + public AffineTransform getPageTransform() { + return this.pageTransform; + } + + public Rectangle2D currentClippingPath() { + Shape clippingPath = this.getGraphicsState().getCurrentClippingPath(); + Shape transformedClippingPath = this.getPageTransform().createTransformedShape(clippingPath); + Rectangle2D transformedClippingPathBounds = transformedClippingPath.getBounds2D(); + + return transformedClippingPathBounds; + } + + private static boolean isPrintable(String s) { + Character c; + Character.UnicodeBlock block; + boolean printable = false; + for (int i = 0; i < s.length(); i++) { + c = s.charAt(i); + block = Character.UnicodeBlock.of(c); + printable |= !Character.isISOControl(c) && block != null && block != Character.UnicodeBlock.SPECIALS; + } + return printable; + } + + private TextPosition getTextPosition(Matrix textRenderingMatrix, PDFont font, int code, String unicode, + Vector displacement) throws IOException { + + // LegacyPDFStreamEngine + PDGraphicsState state = getGraphicsState(); + Matrix ctm = state.getCurrentTransformationMatrix(); + float fontSize = state.getTextState().getFontSize(); + float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f; + Matrix textMatrix = getTextMatrix(); + + BoundingBox bbox = font.getBoundingBox(); + if (bbox.getLowerLeftY() < Short.MIN_VALUE) { + // PDFBOX-2158 and PDFBOX-3130 + // files by Salmat eSolutions / ClibPDF Library + bbox.setLowerLeftY(-(bbox.getLowerLeftY() + 65536)); + } + // 1/2 the bbox is used as the height todo: why? + float glyphHeight = bbox.getHeight() / 2; + + // transformPoint from glyph space -> text space + float height; + if (font instanceof PDType3Font) { + height = font.getFontMatrix().transformPoint(0, glyphHeight).y; + } else { + height = glyphHeight / 1000; + } + + float displacementX = displacement.getX(); + // the sorting algorithm is based on the width of the character. As the + // displacement + // for vertical characters doesn't provide any suitable value for it, we + // have to + // calculate our own + if (font.isVertical()) { + displacementX = font.getWidth(code) / 1000; + // there may be an additional scaling factor for true type fonts + TrueTypeFont ttf = null; + if (font instanceof PDTrueTypeFont) { + ttf = ((PDTrueTypeFont) font).getTrueTypeFont(); + } else if (font instanceof PDType0Font) { + PDCIDFont cidFont = ((PDType0Font) font).getDescendantFont(); + if (cidFont instanceof PDCIDFontType2) { + ttf = ((PDCIDFontType2) cidFont).getTrueTypeFont(); + } + } + if (ttf != null && ttf.getUnitsPerEm() != 1000) { + displacementX *= 1000f / ttf.getUnitsPerEm(); + } + } + + // (modified) combined displacement, this is calculated *without* taking + // the character + // spacing and word spacing into account, due to legacy code in + // TextStripper + float tx = displacementX * fontSize * horizontalScaling; + float ty = displacement.getY() * fontSize; + + // (modified) combined displacement matrix + Matrix td = Matrix.getTranslateInstance(tx, ty); + + // (modified) text rendering matrix + Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text + // space + // -> + // device + // space + float nextX = nextTextRenderingMatrix.getTranslateX(); + float nextY = nextTextRenderingMatrix.getTranslateY(); + + // (modified) width and height calculations + float dxDisplay = nextX - textRenderingMatrix.getTranslateX(); + float dyDisplay = height * textRenderingMatrix.getScalingFactorY(); + + // + // start of the original method + // + + // Note on variable names. There are three different units being used in + // this code. + // Character sizes are given in glyph units, text locations are + // initially given in text + // units, and we want to save the data in display units. The variable + // names should end with + // Text or Disp to represent if the values are in text or disp units (no + // glyph units are + // saved). + + float glyphSpaceToTextSpaceFactor = 1 / 1000f; + if (font instanceof PDType3Font) { + glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX(); + } + + float spaceWidthText = 0; + try { + // to avoid crash as described in PDFBOX-614, see what the space + // displacement should be + spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor; + } catch (Throwable exception) { + this.log.warn("Error getting spaceWidthText", exception); + } + + if (spaceWidthText == 0) { + spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor; + // the average space width appears to be higher than necessary so + // make it smaller + spaceWidthText *= .80f; + } + if (spaceWidthText == 0) { + spaceWidthText = 1.0f; // if could not find font, use a generic + // value + } + + // the space width has to be transformed into display units + float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX(); + + // use our additional glyph list for Unicode mapping + unicode = font.toUnicode(code, glyphList); + + // when there is no Unicode mapping available, Acrobat simply coerces + // the character code + // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't + // necessarily want + // this, which is why we leave it until this point in + // PDFTextStreamEngine. + if (unicode == null) { + if (font instanceof PDSimpleFont) { + char c = (char) code; + unicode = new String(new char[]{c}); + } else { + // Acrobat doesn't seem to coerce composite font's character + // codes, instead it + // skips them. See the "allah2.pdf" TestTextStripper file. + return null; + } + } + + // adjust for cropbox if needed + Matrix translatedTextRenderingMatrix; + if (translateMatrix == null) { + translatedTextRenderingMatrix = textRenderingMatrix; + } else { + translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix); + nextX -= pageSize.getLowerLeftX(); + nextY -= pageSize.getLowerLeftY(); + + } + + return new TextPosition(pageRotation, pageSize.getWidth(), pageSize.getHeight(), translatedTextRenderingMatrix, + nextX, nextY, Math.abs(dyDisplay), dxDisplay, Math.abs(spaceWidthDisplay), unicode, new int[]{code}, + font, fontSize, (int) (fontSize * textMatrix.getScalingFactorX())); + } + + public boolean isDebugClippingPaths() { + return debugClippingPaths; + } + + public void setDebugClippingPaths(boolean debugClippingPaths) { + this.debugClippingPaths = debugClippingPaths; + } + + class PointComparator implements Comparator { + @Override + public int compare(Point2D o1, Point2D o2) { + float o1X = Utils.round(o1.getX(), 2); + float o1Y = Utils.round(o1.getY(), 2); + float o2X = Utils.round(o2.getX(), 2); + float o2Y = Utils.round(o2.getY(), 2); + + if (o1Y > o2Y) + return 1; + if (o1Y < o2Y) + return -1; + if (o1X > o2X) + return 1; + if (o1X < o2X) + return -1; + return 0; + } + } +} diff --git a/src/main/java/technology/tabula/TextChunk.java b/src/main/java/technology/tabula/TextChunk.java index a4c47b3d..046f10d9 100644 --- a/src/main/java/technology/tabula/TextChunk.java +++ b/src/main/java/technology/tabula/TextChunk.java @@ -8,19 +8,19 @@ import java.text.Normalizer; @SuppressWarnings("serial") -public class TextChunk extends RectangularTextContainer implements HasText { - public static final TextChunk EMPTY = new TextChunk(0,0,0,0); +public class TextChunk extends RectangularTextContainer implements HasText { + public static final TextChunk EMPTY = new TextChunk(0, 0, 0, 0); List textElements = new ArrayList(); - + public TextChunk(float top, float left, float width, float height) { super(top, left, width, height); } - + public TextChunk(TextElement textElement) { super(textElement.y, textElement.x, textElement.width, textElement.height); this.add(textElement); } - + public TextChunk(List textElements) { this(textElements.get(0)); for (int i = 1; i < textElements.size(); i++) { @@ -35,8 +35,8 @@ private enum DirectionalityOptions { // I hate Java so bad. // we're making this HashMap static! which requires really funky initialization per http://stackoverflow.com/questions/6802483/how-to-directly-initialize-a-hashmap-in-a-literal-way/6802502#6802502 private static HashMap directionalities; - static - { + + static { directionalities = new HashMap(); // BCT = bidirectional character type directionalities.put(java.lang.Character.DIRECTIONALITY_ARABIC_NUMBER, DirectionalityOptions.LTR); // Weak BCT "AN" in the Unicode specification. @@ -61,12 +61,13 @@ private enum DirectionalityOptions { directionalities.put(java.lang.Character.DIRECTIONALITY_WHITESPACE, DirectionalityOptions.NONE); // Neutral BCT "WS" in the Unicode specification. } - /** Splits a TextChunk into N TextChunks, where each chunk is of a single directionality, and - then reverse the RTL ones. - what we're doing here is *reversing* the Unicode bidi algorithm - in the language of that algorithm, each chunk is a (maximal) directional run. - We attach whitespace to the beginning of non-RTL - **/ + /** + * Splits a TextChunk into N TextChunks, where each chunk is of a single directionality, and + * then reverse the RTL ones. + * what we're doing here is *reversing* the Unicode bidi algorithm + * in the language of that algorithm, each chunk is a (maximal) directional run. + * We attach whitespace to the beginning of non-RTL + **/ public TextChunk groupByDirectionality(Boolean isLtrDominant) { if (this.getTextElements().size() <= 0) { throw new IllegalArgumentException(); @@ -76,30 +77,30 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { ArrayList buff = new ArrayList(); DirectionalityOptions buffDirectionality = DirectionalityOptions.NONE; // the directionality of the characters in buff; - for(TextElement te: this.getTextElements()){ + for (TextElement te : this.getTextElements()) { //TODO: we need to loop over the textelement characters // because it is possible for a textelement to contain multiple characters? // System.out.println(te.getText() + " is " + Character.getDirectionality(te.getText().charAt(0) ) + " " + directionalities.get(Character.getDirectionality(te.getText().charAt(0) ))); - if(buff.size() == 0){ + if (buff.size() == 0) { buff.add(te); buffDirectionality = directionalities.get(Character.getDirectionality(te.getText().charAt(0))); - }else{ - if(buffDirectionality == DirectionalityOptions.NONE){ + } else { + if (buffDirectionality == DirectionalityOptions.NONE) { buffDirectionality = directionalities.get(Character.getDirectionality(te.getText().charAt(0))); } DirectionalityOptions teDirectionality = directionalities.get(Character.getDirectionality(te.getText().charAt(0))); - if(teDirectionality == buffDirectionality || teDirectionality == DirectionalityOptions.NONE) { - if ( Character.getDirectionality(te.getText().charAt(0) ) == java.lang.Character.DIRECTIONALITY_WHITESPACE && (buffDirectionality == (isLtrDominant ? DirectionalityOptions.RTL : DirectionalityOptions.LTR) ) ){ + if (teDirectionality == buffDirectionality || teDirectionality == DirectionalityOptions.NONE) { + if (Character.getDirectionality(te.getText().charAt(0)) == java.lang.Character.DIRECTIONALITY_WHITESPACE && (buffDirectionality == (isLtrDominant ? DirectionalityOptions.RTL : DirectionalityOptions.LTR))) { buff.add(0, te); - }else{ + } else { buff.add(te); } - }else{ + } else { // finish this chunk - if (buffDirectionality == DirectionalityOptions.RTL){ + if (buffDirectionality == DirectionalityOptions.RTL) { Collections.reverse(buff); } chunks.add(buff); @@ -111,15 +112,15 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { } } } - if (buffDirectionality == DirectionalityOptions.RTL){ + if (buffDirectionality == DirectionalityOptions.RTL) { Collections.reverse(buff); } chunks.add(buff); ArrayList everything = new ArrayList(); - if(!isLtrDominant){ + if (!isLtrDominant) { Collections.reverse(chunks); } - for(ArrayList group : chunks){ + for (ArrayList group : chunks) { everything.addAll(group); } return new TextChunk(everything); @@ -137,41 +138,36 @@ public int compareTo(Rectangle other) { double otherBottom = other.getBottom(); int rv; - if (this.equals(other)) return 0; + if (this.equals(other)) return 0; - if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) { + if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) { rv = java.lang.Double.compare(this.getX(), other.getX()); // reverse the ordering if both TextChunks are RTL - if(this.isLtrDominant() == -1 && other.isLtrDominant() == -1){ + if (this.isLtrDominant() == -1 && other.isLtrDominant() == -1) { rv = -1 * rv; } - } - else { - rv = java.lang.Double.compare(thisBottom, otherBottom); - } - return rv; + } else { + rv = java.lang.Double.compare(thisBottom, otherBottom); + } + return rv; } - public int isLtrDominant(){ + public int isLtrDominant() { int ltrCnt = 0; int rtlCnt = 0; - for (int i = 0; i < this.getTextElements().size(); i++) - { + for (int i = 0; i < this.getTextElements().size(); i++) { String elementText = this.getTextElements().get(i).getText(); - for (int j=0; j textElements) { - for (TextElement te: textElements) { + for (TextElement te : textElements) { this.add(te); } } @@ -200,56 +195,59 @@ public void add(List textElements) { public List getTextElements() { return textElements; } - + public String getText() { if (this.textElements.size() == 0) { return ""; } StringBuilder sb = new StringBuilder(); - for (TextElement te: this.textElements) { + for (TextElement te : this.textElements) { sb.append(te.getText()); } return Normalizer.normalize(sb.toString(), Normalizer.Form.NFKC).trim(); } - + @Override public String getText(boolean useLineReturns) { // TODO Auto-generated method stub return null; } - + /** * Returns true if text contained in this TextChunk is the same repeated character */ public boolean isSameChar(Character c) { - return isSameChar(new Character[] { c }); + return isSameChar(new Character[]{c}); } - + public boolean isSameChar(Character[] c) { String s = this.getText(); List chars = Arrays.asList(c); for (int i = 0; i < s.length(); i++) { - if (!chars.contains(s.charAt(i))) { return false; } + if (!chars.contains(s.charAt(i))) { + return false; + } } return true; } - - /** Splits a TextChunk in two, at the position of the i-th TextElement + + /** + * Splits a TextChunk in two, at the position of the i-th TextElement */ public TextChunk[] splitAt(int i) { if (i < 1 || i >= this.getTextElements().size()) { throw new IllegalArgumentException(); } - - TextChunk[] rv = new TextChunk[] { + + TextChunk[] rv = new TextChunk[]{ new TextChunk(this.getTextElements().subList(0, i)), new TextChunk(this.getTextElements().subList(i, this.getTextElements().size())) }; return rv; } - + /** * Removes runs of identical TextElements in this TextChunk * For example, if the TextChunk contains this string of characters: "1234xxxxx56xx" @@ -261,20 +259,25 @@ public List squeeze(Character c, int minRunLength) { int subSequenceLength = 0, subSequenceStart = 0; TextChunk[] t; List rv = new ArrayList(); - + for (int i = 0; i < this.getTextElements().size(); i++) { TextElement textElement = this.getTextElements().get(i); - currentChar = textElement.getText().charAt(0); + String text = textElement.getText(); + if (text.length() > 1) { + currentChar = text.trim().charAt(0); + } else { + currentChar = text.charAt(0); + } + + if (lastChar != null && currentChar.equals(c) && lastChar.equals(currentChar)) { subSequenceLength++; - } - else { + } else { if (((lastChar != null && !lastChar.equals(currentChar)) || i + 1 == this.getTextElements().size()) && subSequenceLength >= minRunLength) { if (subSequenceStart == 0 && subSequenceLength <= this.getTextElements().size() - 1) { t = this.splitAt(subSequenceLength); - } - else { + } else { t = this.splitAt(subSequenceStart); rv.add(t[0]); } @@ -287,51 +290,49 @@ public List squeeze(Character c, int minRunLength) { } lastChar = currentChar; } - - + + if (rv.isEmpty()) { // no splits occurred, hence this.squeeze() == [this] if (subSequenceLength >= minRunLength && subSequenceLength < this.textElements.size()) { - TextChunk[] chunks = this.splitAt(subSequenceStart); + TextChunk[] chunks = this.splitAt(subSequenceStart); rv.add(chunks[0]); - } - else { + } else { rv.add(this); } } - + return rv; } - - - + + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + + ((textElements == null) ? 0 : textElements.hashCode()); + return result; + } + @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result - + ((textElements == null) ? 0 : textElements.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - TextChunk other = (TextChunk) obj; - if (textElements == null) { - if (other.textElements != null) - return false; - } else if (!textElements.equals(other.textElements)) - return false; - return true; - } - - public static boolean allSameChar(List textChunks) { + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + TextChunk other = (TextChunk) obj; + if (textElements == null) { + if (other.textElements != null) + return false; + } else if (!textElements.equals(other.textElements)) + return false; + return true; + } + + public static boolean allSameChar(List textChunks) { /* the previous, far more elegant version of this method failed when there was an empty TextChunk in textChunks. * so I rewrote it in an ugly way. but it works! * it would be good for this to get rewritten eventually @@ -339,23 +340,23 @@ public static boolean allSameChar(List textChunks) { * -Jeremy 5/13/2016 */ - if(textChunks.size() == 1) return false; + if (textChunks.size() == 1) return false; boolean hasHadAtLeastOneNonEmptyTextChunk = false; char first = '\u0000'; - for (TextChunk tc: textChunks) { + for (TextChunk tc : textChunks) { if (tc.getText().length() == 0) { continue; } - if (first == '\u0000'){ + if (first == '\u0000') { first = tc.getText().charAt(0); - }else{ + } else { hasHadAtLeastOneNonEmptyTextChunk = true; if (!tc.isSameChar(first)) return false; } } return hasHadAtLeastOneNonEmptyTextChunk; } - + public static List groupByLines(List textChunks) { List lines = new ArrayList(); @@ -364,14 +365,14 @@ public static List groupByLines(List textChunks) { } float bbwidth = Rectangle.boundingBoxOf(textChunks).width; - + Line l = new Line(); l.addTextChunk(textChunks.get(0)); textChunks.remove(0); lines.add(l); Line last = lines.get(lines.size() - 1); - for (TextChunk te: textChunks) { + for (TextChunk te : textChunks) { if (last.verticalOverlapRatio(te) < 0.1) { if (last.width / bbwidth > 0.9 && TextChunk.allSameChar(last.getTextElements())) { lines.remove(lines.size() - 1); @@ -381,17 +382,17 @@ public static List groupByLines(List textChunks) { } last.addTextChunk(te); } - + if (last.width / bbwidth > 0.9 && TextChunk.allSameChar(last.getTextElements())) { lines.remove(lines.size() - 1); } - + List rv = new ArrayList(lines.size()); - - for (Line line: lines) { + + for (Line line : lines) { rv.add(Line.removeRepeatedCharacters(line, ' ', 3)); } - + return rv; } diff --git a/src/main/java/technology/tabula/TextElement.java b/src/main/java/technology/tabula/TextElement.java index 31167390..7e58ff8d 100644 --- a/src/main/java/technology/tabula/TextElement.java +++ b/src/main/java/technology/tabula/TextElement.java @@ -15,12 +15,12 @@ public class TextElement extends Rectangle implements HasText { private static final float AVERAGE_CHAR_TOLERANCE = 0.3f; public TextElement(float y, float x, float width, float height, - PDFont font, float fontSize, String c, float widthOfSpace) { - this(y, x, width, height, font, fontSize, c, widthOfSpace, 0f); - } + PDFont font, float fontSize, String c, float widthOfSpace) { + this(y, x, width, height, font, fontSize, c, widthOfSpace, 0f); + } public TextElement(float y, float x, float width, float height, - PDFont font, float fontSize, String c, float widthOfSpace, float dir) { + PDFont font, float fontSize, String c, float widthOfSpace, float dir) { super(); this.setRect(x, y, width, height); this.text = c; @@ -49,7 +49,7 @@ public PDFont getFont() { public float getFontSize() { return fontSize; } - + public String toString() { StringBuilder sb = new StringBuilder(); String s = super.toString(); @@ -57,75 +57,75 @@ public String toString() { sb.append(String.format(",text=\"%s\"]", this.getText())); return sb.toString(); } - + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + java.lang.Float.floatToIntBits(dir); + result = prime * result + ((font == null) ? 0 : font.hashCode()); + result = prime * result + java.lang.Float.floatToIntBits(fontSize); + result = prime * result + ((text == null) ? 0 : text.hashCode()); + result = prime * result + java.lang.Float.floatToIntBits(widthOfSpace); + return result; + } + @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + java.lang.Float.floatToIntBits(dir); - result = prime * result + ((font == null) ? 0 : font.hashCode()); - result = prime * result + java.lang.Float.floatToIntBits(fontSize); - result = prime * result + ((text == null) ? 0 : text.hashCode()); - result = prime * result + java.lang.Float.floatToIntBits(widthOfSpace); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - TextElement other = (TextElement) obj; - if (java.lang.Float.floatToIntBits(dir) != java.lang.Float - .floatToIntBits(other.dir)) - return false; - if (font == null) { - if (other.font != null) - return false; - } else if (!font.equals(other.font)) - return false; - if (java.lang.Float.floatToIntBits(fontSize) != java.lang.Float - .floatToIntBits(other.fontSize)) - return false; - if (text == null) { - if (other.text != null) - return false; - } else if (!text.equals(other.text)) - return false; - if (java.lang.Float.floatToIntBits(widthOfSpace) != java.lang.Float - .floatToIntBits(other.widthOfSpace)) - return false; - return true; - } - - public static List mergeWords(List textElements) { + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + TextElement other = (TextElement) obj; + if (java.lang.Float.floatToIntBits(dir) != java.lang.Float + .floatToIntBits(other.dir)) + return false; + if (font == null) { + if (other.font != null) + return false; + } else if (!font.equals(other.font)) + return false; + if (java.lang.Float.floatToIntBits(fontSize) != java.lang.Float + .floatToIntBits(other.fontSize)) + return false; + if (text == null) { + if (other.text != null) + return false; + } else if (!text.equals(other.text)) + return false; + if (java.lang.Float.floatToIntBits(widthOfSpace) != java.lang.Float + .floatToIntBits(other.widthOfSpace)) + return false; + return true; + } + + public static List mergeWords(List textElements) { return mergeWords(textElements, new ArrayList()); } - + /** * heuristically merge a list of TextElement into a list of TextChunk * ported from from PDFBox's PDFTextStripper.writePage, with modifications. * Here be dragons */ public static List mergeWords(List textElements, List verticalRulings) { - + List textChunks = new ArrayList(); - + if (textElements.isEmpty()) { return textChunks; } - + // it's a problem that this `remove` is side-effecty // other things depend on `textElements` and it can sometimes lead to the first textElement in textElement // not appearing in the final output because it's been removed here. // https://github.com/tabulapdf/tabula-java/issues/78 List copyOfTextElements = new ArrayList(textElements); textChunks.add(new TextChunk(copyOfTextElements.remove(0))); - TextChunk firstTC = textChunks.get(0); - + TextChunk firstTC = textChunks.get(0); + float previousAveCharWidth = (float) firstTC.getWidth(); float endOfLastTextX = (float) firstTC.getRight(); float maxYForLine = (float) firstTC.getBottom(); @@ -137,21 +137,21 @@ public static List mergeWords(List textElements, List 0.5)) { continue; } - + // if chr is a space that overlaps with prevChar, skip if (chr.getText().equals(" ") && Utils.feq(prevChar.getLeft(), chr.getLeft()) && Utils.feq(prevChar.getTop(), chr.getTop())) { continue; } - + // Resets the average character width when we see a change in font // or a change in the font size if ((chr.getFont() != prevChar.getFont()) || !Utils.feq(chr.getFontSize(), prevChar.getFontSize())) { @@ -160,30 +160,28 @@ public static List mergeWords(List textElements, List r.getPosition()) || (prevChar.x > r.getPosition() && chr.x < r.getPosition()) - ) { + (prevChar.x < r.getPosition() && chr.x > r.getPosition()) || (prevChar.x > r.getPosition() && chr.x < r.getPosition()) + ) { acrossVerticalRuling = true; break; } - } - + } + // Estimate the expected width of the space based on the // space character with some margin. wordSpacing = chr.getWidthOfSpace(); deltaSpace = 0; if (java.lang.Float.isNaN(wordSpacing) || wordSpacing == 0) { deltaSpace = java.lang.Float.MAX_VALUE; - } - else if (lastWordSpacing < 0) { + } else if (lastWordSpacing < 0) { deltaSpace = wordSpacing * 0.5f; // 0.5 == spacing tolerance - } - else { + } else { deltaSpace = ((wordSpacing + lastWordSpacing) / 2.0f) * 0.5f; } - + // Estimate the expected width of the space based on the // average character width with some margin. This calculation does not // make a true average (average of averages) but we found that it gave the @@ -191,20 +189,19 @@ else if (lastWordSpacing < 0) { // .3 worked well. if (previousAveCharWidth < 0) { averageCharWidth = (float) (chr.getWidth() / chr.getText().length()); - } - else { + } else { averageCharWidth = (float) ((previousAveCharWidth + (chr.getWidth() / chr.getText().length())) / 2.0f); } deltaCharWidth = averageCharWidth * AVERAGE_CHAR_TOLERANCE; - + // Compares the values obtained by the average method and the wordSpacing method and picks // the smaller number. expectedStartOfNextWordX = -java.lang.Float.MAX_VALUE; - + if (endOfLastTextX != -1) { expectedStartOfNextWordX = endOfLastTextX + Math.min(deltaCharWidth, deltaSpace); } - + // new line? sameLine = true; if (!Utils.overlap((float) chr.getBottom(), chr.height, maxYForLine, maxHeightForLine)) { @@ -215,15 +212,15 @@ else if (lastWordSpacing < 0) { minYTopForLine = java.lang.Float.MAX_VALUE; sameLine = false; } - + endOfLastTextX = (float) chr.getRight(); - + // should we add a space? if (!acrossVerticalRuling && - sameLine && - expectedStartOfNextWordX < chr.getLeft() && - !prevChar.getText().endsWith(" ")) { - + sameLine && + expectedStartOfNextWordX < chr.getLeft() && + !prevChar.getText().endsWith(" ")) { + sp = new TextElement((float) prevChar.getTop(), (float) prevChar.getLeft(), (float) (expectedStartOfNextWordX - prevChar.getLeft()), @@ -232,13 +229,12 @@ else if (lastWordSpacing < 0) { prevChar.getFontSize(), " ", prevChar.getWidthOfSpace()); - + currentChunk.add(sp); - } - else { + } else { sp = null; } - + maxYForLine = (float) Math.max(chr.getBottom(), maxYForLine); maxHeightForLine = (float) Math.max(maxHeightForLine, chr.getHeight()); minYTopForLine = (float) Math.min(minYTopForLine, chr.getTop()); @@ -246,42 +242,32 @@ else if (lastWordSpacing < 0) { dist = (float) (chr.getLeft() - (sp != null ? sp.getRight() : prevChar.getRight())); if (!acrossVerticalRuling && - sameLine && - (dist < 0 ? currentChunk.verticallyOverlaps(chr) : dist < wordSpacing)) { + sameLine && + (dist < 0 ? currentChunk.verticallyOverlaps(chr) : dist < wordSpacing)) { currentChunk.add(chr); + } else { // create a new chunk + textChunks.add(new TextChunk(chr)); } - else { // create a new chunk - textChunks.add(new TextChunk(chr)); - } - + lastWordSpacing = wordSpacing; previousAveCharWidth = (float) (sp != null ? (averageCharWidth + sp.getWidth()) / 2.0f : averageCharWidth); } - // System.out.println("before grouping"); - // for(TextChunk q : textChunks){ - // System.out.println("'" + q.getText() + "'"); - // } List textChunksSeparatedByDirectionality = new ArrayList(); // count up characters by directionality for (TextChunk chunk : textChunks) { // choose the dominant direction - // System.out.println("beforegrouping: '" + chunk.getText() + "'"); boolean isLtrDominant = chunk.isLtrDominant() != -1; // treat neutral as LTR TextChunk dirChunk = chunk.groupByDirectionality(isLtrDominant); - textChunksSeparatedByDirectionality.add( dirChunk ); + textChunksSeparatedByDirectionality.add(dirChunk); } - // System.out.println("after grouping"); - // for(TextChunk q : textChunksSeparatedByDirectionality){ - // System.out.println("after grouping: '" + q.getText() + "'"); - // } + return textChunksSeparatedByDirectionality; } - + private static boolean verticallyOverlapsRuling(TextElement te, Ruling r) { - // Utils.overlap(prevChar.getTop(), prevChar.getHeight(), r.getY1(), r.getY2() - r.getY1()) return Math.max(0, Math.min(te.getBottom(), r.getY2()) - Math.max(te.getTop(), r.getY1())) > 0; } - + } diff --git a/src/main/java/technology/tabula/Utils.java b/src/main/java/technology/tabula/Utils.java index 6a71d094..1f04a4c2 100644 --- a/src/main/java/technology/tabula/Utils.java +++ b/src/main/java/technology/tabula/Utils.java @@ -4,13 +4,18 @@ import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; +import java.io.IOException; import java.math.BigDecimal; import java.util.*; import org.apache.commons.cli.ParseException; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.rendering.ImageType; +import org.apache.pdfbox.rendering.PDFRenderer; /** - * * @author manuel */ public class Utils { @@ -19,7 +24,7 @@ public static boolean within(double first, double second, double variance) { } public static boolean overlap(double y1, double height1, double y2, double height2, double variance) { - return within( y1, y2, variance) || (y2 <= y1 && y2 >= y1 - height1) || (y1 <= y2 && y1 >= y2-height2); + return within(y1, y2, variance) || (y2 <= y1 && y2 >= y1 - height1) || (y1 <= y2 && y1 >= y2 - height2); } public static boolean overlap(double y1, double height1, double y2, double height2) { @@ -86,17 +91,15 @@ public static boolean isNumeric(final CharSequence cs) { return true; } - public static String join(String glue, String...s) { + public static String join(String glue, String... s) { int k = s.length; - if ( k == 0 ) - { - return null; + if (k == 0) { + return null; } StringBuilder out = new StringBuilder(); - out.append( s[0] ); - for ( int x=1; x < k; ++x ) - { - out.append(glue).append(s[x]); + out.append(s[0]); + for (int x = 1; x < k; ++x) { + out.append(glue).append(s[x]); } return out.toString(); } @@ -121,8 +124,7 @@ public static List> transpose(List> table) { public static > void sort(List list) { if (useQuickSort) { QuickSort.sort(list); - } - else { + } else { Collections.sort(list); } } @@ -134,16 +136,16 @@ private static boolean useCustomQuickSort() { // workaround to the transitivity issue of TextPositionComparator: // https://issues.apache.org/jira/browse/PDFBOX-1512 - String numberybits = System.getProperty("java.version").split( + String numberybits = System.getProperty("java.version").split( "-")[0]; // some Java version strings are 9-internal, which is dumb. String[] versionComponents = numberybits.split( "\\."); int javaMajorVersion; int javaMinorVersion; - if(versionComponents.length >= 2){ + if (versionComponents.length >= 2) { javaMajorVersion = Integer.parseInt(versionComponents[0]); javaMinorVersion = Integer.parseInt(versionComponents[1]); - }else{ + } else { javaMajorVersion = 1; javaMinorVersion = Integer.parseInt(versionComponents[0]); } @@ -153,7 +155,6 @@ private static boolean useCustomQuickSort() { } - public static List parsePagesOption(String pagesSpec) throws ParseException { if (pagesSpec.equals("all")) { return null; @@ -170,14 +171,13 @@ public static List parsePagesOption(String pagesSpec) throws ParseExcep if (r.length < 2) { rv.add(Integer.parseInt(r[0])); - } - else { + } else { int t = Integer.parseInt(r[0]); int f = Integer.parseInt(r[1]); if (t > f) { throw new ParseException("Syntax error in page range specification"); } - rv.addAll(Utils.range(t, f+1)); + rv.addAll(Utils.range(t, f + 1)); } } @@ -190,10 +190,10 @@ public static void snapPoints(List rulings, float xThres // collect points and keep a Line -> p1,p2 map Map linesToPoints = new HashMap(); List points = new ArrayList(); - for (Line2D.Float r: rulings) { + for (Line2D.Float r : rulings) { Point2D p1 = r.getP1(); Point2D p2 = r.getP2(); - linesToPoints.put(r, new Point2D[] { p1, p2 }); + linesToPoints.put(r, new Point2D[]{p1, p2}); points.add(p1); points.add(p2); } @@ -207,25 +207,24 @@ public int compare(Point2D arg0, Point2D arg1) { }); List> groupedPoints = new ArrayList>(); - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[] { points.get(0) }))); + groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{points.get(0)}))); - for (Point2D p: points.subList(1, points.size() - 1)) { + for (Point2D p : points.subList(1, points.size() - 1)) { List last = groupedPoints.get(groupedPoints.size() - 1); if (Math.abs(p.getX() - last.get(0).getX()) < xThreshold) { groupedPoints.get(groupedPoints.size() - 1).add(p); - } - else { - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[] { p }))); + } else { + groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{p}))); } } - for(List group: groupedPoints) { + for (List group : groupedPoints) { float avgLoc = 0; - for(Point2D p: group) { + for (Point2D p : group) { avgLoc += p.getX(); } avgLoc /= group.size(); - for(Point2D p: group) { + for (Point2D p : group) { p.setLocation(avgLoc, p.getY()); } } @@ -240,34 +239,48 @@ public int compare(Point2D arg0, Point2D arg1) { }); groupedPoints = new ArrayList>(); - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[] { points.get(0) }))); + groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{points.get(0)}))); - for (Point2D p: points.subList(1, points.size() - 1)) { + for (Point2D p : points.subList(1, points.size() - 1)) { List last = groupedPoints.get(groupedPoints.size() - 1); if (Math.abs(p.getY() - last.get(0).getY()) < yThreshold) { groupedPoints.get(groupedPoints.size() - 1).add(p); - } - else { - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[] { p }))); + } else { + groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{p}))); } } - for(List group: groupedPoints) { + for (List group : groupedPoints) { float avgLoc = 0; - for(Point2D p: group) { + for (Point2D p : group) { avgLoc += p.getY(); } avgLoc /= group.size(); - for(Point2D p: group) { + for (Point2D p : group) { p.setLocation(p.getX(), avgLoc); } } // --- // finally, modify lines - for(Map.Entry ltp: linesToPoints.entrySet()) { + for (Map.Entry ltp : linesToPoints.entrySet()) { Point2D[] p = ltp.getValue(); ltp.getKey().setLine(p[0], p[1]); } } + + public static BufferedImage pageConvertToImage(PDPage page, int dpi, ImageType imageType) throws IOException { + // Yeah, this sucks. But PDFBox 2 wants PDFRenderers to have + // a reference to a PDDocument (unnecessarily, IMHO) + + PDDocument document = new PDDocument(); + document.addPage(page); + + PDFRenderer renderer = new PDFRenderer(document); + + document.close(); + + return renderer.renderImageWithDPI(0, dpi, imageType); + } + } diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index f6d808e7..ed1df566 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -39,62 +39,64 @@ import org.apache.commons.cli.ParseException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; -import org.apache.pdfbox.util.ImageIOUtil; +import org.apache.pdfbox.rendering.ImageType; +import org.apache.pdfbox.tools.imageio.ImageIOUtil; public class Debug { - + private static final float CIRCLE_RADIUS = 5f; - - private static final Color[] COLORS = { new Color(27, 158, 119), - new Color(217, 95, 2), new Color(117, 112, 179), - new Color(231, 41, 138), new Color(102, 166, 30) }; + + private static final Color[] COLORS = {new Color(27, 158, 119), new Color(217, 95, 2), new Color(117, 112, 179), + new Color(231, 41, 138), new Color(102, 166, 30)}; public static void debugIntersections(Graphics2D g, Page page) { int i = 0; - for (Point2D p: Ruling.findIntersections(page.getHorizontalRulings(), page.getVerticalRulings()).keySet()) { + for (Point2D p : Ruling.findIntersections(page.getHorizontalRulings(), page.getVerticalRulings()).keySet()) { g.setColor(COLORS[(i++) % 5]); - g.fill(new Ellipse2D.Float((float) p.getX() - CIRCLE_RADIUS/2f, (float) p.getY() - CIRCLE_RADIUS/2f, 5f, 5f)); + g.fill(new Ellipse2D.Float((float) p.getX() - CIRCLE_RADIUS / 2f, (float) p.getY() - CIRCLE_RADIUS / 2f, 5f, + 5f)); } } - + private static void debugNonCleanRulings(Graphics2D g, Page page) { drawShapes(g, page.getUnprocessedRulings()); } - + private static void debugRulings(Graphics2D g, Page page) { // draw detected lines List rulings = new ArrayList(page.getHorizontalRulings()); rulings.addAll(page.getVerticalRulings()); drawShapes(g, rulings); } - + private static void debugColumns(Graphics2D g, Page page) { List textChunks = TextElement.mergeWords(page.getText()); List lines = TextChunk.groupByLines(textChunks); List columns = BasicExtractionAlgorithm.columnPositions(lines); int i = 0; - for(float p: columns) { - Ruling r = new Ruling(new Point2D.Float(p, (float) page.getTop()), new Point2D.Float(p, (float) page.getBottom())); + for (float p : columns) { + Ruling r = new Ruling(new Point2D.Float(p, (float) page.getTop()), + new Point2D.Float(p, (float) page.getBottom())); g.setColor(COLORS[(i++) % 5]); drawShape(g, r); } } - + private static void debugCharacters(Graphics2D g, Page page) { drawShapes(g, page.getText()); } - + private static void debugTextChunks(Graphics2D g, Page page) { List chunks = TextElement.mergeWords(page.getText(), page.getVerticalRulings()); drawShapes(g, chunks); } - + private static void debugSpreadsheets(Graphics2D g, Page page) { SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); List tables = sea.extract(page); drawShapes(g, tables); } - + private static void debugCells(Graphics2D g, Rectangle area, Page page) { List h = page.getHorizontalRulings(); List v = page.getVerticalRulings(); @@ -102,7 +104,6 @@ private static void debugCells(Graphics2D g, Rectangle area, Page page) { h = Ruling.cropRulingsToArea(h, area); v = Ruling.cropRulingsToArea(v, area); } - SpreadsheetExtractionAlgorithm ea = new SpreadsheetExtractionAlgorithm(); List cells = SpreadsheetExtractionAlgorithm.findCells(h, v); drawShapes(g, cells); } @@ -112,54 +113,56 @@ private static void debugDetectedTables(Graphics2D g, Page page) { List tables = detectionAlgorithm.detect(page); drawShapes(g, tables); } - + private static void drawShapes(Graphics2D g, Collection shapes, Stroke stroke) { int i = 0; g.setStroke(stroke); - for (Shape s: shapes) { + for (Shape s : shapes) { g.setColor(COLORS[(i++) % 5]); drawShape(g, s); } } - + private static void drawShapes(Graphics2D g, Collection shapes) { drawShapes(g, shapes, new BasicStroke(2f)); } - + private static void debugProjectionProfile(Graphics2D g, Page page) { float horizSmoothKernel = 0, vertSmoothKernel = 0; - //for (Rectangle r: page.getText()) { - for (Rectangle r: page.getText()) { + // for (Rectangle r: page.getText()) { + for (Rectangle r : page.getText()) { horizSmoothKernel += r.getWidth(); vertSmoothKernel += r.getHeight(); } horizSmoothKernel /= page.getText().size(); vertSmoothKernel /= page.getText().size(); System.out.println("hsk: " + horizSmoothKernel + " vsk: " + vertSmoothKernel); - //ProjectionProfile profile = new ProjectionProfile(page, page.getText(), horizSmoothKernel, vertSmoothKernel); - ProjectionProfile profile = new ProjectionProfile(page, TextElement.mergeWords(page.getText(), page.getVerticalRulings()), horizSmoothKernel * 1.5f, vertSmoothKernel); + // ProjectionProfile profile = new ProjectionProfile(page, + // page.getText(), horizSmoothKernel, vertSmoothKernel); + ProjectionProfile profile = new ProjectionProfile(page, + TextElement.mergeWords(page.getText(), page.getVerticalRulings()), horizSmoothKernel * 1.5f, + vertSmoothKernel); float prec = (float) Math.pow(10, ProjectionProfile.DECIMAL_PLACES); - float[] hproj = profile.getHorizontalProjection(); float[] vproj = profile.getVerticalProjection(); - + g.setStroke(new BasicStroke(1f)); g.setColor(Color.RED); // hproj - //Point2D last = new Point2D.Double(page.getLeft(), page.getBottom() - hproj[0] / prec), cur; + // Point2D last = new Point2D.Double(page.getLeft(), page.getBottom() - + // hproj[0] / prec), cur; Point2D last = new Point2D.Double(page.getLeft(), page.getBottom()), cur; for (int i = 0; i < hproj.length; i++) { cur = new Point2D.Double(page.getLeft() + i / prec, page.getBottom() - hproj[i]); g.draw(new Line2D.Double(last, cur)); last = cur; } - + // hproj first derivative g.setColor(Color.BLUE); - float[] deriv = ProjectionProfile.filter(ProjectionProfile - .getFirstDeriv(profile.getHorizontalProjection()), + float[] deriv = ProjectionProfile.filter(ProjectionProfile.getFirstDeriv(profile.getHorizontalProjection()), 0.01f); last = new Point2D.Double(page.getLeft(), page.getBottom()); for (int i = 0; i < deriv.length; i++) { @@ -167,7 +170,7 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { g.draw(new Line2D.Double(last, cur)); last = cur; } - + // columns g.setColor(Color.MAGENTA); g.setStroke(new BasicStroke(1f)); @@ -176,7 +179,7 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { float x = (float) (page.getLeft() + seps[i]); g.draw(new Line2D.Double(x, page.getTop(), x, page.getBottom())); } - + // vproj g.setStroke(new BasicStroke(1f)); g.setColor(Color.GREEN); @@ -186,7 +189,7 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { g.draw(new Line2D.Double(last, cur)); last = cur; } - + // vproj first derivative g.setColor(new Color(0, 0, 1, 0.5f)); deriv = ProjectionProfile.filter(ProjectionProfile.getFirstDeriv(vproj), 0.1f); @@ -196,7 +199,7 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { g.draw(new Line2D.Double(last, cur)); last = cur; } - + // rows g.setStroke(new BasicStroke(1.5f)); seps = profile.findHorizontalSeparators(vertSmoothKernel); @@ -204,38 +207,35 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { float y = (float) (page.getTop() + seps[i]); g.draw(new Line2D.Double(page.getLeft(), y, page.getRight(), y)); } - + } - + private static void drawShape(Graphics2D g, Shape shape) { //g.setStroke(new BasicStroke(1)); g.draw(shape); } public static void renderPage(String pdfPath, String outPath, int pageNumber, Rectangle area, - boolean drawTextChunks, boolean drawSpreadsheets, boolean drawRulings, boolean drawIntersections, - boolean drawColumns, boolean drawCharacters, boolean drawArea, boolean drawCells, - boolean drawUnprocessedRulings, boolean drawProjectionProfile, boolean drawClippingPaths, - boolean drawDetectedTables) throws IOException { - PDDocument document = PDDocument.load(pdfPath); - - ObjectExtractor oe = new ObjectExtractor(document, true); - + boolean drawTextChunks, boolean drawSpreadsheets, boolean drawRulings, boolean drawIntersections, + boolean drawColumns, boolean drawCharacters, boolean drawArea, boolean drawCells, + boolean drawUnprocessedRulings, boolean drawProjectionProfile, boolean drawClippingPaths, + boolean drawDetectedTables) throws IOException { + PDDocument document = PDDocument.load(new File(pdfPath)); + + ObjectExtractor oe = new ObjectExtractor(document); + Page page = oe.extract(pageNumber + 1); - + if (area != null) { page = page.getArea(area); } - - PDPage p = (PDPage) document.getDocumentCatalog().getAllPages().get(pageNumber); - -// PDFRenderer renderer = new PDFRenderer(document); -// BufferedImage image = renderer.renderImage(pageNumber); - - BufferedImage image = p.convertToImage(BufferedImage.TYPE_INT_RGB, 72); - + + PDPage p = (PDPage) document.getPage(pageNumber); + + BufferedImage image = Utils.pageConvertToImage(p, 72, ImageType.RGB); + Graphics2D g = (Graphics2D) image.getGraphics(); - + if (drawTextChunks) { debugTextChunks(g, page); } @@ -268,21 +268,23 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re debugProjectionProfile(g, page); } if (drawClippingPaths) { - drawShapes(g, oe.clippingPaths, new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, new float[] { 3f }, 0f)); + // TODO: Enable when oe.clippingPaths is done + //drawShapes(g, oe.clippingPaths, + // new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, new float[] { 3f }, 0f)); } if (drawDetectedTables) { debugDetectedTables(g, page); } document.close(); - + ImageIOUtil.writeImage(image, outPath, 72); } - + @SuppressWarnings("static-access") private static Options buildOptions() { Options o = new Options(); - + o.addOption("h", "help", false, "Print this help text."); o.addOption("r", "rulings", false, "Show detected rulings."); o.addOption("i", "intersections", false, "Show intersections between rulings."); @@ -298,50 +300,46 @@ private static Options buildOptions() { o.addOption("d", "detected-tables", false, "Show detected tables"); o.addOption(OptionBuilder.withLongOpt("area") - .withDescription("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") - .hasArg() - .withArgName("AREA") - .create("a")); + .withDescription( + "Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") + .hasArg().withArgName("AREA").create("a")); o.addOption(OptionBuilder.withLongOpt("pages") - .withDescription("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") - .hasArg() - .withArgName("PAGES") - .create("p")); + .withDescription( + "Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") + .hasArg().withArgName("PAGES").create("p")); return o; } - - + public static void main(String[] args) throws IOException { CommandLineParser parser = new GnuParser(); try { // parse the command line arguments - CommandLine line = parser.parse(buildOptions(), args ); + CommandLine line = parser.parse(buildOptions(), args); List pages = new ArrayList(); if (line.hasOption('p')) { pages = Utils.parsePagesOption(line.getOptionValue('p')); - } - else { + } else { pages.add(1); } - + if (line.hasOption('h')) { printHelp(); System.exit(0); } - + if (line.getArgs().length != 1) { throw new ParseException("Need one filename\nTry --help for help"); } - + File pdfFile = new File(line.getArgs()[0]); if (!pdfFile.exists()) { throw new ParseException("File does not exist"); } - + if (line.hasOption('g') && !line.hasOption('a')) { throw new ParseException("-g argument needs an area (-a)"); } - + Rectangle area = null; if (line.hasOption('a')) { List f = CommandLineApp.parseFloatList(line.getOptionValue('a')); @@ -353,7 +351,7 @@ public static void main(String[] args) throws IOException { if (pages == null) { // user specified all pages - PDDocument document = PDDocument.load(pdfFile.getAbsolutePath()); + PDDocument document = PDDocument.load(pdfFile); int numPages = document.getNumberOfPages(); pages = new ArrayList(numPages); @@ -364,39 +362,26 @@ public static void main(String[] args) throws IOException { document.close(); } - - for (int i: pages) { + + for (int i : pages) { renderPage(pdfFile.getAbsolutePath(), - new File(pdfFile.getParent(), removeExtension(pdfFile.getName()) + "-" + (i) + ".jpg").getAbsolutePath(), - i-1, - area, - line.hasOption('t'), - line.hasOption('s'), - line.hasOption('r'), - line.hasOption('i'), - line.hasOption('c'), - line.hasOption('e'), - line.hasOption('g'), - line.hasOption('l'), - line.hasOption('u'), - line.hasOption('f'), - line.hasOption('n'), - line.hasOption('d')); + new File(pdfFile.getParent(), removeExtension(pdfFile.getName()) + "-" + (i) + ".jpg") + .getAbsolutePath(), + i - 1, area, line.hasOption('t'), line.hasOption('s'), line.hasOption('r'), line.hasOption('i'), + line.hasOption('c'), line.hasOption('e'), line.hasOption('g'), line.hasOption('l'), + line.hasOption('u'), line.hasOption('f'), line.hasOption('n'), line.hasOption('d')); } - } - catch (ParseException e) { + } catch (ParseException e) { System.err.println("Error: " + e.getMessage()); System.exit(1); - } + } } - - private static void printHelp() { HelpFormatter formatter = new HelpFormatter(); formatter.printHelp("tabula-debug", "Generate debugging images", buildOptions(), "", true); } - + private static String removeExtension(String s) { String separator = System.getProperty("file.separator"); @@ -417,8 +402,4 @@ private static String removeExtension(String s) { return filename.substring(0, extensionIndex); } - - - - } diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index a19669bf..69f50c9d 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -1,26 +1,42 @@ package technology.tabula.detectors; +import java.awt.geom.Line2D; +import java.awt.geom.Point2D; +import java.awt.image.BufferedImage; +import java.awt.image.Raster; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.pdfbox.contentstream.operator.Operator; +import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdfparser.PDFStreamParser; import org.apache.pdfbox.pdfwriter.ContentStreamWriter; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDStream; -import org.apache.pdfbox.util.PDFOperator; -import technology.tabula.*; +import org.apache.pdfbox.rendering.ImageType; + +import technology.tabula.Line; +import technology.tabula.Page; import technology.tabula.Rectangle; +import technology.tabula.Ruling; +import technology.tabula.TextChunk; +import technology.tabula.TextElement; +import technology.tabula.Utils; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; -import java.awt.geom.Line2D; -import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; -import java.awt.image.Raster; -import java.io.IOException; -import java.util.*; -import java.util.List; - /** * Created by matt on 2015-12-17. - * + *

* Attempt at an implementation of the table finding algorithm described by * Anssi Nurminen's master's thesis: * http://dspace.cc.tut.fi/dpub/bitstream/handle/123456789/21520/Nurminen.pdf?sequence=3 @@ -90,7 +106,7 @@ public List detect(Page page) { BufferedImage image; PDPage pdfPage = page.getPDPage(); try { - image = pdfPage.convertToImage(BufferedImage.TYPE_BYTE_GRAY, 144); + image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); } catch (IOException e) { return new ArrayList(); } @@ -98,11 +114,21 @@ public List detect(Page page) { List horizontalRulings = this.getHorizontalRulings(image); // now check the page for vertical lines, but remove the text first to make things less confusing + PDDocument removeTextDocument = null; try { - this.removeText(pdfPage); - image = pdfPage.convertToImage(BufferedImage.TYPE_BYTE_GRAY, 144); + removeTextDocument = this.removeText(pdfPage); + image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); } catch (Exception e) { return new ArrayList(); + } finally { + if (removeTextDocument != null) { + try { + removeTextDocument.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } List verticalRulings = this.getVerticalRulings(image); @@ -119,7 +145,7 @@ public List detect(Page page) { // normalize the rulings to make sure snapping didn't create any wacky non-horizontal/vertical rulings for (List rulings : Arrays.asList(horizontalRulings, verticalRulings)) { - for (Iterator iterator = rulings.iterator(); iterator.hasNext();) { + for (Iterator iterator = rulings.iterator(); iterator.hasNext(); ) { Ruling ruling = iterator.next(); ruling.normalize(); @@ -150,8 +176,8 @@ public List detect(Page page) { if (verticalRuling.intersects(tableArea) && !(tableArea.contains(verticalRuling.getP1()) && tableArea.contains(verticalRuling.getP2()))) { - tableArea.setTop((float)Math.floor(Math.min(tableArea.getTop(), verticalRuling.getY1()))); - tableArea.setBottom((float)Math.ceil(Math.max(tableArea.getBottom(), verticalRuling.getY2()))); + tableArea.setTop((float) Math.floor(Math.min(tableArea.getTop(), verticalRuling.getY1()))); + tableArea.setBottom((float) Math.ceil(Math.max(tableArea.getBottom(), verticalRuling.getY2()))); break; } } @@ -160,18 +186,18 @@ public List detect(Page page) { // the tabula Page coordinate space is half the size of the PDFBox image coordinate space // so halve the table area size before proceeding and add a bit of padding to make sure we capture everything for (Rectangle area : tableAreas) { - area.x = (float)Math.floor(area.x/2) - TABLE_PADDING_AMOUNT; - area.y = (float)Math.floor(area.y/2) - TABLE_PADDING_AMOUNT; - area.width = (float)Math.ceil(area.width/2) + TABLE_PADDING_AMOUNT; - area.height = (float)Math.ceil(area.height/2) + TABLE_PADDING_AMOUNT; + area.x = (float) Math.floor(area.x / 2) - TABLE_PADDING_AMOUNT; + area.y = (float) Math.floor(area.y / 2) - TABLE_PADDING_AMOUNT; + area.width = (float) Math.ceil(area.width / 2) + TABLE_PADDING_AMOUNT; + area.height = (float) Math.ceil(area.height / 2) + TABLE_PADDING_AMOUNT; } // we're going to want halved horizontal lines later too for (Line2D.Float ruling : horizontalRulings) { - ruling.x1 = ruling.x1/2; - ruling.y1 = ruling.y1/2; - ruling.x2 = ruling.x2/2; - ruling.y2 = ruling.y2/2; + ruling.x1 = ruling.x1 / 2; + ruling.y1 = ruling.y1 / 2; + ruling.x2 = ruling.x2 / 2; + ruling.y2 = ruling.y2 / 2; } // now look at text rows to help us find more tables and flesh out existing ones @@ -182,14 +208,14 @@ public List detect(Page page) { for (Line textRow : lines) { for (Rectangle tableArea : tableAreas) { if (!tableArea.contains(textRow) && textRow.intersects(tableArea)) { - tableArea.setLeft((float)Math.floor(Math.min(textRow.getLeft(), tableArea.getLeft()))); - tableArea.setRight((float)Math.ceil(Math.max(textRow.getRight(), tableArea.getRight()))); + tableArea.setLeft((float) Math.floor(Math.min(textRow.getLeft(), tableArea.getLeft()))); + tableArea.setRight((float) Math.ceil(Math.max(textRow.getRight(), tableArea.getRight()))); } } } // get rid of tables that DO NOT intersect any text areas - these are likely graphs or some sort of graphic - for (Iterator iterator = tableAreas.iterator(); iterator.hasNext();) { + for (Iterator iterator = tableAreas.iterator(); iterator.hasNext(); ) { Rectangle table = iterator.next(); boolean intersectsText = false; @@ -219,7 +245,7 @@ public List detect(Page page) { foundTable = false; // get rid of any text lines contained within existing tables, this allows us to find more tables - for (Iterator iterator = lines.iterator(); iterator.hasNext();) { + for (Iterator iterator = lines.iterator(); iterator.hasNext(); ) { Line textRow = iterator.next(); for (Rectangle table : tableAreas) { if (table.contains(textRow)) { @@ -241,7 +267,7 @@ public List detect(Page page) { // we found something relevant so let's look for rows that fit our criteria if (relevantEdgeInfo.edgeType != -1) { List relevantEdges = null; - switch(relevantEdgeInfo.edgeType) { + switch (relevantEdgeInfo.edgeType) { case TextEdge.LEFT: relevantEdges = leftTextEdges; break; @@ -275,6 +301,10 @@ public int compare(Rectangle o1, Rectangle o2) { return 0; } + if (o1.contains(o2)) { + return 0; + } + // otherwise see if these tables are "mostly" the same float overlap = o1.overlapRatio(o2); if (overlap >= IDENTICAL_TABLE_OVERLAP_RATIO) { @@ -388,12 +418,12 @@ private Rectangle getTableFromText(List lines, continue; } - float distanceFromTable = (float)ruling.getY1() - table.getBottom(); + float distanceFromTable = (float) ruling.getY1() - table.getBottom(); if (distanceFromTable <= rowHeightThreshold) { // use this ruling to help define the table - table.setBottom((float)Math.max(table.getBottom(), ruling.getY1())); - table.setLeft((float)Math.min(table.getLeft(), ruling.getX1())); - table.setRight((float)Math.max(table.getRight(), ruling.getX2())); + table.setBottom((float) Math.max(table.getBottom(), ruling.getY1())); + table.setLeft((float) Math.min(table.getLeft(), ruling.getX1())); + table.setRight((float) Math.max(table.getRight(), ruling.getX2())); } else { // no use checking any further break; @@ -402,30 +432,30 @@ private Rectangle getTableFromText(List lines, // do the same for lines at the top, but make the threshold greater since table headings tend to be // larger to fit up to three-ish rows of text (at least but we don't want to grab too much) - rowHeightThreshold = avgRowHeight * 3.5f; + rowHeightThreshold = avgRowHeight * 3.8f; - for (int i=horizontalRulings.size() - 1; i>=0; i--) { + for (int i = horizontalRulings.size() - 1; i >= 0; i--) { Line2D.Float ruling = horizontalRulings.get(i); if (ruling.getY1() > table.getTop()) { continue; } - float distanceFromTable = table.getTop() - (float)ruling.getY1(); + float distanceFromTable = table.getTop() - (float) ruling.getY1(); if (distanceFromTable <= rowHeightThreshold) { - table.setTop((float)Math.min(table.getTop(), ruling.getY1())); - table.setLeft((float)Math.min(table.getLeft(), ruling.getX1())); - table.setRight((float)Math.max(table.getRight(), ruling.getX2())); + table.setTop((float) Math.min(table.getTop(), ruling.getY1())); + table.setLeft((float) Math.min(table.getLeft(), ruling.getX1())); + table.setRight((float) Math.max(table.getRight(), ruling.getX2())); } else { break; } } // add a bit of padding since the halved horizontal lines are a little fuzzy anyways - table.setTop((float)Math.floor(table.getTop()) - TABLE_PADDING_AMOUNT); - table.setBottom((float)Math.ceil(table.getBottom()) + TABLE_PADDING_AMOUNT); - table.setLeft((float)Math.floor(table.getLeft()) - TABLE_PADDING_AMOUNT); - table.setRight((float)Math.ceil(table.getRight()) + TABLE_PADDING_AMOUNT); + table.setTop((float) Math.floor(table.getTop()) - TABLE_PADDING_AMOUNT); + table.setBottom((float) Math.ceil(table.getBottom()) + TABLE_PADDING_AMOUNT); + table.setLeft((float) Math.floor(table.getLeft()) - TABLE_PADDING_AMOUNT); + table.setRight((float) Math.ceil(table.getRight()) + TABLE_PADDING_AMOUNT); return table; } @@ -454,7 +484,7 @@ private RelevantEdges getRelevantEdges(TextEdges textEdges, List lines) { // we'll only take a minimum of two edges to look for tables int relevantEdgeType = -1; int relevantEdgeCount = 0; - for (int i=edgeCountsPerLine.length - 1; i>2; i--) { + for (int i = edgeCountsPerLine.length - 1; i > 2; i--) { if (edgeCountsPerLine[i][TextEdge.LEFT] > 2 && edgeCountsPerLine[i][TextEdge.LEFT] >= edgeCountsPerLine[i][TextEdge.RIGHT] && edgeCountsPerLine[i][TextEdge.LEFT] >= edgeCountsPerLine[i][TextEdge.MID]) { @@ -497,9 +527,9 @@ private TextEdges getTextEdges(List lines) { for (Line textRow : lines) { for (TextChunk text : textRow.getTextElements()) { - Integer left = new Integer((int)Math.floor(text.getLeft())); - Integer right = new Integer((int)Math.floor(text.getRight())); - Integer mid = new Integer(left + ((right - left)/2)); + Integer left = new Integer((int) Math.floor(text.getLeft())); + Integer right = new Integer((int) Math.floor(text.getRight())); + Integer mid = new Integer(left + ((right - left) / 2)); // first put this chunk into any edge buckets it belongs to List leftEdge = currLeftEdges.get(left); @@ -524,7 +554,7 @@ private TextEdges getTextEdges(List lines) { rightEdge.add(text); // now see if this text chunk blows up any other edges - for (Iterator>> iterator = currLeftEdges.entrySet().iterator(); iterator.hasNext();) { + for (Iterator>> iterator = currLeftEdges.entrySet().iterator(); iterator.hasNext(); ) { Map.Entry> entry = iterator.next(); Integer key = entry.getKey(); if (key > left && key < right) { @@ -542,7 +572,7 @@ private TextEdges getTextEdges(List lines) { } } - for (Iterator>> iterator = currMidEdges.entrySet().iterator(); iterator.hasNext();) { + for (Iterator>> iterator = currMidEdges.entrySet().iterator(); iterator.hasNext(); ) { Map.Entry> entry = iterator.next(); Integer key = entry.getKey(); if (key > left && key < right && Math.abs(key - mid) > 2) { @@ -560,7 +590,7 @@ private TextEdges getTextEdges(List lines) { } } - for (Iterator>> iterator = currRightEdges.entrySet().iterator(); iterator.hasNext();) { + for (Iterator>> iterator = currRightEdges.entrySet().iterator(); iterator.hasNext(); ) { Map.Entry> entry = iterator.next(); Integer key = entry.getKey(); if (key > left && key < right) { @@ -634,8 +664,8 @@ private List getTableAreasFromCells(List cells) Point2D[] groupCellCorners = groupCell.getPoints(); Point2D[] candidateCorners = cell.getPoints(); - for (int i=0; i getHorizontalRulings(BufferedImage image) { int width = r.getWidth(); int height = r.getHeight(); - for (int x=0; x GRAYSCALE_INTENSITY_THRESHOLD) { @@ -752,13 +782,13 @@ private List getVerticalRulings(BufferedImage image) { int width = r.getWidth(); int height = r.getHeight(); - for (int y=0; y GRAYSCALE_INTENSITY_THRESHOLD) { @@ -805,19 +835,19 @@ private List getVerticalRulings(BufferedImage image) { return verticalRulings; } - // taken from http://www.docjar.com/html/api/org/apache/pdfbox/examples/util/RemoveAllText.java.html - private void removeText(PDPage page) throws IOException { - PDFStreamParser parser = new PDFStreamParser(page.getContents()); - parser.parse(); - List tokens = parser.getTokens(); - List newTokens = new ArrayList(); + // taken from http://www.docjar.com/html/api/org/apache/pdfbox/examples/util/RemoveAllText.java.html + private PDDocument removeText(PDPage page) throws IOException { - for (int i=0; i tokens = parser.getTokens(); + List newTokens = new ArrayList(); + for (Object token : tokens) { + if (token instanceof Operator) { + Operator op = (Operator) token; + if (op.getName().equals("TJ") || op.getName().equals("Tj")) { + //remove the one argument to this operator newTokens.remove(newTokens.size() - 1); continue; } @@ -829,13 +859,13 @@ private void removeText(PDPage page) throws IOException { document.addPage(page); PDStream newContents = new PDStream(document); - ContentStreamWriter writer = new ContentStreamWriter(newContents.createOutputStream()); + OutputStream out = newContents.createOutputStream(COSName.FLATE_DECODE); + ContentStreamWriter writer = new ContentStreamWriter(out); writer.writeTokens(newTokens); - newContents.addCompression(); + out.close(); page.setContents(newContents); - try { - document.close(); - } catch (Exception e) {} + return document; + } } diff --git a/src/main/java/technology/tabula/writers/JSONWriter.java b/src/main/java/technology/tabula/writers/JSONWriter.java index 88b5c1f1..cf9a843b 100644 --- a/src/main/java/technology/tabula/writers/JSONWriter.java +++ b/src/main/java/technology/tabula/writers/JSONWriter.java @@ -15,9 +15,10 @@ import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; public class JSONWriter implements Writer { - + class TableSerializerExclusionStrategy implements ExclusionStrategy { @Override @@ -31,27 +32,32 @@ public boolean shouldSkipField(FieldAttributes fa) { } } - + final Gson gson; - + public JSONWriter() { gson = new GsonBuilder() - .addSerializationExclusionStrategy(new TableSerializerExclusionStrategy()) - .registerTypeAdapter(Table.class, new TableSerializer()) - .registerTypeAdapter(RectangularTextContainer.class, new TextChunkSerializer()) - .registerTypeAdapter(Cell.class, new TextChunkSerializer()) - .registerTypeAdapter(TextChunk.class, new TextChunkSerializer()) - .create(); + .addSerializationExclusionStrategy(new TableSerializerExclusionStrategy()) + .registerTypeAdapter(Table.class, new TableSerializer()) + .registerTypeAdapter(RectangularTextContainer.class, new TextChunkSerializer()) + .registerTypeAdapter(Cell.class, new TextChunkSerializer()) + .registerTypeAdapter(TextChunk.class, new TextChunkSerializer()) + .create(); } - + @Override public void write(Appendable out, Table table) throws IOException { - - out.append(gson.toJson(table, Table.class)); + + out.append(gson.toJson(table, Table.class)); } - + public void write(Appendable out, List

tables) throws IOException { - - out.append(gson.toJson(tables.toArray(), Table[].class)); + + JsonArray array = new JsonArray(); + for (Table table : tables) { + array.add(gson.toJsonTree(table, Table.class)); + } + out.append(gson.toJson(array)); + } } diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index 4c300fad..debd9fd1 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -26,139 +26,141 @@ public class TestBasicExtractor { private static final String[][] EXPECTED_CORRECT_COLUMNS = { - {"","","Involvement of pupils in","" }, - {"","Preperation and","Production of","Presentation an" }, - {"","planing","materials","evaluation" }, - {"Knowledge and awareness of different cultures","0,2885", - "0,3974","0,3904" }, - {"Foreign language competence","0,3057","0,4184","0,3899" }, - {"Social skills and abilities","0,3416","0,3369","0,4303" }, - {"Acquaintance of special knowledge","0,2569","0,2909", - "0,3557" }, - {"Self competence","0,3791","0,3320","0,4617" } }; + {"", "", "Involvement of pupils in", ""}, + {"", "Preperation and", "Production of", "Presentation an"}, + {"", "planing", "materials", "evaluation"}, + {"Knowledge and awareness of different cultures", "0,2885", + "0,3974", "0,3904"}, + {"Foreign language competence", "0,3057", "0,4184", "0,3899"}, + {"Social skills and abilities", "0,3416", "0,3369", "0,4303"}, + {"Acquaintance of special knowledge", "0,2569", "0,2909", + "0,3557"}, + {"Self competence", "0,3791", "0,3320", "0,4617"}}; private static final String[][] EXPECTED_COLUMN_RECOGNITION = { - { "ABDALA de MATARAZZO, Norma Amanda", - "Frente Cívico por Santiago","Santiago del Estero", - "AFIRMATIVO" }, + {"ABDALA de MATARAZZO, Norma Amanda", + "Frente Cívico por Santiago", "Santiago del Estero", + "AFIRMATIVO"}, {"ALBRIEU, Oscar Edmundo Nicolas", - "Frente para la Victoria - PJ","Rio Negro","AFIRMATIVO" }, - {"ALONSO, María Luz","Frente para la Victoria - PJ", - "La Pampa","AFIRMATIVO" }, - {"ARENA, Celia Isabel","Frente para la Victoria - PJ", - "Santa Fe","AFIRMATIVO" }, - {"ARREGUI, Andrés Roberto","Frente para la Victoria - PJ", - "Buenos Aires","AFIRMATIVO" }, - {"AVOSCAN, Herman Horacio","Frente para la Victoria - PJ", - "Rio Negro","AFIRMATIVO" }, - {"BALCEDO, María Ester","Frente para la Victoria - PJ", - "Buenos Aires","AFIRMATIVO" }, - {"BARRANDEGUY, Raúl Enrique","Frente para la Victoria - PJ", - "Entre Ríos","AFIRMATIVO" }, - {"BASTERRA, Luis Eugenio","Frente para la Victoria - PJ", - "Formosa","AFIRMATIVO" }, - {"BEDANO, Nora Esther","Frente para la Victoria - PJ", - "Córdoba","AFIRMATIVO" }, - {"BERNAL, María Eugenia","Frente para la Victoria - PJ", - "Jujuy","AFIRMATIVO" }, - {"BERTONE, Rosana Andrea","Frente para la Victoria - PJ", - "Tierra del Fuego","AFIRMATIVO" }, - {"BIANCHI, María del Carmen","Frente para la Victoria - PJ", - "Cdad. Aut. Bs. As.","AFIRMATIVO" }, - {"BIDEGAIN, Gloria Mercedes","Frente para la Victoria - PJ", - "Buenos Aires","AFIRMATIVO" }, - {"BRAWER, Mara","Frente para la Victoria - PJ", - "Cdad. Aut. Bs. As.","AFIRMATIVO" }, - {"BRILLO, José Ricardo","Movimiento Popular Neuquino", - "Neuquén","AFIRMATIVO" }, - {"BROMBERG, Isaac Benjamín","Frente para la Victoria - PJ", - "Tucumán","AFIRMATIVO" }, - {"BRUE, Daniel Agustín","Frente Cívico por Santiago", - "Santiago del Estero","AFIRMATIVO" }, - {"CALCAGNO, Eric","Frente para la Victoria - PJ", - "Buenos Aires","AFIRMATIVO" }, - {"CARLOTTO, Remo Gerardo","Frente para la Victoria - PJ", - "Buenos Aires","AFIRMATIVO" }, - {"CARMONA, Guillermo Ramón","Frente para la Victoria - PJ", - "Mendoza","AFIRMATIVO" }, - {"CATALAN MAGNI, Julio César","Frente para la Victoria - PJ", - "Tierra del Fuego","AFIRMATIVO" }, - {"CEJAS, Jorge Alberto","Frente para la Victoria - PJ", - "Rio Negro","AFIRMATIVO" }, - {"CHIENO, María Elena","Frente para la Victoria - PJ", - "Corrientes","AFIRMATIVO" }, - {"CIAMPINI, José Alberto","Frente para la Victoria - PJ", - "Neuquén","AFIRMATIVO" }, + "Frente para la Victoria - PJ", "Rio Negro", "AFIRMATIVO"}, + {"ALONSO, María Luz", "Frente para la Victoria - PJ", + "La Pampa", "AFIRMATIVO"}, + {"ARENA, Celia Isabel", "Frente para la Victoria - PJ", + "Santa Fe", "AFIRMATIVO"}, + {"ARREGUI, Andrés Roberto", "Frente para la Victoria - PJ", + "Buenos Aires", "AFIRMATIVO"}, + {"AVOSCAN, Herman Horacio", "Frente para la Victoria - PJ", + "Rio Negro", "AFIRMATIVO"}, + {"BALCEDO, María Ester", "Frente para la Victoria - PJ", + "Buenos Aires", "AFIRMATIVO"}, + {"BARRANDEGUY, Raúl Enrique", "Frente para la Victoria - PJ", + "Entre Ríos", "AFIRMATIVO"}, + {"BASTERRA, Luis Eugenio", "Frente para la Victoria - PJ", + "Formosa", "AFIRMATIVO"}, + {"BEDANO, Nora Esther", "Frente para la Victoria - PJ", + "Córdoba", "AFIRMATIVO"}, + {"BERNAL, María Eugenia", "Frente para la Victoria - PJ", + "Jujuy", "AFIRMATIVO"}, + {"BERTONE, Rosana Andrea", "Frente para la Victoria - PJ", + "Tierra del Fuego", "AFIRMATIVO"}, + {"BIANCHI, María del Carmen", "Frente para la Victoria - PJ", + "Cdad. Aut. Bs. As.", "AFIRMATIVO"}, + {"BIDEGAIN, Gloria Mercedes", "Frente para la Victoria - PJ", + "Buenos Aires", "AFIRMATIVO"}, + {"BRAWER, Mara", "Frente para la Victoria - PJ", + "Cdad. Aut. Bs. As.", "AFIRMATIVO"}, + {"BRILLO, José Ricardo", "Movimiento Popular Neuquino", + "Neuquén", "AFIRMATIVO"}, + {"BROMBERG, Isaac Benjamín", "Frente para la Victoria - PJ", + "Tucumán", "AFIRMATIVO"}, + {"BRUE, Daniel Agustín", "Frente Cívico por Santiago", + "Santiago del Estero", "AFIRMATIVO"}, + {"CALCAGNO, Eric", "Frente para la Victoria - PJ", + "Buenos Aires", "AFIRMATIVO"}, + {"CARLOTTO, Remo Gerardo", "Frente para la Victoria - PJ", + "Buenos Aires", "AFIRMATIVO"}, + {"CARMONA, Guillermo Ramón", "Frente para la Victoria - PJ", + "Mendoza", "AFIRMATIVO"}, + {"CATALAN MAGNI, Julio César", "Frente para la Victoria - PJ", + "Tierra del Fuego", "AFIRMATIVO"}, + {"CEJAS, Jorge Alberto", "Frente para la Victoria - PJ", + "Rio Negro", "AFIRMATIVO"}, + {"CHIENO, María Elena", "Frente para la Victoria - PJ", + "Corrientes", "AFIRMATIVO"}, + {"CIAMPINI, José Alberto", "Frente para la Victoria - PJ", + "Neuquén", "AFIRMATIVO"}, {"CIGOGNA, Luis Francisco Jorge", - "Frente para la Victoria - PJ","Buenos Aires", - "AFIRMATIVO" }, - {"CLERI, Marcos","Frente para la Victoria - PJ","Santa Fe", - "AFIRMATIVO" }, - {"COMELLI, Alicia Marcela","Movimiento Popular Neuquino", - "Neuquén","AFIRMATIVO" }, - {"CONTI, Diana Beatriz","Frente para la Victoria - PJ", - "Buenos Aires","AFIRMATIVO" }, - {"CORDOBA, Stella Maris","Frente para la Victoria - PJ", - "Tucumán","AFIRMATIVO" }, - {"CURRILEN, Oscar Rubén","Frente para la Victoria - PJ", - "Chubut","AFIRMATIVO" } }; - + "Frente para la Victoria - PJ", "Buenos Aires", + "AFIRMATIVO"}, + {"CLERI, Marcos", "Frente para la Victoria - PJ", "Santa Fe", + "AFIRMATIVO"}, + {"COMELLI, Alicia Marcela", "Movimiento Popular Neuquino", + "Neuquén", "AFIRMATIVO"}, + {"CONTI, Diana Beatriz", "Frente para la Victoria - PJ", + "Buenos Aires", "AFIRMATIVO"}, + {"CORDOBA, Stella Maris", "Frente para la Victoria - PJ", + "Tucumán", "AFIRMATIVO"}, + {"CURRILEN, Oscar Rubén", "Frente para la Victoria - PJ", + "Chubut", "AFIRMATIVO"}}; + private static final String[][] EXPECTED_COLUMN_EXTRACTION2 = { - {"","Austria","77","1","78"}, - {"","Belgium","159","2","161"}, - {"","Bulgaria","52","0","52"}, - {"","Croatia","144","0","144"}, - {"","Cyprus","43","2","45"}, - {"","Czech Republic","78","0","78"}, - {"","Denmark","151","2","153"}, - {"","Estonia","46","0","46"}, - {"","Finland","201","1","202"}, - {"","France","428","7","435"}, - {"","Germany","646","21","667"}, - {"","Greece","113","2","115"}, - {"","Hungary","187","0","187"}, - {"","Iceland","18","0","18"}, - {"","Ireland","213","4","217"}, - {"","Israel","25","0","25"}, - {"","Italy","627","12","639"}, - {"","Latvia","7","0","7"}, - {"","Lithuania","94","1","95"}, - {"","Luxembourg","22","0","22"}, - {"","Malta","18","0","18"}, - {"","Netherlands","104","1","105"}, - {"","Norway","195","0","195"}, - {"","Poland","120","1","121"}, - {"","Portugal","532","3","535"}, - {"","Romania","110","0","110"}, - {"","Slovakia","176","0","176"}, - {"","Slovenia","56","0","56"}, - {"","Spain","614","3","617"}, - {"","Sweden","122","3","125"}, - {"","Switzerland","64","0","64"}, - {"","Turkey","96","0","96"}, - {"","United Kingdom","572","14","586"} + {"", "Austria", "77", "1", "78"}, + {"", "Belgium", "159", "2", "161"}, + {"", "Bulgaria", "52", "0", "52"}, + {"", "Croatia", "144", "0", "144"}, + {"", "Cyprus", "43", "2", "45"}, + {"", "Czech Republic", "78", "0", "78"}, + {"", "Denmark", "151", "2", "153"}, + {"", "Estonia", "46", "0", "46"}, + {"", "Finland", "201", "1", "202"}, + {"", "France", "428", "7", "435"}, + {"", "Germany", "646", "21", "667"}, + {"", "Greece", "113", "2", "115"}, + {"", "Hungary", "187", "0", "187"}, + {"", "Iceland", "18", "0", "18"}, + {"", "Ireland", "213", "4", "217"}, + {"", "Israel", "25", "0", "25"}, + {"", "Italy", "627", "12", "639"}, + {"", "Latvia", "7", "0", "7"}, + {"", "Lithuania", "94", "1", "95"}, + {"", "Luxembourg", "22", "0", "22"}, + {"", "Malta", "18", "0", "18"}, + {"", "Netherlands", "104", "1", "105"}, + {"", "Norway", "195", "0", "195"}, + {"", "Poland", "120", "1", "121"}, + {"", "Portugal", "532", "3", "535"}, + {"", "Romania", "110", "0", "110"}, + {"", "Slovakia", "176", "0", "176"}, + {"", "Slovenia", "56", "0", "56"}, + {"", "Spain", "614", "3", "617"}, + {"", "Sweden", "122", "3", "125"}, + {"", "Switzerland", "64", "0", "64"}, + {"", "Turkey", "96", "0", "96"}, + {"", "United Kingdom", "572", "14", "586"} }; - + private static final String[][] EXPECTED_TABLE_EXTRACTION = { - {"AANONSEN, DEBORAH, A","","","STATEN ISLAND, NY","MEALS","$85.00"}, - {"TOTAL","","","","","$85.00"}, - {"AARON, CAREN, T","","","RICHMOND, VA","EDUCATIONAL ITEMS","$78.80"}, - {"AARON, CAREN, T","","","RICHMOND, VA","MEALS","$392.45"}, - {"TOTAL","","","","","$471.25"}, - {"AARON, JOHN","","","CLARKSVILLE, TN","MEALS","$20.39"}, - {"TOTAL","","","","","$20.39"}, - {"AARON, JOSHUA, N","","","WEST GROVE, PA","MEALS","$310.33"}, - {"AARON , JOSHUA , N","REGIONAL PULMONARY & SLEEPMEDICINE","","WEST GROVE, PA","SPEAKING FEES","$4,700.00"}, - {"TOTAL","","","","","$5,010.33"}, - {"AARON, MAUREEN, M","","","MARTINSVILLE, VA","MEALS","$193.67"}, - {"TOTAL","","","","","$193.67"}, - {"AARON, MICHAEL, L","","","WEST ISLIP, NY","MEALS","$19.50"}, - {"TOTAL","","","","","$19.50"}, - {"AARON, MICHAEL, R","","","BROOKLYN, NY","MEALS","$65.92"} - }; + {"AANONSEN, DEBORAH, A", "", "STATEN ISLAND, NY", "MEALS", "$85.00"}, + {"TOTAL", "", "", "", "$85.00"}, + {"AARON, CAREN, T", "", "RICHMOND, VA", "EDUCATIONAL ITEMS", "$78.80"}, + {"AARON, CAREN, T", "", "RICHMOND, VA", "MEALS", "$392.45"}, + {"TOTAL", "", "", "", "$471.25"}, + {"AARON, JOHN", "", "CLARKSVILLE, TN", "MEALS", "$20.39"}, + {"TOTAL", "", "", "", "$20.39"}, + {"AARON, JOSHUA, N", "", "WEST GROVE, PA", "MEALS", "$310.33"}, + {"", "REGIONAL PULMONARY & SLEEP", "", "", ""}, + {"AARON, JOSHUA, N", "", "WEST GROVE, PA", "SPEAKING FEES", "$4,700.00"}, + {"", "MEDICINE", "", "", ""}, + {"TOTAL", "", "", "", "$5,010.33"}, + {"AARON, MAUREEN, M", "", "MARTINSVILLE, VA", "MEALS", "$193.67"}, + {"TOTAL", "", "", "", "$193.67"}, + {"AARON, MICHAEL, L", "", "WEST ISLIP, NY", "MEALS", "$19.50"}, + {"TOTAL", "", "", "", "$19.50"}, + {"AARON, MICHAEL, R", "", "BROOKLYN, NY", "MEALS", "$65.92"} + }; private static final String[][] EXPECTED_EMPTY_TABLE = { - {""} + {""} }; @@ -185,11 +187,11 @@ public void testColumnRecognition() throws IOException { Table table = bea.extract(page).get(0); assertArrayEquals(EXPECTED_COLUMN_RECOGNITION, UtilsForTesting.tableToArrayOfRows(table)); } - + @Test public void testVerticalRulingsPreventMergingOfColumns() throws IOException { List rulings = new ArrayList(); - Float[] rulingsVerticalPositions = { 147f, 256f, 310f, 375f, 431f, 504f }; + Float[] rulingsVerticalPositions = {147f, 256f, 310f, 375f, 431f, 504f}; for (int i = 0; i < 6; i++) { rulings.add(new Ruling(255.57f, rulingsVerticalPositions[i], 0, 398.76f - 255.57f)); } @@ -214,7 +216,7 @@ public void testExtractColumnsCorrectly() throws IOException { Table table = bea.extract(page).get(0); assertArrayEquals(EXPECTED_CORRECT_COLUMNS, UtilsForTesting.tableToArrayOfRows(table)); } - + @Test public void testExtractColumnsCorrectly2() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/eu-017.pdf", 3); @@ -222,20 +224,20 @@ public void testExtractColumnsCorrectly2() throws IOException { Table table = bea.extract(page.getArea(299.625f, 148.44f, 711.875f, 452.32f)).get(0); assertArrayEquals(EXPECTED_COLUMN_EXTRACTION2, UtilsForTesting.tableToArrayOfRows(table)); } - + @Test public void testExtractColumnsCorrectly3() throws IOException { - Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/frx_2012_disclosure.pdf", + Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/frx_2012_disclosure.pdf", 106.01f, 48.09f, 227.31f, 551.89f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(EXPECTED_TABLE_EXTRACTION, UtilsForTesting.tableToArrayOfRows(table)); } - + @Test public void testCheckSqueezeDoesntBreak() throws IOException { - Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/12s0324.pdf", + Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/12s0324.pdf", 99.0f, 17.25f, 316.5f, 410.25f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); @@ -254,11 +256,11 @@ public void testNaturalOrderOfRectangles() throws IOException { BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm( page.getVerticalRulings()); Table table = bea.extract(page).get(0); - + List cells = table.getCells(); for (RectangularTextContainer rectangularTextContainer : cells) { - System.out.println(rectangularTextContainer.getText()); - } + System.out.println(rectangularTextContainer.getText()); + } //Column headers assertEquals("Project", cells.get(0).getText()); assertEquals("Agency", cells.get(1).getText()); @@ -268,7 +270,7 @@ public void testNaturalOrderOfRectangles() throws IOException { assertEquals("Nanotechnology and its publics", cells.get(3).getText()); assertEquals("NSF", cells.get(4).getText()); assertEquals("Pennsylvania State Universit", cells.get(5).getText()); - + //Second row assertEquals("Public information and deliberation in nanoscience and", cells.get(6).getText()); assertEquals("North Carolina State", cells.get(7).getText()); @@ -281,36 +283,36 @@ public void testNaturalOrderOfRectangles() throws IOException { assertEquals("NSF", cells.get(12).getText()); assertEquals("Michigan State University", cells.get(13).getText()); assertEquals("nanotechnology (NIRT)", cells.get(14).getText()); - + //Fourth row assertEquals("From laboratory to society: developing an informed", cells.get(15).getText()); assertEquals("NSF", cells.get(16).getText()); assertEquals("University of South Carolina", cells.get(17).getText()); assertEquals("approach to nanoscale science and engineering (NIRT)", cells.get(18).getText()); - + //Fifth row assertEquals("Database and innovation timeline for nanotechnology", cells.get(19).getText()); assertEquals("NSF", cells.get(20).getText()); assertEquals("UCLA", cells.get(21).getText()); - + //Sixth row assertEquals("Social and ethical dimensions of nanotechnology", cells.get(22).getText()); assertEquals("NSF", cells.get(23).getText()); assertEquals("University of Virginia", cells.get(24).getText()); - + //Seventh row assertEquals("Undergraduate exploration of nanoscience,", cells.get(25).getText()); assertEquals("Michigan Technological", cells.get(26).getText()); assertEquals("NSF", cells.get(27).getText()); assertEquals("applications and societal implications (NUE)", cells.get(28).getText()); assertEquals("University", cells.get(29).getText()); - + //Eighth row assertEquals("Ethics and belief inside the development of", cells.get(30).getText()); assertEquals("NSF", cells.get(31).getText()); assertEquals("University of Virginia", cells.get(32).getText()); assertEquals("nanotechnology (CAREER)", cells.get(33).getText()); - + //Ninth row assertEquals("All centers, NNIN and NCN have a societal", cells.get(34).getText()); assertEquals("NSF, DOE,", cells.get(35).getText()); @@ -318,9 +320,9 @@ public void testNaturalOrderOfRectangles() throws IOException { assertEquals("implications components", cells.get(37).getText()); assertEquals("DOD, and NIH", cells.get(38).getText()); assertEquals("and networks", cells.get(39).getText()); - + } - + @Test public void testNaturalOrderOfRectanglesOneMoreTime() throws IOException { CSVParser parse = org.apache.commons.csv.CSVParser.parse(new File("src/test/resources/technology/tabula/csv/TestBasicExtractor-RECTANGLE_TEST_NATURAL_ORDER.csv"), @@ -329,30 +331,30 @@ public void testNaturalOrderOfRectanglesOneMoreTime() throws IOException { List rectangles = new ArrayList(); - for (CSVRecord record: parse) { + for (CSVRecord record : parse) { rectangles.add(new Rectangle(Float.parseFloat(record.get(0)), Float.parseFloat(record.get(1)), Float.parseFloat(record.get(2)), Float.parseFloat(record.get(3)))); } - - //List rectangles = Arrays.asList(RECTANGLES_TEST_NATURAL_ORDER); - Utils.sort(rectangles); - - for (int i = 0; i < (rectangles.size() - 1); i++) { - Rectangle rectangle = rectangles.get(i); - Rectangle nextRectangle = rectangles.get(i + 1); - - assertTrue(rectangle.compareTo(nextRectangle) < 0); - } + + //List rectangles = Arrays.asList(RECTANGLES_TEST_NATURAL_ORDER); + Utils.sort(rectangles); + + for (int i = 0; i < (rectangles.size() - 1); i++) { + Rectangle rectangle = rectangles.get(i); + Rectangle nextRectangle = rectangles.get(i + 1); + + assertTrue(rectangle.compareTo(nextRectangle) < 0); + } } @Test public void testRealLifeRTL2() throws IOException { String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/indictb1h_14.csv"); Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/indictb1h_14.pdf", 1, - 205.0f, 120.0f, 622.82f, 459.9f); + 205.0f, 120.0f, 622.82f, 459.9f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); @@ -365,10 +367,24 @@ public void testRealLifeRTL2() throws IOException { @Test public void testEmptyRegion() throws IOException { Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/indictb1h_14.pdf", 1, - 0.0f, 0.0f, 80.82f, 100.9f); // an empty area + 0.0f, 0.0f, 80.82f, 100.9f); // an empty area BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(EXPECTED_EMPTY_TABLE, UtilsForTesting.tableToArrayOfRows(table)); } + + @Test + public void testTableWithMultilineHeader() throws IOException { + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/us-020.csv"); + Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/us-020.pdf", 2, + 103.0f, 35.0f, 641.0f, 560.0f); + BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); + Table table = bea.extract(page).get(0); + + StringBuilder sb = new StringBuilder(); + (new CSVWriter()).write(sb, table); + assertEquals(expectedCsv, sb.toString()); + } + } diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index a6cbacfb..f4f19c26 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -16,97 +16,110 @@ public class TestCommandLineApp { - private String csvFromCommandLineArgs(String[] args) throws ParseException { - CommandLineParser parser = new GnuParser(); - CommandLine cmd = parser.parse(CommandLineApp.buildOptions(), args); - - StringBuilder stringBuilder = new StringBuilder(); - new CommandLineApp(stringBuilder, cmd).extractTables(cmd); - - return stringBuilder.toString(); - } - - @Test - public void testExtractSpreadsheetWithArea() throws ParseException, IOException { - - String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); - - assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[] { - "src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", - "-p", "1", "-a", - "150.56,58.9,654.7,536.12", "-f", - "CSV" - })); - } - - @Test - public void testExtractBatchSpreadsheetWithArea() throws ParseException, IOException { - FileSystem fs = FileSystems.getDefault(); - String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); - Path tmpFolder = Files.createTempDirectory("tabula-java-batch-test"); - tmpFolder.toFile().deleteOnExit(); - - Path copiedPDF = tmpFolder.resolve(fs.getPath("spreadsheet.pdf")); - Path sourcePDF = fs.getPath("src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf"); - Files.copy(sourcePDF, copiedPDF); - copiedPDF.toFile().deleteOnExit(); - - this.csvFromCommandLineArgs(new String[] { - "-b", tmpFolder.toString(), - "-p", "1", "-a", - "150.56,58.9,654.7,536.12", "-f", - "CSV" - }); - - Path csvPath = tmpFolder.resolve(fs.getPath("spreadsheet.csv")); - assertTrue(csvPath.toFile().exists()); - assertArrayEquals(expectedCsv.getBytes(), Files.readAllBytes(csvPath)); - } - - @Test - public void testExtractSpreadsheetWithAreaAndNewFile() throws ParseException, IOException { - - String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); - - this.csvFromCommandLineArgs(new String[] { - "src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", - "-p", "1", "-a", - "150.56,58.9,654.7,536.12", "-f", - "CSV", "-o", "outputFile" - }); - //assertEquals(expectedCsv,); - } - - - @Test - public void testExtractJSONWithArea() throws ParseException, IOException { - - String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/spanning_cells_basic.json"); - - assertEquals(expectedJson, this.csvFromCommandLineArgs(new String[] { - "src/test/resources/technology/tabula/spanning_cells.pdf", - "-p", "1", "-a", - "150.56,58.9,654.7,536.12", "-f", - "JSON" - })); - } - - @Test - public void testGuessOption() throws ParseException, IOException { - String expectedCsvNoGuessing = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_no_guessing.csv"); - assertEquals(expectedCsvNoGuessing, this.csvFromCommandLineArgs(new String[] { - "src/test/resources/technology/tabula/icdar2013-dataset/competition-dataset-eu/eu-001.pdf", - "-p", "1", - "-f", "CSV" - })); - - String expectedCsvWithGuessing = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_with_guessing.csv"); - assertEquals(expectedCsvWithGuessing, this.csvFromCommandLineArgs(new String[] { - "src/test/resources/technology/tabula/icdar2013-dataset/competition-dataset-eu/eu-001.pdf", - "-p", "1", - "-f", "CSV", - "-g" - })); - } + private String csvFromCommandLineArgs(String[] args) throws ParseException { + CommandLineParser parser = new GnuParser(); + CommandLine cmd = parser.parse(CommandLineApp.buildOptions(), args); + + StringBuilder stringBuilder = new StringBuilder(); + new CommandLineApp(stringBuilder, cmd).extractTables(cmd); + + return stringBuilder.toString(); + } + + @Test + public void testExtractSpreadsheetWithArea() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); + + assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", + "-p", "1", "-a", + "150.56,58.9,654.7,536.12", "-f", + "CSV" + })); + } + + @Test + public void testExtractBatchSpreadsheetWithArea() throws ParseException, IOException { + FileSystem fs = FileSystems.getDefault(); + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); + Path tmpFolder = Files.createTempDirectory("tabula-java-batch-test"); + tmpFolder.toFile().deleteOnExit(); + + Path copiedPDF = tmpFolder.resolve(fs.getPath("spreadsheet.pdf")); + Path sourcePDF = fs.getPath("src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf"); + Files.copy(sourcePDF, copiedPDF); + copiedPDF.toFile().deleteOnExit(); + + this.csvFromCommandLineArgs(new String[]{ + "-b", tmpFolder.toString(), + "-p", "1", "-a", + "150.56,58.9,654.7,536.12", "-f", + "CSV" + }); + + Path csvPath = tmpFolder.resolve(fs.getPath("spreadsheet.csv")); + assertTrue(csvPath.toFile().exists()); + assertArrayEquals(expectedCsv.getBytes(), Files.readAllBytes(csvPath)); + } + + @Test + public void testExtractSpreadsheetWithAreaAndNewFile() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); + + this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", + "-p", "1", "-a", + "150.56,58.9,654.7,536.12", "-f", + "CSV", "-o", "outputFile" + }); + //assertEquals(expectedCsv,); + } + + + @Test + public void testExtractJSONWithArea() throws ParseException, IOException { + + String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/spanning_cells_basic.json"); + + assertEquals(expectedJson, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/spanning_cells.pdf", + "-p", "1", "-a", + "150.56,58.9,654.7,536.12", "-f", + "JSON" + })); + } + + @Test + public void testExtractCSVWithArea() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spanning_cells.csv"); + + assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/spanning_cells.pdf", + "-p", "1", "-a", + "150.56,58.9,654.7,536.12", "-f", + "CSV" + })); + } + + @Test + public void testGuessOption() throws ParseException, IOException { + String expectedCsvNoGuessing = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_no_guessing.csv"); + assertEquals(expectedCsvNoGuessing, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/icdar2013-dataset/competition-dataset-eu/eu-001.pdf", + "-p", "1", + "-f", "CSV" + })); + + String expectedCsvWithGuessing = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_with_guessing.csv"); + assertEquals(expectedCsvWithGuessing, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/icdar2013-dataset/competition-dataset-eu/eu-001.pdf", + "-p", "1", + "-f", "CSV", + "-g" + })); + } } diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index 150ea8ab..cd4c8365 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -12,23 +12,23 @@ public class TestObjectExtractor { - @Test(expected=IOException.class) + /*@Test(expected=IOException.class) public void testWrongPasswordRaisesException() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/encrypted.pdf"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf")); ObjectExtractor oe = new ObjectExtractor(pdf_document, "wrongpass"); oe.extract().next(); - } - - @Test(expected=IOException.class) + }*/ + + @Test(expected = IOException.class) public void testEmptyOnEncryptedFileRaisesException() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/encrypted.pdf"); - ObjectExtractor oe = new ObjectExtractor(pdf_document); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf")); + ObjectExtractor oe = new ObjectExtractor(pdf_document); oe.extract().next(); } - + @Test public void testCanReadPDFWithOwnerEncryption() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); ObjectExtractor oe = new ObjectExtractor(pdf_document); PageIterator pi = oe.extract(); int i = 0; @@ -39,9 +39,10 @@ public void testCanReadPDFWithOwnerEncryption() throws IOException { assertEquals(2, i); } + /* @Test public void testGoodPassword() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/encrypted.pdf"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf")); ObjectExtractor oe = new ObjectExtractor(pdf_document, "userpassword"); List pages = new ArrayList(); PageIterator pi = oe.extract(); @@ -50,67 +51,68 @@ public void testGoodPassword() throws IOException { } assertEquals(1, pages.size()); } - + */ + @Test public void testTextExtractionDoesNotRaise() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/rotated_page.pdf"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/rotated_page.pdf")); ObjectExtractor oe = new ObjectExtractor(pdf_document); PageIterator pi = oe.extract(); - + assertTrue(pi.hasNext()); assertNotNull(pi.next()); assertFalse(pi.hasNext()); - + } - + @Test public void testShouldDetectRulings() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/should_detect_rulings.pdf"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/should_detect_rulings.pdf")); ObjectExtractor oe = new ObjectExtractor(pdf_document); PageIterator pi = oe.extract(); - + while (pi.hasNext()) { assertNotEquals(0, pi.next().getRulings().size()); } } - + @Test public void testDontThrowNPEInShfill() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/labor.pdf"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/labor.pdf")); ObjectExtractor oe = new ObjectExtractor(pdf_document); PageIterator pi = oe.extract(); assertTrue(pi.hasNext()); try { Page p = pi.next(); assertNotNull(p); - } - catch (NullPointerException e) { + } catch (NullPointerException e) { fail("NPE in ObjectExtractor " + e.toString()); } } - + @Test - public void testExtractOnePage() throws IOException{ - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf"); + public void testExtractOnePage() throws IOException { + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); assertEquals(2, pdf_document.getNumberOfPages()); - + ObjectExtractor oe = new ObjectExtractor(pdf_document); Page page = oe.extract(2); - + assertNotNull(page); - + } - + @Test(expected = IndexOutOfBoundsException.class) - public void testExtractWrongPageNumber() throws IOException{ - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf"); + public void testExtractWrongPageNumber() throws IOException { + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); assertEquals(2, pdf_document.getNumberOfPages()); - + ObjectExtractor oe = new ObjectExtractor(pdf_document); oe.extract(3); - + } + /* @Test public void testExtractWithoutExtractingRulings() throws IOException { PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/should_detect_rulings.pdf"); @@ -123,5 +125,6 @@ public void testExtractWithoutExtractingRulings() throws IOException { assertEquals(0, page.getRulings().size()); assertFalse(pi.hasNext()); } - + */ + } diff --git a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java index 54484adb..786cb1ab 100644 --- a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java +++ b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java @@ -1,40 +1,41 @@ package technology.tabula; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.awt.geom.Point2D; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.junit.Test; -import technology.tabula.Cell; -import technology.tabula.Page; -import technology.tabula.Rectangle; -import technology.tabula.Ruling; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; import technology.tabula.writers.CSVWriter; -import technology.tabula.UtilsForTesting; import technology.tabula.writers.JSONWriter; public class TestSpreadsheetExtractor { public static final Rectangle[] EXPECTED_RECTANGLES = { - new Rectangle(40.0f, 18.0f, 208.0f, 40.0f), - new Rectangle(84.0f, 18.0f, 962.0f, 464.0f) + new Rectangle(40.0f, 18.0f, 208.0f, 40.0f), + new Rectangle(84.0f, 18.0f, 962.0f, 464.0f) }; - - private static final Ruling[] VERTICAL_RULING_LINES = { + + private static final Ruling[] VERTICAL_RULING_LINES = { new Ruling(40.0f, 18.0f, 0.0f, 40.0f), new Ruling(44.0f, 70.0f, 0.0f, 36.0f), - new Ruling(40.0f, 226.0f, 0.0f, 40.0f) - }; + new Ruling(40.0f, 226.0f, 0.0f, 40.0f) + }; private static final Ruling[] HORIZONTAL_RULING_LINES = { new Ruling(40.0f, 18.0f, 208.0f, 0.0f), @@ -45,10 +46,10 @@ public class TestSpreadsheetExtractor { new Ruling(64.0f, 18.0f, 208.0f, 0.0f), new Ruling(70.0f, 18.0f, 208.0f, 0.0f), new Ruling(74.0f, 18.0f, 208.0f, 0.0f), - new Ruling(80.0f, 18.0f, 208.0f, 0.0f) + new Ruling(80.0f, 18.0f, 208.0f, 0.0f) }; - - private static final Cell[] EXPECTED_CELLS = { + + private static final Cell[] EXPECTED_CELLS = { new Cell(40.0f, 18.0f, 208.0f, 4.0f), new Cell(44.0f, 18.0f, 52.0f, 6.0f), new Cell(50.0f, 18.0f, 52.0f, 4.0f), @@ -63,34 +64,34 @@ public class TestSpreadsheetExtractor { new Cell(60.0f, 70.0f, 156.0f, 4.0f), new Cell(64.0f, 70.0f, 156.0f, 6.0f), new Cell(70.0f, 70.0f, 156.0f, 4.0f), - new Cell(74.0f, 70.0f, 156.0f, 6.0f) }; - + new Cell(74.0f, 70.0f, 156.0f, 6.0f)}; + private static final Ruling[][] SINGLE_CELL_RULINGS = { - { - new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(380.73438f, 185.66929f)), - new Ruling(new Point2D.Float(151.653545f, 314.64567f), new Point2D.Float(380.73438f, 314.64567f)) - }, - { - new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(151.653545f, 314.64567f)), - new Ruling(new Point2D.Float(380.73438f, 185.66929f), new Point2D.Float(380.73438f, 314.64567f)) - } + { + new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(380.73438f, 185.66929f)), + new Ruling(new Point2D.Float(151.653545f, 314.64567f), new Point2D.Float(380.73438f, 314.64567f)) + }, + { + new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(151.653545f, 314.64567f)), + new Ruling(new Point2D.Float(380.73438f, 185.66929f), new Point2D.Float(380.73438f, 314.64567f)) + } }; - + private static final Ruling[][] TWO_SINGLE_CELL_RULINGS = { - { - new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(287.4074f, 185.66929f)), - new Ruling(new Point2D.Float(151.653545f, 262.101f), new Point2D.Float(287.4074f, 262.101f)), - new Ruling(new Point2D.Float(232.44095f, 280.62992f), new Point2D.Float(368.1948f, 280.62992f)), - new Ruling(new Point2D.Float(232.44095f, 357.06164f), new Point2D.Float(368.1948f, 357.06164f)) - }, - { - new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(151.653545f, 262.101f)), - new Ruling(new Point2D.Float(287.4074f, 185.66929f), new Point2D.Float(287.4074f, 262.101f)), - new Ruling(new Point2D.Float(232.44095f, 280.62992f), new Point2D.Float(232.44095f, 357.06164f)), - new Ruling(new Point2D.Float(368.1948f, 280.62992f), new Point2D.Float(368.1948f, 357.06164f)) - } + { + new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(287.4074f, 185.66929f)), + new Ruling(new Point2D.Float(151.653545f, 262.101f), new Point2D.Float(287.4074f, 262.101f)), + new Ruling(new Point2D.Float(232.44095f, 280.62992f), new Point2D.Float(368.1948f, 280.62992f)), + new Ruling(new Point2D.Float(232.44095f, 357.06164f), new Point2D.Float(368.1948f, 357.06164f)) + }, + { + new Ruling(new Point2D.Float(151.653545f, 185.66929f), new Point2D.Float(151.653545f, 262.101f)), + new Ruling(new Point2D.Float(287.4074f, 185.66929f), new Point2D.Float(287.4074f, 262.101f)), + new Ruling(new Point2D.Float(232.44095f, 280.62992f), new Point2D.Float(232.44095f, 357.06164f)), + new Ruling(new Point2D.Float(368.1948f, 280.62992f), new Point2D.Float(368.1948f, 357.06164f)) + } }; - + private static final Ruling[] EXTERNALLY_DEFINED_RULINGS = { new Ruling(new Point2D.Float(320.0f, 285.0f), new Point2D.Float(564.4409f, 285.0f)), new Ruling(new Point2D.Float(320.0f, 457.0f), new Point2D.Float(564.4409f, 457.0f)), @@ -107,24 +108,24 @@ public class TestSpreadsheetExtractor { new Ruling(new Point2D.Float(565.0f, 285.0f), new Point2D.Float(564.4409f, 457.0f)), new Ruling(new Point2D.Float(470.5542f, 285.0f), new Point2D.Float(470.36865f, 457.0f)) }; - + private static final Ruling[] EXTERNALLY_DEFINED_RULINGS2 = { - new Ruling(new Point2D.Float(51.796964f, 180.0f), new Point2D.Float(560.20312f, 180.0f)), - new Ruling(new Point2D.Float(51.797017f, 219.0f), new Point2D.Float(560.2031f, 219.0f)), - new Ruling(new Point2D.Float(51.797f, 239.0f), new Point2D.Float(560.2031f, 239.0f)), - new Ruling(new Point2D.Float(51.797f, 262.0f), new Point2D.Float(560.20312f, 262.0f)), - new Ruling(new Point2D.Float(51.797f, 283.50247f), new Point2D.Float(560.05024f, 283.50247f)), - new Ruling(new Point2D.Float(51.796964f, 309.0f), new Point2D.Float(560.20312f, 309.0f)), - new Ruling(new Point2D.Float(51.796982f, 333.0f), new Point2D.Float(560.20312f, 333.0f)), - new Ruling(new Point2D.Float(51.797f, 366.0f), new Point2D.Float(560.20312f, 366.0f)), - - - new Ruling(new Point2D.Float(52.0f, 181.0f), new Point2D.Float(51.797f, 366.0f)), - new Ruling(new Point2D.Float(208.62891f, 181.0f), new Point2D.Float(208.62891f, 366.0f)), - new Ruling(new Point2D.Float(357.11328f, 180.0f), new Point2D.Float(357.0f, 366.0f)), - new Ruling(new Point2D.Float(560.11328f, 180.0f), new Point2D.Float(560.0f, 366.0f)) + new Ruling(new Point2D.Float(51.796964f, 180.0f), new Point2D.Float(560.20312f, 180.0f)), + new Ruling(new Point2D.Float(51.797017f, 219.0f), new Point2D.Float(560.2031f, 219.0f)), + new Ruling(new Point2D.Float(51.797f, 239.0f), new Point2D.Float(560.2031f, 239.0f)), + new Ruling(new Point2D.Float(51.797f, 262.0f), new Point2D.Float(560.20312f, 262.0f)), + new Ruling(new Point2D.Float(51.797f, 283.50247f), new Point2D.Float(560.05024f, 283.50247f)), + new Ruling(new Point2D.Float(51.796964f, 309.0f), new Point2D.Float(560.20312f, 309.0f)), + new Ruling(new Point2D.Float(51.796982f, 333.0f), new Point2D.Float(560.20312f, 333.0f)), + new Ruling(new Point2D.Float(51.797f, 366.0f), new Point2D.Float(560.20312f, 366.0f)), + + + new Ruling(new Point2D.Float(52.0f, 181.0f), new Point2D.Float(51.797f, 366.0f)), + new Ruling(new Point2D.Float(208.62891f, 181.0f), new Point2D.Float(208.62891f, 366.0f)), + new Ruling(new Point2D.Float(357.11328f, 180.0f), new Point2D.Float(357.0f, 366.0f)), + new Ruling(new Point2D.Float(560.11328f, 180.0f), new Point2D.Float(560.0f, 366.0f)) }; - + @Test public void testLinesToCells() { List cells = SpreadsheetExtractionAlgorithm.findCells(Arrays.asList(HORIZONTAL_RULING_LINES), Arrays.asList(VERTICAL_RULING_LINES)); @@ -133,7 +134,7 @@ public void testLinesToCells() { Collections.sort(expected); assertTrue(cells.equals(expected)); } - + @Test public void testDetectSingleCell() { List cells = SpreadsheetExtractionAlgorithm.findCells(Arrays.asList(SINGLE_CELL_RULINGS[0]), @@ -154,7 +155,7 @@ public void testDetectTwoSingleCells() { // should not overlap assertFalse(cells.get(0).intersects(cells.get(1))); } - + @Test public void testFindSpreadsheetsFromCells() throws IOException { @@ -164,7 +165,7 @@ public void testFindSpreadsheetsFromCells() throws IOException { List cells = new ArrayList(); - for (CSVRecord record: parse) { + for (CSVRecord record : parse) { cells.add(new Cell(Float.parseFloat(record.get(0)), Float.parseFloat(record.get(1)), Float.parseFloat(record.get(2)), @@ -179,7 +180,7 @@ public void testFindSpreadsheetsFromCells() throws IOException { Collections.sort(foundRectangles); assertTrue(foundRectangles.equals(expected)); } - + // TODO Add assertions @Test public void testSpreadsheetExtraction() throws IOException { @@ -187,7 +188,7 @@ public void testSpreadsheetExtraction() throws IOException { .getAreaFromFirstPage( "src/test/resources/technology/tabula/argentina_diputados_voting_record.pdf", 269.875f, 12.75f, 790.5f, 561f); - + SpreadsheetExtractionAlgorithm.findCells(page.getHorizontalRulings(), page.getVerticalRulings()); } @@ -199,14 +200,30 @@ public void testSpanningCells() throws IOException { SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); List tables = se.extract(page); assertEquals(2, tables.size()); - + StringBuilder sb = new StringBuilder(); (new JSONWriter()).write(sb, (List
) tables); assertEquals(expectedJson, sb.toString()); } - + + @Test + public void testSpanningCellsToCsv() throws IOException { + Page page = UtilsForTesting + .getPage("src/test/resources/technology/tabula/spanning_cells.pdf", 1); + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spanning_cells.csv"); + SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); + List tables = se.extract(page); + assertEquals(2, tables.size()); + + + StringBuilder sb = new StringBuilder(); + (new CSVWriter()).write(sb, (List
) tables); + assertEquals(expectedCsv, sb.toString()); + + } + @Test public void testIncompleteGrid() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/china.pdf", 1); @@ -214,7 +231,7 @@ public void testIncompleteGrid() throws IOException { List tables = se.extract(page); assertEquals(2, tables.size()); } - + @Test public void testNaturalOrderOfRectanglesDoesNotBreakContract() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-017.pdf", 2); @@ -223,31 +240,31 @@ public void testNaturalOrderOfRectanglesDoesNotBreakContract() throws IOExceptio StringBuilder sb = new StringBuilder(); (new CSVWriter()).write(sb, tables.get(0)); - + String result = sb.toString(); String expected = "Project,Agency,Institution\r\nNanotechnology and its publics,NSF,Pennsylvania State University\r\n\"Public information and deliberation in nanoscience and\rnanotechnology policy (SGER)\",Interagency,\"North Carolina State\rUniversity\"\r\n\"Social and ethical research and education in agrifood\rnanotechnology (NIRT)\",NSF,Michigan State University\r\n\"From laboratory to society: developing an informed\rapproach to nanoscale science and engineering (NIRT)\",NSF,University of South Carolina\r\nDatabase and innovation timeline for nanotechnology,NSF,UCLA\r\nSocial and ethical dimensions of nanotechnology,NSF,University of Virginia\r\n\"Undergraduate exploration of nanoscience,\rapplications and societal implications (NUE)\",NSF,\"Michigan Technological\rUniversity\"\r\n\"Ethics and belief inside the development of\rnanotechnology (CAREER)\",NSF,University of Virginia\r\n\"All centers, NNIN and NCN have a societal\rimplications components\",\"NSF, DOE,\rDOD, and NIH\",\"All nanotechnology centers\rand networks\"\r\n"; - + assertEquals(expected, result); } - + @Test public void testMergeLinesCloseToEachOther() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/20.pdf", 1); List rulings = page.getVerticalRulings(); - float[] expectedRulings = new float[] { 105.549774f,107.52332f,160.58167f,377.1792f,434.95804f,488.21783f }; + float[] expectedRulings = new float[]{105.549774f, 107.52332f, 160.58167f, 377.1792f, 434.95804f, 488.21783f}; for (int i = 0; i < rulings.size(); i++) { assertEquals(expectedRulings[i], rulings.get(i).getLeft(), 0.1); } assertEquals(6, rulings.size()); - + } @Test public void testSpreadsheetWithNoBoundingFrameShouldBeSpreadsheet() throws IOException { Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", 1, - 150.56f,58.9f,654.7f,536.12f); - + 150.56f, 58.9f, 654.7f, 536.12f); + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); @@ -256,11 +273,11 @@ public void testSpreadsheetWithNoBoundingFrameShouldBeSpreadsheet() throws IOExc List tables = se.extract(page); StringBuilder sb = new StringBuilder(); (new CSVWriter()).write(sb, tables.get(0)); - + assertEquals(expectedCsv, sb.toString()); - + } - + @Test public void testExtractSpreadsheetWithinAnArea() throws IOException { Page page = UtilsForTesting.getAreaFromPage( @@ -271,40 +288,40 @@ public void testExtractSpreadsheetWithinAnArea() throws IOException { List tables = se.extract(page); Table table = tables.get(0); assertEquals(15, table.getRows().size()); - - String expected = "\"\",TM,M.U$S,TM,M.U$S,TM,M.U$S,TM,M.U$S,TM,M.U$S,TM,M.U$S,TM\n" + - "Peces vivos,1,25,1,23,2,38,1,37,2,67,2,89,1\n" + - "\"Pescado fresco\n" + - "o refrigerado.\n" + - "exc. filetes\",7.704,7.175,8.931,6.892,12.635,10.255,16.742,13.688,14.357,11.674,13.035,13.429,9.727\n" + - "\"Pescado congelado\n" + - "exc. filetes\",90.560,105.950,112.645,108.416,132.895,115.874,152.767,133.765,148.882,134.847,156.619,165.134,137.179\n" + - "\"Filetes y demás car-\n" + - "nes de pescado\",105.434,200.563,151.142,218.389,152.174,227.780,178.123,291.863,169.422,313.735,176.427,381.640,144.814\n" + - "\"Pescado sec./sal./\n" + - "en salm. har./pol./\n" + - "pell. aptos\n" + - "p/c humano\",6.837,14.493,6.660,9.167,14.630,17.579,18.150,21.302,18.197,25.739,13.460,23.549,11.709\n" + - "Crustáceos,61.691,375.798,52.488,251.043,47.635,387.783,27.815,217.443,7.123,86.019,39.488,373.583,45.191\n" + - "Moluscos,162.027,174.507,109.436,111.443,90.834,104.741,57.695,109.141,98.182,206.304,187.023,251.352,157.531\n" + - "\"Prod. no exp. en\n" + - "otros capítulos.\n" + - "No apto p/c humano\",203,328,7,35,521,343,\"1,710\",\"1,568\",125,246,124,263,131\n" + - "\"Grasas y aceites de\n" + - "pescado y mamíferos\n" + - "marinos\",913,297,\"1,250\",476,\"1,031\",521,\"1,019\",642,690,483,489,710,959\n" + - "\"Extractos y jugos de\n" + - "pescado y mariscos\",5,25,1,3,4,4,31,93,39,117,77,230,80\n" + - "\"Preparaciones y con-\n" + - "servas de pescado\",846,\"3,737\",\"1,688\",\"4,411\",\"1,556\",\"3,681\",\"2,292\",\"5,474\",\"2,167\",\"7,494\",\"2,591\",\"8,833\",\"2,795\"\n" + - "\"Preparaciones y con-\n" + - "servas de mariscos\",348,\"3,667\",345,\"1,771\",738,\"3,627\",561,\"2,620\",607,\"3,928\",314,\"2,819\",250\n" + - "\"Harina, polvo y pe-\n" + - "llets de pescado.No\n" + - "aptos p/c humano\",\"16,947\",\"8,547\",\"11,867\",\"6,315\",\"32,528\",\"13,985\",\"37,313\",\"18,989\",\"35,787\",\"19,914\",\"37,821\",\"27,174\",\"30,000\"\n" + + + String expected = "\"\",TM,M.U$S,TM,M.U$S,TM,M.U$S,TM,M.U$S,TM,M.U$S,TM,M.U$S,TM\n" + + "Peces vivos,1,25,1,23,2,38,1,37,2,67,2,89,1\n" + + "\"Pescado fresco\n" + + "o refrigerado.\n" + + "exc. filetes\",7.704,7.175,8.931,6.892,12.635,10.255,16.742,13.688,14.357,11.674,13.035,13.429,9.727\n" + + "\"Pescado congelado\n" + + "exc. filetes\",90.560,105.950,112.645,108.416,132.895,115.874,152.767,133.765,148.882,134.847,156.619,165.134,137.179\n" + + "\"Filetes y demás car-\n" + + "nes de pescado\",105.434,200.563,151.142,218.389,152.174,227.780,178.123,291.863,169.422,313.735,176.427,381.640,144.814\n" + + "\"Pescado sec./sal./\n" + + "en salm. har./pol./\n" + + "pell. aptos\n" + + "p/c humano\",6.837,14.493,6.660,9.167,14.630,17.579,18.150,21.302,18.197,25.739,13.460,23.549,11.709\n" + + "Crustáceos,61.691,375.798,52.488,251.043,47.635,387.783,27.815,217.443,7.123,86.019,39.488,373.583,45.191\n" + + "Moluscos,162.027,174.507,109.436,111.443,90.834,104.741,57.695,109.141,98.182,206.304,187.023,251.352,157.531\n" + + "\"Prod. no exp. en\n" + + "otros capítulos.\n" + + "No apto p/c humano\",203,328,7,35,521,343,\"1,710\",\"1,568\",125,246,124,263,131\n" + + "\"Grasas y aceites de\n" + + "pescado y mamíferos\n" + + "marinos\",913,297,\"1,250\",476,\"1,031\",521,\"1,019\",642,690,483,489,710,959\n" + + "\"Extractos y jugos de\n" + + "pescado y mariscos\",5,25,1,3,4,4,31,93,39,117,77,230,80\n" + + "\"Preparaciones y con-\n" + + "servas de pescado\",846,\"3,737\",\"1,688\",\"4,411\",\"1,556\",\"3,681\",\"2,292\",\"5,474\",\"2,167\",\"7,494\",\"2,591\",\"8,833\",\"2,795\"\n" + + "\"Preparaciones y con-\n" + + "servas de mariscos\",348,\"3,667\",345,\"1,771\",738,\"3,627\",561,\"2,620\",607,\"3,928\",314,\"2,819\",250\n" + + "\"Harina, polvo y pe-\n" + + "llets de pescado.No\n" + + "aptos p/c humano\",\"16,947\",\"8,547\",\"11,867\",\"6,315\",\"32,528\",\"13,985\",\"37,313\",\"18,989\",\"35,787\",\"19,914\",\"37,821\",\"27,174\",\"30,000\"\n" + "TOTAL,\"453,515\",\"895,111\",\"456,431\",\"718,382\",\"487,183\",\"886,211\",\"494,220\",\"816,623\",\"495,580\",\"810,565\",\"627,469\",\"1,248,804\",\"540,367\"\n"; - + // TODO add better assertions StringBuilder sb = new StringBuilder(); (new CSVWriter()).write(sb, tables.get(0)); @@ -312,22 +329,22 @@ public void testExtractSpreadsheetWithinAnArea() throws IOException { List parsedExpected = org.apache.commons.csv.CSVParser.parse(expected, CSVFormat.EXCEL).getRecords(); List parsedResult = org.apache.commons.csv.CSVParser.parse(result, CSVFormat.EXCEL).getRecords(); - + assertEquals(parsedResult.size(), parsedExpected.size()); - for (int i = 0; i < parsedResult.size(); i ++) { + for (int i = 0; i < parsedResult.size(); i++) { assertEquals(parsedResult.get(i).size(), parsedExpected.get(i).size()); } - + } - + @Test public void testAlmostIntersectingRulingsShouldIntersect() { Ruling v = new Ruling(new Point2D.Float(555.960876f, 271.569641f), new Point2D.Float(555.960876f, 786.899902f)); Ruling h = new Ruling(new Point2D.Float(25.620499f, 786.899902f), new Point2D.Float(555.960754f, 786.899902f)); - Map m = Ruling.findIntersections(Arrays.asList(new Ruling[] { h }), Arrays.asList(new Ruling[] { v })); + Map m = Ruling.findIntersections(Arrays.asList(new Ruling[]{h}), Arrays.asList(new Ruling[]{v})); assertEquals(m.values().size(), 1); } - + // TODO add assertions @Test public void testDontRaiseSortException() throws IOException { @@ -339,7 +356,7 @@ public void testDontRaiseSortException() throws IOException { SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); Table table = bea.extract(page).get(0); } - + @Test public void testShouldDetectASingleSpreadsheet() throws IOException { Page page = UtilsForTesting.getAreaFromPage( @@ -350,35 +367,52 @@ public void testShouldDetectASingleSpreadsheet() throws IOException { List
tables = (List
) bea.extract(page); assertEquals(1, tables.size()); } - + @Test public void testExtractTableWithExternallyDefinedRulings() throws IOException { - Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-007.pdf", + Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-007.pdf", 1); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); List
tables = (List
) bea.extract(page, Arrays.asList(EXTERNALLY_DEFINED_RULINGS)); assertEquals(1, tables.size()); Table table = tables.get(0); + assertEquals("Payroll Period", table.getRows().get(0).get(0).getText()); + assertEquals("One Withholding\rAllowance", table.getRows().get(0).get(1).getText()); + assertEquals("Weekly", table.getRows().get(1).get(0).getText()); + assertEquals("$71.15", table.getRows().get(1).get(1).getText()); + assertEquals("Biweekly", table.getRows().get(2).get(0).getText()); + assertEquals("142.31", table.getRows().get(2).get(1).getText()); + assertEquals("Semimonthly", table.getRows().get(3).get(0).getText()); assertEquals("154.17", table.getRows().get(3).get(1).getText()); - + assertEquals("Monthly", table.getRows().get(4).get(0).getText()); + assertEquals("308.33", table.getRows().get(4).get(1).getText()); + assertEquals("Quarterly", table.getRows().get(5).get(0).getText()); + assertEquals("925.00", table.getRows().get(5).get(1).getText()); + assertEquals("Semiannually", table.getRows().get(6).get(0).getText()); + assertEquals("1,850.00", table.getRows().get(6).get(1).getText()); + assertEquals("Annually", table.getRows().get(7).get(0).getText()); + assertEquals("3,700.00", table.getRows().get(7).get(1).getText()); + assertEquals("Daily or Miscellaneous\r(each day of the payroll period)", table.getRows().get(8).get(0).getText()); + assertEquals("14.23", table.getRows().get(8).get(1).getText()); + } - + @Test public void testAnotherExtractTableWithExternallyDefinedRulings() throws IOException { - Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-024.pdf", + Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-024.pdf", 1); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); List
tables = (List
) bea.extract(page, Arrays.asList(EXTERNALLY_DEFINED_RULINGS2)); assertEquals(1, tables.size()); Table table = tables.get(0); - + assertEquals("Total Supply", table.getRows().get(4).get(0).getText()); assertEquals("6.6", table.getRows().get(6).get(2).getText()); } - + @Test public void testSpreadsheetsSortedByTopAndRight() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/sydney_disclosure_contract.pdf", @@ -387,7 +421,7 @@ public void testSpreadsheetsSortedByTopAndRight() throws IOException { SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); List
tables = (List
) sea.extract(page); for (int i = 1; i < tables.size(); i++) { - assert(tables.get(i-1).getTop() <= tables.get(i).getTop()); + assert (tables.get(i - 1).getTop() <= tables.get(i).getTop()); } } @@ -399,29 +433,29 @@ public void testDontStackOverflowQuicksort() throws IOException { SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); List
tables = (List
) sea.extract(page); for (int i = 1; i < tables.size(); i++) { - assert(tables.get(i-1).getTop() <= tables.get(i).getTop()); + assert (tables.get(i - 1).getTop() <= tables.get(i).getTop()); } } - + @Test public void testRTL() throws IOException { - Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/arabic.pdf", + Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/arabic.pdf", 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); List
tables = (List
) sea.extract(page); // assertEquals(1, tables.size()); Table table = tables.get(0); - - assertEquals("اسمي سلطان", table.getRows().get(1).get(1).getText()); - assertEquals("من اين انت؟", table.getRows().get(2).get(1).getText()); - assertEquals("1234", table.getRows().get(3).get(0).getText()); - assertEquals("هل انت شباك؟", table.getRows().get(4).get(0).getText()); + + assertEquals("اسمي سلطان", table.getRows().get(1).get(1).getText()); + assertEquals("من اين انت؟", table.getRows().get(2).get(1).getText()); + assertEquals("1234", table.getRows().get(3).get(0).getText()); + assertEquals("هل انت شباك؟", table.getRows().get(4).get(0).getText()); assertEquals("انا من ولاية كارولينا الشمال", table.getRows().get(2).get(0).getText()); // conjoined lam-alif gets missed - assertEquals("اسمي Jeremy في الانجليزية", table.getRows().get(4).get(1).getText()); // conjoined lam-alif gets missed - assertEquals("عندي 47 قطط", table.getRows().get(3).get(1).getText()); // the real right answer is 47. - assertEquals("Jeremy is جرمي in Arabic", table.getRows().get(5).get(0).getText()); // the real right answer is 47. - assertEquals("مرحبًا", table.getRows().get(1).get(0).getText()); // really ought to be ً, but this is forgiveable for now + assertEquals("اسمي Jeremy في الانجليزية", table.getRows().get(4).get(1).getText()); // conjoined lam-alif gets missed + assertEquals("عندي 47 قطط", table.getRows().get(3).get(1).getText()); // the real right answer is 47. + assertEquals("Jeremy is جرمي in Arabic", table.getRows().get(5).get(0).getText()); // the real right answer is 47. + assertEquals("مرحبًا", table.getRows().get(1).get(0).getText()); // really ought to be ً, but this is forgiveable for now // there is one remaining problems that are not yet addressed // - diacritics (e.g. Arabic's tanwinً and probably Hebrew nekudot) are put in the wrong place. @@ -436,26 +470,26 @@ public void testRTL() throws IOException { @Test public void testRealLifeRTL() throws IOException { - Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/mednine.pdf", + Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/mednine.pdf", 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); List
tables = (List
) sea.extract(page); // assertEquals(1, tables.size()); Table table = tables.get(0); - - assertEquals("الانتخابات التشريعية 2014", table.getRows().get(0).get(0).getText()); // the doubled spaces might be a bug in my implementation. - assertEquals("ورقة كشف نتائج دائرة مدنين", table.getRows().get(1).get(0).getText()); - assertEquals("426", table.getRows().get(4).get(0).getText()); - assertEquals("63", table.getRows().get(4).get(1).getText()); - assertEquals("43", table.getRows().get(4).get(2).getText()); - assertEquals("56", table.getRows().get(4).get(3).getText()); - assertEquals("58", table.getRows().get(4).get(4).getText()); - assertEquals("49", table.getRows().get(4).get(5).getText()); - assertEquals("55", table.getRows().get(4).get(6).getText()); - assertEquals("33", table.getRows().get(4).get(7).getText()); - assertEquals("32", table.getRows().get(4).get(8).getText()); - assertEquals("37", table.getRows().get(4).get(9).getText()); - assertEquals("قائمة من أجل تحقيق سلطة الشعب", table.getRows().get(4).get(10).getText()); + + assertEquals("الانتخابات التشريعية 2014", table.getRows().get(0).get(0).getText()); // the doubled spaces might be a bug in my implementation. + assertEquals("ورقة كشف نتائج دائرة مدنين", table.getRows().get(1).get(0).getText()); + assertEquals("426", table.getRows().get(4).get(0).getText()); + assertEquals("63", table.getRows().get(4).get(1).getText()); + assertEquals("43", table.getRows().get(4).get(2).getText()); + assertEquals("56", table.getRows().get(4).get(3).getText()); + assertEquals("58", table.getRows().get(4).get(4).getText()); + assertEquals("49", table.getRows().get(4).get(5).getText()); + assertEquals("55", table.getRows().get(4).get(6).getText()); + assertEquals("33", table.getRows().get(4).get(7).getText()); + assertEquals("32", table.getRows().get(4).get(8).getText()); + assertEquals("37", table.getRows().get(4).get(9).getText()); + assertEquals("قائمة من أجل تحقيق سلطة الشعب", table.getRows().get(4).get(10).getText()); // there is one remaining problems that are not yet addressed // - diacritics (e.g. Arabic's tanwinً and probably Hebrew nekudot) are put in the wrong place. @@ -467,4 +501,16 @@ public void testRealLifeRTL() throws IOException { } + @Test + public void testExtractColumnsCorrectly3() throws IOException { + + Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/frx_2012_disclosure.pdf", + 106.01f, 48.09f, 227.31f, 551.89f); + SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); + Table table = sea.extract(page).get(0); + + assertEquals("REGIONAL PULMONARY & SLEEP\rMEDICINE", table.getRows().get(8).get(1).getText()); + + } + } diff --git a/src/test/java/technology/tabula/TestWriters.java b/src/test/java/technology/tabula/TestWriters.java index c60b8991..8d50065b 100644 --- a/src/test/java/technology/tabula/TestWriters.java +++ b/src/test/java/technology/tabula/TestWriters.java @@ -1,12 +1,15 @@ package technology.tabula; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.util.List; import org.junit.Test; +import com.google.gson.Gson; +import com.google.gson.JsonArray; + import technology.tabula.extractors.BasicExtractionAlgorithm; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; import technology.tabula.writers.CSVWriter; @@ -14,19 +17,21 @@ import technology.tabula.writers.TSVWriter; public class TestWriters { - + private static final String EXPECTED_CSV_WRITER_OUTPUT = "\"ABDALA de MATARAZZO, Norma Amanda\",Frente Cívico por Santiago,Santiago del Estero,AFIRMATIVO"; + private Table getTable() throws IOException { Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/argentina_diputados_voting_record.pdf", 269.875f, 12.75f, 790.5f, 561f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); return table; } + private List
getTables() throws IOException { - - Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/twotables.pdf", 1); + + Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/twotables.pdf", 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - return (List
) sea.extract(page); + return (List
) sea.extract(page); } @Test @@ -38,7 +43,7 @@ public void testCSVWriter() throws IOException { String[] lines = s.split("\\r?\\n"); assertEquals(lines[0], EXPECTED_CSV_WRITER_OUTPUT); } - + // TODO Add assertions @Test public void testTSVWriter() throws IOException { @@ -50,39 +55,80 @@ public void testTSVWriter() throws IOException { //String[] lines = s.split("\\r?\\n"); //assertEquals(lines[0], EXPECTED_CSV_WRITER_OUTPUT); } - + @Test public void testJSONWriter() throws IOException { - String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json"); + String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json"); Table table = this.getTable(); StringBuilder sb = new StringBuilder(); (new JSONWriter()).write(sb, table); String s = sb.toString(); assertEquals(expectedJson, s); } - + @Test public void testJSONSerializeInfinity() throws IOException { - String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/schools.json"); + String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/schools.json"); Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/schools.pdf", 53.74f, 16.97f, 548.74f, 762.3f); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); Table table = sea.extract(page).get(0); - + StringBuilder sb = new StringBuilder(); (new JSONWriter()).write(sb, table); String s = sb.toString(); assertEquals(expectedJson, s); } - + + @Test + public void testCSVSerializeInfinity() throws IOException { + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/schools.csv"); + Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/schools.pdf", 53.74f, 16.97f, 548.74f, 762.3f); + SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); + Table table = sea.extract(page).get(0); + + StringBuilder sb = new StringBuilder(); + (new CSVWriter()).write(sb, table); + String s = sb.toString(); + assertEquals(expectedCsv, s); + } + @Test public void testJSONSerializeTwoTables() throws IOException { - String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/twotables.json"); + String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/twotables.json"); List
tables = this.getTables(); StringBuilder sb = new StringBuilder(); (new JSONWriter()).write(sb, tables); + String s = sb.toString(); assertEquals(expectedJson, s); + + Gson gson = new Gson(); + JsonArray json = gson.fromJson(s, JsonArray.class); + assertEquals(2, json.size()); + } + + @Test + public void testCSVSerializeTwoTables() throws IOException { + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/twotables.csv"); + List
tables = this.getTables(); + StringBuilder sb = new StringBuilder(); + (new CSVWriter()).write(sb, tables); + + String s = sb.toString(); + assertEquals(expectedCsv, s); + } + + @Test + public void testCSVMultilineRow() throws IOException { + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/frx_2012_disclosure.csv"); + Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/frx_2012_disclosure.pdf", 53.0f, 49.0f, 735.0f, 550.0f); + SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); + Table table = sea.extract(page).get(0); + + StringBuilder sb = new StringBuilder(); + (new CSVWriter()).write(sb, table); + String s = sb.toString(); + assertEquals(expectedCsv, s); } - } diff --git a/src/test/java/technology/tabula/UtilsForTesting.java b/src/test/java/technology/tabula/UtilsForTesting.java index 2944daf7..c4f2fe93 100644 --- a/src/test/java/technology/tabula/UtilsForTesting.java +++ b/src/test/java/technology/tabula/UtilsForTesting.java @@ -12,20 +12,20 @@ import org.apache.pdfbox.pdmodel.PDDocument; public class UtilsForTesting { - + public static Page getAreaFromFirstPage(String path, float top, float left, float bottom, float right) throws IOException { return getAreaFromPage(path, 1, top, left, bottom, right); } - + public static Page getAreaFromPage(String path, int page, float top, float left, float bottom, float right) throws IOException { return getPage(path, page).getArea(top, left, bottom, right); } - + public static Page getPage(String path, int pageNumber) throws IOException { ObjectExtractor oe = null; try { PDDocument document = PDDocument - .load(path); + .load(new File(path)); oe = new ObjectExtractor(document); Page page = oe.extract(pageNumber); return page; @@ -59,32 +59,32 @@ public static String[][] tableToArrayOfRows(Table table) { } public static String loadJson(String path) throws IOException { - - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8")); - StringBuilder stringBuilder = new StringBuilder(); - String line = null; - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); + + BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8")); + StringBuilder stringBuilder = new StringBuilder(); + String line = null; + + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); } return stringBuilder.toString(); - + } - + public static String loadCsv(String path) throws IOException { - - StringBuilder out = new StringBuilder(); - CSVParser parse = org.apache.commons.csv.CSVParser.parse(new File(path), Charset.forName("utf-8"), CSVFormat.EXCEL); - - CSVPrinter printer = new CSVPrinter(out, CSVFormat.EXCEL); + + StringBuilder out = new StringBuilder(); + CSVParser parse = org.apache.commons.csv.CSVParser.parse(new File(path), Charset.forName("utf-8"), CSVFormat.EXCEL); + + CSVPrinter printer = new CSVPrinter(out, CSVFormat.EXCEL); printer.printRecords(parse); printer.close(); String csv = out.toString().replaceAll("(? - +
diff --git a/src/test/resources/technology/tabula/json/schools.json b/src/test/resources/technology/tabula/json/schools.json index 35d04371..1c9ed032 100644 --- a/src/test/resources/technology/tabula/json/schools.json +++ b/src/test/resources/technology/tabula/json/schools.json @@ -1 +1,2 @@ -{"extraction_method":"lattice","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91127014160156,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.5,"width":69.72000122070312,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91127014160156,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.5,"width":69.72000122070312,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91127014160156,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.5,"width":69.72000122070312,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91127014160156,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.5,"width":69.72000122070312,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91127014160156,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.5,"width":69.72000122070312,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91127014160156,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.5,"width":69.72000122070312,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91127014160156,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.5,"width":69.72000122070312,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91127014160156,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.5,"width":69.72000122070312,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91127014160156,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.5,"width":69.72000122070312,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91127014160156,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.5,"width":69.72000122070312,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91127014160156,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.5,"width":69.72000122070312,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91127014160156,"height":10.780029296875,"text":"Cohen"},{"top":397.86,"left":172.5,"width":69.72000122070312,"height":10.780029296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":408.64,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":408.64,"left":18.588728,"width":153.91127014160156,"height":10.819976806640625,"text":"Commers"},{"top":408.64,"left":172.5,"width":69.72000122070312,"height":10.819976806640625,"text":"Beth"},{"top":408.64,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2294 Commonwealth Ave"},{"top":408.64,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":408.64,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":408.64,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":408.64,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Self Employed"},{"top":408.64,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Homemaker"},{"top":408.64,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/1/2012"},{"top":408.64,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91127014160156,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.5,"width":69.72000122070312,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91127014160156,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.5,"width":69.72000122070312,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91127014160156,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.5,"width":69.72000122070312,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91127014160156,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.5,"width":69.72000122070312,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91127014160156,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.5,"width":69.72000122070312,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91127014160156,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.5,"width":69.72000122070312,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91127014160156,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.5,"width":69.72000122070312,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91127014160156,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.5,"width":69.72000122070312,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91127014160156,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.5,"width":69.72000122070312,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91127014160156,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.5,"width":69.72000122070312,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} + +{"extraction_method":"lattice","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91128540039062,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.50002,"width":69.71998596191406,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91128540039062,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.50002,"width":69.71998596191406,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91128540039062,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.50002,"width":69.71998596191406,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91128540039062,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.50002,"width":69.71998596191406,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91128540039062,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.50002,"width":69.71998596191406,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91128540039062,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.50002,"width":69.71998596191406,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91128540039062,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.50002,"width":69.71998596191406,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cohen"},{"top":397.86,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":408.63998,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":408.63998,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Commers"},{"top":408.63998,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Beth"},{"top":408.63998,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2294 Commonwealth Ave"},{"top":408.63998,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St Paul"},{"top":408.63998,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":408.63998,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":408.63998,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":"Self Employed"},{"top":408.63998,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":"Homemaker"},{"top":408.63998,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"8/1/2012"},{"top":408.63998,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91128540039062,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.50002,"width":69.71998596191406,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91128540039062,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.50002,"width":69.71998596191406,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence‐teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91128540039062,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.50002,"width":69.71998596191406,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91128540039062,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.50002,"width":69.71998596191406,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} \ No newline at end of file diff --git a/src/test/resources/technology/tabula/json/spanning_cells.json b/src/test/resources/technology/tabula/json/spanning_cells.json index 29431f4b..97f3d147 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells.json +++ b/src/test/resources/technology/tabula/json/spanning_cells.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938674926757812,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.458,"left":119.78943,"width":121.92680358886719,"height":12.785385131835938,"text":"Volume servers in:"},{"top":159.458,"left":241.71623,"width":46.66426086425781,"height":12.785385131835938,"text":"2007"},{"top":159.458,"left":288.3805,"width":46.663482666015625,"height":12.785385131835938,"text":"2008"},{"top":159.458,"left":335.04398,"width":46.663818359375,"height":12.785385131835938,"text":"2009"},{"top":159.458,"left":381.7078,"width":46.663360595703125,"height":12.785385131835938,"text":"2010"},{"top":159.458,"left":428.37115,"width":46.73052978515625,"height":12.785385131835938,"text":"2011"}],[{"top":172.24338,"left":119.78943,"width":121.92680358886719,"height":12.832305908203125,"text":"Server closets"},{"top":172.24338,"left":241.71623,"width":46.66426086425781,"height":12.832305908203125,"text":"1,505"},{"top":172.24338,"left":288.3805,"width":46.663482666015625,"height":12.832305908203125,"text":"1,580"},{"top":172.24338,"left":335.04398,"width":46.663818359375,"height":12.832305908203125,"text":"1,643"},{"top":172.24338,"left":381.7078,"width":46.663360595703125,"height":12.832305908203125,"text":"1,673"},{"top":172.24338,"left":428.37115,"width":46.73052978515625,"height":12.832305908203125,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890426635742188,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890426635742188,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890426635742188,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890426635742188,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890426635742188,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890426635742188,"text":"1,693"}],[{"top":210.85715,"left":119.78943,"width":121.92680358886719,"height":12.890701293945312,"text":"Mid-tier data centers"},{"top":210.85715,"left":241.71623,"width":46.66426086425781,"height":12.890701293945312,"text":"1,512"},{"top":210.85715,"left":288.3805,"width":46.663482666015625,"height":12.890701293945312,"text":"1,586"},{"top":210.85715,"left":335.04398,"width":46.663818359375,"height":12.890701293945312,"text":"1,646"},{"top":210.85715,"left":381.7078,"width":46.663360595703125,"height":12.890701293945312,"text":"1,677"},{"top":210.85715,"left":428.37115,"width":46.73052978515625,"height":12.890701293945312,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785049438476562,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785049438476562,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785049438476562,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785049438476562,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785049438476562,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785049438476562,"text":"1,693"}],[{"top":236.5329,"left":119.78943,"width":355.312255859375,"height":13.102508544921875,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.891510009765625,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.891510009765625,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.891510009765625,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.891510009765625,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.891510009765625,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.891510009765625,"text":"1,371"}],[{"top":288.14426,"left":119.78943,"width":121.92680358886719,"height":12.89013671875,"text":"Localized data centers"},{"top":288.14426,"left":241.71623,"width":46.66426086425781,"height":12.89013671875,"text":"1,465"},{"top":288.14426,"left":288.3805,"width":46.663482666015625,"height":12.89013671875,"text":"1,471"},{"top":288.14426,"left":335.04398,"width":46.663818359375,"height":12.89013671875,"text":"1,426"},{"top":288.14426,"left":381.7078,"width":46.663360595703125,"height":12.89013671875,"text":"1,334"},{"top":288.14426,"left":428.37115,"width":46.73052978515625,"height":12.89013671875,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66310119628906,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.4141,"width":46.663787841796875,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66310119628906,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.4141,"width":46.663787841796875,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66310119628906,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.4141,"width":46.663787841796875,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] +[{"extraction_method":"lattice","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938491821289062,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.78943,"width":121.92680358886719,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663360595703125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37115,"width":46.73052978515625,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.78943,"width":121.92680358886719,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663360595703125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37115,"width":46.73052978515625,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.78943,"width":121.92680358886719,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663360595703125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37115,"width":46.73052978515625,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785018920898438,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785018920898438,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785018920898438,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785018920898438,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785018920898438,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785018920898438,"text":"1,693"}],[{"top":236.53287,"left":119.78943,"width":355.312255859375,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.78943,"width":121.92680358886719,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663360595703125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37115,"width":46.73052978515625,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66316223144531,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.41415,"width":46.663726806640625,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] \ No newline at end of file diff --git a/src/test/resources/technology/tabula/json/spanning_cells_basic.json b/src/test/resources/technology/tabula/json/spanning_cells_basic.json index 1ecfbaae..da8c71e0 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells_basic.json +++ b/src/test/resources/technology/tabula/json/spanning_cells_basic.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897994995117188,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.458,"left":119.789444,"width":121.92678833007812,"height":12.785385131835938,"text":"Volume servers in:"},{"top":159.458,"left":241.71623,"width":46.66426086425781,"height":12.785385131835938,"text":"2007"},{"top":159.458,"left":288.3805,"width":46.663482666015625,"height":12.785385131835938,"text":"2008"},{"top":159.458,"left":335.04398,"width":46.663818359375,"height":12.785385131835938,"text":"2009"},{"top":159.458,"left":381.7078,"width":46.663330078125,"height":12.785385131835938,"text":"2010"},{"top":159.458,"left":428.37112,"width":46.73773193359375,"height":12.785385131835938,"text":"2011"}],[{"top":172.24338,"left":119.789444,"width":121.92678833007812,"height":12.832305908203125,"text":"Server closets"},{"top":172.24338,"left":241.71623,"width":46.66426086425781,"height":12.832305908203125,"text":"1,505"},{"top":172.24338,"left":288.3805,"width":46.663482666015625,"height":12.832305908203125,"text":"1,580"},{"top":172.24338,"left":335.04398,"width":46.663818359375,"height":12.832305908203125,"text":"1,643"},{"top":172.24338,"left":381.7078,"width":46.663330078125,"height":12.832305908203125,"text":"1,673"},{"top":172.24338,"left":428.37112,"width":46.73773193359375,"height":12.832305908203125,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890426635742188,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890426635742188,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890426635742188,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890426635742188,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890426635742188,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890426635742188,"text":"1,693"}],[{"top":210.85715,"left":119.789444,"width":121.92678833007812,"height":12.890701293945312,"text":"Mid-tier data centers"},{"top":210.85715,"left":241.71623,"width":46.66426086425781,"height":12.890701293945312,"text":"1,512"},{"top":210.85715,"left":288.3805,"width":46.663482666015625,"height":12.890701293945312,"text":"1,586"},{"top":210.85715,"left":335.04398,"width":46.663818359375,"height":12.890701293945312,"text":"1,646"},{"top":210.85715,"left":381.7078,"width":46.663330078125,"height":12.890701293945312,"text":"1,677"},{"top":210.85715,"left":428.37112,"width":46.73773193359375,"height":12.890701293945312,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785079956054688,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785079956054688,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785079956054688,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785079956054688,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785079956054688,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785079956054688,"text":"1,693"}],[{"top":236.53293,"left":119.789444,"width":355.31939697265625,"height":13.102462768554688,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.891510009765625,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.891510009765625,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.891510009765625,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.891510009765625,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.891510009765625,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.891510009765625,"text":"1,371"}],[{"top":288.14426,"left":119.789444,"width":121.92678833007812,"height":12.89013671875,"text":"Localized data centers"},{"top":288.14426,"left":241.71623,"width":46.66426086425781,"height":12.89013671875,"text":"1,465"},{"top":288.14426,"left":288.3805,"width":46.663482666015625,"height":12.89013671875,"text":"1,471"},{"top":288.14426,"left":335.04398,"width":46.663818359375,"height":12.89013671875,"text":"1,426"},{"top":288.14426,"left":381.7078,"width":46.663330078125,"height":12.89013671875,"text":"1,334"},{"top":288.14426,"left":428.37112,"width":46.73773193359375,"height":12.89013671875,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66310119628906,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.4141,"width":46.663787841796875,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66310119628906,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.4141,"width":46.663787841796875,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66310119628906,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.4141,"width":46.663787841796875,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] +[{"extraction_method":"lattice","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897811889648438,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.789444,"width":121.92678833007812,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663330078125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37112,"width":46.73773193359375,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.789444,"width":121.92678833007812,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663330078125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37112,"width":46.73773193359375,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.789444,"width":121.92678833007812,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663330078125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37112,"width":46.73773193359375,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785003662109375,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785003662109375,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785003662109375,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785003662109375,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785003662109375,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785003662109375,"text":"1,693"}],[{"top":236.53285,"left":119.789444,"width":355.31939697265625,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.789444,"width":121.92678833007812,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663330078125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37112,"width":46.73773193359375,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66316223144531,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.41415,"width":46.663726806640625,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] \ No newline at end of file diff --git a/src/test/resources/technology/tabula/json/twotables.json b/src/test/resources/technology/tabula/json/twotables.json index aca9787f..5c70c52e 100644 --- a/src/test/resources/technology/tabula/json/twotables.json +++ b/src/test/resources/technology/tabula/json/twotables.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":111.18451,"left":67.41156,"width":342.44476318359375,"height":174.07479858398438,"data":[[{"top":111.18451,"left":67.41156,"width":85.61141967773438,"height":28.53582763671875,"text":""},{"top":111.18451,"left":153.02298,"width":256.8333435058594,"height":14.266975402832031,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":125.451485,"left":153.02298,"width":51.367401123046875,"height":14.268852233886719,"text":"資本金"},{"top":125.451485,"left":204.39038,"width":51.36669921875,"height":14.268852233886719,"text":"資本剰余金"},{"top":125.451485,"left":255.75708,"width":51.3656005859375,"height":14.268852233886719,"text":"利益剰余金"},{"top":125.451485,"left":307.12268,"width":51.366668701171875,"height":14.268852233886719,"text":"自己株式"},{"top":125.451485,"left":358.48935,"width":51.366973876953125,"height":14.268852233886719,"text":"株主資本合計"}],[{"top":139.72034,"left":67.41156,"width":85.61141967773438,"height":14.268722534179688,"text":"当期首残高"},{"top":139.72034,"left":153.02298,"width":51.367401123046875,"height":14.268722534179688,"text":"5,664"},{"top":139.72034,"left":204.39038,"width":51.36669921875,"height":14.268722534179688,"text":"749"},{"top":139.72034,"left":255.75708,"width":51.3656005859375,"height":14.268722534179688,"text":"12,017"},{"top":139.72034,"left":307.12268,"width":51.366668701171875,"height":14.268722534179688,"text":"△747"},{"top":139.72034,"left":358.48935,"width":51.366973876953125,"height":14.268722534179688,"text":"17,683"}],[{"top":153.98906,"left":67.41156,"width":85.61141967773438,"height":14.268753051757812,"text":"当期変動額"},{"top":153.98906,"left":153.02298,"width":51.367401123046875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":204.39038,"width":51.36669921875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":255.75708,"width":51.3656005859375,"height":14.268753051757812,"text":""},{"top":153.98906,"left":307.12268,"width":51.366668701171875,"height":14.268753051757812,"text":""},{"top":153.98906,"left":358.48935,"width":51.366973876953125,"height":14.268753051757812,"text":""}],[{"top":168.25781,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"剰余金の配当"},{"top":168.25781,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":"△525"},{"top":168.25781,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":""},{"top":168.25781,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△525"}],[{"top":182.52675,"left":67.41156,"width":85.61141967773438,"height":14.265869140625,"text":"当期純利益"},{"top":182.52675,"left":153.02298,"width":51.367401123046875,"height":14.265869140625,"text":""},{"top":182.52675,"left":204.39038,"width":51.36669921875,"height":14.265869140625,"text":""},{"top":182.52675,"left":255.75708,"width":51.3656005859375,"height":14.265869140625,"text":"1,269"},{"top":182.52675,"left":307.12268,"width":51.366668701171875,"height":14.265869140625,"text":""},{"top":182.52675,"left":358.48935,"width":51.366973876953125,"height":14.265869140625,"text":"1,269"}],[{"top":196.79262,"left":67.41156,"width":85.61141967773438,"height":14.268966674804688,"text":"自己株式の取得"},{"top":196.79262,"left":153.02298,"width":51.367401123046875,"height":14.268966674804688,"text":""},{"top":196.79262,"left":204.39038,"width":51.36669921875,"height":14.268966674804688,"text":""},{"top":196.79262,"left":255.75708,"width":51.3656005859375,"height":14.268966674804688,"text":""},{"top":196.79262,"left":307.12268,"width":51.366668701171875,"height":14.268966674804688,"text":"△0"},{"top":196.79262,"left":358.48935,"width":51.366973876953125,"height":14.268966674804688,"text":"△0"}],[{"top":211.06158,"left":67.41156,"width":85.61141967773438,"height":22.830032348632812,"text":"持分法の適用範囲\rの変動"},{"top":211.06158,"left":153.02298,"width":51.367401123046875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":204.39038,"width":51.36669921875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":255.75708,"width":51.3656005859375,"height":22.830032348632812,"text":"85"},{"top":211.06158,"left":307.12268,"width":51.366668701171875,"height":22.830032348632812,"text":""},{"top":211.06158,"left":358.48935,"width":51.366973876953125,"height":22.830032348632812,"text":"85"}],[{"top":233.89162,"left":67.41156,"width":85.61141967773438,"height":22.829788208007812,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":233.89162,"left":153.02298,"width":51.367401123046875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":204.39038,"width":51.36669921875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":255.75708,"width":51.3656005859375,"height":22.829788208007812,"text":""},{"top":233.89162,"left":307.12268,"width":51.366668701171875,"height":22.829788208007812,"text":""},{"top":233.89162,"left":358.48935,"width":51.366973876953125,"height":22.829788208007812,"text":""}],[{"top":256.7214,"left":67.41156,"width":85.61141967773438,"height":14.268798828125,"text":"当期変動額合計"},{"top":256.7214,"left":153.02298,"width":51.367401123046875,"height":14.268798828125,"text":"―"},{"top":256.7214,"left":204.39038,"width":51.36669921875,"height":14.268798828125,"text":"―"},{"top":256.7214,"left":255.75708,"width":51.3656005859375,"height":14.268798828125,"text":"829"},{"top":256.7214,"left":307.12268,"width":51.366668701171875,"height":14.268798828125,"text":"△0"},{"top":256.7214,"left":358.48935,"width":51.366973876953125,"height":14.268798828125,"text":"829"}],[{"top":270.9902,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期末残高"},{"top":270.9902,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":"5,664"},{"top":270.9902,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":"749"},{"top":270.9902,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":"12,846"},{"top":270.9902,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":"△747"},{"top":270.9902,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":"18,512"}]]},{"extraction_method":"lattice","top":311.64725,"left":67.41156,"width":445.17803955078125,"height":191.19354248046875,"data":[[{"top":311.64725,"left":67.41156,"width":85.61141967773438,"height":45.658660888671875,"text":""},{"top":311.64725,"left":153.02298,"width":256.8333435058594,"height":14.266693115234375,"text":"その他の包括利益累計額"},{"top":311.64725,"left":409.85632,"width":51.365631103515625,"height":45.658660888671875,"text":"少数株主持分"},{"top":311.64725,"left":461.22195,"width":51.367645263671875,"height":45.658660888671875,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":325.91394,"left":153.02298,"width":51.367401123046875,"height":31.3919677734375,"text":"その他有価証券\r評価差額金"},{"top":325.91394,"left":204.39038,"width":51.36669921875,"height":31.3919677734375,"text":"繰延ヘッジ\r損益"},{"top":325.91394,"left":255.75708,"width":51.3656005859375,"height":31.3919677734375,"text":"為替換算\r調整勘定"},{"top":325.91394,"left":307.12268,"width":51.366668701171875,"height":31.3919677734375,"text":"退職給付に係る\r調整累計額"},{"top":325.91394,"left":358.48935,"width":51.366973876953125,"height":31.3919677734375,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.3059,"left":67.41156,"width":85.61141967773438,"height":14.266754150390625,"text":"当期首残高"},{"top":357.3059,"left":153.02298,"width":51.367401123046875,"height":14.266754150390625,"text":"△669"},{"top":357.3059,"left":204.39038,"width":51.36669921875,"height":14.266754150390625,"text":"61"},{"top":357.3059,"left":255.75708,"width":51.3656005859375,"height":14.266754150390625,"text":"△109"},{"top":357.3059,"left":307.12268,"width":51.366668701171875,"height":14.266754150390625,"text":"―"},{"top":357.3059,"left":358.48935,"width":51.366973876953125,"height":14.266754150390625,"text":"△717"},{"top":357.3059,"left":409.85632,"width":51.365631103515625,"height":14.266754150390625,"text":"246"},{"top":357.3059,"left":461.22195,"width":51.367645263671875,"height":14.266754150390625,"text":"17,212"}],[{"top":371.57266,"left":67.41156,"width":85.61141967773438,"height":14.269073486328125,"text":"当期変動額"},{"top":371.57266,"left":153.02298,"width":51.367401123046875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":204.39038,"width":51.36669921875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":255.75708,"width":51.3656005859375,"height":14.269073486328125,"text":""},{"top":371.57266,"left":307.12268,"width":51.366668701171875,"height":14.269073486328125,"text":""},{"top":371.57266,"left":358.48935,"width":51.366973876953125,"height":14.269073486328125,"text":""},{"top":371.57266,"left":409.85632,"width":51.365631103515625,"height":14.269073486328125,"text":""},{"top":371.57266,"left":461.22195,"width":51.367645263671875,"height":14.269073486328125,"text":""}],[{"top":385.84174,"left":67.41156,"width":85.61141967773438,"height":14.268402099609375,"text":"剰余金の配当"},{"top":385.84174,"left":153.02298,"width":51.367401123046875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":204.39038,"width":51.36669921875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":255.75708,"width":51.3656005859375,"height":14.268402099609375,"text":""},{"top":385.84174,"left":307.12268,"width":51.366668701171875,"height":14.268402099609375,"text":""},{"top":385.84174,"left":358.48935,"width":51.366973876953125,"height":14.268402099609375,"text":""},{"top":385.84174,"left":409.85632,"width":51.365631103515625,"height":14.268402099609375,"text":""},{"top":385.84174,"left":461.22195,"width":51.367645263671875,"height":14.268402099609375,"text":"△525"}],[{"top":400.11014,"left":67.41156,"width":85.61141967773438,"height":14.26885986328125,"text":"当期純利益"},{"top":400.11014,"left":153.02298,"width":51.367401123046875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":204.39038,"width":51.36669921875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":255.75708,"width":51.3656005859375,"height":14.26885986328125,"text":""},{"top":400.11014,"left":307.12268,"width":51.366668701171875,"height":14.26885986328125,"text":""},{"top":400.11014,"left":358.48935,"width":51.366973876953125,"height":14.26885986328125,"text":""},{"top":400.11014,"left":409.85632,"width":51.365631103515625,"height":14.26885986328125,"text":""},{"top":400.11014,"left":461.22195,"width":51.367645263671875,"height":14.26885986328125,"text":"1,269"}],[{"top":414.379,"left":67.41156,"width":85.61141967773438,"height":14.269195556640625,"text":"自己株式の取得"},{"top":414.379,"left":153.02298,"width":51.367401123046875,"height":14.269195556640625,"text":""},{"top":414.379,"left":204.39038,"width":51.36669921875,"height":14.269195556640625,"text":""},{"top":414.379,"left":255.75708,"width":51.3656005859375,"height":14.269195556640625,"text":""},{"top":414.379,"left":307.12268,"width":51.366668701171875,"height":14.269195556640625,"text":""},{"top":414.379,"left":358.48935,"width":51.366973876953125,"height":14.269195556640625,"text":""},{"top":414.379,"left":409.85632,"width":51.365631103515625,"height":14.269195556640625,"text":""},{"top":414.379,"left":461.22195,"width":51.367645263671875,"height":14.269195556640625,"text":"△0"}],[{"top":428.6482,"left":67.41156,"width":85.61141967773438,"height":22.829620361328125,"text":"持分法の適用範囲\rの変動"},{"top":428.6482,"left":153.02298,"width":51.367401123046875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":204.39038,"width":51.36669921875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":255.75708,"width":51.3656005859375,"height":22.829620361328125,"text":""},{"top":428.6482,"left":307.12268,"width":51.366668701171875,"height":22.829620361328125,"text":""},{"top":428.6482,"left":358.48935,"width":51.366973876953125,"height":22.829620361328125,"text":""},{"top":428.6482,"left":409.85632,"width":51.365631103515625,"height":22.829620361328125,"text":""},{"top":428.6482,"left":461.22195,"width":51.367645263671875,"height":22.829620361328125,"text":"85"}],[{"top":451.4778,"left":67.41156,"width":85.61141967773438,"height":22.82977294921875,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":451.4778,"left":153.02298,"width":51.367401123046875,"height":22.82977294921875,"text":"556"},{"top":451.4778,"left":204.39038,"width":51.36669921875,"height":22.82977294921875,"text":"80"},{"top":451.4778,"left":255.75708,"width":51.3656005859375,"height":22.82977294921875,"text":"5"},{"top":451.4778,"left":307.12268,"width":51.366668701171875,"height":22.82977294921875,"text":"―"},{"top":451.4778,"left":358.48935,"width":51.366973876953125,"height":22.82977294921875,"text":"642"},{"top":451.4778,"left":409.85632,"width":51.365631103515625,"height":22.82977294921875,"text":"△0"},{"top":451.4778,"left":461.22195,"width":51.367645263671875,"height":22.82977294921875,"text":"642"}],[{"top":474.3076,"left":67.41156,"width":85.61141967773438,"height":14.268341064453125,"text":"当期変動額合計"},{"top":474.3076,"left":153.02298,"width":51.367401123046875,"height":14.268341064453125,"text":"556"},{"top":474.3076,"left":204.39038,"width":51.36669921875,"height":14.268341064453125,"text":"80"},{"top":474.3076,"left":255.75708,"width":51.3656005859375,"height":14.268341064453125,"text":"5"},{"top":474.3076,"left":307.12268,"width":51.366668701171875,"height":14.268341064453125,"text":"―"},{"top":474.3076,"left":358.48935,"width":51.366973876953125,"height":14.268341064453125,"text":"642"},{"top":474.3076,"left":409.85632,"width":51.365631103515625,"height":14.268341064453125,"text":"△0"},{"top":474.3076,"left":461.22195,"width":51.367645263671875,"height":14.268341064453125,"text":"1,471"}],[{"top":488.57593,"left":67.41156,"width":85.61141967773438,"height":14.264862060546875,"text":"当期末残高"},{"top":488.57593,"left":153.02298,"width":51.367401123046875,"height":14.264862060546875,"text":"△113"},{"top":488.57593,"left":204.39038,"width":51.36669921875,"height":14.264862060546875,"text":"142"},{"top":488.57593,"left":255.75708,"width":51.3656005859375,"height":14.264862060546875,"text":"△104"},{"top":488.57593,"left":307.12268,"width":51.366668701171875,"height":14.264862060546875,"text":"―"},{"top":488.57593,"left":358.48935,"width":51.366973876953125,"height":14.264862060546875,"text":"△75"},{"top":488.57593,"left":409.85632,"width":51.365631103515625,"height":14.264862060546875,"text":"245"},{"top":488.57593,"left":461.22195,"width":51.367645263671875,"height":14.264862060546875,"text":"18,683"}]]}] +[{"extraction_method":"lattice","top":111.79087,"left":67.41156,"width":342.44476318359375,"height":174.0704345703125,"data":[[{"top":111.79087,"left":67.41156,"width":85.61141967773438,"height":28.536293029785156,"text":""},{"top":111.79087,"left":153.02298,"width":256.8333435058594,"height":14.267105102539062,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":126.057976,"left":153.02298,"width":51.367401123046875,"height":14.269187927246094,"text":"資本金"},{"top":126.057976,"left":204.39038,"width":51.36669921875,"height":14.269187927246094,"text":"資本剰余金"},{"top":126.057976,"left":255.75708,"width":51.3656005859375,"height":14.269187927246094,"text":"利益剰余金"},{"top":126.057976,"left":307.12268,"width":51.366668701171875,"height":14.269187927246094,"text":"自己株式"},{"top":126.057976,"left":358.48935,"width":51.366973876953125,"height":14.269187927246094,"text":"株主資本合計"}],[{"top":140.32716,"left":67.41156,"width":85.61141967773438,"height":14.265777587890625,"text":"当期首残高"},{"top":140.32716,"left":153.02298,"width":51.367401123046875,"height":14.265777587890625,"text":"5,664"},{"top":140.32716,"left":204.39038,"width":51.36669921875,"height":14.265777587890625,"text":"749"},{"top":140.32716,"left":255.75708,"width":51.3656005859375,"height":14.265777587890625,"text":"12,017"},{"top":140.32716,"left":307.12268,"width":51.366668701171875,"height":14.265777587890625,"text":"△747"},{"top":140.32716,"left":358.48935,"width":51.366973876953125,"height":14.265777587890625,"text":"17,683"}],[{"top":154.59294,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期変動額"},{"top":154.59294,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":""},{"top":154.59294,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":""}],[{"top":168.86205,"left":67.41156,"width":85.61141967773438,"height":14.268997192382812,"text":"剰余金の配当"},{"top":168.86205,"left":153.02298,"width":51.367401123046875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":204.39038,"width":51.36669921875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":255.75708,"width":51.3656005859375,"height":14.268997192382812,"text":"△525"},{"top":168.86205,"left":307.12268,"width":51.366668701171875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":358.48935,"width":51.366973876953125,"height":14.268997192382812,"text":"△525"}],[{"top":183.13104,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期純利益"},{"top":183.13104,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":"1,269"},{"top":183.13104,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":"1,269"}],[{"top":197.4002,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"自己株式の取得"},{"top":197.4002,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":""},{"top":197.4002,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":"△0"},{"top":197.4002,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△0"}],[{"top":211.66914,"left":67.41156,"width":85.61141967773438,"height":22.82952880859375,"text":"持分法の適用範囲\rの変動"},{"top":211.66914,"left":153.02298,"width":51.367401123046875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":204.39038,"width":51.36669921875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":255.75708,"width":51.3656005859375,"height":22.82952880859375,"text":"85"},{"top":211.66914,"left":307.12268,"width":51.366668701171875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":358.48935,"width":51.366973876953125,"height":22.82952880859375,"text":"85"}],[{"top":234.49867,"left":67.41156,"width":85.61141967773438,"height":22.829910278320312,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":234.49867,"left":153.02298,"width":51.367401123046875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":204.39038,"width":51.36669921875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":255.75708,"width":51.3656005859375,"height":22.829910278320312,"text":""},{"top":234.49867,"left":307.12268,"width":51.366668701171875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":358.48935,"width":51.366973876953125,"height":22.829910278320312,"text":""}],[{"top":257.32858,"left":67.41156,"width":85.61141967773438,"height":14.2686767578125,"text":"当期変動額合計"},{"top":257.32858,"left":153.02298,"width":51.367401123046875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":204.39038,"width":51.36669921875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":255.75708,"width":51.3656005859375,"height":14.2686767578125,"text":"829"},{"top":257.32858,"left":307.12268,"width":51.366668701171875,"height":14.2686767578125,"text":"△0"},{"top":257.32858,"left":358.48935,"width":51.366973876953125,"height":14.2686767578125,"text":"829"}],[{"top":271.59726,"left":67.41156,"width":85.61141967773438,"height":14.2640380859375,"text":"当期末残高"},{"top":271.59726,"left":153.02298,"width":51.367401123046875,"height":14.2640380859375,"text":"5,664"},{"top":271.59726,"left":204.39038,"width":51.36669921875,"height":14.2640380859375,"text":"749"},{"top":271.59726,"left":255.75708,"width":51.3656005859375,"height":14.2640380859375,"text":"12,846"},{"top":271.59726,"left":307.12268,"width":51.366668701171875,"height":14.2640380859375,"text":"△747"},{"top":271.59726,"left":358.48935,"width":51.366973876953125,"height":14.2640380859375,"text":"18,512"}]]},{"extraction_method":"lattice","top":312.25272,"left":67.41156,"width":445.17803955078125,"height":191.19696044921875,"data":[[{"top":312.25272,"left":67.41156,"width":85.61141967773438,"height":45.658233642578125,"text":""},{"top":312.25272,"left":153.02298,"width":256.8333435058594,"height":14.267730712890625,"text":"その他の包括利益累計額"},{"top":312.25272,"left":409.85632,"width":51.365631103515625,"height":45.658233642578125,"text":"少数株主持分"},{"top":312.25272,"left":461.22195,"width":51.367645263671875,"height":45.658233642578125,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":326.52045,"left":153.02298,"width":51.367401123046875,"height":31.3905029296875,"text":"その他有価証券\r評価差額金"},{"top":326.52045,"left":204.39038,"width":51.36669921875,"height":31.3905029296875,"text":"繰延ヘッジ\r損益"},{"top":326.52045,"left":255.75708,"width":51.3656005859375,"height":31.3905029296875,"text":"為替換算\r調整勘定"},{"top":326.52045,"left":307.12268,"width":51.366668701171875,"height":31.3905029296875,"text":"退職給付に係る\r調整累計額"},{"top":326.52045,"left":358.48935,"width":51.366973876953125,"height":31.3905029296875,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.91095,"left":67.41156,"width":85.61141967773438,"height":14.268768310546875,"text":"当期首残高"},{"top":357.91095,"left":153.02298,"width":51.367401123046875,"height":14.268768310546875,"text":"△669"},{"top":357.91095,"left":204.39038,"width":51.36669921875,"height":14.268768310546875,"text":"61"},{"top":357.91095,"left":255.75708,"width":51.3656005859375,"height":14.268768310546875,"text":"△109"},{"top":357.91095,"left":307.12268,"width":51.366668701171875,"height":14.268768310546875,"text":"―"},{"top":357.91095,"left":358.48935,"width":51.366973876953125,"height":14.268768310546875,"text":"△717"},{"top":357.91095,"left":409.85632,"width":51.365631103515625,"height":14.268768310546875,"text":"246"},{"top":357.91095,"left":461.22195,"width":51.367645263671875,"height":14.268768310546875,"text":"17,212"}],[{"top":372.17972,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期変動額"},{"top":372.17972,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":""},{"top":372.17972,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":""},{"top":372.17972,"left":409.85632,"width":51.365631103515625,"height":14.2691650390625,"text":""},{"top":372.17972,"left":461.22195,"width":51.367645263671875,"height":14.2691650390625,"text":""}],[{"top":386.44888,"left":67.41156,"width":85.61141967773438,"height":14.268646240234375,"text":"剰余金の配当"},{"top":386.44888,"left":153.02298,"width":51.367401123046875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":204.39038,"width":51.36669921875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":255.75708,"width":51.3656005859375,"height":14.268646240234375,"text":""},{"top":386.44888,"left":307.12268,"width":51.366668701171875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":358.48935,"width":51.366973876953125,"height":14.268646240234375,"text":""},{"top":386.44888,"left":409.85632,"width":51.365631103515625,"height":14.268646240234375,"text":""},{"top":386.44888,"left":461.22195,"width":51.367645263671875,"height":14.268646240234375,"text":"△525"}],[{"top":400.71753,"left":67.41156,"width":85.61141967773438,"height":14.26812744140625,"text":"当期純利益"},{"top":400.71753,"left":153.02298,"width":51.367401123046875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":204.39038,"width":51.36669921875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":255.75708,"width":51.3656005859375,"height":14.26812744140625,"text":""},{"top":400.71753,"left":307.12268,"width":51.366668701171875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":358.48935,"width":51.366973876953125,"height":14.26812744140625,"text":""},{"top":400.71753,"left":409.85632,"width":51.365631103515625,"height":14.26812744140625,"text":""},{"top":400.71753,"left":461.22195,"width":51.367645263671875,"height":14.26812744140625,"text":"1,269"}],[{"top":414.98566,"left":67.41156,"width":85.61141967773438,"height":14.26678466796875,"text":"自己株式の取得"},{"top":414.98566,"left":153.02298,"width":51.367401123046875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":204.39038,"width":51.36669921875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":255.75708,"width":51.3656005859375,"height":14.26678466796875,"text":""},{"top":414.98566,"left":307.12268,"width":51.366668701171875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":358.48935,"width":51.366973876953125,"height":14.26678466796875,"text":""},{"top":414.98566,"left":409.85632,"width":51.365631103515625,"height":14.26678466796875,"text":""},{"top":414.98566,"left":461.22195,"width":51.367645263671875,"height":14.26678466796875,"text":"△0"}],[{"top":429.25244,"left":67.41156,"width":85.61141967773438,"height":22.8292236328125,"text":"持分法の適用範囲\rの変動"},{"top":429.25244,"left":153.02298,"width":51.367401123046875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":204.39038,"width":51.36669921875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":255.75708,"width":51.3656005859375,"height":22.8292236328125,"text":""},{"top":429.25244,"left":307.12268,"width":51.366668701171875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":358.48935,"width":51.366973876953125,"height":22.8292236328125,"text":""},{"top":429.25244,"left":409.85632,"width":51.365631103515625,"height":22.8292236328125,"text":""},{"top":429.25244,"left":461.22195,"width":51.367645263671875,"height":22.8292236328125,"text":"85"}],[{"top":452.08167,"left":67.41156,"width":85.61141967773438,"height":22.830596923828125,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":452.08167,"left":153.02298,"width":51.367401123046875,"height":22.830596923828125,"text":"556"},{"top":452.08167,"left":204.39038,"width":51.36669921875,"height":22.830596923828125,"text":"80"},{"top":452.08167,"left":255.75708,"width":51.3656005859375,"height":22.830596923828125,"text":"5"},{"top":452.08167,"left":307.12268,"width":51.366668701171875,"height":22.830596923828125,"text":"―"},{"top":452.08167,"left":358.48935,"width":51.366973876953125,"height":22.830596923828125,"text":"642"},{"top":452.08167,"left":409.85632,"width":51.365631103515625,"height":22.830596923828125,"text":"△0"},{"top":452.08167,"left":461.22195,"width":51.367645263671875,"height":22.830596923828125,"text":"642"}],[{"top":474.91226,"left":67.41156,"width":85.61141967773438,"height":14.26776123046875,"text":"当期変動額合計"},{"top":474.91226,"left":153.02298,"width":51.367401123046875,"height":14.26776123046875,"text":"556"},{"top":474.91226,"left":204.39038,"width":51.36669921875,"height":14.26776123046875,"text":"80"},{"top":474.91226,"left":255.75708,"width":51.3656005859375,"height":14.26776123046875,"text":"5"},{"top":474.91226,"left":307.12268,"width":51.366668701171875,"height":14.26776123046875,"text":"―"},{"top":474.91226,"left":358.48935,"width":51.366973876953125,"height":14.26776123046875,"text":"642"},{"top":474.91226,"left":409.85632,"width":51.365631103515625,"height":14.26776123046875,"text":"△0"},{"top":474.91226,"left":461.22195,"width":51.367645263671875,"height":14.26776123046875,"text":"1,471"}],[{"top":489.18002,"left":67.41156,"width":85.61141967773438,"height":14.2696533203125,"text":"当期末残高"},{"top":489.18002,"left":153.02298,"width":51.367401123046875,"height":14.2696533203125,"text":"△113"},{"top":489.18002,"left":204.39038,"width":51.36669921875,"height":14.2696533203125,"text":"142"},{"top":489.18002,"left":255.75708,"width":51.3656005859375,"height":14.2696533203125,"text":"△104"},{"top":489.18002,"left":307.12268,"width":51.366668701171875,"height":14.2696533203125,"text":"―"},{"top":489.18002,"left":358.48935,"width":51.366973876953125,"height":14.2696533203125,"text":"△75"},{"top":489.18002,"left":409.85632,"width":51.365631103515625,"height":14.2696533203125,"text":"245"},{"top":489.18002,"left":461.22195,"width":51.367645263671875,"height":14.2696533203125,"text":"18,683"}]]}] \ No newline at end of file diff --git a/src/test/resources/technology/tabula/us-020.pdf b/src/test/resources/technology/tabula/us-020.pdf new file mode 100644 index 0000000000000000000000000000000000000000..39a8546ce0d8ece82a9b38509deb5497ee4549e2 GIT binary patch literal 122078 zcma&NQ?O{uwk$e_=CEzswr$(CZQHhO+qP}n_84!i9p}B+C+_>Wf7M!4Wo5OG-Yc_3 z5z7gQP}9>eK@g8##TG!&)8WzK*&0|taBmX|C3Un6*0GRGIqeD6|vHH zG8Qs6v^6s3;el{;axm7nhH%Te))sff5_K_AV~v9k5J+GqoX&?m1n)zMXr^5e$I0ur z7K7ts6%TjJ>l1DQNeCn{F%g&F9N9AD9GNg#Vn;737DR|O7ytR|8abh}slB#;)MrKv!bj(&NK z)r9?9+wx_OXs?ANPWM(@P4oh)js>cd1D!zk1e%}g$sY$zlVi=Di%dKDZA@u~Q~H~o z4f}KGH2GT4f3ChfTlQi1;Z=F=NhbzDEBS2~N8F=26u9_Ued}to#nokB`sM1ufQGaC zxwv7S!{6@5vnedT+lU zSG1IM6f`h#KKJM8`rZc3Q&`7{Gu8qOv{dtTvUlAtacK6Tj{%PNS_B~?o~S$(HlQgh zxuEQC!{fD1gXc%CG-NN0G&uW&WSl;|c1Cx}knUtS2M0%6r|;wb-lj`W2Qv8q0aaz= zPwL(y|9)`znFrU{gg6=JqSNPutMO|96KtZv>BRK~JNO~pM!N%0j_ARvXs2f*#j;rq zZYckzRGPcGLK1ayA=!M{RpXg(IH0+F(DdsqNLe;zXwmcMvtwNG@gqGKuNg(^HF6`w zbm%>l&7*iyC-iY$Oc^~&u8_ApjHhE_3I=&LC;nl-Jl0vB4R2Ks#s= z%{9jXkpWZBt_`c|qbHSJ!ZOE_3qQt*QtX({j`^LAV^Q@J4UIRg>SXLBA&`EWM2?i3zTYMQk2YYh-r_%tpkxV*nk`#7s;&H zEbytT9ZH6c=N)x>r!REr$>mJJr^6FFu&CQR|wJftwPP{lMSWzg-=9`p76(`Me zF_{Fl)Gf$CvY6!L^3VGw%PaNQw+caYJWShs9HbmPE~>{uh|a%YZu1KiX5+Dk>xSPi zr734Jlq#`_rrPVd99uyuGdlu|em!$zl#aPOPPMdoxV%oWvK(l4C>ZA-P_*@ezLz5k zx6xFzu70^-B6r_2j(ym0VKgUlo{fKu3GM*1B}|e`dOD6PS$fVl95)`E6=jvIDsXcx z9Br;7)yyUMJBwkIwnDZ`_g+3H{1aU-5Xc5zV@Ce3`S#e*^Ji34&~7ltp*C ziznRA-t9xW{a{!6p@1c6h&I?O?S>qn0`XN65_b-FG>2Jnw1o8&%3qq*&{QvyYd>6r zsYsS!L<#mla;{3{=s4T*djm-jv$fXj_opZZQ;CEO)QIu5yl^UqnTM@tGR_aI-gX=a zy&yilK%GH}$q3yOF`$B}qS|s|+&2&lnev5CJ?CM-VQD|5N$3XbEGeCo^c0$+C`y=~ z#0Qlu0jYfB$YsZ>S=&SjY1|WY`F`{-KxnfW1}vmOQfP4qz?%?VX*q zz_X6@M?DpY$n+_ggv7zD7nM59pIK-CA5=z&ConK?BxK^#hj($wBxF+LIoOthj`X7Oj;l#4L=+%oxs3#EQfRoM3%{;e2)Z2i&JjIRcvkD zw?ZLXuH5{|X}^_{tDoIdlpGE+%kZ#Y87oQVWRC!iKNWRPW36x^e0g_oJDkm7%4c~L z;3Z4w*HLGDJ&e*Yi!66%L0|g0?9LPGCa7q7Re-JB{!$+1l~LWAl?<=(hd(-(BBlw* z4u3!*aqn@I=S7iMkqB}o-i>{HVTWAIe%yX}{(RoR(~GG%bc}>AMQ&%O)>M!2wU3L5A2I;q%RS zUZE9AaekvCM^oIND&GnAa`6m>Tu5O&$b=!FuzR1}`G{8MFCy3Y=dm@0+Gt`t$*)hO zfd>PTtjZch7~VZyUAc(?$uLo;slF16c~_A~RE`&~jiV*p*G8u`g*_G|U<#1TsXK-o zq*d!q=I(%)TJohBU4Fx5$R2gmgUCmpTv!B@XAN@mbmCS?CNbnGwtj8lN2wTg3ZE;3 z@(P~^Z-xsY$TZl3cmqwYzyM!5BHr&DS}Z^)cr+FjKN)OhxLz=LDYK;~s$7a(85l*D z*iMg(NBpC3q3`!vd81F^`3(c7xR|^sj5N$q@LqTdiBT6_O1-Ti!ehaU17VUU1=Gzx zu0&X%LI`{49B0g=2zZUhu#koTA-VR(`FI~*5=y$z(BI$LTG9>aG#Tub$M#3&niOhq zDKbE2%Y?%z_pPEET~7GSFb8+M16GWDWT^ZgD#^vFpqY__f(4+laV`$-W^Ckj^B^^` zTE*ecnu3Nd^G2|mzw=OSJ)E=%Euf>4ZkfJf24cv!))x)1HqMSCq+=y%F?=|NeGnTW zDd8fRi9ae;1pfUTg+Ca+*kMVlZML)BOQ?K1XaJ=32O}Wr&&GnMM}h*%BS)dvNxM>Pov8CH$d$u0dd!Wvif9gfgYwi+RaDTSqPge9#k|4wl=gO}P7PK!mP6T&+We zMR9lf?J-g_)%!q#2-O|4d$}0^8^rv0%p=bgC||ZBDneOngB=*=qGz`EW!TC60qmxs z!+`{3q?wuK&oCttgR0mFoSEWYl@K&qGkSpX&EjQb3EtB_95u1%ODf>rv4;4R#}Z4= z?p)?TngcSopD$uHAF3UvcEI8pdDVHcTMU%a_3 zuO$jGBt?j_-!_83_;4Wt+>}ZHXgy1>z3vrixcm*u`}0R~-^}z3ThoJp4q#KS0j}oz z1?x2`N+K2hBC_4`3Zt#bKv58uCXQm1!S+B+YHTd}?_9PdY8*z;lcHP*#AGJgbB83y zlxpJ>%DEA9sTU#q70f6oe=+fBOdc>!jR5w#7aul-3>35Fo<1w!?$#GDG9TMYUiKN_ zaJ^4tDJluhAO5pKoA7-t08Yi{jjiF+6N0&Q$RMz7kjXz;c78xAcQ2sL8m=q+mrv+_ zP%vJD-}|oLhe~8=DMH0m9Ap2WNqCHc!J;aqCJLdX5XI%SjozYXGk1WwahV;ximceKZrmhH46Gc+>_Jjt;02a6e#!J%KDo zq}KJL(91aoRpO7U#+8>4c31MP9hXBrtMpf_x645mR@^pMNEKP1yJ42k<_Z~XaE^!c z^C9^X&oQG6@8-H2%(mq;hc6Pa*H}wYFZS^?nO5>E|0DNRmBA#Q`%DWbG)s!Cf#jZr zQlTq4`&o$26sHqKG#k$!{T2yu=6GTQZ}`HsF1$oBPV&e^SlK{|mPP1w(+C?`*{gEc zA*sNcVPDxC7qx{F9g#9{ODf_0x0r``wqT$_w(xxbZg7f#q0awOgf&aUI0TJG{E%LY z%k~GIi|}*5p1Eylcae`9C95yG+SgAZVB7~JuSWfwZ9Bbfq7c!z+Q{?aWm~Ddd?uGW z`1Iy$ozm@d#igN|ht!mJL#05YKelDuC?z-*SYKZzx@pOsMZ3lsN+hZ2u!i4UHb zD{1bP=R2`8&~a<{jg_{BLV~b3aw*{=ZJ3Y>*&j|39vul>5Gu_sfGuMHeqBr8!ZY06 zvJ^`}P#H^SDkugUZ9!oPx-{ofm^{oPTIx7y{5;iZu+pREsRz$B<%h$DAf2%DJUs72 zj`Znv;W4HaoX9*@e+IQ&rG|{Q534z7fuxY%8w93LC!!p&(K8lF<&=$NIwKYU56)-c zhH>uEC;+$5>UMR2VJ45sMB8q9N`Xmk>KWQhhSFg~dO5 z8-fo}zv?cFjkH!_xWwl2M=28Hu8hrPRX)hEAT;U3fipiojGw~6NpOH9H0cmgU=y#i zZk$~W*&iC3Xx|objed=6jy-`^3k!`gSCtTl$FCZGx1$dopYidt^jOq3E50QY1&Nd- zU-u4U>Zf9-&#kk^pZ-qK*RBWoefa6Uv>MUFSYMnAadviz z6Ebo@a*@sahRO;-Jw!ce_P{r>%+bPF@kzF;=}IL0J0BI)Ub%JT$7y7#kjnDD$>%18 zV1lEmI(Hbfik4@~4;FVHbPhUU!o^i8=l0qF8^8cJqWP-xhd2T|JfOg}0TOIKj-S&X z77Vr2#OU(eJ5>c{+$v1qRUDsQNdA!J{ELvsv+5F;zDw_L5JhI_Gb8V_T$RAqGS|i5 zVOM`Dnx7M_n@skvXM3tLYm3Y#8^D$o5J5BbKicXr4PN{l2jJ7<8xyljJk^RSBno=} z6MwgK)M$h!U;3}yC+yu9+V#ug4EI^&iNoRns`0GWwL)brV29r~y4PCH@o(9b%k2MkCr zn}cv+ep++AaTj4R(E?@*?nu_(n5`B2DjS%QU7Q4L>HB9tIX>f*SMV)->v?mnCe7XU zIPO&OJuFEBn?_j&+SkobMovgNFoGBB@JgS_4$O>{q;0w$CG+xkw<_-0M5;uuc30rGR+H!tRQjLftb1er$031h^z3Em+}HAlY=E+K{P`MoGJty^m&3`b}t z?mGiq^p#MP;uaGnWzllzB_WW^-XAv5tda$K9;4#W&wEA8%Bi>;f@jO6q}VgP7dW{t zv2uF{=Bw>1f3i=8XO>cQd1b5b^o>`1SCW4*B4G2p9i^%KyT9ux0qg218C3KiUe=JXX8bzeOaQTweXA-8^#)Aa$#0R|*6rJrhOWCA5H)C;{RC z+eBVY9s^S(UesI>=Bc;baxNO9aU>;_^@BXvaO<2fj%Z! zM2U*#t?!YvG9qm7_~9P})WrSs`c7QV__b_8ts z3hC$q*`~p2cn1PI@@$t+RH%#DCPFGu+)4X>v%%ff@EeF;FauiH!6xop4N1cqD|y6W z{6bw@b&`xgiY5Re>1JLz(D@GaVoTMZFu#|=Vhxt3FWWl*`;7Wg1&{+{TlX#UwZ z96weDC!kVuG34;zg@(6gEMBL++_cQmg)1BQtJU<9cO?h`LnRx$6BG{) zDag*lJ=&;1dLdcaN^;Uc)pk#+FZ=N#Q3~v4EEBo6WZIA+gmB5_0cv?zT#m%Q?Nkv; zDD313XRl1ja1C;v6#02~2TWs2kA2cP{G{+`_8_UxVIcvrDDZ)+(|s(&)$9@tlr7j* zN^~x52i1&S74M9uh03-k=#-_fTVNP3@cWey9nvYH;1I8ms+oN-5`{2BS9EHE#whI2 z25z*|Wmibo)GVknLwAx2XRTQ7FG4sg1QVPM?v?eZmJ0^+b&fYi-`9iELq3PJzM?ruox>v;DKpBTyXE}OA}{ok&qB{D z{EN&TlK&#ebuxczG{z~76>76LKmds^LWYPamLM3%r01Kuyq(2 zux52M`b953PY9xP4K{IMnfl5fTKr;y;v_&=-o7y>Cs%JBKj5fEpwvO;h5DT#ax%eL z6p_iVcRf~eTf>=Bfg9@K9@3SVD;EIO-4v8Dvk5V*2G*-Q&hU@;Em>~=Y8+I zFjG>c_RDtX?3_4aF~7}#Fr1~h z0PX`on#qI_iFv=-q)>hXS*8;(Sj9#Ex!VS-TGVVOVBy#MZ;ub1OvcCgNZj?Pwe}6;t+?r+oyIl^&T#S8 zt+eB!?lRH(EGopRj>ht~Vp%m(-+OyWv0CO>ed5C*;TE;EQvWM@X#1u=>z~R-xw2bS z1fH!8G6bEF`Y}ShcGar|Xd5>`6$fsaMy~KgJ6z$aQU}NhvKtGi+KjgFFY1~H z$69Cw288~P5@jZIkdCIZM4#rs88jrPbta+rny*UB4#17F)SU3+CrAw zolhKy!2@67;j35Wzcgo*{QPhm@H>M=xR^Tx8!8r$koNK zx;unO*yCz$XEnU26aT6;5hB14l$kBGQKi7YtIvFGJ#vq;7MN zY{yl_BSNrZ%ZIS7$24(VXIC=)u@ExHW~^ot=CI}sgx+0IQ zlEaXtuD2P~xYC$8hVoS%UgPP~UOJdBVO^vpUn?|Xv|(DMmYO-{L+Sl1g>mmYDAHmP z__GwzJA2Yk@J-3MgF5S(tKzVD{b8#^;w>I{3_Yr>C6BiYq2l5E@{&A}H00(>{t;U_ zU&O0$4BSb+>r~KNUig=UH04r5%z;iOHHTZbaNYfS0eWc7mrMXgm)#vDeq%GjXfhui}ihJjm`YH zc;h?+KZ~DebL)%>eifwH_bft6EC(3@gylExkSf+$TdP}7oztBJ=7IkKy-N)#VW2Nv z)Uhg)osp;*>F{{Gk0lwEsH9hy1xsd&It7hIj(Tn4TnLi6+)!x!gXp>)#|X7L+0pN( zop{S?DHO0@4L8)Q`c~nQ-oRf{WJJxNEw^2H-pUwE6Vl!1Jc`*4Dnj%Br!)O)l5RdHi)aOSeeU z#~rk5KC0WC_iH0+<9puOKkq?T`;7ykYAX0wzi{MZ2GeQ;KcK$$QgN}3=$;m^Phj+8 zydSC%uC)u?S-WBmwaVEYeSw<(Pl=+9(0&0~!#vu9@Q@GsTLZ&*$#5GpI2&$AZ{cs7 z3Wij0;!`*lX{i7%1FVL6Tcq)z)k)A0$FsEQX=GNg^q4WE{uRj@2y-}fLE>-46FNn$ z^tqyNx%_+SiF7`~yTt7Abn{THZn%Sn2MWuf+15F(_9Cz78mNO#gYU@t^Y8$(yTpOQ zw6qjyOh)BO>29(j8*Y+NCw}S9M-+@<&+a-+^3yc=eUGNdQ1n@U2~<#HV%N9qt!ic0 z#N#L6$|+4<7UBxI59Rrq9glbGLgw#|r+;4(ih(;kf6b)AsAY1o!@;=>mY+573^;1v z%MaOfTkO(~P5er>$j!-O{J@+1JE^GO_IsnW$YMZa(^xUbfq6zkhh+Wo(IL;OV%aM5 zbb0olojx#F1s8TvV&>TG<}RXhwj&+ef$ApCHWE0TW-~x%!GsTzo%84gOKO1Bu~HcD zHYo86%QLX7Eus==bkdX%O>evf5@bx2abJ6LhFyXQhDHsw0U(u;Mypms>@1sY+TS18 z5}CjtV;iIYY198R`nR|LpN{^&12#H#Mu`7OGXC4<|KFW|Muz{p&cCMPRtxfq)Xq!s zqB#bsOvzyB%#BnE@t*`d&P7ntdukW&M2G56JjsUa6-x3>g~g{;)IZ=^uzSX?$H5Nf zqlw_*+-$ghj&^tZa78_`4N1i5KdV2#X7ulijQ9zvmE*67I%4T6$^?$-#qJGhNCg#& zIhz5jN^%gz{*?%-qsd)4UddT9P+|iKz7*Y6-QyZ#M~Ohe6T$^YusSkolod+F3Y8QM zO*4ss!$IKb4*5YoXyS0Qflc8Dytpni<*xPE_bniPd>xtuBi~nEz(!0$c@IAsc9dY%G?^b z#LGS{<{mm|oDhZ5%k`(!HO7nfxFp?F$p4g6Na<+Y$CscqSX;!`VPsY)O)wm4xN}-O zihO`B-;m1M@P1tVtd3K!dNGTDM9-_d=o{y#u&0GuCRQc@JSG_rTbkzdu@Pz`8zoI$ znvX0roXq*1cYnIxax48}Uy-`zaQ|379Q`zgep;BJJ7Tkp6^p2B_}G2>(CNG95EqwC zD!un!Kp|2c*X&Ij`3_LdByT20k)?@A%8G0z19N4I1lKylUocU4RY!`?FfuRXNXZo$ zRczRXspgf~$dBi7T3``r?D;QFR7{DUC?8)EgF8a@YT}XVL&}L(vLtSenp48Vh~rTm zu!a9Yvy0GhuLxaKabUyquk#Z`0H8Zi3bv)!47U>l)Q2Ax2kr|ae4O}SOYA4MUV;95 zf+E;1tQGM9K6sEY7AgE6LYWzF-nwM4P$D=K`z)b9QEUMqK65GrSP6V;L-zmfaK=11 z_}?V{>HNL%{}-ZP;mSxK?1lsk=sys4Vg!FgvML_F`~Dk3?EKTeT8NFvzb@>M2vBcG zp0YA_@xLb^72krkAneBh4-mv8g89Ld(t7yXGJYGC~n@bsAu>q8&>>oPx zr_p~f&YwYjTP=*|aAid+Tc*5wTmI`TFYo{{*j5d(cXoHKmN4*pZX6oTTELH`|IJ08 zD~;Fszw0p)`2OGA_QEni{#kKk#|Nkn5c)5BathxqA@n=hIJ(xm&S86mmb|Mvt$v^% z5~03bzJaX>7+*qgO+1dT=v9DSc=bM4zJWa>>>fb`6w=E(Y#k7@DUW=E0+`cdq{l zN(+@ULH`4{^)K9ig2nlYV}RZIe~RGg^>1O^`&_xOt2I#m1DE!nr78bV_-EQQV2>ds zyv)fx_Sg2m!QuH`>bWqO)TP$-KPhgt5>$M^~LmJl{`NBo877x{UHg>LkNYM(l>cDhjf&y4gggw26`F8WU5tq0_b>56k1i4n8hE z?H1{n0xDxw!2A0Jm&(hfBhGu0W9w=q4Otj`F=b4p2zg3yfI z@);0I_HG_oRWvlQvNE(ycKJjz$UEW-EX6e;7BfyaQt?Gm#$4%_T3huP1*nWGFcY!9 zZ0tQ;4AXCe7o*CHlH1pb!?~vJp4&u&bdas?AF?G4cTvj4Ql%J^S)~)$n2FmwImYD< z1j2YFsV51`%~?3u3(vxdFi8xxCA-sG$LQi&EF4D4ZCnQU6XoZ~%iQ?o!RH8yk0NKs zq}7@I?tlc7g(o59`GDW3dB1THy7R=!jqXz&M%I>&%9qBOUM5qCbI=rvQLDz;Q_oX$ z)D|C>b28aGkaLn|l4i&HzJdIk>bj>e+WVR5f?ykLs*leUtLXgZ}03$aOAlU~e*4Anx~0)~Bg zwOad^%=Cq;JB!QnmZ~y1qN;P3ebP_SWsd@VZu3hdvf2iYdTlX#A6w$DvGS%#pr!9` zWS}JU+j9PDWS@$pI>3%(P)A0m$Kt40r_L(B z7+WGr+&YC2&ZG@Yr~>d(XF$uo;M8bpJ-!IG^eOa9g<_Redf}Fyht%x`CH}2x{9swd z^mH^D(!}a@HvzSmwR(KC-lG;y^52TC!5^FR6ptf;N@*#{tcLo^njlvN{CM4zfI!Wc zQ?>e(!@(57#?SnLe_s??g_ss1QMn1lF8jfo&)KZRem^SHI%Z(^K0d1zqb7F+DZaBL zaGh4R>UOqg7%Yi;l$^jQcrUxXq|$EP5QlVCh0W^p23Ua_t`P7IGYK)q920o1oReXE z32HB944O-;CGb5+@6Ry=)oWqE`Edb&w7G4r0S(htlJ__rEE%;3b*=;Yxo9h!6h`!^ zkb}25b}T%MS}Z7uwj|f80JuZDF~Fg)&(wO~S!V{jv56}ul}tX^f-Fj<0qg!sw&F3S z3Y=ThI+IJ4iex5PAXM_tY?M0@!hz@^6E|{DR+~x79oPLd$Sj+o%KVB-Th%hsZ-3gc zsM4ntE1#$K-qvth>sjDVJMOpkFCmPCC1d z?Fnm_rZc~hk}}oq#_8kNgPimfEeHdWx126=p4604l5c4ocMdddlcsIVnm+z>F%gnz zcBGx}HoELG(pmn%qri+j+}G*`msxPe!5sZOy^|&recu($*!-v`cP;7BGPOt>loTr! z))|>@+>WLuW@%j#%_(Nl-fo3CQAm@&hCUIDx$~h4tmL1l?&rO(n%a2U9;$75wbwPr za;zjlxtz8Zk$$S})>QuyOe-9`JP*;Td}>=6@wyeMlG8~Mn(y1H9pAd?8 zu7&t6YAFuZ#Rx4&73N2R5&5QqdK-b>1J96_2TqB^22gTbMPM@}=y`7v{dtj>g9hs1 zRRo1@x_|0%-_1Xy{Zm#;xfMx!kn-M!Vn%y5wwR ziz)QzOo6qzVl&+Q;vco==ia5`h;pBd2C#MKRG>q^Zo`9lLtlq<@#q6U75n%_A1|m7 zwj|#jLBZar-^C*GxMVf#jNBkJinb@PY?U3ys2u~WqrD_jy2A>l$=(eH{~2dgWsCuT zE=)nQWU(pT#axqtRlg94x_(l_nnAm->OO5W`C`Qx zl&r?=>DYs;AILq>`eF7kMq=ru9Ao(0Wir$PSlQXgH?m^3$XPcfQeR=Sa`U$QnZ0N3 zIvZ%RO$W^}RyXoMGDy!klaa29PG7}Rlfe!dNph8$^8G$97L{SDP9bcLaUKR=mmF_~ z8FL?(-m1+hnn0@cz(o6D(#c!vYQ}}E_rN@&N%OI~hqURCvp+c}1G9 z86p+GYEE9U9XbVHk%)>cpY6%SujdQF^5-WIybSbP)SJH}Q=cI8j95mPST2JkT= zJqq@(+Wg!WmVxl?a71=HkqWR$o0h4Sm^_u?wBT~fHaBILeX?-FddDr@DifM}sJlwj z7$uQ>;U}ECzAF&vHz#68Vq{OxQtF%)?NiP*|mNw;s?+Okdzg8x1Y~;uF1^ zQ_#iFUqor0m2<odOz+21n) zQxJRBD7?vk$k&NwE6FF4Sq-Z2xObG%L_8SS%AZq?}rm$Q%4zU zF6XqeDWODN-S+3HZYaQVyY&!gw!yOvi&){W_zTEG5=5AJc=0WBD^(B^%nNQ8usy+n ze|2u=^6jOI1&?_~ISwO&)h8GhAjDyPBGLg%h4};v9RPss6PD&*kvRY*geU0Fck6Sb zqv#iQqH&Y2WM*l3X3?2A#Xek_Phk^*{-n7l-P^C?7ho()JA8x3V#_?7Rawm~7> zUsJ2SI3b&J)3~?~;I1CRvJmSDo@4klJG-6@-HO(i6#FfHc|r-?aHr+%4kTPyr~U$- zwsmi_(98&KzFB$|m3OvJ6HfPl)BYv-%FE8=ivDVcyWW55+_M|NJpd@$P2KkM({-Q& z04U)(Ildia_Bq(6Fh!jTpL@9yXrj)+iP`2R-_9C`SH_b34xJzLjoqv6wm`Zh(G!jo zgWBQ0BS?@%rz6o<0D|qnCCy&g{q(8k5yaUUC=IUCr_RxQ%G;rn))wD+4@v;;U`n~GNxQ19T& z*qG(bZe8!~TkXnv;*B<68I+4(4uzvzyz><;SV_$HuXUK+#BX(JX_bCVC<_Z8NJU3P z1zdLRicHi~{_~LAr|5rvj3DW+DGjalJ8MG8H_1UKgpJgTJZa$y?3GpBvn&0C6l5SD z(B-IP%2HY6y;Ll2Tfw=dylM2v;>x-4mCwHB&}%uLRc2VO37B0Z{WbdG zIVA}<$;95~(Q06?8JRRZg_4;=s2{Uaa`zPe4}&pn@@Y@1AX$epl2LShy;yUu^Zu+W z?))V-zjZ?D>$eV>3rQF3xLzFZv{BV<1pkMZ^dFDtU)zX@nVtUs^^%zWHIDwbm&C;Q zf8`}%ZrWguCj0HA0Sd?erC(rL3oTGXIq@(xIbC5L?sy~EY!DikDBzhxGH#C-3Q5X1 zk^Er)Zq7+pzsXXc5sRP^fkXDRk#K@0pzGG@dS~XgVSKte>o8NK_VvAZC;?PoGyn z4jQv!xxu0B1Gp)rv7h`{J)`<`nWKhGfff;wG0}mF>6CFvu-6uoUyyoem{Vq9yZnjc z_3U}Kg8YGYX^hTht!=nI<<#u#i;L4yPYO_02;;i^w!Q-db5vJ6L7xv{ST2Z*F!7Fu zj`7?0=>J&k?tlD#wsO5)u3XN>sfMU-n(A#tS^?c|y=#<9dsLus2qq}L%b4Rsq=86= z2T+;cAWNuyF}A&P9o_$}0ho{i5U;RYeZn4^)hoNceqOblg>6_K(Xj=H1xH-MTbgY~ zA@W=&24q5l%9emAc0iT9|??cOU_wy@p-!AZ2DKTFUQkv~R zRzw#16Jl=dzbLtm0BpOK7f0>f2eYuIzdx1=tz0k>$EZwEw8_^d`qg7{gnt1I+=!lt&z1X^Kriy$Ei8`yV6eGNfQMOOa8wZ33LY02o?*lb36{Hs@4*Wr%#Zry5MN*< zEw)N&tW@NGWy%KF)bQMSpoRKS9`E7s4W~jCb(GR%qmSO1-~cqIMg@bSF2!8YX9J^b z*AU5)a@@Yd(pYba-?BpB;%;&JPB?wAt(b&C1e;niBK-68 zdNKq6yw59A5-=oMVC`P5?lkVoBW@ua)GjKeQUEm~Djx!Kf-Gd(W-V#bcHK3Y`3&(d#4?8@;=&5O$F~=x0gCG)Cf3Z+GTHYX^3>Ih4;zm0=hco9&E@fQcq0f@e zGVL#QA3VfI_w#nE;n`5oAQZu)V`q`Vy_eHL>uiV*_vd|~J6r^#{NUy{EDrOf|0Z~{ zLdG%RTA3c8ZQU~V*KsJ8J@-Rds*h_>nhqNSf`!!0+UD^PA%QppuvPR{Se+h3ygN%P z3o%ke_XJr{!sGJG+G18T7gvLnw453LgFet*zB+qRM7Rb5_zh8WmB}mGwMkA2yeJZ} zR3Y81njpG+N;EW99k9+2dV)P#u=CKB!@|N8*h#z$x1Qtx56CJ48di7Mn72+EJAzk; zmB$hv-oSg)x-d;PP4KV)gK4Mcd6<^LlK(leZ`&f762EosXxCy}EmWItYj?Y9F+AYoinAf0ZP4tODFRYucXm4cYE zZMAQV9G*^#Rb*i;1On=(2}C^gBad3(4un?aRo8VY6`X-nDW-UrnenVgOMq0>~3N`r`d;m9V0fHd9Tc zl&ITo7phPLhF()WL||RMXj%V^EHn+}jAGf$Skk z*Ticv`Am*WML|aV=G34~?`W#fu zBnQw{1L-3tJ2?5H!p2G>A(ZtT{`B;8ZhNMw(c#kWXi{m#5BK(DkY2Lr>zzjkcmF6$ zs!{Q?0TOu*afbk}m0AcKbia~5uyqW~UPotW7Q}+eVdc5_0T%a$cJzM$4TF~r)J7)u zEc_{PIEnny{*qEwwW2-DoWzIGKzTO0?{^B?P$bs^r2K-K>$2`@&LR%7 zG8Z{bgh^#Q#&hl;cWM&Bd&xBtiv{m%u!vJo99Py90rv|j^yb*~)BUa!<~NwGPU6NZ zC&eYZ{tA5%x(dJ&Q+hhiBw2~Q3meyaJIuTxF_yZ-WR6)i5`l+%&JFAGV{P+R_G7nn?_JT?(v+ z7&gbI%_BdXnqkWib+6e94Di~5ac}A zqI>AIUAa|YAc1E|Kon7^!UT6{y#k+<@Ls3`kzJ%Oi$s#CdIarg2y~u}rXQ=^p2Zpy3%oIi z-D$jfFQ_J?Gx@Qlnc6lg1dqfXQsn8_cpSAgYiFI@Q6uNkJV{=Q@04lsc!VJ( z*HT+<+sp;#=^sPxRdDc=HG7w2AN>vI@|hqEV#@bd1=TXF6(a35Bt2YHwb+KQBndg-6S6xnXvq3&wx);jDePck?j4Zd zCuYU&h6F@k+406@)9gUVH{cr=7{Daq{}4I<5ikGh8Ab*=w*OD$u>PMShwcAHvu4cOV+1j=hs-b zqCu*Xf;^HzGSaBM_Mt+?cpkZ{6fipzrHI_#S!=xWyO#*{Q<^kf>_>kC`8u@fn&JIn z>51ZTXiwI63zd3_DLJKuJh|98K8xm6Sf_-6HBa}|H;wo)_?%xgnP%gXq4MIww)CHE z_ndy)-%W3d>Rc0=Tg#MGRO}(tGtQ5ms>?~dDB5L$WP-~qB@JDC<)>wTdoE5=zqjs` z#M4)eH6n$QH8NrqkjpEK9Gr9Jt~2>5FErF4+GnQdPzb6ggv8T{87iefi_7bN4MB19 zDkf4YB!r@sq!Wv0imbb^n};F3EBC*z)&p&OJifdgcIR0Qi_D@}Ja`09&6WEO<6q)4 z6UGkbI}(~bxpoH8+m^F%Bt~wS5X)^{iQ> z?^IHKGNlo_lozFqZ<7q&<{f&+EMOaDETe%SnsQ*Zbj_7v)_Bm-!YS__O6CWJFMPWGL1CxeoVT}-mY6&Gf{{Lhf z78K<)!`s+^3q!QP`p5B6L+{4`P?awe9L*`&X@c~Y{Qe)tz9~wRW@&fYJ#E{Xwr%&c zZQHhc+O}=moVIP-c-!XbZ|`&di@pDgb5T{RG9#arnN_taR>Tt#&;;xpJAxQ7I1Xhf z%QmY2AxoH|U=MIf3XKq=w-^aR$i#85|3`Ed?0*qOPjdWUL@7xA7ts_gw>4`jMD!57 zg;;1pc8-HRdOVH;gI|kGv!ATS}!5Z)^HhP~ESUwwV{^L+l#X&2AzdQ)7-_C&_v_7}PNYUIo+om!REnIIY zA-bTQ!^q%wYbpAn{V5*xsR#q@#hVJ=*uH!kRx)n=QZR?M!Dd2~Ed4mV}Ov zXz(Eaut&__2v+`mQ%oh-^-PYggA*%B2S@O|+KWLTKQm~f?;9yq0#AGXYy=s$eyZ`vYS~9>FRdG{}y#9jlHW#*99!x7ovBU383(KP``*M>HI~?w2&&MZ_%M z1$~sySh!5*rjwbDVlVI6j=rpxwAAo@db!7GeYtdKf2)t!GBUd$I$M_ar&ZtLhI85k^& zs#maS5F1Q{t)IEO70S?PTyJ6F0f4`7xB9Mdv4;?$?4hz)JitM?04su zr95u3ULFfpn$r5_3xp=Nop4wOo{0+ellv3~n_dCqTzkrrOE1el$@+fvUkK$Mp{fLNc|$Mb+h<$MS1FUwq&Sx#Yo>q_Izlij$T8K_nNq zFI@NS=?$`e1lhc?6#HSG)iKvl9pYk^q{rui(Qz2E!~QD0O66-cDO*L`G*lNPKme8{ z55I5`B0NC<5AxE2riqB=Jba|d}4X|ctPmxPlZ0q=aAxb zBykhHj#G7{=@PS}@52dpOu3>k)1mGkS+MLMtxBMw09y4cShnaKqv)Jcr}CoBq}Y=B za@FV@tp{Vwg~_6y;AiSb5;P$DnyS?-$|dU6lJf?R8J-~vJzGDu@F&sR$)ikF?I#$t zw$tb&jQ1+at*UuCF&{fE9i6@Pyv(h=3?kZ~54$Zx*w{Xu)&*4mRCn7gS9tm(G8X9L zHJn|FD^__{BvY{XMueHiS%ar@|JHmEZo& z+L8(*CrA>&9_$)WSi}lXcGZqaWF%UkgqM?~a7q6XcMxq5{|5Y*|78yY0w$$Y5*n0j=cRfQLrtrI?BS z-vGSchdc&TGH`l0fr*2M2Mg}5N~BDUyLXnfR6+|@b$vVwF@TJevA!g`!uGF9VD0TS ziF_hjd1RxdEa7hMU+YiVg)0$L8FR8q?NS7%*A|bpFNJ4g8#9aUzdM6Q2mw%^!ehP1(h&?G&Kb ze9ARWbsE(LUCuS-ja+Tqzm#qVx*H!sSxfDgK*lunfyE@YkWU*yYW1T)mQt^B7xhfW zh7ecLky>&!5gQa2I!axa7H@JOiV%XfM@loavvxUWEiKQF{pmw~brLeCAuj(r^I2bf z4@(Qgi9qJKX|}{=mGU|gJL9d_b`pZxZ>Hd=UfjWZA0c7If{WxZ+AC7}1L0G#Qi)RH z7{&@e6*tme%ND|!hmpQt7qNX};UpU1rLLd{ZqatX=_mTP_OjUvS!rXy#;*t)Zd?wj zjslM%1f)Jp<2sX81l^SabiqE%U4HqJnU!&yBv6X!^y0*$1{eRBGQ5r7Ta|!M zZ7Q-7T(*isI~p<#PR!gU<;aR03d?i~ZrClmj^NWRQpR0{ignwTy!1$v*k2*tAg$|* zV7%$6rAy4H_7U%r=a1|cc>9_n3AM^0sg^JN@;AFiv-Az68h@%pzPN4OPR^+h1yyC! z9-;dWOQ5jI3Km>zgV55on_^OyFo}n$V%XlprZowt(H)dX+@dN8(g?eNQPY6k8$R;r z2z@?3RDUKhSwX3=KW#go{w;^m{p}Qxq80mc8!Z-bR!{*12mj=_bF{?p{=;lB)<<4-JUU7vcPqi+hp-Sxx1iEej*vD;91xJ(?>`O)nI{7KKIuGQsWxWRy zko7cYy$4&Y26_?wX83~x7fks8XD~^NSui4La|6u&OeM7=6yu}Lq^cHU*|<%**5vH8 zcql-ro$?E+c;(pc<6$5=XF?1V+c40@74!)004GND07p#P=DE;a2%8p($gD!7k1#D2 zvM74wphE?e%03qo&p(AV3Pu?3=BvvZ%(APJAvFMzk$vk(JYN~33BeVmiaRbKQT%py zJ*=n>WQS0IXpgd!oXuIz?Dyr+Lo_KB0#jn;jzHdZ?7n}W;bSOUBNg_QR?k*#UK#gg zKH7o37^rg-3>QbY^{xZ_g=O70?`zTv!gKY~(%e}-5Ls&J4Fep8TGXTbXXte>5MMho zcM3;7V=-3Wa))yObVvNc&wa#IxDnnzC_QXLBp(Ua`k?$z4cC*01L|&`j^~>PpC}FL z5*AYB%;&|-=U^R|J#2XB;ZcuK@;$#0VMV?7?UJFYHlm{vsz=$toxLt(deP9xBgrDrT%1s+R zEaP*gQz(^qhhV zCtG!g;D1is9%J0|?XTWXB0qlN858Im-fbDa(nrlro*ec{Sx%@8)z{T!U5fRdZ&L6i zyK-U`++X`YjyRWI8*yu6XdIA=z?#X`^mz*D^MXf6h|igW8vhP{;KnWh(#l%55LI(vn3S?m?X<1A&0a)HTt0O|uEu3-kem{wWFc)Sm1 zSo}gWkV@{Wz4`%V4$&ffKkcSIpj7uqUkRe59;Ddsn%NmaX>@Wao29C+_E5A13M9g3 zQn;n#H05MDyqd(PDbV(F3jcQq!L#j~D&tZX4&k z(aJ|91wv38Rd)#~c9bvJ=>`OFLTo3v6hEiaY!J$uu7Fm$P9!+`_M=4%@P+_^ul^Br zOe~*A{yVQzLlM1o%Kh?f4=Z?ORe?-K_RN`_Tgdbo+`#L1s&*P`7AJhW_hjSLd2h&) z>Hv?NF+VCJ+Xg%xDU@?`P3fEYjcHaFMc5H4q9bIx;^d1g;pL`{D7gpV;hR|EBe4GyAuo ze>07qEuh-Xpp%q?SZpVpg<8CoL_c!Pf0qQ|ts*e4Z6-hdArR={*f8zdkFfms1nB59 z7fRlI?J`>}gbCv63AwUqV|`J_nSht*=YYLeo1|fEDP#N4fs5N#fo0mc_*_MRtsp`%H|aZL2X{hfOyW ztlB|uWHyTqv~sdX@J4x0n!TFnwY+x}91U+wpAf~Bk1zfrHyMDJfqB`AxpJcP1V z+KPQks}wlv`Oco{gemt=3-(%dv0|dLgDak$Y(D3|*-JNXA}M!qF2~^uH;^`R1k66hV8^&H;mz@cxm zqiDKjPK-ga=UY}z==P39{-k!TJ7G3b6>h$~LWViS6TK9S0@Uz@Ls4JU+P+`5tPl=G zA!F?t?sl-y9TB?1br{DjTerG#vhkIdlUqK9Q0WDLBnra(d{HH5*)62+ZN{oo2mT`0 zd_zwP9110PPk|>Ww(})1M*{iwMc-vzl8RZU`|0oR^VPXO>CI&0(CtrICxIIrNNjD}bD7l%iXQCb<3Otu`pxe4> zeleQ{zjS2E3GR}<$x~InKXWmpvKTtvQ?6dyQ8oe zc6%~jqv5n0-e$+8<2qnej8a;e80VLLr=$OG6ixe<_oV&NLq+-6xFD+%-D^A@i5Xj9X}~BC>qmhu`XX6&%Isd#w^iA z@|tp2uV~~C(kP)MB$9p(-9{dg<|!GMd@K#uv5$CL%5znIapD;9J!o+3s$b3Q92|*U z8IBv2q|FGAW*SQz2&1dp&b&5#SU4XpV!dBl8;@sPZJC@`WLRqM#LmgcIE+G*8gre$ zS3F_CKr3saVJ;3a&c~O=8*8UMME9)CUCxaIw$7#$nwvfz0evPRsKO~4O?*md$sSd( z&n!B%2yK+7i9rW*HGyDMi1CS-NeHM_lY(o|+MA~zCOq%HmOYGgy(IGwOHNe-_z0yB z4@EiXs;&)S=ryo2`*X2a{2%f){wB5>N_|j8g}|(s`6C!Xa;;(eODYjb?r>bY#_Y?9 zwfsW^6VRZnRLFUY0#@@Q!YaK{v=ni9QtT{dsDeTK{yz!8_`{Nsr7`z@5DHQwP#GJr zY+bNTF)ecnL%hRzbNze^-HPGi3cCSKF6(tm^8g-=)MkQI^D9!hRr?Ntf;F^9LS&B| z91q-~N7J}PkgPhW`;NcD8rmZvvcrf-`Pr*a-4>3aMCDE`L*y6y-3N&?v}Y`62N^M= z5Ts^78ZsyeI)i{lhxkWGEmjH=&X7W6WV0@Qc#j0w3?m{Tv`3#>hYU2Nj^Ce@bV%X9 zU>+!1Fy%opX9WTsdU^a_5rJ^JUEMl`nU&jAQSnGXIOd_1IFP&H$g~WGkY*Fd%l}BR zAI7sKhZTd{gPy4+krN97&BKJxU}wCrkbp*ynC3+3kmQu7H7*P;LK;g{ zFkweym85^$(6oH`e6hrK=eaFE_IX6$;At>Pq#SE@)`bnxK_ncFwL>+6(7!+lrN>Za zD4K~*o>5Zik?L+&uIXUpblMx4uhac3bs=pkWU01r+q;kTvtJGZPa0=D=ky)9rl|MJ z=fJe7?br^55b59%BnqfmZ1p=eyy^$*CkXH=fC7>>6CcXrLdxPdp;t z;gypGOSzFyF|2a}LyK2%E2tNPRRD9a5J~tb^V1fz7<#!DiSZ~&5SgD_$n@M11pJ+s zD14Mo7h6eYI(_<_5bLdAPv4LwM=<(2dd&a#PVqGHvCI^Hw0s|5Hg9*&d5~}>fr8r{ zeOx&Txg>du-JhFZ-OG71l!;n|O;|8==Wcx;Y|GEJqM9>RmoI{{LMGN~_!1;BK7jRT zKCaU+0K*C+TV*|$etT|e1R@o+zv4xY35&X%7_{M2Maq^dWUa>bB;IZ#R4*zs`|-%t zj-?@qp`r6>z2?5LVa(l z-)D6DXSHTxUBS_q~P)eulog7Z|(Hnxt_B|^+)Ml0(soPMBx)0 zhEN>-IvJc76;f?upSd5*(-Tge4mPRTBD~CfGKl=MIlorg!Y=V`m+G&!$z2y=e z!V(nD`p~cjZ;r4UyCNsB8;?HQH+N~i@8<8XfS3*~Cg4E|6)c?k$3N8t9vMZ7l24TG zX!iNjT0U0MO;OPf#2!}rJEwrUWVX$GPPC=Ou*29KSR?Y^H>>AW}$aRNNNW|LSk`0u*E1pU_BIm5l7q&OP^{ z5boM-mpKts=_zujS@#4}!nf&fa+A=HDmY1srGwfEfL6^Ga%j!>}aEUbvqM|<8 zNNS#Et)DLZU^!L=EYPk`N=vHfm#{{uG&ox@8E3xu#ivjwqW4fduL=Y(omwL*Cmks! zlJ?Zw4%k)UdU))uTRKJ!rP*2TwpS`6!+t00gY=Ms6`hQBDH;iCYu-EcG`% zZ0e7X@4HgMgCa6Ig2tTYDVkeCgoPg2r-nEWl-%L1a8A(1oN}3T4HDNn%7IIyJQwA~ zbMtcjFm1chXPcjXzczOO+Z3cCns8Me3(HSmIx-(FFmd}?Zjy{v3+4%E>)uUqy$0#j zsvFpoXgYS8b#u2tsgRcAt z)ZByV>`E8~) zb8=i$(odR}3zNJvKTBiVqzBriK%lfYEJ-4Lki#1Jr}ebSc;?L6F@pj!jaQKwdqu+7 zr0L>cNiHc`W5g~s@%G-jj_XR+7p=Ckopt=$!|>mVW4Ve|KKaJ`A(Fk(1wp<#@FuJZ zLHoeq>QR>2$MnNCzvhR|6aSp!nGfb^Q>weQf2A|ubGL0MG4@euWH&kNCE{WA*u*~& zUjG5-XI_>DC<_LWxkS=2*@nw)?uhO{Kb zU#$w$FN}N=81-YTbn;&2mtiB5=JVx5y$?<&MP-(ijCHXjTA7n0=hX6OqfG?tIE7Xs z&aZ@@n8ZCJv`|G!7BI&94)ktX{k3B**NIx5#3_J^O<}9;5UaKI^HdEj3pA46@|Dyt zaN=EFbX082Efa~xyw=@!2rSvI1MZxSz~Hq&Xtk9SU4M&&1sT#CF5K41WT~F}?FyuJ z%x~@CZ}OK@4R-dirHb~7AN*+3<(3kCjaw^eq1u4v(R*#rqDBI`qeyi!ROB-H4@9zM&sPD|gl zN9*=(MP*&-hY2|aKYn_x3l3*K=gX2aI^u0;QJ;sJkFV7V0Dg3V*}c`@j}!p?C?nmp zn0n@m4!1{BmazM7(9K@|_@@w75>4P?O0~?>;mc$H>^Y!4L7x6K=Q|D2N55?c&c{F#00pItVBtERk7!7hs>40eoy9 z@5Wq|5b2Tir6Zk07^Lc0$-cqj7o_g&?cDeecXX;WwBdzVLW!@3oI`(7ObbY0KIBi1 zjp5bR_1{i`HyD>lEQix0{eg!ySksDp)L6D?*L6TXmK}ByMx#33LVgwSIrY<_Q=Fok z&wzuOUmP-A$f^O{UxF@V(~tCL0WtMl$z`G+)z1dSK08GskRU4@?49m*CGS_gAG6QT zTQLQryEj>HhjZWpY`f*h4uI(+W3Ib~WvBMVzVhF(FJ&pg%CdY{8(nVRZP9}*F8dgFI9WQF+ygimJkzd1u^xD_fl5#0n`-XXTt%n!?}e}T$=E?UciT3 z9hJdmRyiMbpx+tpF}ufIOf{cy&nBMLY!>*0eYRlv==^OWC!cI+?sKAZBe$;v6l3s` zX!O=4Jo$QMTk@hn=HQj85gG2^k!Yx_ysmRd`x<}G=#5&h%z=R1J4@A? znOMTjo)K2FZh~*L3BCUzg1fYB>jSnSBlra@b_qxiaZG>(1UiL}e8$4P#75x{+s6&h77H5g4a=w1 z^8P^8P6tH&$`2I!JX zK{R!`9mZ@J#`GUd5Uzul5E6rs$b4y1Ex3%&ppAPv^1i9DhfZm?O@?0b zps+7cK0?7sDeAhHQ+&Sz`h`n7bKUKI@S12GIir5FAWP3-Yp#`9QzOuUDCb%|sqYl$ z93wcx4!U-Cu^9HZH$0y=vHoGY2#9rFDdSdqAwo+ljfvP&D+^WDQGy9Uda75KJmiux zWU>6Ar^7JHpeXVDAo>=5!p?zxxc%B9ZK3h(lo;xx+Oh8L7)4x~>aa;D=6FtA8%j5l z9wpanHF-%jzh87$-Kwp5)~r9_y!hnGMwNDBhGB?P-Fy?2$z2*&?m+ksoWZzR8zbR8 z{1cU!Z>oF12C@}pT;#}J!xO(?mmVCG5J~G&QlbD>-W?evMG~1BhgyYD?U|N(HVS2i zl$#4grX3Ur`MeH_&|OMK9GTd7Q92N_O`J-fmvQw83v_<9%EHZcX6T2s!S0|u~7B=`R=hhSTH^2>W#k2kRYz{PoomJ4x_f3Ls=DBQQ8vP*1jiU1}P_7nJj( z?-okae;|GQP%FS#NHvg{v{JZ6*3;d=kL20Hi`KNn?kUzPC~`))i^h-}k6bU?#f*hO zLfj?m#gR~_F=lkytrXq(t!j(i4*r?MZ7l7N*xG`3k!yEBPdj{X#^OH@&w0{rgPJUQAH1 zJ5(w8cToS&5)G*ZW)G-z%GP!TU^e=+pmO(&%7;k2N#o4*AA>Zo;L@Usz$tce1>StH zcTug-fBlZIwh&3whq-RaVVzvE1Jw_gkc8ZIWlGUZ0}9_051uW9jD3Q1NRMGSH#Csh zKuvJ=@YM`Avf+`DSsII(N^-c;R8wY2DcFnr)6RtS8YiW52<~e%4)CM=C4l1eR7XKmVY_V#_X3mPA7M8^LcLhcAwah}UPH^bc^Pqei5f))=Lp)*Owj6F14opzV(aV-iVhC!CSgW3a&5gQ&bB zL#;B&Q$_(0JlqzZIkxJxGCFJ026|BfNjUgaI8X0Urs@JYd{5gLYuaVlK-Lu zHt10r%x55VR4bOCkl@lWeH1ns<)R|hBl>dQp=zZ(<^sg?MhvRJSu5+LxTm1yxtS7$C%LqtD|64^hqLVwA zUAot#4yy}mk@|gsLHPpyp}{E-0_5p8i(_wl(1)WQo~hiFW$znt_&(5EH*8g?dPX%-2v{kwAC=)b@lwszi;S!7=P5jc8be0dnnLsCMrP2L znzm;_8kHq)^(API1CeYz%zmBcR8xa0z`UPj_?I|r$0B^h@9$HcNylpjthiY~I@+Zo z%G?Z)C<3V-B4ss=<6m7p`#jEp4^NUk+rw*Sma*vGIeuN!6XYP)6E|EtF~Q0Y$+~^{ z6WgUTETLpS7Y7}Qf6zW{kWtetN!1z32M2GA?D=Q~LQEn&(`w?jgb-q^Vz!t2KjWz@mL|p}du) zB*64FZ9++W2q|?ijlYA)sezX(fE<>P)Z1>{H3(-2qZbz1tJXlZi<&Xd2J54^$*;AA zz>V}Ap3Z#xhl#_T_ar7DIrHHUW+hXz1{Rz@vMLOwhB*YlhxD(%uI-3^m6Qq#25(0C zGj-JbNo8Bf@(@RGIROYReS09c@&&@qpl93j7plM&PrGyTuuwFV5yW0_STZE#;#g?J z<^zGA#k;55Up1#Zb6+F&LCoY5Xq~efg116nBgO`>_w~Z6zcbUAr$>sbo>IGP413e% zLVfvTy=>%8vMF|$#j?OjZk#a#RMQn`VftulE20haQW?tw2aOfn4a!o4QZ6&+z)bq1 zOz;W8Oms6;gyeld!-)!7Le{L=$gw71vS-<;{0m3vseWo}d~T|F=a*887L436@j+qT zm+yZjuu}k&yZog)g}kY!551e!S>?YRPCJ4(?|6!+1!x<%{!C6m5;?4<+10#2vnOXx zmatF`ZDGW*!{lRoo*WAQ3;~*aLm3?~5oJ_h1H$viY@ ziJ?}>+ub{%9Mz)=Ot#_wFri#li!v!eydKZQ5gr2xgC1<=_-$M>;ecKC{a=^7H%I;h z8iX5L5Sm){U9AKkybgK4)Tg&uKd^7;^Q>;oYx9(j{hkS-<;OdcQ6-asaktfw%G<8y zcd-{=9uRDXa8uTKducSa=P+2ARxiM(UJYhTn1U=}Zb(cHTT-Fc?5U{vgmZJAxuj z_Max0_n9+9cF{mI{4uensgl1$j>1w*MTkX2?IRV8QeRGGR#2M?Qr+|LMeB(8tI40nQQ>${$7#((iw|TFsj2~2vwhvr(Xgj{R%Bg@^O+N(? zg=sLU??6DG2VNJ6vq*<-jQmN1#bl5*>8#vs)V>tA8zpVgj~hJX(&CJ{C*faawiq2K z^h_+ylA~6a_AwQw4>#u@SfH&(kwk&UfNQ#U6^HY<>!t!VxLu$Xa&!d1ufOa79A12qrr=+(8I^>Is7eixA z2iO?ojs;0tY(e>Bxq7R6samvNSs+S1UT~#x8lo>ElqRC3Ah)lp{y|#znLLGJ`Q^fW7^$PkX=$YIPDy6?es;E-4ms-0jn>)MjbZ83 z&U|o})XHS-akO-7jo1>(A(3+g?{Y!W zI#sO5Fm^=Lt(joykoogbO6}|g$ik91Y)rC00}X_i`!Ll*@wYQ#zH8JWRv{@FGC^>y z774?W4LJ5E4*H*2v{(bz6W9Ds9dxSsP$vvHPZvnrN3{MDP05G3Yp|W6?94JbT~%n{ z{ms90Jw656On}C@x!M9{-_RB_u*ut05vomB#9oFt59g_QOc)?PA(z;xP6V-RQX!L{ zQ(-uB>QNtc_RAwik{YVtTPR$8`!HF-hp_eMBFR&HeYykPP+bpwFjqgUcH~~0-c6!I zUEOogI?A<#+gM6g{z=gdN-nW+D8)IUOMvi5)fM8x9BaewH)L*VWZTD4re9`h5QK9J<*Q^Xge@~VN{D|E-PMhwP1j4(hj zj-5b1D5z|bCDTbgQug;f85GcBk;6~4t;hgGaR2OaN(|i853R4{f^l}Qqm*CT6}=OZ zJUzd9%8g8_o1LyDoIO)oST)U(1yzek7bhixrk|Z=;Kx-Um;Yi_;_$mQEv{qc0|;Rb z2T2BQ+t!(=3$dvO)s_0M&zw4~(Y;w6+O-ZFkx*4$R(36NkBra9qToJUT@b86Le#9w zVtt-s`z6^nke+~1IODNg{k)}w_H9h@RDYl?aVRi#j*R{x(xC}{t}8RrHuG!UtNYN& z#U{a!%0jPUcn#BH>=t2aV2j=;^#;WMcks#^@x-GrvoZI%N6vdCe*NcgJ<^nk#j1T9 z3)9QI_beoPZ^3(Nl%cmb@%6!NevY!Iq8JJ|n9QTLZYOBy;G|zq zA_(8DL>YfW(K5EX^*Fj4*Wp2$!H^!@o+58AdA$SD-{3P{ffrquh7ss`?#l3w<4=|@ zJZypMRZA7K#uN{E6x6m6UMk}(+BfR4ra|e>#>7EE<-M2cVJd+SPR%ef7pV~B!@Aso zdWLt&JP`DB=TNsIK+SrvSJV4c+P#WxRgJYrc73KkyG^ogBC z0)1w$LiIPC-4R0+SnfKn6tDgUvwK!o>u;WtCQiqW3NWS6r@m<35lq8y*O;sXNBw!U zj4e(}zv%`e+;I=+6WBpDujSXrL1TTIA}7*2rgN3ei%jhURzLvO;uGmM^!_^0HC!+8 zLE36yNg0YY!F3!;D#@PDLn(~pOmVhe3DcGdXARx+uk2DL zrq=aB9nCVRQ79+OeC5E5S)xf^N|~z_O&F{o^ry6f=<@sy3I`s5Id7J<5qY`Pp~cAb zF_B3!mys-<7H1&e*gX0#=@2#SB2$To(h?xmY5_=n+L?}B1vk0b3YJ9~@#&e@Qiu6B z$S?aMaO^ANT+Vkr&w8f>b)^Z_;zwU)^Tmq7M=AjX?D26Ic3JF>M9u74O(S%Kqb{T? z0ecHKacf+OT)*o6mEH48(O z4#PrRpdL7EW; zyLz6wsHqmtFJwT$YY`-uC6~115YUe#n@^A!)ScNpZjdoiREtZ->T9K66_B<^?Rt%_ zbNRMkX>eIhFQMi*%*ko9scw$P za9y2z_Z^6}z~ z(`PCssar(76F~;f?DP$4`;MJNi(Ya#w8#yPzQD5hR&+y{2Kkn zYId^iJNI)swIXAF5km5U{;1+(V4c!Q{^;6jz4iBdnbp7G!jFL9BX5!FfJ0io7JK8wmBdZZFQJ)W6(d`!3mx}SiF2UShnDJ!Uz*f{Vz>t`~Q|p zs-uvSR$n?BXLeaHz}_o5(wS7 z?EBnB%eJ$4k_>-p&WAedMEsZFraVQ+qY)T zbJp36Ec$@5?3alkj~Ea@kiw!sB~EM$Rav`6H-3Oza^d_zwbqOZida#hEXpsOU16|@ zXiu5+2(}r)_5l2CN^)g`dyXJA!&)n=HUZzfIsD|pC@;5qBZ#WO5rlr9A_4Qf)G(sL zR{EC!l4=-muY;{x>|-@dOKQn39DHz43F|(TV&17cjuoe2zXNnhTlv0a7#{y(T$>Gb z4Zw;q&f9uCObIQ6t4>0i;@n2kiOHd9*_eeT3DiZ^Gwg<9toR*dL88q-eEI6N{p{T0 zJ{6l)c^T7y5xCZ!Yw+oH0N&ES`7Tsq=^0q!k%R)KQSkwP&EGXMd#UL&NoY0WP5tQybW%rmJaW!cK+5f z&QzX658lI%%b8((@65?r*VZ)@>nIGn_%TKWKyyYR52=b;Y`L=iT1A9QcRpQ`vDfKr znIqFl=W?x&r+zVW=;m58P{m%I7-OzXdpje028BDp+k+#3*}YvcE{{XzJR!L#7kBs| zemd^@1G3wfaJ%brY}+;7MB_f}gB=tsX??h24XPqmCn94~1kP@jbU7KMwez=bRcv8o z1aQA078_=vi#C4}=hH(J>s4WvHRE~lU5)M9Ms3|e?30ZF;^L$c&JwC9UAu(2(bW0S z3@43W0>-6DwH|OBNAoz1WN#W*oA78^9i3{bo58sY00mimPnA*H$3y%V733qF5r3Ds zqHe)ALwJp!cPYIt;Zig?1}SGEtJf*)Ffrr4FXg@EG&!7F)}>bRl%VL`aFpj^7^a@(uV4gv>9 z$dxJj$8++q%>EC;$0;15(iZt%UO)tbzUyN(L^fT_YKPp?D8iyCY*?j7_t{7f6ntb| zD!a1Kf#F90;cZsbj#7N)cHY**?jMHZqe_Pieb8UenWKB@(26$oE4fAj_FH_CC zp?6q0&HUcU;>osTs=cFrAuLw&#|GpNa$Z+RrQo6gH$%;V6D*vGVg^Y?cvJ?=3T#Jk zF=xN0{w_i6I2B;Jk$xn@apERr~s|< zn6vm)M>M1w#kzI@sjt&v{i&b+HOC*S1U%rtDgmW|ZF$^K<5FGRwDrlxtYV+;zOVWm z1984!cgl{*%qo7U_yB(XH!V%TE0a|Shn0^^C^0`sQwONUqwwY_)FTWecIB$^c4nGf zRaP6-wWnYe+y=3Alb9w>M>KjJd)r2)4X~!Kd!`g4t0pKLq`Hc9w2~H$fKakcLfZ`i z*Ep+7%(bx3K};XX)LDp2JjvDP9vvWd+4KjJMwi|*>t~xI-){<%m@`nX}#8rONuI|&o4S33~sA?;s)ILYb zfYPUz)-<2tP(~M&+p0g9k&dN{X;#!!RHu|@c-N(%e!qe)RQe*>6Y^fIagt8w6Ypzf zr)cIDmUR5$`r`UH8XVc*WZ6bQ{TJxu6EXQ6SKil>4kXg+X|z9+f&J%{>>lrMBXW5B zJ&L+U15V~q{6$|x{K~slxE5a>VP^aeQuOML6B(Z~Jqrvu=GD0GeBGkwbKE_bm*@qREgM zZDs0|Tf3f>sCz+!0DAPpNxoAR57~Sz#dHTrC%mVG{+bk$y!$e5dSo7XI`>FKH`q04 z>s~|_*N!67IbS==EJHc18GtMp)=E>948W?mLfED4cWgfb`E!O1YFVGLC5mEpHLaH> zp?3kmIrjvoWU1q3vjefS&e`KI#*6&2mitT(mq~p$c8?l2k5mxeU#IZkK$Ki4>_yXg zz$x`QmcDw+vr4*54(eHPGrTZfWQgmux7ISMgn*b}CQC^{P5${Ldc>ubue7rIM-q4Z zhY@t?2BAmfse6019#=J1(w_sOYy|2AD=DS!??2fZKC&6Dg`;wYF0U(3ddmP^XfCoc zr#g3?LUqFJ(h}oMK-C@)00&)S*5*E79!8vlJ)Um@#o;v;7qR@<@p69vyikjZRL9C{ z&rPm&N=V{0n5V4FHvC4ORlDDZJO&LlRU7i%j(X=kcC<>%us3L@?}djE9!05U8B6r3 zRn=EMCfqx*KpK~PM`6{`cDBQT+exC3iq|lr%OK6qmR$fp5qY$(!8Gu?Q8Jl7iZBvN zEt@S}T?v_5QP5v4%uNfd0W=#wFepI6DzTe4e6(t+ht7Zw(xBL+P28n|+|V;3I|-y0 zFO&Pb_QzwuROmuzUc9sQ8rH~Yy82S%ei`FmRI6!2iDKpEk1gr0x>U%|BjI+6aKj)) zW1n)`k`;P8Je)jIb4#nKqP0v2I~ka(@h1A}WYb__1M=-2cwGhp?jH(GxQZ6-kuNm! zQz7SYqF{39PnqDIynmVSqo=@~#~)x7Qe2MCtnC-6*l%KQm8JLY2B>_`qyNwf>6u_)u_!9?Jxwd%7dvct1V$ zT!x3ow^e}VP<3<}13I$LMrlV;rV-RCT-=nM=qa#x`_RKJO85)RI=(uO*4Pf*P%9tb?L{M&CqQPhr5qBlK3; zZ16kIW~WI++I*saehMQQd5$U|Iap(Wzy>1Js1*XroqVt8|M2z|U{y6+|A2H$H%B_8 z&Y`CAyE=SUF%-1R;QPeLjm=~C;uJ4O`MLk7Wfa40>o!p!bm zx^akQgo*9CxQU|SNs(Ivino(g`VsTxzFgpyjBAD}bG@GGD$$XVx4S`RXzo(dG`){0*9} zz)NrXSXJ;LmMinY5U7-s4?j^ne*`-lK*}2dcD-9njGSsyd)ZH@oDb;L*UN0H<*=IQEHc! z{H5KZA9$8dIMpuGzs#5nM^$O~;0Wr3;N#y>Pb0Tg_$a;O_QaX$Y>kQx;oZu^XWoXD z8yquzt7JjGA#YX<98W)4q@&X&A?mQ?BxCRw?@G@D++`?0Ef;Y>jEhbgjTMBE-H%7AqBaHaP$ChL2J~2B)Ge{{wV=F zCsYP@PGcxJq-oHH?LbgkXarL4|Ap|NAM*YXp8JQO{~$c<8%+PD@Z5iVuj&6ncy8_= ziiK&Oo9ACO4}0nFe=9ui|E=b^|I|Fs-)Np2`mE)DDLl{rvF3UH)I87MXdd=6vHw>1 z{}atixj4GGYr2|ST0^Y=hh~4PB07LX29S^f~4Rn~zKu%B{XrROT5pw!*Wek9Th$jS9c>h2MsIq@?|B(v> zaLC%bdqBvbJOCWZ=8!lHlmNeh<(~!!gtIx=+|kAMmvBFEPt6nTXzy(80r=6U5ZDBp zTR|uRd_P9xZ-&1+4bn<`u%k7T5r~f$a_|{(a&l@x19NC#0Sz3Xfi*M$Km!SAzy=Mt zpaDBHFakqEDQMsV4ZNTMtcW`_2IFP>R~n2BjLrs{2D^kYfYHH9{3eEFz(`!7#IRzp zm?!iSCL636jL!Zq5@%@40~*|i1~3M&OH1gb9W;Qkf(0-xzw7ud#&4#uVleiw%KvSZ zFfP9v4PyXP1gvscF03p}KC6Ee4Mq%W7Ayl+3`Pgb_|5q@zuzkP-CkJkZ{pvQ{x0@g zC9n?mfr?=SDfm|*SmR)9V6oq=c7n1L{HvKjXbe^jZ0v9` zqjN}GLk7Gd43eOx0G*zH&gMTyu_|QF{$UY+7!t$<_+?2yrrN*Y0G&fpg+tZF-O1b$ zokQ(`3V;ipLrVz&cK5Uv75zC;bNzl29_lUF+C#o)=))udnZ&Ij5~;acS-aai+cGIw zL0kZPun#0n)6><}(b@^>WN`i=2Jknde-T4d;vXx8xf(yc0}UV_I;^Y)hXxlA9o8C+ z-{uK(M1GNS@uPG7cuZdd$b}As!5^d)2%QUN_8b~O5IXQ@l#2(Q3#K+mDi1mk7X8f@ z^c&p%McRL>G;|IZ*MDpX2-;acrGt42f9M`UYh&){@mtj(s0{y}_#e6j^c$A`MLx9$ z|0KkJ&^(0ppM?13Y5sD|{*d?=F{F?Gsl#CI)vsQF{D>O#vll>o=pY!Na%g~f(P2VE zx)H>K4r?nk%8d@w5i|-yhiUzf&V@N@zu5k-I`?;v!knmIy#ALW{>}JWMrJ#7~Wp8OMrJ}Ed&I5B+jDLb2%yIf94lgG(s#!IoQ)S2bB1~IeyX`L*6EA$ivSKIrAFw z^75fW4?Z9ecEGN=AX?%E8A8(_Wgzh%bkI8ZA@#y&A@xFNjnR32(ETj;7Y_k$2!CEK zLtZE^K2Ad($jbefjDN}ugw_E$p!v`aZfUuS4rVfnw>3ZaF{0OJYe%L!RsbMf&T zazT6sm}Vd)ASnV|KdOah^YU=QvW=l#t01lE;{mpIQgF6$0l?;X4amf80fz1)Kr*47 z106WP-$Rz~msvq323dPYu(dmftRrMgLE75V#mbsP8S=YlupI!%3lbHDxCqwfPUzk* zjT2Rzy8yVMXQD`aZ#sHZ=%Q7c`t!7>P7$tSXgQwVbt7thyrQzID6^_?#084^Tw8Rs zBfy?vCw92qW`}=-CsjD_JDL@eKZr+OBCU6Q8jet(t33m>~QDi-^=-_>Fl3E^8 zlVFMWmIhm`Q_&N;afGsqJfWa?P#NT?T~2~j{kl&4&fLSC#Cak8J4HhUg0mn=OFp=R zV(iK4I5|LkqrRL~iPR010XomevjxpXtJ;mNr~79wnVt8sKWV9@$~U*#tJEqc&tD@% zQpD##w>*Ao+-0%KRQN2+j+^iKJC6BfZ;Jm-{g~h z8p{VkoTnDD+9Na%yB!4{n%4kp9qT%pB}DNu-K9_nK!PTRwOHQbr15VHqBj~{72 zVo zN^k-oAP5PeX}@cQ%r7twP%aSQ`YZlB27y5sJ@gE%2S)h=;vwnKRzb@_<$>ft;OrN2 zX+c&lPzC-T+c3xfpF2q5ftsYI1gnCUl!O<=NaV~Rs~AnN6`P9HKTlX(u*KG&2KV=! z!q5G?PXwTD{NMip`JntDa4i67>(2v9`78eC`40{deenUI4*!ooZUGR0AL5Ad3h+bl z7CLM=0o;(ECkw!qHvBwX=sf(;G+s^t01r1mfSV685pn!N3W%W263!m>e_j8jJc!~T zv-__dTE0J)jsF1^c>fUIcy&2RWjfb|Ul-~;i^3vmT%4ZXqq4KjqBz)QS}sCybZNIcHsC<^vi5dm4&ody8U<8J_RINk1u47@|zV@Dc_&o6Y>75TJ0!?!B}-7aV%20enl_5QX` zVh7D6kj%vD&13{IA+8BgLhBu}@&&u){<=GgAQk|-UF$LvyvVcVGX7)R9+m~A+?v5b z`NNmq%ExEkK7(I19-LtG|4O0BEp!^Fd^yCb*HDv#-xAb%H{f2*Nm;3|#|NUs> z0s?;z$NvZsKTH}HLVb>3h6X!BhY&RF_xT4k^crfyFhhqLKEz0W!3AWX{sUORXkob! zC;BHy{45CtmOmik2j$Q3-vGo9-1`P|z=>-^neP2vID>ThCgZ&3?Sb z%6ORuy+ThlJ+A2AL99;) z)@ZQ< z@tL-`lbI91slB7UE9eyao;&F)KkUsEL~EJcHel+-C$i+&fUsvp@6!+hvUR5wSt9A5 zz!S2B&Hbwhz_wfd8H=@*G?ZmE{uPTQT^#=vjiG}PGX8%X1hkv}ok4K^F=z5{{W1su z2!e_b7a1Dq&`9OXy0Q3wQw2=LzU&lYv!}5P|fFd;P1rhv^k23N>ZpZMzwy>Zj zKrmE>AT&Q8KmeiwKIkG1ofozj!V7u%1P^4aaSI5*(ENu%Kq+`(cSZiH5z3zviufP^ zFXWa36#01}Tj@|4U}=zAf&4#A6?zung>ZnR@$&Mb^9n%cUJzu(39SVL*?H%M?6~j< z{Fq^Re#}UJwBxTjf2I9-hRE^fA9S_x$J7F8IVAh{LIOG!|2d;TbAR?f%+2|03W5US zUl;#8KS|r$*jPjESwe178bbPw!_(Owva`-<{Kr)F$Hv)zuvSj~KONYF4(wn6X4p4j zBo{!_J$=cBhUjp%!8&5``(eTI4{-dh2tQDIoo77RC!Qlx@pEc5v^$7+=F=fre)KrR z#~>emu47r4nRQO6`fGANsV6|jV{+vNO?({AYpt0o*Bd=cZJ@kIS!76pJYo(hJ zs`@%g8b3W#sD=HFU-~aL2HP3^pIxB;?3eyIYJN;Nf2RCR{O3sfVG)0m51WFZe$fv< z^=~O)G|(vwvIK`s8o$m^4-y)O9=|3v=$W4%VmCk1A(jvItU!q1A`D6$>iXv;NZZ_XmNkjv(UEwX-3dR z-tSEomSR z2GoyRju5R_L;4Gb62HxtUJ`O!!THyd2!a3`2o-<{`Va!NWzaIv=9=)XG!Aqra1{0U@E;f%B&k1T>-_%VP)UJQkB28rXL2Fa(>0wfzc5F-)c8>La< z5ed;)!ULb~Mb!r~QuW~?gjuGQRZ%fvu(DS)q3^6VlA9Z+Y6Cz^uhU=Pf^U~x+Lrh- z1)G|hnzxNlKE0lnAh}l{6&oQnP(vU6!RdSacWgE_8oIbPpN=7)Z$?LU_dbl?qw^O# zO10*rJ@v?zuydX)Bh@SlI39U%gWCGx4w>KRQ)I)pv_T06+%Lb3q}SWom);Ul-Fw`@ zc2uOIlDTxnB>Bnkvx;$3JFg^vXaZUVt!GCkDFzMWYwQjmcFC|M^s7XaBwg>jKIcsC zw8__G6MQwwL#j`tDkqctQ6AM7;7iVrV+)h-iieMppHnQ<;_pfgZ&I#H2Ai8a$}`R9 zk(Yj!vmwe&gbhCz5G&GeqZLsHPf?efKX&E|CZ3CbIg@!!R4)Fy0pE3+#Y$4Z4vsAL zbN6EvU4px$|b2!ljaOZmf|VleRgPZ^@VX zv7QzQXT&h#NO6dj%2bc7*@^9ih9@O(3h1W@N4?ySd$s?e_W}MKh8)Hv)+Hi&s7L>o zq%R35ggNG%**3>03j_3Xx(qCE76{_Z)F~Y)7n}8)PGE}ggKvHQ9ZUph>8^f2H5y9te>IU>&ZxalrX z$HVn0cX+spn4l-L5R1iS+gb)-Q6n-v4jJuyuJV4gXCd>L=1xBozcU?3USw99ie`A7 zuCY(yWl*&%b_FY6^6L#7*XRc81snE}*3rj3k2{Q)*}D?gPy7=`SMvR1s0Y+mh>z5c zOpi=4o`s%;aLBass~NG?McgL)D&4#qpCBpGnPb{b5l!9+6kL+_8`~+K#L51wT>jn-GW%az1U3Th<1HkrBvi~?%i(C{@k zJM66&zUg*fOvCbC2H@8opqM)c1Tu0E#-6jg>u~2W#K@Dj9Gw~Ai1xIGi>|1eM=phl zZk)`7&i6$x*yTK3+P?{PAXv?ku5>%`7MPP_kw`aA;)A1%f6ozYL=qppA8&-`W<~cv zo%xIpjFYbPJ!UR2emYNXAN+*D7mjdEXncATX*tS&Md$77&Gv6ev)6)2p&55qOrOrC ztQZZUd4V}9HmHb4lj6rMz%kSLqm8=e$Gv?IjR*r&Nuq7xQSQsVR)6eHZ@{2+M7{hX zq6=R=L=0*%+{gt*JZ@NmWoLpFUsasHa!=y0?iz6pWry=IB}HY2Lcj`~L2p1vPj1wD*m`zg zQ*&U*W6Z^n3MpH&)TJ)+iVXvGHw(Ji6pBu^z>6$N%OnnlV7+)7dKZcOF^S_Ax||XX zOjn9t>URHc;-J2nbsA?`3*L5fT5*Xxc5KKO9@)Hho#*fdGPe&0u1?r?H0NFyG!)y$ zckV5sTNocTuglOjuDnbj!?e13Y!W}e0iLOL)akb1CB^d1ydQ}$dN&50rAuo2gLe)4 zh+NmS$$V^9c#&k+2URRjH^THVqeaGwk8ho~r$l%*eU3(b9ZIqcE6!JTSPp0fa?5!b+H=xwVP3qPEYv#7qt~t&YZ%| zX%b>g!ggWr4B_Wq@rh5t)i$uUm=SxO^p;5)r96IgmoCHXft!oBtMvjtm9iY}7n&5! zqF%Z9k_w8i7@-bLgzpb>>{l{YnS?o=Bj2*y;rgiV=Cx~WdY$9B7)FG& zs6`A?#Zk)^Y!n<(DbM}(rf0b|c&%c7w4w54XO~lO=`{G=_S#47CfnD?;Ke2$2mhVt z+atPC+?6Fkw(YHSzyjw*T<;TPxYd0(mX_GE(vr9}?R~|Rk&qD&z=X&A>(Lx&l^N%`XEnaSzLSnkMJ=-%=)YgQZu@#c|y{Ap;j?=>Et&}drPQHfQ8fe*M^0KhVLT|U8G+ps|w0v zRoHGH=-vNR%SwOO9(S3bXC^!IY+L6|L1;)91_2>D95or%n@oerdfawubali^m+>(b zS3DOA%}hbvag}!r1%y2gs|9f;_QOVQ$~n4ZAYDP{N{l=7e6*z%f~)Q|YomGm)hxCr zv6f$M2RBGdcDi~)!{c9QmFrZzR_gLPKYu-aTwL(ZM=Z40QXi+vGv<;UA#b2$S@FE;BVUj8#9-M0 zhD;_cw0$C`uF6F=s=*tY@1AcnJnheE3gRJ1uo^qx z9+|PcuRa;e&WEaSgHJmSKr&wNIq(Xt1%FRGsp@QFluD8{!sfvEd;n%r1~%M&(O){pK% z-b{yz7hmWKZ>I||g)g}~p(-B^pbV#@K@?~$l}yL6$0(RQMo$~Q$oP;01jHY;w^EVh zhkE2zCnP2C6NI$jPB6)90-Qo>kdpc?$5Ss7bi@S_w-gV9@GtAOHospo`1XRXCL++6}AwGke4cuPZp}W|@Te!+~?hXA`Y-Bl%3hqR+ z4-)*<<}`HW=bfu-?FIvP`iSiq3#1bG50NMW=mTU}`|Qy@`d9%@L15GgE_vH~k?Y(P zMa$YqQOS@0&+iex*JpmO81!pbo+`p%hm4HC#dC| zqFo?{dF7SVl-W_gevdwxVn%1|b}>PiQC%GBKX$As`ap|-6N|tza8Tk#ohxmUV2jjo zWkF@5I+$(UrFlxvbtjN&U5X%F+Ki66Geb<8rC>Z^8^9JwC%H@aK{ZcSJ_FzsN)V2y zh1`gsKraVq#o40UhF1vYCQDL|YP z{snt7JX3r^eL8{!cRSql-GzMd5^;UhX{5vE#l|`__rMeigc+oJ93fip_5=mY3A~bc z{r8e4xkc=P!zsk&tPn*q#_G%b;YDa^om3x0Vu{B+A@xRhP z4hqkat=?=UhlabXxsZ@e2^v2Zc#y9To**b5zc1(@`~mRro?2U02JwAL9^%(`?yvI( zPB_86nuk-YzenXL%s-|kOgWFQV%&`Io@(0S!Zsdl zj@;#aEZ4$jZ!G*m@k-B~2AsgWyAOwTGgIxI7rYVq_S$2y8n~j!X&bnR`AQqK9^T6> zH194ew(8!4Pu|LDDHM~Z#z2FYmJ&a@mw*-y5JP6}AK~6C_*@|9hfp&#yI4!(`Ki@q z{2G2biEpKc4<5@UPcy+=d@Ms;)}>SGQwWM4pfZpfNrSZjI`XAAGwT}0f4^3bJ zs07s@Oz6wgkdNrgBMz(KxG|FJnfs3AZ<6}pV>?KP%gYbyTq`O!rp|BnrovGX$|K7& zy9-L#%$HTwB4wO@?>$}%P?qNtm!krZtMdXZG@BM?jy1jBAc@Tph~QEzx5wwe;b?^q zJ|K|G`5H_%iE{X?Mn1ijHZHxa?WyQb)qFE|!f=(en>)>p zZoa-+f%97qnIIBYVol&xnwnsG(-2*Nz)Xkq%CVnu);goC&t{fs$6BAr+Jpg^w9D2% zX%JHp<(0@5N2BJEHAN`tkz^o?mWuY=`ry7ZKdGoQfQrf`Gc0VWpob#{quxx!jzZEK z5H}x|zp{qXbM-!~UcUeB!Nkmd1NUXvwlRs=gFEGJRdqDx8ZSgCk(QlE-NdTmy+%Xh}(J5d*mJB(eO%2)Ta zu?sFmvbKqXu5wM;*>bW~!)eM)rHd?Yyp^wZ9s0^CT3GqgPTWe0gHG&SOERx0BE_@i zLr&ay^JvRP@7mJt;(r@$I=>mCU$!-VLwuo6EOuJOj$a98R({l2nLqgWs|v-tiQepO zOTo-7OF^v17PmVtJ?(m!-}ZDtPC%ZQ+np&Oz*P4%$BT_PzE1_E&4p71Y^8RKDw8(j z?%OfmD&9TI=QaCgp1N)Qw;P96zKy2d`|R9}?*1ng{c|xLDmOJxQdUZWA9~?X8f*AY zHSg_s>-KNn9=;hrHm5%}mQsSu#u~mpOpkS$q5snloS6KGEx1LSeA8l(KL%!v3@pCS zLGdj=3UxphOhLLKJvhZ^{C2pD;$$rZ44kz<#GgToG}-3OnTPX5^NunBYVPnq?tiS? zmf#}xDeGN481SN^DaD>|<9PgvPr};@l@pEAmwj^VP`ROb-S&gO?Sr z%-=E@7w&}^k^uo*=jvwNf`B?yDtUTh4|j|lv*0K3k{=Uz5J=?(!1@~o91jtiLbTqc zL^TTGTgqp;A~*&<gC4pi>nSPvr4dErQD7sjY2w`GI!tt=3?5dX^}62Y`V9DfH>2&g z;AY|=-7^E{n&GZ;v2JTXn9WzoCMM}3UCyelP1IvUeoSl7<|$u#2aBT)0T7-=jMwmf znS0@^l|@Q`9Z_qR@|)+uHWp8&QmJT>#zuQy5Xyc`YGI=2R!y7CO*l>ACmL*I_;#9t z!l+HD6w^_3V2ZOh-{L%hk~SxHA$lMs8K(a3 zx^KJK6@6O$()L6IFE8_|J}r#rpX}soXO-}^`=Klo0mFyx2ou>svPpxGjET_I zgQFC_etNa|HgVvE!3L|A-qgoxl+tj8Q*;631pkF9Tb%BLCw(8=Hw6gB7ecV>gn8a) zMl7LE*B?426FWSFS9L0p*cJ0VW->&6X8H`+juYOqD`j+e#NbD2ukfUz+?=8@F<>l?(=>AScVZ|(VOhl*INI==`ZnS_aR}Y7i zqLyDsfKdn|F893)9v4D`AgZc^5aSTCru0wb%Se9hR_|@AMYn{76$;cY(TgLr-%Sf62g_5Jj1d)(#BvuoQO36% z4%w)mFg*bbGUSmx$qee}aVgD!)?W*Z4c(uD%x!;m$>QNYr9S$|xA z*4uZD6GmM%Wrh?UBA)N8*LmF{SG)$v4%F?d4=b+l-8F>m&p)j0k~jyeVuULBZgNgA z3+Bxe)bIjuHPcBAv?>b3f= zO|_H2gsaMEM%y8G?0D=e$QV*W0aqL2#;5gevJ5l#N!SCB6qC6A(F3rxYv=wN4|;mP z28|V9T&le^2TgjPJ!!2m3DF=54{{NgvUaWzjr zhetCVB*hVvIq`Oy6mQ+vN%9%BA2u7L!AJ0#lg(a4j4v#+;7mYcXQ3n|xSgM85}7<3 zuYa3n-+G01^Zrify@SBxy6Xy4GMh54IKELHRlX(XW|1Ayd5QV7PaKcGwDd@YO;<sq0`e#QNc6 z!dooAF|+u<*Psel!(6_0$BJGf@#&SF>`oRsFmwp=nhUklXGWYxynBjwh5Ax3xL8cY z8*0*YYig&n-p(=E+%vS?qXGpND<~KwuLOz~6HT+1l|=GOj%&1gfBV#`7Z-N;_poR_(D}=>rqn0v~%BADym1x%!wGtzZxBv^aU8|%OKsSaSCj!t52?Xv>sT| zyQ@MFV2t=|Qp?`JX_d8n+A!_B;q8cFvcT!qNOz(2=~SWT>6QOz#_`hut|l%L6&sVz zeG}#JybeTcvnCPe&err;S(I;|)Uu?gfJ%eG>gb%x&&tiC1WoBnGc>B^n0TaLI7V3z zXy+ly`hWNIrEe<9Xhu4-KYZDK)d45N>DEPPuRZpZdM@Rz9%i(bO=kR5;kwQhsp88w zsv7=ptpdl350&DFT751TGw_yPUK`^rtvzv6x!x11pUq}aN>gjT`s6ny;xg)(F1pdb z7qlcimVSPw%W22a2PZRwb2uE5Z{T8B>y~=pwx-ncD7F*TIb>^E*!B*YoNVGV#MYo^ z33s30p!UuS#C=hYAW>;~PYFOtz+{=zQHl4aYRaMYeHXfL-2~XI{c08|N{e<<5*n%f z&XzU#9a5SDgTf$MntW`o$piyN?z$D{tP-wzgd)GBOW~RL#*m3G&a9<#2RTW>E&N10 zTIZ2gOERk|vobczmqCtX!$GEm!GVw9_=9#JQ8ZHf@Uano*+m@?SAg0fY!%2}WJua; zYnwJH_W=%=6K})k5C*hd+XUtlv4K9H=YG}cDR9Cn&TMskTRU^N&Rs{Dw|+?}>vGD_ zg@@61g?ZG&kHhrL--4X;q-)nBXn%8#8qWldREVovz>K=0#n)juKRsIMxf@;=v#@EwWyrYNUC-73jAT$Jml z6kcfDL7O2<{8Y^wd!H%EE0)GKUZM2$?pDS(optEk=V-dU7TRr4*RTJ+4~plDEp<%_ zc$cmR6mVOKcM+Qbr#m=l2MVC{wK#qtj8{}@%|SvrAQ& zi3~wg1Q(VnS_46p1o1N;_QHJ^5yeZ=2QhErT+M*2>EJ@}>rhC9RfXPTo}M8<^AW zvl*xr*fun{Y}~*p5~!RyTJHTN(Dveli*w1=$1tKgpN3oxM7T*7U zk=*xCX|z05C63*|KF-{|!pmHww6dgQ+^#aIMlfw05x2%_R>)1s_G5q|U59d8TRT@`SE!d4Dcg zA;fK`XKCf2dau=XpoZtnL{-O$>_l>Hk;7$lrYf1?4uH^9X>A@igdSiKinNR%#bk{3 z9PF-%Uxd+JJU{Tj!8$c=%84z4veo7qg;tZ8EX0e!mUhHF_} z1X>~uGD$lxy;!K?_~?@*a|JNj`;=PEodF^>*8J7mwQ}9I9otHluh%r?1(lCNG%=Qz zTSWaqkD@)Y9@(6GeLHMN{&v~EHj>tY(z+zjromCHKh2-*wdd;o_^2qFF217K9Ki5M zo^XmiNc}T2IPqjscNIThlcw%7L2w5#!U3TNgs zYgH5#oie9KVrFD&Pa5hNS~X4?TNMwBYeMnhxn|3Ttl}(Wf!MN27+(C}UJ5#2Y<_Au z3-a;fu-qz-b$Yb$ebmsGp0yzF<09IDr?D6wfQ5wGbFhu}qwP=05fiH<##$ zS76t$wCE7O3_c8{2V1{2ijtz>v0OaWhC>`x>-Fk*{=VbqZi`Xgd~E~s;1#N_O3YER z5mLlJYc11K>b&gY?A)dNTS*SmW1Gl#nk>XJ9Yf?MbatO%n{+pHuTe(BYwp-iDwF?Xz#w%=ZwFQbuta6dn=<-wa!x|1b*4mVB zfji!`E~~>YB`Wc~sT{fVlj&$bSdTNAhb;4?hh9i%_1lFjg{;|S1lPH-xYTqRHw6Ov z;1lr;`w&#Zt=8(vIzqnoBIBwd58G&sV@8q-rHl1suQsX#78AwrblF+H1`qT(0WD}n zbnj1aMV2Ly(bL=vxF6;d(1;`~k77MI@+DX%eI(OZU%sj=aAI4h?qY(;JJ8VwDk=iJoc3;Yf%Z7q-Ve zcGmYYN79kB-2rq{*{u`b-`B+-h*6U#t#J^Yno>N)VL*PS;C=LNe$P~G`ulKBkw3=s zD&P(1A@wReqg2Us+?VhW#xNIbzRkU<$m-VUP$a<|-xaFh=U+a!?X^_E+t#V3Sz~~A z)3f8RXW;`4IdR|6%u*7@f;)&i&?lox5(u2M#G`0JTbL$`qA{oQGADxgMe%qpwqzctnoZ);V4F)njr0-XpQhbAr)kE5#p|ut$?J~X z!pPGdN_>&(kjB|ZGau)vzEFY0_LkzZY3IuWfVTI94q3dq2Q~RTHPe7~T3$OEg?hN3 zAM3-@e!6_JhEabm~V!DdftlBp1v?Dc2HzMi{IM{6p*7_)dRb`9!pa#k8?3GS2 z@&Q0VCR2yrOah3hA09kZQeY|lY7$i0kWtGyVM)_ZKBV*AcH&Ac?D)x0g30oig0zZh zlY5O>BFJo$z8<0qMAj0Ytxb*_TAgXgj@wauRl)qbBlj5@FZp#*=Z6v+tpiYnPCnuy zF!fj%uhipBYoL1y7^`x+ppMznX(gWy1?}SdlHDE;6f`>!@x-*;bmYIrYj&Lt9z827 z^IcC(6vF$4aYZ>x>#Rs2bZtR%F!3Revei%L$yKNB?UthDXcm0Gcv}WnPB>3E6QY%V z5^k@i__infog{ii%Gs!LX|hq{qHS&baX*!oy<3!Kva7`enjG%2Qj)HZI+8(Lu z8iZT95bxrIUaH6>4_~@<67t!Wx`pEkD!nM8T{2LpR zE)Vez0nEdILeT=9;fxKYmBv8THthf-wPS>P$fQiNDRhaK_0K~>r&7o^A6QnvC6W<2 zGuU%ItEr7;aHK)zX|)_H-CD`L?E-HcgN4)^K(TC7A=;c*JIWZ!{%vG@dh3*iNX$`{ zDw(MuTT(Neuh_DuBq1z;a2h0sUp@gK%i?@vg46moaRy@wNw0d{4iX%A1YHCI{^Rdd zQLK{nEM8}gVNUvA+1V9R7JUl_*e^B)H7Gjv}G_*IcM%xLGL zRwFp1$;e_=b3NqWl#Df?xk(Oi$mcGrN`0Xw-Sp268bMM~uqVP49NlMpD9Ck{(?6vW znTFf*P+BgrygF2oKg9;n@`!xUvBs0{ z<=|FQku@)?;iLJNH8&o+WH>D#yhhoNKEl%xIUGBlRVK^cCWOac5`mE4``oQzRIijn zSm8><1SXwOaGAZYPk5L9Dm)PK2K`)ZezyHiPoNX%IN=TY+ykT40-`Dd5ZQ;@O39UQ zR!MUq?V^b{NU!tX#cuCvF|!w0X`86x?-OYkZ)PDSJAaN$v3h01j&jnEwfzj|17qpp zb)%Zfz{>*0FJ9#31SVg&iM6D=9oZ5It2OfSd0G*;pJDS9oA2l{Je8>4c87CD$^vE; zQkatB4uA2>eBhZHNl=Dt_~NA{#~P0xDbi6EsutuW_ZBz~o55~3opU64=oGKeDLVHV z_4(Q)zQ?>e?d@As`0!+f;*E^xMe$ATV0=>LJEeW*(v@a}DO9^GoA-!x!GTr|QZ)(0 zJkin(xB7^t=iOEG-z{b@OL^)2Gz-Yx+xJD`4sWKhy}R>KBZ){NB}c4UMu7Xs&nT*9 zt*i$`IkB`5n>waLKgRI->c1fopzM_XNIE3{@ouX`!5R+}I0l(y&17yc2e3V$HoD$B zq|DA|TC1%>DNR^jK5(#B4z8yqQZmP|uB!;fThmP3pcwQ?#kilwTpMa1%egWVNx<^n zzZ*DSZ8Si_4n)#RaQc8cQ@rg&Pn3!#i){|N9}6r?1g{?3mvvIP2P#YR22M#2C!5H; z$2_04yz9x=Jwl974sz4aN>|<`oKuo}cV0snp=Tv@(0`4$=CCFNr?|$s#)*+ODyNL} z* zoOwgdVBdq>AZgGZIH4bi%Z5QvR+A7}`C2k_j43dJe*Tf+R?_Vz-T(X8CII>g`7-9HAo`P}5TN0c!%!gE9 zx)iyLOqP5b69Y3AxdRZa(?#Tm-|{s;)8*W>0`l!Wl_D8-9db)n|C@`~I^N`-tWU89 zL73KvY-z$bf_=LBp_p9eic`An64hl`%)wjrdz2as4`oUm)L$S@q@)A{myYTG~L zCls?pO;fNDD!A|aGD$yegN^x_pLSK|R(FR7#+M>mcRS~};k*n{H(`fI1JQ(t&AE{NvY zJp8DxpKp|2Z&3WvxKjCzYJd8A`fAo@>!o8<#5l4UO5`bbGaLjzlc6HhzMkh)mw=aDC zfjsidtvkzG&ru=o2^aiZ1&S{EnR;^aCn@JZYmb9n@kNGpSrvm0%pD^k(hAJ_rJMz` zFIYWr@+9l-MPO$`EgPM8Wd+vXe1_$|(D-R{go#zoAKz*d-oBz=*=mV-#ddo+m%O`_ z8&d>Ue{=8xo)GTnS%{=g@uL}4y4zgHTj@(7w}G53*xs!zPu9}KKdS(&VyYsY_iaZg%>F$27V-($D&K;^=D&9=$Q-H?&5#M|)rGwgr!MC+J%%u!0re z`)A$?dcHKT3djn`buRIFVV&}%eBg5j(+v`8l|mji{O;B0ZY`1aD)3tUZLhT}2GJh5(OSvVg38jO29HpE)$ehc(@wCI}*`sxYSAo!QVguMmQF zM+Z$<_%Y-x{_Vcsp_Lci zqxDs3kv*SpVWP+-kGXV>njAOp6LIhgT=3jJT0z{FpfLEv?M$}R&bE3XZ^BVABo;x= z5ZhOQi9JG@#25EEk-^qqK1?lSW6wr=)w*oYtEz!`Ww{CSIk=BN`C(usFo_7 zMN1R6{#iVO3DJMCg^a#A77#x7vY7lR@U6B^2Mbl~&OSm5T66<_Q=Q!S-4?xJSf3Lmw!^&l07h2Uq{d$STq#Ig#z~R< zNXNu2pV>?)D|gmMkQQLM%~hDCsQ2J*?1#Z?@z1s?$ntLLa~R1Py>-WW-fDBxpWigU zY>B>Gg1RFCKHMo}{&qk6_ON06*%iGrDah}$vDo$HY_<-@6`PPrlnd)luvmq2%j1(* zMW0l!cet(--FI%LaU4mE1VCTY$ygtI^;|EhWZ!&OJi0{D`NUb;;O(6D#4q)}=*Ksk zhKeO3W==DsrwDtK$_Qw1?RT$)O{OKuyk0ZMU+&~ZDcoBedhd;+dd2i^98+1i&wh4a zs>ktyhL(=qHbj!}Q9ryaewALCx|HI>NPmZM^8vlTm=9_|X3P7-r~9!oKpG3DdnoBL znIek7OVX{eQB)7Sv38o_(V=LAsYvZFc8nz+?5@0m0!7TF+iyklvA3td`x=TA+o0sU zZ@A&UqD~qG?{nWtQEWe?)Dmf?!S2wi&@fxH4V1UP<5(M=YhdK4@({jNoKSIh-Qc2$ zuaJ@b@p<_BZX_4X#kbe%Cg!&r#@Y1jVpnjyj|XF$7Qp|HvU3U+C5RU5J+^Jzwr$(C zZQHhek8Rt!$F^7MEN-Q6>L@3qWlW$fz2O^SnDY{6rW2EG>WC|LoB zGODjViBF9IkP2=aizdv(s)vXFJV2sm?k+k)fo!6<>=C{T8o?Rm-0{BgZjl;Q-eu3{ zV~Sxx$U!qo*gc=uAwW~O8;gK!U<7nNapq7$xoV)o$AcqW27`0DFSY)~rB1?N%oQ*` z?mAOs)f|brC&idySe6#PP-G3+jWLEI2yRhVF=*oV^k-?1Fh`kz08}Toa>F`rDWgvG z#C(xV(vld~_2RL)R{nJH91Oi)DXxO$Qb&~;15AH4OPUF_00_k(cdL+bvGjKiu|=K%;J*dNAl6ulip1D1W$HEhs^ z>HJre0`r%(a^6q@rBX+siZw^Ul?ymZ1)wL803utfUfr2fgOr}Mb=tIn~iU8nAXdn>$kdZco4F`2?NaTMF_?`Va=biEpe@PsVnAB;?hx?HDD zeq6nnkS&kl8aCnl4+X50q}-N*ryA{AM^X)tIt2Ue@bc7(?kC_y*S9rvV|%Kb@vGxE zibyfJ`QJO}++%IezKH3_Q=FBeoJx1p;3l(wbH*f#2{ zLEea{#X>ZpI)iN02iB07cx&|2f3F8dILcg_dbnCgIKD zj9up@^6}*zen3s59LF5f92aY>8g5(gS{+Y~JihSlnDl^i)^eC{c4vspq>Er`7_okE zs6lyn)P5Lr?$8mek58tqPjLGr}=eQt8pksa0xY#)=$t zI#%!qoxrB_&Z*#7UW&A5uyD7AZ02V?Fk^yMi+TyWiH0y*;wi*HAkQRuX_S~@IGF+u zknl`sPL3@zY9ALGVe#jkMz%RYI>AMZ3L_#@2@_^!Fbo7v2(vW`s@G+VO^MD=Q6r*~ z6F*-ro)Lk`w;DpmBSkS^s>@Dp80q;+sLeCgONYCZ`uRw%O$BQbnJU(mD=6a?oTDi9 zNUqIS64RmZujkR*Or6=U=G53HBatvkhz#?S)p)=6aB#uF+O)N-Y|5GL?@u&SrJ9Ux zwc_^LT}>9DJ@z4Lm6X`{<{FmDoIG;%Mh)4-iK!^^P zs82ttcZqkZ2fvAo{9&5HHQ7y+P1M!wSY5HMc+oY_CDt>{Jn2~ZplWAzYji+XBgd_0 z{5ALlH@njy2bLrdM~SQndBqb98ATdh7maF*$~*qe=BL0w3CjfMID7(DQ0n$N4eEC7 z0Hg|?SuitazN_@n04iDp>b8#JO<;tSXT)qg=Iv{oFHnx`*Caw!{K`x{uxvO~#;qYu zLVZja++;Yn-n!4u8}^1@(^o_vR6Q%JA_zWDHs$1fz@K;@3x1>o3iu_UyGXoRUk9x#k5t1AbO2LO5+7sRU1YloY zo}DZX=;%|@S*H~(3+=kY!mK;>b&n0~Bry>Jj@IMpZCFYd<+=68>!3VF3=`1|i7am* z3rsr&FeQ4tobo}ZBX7w`OnA0m_ zTGx=lI#JM!jscSIeNT(x;=tYpK}Io3!OzMuRu{z_YwLrq5&=L*sx#I?hs(}a_5 zk@fxQN&MO-wn4o^K*juHphKK(t#91?DRT|$cZ~gUHbv@NDhldMpumv%q-PyZ8z=fQ zX%kA0=m~#+lREV21o{{Kqjuxep;9c|ahg>)h(J*vGjbTAxY25R>fX?#J>%5P7!T=Q zzA^#A_*9pr=emU9zRLL-6-Rap;;Am8(f4}DnIF`k;K|3oCK_%$E3Nbh(B@PW%4W0O zxHV1xR?JID5Tvv^y8+Hi%1DkHZ?)&O6<&!?v%S`rt5+%eGPB|0W;#B%n{2RK%9V>z zd)DRN$nlAs4R0qqkB6agw(HXEA_D(Lr3!IuZUHY@Id`QYWkXDBM9(#^w_37;C!?!_ zPo{BagHYSd?wK9TPx)7+WwTtm#-64;m#?h{k^^otdh`cHSDfpTE-DwY_R{N_p5inM z_6la0dbkI@+C1}2i+9D(bq|C*HmcSB446m|_62+mggRm~d$dJxF)3k%Sgm@)r7D+Y zQK~x9k_hA=O`Bw=D(m^eDoYd!5Dkn$&5So80$UcPa4n_}JXOmoXyd(%DC_pHVxt8L z3W_^qks@MQNcu!0M@`6L@q~gH8Yx6AA7Z(DW9Jj_fcL*G&ok1ayl^ypgV8vdHMbZ~ zdtsgm8qfpmA@m(b%N)hcv(bZ8-%ai_VK4t|Xg9ZNdOF<4A2x2(J8Yg7v1oZZL7Xl| zpz)8Rgu<`Bhxr#zWbH zaMTYUI>xvvb|yHz(_|%ALnETec_G6qK_0qhlJxeoC$CNJ7(UB>}2rNhbY)I@M8iqXfQD z#UWheDQYw31FC1|#b%$n<>yFlHJZ+^$WD{RM(BggIJ$mz=;PWOLe80IBRUBGGNw)H zR|z2(+2Qm<{ds#X(5U-|A`yh#8d(+}jnx966IP2mBo`NVy0Pye_)cO`igeBD+%VEh zlcy_epeTw>J&`7hy=b_06c(}3>@GX}QR{LwcWS|1Em#cO1H2I?ZHwn4xh^Ixolm_1 z!XQp`ZKx>2UnV}sgQbJMRut9*TRHyO>@(igbA3^E_GYzVu!VmOESqLL>M{!Av1-E! z{ziy;3$+veVhGfkFO+gxzq4gYF-?r)qo+37w}Hbv!&I%RP!`c-E*?2&I;^U2 zILwHB+2u$Q8;Dm!-5TbF@>)ev5=Rt&xm?+4t~Nfi#d`dHyU}>aSTC=zJ}3_70Cz{8 zuhn?$sio{u=-hVQ{>^kZJRpK$)2$DI+19H^)r=ne8Bl15cR=0(&1Eh35>V)$E<7#M zV~d^{x?vu<3YIAb?fK6Yy&D|b;S=1;ELK8mg}zn5KdygVy@mSW2IA$6e%|KZ-_{nI z=9<1b0!IC09y`H3aCy^>9odCNA(xid`?HCwl7;2vU|M3B3RIl2{5B+$&4m3ot*2B@ zpQ7E13fL6OVw=|ov{h})YB`nj!)SlT#)AP#e-FD=?VLlIQ4uWf5Rg`1v?R;sbng<9 znpN%PiuO1kk|qftV)C-|FY!m|N691>dqJs?ljQ2B=%eag$gQc^&lE6OwNo+w%w zadhh(zCXt~p@jlbskJUycZsiMC$?V)Uto5A1|wx!eji&#bkx00AF&&0wzbc(5y&!m z%9wg_lYCyt2QYE0y15Sr^(D3TIzOwPr(bM4o=NW{%lJd{UM3&o0DD zwM5=@HHjN``x;7mX=OtsS~03zWctQ;P>EalY@*JZ4mXL#u&w8HN!1LpF(F4T2JJb8 z{9-UrR8Vt99XT^nA7|x183n>-W#seoAfZ0R!b0z>Zz0{*NPfglyX}&mX+t?D*~S4* zl}y*toE~KLVv1PBkkNbCU#5B>6C5$_EtSdJ*=^!&S*Bhk^|F|RR;D{oOfK;q1n6#=zeT7FQKERP<9%u2wt6+feg7)*EB=vX zF4v_LC^)OHFz+mN95(MwN1ep>^kORy;NkxDxgLL}Fy6@I8sVwy`ucNwsL8L)5mlTx zr*I{zW5*e!&>_=N-O*N~;wI@POGcn0-^#yIzL99lSuJ(`D1dXSjwr{TGqx3yKpx(u zn@k9}-+HU{#=bL=cRZ~6jV%XXdq27teWKLCnDN_y9AjpG@bp;Con-AT+Hi+4OCy&d zE@v8072X_38HNgdHR$E z&2C;!AI)gbOfEuI!Xyb+K`+$*dtwpt*B}+;qzIa_MjY7yl}q&zGdDM@G1Z1{5qJ|1 z=_o!|5J72%&{u6~h<($DidrFeq!j!|O_f?+b?T#Tmg-F|g7Ao^g3M)q{-JX|T%t!% zV=Fr~afU;EwWZCyn_%$S>i2md=f-V{`wY+bwy->?vPjVjNMp~p5YEJ?@(@9>C7Dew zyWoJj*c%K*ST-4KTgHn2lo3g*WH1kD4devqmX*6I%n~)6p0i;yNj0xP1S6T%hbdSk z(21rgoQvjOugr!lPvE+!c42pbdcn8%O)5zj&Q2{_60S}9Jg<^2nqm2hS+Dtbp5`PC zBJOM(k#AQn(rn1C$uHpQaH!@|D$w(svZ#iN7pY0KXoZ-+Q+uYK z`zo0UW@Rt`S~vD|lN6I5phfH)%1EY`YK(Sqd~NNB`MioE3pCGXwYb4hjr}kb16gTq0^V3mLTm6oiYZ!7z;g=}QpD`cb82)}4AI=a#jzJKMxLt94w) z?t7G0?=M$PwS))XDXKDMc{Tb0eX76E-Q*7G@vcxFSxYtivmS5wK?KRwqQvd<5KJ=d zO+Z!h-Nnu`q%?p1?eqd~1^rB-ZbgIGta3&YTU0WM0y;l=>-CCB}?3U&%>Y z=EPo2SA{(h9kGfzxv81cIKkswQ&iwgO`&1(Q)z=wRv1anya)!aytf@nzvaKsrHSBv zp?pOjl^0SfuSxa-B(xeZ7n{5)qYiuidd~7Gf&+%D7YdJ~MD9w)R>8vju^B{JRjU(B zQPa~^EXSors98Ba^&{UKpgH9!^qnyg3{*~Y8cg#j%hJi2%^)k5qHe}Xa38A&-Z*g& z^`md*#d#^bGoz{!cuZYB$!V+mmrM&_AB?$tcs{vE3H$cIcw*`Af5hPxz7NoUOnw4? z(uYK59wEIsiiq-7F0CnK3kI?c$2Y~HbUQvy5ZRCNEch13O%}(Oz{swwJM(=FD0`X+ zhlf<3XBj3Kp_=D&QJS%;d99f^7@=I&oeT7?8n0B*K4KGTR;1&uyX@_#JPl?N#RA=M zJl>DC_Qt=^K0Dey-@{XU-cARJ$~Kj|{Z6)@x$pncD82K3YJU(FTbwP-$MLOxJBXgV zL!J&tq*-YIl9?u4Nk-kXU0+l=ZH7=Mlo7UKgPUdq;;F=T%5^5$>ZV+ob}oW)qM_!H zc8^;#pLAs89+`5c1z2c-mfB!&HqihX0Sduh2oOyD4i{T?Kg*B>VcwhAt^-Gg3IZsc zL81LZ6Kp4(b^m&_&$f>PzNorwZk-=*VN zQT)TA0qG>^Q}rxpQwEq*4+1O$6@|Q)180v(lj`(inxyY{<3#{(!>t*}r;AV#l5J)pAeLCz< z5G!&Yn*|(titPl;gndY@`~fAz-?tHa*MuT+Fa2jgmn6y;m!~J4la3iRq8{nO)mdQKN{J+V4a?7*$fLdmtC_;NPL2yP$9WiakiI|$QCREcs z;3#`l28tFD`1c#!hv*{hvqN&V8pmY4*Y=`p8{>d*u#N4K~xM z(8HoxQrc>~`PMJQm(BUXo3FEOB0L4!E>?ytE*N&@c)XWoT>5zQv-4}Q&?FPl`T>PK zjO#VzRZMuv21##}fPRf2pM!>xw^9?Chb0h9AiPMw1|Je%tIwJ0!z65@DFsnajIacP z5eZ|~x7F8*54#yV9=$hOB&cH<*V-NY43W+}u%Y&;;qZ4g8ufbfR8Fa)5IA}A#eCZrjpmv zPnWfT%5J!y;nsEEp3k&!fv45X=b#taPOO^yzo^bW#shYUW+!=V7cWn$d|l zBvE-XQ>2c)32j`dEu_~TdjU~FZ8&0aJ#WupWILr)o0R<1TK*_ho@y6r=^-e%VQ+}O z@O-ho8G1ueoRw8cE~V6!Gr{Z_Sm;vt-8GY>7?T{9s568d%Rd_pH*-(E|Eh9OF%uvP zE14sc9q3#Y@5Ryswj=Ed_UVPO^x~cIc%97U)l;t^$v_WMnww&(`Cynr`^3*>SR(|Z@E1Tnd zrh6bN84x4gr8ZiS@u+4K%9dy6ai+g4~@t9C4H|J}CC2@Y0Sj;_fjav4ig)yeEG-OrpzNqG^6 zBfn^TS^C-<6Dz5nAXCl+b3OGC1K^x4f^1K$guIUFFCB$aeu)(b3+jfjJs35(;- z($;5X5TuRjS1-9(n;%gycISCo5&fcR*V5J`nwLpPu#Jp%tk^qM^lR;eo8B5%Ti!3| zM0y)+u1ocX#8A)*kF2KIENgp!sFqR0D#BCI)!A^LFYi$(clkG=V2*sZp%z$Pd!v{t z^`<;hnBzQ#CO!{Ic_>v(=|bu6^8WOwj8D*WtEg-{hn?Cto$lMKzuZvi+Lo zwOSJ-G=gaV=M0l_LRm+J2ats&*7jR9o(L3iO@=4Gn(Ij`?L~Vhx&34~#^zx3Uyaqz z-lEeK&O{;z&(@y3kM~pmhbf)=U07`|kermZ?^72=@_}dP>qD92gH|ha-!tJQIIZVQ> zsSr>#Yrs>b^pGAW5fzXrQ?-QX0cZlkM^-8xb(L1P=gRe#E3MZ1E$P9dN7g)v8^7;f zUyj@34pTL)=#>}sWNbXyLw`#de{>ax!6Z(}B|U@!-!+T6tkFzpN+6DEK2B;qJsU#? zzYsf847?Mes7(rZvmzm?%Oo5~mT>uNEc6-~0-60B*!C_s3p>#euL1-QC{Z09Akm`H zKRkZvq}4n04$5bFYcXs3k&)zRc4mk8zXcR`b?(B(!vjMEurk;IY?_6<=J(&uJ@6Ga zgo|0-%QvU2dy*9zS7{Q{TO@~2@vah6(^`WKblo9PjXM3yg1}W_FAd7AQ%gZ$b z4|KR#RhFu13T*np+wlKL#+shHJo<@jLN}?h)Mm0hR@%0~JjrzCmz#jAZ+2WxDv-=t zYP&&>4!z^(PJC`B^-+|tAUsR99ngdgG&8J|-qf{1i zn%yfDl$dAOceg2P02U{gR2D5Ay}(%AGR4aJ*==R{Zro(zh$4g>!^*f(GnYdTTbE|-VdmRNnR z=d)I*u~MKFPKT3t;vf8McwM(@Ofb1fm`Rbs>kE&Lwu){y7nnsIvqj4DyO+{EK3RSj z{>jypn0-9$F=m7(SH}v>j;$!5Y!VJP6daPQq5#>Z(3{IB{Izhbd=@?4Y^hy5-TwjtFF3jPMp}Yv%aCFx;Ew*Y3}4O z-z-S2&!Lgb($DBW&F(E2J}F_{Z~Cf9P{tBS>RUxGo7E?M$nBd+ufnU8XD(ZRe14*y z_K*gdrZL%u^=cJd*7o&|d%<*FoSrgGJ@$7=Q?<6`Jcl8FO_Oqy+FJiw2{%Y<4)x7! z!nQ7KqqcjhXSkclcgnZwXN0rghk(>Llc#8|y8q3<(^;}ii%Nf^t@x}8L^=SCu`72z z9HZOXyav9mZiaC!i|$PG+#?B1 zvCBfE9sVX*uq(9INpuNYWeM2&`jEK4e^BDk-oES)utyY%v(mis`x7Qf=dH^F;qIC!RI%{;2Z2^nSJ# zqs~3NOTMWx$^@<}VKp`63zpZsO=F$;n^;WPYtAIwUa>j)S_~TC6<~tDN^Z%`c{`P* z$;j_-y9iZ_xB%Wo~JQg}2bk62*H%?17RMMA*PrxST z>8>B02;z)3*61g#`Hl^|%YASvHTR`PAXm;^MZoNsQf9J0?+f_S(pn3xmb0E#YS&htily8OO(xfe(0hWkQGWd{9R(Z{8nFPN$qKZGwc zjQv+3TC;LOuC&m>c-P$l^3-%ewmobA;PmLV<`ojNF8A0YkGC@Vqlo50mmSB@qFy)> zP0FsS3v!bf;(5W{5_A(kyK)_bRSa{l+a%|q;j8i?cA#@CbEkG*8v{pDY40=+Strf& z*Kj!Su-yam>{{NgWxQ3+rL zV-Y%H8Ica7E-+o>*w~+W0Dj~6_d>{}=mGY~0rA2y`tZS2|H3~N(}ByzE+L7jk5L>B zA!K_Q2DPKpyQ&L_s%D;=ks1LDHtDHJ)46DYoU_gieNG{F1rGb@(ebqVw zdy8E)wFu;C?^>Ji%Qgs_fTgEPh2ve)P7X;PBsk+t=;Plr_gw;w8j|<)I=N`wL-O-M zu;JNB7UA&~Wf@hl3`_E1m0+yjA4EimE*Uy@a8*IAy)W0R0Xv1%*stFEV@#N` zu;gF0{S-JrIj@yf2oMFOl{gqj8{mMW7=lFgi&7}cy6 zSTY<|CRY-Bu$6PNnt z{@&|E0#73r8106oG1WoZg#_zH@7=lz&q~3hTu;|mbgXOPk#YT{2hc+bXsg%XX1H!b ze5lw4LSvf`7P%oDcTWnPGvAr4KrR+?s%0#X^fc1J#`(1YgIM-Kb#OX? zH1Mr`NB5XI?Jk^c;!R3lSh@T*D&>Am0C?Sqdq>?C=-IcnsMi1GfIo|S@{c-vs9DXN&Kim#l3T8f1$}ix5mi z`5XY7(D4kB?u0P4G0HPTp9STejU3QaMsJrkb$}{?_ml4`$lx{iyHB1GDG?PHkoNXr zS4C>O{fEP3otQt554!KV$b%2c5RRK z3~sp^E)iePJ6s+uaBo!r<{TL0NDfZxb_sBFM4`$@jik9n|2TsKUQPKGaTNH0GTuSE z=VWbO(Z1vSaA9@N_SzM#ysg+c$McyNU46P@+3d5enbY+CCS_kySUD-Oo#zA%3WAQo zov@3+BZIKDcI#=VfJA?^jd;Z}Bl8yu15p(XJVMp%==SXnSMH(Vt{7yaN-1g7S?&qz zMXxl+;t(|9foY%{Q3Vb~(fE$J{LP6Y=lzm-A^o5EsU*_)Ouefwi}gGb-GTa+qR{9< zqk{NWL8K_f%k`at4_@yLd``Ku{^n?{Y>xHy(mbxB`93XXX_@}Z#>w#7R^ySbh?ugQ zf1IOAR_uK)Rg%O(i{%1`oD&dxC1T~A!fR2$+c7J``Gm!?IcD21=jq)R<=gi&E~V^_NhE5tr3qD?uISzo&9SRK#I1&*M!FQjP~%aoX9#3lF{~k!bCVkgc9T?(S5ZUUL{Z2m z1vW3jPQq_@q@J{|N2EZ69X(*6!*JOWCOqp5tvgF8wqlpqQ5-Z?O{DE08GqM{sj@$@ zmBf{XCCxCdy0oA$u#Z($wFbQXhWG4+u zGk-hU@j~>l8lkzuz#WP4xDBq=NFw&x$3D0KmG~Jpo$(GbK_%9sCCn6yh>O}XC-(=H>lCe%PZr~Rz9`*#v z4nK~y$zGXzjU8fl0zy-6@06ROhUGh9b;!9E_|*|iJcN1g=zpg)bQrTcr&6Z(YWF$z zw5x)9v!6(Bn#2V)#b!%WA6^^Bj!aCKy#WAC|fxMb{ zHdD;k&5o>fe*45Z#u8rcQttE(w46&ykR3) zMB6+?Wj}`kDZ`0IglApt#)?2PofYK0g?aSO>v5*#YKuh~DkUQI-8KyaQioKRDP{ z&JoAxHNtNchjIPhKjeNbM%k}E2yrpU_2DAah6qvWLwqsrzBqD*q5|O6K8~Z$Uufqv zc@Pc(pj0;B`5mcEvyEz7U&GJelhF9&?rOy+2faTapiIaw{~MC}e{~@IzmU}b&qk;J z22}r5GSD#o>dzVIe|0=;jO_o3Q)m7kDD~f)|1(MbKc@c!r2hNr{{f`Vz`_AZCu8B{ z^sD;!mdKH_(+`hN$qvoQTm{u7e^3s(ORRR8}!Se@k;tp0yhC_w&qz1uG>pP7S^ z{Xb=I3`}ec|1)R(${WI2S!CT@Wvkk*w)N%OdMjsUL4u5!SOyimm;g!&oQnW}5CR^* zfjHQox}gFcI2k|k05TT5Z9xLuH4u{W`hq>S=%8(iTiX;_%^4ei>!xxe2Oj(6=cLafOXKpu_y;yLzP z1{ogacQm|OYq`hWy~^aE8Nz;4KCjW5qC#%f$tudSI^(bL@xfw8x{$Je^))8Z5sJ??vglgQV7Xl$o$ zC+N8uydfJaTeT$&Svo5rF-`H;G!4x3LFtA5G-6d6-_R3bCpKIGIxEN;Jft7&9aLr* z=AhnUkG#@r?P2Y$vm3LhuUui0Ioi2k7``(;M58%@W|*s>JLnhA6@RaY*DXU6WVIMr zfj1zZNann?e<2D>(TO~(>405<*t}?!05@ZP+WbX1GJlq4~!|3fw z8+I)}@Nl6bGYpPdkLZm-YV@J?=3jf#{rGTQ{@SF7I$IvbB5!6~89^rlnJ|Ou*&?{Q zFe(VYXzj7M(!r^VIhs>|N62j%%rQ&Hc#nuIj2dm*i*i_O=fDut5e~aE~bpf(~aMOXgSUih0)&qZMK4#>hhNt%jszEZkon^V^5ANWzLims5Ikv?3(f*=Jt1+jBj1~zR> zpN6lM_IUh@0Q7R8;iiR_|Nb!933<)s&>s+;l0)*Jis1c;`-H(K6O6Be&~iYO9n4^d zI@zOer_7B(J5cR{)eE!hzj~GRhJ)RuRi9pb_4p+F1o=kwgNp~CM?#rL0FxlbAWniN zNE$O-5M3WHD$e4D*rU0J^@#K4=Ox)m@MH8G0VYV0Fc@J#N^h4&YE0D_wKl{BaPOJ$ z9%%6A!?`eETE$ugTPwQEx=g#|<3MqPYEAoqd7*frh;xs?8<*QlyKQ|C`1T1vD20p) zmKiYJx$9--Hy90P6wqKxaNUkz*aYy}t-w4xMYt;zN z76=<#amL*q!VO(p_U}@U6%(*v(2Tt%B7LOf09RL!$Q60HBeVePx)G%?#>NaCRoaZV zn@j7%@zjp40p&d#gtM`)psX>>498~h!OH)I#$HSR{v_xWq-Y(n1|To0hD1-Z5X z0I!%My8YzAXMiODNlpyFvjgyC39?2Cn4A=Flo3|jy9qF=0V6*$fXfs{oL6Mjw7(|} z4px4&Pj|eBOb-1S!UcGnyTIca)Z?}^o)6y(0eKtrZs!ncYz#FvbzfZMuAmr~xE4-Z zOn}Ej!!l~spfOFF&rfsKjL|GXMgg1!P-U1PcS>8~0HSaKU>)YM)h4a(yeKH}l^4?K zgOE8&i-TalI5e1<6ni%~EYypB6cc?16Ez&y2##cA%KmkK?mj8DGKHJTRfpbBmt13- z?N({mBu`pLYR~fz9|e+So3xOW%>1cwN(Gr%p%vuj&P;5y5|=9o33KmErS7S&I$tYi-@lbPjz`_} zR%U%2zY*68NIJG;;T>d7hDOOojGorc6x${DhW>fnDgM2yK@j;6U!}UMx3_1y3 z-0=c^?R^kb6|RG#kmd{W{;t&I{sy;|{kO{c1o;IF_^JP{;zJi*-@W~%Qa5LC_z3ws zKQ7hMTK|b@y&9j12}dQfgMvf9e@p_@vc>1ho(Ylz2oGS2jXxP=U|0nb&u&q35CGj4 zP%Pc5Pv27ew@-@HcQBobJrp3WGB$H6x)r|F=ZxhYRYSyct~>qh9pz4Xwm!STaPOLd zIrM^7aGJ%IFNXeHlt49FOWXsnexvKaBK$&G+(J<@Q{$R+{U>6e#cCI|ES5+Uw_!e(b zN0PpxB3o%GDN-E(I)Z2jX#wKVAQ~?>pA1Rh5rKB8j^!!(9ZsEHWFPK+pK-iA>X@%^ zqy!0|66lEe{6Re9{cGh>awJO-> zp=$BX5TEEIdP$PUJfnc7qf*lp{|C-IBh-;up$YDUp6Fy9?npGQplls=Bf+771*j$< zYARCI6zLp~OgT!ETjQo8U^6QDViWE<))9hGz8SM7Xg>t13y~)DY-`}Olod=oTi+>5 zJZ*47QNbqo>_UCaeY$6O_5BCxK>AU9YktYxaxm(bT~$brOUUQQm=jaMGB^uoCld9u zs)x0Z^D)X?CP{BUMXy&xmnxa&pXQ~x4a(ZoSls(~CNeIrSq>wKpvDFZ5v7ZcV^A{* zB`GH*DIY7N#Ylpg`N>p{G8S6hg^mf1Y6BIa$;{9YAyVlKZ3V`0u8xv=Uyb9}<#&@9 zC`z->lNiV8wKhm+2P>(sfzYET8mSzasP8Mn>=>%->Nz$i5hJVLvi8U2_hnFb_u+x6 zQdBdf$0l|(=4##f^@Y_s%dsDkVmW@LIb&r2yUgIOAaQ)8>`K-4f8hAF!7OuTXh5fF z%+#DB~%q(V5(`2g0V=g~! z;x+$-9Ua_>XJ<+dU|mzHOP+#sI0lKH9t#pY6&a;}zls733^UL1rvufY9hihsN%>Yy zV&k|;Gf$1+oQH>wPh}Iq^oM|MH-YXE@ouRKHs~|*sN?NKPY&qzY(9>h8?$GU77aP3 z6P0wDUT&OSId~|_#EzJyWTTFp8?sr)E4XpyCFxuajoj%F8CDy{EI}SI z9wGhU`QC-gWfoUT1q|WQ+)Cw~qfzhd|4lBO-Q#bABwR_`IdH?saUD^bbKQ%V9SEAj ztGRH_a0Nncp1qb4iP!C%zOFfp+`)}PjK;-6#HKCcIXw22cXHwgh{cB}fGq?aBJ|GG zFEYTOx{cH?*H6_CP`J@J2^_0&p!NwhE}C)u?XL>dAmupH7~$My8O1S~)5ydfdTkrL zX&X<-qTtIE!sEF{KR0)Pb{JbU5iXUAs+tyRJcw0Jr&h=D;co$B$W*`?a$RqtNqqKr0ZFBxzcR@xj zfSacOWjxmwtLvs=5w@}QQ={u4ZFi^>Kj7RDDfAl;g>e;qEyPWo$KnGB zgbp*%y)B}N7)1{*@rnwVJbsGw2GMI zGw2c^vq4GRb0}ZXm9?!OBt_Vx)WF=$5%Cx1iL_f}>bt22#17{z&6kBc8O6+EOLh3W zo1~<+R?O3E7Qxl5>39*Z67x0SoS-$$tS&5H3A8kf&iZ;)=6BA`w<9S5&lafwhxM!6 zzy&efol98eQnz+W6;nV4%LrqH^6SG{8K?UC0$3HIVS&xD^RffTxa@hU3r0F2Qvs1+ zLiH~wIi41TXf59z;rSDx%mu;v$^JNSBZ~Wy?XTkFIz|gf2B3B@G*G$6J|hk7Cek|0 zEdH6xi+qnHl{kr{{D_oiNG^$rhn{vl(|I=*_rI7IA#*w}%o9S3PvQ|-`>vl;Hbs2# zs@r?`?C@%ivxvYa2=YW!_@oBDi_;PQV1nFt+8V0S>e)UHSy9X7qU!H$^dBl%YePlq zo{i5-%bO%JOpSIQ=+3IG^gKUaDuA+54JqBX?0WR_{;}HF*+9p{&Ac@@bwA||9`q7Y zijd1~-mJA#-tS%qI`vPTm&6~W&048dl`8~G)(9qGP=uGeK^H^2Q?fbI=!ot)CA6#; zup7W1C#>-zpfJtwcvyKSe(-VkEn`nzu0QkW5JtDguX}1q}m=Mgm{}&J0VTFLtB#HaO_zvH|^8 zk8BgUvV!Oq2*CJiHCU!cmM3Eh6rf^|Oy)BNdK@kNMLOi{%j3VkxAMrPGD;ax=!qsW zsSB&j-HmN! z2IwH<^DyTXJ+p`P5~nd$ZQ^-**i;>DXVi=8koSRs7J}`Tn6iz~)h?`(McwX#I{5Eq ziS@q@?r27UFsd z34u>AKfx~XnCv!o243Hwav&o#WqXgza1vvhJV_KCgy)((VxK4*jppsAlpO(B8I6Xq z$C|XBvMV1(36BqXg?hBtKl0k?D#TAH%??83(eVEmL^|b_g&nS+jt$jfSpw2!y7cS$ zCprrV?9%B-hOZ2@Io^uElecOx@#oNLXfk(L4K`#}s@C4lrVBr3ImS;wCHaWdq zkE3+gI(!Uvm$wm4HPu+1bpJ-5G;uz9d#Z^Z_rkD{s>1eRuBRX#=&(<@&*}hMjt8!} z^j|2Q*ZCHt7Si{I=%&cB6A6TeDTGxE6dDWBx5#JP`K!Rg4RmnfktFAj6bM3YsrMQ1 zh#zuy*;S2mNq{H5-4jB%6q+qP}nwr$>H>z;dT+qP}n zw%zBwnR(qaotgA>vXM%qcCxD~*?+BF-@m?_V=+&8I^2%-tGg|f&T#0AW(>aT4h|R;Xm{h zCm~J&(966r@>sr-k)4wcE!@P35=8@!pkV+H5A-2sUY4!iXr+4`@18CDX#Rqw_xQ=q zu@C1z^0=P<%B#WqTqsNO#}gjLIrla(+G2(eK(FY#2yqMj;X#+yXKN*P~60L{zTw(~lgk44_R>c@#G;hoV~3svjfrYKUMxO7jqnKjFCWyhGcxY9*Ub$!1}eaDd6k+-*iX9s?F%~<3U1OoI#gi@oyT5! z1z=yO^kt11#s6WB*}Dr2M_wmG1CLXsK*bqqNT`}14Pn~*X^6~G6mgJj;6WM=g$#4V z>7_g7fYpS=mbmTSB`aRM zs}yUTq7)P--MDhZ;K9%yR+JuW=y3QSAg!YpJ#v_=Z^JD-{vRu$8hQ|zIHH+nUZ*>| zd(P5nlE@>=+%9JTD;%w>7Ts8pTt|5D3_rBZ3>N=N0^&y}p=09yF7T4PAF*!bA$Ec# zaKfbgIZ~Nluhwqj9}rL9Z)#1o8L(^~_>1}kDgV1~jLeZk=r^Nm7Bvj&ztRV=tdlqc zOlF)Lr5aRh<=CvUp<>3$lUxJG|1$pBzT<|5!Q5c-#YSx5KRCif2)z758d~L~0$ak8 zYO#Ma7ND~tRn45a4Ew`ujrm8_fP|{oza%@*CSO@$!ilmO{0sn4i~Psr6=k2GUSP&9 z6cn=;ngDeXt4ggX>Cvld&V&t{MlEBiQ?~*ktIt6g-F%iic=aI149q#xK_{rshRFdc zSQF5+Yq{_wT#uS61(K>tvS?l@c*~5f51Ye=d4??CEw~?;CInI;NU%n|ELm!oQ4vH7 zG;486@c>n24uU`2xv`HdeJX#dITg7{YrM=-FDEl2>1b2GFvVw`X31|!5p|((z4BdS zsI=ZF(pX}WT1sOOEMCJ~lze46feX$#lUJ;QX@ewX$t|t3UO536EvmA;>*7a9`RpU* zqG&y3Mxk^KTx8{4IROgSDAk0PzZ3z{FuZ#~8Z{ym4YkGXu!U&H<1tpKs*M zKO;9N2uMdkV9nIj7J4>g&IlAf3aXEXnBJh}GKrzVaoW9QD2mt}`QG?6#{3$mIk&a> zrl90GU8LiRv-)NK4|3f0^2jC7+v`2Q!}T>deXJSY*83?lHT}GILx@0?R<0Vc-mblk z>9WH`qfB12SVy?^qFq9(ifgx5o?nbpOnJ;Eh#pCR#_TzXWC1${=@^A&v|_Vzu#FNF z*(q6~SP}t(!&>j13X)X-M8lF;3`>RwixumxUIFC(!#4&i#XndKgyLd*)TMLi{9W{B z2oReT>@Q1+KaeIX!xo)~E8#(7!3jzL$EcMIInk;CULbWUj=;n(9bAZ=VvX`BaXU-n zZJWZ_^swP`EB3!dJBhhJy=1@(oyb0PTL>@ zx|ocxbnpEQa>O9pdVd%p>#^hiiQLPgoqrx;hQ5V!BWCr^93a{BvNnkI)H>}X2%H{l zN6pQqGp>3y5_RJGW3_WXPIt&}J{oPe5_3HCF25|(^F~zJ;v2BJz&?eP z3tDf}eF!n0+WGe(KG!CgV1!|>VA(U(YEg=rCpRW?E=xQza_J^ZJtabm;MR|fy4As1 zFp`DKzavkbY5FkohtwQoywUQ^um^oCMvetk+jJIE_?K5*eq5qI-vqp2KP5p!KYfWY zZa zeu!E~W2>H({8!Z8L`c) zf!}U=EG6+pwBgS;rQoc!)D5CY`v1 zRU`_mP^4xWqzIN3DY;zCp#oOnQ9#-}eGKHqNbH^{Q>2z94$e{`A%#@6>_-gNXyaag zD&c;=#g2(v<2vq|NrSJ1OR^$(_`!A8LCHF0Oxc`n*S}kYo8)2DO zbJb;{a8JDohSaHxIL_wmeVjMn;UaccUBiE)KC-fVNrtN=-DN=Jr&GjAwJD7M_)nT#Wpx7J*d-l)YXzCZb})Y6@wAJp>Y8`i_VLLWR`@Jn*M@pL1D&oKj{y}%;cTwyUc>>5};GYfV&p@dTh)Zk-Y@-N`I zG>d+)V0^xBp(^$Gn(4UaNJ4#G)hfULua#hJP4yKiSLhuPCffNob&kMt6E!$4&KYz= zA@e*Y)MDv~getJfun!>-dDxqhvV{cZ@x;VLN*)bF_adRdHV`~qp(-58GYx~#2PM&Xo2 z8!ZJj4F&Z*Oy85wl#z?&ZWeKt3$Zrw=~3KNesX&=Eg#i3^Hp5emCnw6U#KsJ**C$r zNw*$;`o9L`PEek^Hq7}z4={HM;LJixIF5n#PGbciUakh`5{iAhQjcTR$y{`OsUh`> z0eUUqcMl_|^{m|)di+n?2a4xUN@X9?H;UbH;pytB9Xm~Qm*eh`yON)97ea9C-dWs- zaK0m$@c4ZGf3FWiZp}L-s+?!DIP*!)eajM=&0^c;d|>sgj{_}{Rjg`_m;RX|(?Hw? zvRFlji;uE|<1y%nxmYjQgGh>%i9A*mmqI8Rs>ahiTN~fnuRUTT+J$=hSp#C1Ok8)w zZWm^j=|b{=G2Or%ZX3BQLz8(aX0V-WTNZ%j$-wSH+}&de;;|xOWCKJ}5*{A-mgF=( zZ*P9eI3Ej_bc9|)fBkwO545u|+_JHpR9WhO&V$RG4+Zux#taSY5`H&UM38HQ0-@ucaVH9YIpNaoK^;D6o|E+5+1T*oO*L<}4eL zIxyHs7^+Rcfq7skf)}vu8@y6qG1k>JpSIMCELyT+NfxO^f!&f9zJj>g2nhw1f|0A* zrc54#M4WnOWK%v@@@*+SNGb(%+&WrOD_*2Vx%4H@ zOGP?Efh>Y&F!k{7mPpdT19{+G=y*(Mzo44~ywabY^ZG$WWsT`Ki|X8I z8q|q7ob{g5KR&mBffF8MdxjEo>9eCPJJ{MxhS1gD-uh=$i8DI*>2(*q&mVVlQPl6- z1?wJeuh499xFJe&43E+N=b18@l`?8=OJkS=cOaAIlu)P*I#Ifn^u)SDW}Zqc(Qu^X zt-N}}rHaRc9-Z4TMPND@F{ERLL(7(8;?eQ>la35j)=hAi{|Nl1bK;K|w3CQuvp$Q>N#m8u=&`Q5AfeYo1|_d~FvE zXf9I?Q0f(n0H6rdz^TQT0p2_%-|FQY$nS-ymLQm#6gdrDOECIImlI1z4GJsp^lM*M z7qKtI_tTIkg(Fv*E**IlZ-r+bD$1{j_i5x$#fm4jTy|WIu`bN<%R3CMhKy}l*=5;F zo9>W9(a4Wj7NuTr+sZpV&74n9WRsk$@Aqb05=)=-R5={KJHsfWr2&T@f9;YtPxJi~ zY#hmE|G3J^>Dg}Q`Ah5+oGd(Qjtz|&PpKY@n)!7>GZTO##negwBc~4D!VweNMa%qy zQj7ja5*CaejaS&n=|VMUNfA3hK}TK9Vdu2T?x>@K(=@jPu{q@D&k+9b>8AKB6**_Z z5~p{lPC6!4SiXmT!b$tH53&B<^|78p>Ri#0e&EpE(oE(wEDhOxGg;)E9hgzm9Ig?r z=ce#Lo|=%ttnmy(K&8q6#RLcQxDSmml)9gJeWcn!w*9@I%$i|`vF1U*?916*?YI3c zs(muW{|`Q~<7V@44!_I!VdrIL!ph1M6JL7MZ-NcSc`Bx5%kjo)_f-|Z8hX~5X8lMV zjVY#hsLuVi(x-zpX`7VF{d{b5RqRa5G0UYS=s*@tIb9>DLb54nh19a7!a<4cU+I;~ zL_JuTR4um#YPs9Kje~9Xl2)dWRAx1nB`NKk+90~h<4%aO6{vIPbA3fMbG=tpjE=o1 zg)-kN+r-JbPci_ey8BrOaNL(8_%J-*y%M>e>(V{2^Rk-yPFxLp_v<7%J%4Noj;~oy zd!DKI>BB{{eGejq73Sr==~|p~E-^0!-+mXyDcuR6ZUjt?>A{su0aqz!H7bpkvQPRh zTinw0{5=`qKh7abm{WGfsB``=p>idqjY zZ0w{wdv+Xvjpbf0T&q5)WI(g)s&9=X<%IoM_w!G+lHZifx((OH0gI)D$%=^gw_>Nn zKzL~!r!9oO1{)$iY}R`ddQw!h)Ma;IjYv)UM1w|1I*J!y9YnqRX_SG< z7+c?uKeKwD*Dw!9J8uq*yepH;ST2X!AkUbgcrVPDVQD+f=G=U3iv z0G**BW_9cUok)swu{VO0i0_zKPeINUgOO!ESXNk48rpdr%teHz6AW}~8NAUX*ojj^ zrK5d8j9G?FR4Hz8!^RC8TT;}gfYfqA5X)5#9mK_by89l z^CdEA=)42@C+bbqcjmd2d@1jp7dY^db+D^|~y?rG0iX@{#QC^tl@3K;B z6m|8!riGAKxaIivK$~yA z^&g=3!}B(oOdeahG5LD>9WBQE>p6b!7`gTgS!XUHNETC&#>x0xi8ghN48XMt3k~Pc zWW-CQHe+w`$TRPU}5o2_nnm z5(Qot0dZE=twMB{)<_(rk*zapIF^N_wj{GYwoGTK6hkJ#{z_wf%%3o;5X%QtRzE_w z8lp2Iu@q>qs8lTg)AxiuMW3Z^O5K4FZ<1~lKNtUJyDJ58D~dX4Ag(PhB63Fx$@0rY^1^sxpBU`zVx{uM^ zd@?Ep2zMueNFjM+lj+s;J2E^5J$6184@E5_XJf4BW!Ky!>Lz7^W0c;c$3vBmG)xf3 znJ@wqh+sG%4B9oTi)g0Ftv%w@yRDT9NGGT?5S0u~4>Uc4w!Q7Az0{^L{G!T=)0O4r zW`k;_nC+xKv&FR7wp-TcEY$Fmp^>9B`zlC0(oz?dDpciO2dyH5CjoOWq~_yJ95EGj zvUVx8$QM3PKGG`LQuSFY31R&SDk#O4Txba9kqo@(aTpBfPPuQ9-3{4ex?!|0eJr?+ zTW$FL57jqXtn-Row8s-*+X=G~?{9`1M((WL+QK0gh^vFvlEXcob=aRNfHBPLz!`#( zEAu8~CCcB2IV<@{Mx;Hf9YEIuRXIkQz&%{<3B1i9P(=#Fa@c|ysmMQz0Gh6|FnlBo z8-Uu@ko(XAlI_zGzuGVy|ZHlRCsy>G7a31)4D(d zXm1KFapc0Y&0nt*$NZT;-}39c@nJHYv7EYf89rhgEgic~JB z!%YJ2IEw~Oq~yi=mu@VWik@JYl2axz0m=2x4l(0>oyboMQWN5fWv&aB^u0OqZPa`= zNGu?S96?&sT*lHwRH{i(Dio-_Z8f8MylBvqI_SWz)0p_y80?2Nx(&1Zl~%27hO7Ha z)i9%|a@=Bjs_RXX*asDUJ6BzTEN6Rt`CWMkG+Psl?izbAk8a8(b$ZWFUpL?VyGPgz z|Iewt@OWt<9f*$B9Q!w=WIsb-t7IZkTrzd}D9sa5yWb&tv_%>flvA*qE$f`f`0vmnm>MIZJNuT_N@uvY?EGn3%LKvvT>sh|Tl_Az|21D{OdU+Pb?0>alReYyc33$_%=lnS{5Ua( z#eSHFCj@4A6skQb27GKBjaYsr;9VtN=);RBl2a}Zzd*`BhMXBnmxYvxv21Rm${U|E zsdm04#j#6S{`VX2kmne7aD-C>K-MdACh|A?3t!ZFDMun9)X)o2fuxKDwsxIbZ6Xje z3*TU1E=I{;A2aHx#K+nvmH_DOx`*uk>2W@>A+)pUcvT_Yv5^tlGD*+O{apF4&H9L; z6aA#e?Qmly8-myW@Z9|6vV*(AZeSJEdHqGc>qPdQ_arq>%nj#KK2GPflfQ0KaY(Ny z!&a~SAT%S4b9_~5%Y!*}5^m0O>dhu0HtBb#+LvK=x$ry}s;qW#?QF-bJb^R1Zf; z3~9r(9BoMuX`{?il~>XzP{TL@LO_Ys6rfIO-!1_$*u-7kMi8CXpynx?+d0-R4%%|i z{)U>Wc;{G*Pf;H2&=>CE2z%?TZPgcEW?<3)vonn^Ie)U1%ADm^eZ-nShS8Ypmqo5+zq3W z@dV|6C~LVmsQ(U7Bn(@^p>Ek+;qvP@l69g-jMNwUAk#-`W% zlFlMQ;YzTW<*p`=Z?!kcH(PL$hUVgSF4d;ThbW-4BO-ewlP!sVE(E(X&VRgu(gzbZ zBErK9pqTEz)T`8=l^TI}K9<+~gAVh3rrS}=y=vRX^#Oe1P8 zzE5wO}ysPPc~Xi;Fm>V$DZ~2^G|ZbV^UoOgxvAelg1>)LavGcJdv#zlWZ6P(i^})l%bg z!%0_QM9dpgE|$xPHB*}^|Gqi->UlPvvvwL+diCkx!UrIkd0 zJzepK3?7%f-?@_$#Y+yIPe3;n*gz2BFT{^@QlPufGo*k&DgY9ZSD6DieD^OZg-I!> zv%pCv&xK-9w9ASv&MmXRN{2g2D}|cM|7nQ425gz|kNV>O_%hmTIo-H5g`Ml!99!tY zM2jgz_*%I$e8lkN@Yy&*oJuk_e4YMj3J?9(IxO$Maa1i0^+tRW$^<@YyZjMo@*(s> zJXd8fV~v^R3)2lLzJo7Vo9#w;mlx1xJ(L&hf*ZfO)xj92pQYH0MvR&Lp7KZC%W5F} z3lvxxDN#Xpu`*?(`Kdx%Q06=0L*`QX?es0EBV?SH1-7+L-oX*Wp)c_C#% zYDpDgK{rD?7jZ);6H{du6Ixl5|76Yn6M17Gp#6Ow2kS5H#>(=4;cjfKtZcuSo1n9? zsh!JzRQ%tNxBn>q7xKpVTaa`yw6Qc6v@^FcCHUpolwC}1)d(1w*#95I8!N+arLcve zld`D`1-&4>7`-^X1id7^481J9JiP+F61_6L3cabNxrGb8nWdX4y@jWPg{d9Aou!>A zz5Va$Z0hz~bhh-McXlu|Hl=rQx2N|qb+V`YFLaKXfQ{|9bCmx7qjPM(=-hua{XZ!} zF-sd4Qzv>c8$%aU5mRG(6Vu=Kay4@CbTFk?`Mod-{}(&Q!NA1F=j`HSYG@1Pk*TTz ztDv%i>KC{5;-=Y*ZQxn4)?~jE4hIQ%C@xT*-wFYGR3d-^1FG(}l)}HIYlz6$I7aes zX%JBwdv4iCNIO5@f~fBv84Ri575I;-{(u_w12OkmutK|4%$d-! zYDL)!y~zQYuxn35yGeVd)rpLjty^zf(l9}X;?G882wd04SE@Bg)+R$fZ<*~K)m}0X zCLNOXW}|TagrG3FT{p%%#5F8xkRlBK;Om++ug93sku#_n&iGXfnbo6s&ad{*Pm)c1 zD@EqBKuV7B%dTbqO-M`0LdGQ?td4|+jSDXv0(v4sl?hQYRN+7s6jh`yvyc*| z&9|^(eBvo8Qc1=?k}oS0715xIDKF5nh}{-Ang2Nbjepb-)zC?{lIY%NtI$0qgi7(7 zpfUDM`W@Sv(TuK9%DK*)=qyt@N)2(jAM4;k+Z*$T-6_oUfwt{CEKun8CR8uOjAUMQSln>WgrCMU+ATPIiR4}gj3lCfExgy zI>u!}jm;@@;HLT+*=U$4cPLvpdaf!I4|f+K<~!+k-|EhWZ55A|7L0~8Yl}8 zkGNPG%Bxrx_In$DJa6GZ>^)FBmkQ1!9u%excjrbB5ekDx!{`)(nA(j+GxT^P`P7}| z;H~Xl^xrP+OW0AD9tg|{4^vMUaPx&Zsg{ZTMdG}6n_swJ$F_oFIc%ktmr?Y14YfYJ z<2#Gh^L`qvBu?V1CA3OG_jR2?0}*D*CBn8nprlJI9hof^6_DSQjvM7|CS%~evFJ{R z?MR1*N$jFGlGpiks>rtj_`h*SjSLgumVKbP6oP5MMpH<%FPGT9I3)~s_aA}I1EAql z=Wl{>-g!N_AsEnhS%(v~GrP4ioT<*N=yIO!Mz8%(3I3hZgeimz9dUT2qO5egN&H+W z!^Xgp6Cy-M-Q90qY+kDK3d4sk2<0m$<{K%2b?>RJ))0k&$}H$do+Z*l`XKla4phGZ zfN`Kzx2G~3Fu^A1Ija5@@K7r(w{X1IIyqrgq|%c3KS0QwT73Y36B?P581 zR~)?q+uA>E_0x6VoLtb0oHP9ERO1XaLV2wO5S;*red?K8QR~st)s6|Y(1EetztGv0 zZ?@4$dVM>n({>-mgDn(8j=IJC2X7Sm>lTtG@qPr%fzs9{*T$$Yo{4#bxiyJYiJHu8N@8Wr7{Ry7mebgy> zSfei>gaA=H%0%PVaiM2$$b6h3$GY2P;WGfg*(BW=_&DL?eow*qj1_5TkZ56TU#}JI zA$~C!-c#XZxI8GhYPr7XKHWmAsELxAl9SO*ZJkE2kFO}l-il3Xtw;!&AUC*+@boRP zk=naQ903}nj8&JYa9W}4Dv6~|sYV{h{{lxqY0~_kWed~)s%+5^*HTpyqZV|sG_;Xb z`R`JNmWB2Ipz}GInf^yOpY6XZmH$mR|38Gu|2mw{{=cU%*nbtqe>DC7P#7}5{H2Qp zBLOoD2Pe~i2@Fm~#{W@aEOtS9pop$>=&Ab3zUc72q@~G`F+-*a5J3JBAelmp{}={A zh7>>KLskGGsRW8FJ+1bD#=G#UgCR8Fcn(%oTL}))twDv?K%db~cGcuzVE$>bGBa{` z`S9C$_~4)U@%&y;S=!iI+FH8#>Q==?5Q9ilq~4$XbC)D7h4^9Hj#O^hfIg%1ce|$z zjnK#Mxg70kZkO9X82E;mM6S(kZF8unXTKZiPvJHMr2e#SA=Nj7uf1p z%NZs)@I8r~^W5hdu^?@i;C=z(A0=jCCoTmr0@f}9tM;cAo%YO5oRY-u?j#lkNm8J? z?1e67j7GfYmNBgB_od|Q+KY(yzxsi?^V?ZM$KKFYCgg?AAEZdbz{x^Qu}5;=-v4EBjk7HCJbpp zXo)qgp1=ES**_6h$sVRYW&6qY*zOukZ0|MhBz|Mcv_fj} z7o+r}!iOL>oHq`x&cH2}|=`Innk+MKZ&dk9~Jifw4xTCoEW%3Vc$F9bjO}x+PM?qO0fzkR)p~U!+n?VI`u6i9i=CD^m zS|1LGcp%~cCntNMZ=HO24erf80lrDGKWgp_d*``dsWBSTK-T_wCv=-YV8U;(7DmvJ zZ;WmgW_8MTpO8$CYI35h560|bwUSkbXiwRmApL$_!8gS>MX$kEl{)*w-gx+iN8S)W zVf;vcAbu!+$`t53$$V(2_Kh5qRtdj_&&gpE$s~}Az|Q0>dmfAP5L+Ka8{v85+P`iw z?SRz>u7us=nYP8h1-=13d4Q+(hLLtv?oql!DhIAe^jr0CB*69^PkHcxb$UeH;-gFm z*wNyKljeZt$$i=9#`u9{QGbZIM({)3KY%yiyypJcljui~ErueN{W1TJy_gzlTbZT2 zX8HRnKIh#T#QTc#hRP1uy377akcW2U1fQqxJaNa>7`I4JsKaCf%7+)01K7m?n!0b_ zhO$4(v6~NdU2{s-82^cx1pX{B3R5GRlTR*4!QZe}U4>|MHY_pe_z)y5rlzI+QPY~Z}rteffUf#uOPnFOf6`4A1L4G zYZ3Xqm@!rhOsK#^pYRcgfiXx!k8<)gp>5KnvFC|1=+#&w`gfpa{efwMJ%siCo?x5W<6Xm zzLbz=WhmiTBaY5}oZu}17w9NU&z z;()bm7^{Seg|bodM$O?3LF6Ll{vofofq#bShat#L2lR$u`e&#B>2IPT+mDVZCLX_= z&&qs4LMBsLg^4ygRdu16*(+==ZbqtLBGHd!t~;yn{O=D33t`=e#lzV~?nWc;ka&yD zmBL)*aI2-9$@Jv=ItY71EZ+cH*a@7phaJbomm|8J9llma+s7I}OVKd5enE$Jv&}LR zH~F#~e}?o$J69{Xj&%M2b_-0HxIHLIY<6Ye!su}OI>QNnzH(tGo~2GM z>EUSnXeTW+Rv^naEhLMjt6j!U4ZcK{;5U}-MDn_XT|O5=Sq3Lf>qtbij8@l5iFNnH z%p=Y39-#T~E#o>ffTT9=*+th_!AkBBG5Pa;nquO}Xpm3|iw0HbIQf`Yxz2Ea2m8@cA#N`lF0^7{3n zF_Gd*QaX0H9T@3IULMuE-^&Yo>E)!h z&7_uNaXjdXsR7<@8>R+`hbh=!1>kN-FC)F;mqBwT1~EY< zDqv(2!WA=v+ZRb`uw%gOzk#9wITO7Mc=z6qEb|JK=djxR0mTB*vmjR*w^ykGmVy<1 zY74}|hW4PnjoFYRCk=RAyORcu5NxnU1#cE~Iy*t>YkJ6yva{Z(i_Wsg3h8C+*+p^xw$EyT{7SF6g`sZ-le`{~xb!M6 zi`$K-O(m9yzI5L+z2QOnjMs~o7WLIuM-H2*UJ{$zSz-}wMJlVMaB8(iv&+!r-#6*h z$9XV%twPy!es?|T2DY-YHp`*%V$LoxSqy%!)7IBr)CY4qEbb%!b>kSe9!#8ozo^V7 zEVS8eMtRMT>p#z)>z|}r(3u(SCVtWjIJQm`lYhxtJ;pKMom9Lz%4ywAo-X{nFd zSzq3N;=2n7=5gc12C|0pJlL(`LQ3YhodIj2Fk*g6vVU4mzWpb3F?j=(KoL^E!gc^z zLZ~;fA428vj=gf36(Cj$XtR;|dQlxXZGi{8z|q&N-BYx{Uk+JjAxJBibM>H1*^`MC zJXnIE`y5fvpA@w6E<>F_#w96;DDn}wD+GU6SK!Iak1(kNpc{>~T&)2QeNB9`ENaui z-9d>#{do+Fqzc2rX@Ey^6x_MtmH52%DC1rf;<=gT<}T9sTMW0R z3dT+_nv9{dX5=SAkQ9HAnZ;eEyV?2G+7BQ`h<~9dV8Vg20vtQ$4JmMH647oUHxx4c zMCUW+!%e-YDwmO6#Y5so>~Ta2oHvN(p7@^Jr$d+_&c!7KHvvwdBaq~p-0(vfn-as1 zc%SgfLtqu4BCK(k-*>?YyhlZe@BwI&+AetxSVE}|6&n3es5s>HsCvn5PE-cSA}TSk zuy0gV`HN>D&`ARPrvS4Tc@)6S-4gswdBdGIpukALa<^1i2M_Ddcxz{~MUDgbiETwX z{xyOBR>jZ&H~0&geLe_Et&2j10t*FlE{l*Rm?+4pZNRozl|r-N8YC$oXe*2rYNVK6 z$URqbi=sURS2Cmm%%KT3PjPUjMHDO~yqmDX57Rxsa9q+(!?Wu>lC?f@kMR}tY-p}; zO6MXPR6(B@N8BzJsut=x5(j%3p zTk9C%V>zJU4BI28b&g0JW_&k6QC>C)Le%=oYqvWemHR{birc@;#`o;KSw^8e>^l z>u0!PA@D2IV1W+}Njd`-bPqmsmwv=jc>&2fUR*9q&$H=n1lxyaG}V$9Z&(Ulu2-ph zBAr*F_&rei4BE{{z# zKj>JV4*pNG+vQtoQd}?&CywR7JkHX(YVe@1fet-WUH0Ax@b!N7c{6_xT?Y{l!}u%< zshrkg%x4#C4<#F~SE<&W+TF_9ZJ3u${AxHoc+9>9zQ!41T&VsXm! z8Tz< z9^SgR_wDMc-W6BDHYo#PUt#5p$|L@tp7g=aNE_nv)v`QE%Bd7Z0#qe-F8e1eX$}DX zF*7SL+yOs=8SU%9n*^V(QzTxQ*esRRb}r!A!|#N!Kfv#RBcH)f%mIeQU-4!TMIXHJ z*XSV^dHQ^|xj8fi6c^|zrps|7jXT-LpXr9)_Ya!*aiQs&Ic9OoT{9Jmr^qq&eAjA^ zR2L8B9VyR}Fh;sTf~QDO^>nLoL6y=7ADXF_{BD$EE^SQ}6IGXzINx>h3|k{UWE&$s zVDE!JEj`7AcO2W?wRUd2vV$yQR_VDcWOmxDGZ_|HMV8)XE2c~=b;FtsCv$FQ%K3Ej zEHsSVOfnnHwcq@i)g>k1Vxd=pPpryTFN+tl1M6Vtz}7^}VM|xIjCq~=_2ygaPnGwO zKYM1#r&Hr+4Pq*vVGF2_j}Y&bQ2%)#zC%3I40`woUEu*^DS#4=cpL8$cu>m|8h6qeM#4z`%bQi^1%JVjkq?xaQ$|a-oyff3=3roVK;Tc| zEb2GZHi3w2skG6H=wy8eEBav_fQM_UEQF9>xjX*320yVvdY?3$qJ@Z&Ly^VHDh-A3 zjw9)t6ML7609-Q`Glm`fI1BFD-39Q9KWOKgH&%W8M`O>f)>4841wHvD9TqnsKDE5vd)Yhz{jY2i+bP68B{T@u0D=l#lr^MRA#+kqZ zWlw;rn@0_*HXG;QHcB38ll7qYs7J84R8BArUD(Ci#}VKK3jN6 zbxGCN>i`UgxcNTP57jguBtv@W^^w;fgZt|?bO}^lWS=8D(*wglidH}Sywj!LZsJ+E zM=~^N-E_u&UN)pqfwVr~$Rza)A{iGav>Dgu!WJ|~mn&0Zf z;jea^zUR=nX1_DNxy}O=_>jF3c0=NdLt(YZ0~Yd8yX``H!8oh_F#uI31jTW$hKl$q z0z8<532$32$Px(18Wz6^PSCMvbx`9~FH+01(yBOFoOWI{tGQh0sI*U;p#04R_^x`% z&$m}TKkm1AcQ9ce74tOJiIwe*Akm1KJ&{*>P5Q{FdX{k`_9@5FlVtwVvpNf4??LC= z5j+xy4~{3GtekVtwnt&W1}?uPYyl;u{z<6k5ISiVx0&!BZI}Sm9+$7!Oo+@Iv`L1% zNah8T0ss{!?228{gC5xPNh(Ux$(%_LS&h3u)l zx*RRA>k5st6b~1^f#&tr%<=(n!a@_5GXaClP9qLm%Kv3Z;pz&vv|UrVc-0Jy9g)x( z^iS9|HRZXXtWF}EL{9g0cv{t#Rv4}G?lhy~hU@lmy-A+m_h4NS_7HaRfI2&)jy;Vl zMTSg&({<lCKWpUSHi-VjK3~Zb3&I1^q9k{#efZ2w`%TD?w=HSYemCc!E?Oke zp*}zsq^G=gj`}eRp%@7i4lW59pnKLfI#*Ck0h*Y?K=Vb>$<(s{^ne|*eNBtbgmF&0 zH$4|xJf+ueDn#1uV;QX4yI#mZ`c;gPuOeim%!)(tGFpKwLC`$y9HDF)U2DA1M@0>C)-vs7xWw?hCT?e)pLBKbB?_lA11CbGu zmd~AltHqtM@CmRI!c^Ba88#o~V=%vNnB+X168D54tL(Mb$>Yhtxwg{ea`PmO!ECI1!Ai#t%zuMFhu3Q_5OTI2KmS24DJ9F z4lC_PaXSx>I*9D`;a8L0?lU!m*AIcS^K}~)q55?mG;%J~;R0Ko?)5Nih_Bmma{_N| zpZWJWLc3`O$9q3H&C6G@xQKUetC!MVD}^v~?qrGbt4kn|vSL`KHo!v|rD4ekmQoU4 zm0~o+9W)5y-vu#-JSuj421YLl6l~tiHZz-SA$+eOyR1=kjIkiY5NTi$ z*&7PrmYW%DetdA*{j%<6yAk+(gwWY~D`u^{>36-IpsW@du4Jkm%2xQOa-u$-sb^2Y zvv3G14+iYtxPRmv4aK&k9%-i_f}UDLNSZHfi82-;V+p_0VE1`7vYZrUzaBM(n}Ig@ zQwcHixxcc~(|)tg!MBn8adEj*d?T~{&PMLt{3L%ueE8GADR9Kp47+)sKHHB2hXUrz#ELb5A3U%#cA+wmKD=B>DJ@Gu z2rsFe1-_s%WQ|g8xD?0dzV(gkY5Qg#_GHlzHZhh5{q2Tc!WH%&cA*R}Vt~ zl@38wCN9$p?WZ%>I=ZzArc7Unya4rpW~NW}xwf-ronRPde^PtLI@3VIV#D@;$L2%k zhz$P88NsW^fw>~+`jZyAF_V+=L!hhC;>Au56{q9^Cyk%05Ns@kJkoj@hUi_aOjR!E z&@}!TtwYL_dxRKWChOmG8pfBK&8O*qvfCdihif6WpH?dnS*Qos7%lr@Bg>mNFnnwE zxzDTH0o|THE{1m*eAXPU#CTCF`z1c_i_m4NfTqCK_FyhOsh#B#Fo080GQL}=a@?Ue3o)=)s|j1W*)C?!%x7~`DJ{o+K< zV}e+clTWM;Z!h0)l~}clE^1q{=Aq6-4t85#4_)JukLD@R^TOA_7hp5T44q{J^-65B zV{_9N&rw*x4x!N#^zT?kMVN-ZS*J1h-~j9ur> z@|3?VsEWLnB~~W?91N`5qgI=Tbg!zBDGvU0167ZOiUwQ%8F1MAlOhiiAii@4JWe}H zq=(iK#lgxj**bJonAu>J;&C}S_K)mg;1iB^`x_)#r~Q629sBEc)v;vMvd5~e`|_;m zAKp;H5_WQ=`uB-3*>z*k>dnc5nis*V>P-=!%+=>3V)aMg=Lp_96b%UX0JkNt=n2W3 zXjkFd--O$f;gP75DBw<8>9Rk;)C-AZ#yNL!M3|@%gO18-?eMjB2p;qrYA)Ob71AWAs*6aNbgKrmLn+5B8J0PBfxD(tqI`L)BSLayYz zB!87G(}<>~o&ThAf^|F=bxym<`iQzmdRywQ!-5sa$sHyA=L8e^oKNPP`Fnxro@{$k zlf8flnj2nam_RZfQZK+Po?tOxWbHK?MaW3% zfF?=dx38I`%zlTDL6Rc^THfnyz=Wyae&WfdEh z7~BRNu4Z-d7T?b~NMhkV!qEN=H)_*ZIDe2pg&hUfssZX`w!+Wp-*f|rbSaL94t2ot z`{HZ(5|{Dxc!i_xvMMAZ!sDK+C;R&b z4O|Qbvy)*?n8z9s7{4o$3T;j{DV#!KG6LM)HEvGBNr4xkMA)#HpsT-d)|+e`oo;>N z5HJmCKIyf>*!?b2T!s;QyU}B7Dl7|Pu%4ir`n-*RuXcTTH;LWrgFWIh?2jG$W!%Y0 zLGYnW0G>qJEO`!JxCM0Hma^v1vE~6Cw!1msD1{zz*xv?Kj!V&*HJI&Q^}61Mecf69 z*rJ)hH==5F%4hL#lfx752@mKdV|9A-rF^!Mxk7?l#x-j{9;^2ssB(N}e%d2j+gypp zZEGAU%8D=h?%zvLdCr^bZ7P!sQbzbb$z^+*B7=7LE$gvy@yWYj`bS)-=y=Tx(_+kA zgzdyi2>$nsLk~0l?)nrULoUC8<9o7B{eq)86Q^37rV$ma>E`!6^NDh`dAD1CePn;IB2)b$3z1ZKc0n>agneTc6WkyJ ztW_YNRpbSjRlWQIh8Mwxf9C9K6~MZ5%@V$-S@jT+z&y|_P4#n#(dVldiI0qS12Hr!CC{@i zyRe<7_itUo%v1yrP~`2KvMmEsVL;Of5tnGCoxyr^F4WChplXpL5xXrwY=7V$TX_&{ zxgc*$nOm5V9esNe-hY2xt(~zgH!;U_>{TCNCwSN$Y4=6y?%_zbyMcwFU0tnvZQyY{NI+tThZa=r(MwLU^x zS~G$II^vgRNT)hVQE0&_Ie#gj48d*T+ktBp*8S2owA15C$%%2e#6uDx>|fO?2`@Mistii4I^d%#E`PG+8?Bpyv|Z0rOS7&`!mLp8Yo#z6`7ti@bnRN#7!K zJ7l7}MT%m$6daMp7NDAIW3fycqgwarM4}*3AfXqf?@5C20O2Jd%RIDLN{tqcneR!1 z^qB7G5VvtY8Z<2%Le{5~jW9JNKztLr0In=PJtgvrqePPf)hQU|uIiHL02|2RRnRIlLGxFMg8DDZRrP!DdSd8n985iwLo~3DZ-~!SGZfR-wY9~Q2`P5wr$w$n%2Z_k) zP)+rDfsoALjzE!+q`;5JfY@u@zj=x%a4x(O#XfwQ7neBDhTOoFZ9uiXc`MKQ{xE^X zDNj#5{zYj|$w?&}*U;%T=TOi{9cek z{mF9|PPvgTuy8hm*_X5Qkvb2VUB0r1rc=}}v=)~dX9jEUF}_{2*;rT`yPK;}aSDRl zkEqKzvFj=F#^|VGjhl%9f5<_$ZwYgqFt+7~|2?fnsh4APlCiz$EczcQjQ*laBg5?F zU_uBxfMJvirNR6w3nItL#hDiY1j>brb>UO+es&WGJ{8Jx0BTrZpH{a-fdQNAg#n$q zr~eJXlDG%_wbMpW5S8e+rNgt0VCtmny~o%dFcDlfGyEKGtK&+8yMfEEbv}7drr9PC z0CiYXEoV#R@7w7Tz}tzW^L_fYmjvF$44bSX>DDc2;qd(ai$*5k!7R|Pok4+8J@XHa z(|5l&gfE9VJp?~GSkKl$`D7%@h);w+S%N@ML-fj`>$J=$teN~DE z(^LF4sAO6kdehmEOmmPdqXzC}r$*QM7`DvMXSCQ6sU=>H5k=5EJR=_p?Q~da{Y>LOm$B%2#XaU}T-=VpKz} z4vUPIVOm@-ZZC!?Igy6eEz(Y6(`{XDqHiX15xa?A_1Jzk??IZigIsMvOS>aQyPYS z=0j496+{4tN3v`mL*zq4-V%{=Jj$;SGi{kA{2_5}h4|lP(Nv7V`&5db_llR@?zNxB@_e#fDjNR_1+oLKQ&nCi-R@?D;LF?CI$KUC` z9Woy`3*EbiOHx?)y>Zsc5AIi4Bu?`0KlHN@(i%B$iQm|NA-ck(0I5?`#~E#C*)eDj zM^phqZE^FdndvvRAA4X4ZJcGiC*}Q`xXHg+z7kvR8~B-_2kZF-&_d~(V!=4cQm zfWedw;7b1FaU{##wfURzS-KgiH5MDSv(hrMw2!v-cFsCfHH>wv{|$Hr|HtWU?Ct1; z+%ojH!Y$&_#o6#nX0BsuqiRDtZ?aKfW;2xs;eMhHk3IMgd`}kO5?M&5_wYEo0;C08 zoZy`G83t9@UdawRarNw!Yf%v{XcNa#VxPYyxKT(j13Vd@mLp{w*nP&Vd&mmKp|1uG zgCy?cXZO&nn;i_!5WifHEXP0DS%{O(QgX+d)MJ&pVDeqjP8iz(qN`rWt+@o=cwQ_~ zZpr98yjF-QQFR(43wTaurmpIc9+Yj!k&8u=S;ePH!8%v4*C$G)>z6m9&8px!Q%dUc z6Scu-LyCO=B~Gad=!Ym@G4n;40-itfq0FhpNQM%vzx7VzY5LF%7vfLVL_&u5%?gPbA z@I9FyC!a64&SRIVu;zFwOlMYVz?$JZs@Mhiy^Dab5qhd3=j?}Px*A%P@)0t84hkfC|!8c2viEpfC?4|HBNtK3B=Nv0^nST)( zS2;zl&6-n+iT?hhdz^9*yMo`R%i?Xk45J^D0J>g7 z4xcA zcKr1DNkePX3PzYmO;EK;WGo(re6mu{kWTtA9hVhyn0XM{k3LIKrABfX@8J{+} z5R(%cd;LlwG-nnl1h4vBY{UeP-V{}CozMZr0HSn)BL-i**8Sa?r;iVqNB7IZi+Jq` zIe;t$N3vUmz%6r3)z`NCy6eRDbu%RE>u~4WO_S@{(ry*2*+Pbxjt4H>Q|X+EcNAVQ zsMP;qF~Yb(>yYU^!aX%2oNDS*3)K%ugg63g5>^Cy@;(B~!O(Z9U-Ocd}YJt*eHM zngW`Bh;hpiHMA*%@p7eSoc54|fa@Hl4Rpq5ZK#vWpaG;qHr(B$_chP7-XFongq*Uf zbl@W9QB03XB~zj}^F}ip-X$VT;?L(sw6T-2!;=M!>}jvsku2-*8|3Fd&tK-ve+g_XU=SZSi1ri-~QOBsnXC<}H3yrX*ZqFe< z9w!~*Bg%!6(5OTRH`dxEPfdjBppB=W>Iol1MW7`^8LNZT$$i^QK=wKf5#EG0tX0!3 zDJ@}szZjOsO%FFDq^*5TECh3Lm4&Hg2AgMN(8eez4#B8{ZM-F;7nZOmhJC2JgjQrW)eu^aSI8^Rv$@T zPNB=@yRK84mQf7h>#*MpwwH}q%fVMpe(21%X>)zGE_h5UaM$+vnjfZqJAj7@u-IFT zr^c?q^BHpPoy+hoFz*ysJ!(9MH|R5(LVtr|@&AJ>8z{k^iB1Cz2T2EQ3mpN1qkKj6 zjq!}(6Oh-ZWod1vd!VbQW|VEJy|1&+hvmKEH10V59CvV?-ShsH?nssi_0F6(sIh-R ztEB0yAL;CGS7k?aqWke&F5#^HH!hbSAyB~{j8@e4OM+M>igPfrN|ZN?oS6}ir5+|P z4huz++i=;Q)dc+w<4l;sF`5!S@sB%}Cc&GaC+ED;aZ_Xjk^@QrL?bf!joW01Jqun8 zhcqm`vBod&Sw{*F{b8z9On$49N`K4>Jx)JCj!0+c1u;W_ly039=TnfVl9tIZg=%Fk z2RS?N^h^u{Q?)zGgqxylo(_jbHa1WOcs5+1GFA8?s@?9XlT7q}c8`T_o$2z`k^9}h z9UL9;@sjPP^ETaTt;e5b;rF_((LMJ|$A_w8E%?J5G16U^FP7xGoN&uFg6B+EIH%Nn z+1Y7JbS;%F1{H`4BtwjYgxh$`lG_BfgJ>y6xwe41mXuZQ!ovBM6pRpjpZlUla@Wed zL^RF`c0txXJG)ZDQqy|F`jWZ1Q@2>|Q64>SL9c#W##FCyV8$Fxf=Xsurk3;^=F5a< z>UU|f7W0I&n!tv`sam?G>J|qT7%EZStqfyXEPb_&Sy?CWEHTDX zft2U_cWR05%@2VB%aS-+_60vS!>xvARn+rYGlP64ZNb`?^yS&EpI4EYL|qQi7Xw?r&IvVB}G1cCw(kijk3_ ziG;zj*j>;#xzmgq0NeFl`fo@WzI# z`Mo?2X1l%E+GS*0^0Yaw+~a96^%!I0ZuGBc#8uB`Vz6)U?$ge|=W}VN+v)t#Fwvwy zAR?H5T8qD7terg4pN=uf5&`S5Y?#a@uU5&15lidrF%JgF^icw39I_r2@5wdjIt%^N z6aW2}ZqBaWyW02euCPa!t%6;#SDlZ^jr*%k_AL7{SEX;3X^qRItnVe)VekN z;;?D6%FO0BJqwco_6s`2ds3dBQf?{AD(oWvNCk5sXhy8MOu8Z^*Q`|p{0%pkOsL!K zp(E{S9vL%}WFRGHx*CJ*dLAxVaoW@H%Fww+(0Yy{t>fndt>${+!)gw-k0ZaC1YP}; zcUyhvuRW$B>w}A`tddb-#c%VLYA-Cgd+zP%f!qt3R{B@{J1*r7FFU+$(}h_#Ie#?! zUyzzXY_Sj-kFkowD!O4cEppGa_dI6qqaTfHyKLy`$lV3J+hVu!r|>B!7?YV}SW2}K zgIRFd$Z_=pVOf+R(;oTU`=eW_q{7cnXS&l!1-E*wp4k1oS>a)FYyqhRVc_Z zU=XOL1_L!rW1OaB>d#@-sG8%e=aaLK?aEo@lZ8S4ikDl#6J(gd?y^UtTd(>a5Rg-kTg7!7dreTA z-N0HzS+J<4Q5#rp{0KHZ=1Zw>{NM8u1G1UBc&qK6`mZ+?7x2^r*rwK>dm6E!gkxcw z=mdyPms1K|b7m-+L&K$xk#)nA;~d?Y28NUBIAzRFj?s*8uCfUhQTLHM)ZY&3?jqsP z;3D9tk(8?{oegT|DH}Cn&bM|4H=F5riVh_Yseq~JtgV8&)}|MwKGQZ`(Qc|*x6S;D zfD3Z~3@3?+gc2;UtA&`xoV*i~|1(^@ECAJCph6)5ote@`RlQL<%)N`8NA2-6TU4$h z1OT3xP&Oo8<(8^(?^MPDuW0FniNf_JqER)cLMF%Er#Uzc5* z-CSJhxvF7}3m+UU5xFF1ZaG!p+EBl`KJJu}bjDf%(AkWaTGI5?VtaJi%X~wIU2%IN z((dtMZ3sQK;uO|_6aCS!NYg;nV|BQM9y3b-ffJLE&Q6LhD_5+^aMtRs5i9DYe ze0V%}ZxMhl@q_cJ-}X++^I@iV{5E=?DJ7XzLPl54iPsZLb`VqCT+F=()Xx}JWEly_ z^!4CiW9CZI^6G$ps@d_k@|YcIQTG3=(pzJfWF>*qz|mM)^(Q^K*5uyDm{Uf?iMS{w zj4bq41vxl}CZ7OTrav`2YK()5+cn&Kyw_wCn_OFvuH#c3VNB`Sy?^v!PR>qLupA?LgF&EY2D90F|d3ca{<;WH$CRwY%o}ogc z1z1F3Dv|mcN1*VVNB6=$Y}vaP(M*L(5bS5HC*0q?1yR2>rNDN(l6=47f4^*{zta+5 zAO8bfaOPibnF-mU(A^)s&n(NVq6#=IP z#eZiD0x^mqLIPDs)W2lLEe=;(vK=zUTfiQW4(#_p$P=I=>%uj?SDwUM

}aEl5a_H5)z(~fD*O&kpLqisVwM`009gC__q9+h(ttse}K?8 zNo{=hVY1*1`Wc0B#Y}It0{KDCnV`b?ztaD&*1iHNt|neIrq(L?g8~0{pLHDnKW28@`HlG2SKKI0FBSoyq{E1Bfgr8n)bFj z^tmS@S)Cx#(`$G=U9B2>X@CBNTotCVcG7)QUw-W?K806FaX6Ixpd@>|N_|fI7itsI zhE@xowMwsD@zLpYIo=WR!~I~6pUUbKjO%}&Zag^hBBh5LJ!)!ARc0#=XF-E znj{axE>tGa`~xtwFf6?>=Y5F?LYiK?6JKHYbuQo&%159aV7ELTZ)LC|wubSvjBxEg zX$y#BvBt&`F3%MOzKUxxS@+CcFl>_`z}chz-qwW2gZLaZ zoOc}%p>*Cw<>lhqVZ#d>-Pi;FC4k3^RB{4X0%s|;+%(8V{%Y_Xoi}(1-xmvBRMO|4 zyzt?i<_hsfV!VC4MIgbGt4V+GVd|2w$d6AF721SC2G(#{(Ws0Vq(H z35KM0Dbb^sAbdR8TKlv&1~;Z|?-s&ehr7Q1MDQDhaNdh<{@FYK3Rl7lZJsOS#;5Ln z?*0RTks)uyyD};G!lI?~lbnpXcG5W3qmQ3YD_C%xacZ@Oua&N7t<1@rDVWJtQ|qqT zx9x)@{D8%Sn?G+VuiK7nz(4#S3Bn#CN^`YPvkG@&{T@*U$!`W ze2Ddn^4AkXMA-gNc_o3fc`lud)YgW^vBmZ^GfL;W^Ks2__%T?jnL=Q+!R4vb@+Ocs?eaQu|!^M{d5a zmavpI@3Vy#4>0;7dtbB0!JbTayOqXq5mBc>wiI`)H4+vv?~N1;L99!>Oe&2~Rq+NY z&~3SHeIw|E-zb<=X&j^f%U-Ml=pVy%lS z^7*oigU@e4p|AJ4QPg}IrQ#v&Vz_K-UN;5onbi|3>?Vv7Klk%USmhXTC((l4)!867 zYBQSppy9mhA&!e6&Vlq`y|q!O>W`jjzY8~HVBxsWrP=FUVJg*#>{ipVPY6Z_y*}1g zs8-Kz9ud=_We9}|i#sumb?~&hV*rBJme9UwJae|1WAN;??sN%Ig*`c+(f6xmKj+H0I+j*@va?Cy@4{7;4c0zdMhv zoVCnIQCg_lcq>FOcm3sq6obrza$j7&;E`*j4dFAk^ms0t=^p;Gs0E+iL#vf)|EcW4 zPbeumA9QvQdMflz?AtVE!dvwpp3W?kLoR?631{Tf>@1v!+ zg@IK)t_#aj*kg`3vu1ti9Kjo%QNBi1HVffUOD=p#j&dGEwV$3!rU;$Kug)KfaWIC{ zq3`f9Cx)84K2&by+fK(J5FsvUen>6ctJ;74XeC871eodw-_U0~ghK%xU#8^TL#8WO zGBiBLd>WHeck$h9a4x(|PAG1P8U-4zT^8j;9VpoeYUG7-^J&HlTl1KQS}rPe#1-z)4(d~;FJ{R4J|#ao@~UH-eCV!}Gq8m@L(VibtPbCQ z+Mp^cNm9sLGgopjPf?7w#U|#hW@u@(O2~OKdE*?bwGMahrD|E)irUkDOw3>tKu%yl zKU1P3DBC9{_$EkBOhyckI#9OABj}2=yn{+ev-mXdvEKJeA&EK79pvChd6-ks$JsZz zb_u7B5xhm#^!d2tSt><=BPFUs^26$({U_N*Z_eLTnj9XbNk@Bi<46c@e+}c-Ar@YK zQZ*j3k(oBMkVeL+WhdFTQD{IOV5P#$fJ}}$Oki3t%$aKCrs*T`Za$g#;oNxuDRp%7 zle**pAZbQS1Lo9(+56y$c-9e{DG$t5*5_5ouE=U7CLvY~+GGAS0oO{x+pHh0T%y}M z`mqUET^m?JxALtk1L>!RKZ}N-NSa>R7yGv_0INM4A%)d-xws8qQGMUB^0&>dGc0r< z)IDv$nUt6)!a6cN87+%iHEj#{$vRt;wU%U{PM|FPB&YO1K!ed3=tii{tTWIj^odF? zaTU2nA@@ur&F~`0Eti5FP|`iH1x~{9+8KTog;=~h6*z`$2NQc^m|wqvM?3U5G3Xq_C9~pZ&h`#NGac~|LdV4mY- zqn(nW8;i8}9KVcWI2yUY?__N_@;xvrxmQ7e?cq31CsgWt{PJ2cL0a}#w9Ej6_UEY7 zQ*rwVk8qkgzu`LedOSG-VQ-|4C3FP?c^Hu7c!7lJ{Y3`rE}?d~g&W*jHlAN5{gWDr z6NW8A^RDpRP=wS>`lCRYI+xE!ivus}@xRs^+Yq!TrLJa~Z5e37e|QZ4DibduC`Sc> z8AB2?j6bRei+vbi75&B`OPF`I%xi&+>9}$Ee0mA!n5+Z4GOe z0-2?T5xY4J&g>>h1Az6nSMza|B0J{VAKS2)p2fzto^umVau!RIB^&k`6G9dx4UYOc zs3~pvj?S&1#1l@`o$WcTPsm+PMwMA#u0#cY1=0=1&L^sQu4Q|KWnd!hS3X>zyLdzm zL^nEe4**dOYms--7Yj69Bq8s_M)c_=c`IN^<$QoYm@Vf($m2$Ytk~xbj7knmv;QYW zZnW_uHv*{~n)Qu(y`*o4Q_;pm!`I!F9vcqP#)RmhOQPf%xiSIiIP%~@ZzDm@r#}x; zhr({!2{^q~x}WqFH$#He${HneUIsENmf?6K440dM4jmTjdSS%@YLQMaI*?a5I*_uA zB8{i?l5l;b>c04j*t}kRu^t;ZahUPD~@a`S$cl9A!DPyg%*}9xe#g9L}W@NewiW{n3 zRz&KI4rMPMSGS9^D+dj$DOZ=g8?ComUiQ1FN0j$gr2DBFw;FD#Rd3bP=UyTr6>Ls- z0NGU^tSCFFk9#p5v=e+|ai%lHRF1u6z+k#%ra}FE-E6~5a8(}}`KNNg&b!Zi>OW?y zifjbcwt6Ce`}cC;Yos{Yw!KN~#km?=T+0NHhdGj-vdgckg*?)t1>Ep-9yN)c{4SPD ztpQ-5Hu>gkGLlm*1abi#y2)EZvI){_}OD4!%-%42v3c}d*bmY`F| z`Fl5G_uI6lZDw$}qopk_-Ru-V5wE+}(d-dkNR+igY@U*8(6l0>9^Kot_aZr)nAK$4 z0?;6md5_c9O9bmDVN>6@aEtA9k)?I`{b-TTD3VwZm&P#`5eUO>L_hXMTd}LOF69yJ zDVwUCh4-o(PcL=pH%|oo2rWZjV1DwnQnwMCG^|-0sdNG%#yP|pVq*KM5Hd|(hUN)F z_wdB9(%m{cd8I!&J!dJx5LFN|&Gp0MEorNyC+U-*ehcC1owt#Vj7dCVxY`;`LRxwP z7YxvK251Dsgg&4{;JY|Nh?}^3K`67k&B*(xUtjSUP$;pkg@k1vi!C^jsMFP;xXgF- z{$grut*v_+0LB|P{@Rj#^nqME;v&%xb z0I97Y`0xgNIa;4#uBdA9M#|<*P!8&oFtfsL}xwaRUy@cN= zkt(LyL>>yV6_C{kw>oVbg6}56(2dFX`f1CP=$6m`)tN|I*40F^2G1X#26ZJwj!`dg z)htdgD3(4^9TbXQ0T2m^Gdi)7y}o|mKPa%hAZ1|*zrnTF2^!)*7OcFnxFCA{J~M4^ zh&NB*3T+jSj7UH|Z zlK(Q}5kF4|AKAFfJhz0q$e9#nx9l5z(O*N1CBQ;plNBD7LEtZ)#9HwprXh|W9@|;9 z?i;uvy>GMfxDc>fS)5E`0Kp2VOCKj1scm(q>2i}myAkpp)Q-X zip<1kg9DXSBcU*Z4!aAHhOytBG?EbG9TUo-qn9$D3&84`1#O8SMLsp zY!r#`-t8e1gAFP27U+lZEmI5Jf|!3{&@kBqmN6pvWBzdvK$BgC_ihhBGJj0AkS^_* zTOfc&4tuGOmf6Uyfe^9;g%JveEp=I|uR_BJJ0oxV@oZt_oz}}xDdjWk&H_!oINdJz zw(()z^qmnaFDnT7<8+yNL3(U{^qo=idojMevgTuCMf~eR?;H8MIDBpa#SvQf=BRJ8 zBY77lZx{khK<^erkb4ngCfU4y~5fX?QaOc(%zgVMf1IywuyM@#3WbSv&3 zjMpWzWPJ@8cHXctX+Hnd}FF;6(b|3_FEwl;CA?33(|PN)m6K2V0p#ztP1(&_x^T+RZ8ZFwSPId2)jHqI%c z@Y8ngh1$361(1U19qJ_93EIvrAa|&TKSD<=tRTv-Y!2h+Bo+!OL6k&p+i=}-l{yR( zzuilzW+NJ#q$%Y%ITR=(WIdlHJ9N=mH^)nT^t>ZozkaDX*WO`7Ym8dR*{vXcX(@vbN6yujjma8Xo!{vh`(i6WrH^LtqyhB~sH0`cEuJM=hdcVn$a7ULk ztUZK}RmUDAG8j+$9})8|(mGU%eOo_pSr=bK_%=}Qpg*(ehA~B^@_hQNLAZXei&#ec zU~8li?wPHFJZ_xujB*|NXKlU&$k3PP)2I{k z6dwhZMqEFPd2qI=o)Oe6qt*7df0OtMWFNFpxzT>}kXr0G)&H=+pWr<^ccGa_LYDdp z{tC;A`ikSqyKLzV#V{EIY6jZRJ$XZgm9(K^*;opVK?QI1@dJqCy|%f&k#!9aJQ~o^ zlzK%IJURTdB{L|GdN!3TU;TA)GAMOK&=2?Rj0@=S7s}j&L5XB++4GL*fI75IgRt-r zv@ulbrD1aYmimASZ3|suQU{-M2p=mtM#3cY?PAe-9OU%PPvQBvso`gy7;6kQ{@>=y ziVJKNk~$N6ObeUHO{6+nEV(;tqVXeN+kpwlr44<^1?e#d5XJ>9bO1TtBX8}PN4*sW zWNNJ=_R{>4Hi|y(<)M*JA||3#sf6ocyhrF(SmM>wGm`EAGpT1jNg~*B9ksQG|F8ook6f|{j<;c$3BQ1@l5edXkKM;ts3_bbnueEhfvOzpr zbt-s@Ftc4~ENB#Frc%|0xseJ8ay4y;DjmLA{e>I{oE{?BIIL0<9=j-L|0)Y`6Fvzp za*8RfN7pP$oSZnz7*T!wnliNDpi062l8%m`ka2Ts4B3@g$wgTAMNzrXn6mz;gMxDT zrr4PBi><<-6Ga-u9@o)I&=*UiZTXh-eV;4f1(tt6|2==VD+h-mg`cIzoMtyzKCjvWHP#lNvFJb(AZt>aoesf`jKrDNOIrStyIHzLy>~d@U&{iKX8}DtVF@ zy!<^cI7aGQBz5eBqK)0lUZGUL611*Jy0`>C09{)j<2f(8iUa)%3f`EstQNKSs8ggb zVm&2DDc2<-8K>lqUZwoa&V(AT86rvtZ0(v@gJ-nZFOkKtUX~W32y3L0ZKpS(sNjDW zd*2-s9%!yIbyyR7VsNs07KixG={+89y+e5>M71o~`}=&)kyo>x;Y;7pZ#vgp1d;<0 z9J~5~?}3EsqIw^$i_5w{q-$Yp_vjVUt*mkk07Noe^eZsc0|oXp)+XztBw+gSeKAH9 zkqsEGN7`r!<{cuQ4`&!CL*}GKC1lWkh|#>jaS3@G8WoOdRq#YG1m+(|JVL=oIFCTU zQ~I(b!Gu!{q+k1p7G%!pKbXfC-mTlyiXi<6N(JLzqj>6qO2*R`=G6dn@`IL_N_2|} zd;49WI=&2abYE`i257Dz=tN7(`=!Hr@@0M7C&o0ki3{4Kn0DjNMcYS%SofVyt08uo z7fQXw)hSk=_A4$Vcl%=opmuTWYRSdD<;xTGI2xOwNU=ir_U!2kH zD*ldfrV*4C-9)4u4t*Q;4WBc2Vl$bL6yMY~pqsFJw`)z&Nz@W;V`~*(;~z^GP;yT`FF?8^>yU;;>zRKPQasC6Q^{MF38*>AEl!C{7(ArO%^^tUwoHO; zZqwuua=$WDbtCHnibFzaeclX>j0oU7+QV+qdlGI`Gx@@;X@D*vqh zx5ztf8g6GoEfO5DF-0%w}L$J zSnSRN*6EIAKXuY#<>1w_*orqfjClEwB-Z06$GOkiZkl0>Rb;fjYl#_9*ZfgQ2m&Sc z_OgbeuxwaDZW0oD9v)TL#mIc!|0ND zZqsey*Xpa%jc~5R)1X9UK*9Nm+PK1qblCo2jx}(mgorsS*c{98}Uvs=3v5u(bBOu@|E}Tvg8aiYkl%VLtl7a=M z^N~e98YT0N~khUgAoa=rfx-DM-Aj95sJuyB=nk)n=!i_vb3z4RCWV?4Dyp4({bt?Fe?IIY-b?sJk)Scx2xj3uJ!4~YEs;&6WQg1&TQ6Y`-i zO(!L!T(v_a(jO;EPZS^2Q`#eIxYcU0BgJ56DylAC88wSLRKLkjF%ojQ8OFyaVjX6f zn$l=Vb#nUQ)Sko80k=kxQgRDvBx5BvDZv#L{*BK>q%9I&ZAAv`CFU^0B;ONkWFm$x zlHPB*Sc$w{A?RH3ahOSob--wrr{5&IJPo{uU(wO-zvUlpi6QY2|K9i9uzZqB0{KbH zS}b#VQ6&oVV+Ll-Cpjp2wC@yD`Bax$#yPO{uB!bL6I-if z!f86&+hp!426RC#*e2g*j0RC7(9qGn*lw~RwAqdHJBJXHREEB>zUqE^pW!AMB+9FI zGZQ0Gl>}dn;(rSOfv-b`;biueB8D|x+k=B z40ZPUQF#PxJ{9dv)SWeFqJzabkk>Q=Ia&~Z(@L5`eEPMgu=tbf`t37yLyt6_N>8ae zK0)2|U8WAo_schzM#77=kn%I-h1IB%sisU`Ynvx4v2~~$(AiiOz9>XZ#(9NW!+w_F zF!ikextYnAqI6?Yzfa6+d>1;e>8!&Lx+mTvZJ=Qham7n@n~6O{6y@b(r=In5a>6*H z4Oh(25Pe5;@YXYo(l*tJYp`J`hA4P=Gy#M12r)q%gVUL|>!Vi=c8ia+2UPomOb#N| z+p&Tnrl<1ktHf!vhnYI=BY-^12J4wB)Zn5vEY8c#&T<~CseC-{tWUW833b;S})zQPY==T?3r$yP~-MG3NQUBIGD9(-G}~Y7C#;V!s_8m~`-x_$H!03+xk>@3%VU zq)Afw)fR*QfUa-F?1wA|f23QL!N-rqhYCG-G5d%HyvfVECs<;l1MH)pcL&p}m3!h7 ztazUi7;-KTn$ihzOjQyVKh>sXT*U0PC4`2%?B~4suEKF01Qp|%#k*W$FmF5TpwYqg zqqK1CJ!gBkdoii3sDQ!rW!_Wx)69+9i0}LDm5In#H4+r!mhV`#Tg41m32PtTcn~F_ zKBG9!6J-Pt2+Aky*;6ZA$v&_8DKVl`op_x847e#jNf#$r%#;=Jf#v`wsTG$GUOm?$ zw8)~PJBhhnzJ=m^DOP1P(jHsjr05+aum1{J;z(iy^43u_SNcT0mvg-ebuuq>!$4Rz`Vfmq5q^?_y#xEWf^~KGhew39k_q5onLybOkq?`e*aln+B2}b#@#Y+cj~W5weQTUX~lXeBS28iO3(i z8pTg$%2O%adRZkq&J~1*=rp5FN|V$6QQ*xF#A$W@39Ro)Dd1P}o2uX9a{%)Fx_0f= z<&*6n)-8T+Rumq6H}c;};@Iz#8r+nFRn>dU8q}vsh&s+S z!iI9NmOpe+LFA;3nLscxO>)^EkOz7%u{?P>WO|s`EMFw%FW=QKdeA`Fx1N_G6>qvl z&4eWR!z0UcQ6hX&#j)k$qvTKGC7PxEz$5?B{mB=IXM0z_&=2RAzh~A$D=roVTN&qw zdhqAX*RL>Z)T`C}Sj5%F7C#EMR6p`ef!X`^yWLC!c(LOY-a7|A2gr_4Wn@N}{OX7+ zCRHp5*`Dm}sgScX^`HG}%}pw-wfUyU`n7*`$IaEH4J#|)tL{scix(|iYm7WD`$<799LLA2xkPTqkyOsaLfSKk&HjTWQzW!cQQIVYCiw_D zqYrZCBAYO(%TRHvLb>cfUWp7%nLje^+Wk$BXX;T4*Lt3m4d}2~tA$A`n(G9#Rn7e8#+^Bs{{usk=FB z;;S}Oq?x>=sEz^fSmsYvYyC!(M zcz54yBQq3^(N0v7GG-yM@qIN>%`C81xU3{ojsWw|d>l^s3|>Rju7N*eL}fw6oMP?W z_X9$%Wt?Tm`}V<)XEr{B-LXUkZ7wzH`7%z9*>v8Ct$9Klkql&|kR%Du%41vix8948 zm)8c-kld_EfuFL_$CXM(Osqxw1h@t z{I-BE?`;=~&!eG)UcRTE+Dd&P0x$-Gj0Ph;KqkdPEYSryeP3Lg8YGfQ`q)gl$}nuen5oK?biXFa|4HUu+mT{nejehnO08r$q55nnPJj8jUQ zq$uxMFjf=l@(vP3Sm@Q4odVGV(-VoW>?x|gn8?LRc1$M1Yv_RAuWVP&uV7s23~+gk!Qb~_zfX8&54 z#s?GX;-uuP1^ROyLj=i0-MOt!j@c#<1 z`{e9PI76>dxSJZ|+~4rUTU9?+x~J$AaLRaW$z)k!c0BtrpYdoMp^7Hj?!-@Zz_D~F z8Gk?CSe$b^wtzyO#t7$4RcAV~(HG59>BNoLLnV{anxgWOo{gRvvzdrXkCW8t>)C5= z4c1AMrhaSpUHQ65&X(PBQ6jCbH`xvR7Oy@K&rImV=8~G4;`T=o;-}N&Ij2Q#8`-@& z6wxN4=_3C?&gm5Q;8w3C-I*Ne=f*J zxR}skB47rDo`1P)pAH22P0;KeIvU#-NQr;eIC5+qH^_zGk6*~580ZGP z0mg50LKviV(Y<*LHM0y!Jii=%Gkybqw4H*BB&C(|!y8@s1B6PG#4 z`;JxYsSdnD(!M&Y<)>3ebfSlH$`#jc(nG^bu$TaE~ z<0B&PL3MNv=G2!j6P>6mo?z5&ut$7VB~GbN%HeGOSzLwfrFO%!1~s>d#huUUSgMxZ z!I0WT#-xvpSDdu&+cnQ5dnfnMl_)9@wJGMn*fl;Y=giFA%2j>m(v)^Vbwd%Mm^}-_ zkLzK@f@iVU@WWFKEN<(53cZd&9wBl-KH_X#4olpb2O+G}+aC zV1c7Lgn)I{{3x_62au#*bMSqfy!pm+TiCW?QJWK6GZrS$ycO`K6DY)^Ld-&)qGV;o zLO0Q$kE_Efk8Evak}Z^P2ef|GJZl<0QD-2)Z~r}Pyd*Cc7(I!ubUIZeC0Z&ei)V!N zz>@puhgey#O11aVRR8Cq*tnE9SKN}xA@fNCHUl!yoOMwT3ta!rFDL0XVZ5}zP8EQ`I%cvB6W7$ z6G#UOv{@_qrOfli`?Q0wQ>}B%A%%or>obq^gY4hN2`AG2JijyFrlwimTsL16d?^Ru z?C{0!Cmuc?eKhLE=8|z!o})e-FXyo!t5LNpdEF+yAXkgS===Y4_#N7ObEbA!ny!N7 zei=}U;q&`yFA9dYA~7ep*aTIRbCRvD&pAB|jD9n&@la+CXnui`zCa3SUAOYYN?Y1OpthZGGBmf~}TMZj76xVdlRd0PU&ddu+7T7bLacu9R*Z9Q#UZ6v_I>agEQO8iv> z0ER&RssZ5SakSFbHPyEz(a|?Fw&0@LYiOb(G1lXvQf8I}N?P&j8ySl@!Sv;wq!e_W zOm*4xsCc-MIC-?;iuD;BwXGNojLmHIVKyZ2T6``tet7Xc*)4%1yQ8_4Iou2qM{_d^ z8+J!7syh~Tc>5L&pdz^=u{GtQdM7DEVryw>W@>Cp!o?W~E)u3^z%C~s^iP5C9v797t*sS10N~)@z~}&Gw1gP~Kx}Mm03Z{9iHQMD!C>>j z!dBan!NP_duJ6te<9C0tS=cb%*~ADhwFel#1ArKTfPX3a*VY2YmKG$pinVnt?QFTI z?Cgy7*x>~g`apdHJqA5y12zT_NMDZu9z!4lR1e6^s;h0F$EpwgmpZHeF!OKv-~(`l zV7MRPEp{20rJkLxK8%Y>SVn?G*vQhx_8(gtkgzcVS*QU2JpKQcRq)vS&t8BB^q+3v zgwwD~TIv}ad=SvK)#qjcg1`(w2m_E=0R&LP=zt)0AdnMqj}jhyI4eI)AI|pw z!ulVS|G{brQ-DtiZbb`I3rhzJUMnjzV_j`qcsTx{?~du8G@O9j2>pj|{@dQtwvv?m z-~DB7emkLW>DUDBJhS0p1N^maa3hiYmtOxpLH}MX;R`Pp zmBZ~)2yfZg!sojAzZPSrf3L;=%4+KWDXHPB{oN#nPwCq%p%!4jO)($@$P5C3S?;on z3J9cvlfkp_f2H8&{^xbT5vFf|1SEkV-7ZJ}c#*I$GlQ8)3`qWg1G9jjAdOn>p;mfzi@Wn%dcS||xC@QxS+f`ZxLSEj!cL!eOL zJsg|>1i!rfjSdI}{Xqw2VPm;34+3Oj`w!)JLZBcZ@DDl=E9f2_2*||32Dzsf%nBEH zAIAm(-IoW3GPB)tBoG1yvVi~Kg|gm1Hx{_s`#1;?uH+ss6wCyMzd`$(Um#4((0lfQ zfGkY+aX>ID{Pgbe!f}v4g2xK_lb0EIyS>Zb^a7#q*?A8KVuG^#=|3jcKXriNd+q#P z9+(yUN8G@y5b&S8kU!@ED>Ku5|AASVS?~D;?gJK3*KWml81ZeZ5dH0|;Sa`oqr_Y)K+e+AmISW!_A`a3g@GjrJTSMPB}4^C)HqoL*}xDc2!x-BUxfi_%=YdA1izrby@5nYDJU(3^nU<;Cs~pJ literal 0 HcmV?d00001 From 056774d3e8a1b9ef27c7a3b81677d41ad85daaf0 Mon Sep 17 00:00:00 2001 From: Melisa Bok Date: Wed, 5 Apr 2017 21:21:22 -0400 Subject: [PATCH 016/245] Fix/font height calculation (#156) * Fix font height calculation, use capHeight when the font height is too large Fix tests Add test with large height calculation * remove print --- .../tabula/ObjectExtractorStreamEngine.java | 11 ++ .../tabula/TestSpreadsheetExtractor.java | 19 ++++ .../java/technology/tabula/TestWriters.java | 2 + ...Bids_for_Transport_Sector__August_2016.pdf | Bin 0 -> 121559 bytes ...Bids_for_Transport_Sector__August_2016.csv | 96 ++++++++++++++++++ .../csv/argentina_diputados_voting_record.csv | 31 ++++++ .../argentina_diputados_voting_record.json | 2 +- 7 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/technology/tabula/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.pdf create mode 100644 src/test/resources/technology/tabula/csv/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.csv create mode 100644 src/test/resources/technology/tabula/csv/argentina_diputados_voting_record.csv diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index f64a7dd7..4796d46d 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -22,6 +22,7 @@ import org.apache.pdfbox.pdmodel.font.PDCIDFont; import org.apache.pdfbox.pdmodel.font.PDCIDFontType2; import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDFontDescriptor; import org.apache.pdfbox.pdmodel.font.PDSimpleFont; import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont; import org.apache.pdfbox.pdmodel.font.PDType0Font; @@ -356,6 +357,16 @@ private TextPosition getTextPosition(Matrix textRenderingMatrix, PDFont font, in } // 1/2 the bbox is used as the height todo: why? float glyphHeight = bbox.getHeight() / 2; + + PDFontDescriptor fontDescriptor = font.getFontDescriptor(); + if (fontDescriptor != null) + { + float capHeight = fontDescriptor.getCapHeight(); + if (capHeight != 0 && capHeight < glyphHeight) + { + glyphHeight = capHeight; + } + } // transformPoint from glyph space -> text space float height; diff --git a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java index 786cb1ab..ecc4087f 100644 --- a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java +++ b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java @@ -512,5 +512,24 @@ public void testExtractColumnsCorrectly3() throws IOException { assertEquals("REGIONAL PULMONARY & SLEEP\rMEDICINE", table.getRows().get(8).get(1).getText()); } + + @Test + public void testSpreadsheetExtractionIssue656() throws IOException { + Page page = UtilsForTesting + .getAreaFromFirstPage( + "src/test/resources/technology/tabula/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.pdf", + 56.925f,24.255f,549.945f,786.555f); + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.csv"); + + SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); + List tables = (List
) sea.extract(page); + assertEquals(1, tables.size()); + Table table = tables.get(0); + + StringBuilder sb = new StringBuilder(); + (new CSVWriter()).write(sb, table); + String result = sb.toString(); + assertEquals(expectedCsv, result); + } } diff --git a/src/test/java/technology/tabula/TestWriters.java b/src/test/java/technology/tabula/TestWriters.java index 8d50065b..63b3dcce 100644 --- a/src/test/java/technology/tabula/TestWriters.java +++ b/src/test/java/technology/tabula/TestWriters.java @@ -36,12 +36,14 @@ private List
getTables() throws IOException { @Test public void testCSVWriter() throws IOException { + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/argentina_diputados_voting_record.csv"); Table table = this.getTable(); StringBuilder sb = new StringBuilder(); (new CSVWriter()).write(sb, table); String s = sb.toString(); String[] lines = s.split("\\r?\\n"); assertEquals(lines[0], EXPECTED_CSV_WRITER_OUTPUT); + assertEquals(expectedCsv, s); } // TODO Add assertions diff --git a/src/test/resources/technology/tabula/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.pdf b/src/test/resources/technology/tabula/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.pdf new file mode 100644 index 0000000000000000000000000000000000000000..64cf98bda2ba67c3ba50dc04dbfb68d4652244d4 GIT binary patch literal 121559 zcma&MV}K^xk}h1fjqb8-+qP}nwyiGPwr$(4F5C9)ea@MgGxyuy%zb~nnQP_Z6A@2F zMl51EArWeN8fIAHz5SU5SSSV-JUTpE0}EI#E?Oyb8)JP3a}Q%9JbGFwJbDItW@dI; zSv&?dT46kPc6wF@S{XcMTBX09{CP$zhNp?gOvi%9z{04_!vkwmWA7K(}O zzvd7!HncS|meY5zcKkD=pskg&wT&Yl6Rn(sv5~oyL zKv0;0iHV(^jZv6IkY41^A1fl;OOLF ztZxkqWwvc#V1%HjXQ1~5L4*P153;X<*XMvCM#l|kZ_HoG5~oHQrU!~t*@ve>5%vPU zcNCx|jVFLnSb!=v zFA59w2kw8(_%Glco%9`?+#HNeV4>(>p@@lvWkq12{zDkBP%I4pC569(7mtDdA5v#$ z{!buSnQ0aOpuqOu_NJ$&XQHQfXQF4U_uE7t!H5rl9}F#*3>sJzJg%W4OT0b)u{Q|_ zEM%*LwO8rp0gX55K|UeL!)MeiBr^W=HCZVzCh6k!M+p)J1_uWRmR~w22L=YB6bSk{j26r;h&HHA#}k%?X7H0|4ZK){!P0DZEc*4ZJZo685#fT zj>q_qj(Cj!&@Vj3zijPKTEbb@!+x3{Zm>0+R48y`mZ+s zLg88DS0>Wa;O~6N|6aA+zLz7jTD1lQ#=?Bn@Vvfx4Lk%z($OZy0$p z*hI4q|BkFPFjw$m=b4^97lvLp%2&fMds(8&`(~c({3bqH;cd4#+pu3dT3fo|%1DZ} z=HLNK+^HE{F=(c^btG3}!KrN7m&Et|#gV~9J)tUH@3EHSY71Vm;V=hfYwW^-70{L| zqv4`K#hbjeP2gE!iw#MsT1R?zI$zM#9Fbr<$3M6Jq^7f#%aq^NWr84 zP1P1WvO}HRh{a~&HHTnyTcvv(i*>2KD&wN23I9OA^j^G<;&r@P&ZTz&DpMq~hWWiI zEm^v$l@mi+-*buQr-|-(hs6?$EO?-~w<3F8i0VQ z62T9%#L?sRGb2G8B`KNXLSqMf_}+TLl+LNF1#-WFJMzIzcfJ^@h`~xE6fo0R)DJPz zA}ySJDXbrm+=~on}LX!c;K)C=w>CjJS#HvjxO2wxbN-m&^eRcb!0$S7*pMH8+VE$0Ty^~| zeAzd_6NK>=i%{2r@OpXS8#vm0g08Eh8rf%{+;uTiVX~CHjSd@eFH`7kx=>=^EolCT z<#&{q$t7y=^Uh*@yT)NETD_k0$-BA&1`X$F^Uiyf1O5PkCL1x+U^Y)L-z$G*XR9**&;s;xP>Dr^UPYFnh{r*Mz{Jqkt=ix|K!AD#R8=)vy z0SH;qQ{cpP!1)<*4@iJ$ZU?5(;hs^PZ+6GP*gBZQ;%7nil(Z5WMnyJl39dq;2kl}#=D<-m{HV**3m;KqK4dF;X6@P6*Ji7S1-2DXA zuth)V0mT5|UU$s<8zN`?iz5I3DePY_b0&JGf9ENsM1I=>I)vcs4=7yCOTZ1iOff`- zq(%j}4HfBiPI^H!bHg}6xYy^V<2fa6fH$kyBRuAcTe60)c%;P_m!XvAFXQRDJ6zq5#rQ*#H0Q&iP`3WXMB>y`G8gYAnSC$ zL}wWj>!iTeU}e$+$^y^=FHjpXj9Tuqr3(v9%GH__kd*xFOo!~poAIWr(MtO)ii!8A z_L58c99#}55L7jV5W^q9K#bqQ$4IC-EDS8-^nYGQO{HqL>~QnRCNxFFk}t|zxJ6`Q zq5VR=pzO)$&7tHD9IuI~mjezsUHHFZ$nPEJtrMKnJt=2o(d% zAZFiyLf2Us8CooS>7+`ujw+`JL=FGtP1Gm8;ZNjtup5(9^3+6(&hJyp`cnkshx+gu ztrbEw8%Ka3=yF=CGjWDEcwG2qmE&MpQJxS4STWM){kY!L1q3%ix1AnIW~dOcu4XUZWQ5gVKJ001N&W=6?sy|LoBH z%K#V|=>8ix3DUBEzzMnjMCA!!J1Ee%Qc#A3663zXXK6Jp{S6|?1c2V=|dLOg0_xGvI8gb|F2&^3$(Bl_70c$XlD8Xz3MoVZZaqp{Z`UFu{ zu8l>=ME4D-*pk`0vDCBe7UW$OydisiMdjKkaO7pn*Y*?C77X?7OGm%dc?|1S*voNr zb%0=~8|^BAGcAGju!e^~J?^Z`Ln?v z0&OwGq5-X`=!~L`*VJ_6a=t3s6*-(jV7d&csdi9D$n8St8Lu@b#sSud{kBuI|(L#5E)8M$W)*X^RS zQA=2FY)e~9B_>%~EkT0=JMXTeyC~xSe zQy*<25(oTg%ki`V;A6^9Tmgw$NoQ;Y$HAy6dVnOr8^U+{XQxeCs6j(DPb!7lGb43u zTbqIf5w;Q?k=ggF*{c;0jfUfXyP+6RAVsS#Pb~S|O@)mOlu}#m61<-HYen{Il5vwZ zMUm|L+_RJ2(5n|yK+Fy5n#~4rDQ)!7#L03VOA7&*&)QS0M%mMl2SR8>-slmxN3P#LaCNqh**Li@B}6`o=^v3C5a zOi+v*yU^mmqN=57Ez^Z_yMr5JX_1EYuCy?GIXnOhEV`mdPgHcr=`>9&N?^U>(n2i; zJc9hW<-}w!#Z^o-Fel9T{#L0lF2f|3mgLcxr@yeONfT2i-+|ct#%rvaQvXbHwnD`T zXO3mRy4VVu4KIR@>2uwz@1kP${p{AA#`@g@Ziy zs-@TF&51+XfaJqi@WQu*uknlSZ;n}C zYAbrPmB)}$%}uH5K7Dv3ni02SDh=IIXua$WJkmLEzZ<{-dL|$CthfO1yi5IYK*-{k zJB2dfKJ4w6=Oo7-GM%dmwG)3JTCp)TIlTUMOaey`4x8}@`NHG;(*8~hhz{GHG^^vI zJJ*eZ_Zm3 z#X!=`g;6c4F+huX#JEC>obTMmwqF^m!;#Q+*ylwo>Vpy3R0dC%?Qe-sr*%E7NK>Yvje@OL@Q3?2BDOM=?zUqbrC` z$6=X!^BATha1VqsF>x;cY>K$GkVj!LVx@EpsvSQ<^T$sTM9mcDhgA!v7vI~h#{?#9 zFOf2IKRtS+dPt=3M=yq|8EdHv(@C8boOQ&&ZlXXqaU{P+o|y)GYoCr!D_PB*z{0<){Y!&<8ma)IMAKi=hsmg5F^3RYw8 z(=7WSp_-?i^UPutBqo9urNTd%W3ttq%<>m1xe<5Mk(n0CulGIj%39iJNV?gVeb3e_*c z;whbLH(W&w^=h^TiQ13D55ZU@T?b9wSm%|@1k$avr+|NiXL8BF#|aCBaJsK@iVVHT zWrv|WPa!W^djrrObKaPX>Bb%*P{&(hOoeG$!flu>n>=_hwVZXc$Bn2{5pzZT)?9dI z0LH&w-J)_pzKU*raQTH!>=L|vW~n--(wI3w-Ah3ZE{u6W3*QBNZoH43 zP$v1SD>ECdml~1#Ce7;~Qv=M-*i*(B6UrhC1@qtC(MMj$OFR%7VQS#hw*}zVj6UKL z`q4(%$M3EBf@s;-^(Q4_N7R7to_!1@keTU<8 zMi)O-!R`hB_=IdLn?Zj^0)IuC{#O#9r(8L(nfeG>C4L%1@5!(WV(V|K) z=>XjXB{z{79x{-P@AR$f6szyrPfLUj2wuTaB=D6-;mtX`zd2{fl^h^aZU#_M#S6QHF5q7IIJaAyWiq}e39dSb$(Oy+QQQW;BU|bU`5?6 z(z2F&j1S;OH}Wt)ng8?@SO><#%Hh$)Sga7^5{tWPK6D#g&o_Rf_dF7e-`y-~x_N&y z7C=sWQ1l@5RTAtH6LMgm@NFKN$eJpOE{&P;+&3#>r?nljL-Sh!0Dx7NhTU{8SPCxJ ztsMa`v5x37>oi-n3q4(tK(=zfo~z?vt*LXM1AU~2HV51mC?A`2T(q8OH$|TSR<8og z4~?Yu-F=*(FpQzr4*6FMQo!@7$lOrhzEq@C3dO|2NsBwhu(pTYI%r1y&)7b38CV$y zzyU7zEGI(rUYWxcZ0!S#Rr=Th({%?|_`czBxooAEa3=LRq4NZDJK~MtrAPv| z(V+8=-Loj?W)eH3xaJVxCND(_GM2F0Q>Zo5i?u`H8zXh2MR&y~mek4fp5+73XnACE z&&hY_ZtBXyHpqBsU1c1gk{rqdkri!jCUZSHxh+{y>(!>^7L(a)oZC zSpFHL^>T`F+orZ|xJVMvGv?XC-DhiPX7(HD=-~7P9a(D6N(max2PHgawc*C)MJrHE&y%4~&txD{n|*XXdQXYX- zUUI2pi4^aP)Vrt4Qv*cZ-r5_U-)`s9RpPwU8c*-Lt(WE~iLIHYT9Vg*f?RxN1vqBl zz2}($En%^Y=Wc-E?6bNE@*4Q(@>9pM;@|@~#+72dK;+1ugqg$y3a}fc{Nu}=fuUft=<$~Snl9FUDwTA@}zNo>i{^_ z)2~o`nu1Vm7jEHNZ%(j6#O(Zuvuy3J4*ngb{9A_TZ$icYnKWVkw?NBZjsG-ZX&F<%Apu8b3E7*q@UGlPsXAt~F>*)tvebA_0?TEc0!1ab>?Jk$s z?R2y2?_Ul;-wP3AlxV&>FFlOe3479`&1sL;ZyX(R5soxeDRKg}_QPGE#~Op+nH7*b z!ak~AD;=HK)#hnvXPx6R-BmdyX2^VW=$j7CW0gI4A&+rwPa5Zn9gl&*%AY#r@X}OjfbtpC9N6g!%JNsk4Q3K_p8$d4{r1xzpCKpKQqEwr zJyI-9Q4)RhP!viAwlZB~>~3n%$1)=yP>**p>Sw_xQKe0607iw2geML2G~A@&@z3#rF`w}+nHdk1WOON1$bO`W@*uybdUxXJFlN$m3@(aJO8U)X1hQ_2~}Ph z|Hd7;LwnTuh!@>K+l}UcDbHjGL0@dx=H%3A5{Z~ z;$HsxRL)8pDB+3q5UdMYO@c`9N3?a+T+EdW=E${Oimud8sKTu;O z=M!kLl~9jvBqi`$%xF^v>?00@mC5YKkM2jwwCgGN9;3&1N$TU3P_NEQXYJqT6RS%c zRi>vX`LS=p*6pn7=8dzqMDS#Lxe6`a#E(!FMlxj|63xVw@ z?KDjog$ZIQ{m9z+>xq^S(L(YM6w7DG!nbAeiwgeGC0rS?9W=+fv_W2k>DHIL8{~YFW074 zI(09O2j6`!D%5xw_0}dnKdDTRCO;Uw*!js|0s5IjkOHDfkpLURVu4E`R|tA2s~<@y zPaCBoJgV#CYwk<%*AHgj!rD~DOuqQ8dMh|90kgZyjpw<}Jy0#HOGAlp+;B-Ji82qW z-T+3 zjg|%tO|S|(QD?^s3K*S#vWizR)oQ`UmH`4$R>|z`7{oz)k{YCE0K&R`oCj>K@{scH zP~}e9Xboc829u%`bjEg7v295Q_pT%*obJ-YYIP-my*e;7$qo0Yl1;$av9a$y!~E78 zjQ7=B3>-e{a6s{)A?}}HYHk;Dm0ZoEt^$vrYNcGu!Po={ZFj46T5cC~42N~mTvy1* zIGo9hu|L~Y|6Ef7Z?4^`^!6pU?^Ye21=(r2(5g7A^bSsMrEiAJmhr#QLaqDovL=;ix^5Ap<%nd8p>~da`ruEE48K}V2YZSV zRhZ$PqeM9Toz7B4aBKr&Q5YRzeo1}r0b+h|-OOzAWR@?aDv8TbSq*mzEm_gAZ^&dV zDgj!uMz^h)O)%NY?KfdPbIr!rBlU_{6Z=i>LIJuRmi6!f#OLq|0|1t2PWRm57m)hq z04UwQ2$Hml44j?_iVTV3GEn$@;1~4&xj8EN6S_$Dnj85$>;JbD`v2r&u>3dkUsUOc zIcNFH{L6vE(snca@(9Gzod6d>$*pudAnJwhzJ-s3xxK2oAmd2X%!Dn)rqj{}*uCHY zGX~hebhBm%RaDPT49u%ye7QqRTSPxXx>!jzFqMbH<6xpE^$B)DJNaMCwl)clQX|0xffbf3Po}6RR!->}r?W3$h^+d1nDjFp9WbZdO+hA;q?-3&Il5C4vIxAoDzI z*z${)ENlAZ4du@1kn`1e)$NNM($+CpHF-G|DOr1O zR@GSdsHnbTKr;qfI9;%MjUH@jbd-MPRbfqu4OMgGr{?lf{lhpm58{9Ql;h#&XKZoPzw@HmSy46@EO_ zhZ|**);4p*fV%YlT%R;rJ*}uAas73onA)-?#Fx}%Rhf^|Qz;>*>?hH_TW!pZaQFV> zwsI=EZX4<>IO0_X;AL(MR#N4V7bggC>U3{fp^W7|Qr=hy<7#tlTWNF*Z*4BwS#@He zBpHRrrQk%@g{hW!f`^+d%=b29&zDnd_mdB%v#Tty_ZSMGCZy6k)qt#D3y& zEx)DjPt$Q0*0r0Tl7-Ke_Y1a!@-v~P_%iQ{U*;aZveru&n`THYcAhkFc{Qo6pPqb} z#WS|rzw(Y^eWB?9wm1)M{*G+^=c6zG`8~tN`0u{PpFpYY0UONKC#4px9{-|dFW=B! zwYaNahhF5EQL&m;M8~%-mG1oN7@Mo-63NXAzx>BbJV6_ev~P7HZJ!aVCmqcc35umY zSjvt0*D=RdagS*#_18cpCB8}GfS3FJjBR3;B=g)9FUkBGk7nmiaZfuW`rWXIP~=t! z?VJ+?e%jevel*kJOd*H`<@WgEm0+5yG37+l)gT}bdO^!6hLVt6EpljYQU(mcR1dB7Wr<0I*!>sd5YF{KU*CFRf=T5IvnYNK`Fn$e72=DI`M^92+s zkemB}AXMz*$5?ZEBBk8r?l2Gj4%F~US|E;eDTVda>c!bp0lwK%d!XgK`WaJ@Xtu7f zS4i&w$~U2$%&yG*zB=C7%f~dqKgMioX9C%f_5Mk%`!S_YNEJ1g@GQDa3LLvD61RJhx zxDIfe1ANjXZ#ED%{RHygr}8tbXcyNpEhHqdMW!jbF@NmTxcLnIQm(+y-6PakvU5-WYYCe3~& zJsVjHlE=|k{t1*`P8L17SUmneB(Z~g4HyfWS~aH4=U+CHE)jL@)5M+oRpO4A*>zz?79k?lC}L66QP5~YnFUm*qm#TBK!bHCrbFIGAxi{8lpb(Zr271ZJ9~a(_s!p1jaS-B zt=VPs$Of9f>}H{GGJgAFH98&Ez-yGdahc5pII)?9KbXxTo$m8X8pVQBH@P#Jg}>O% zD%{TH67LQ0OLB8yH7a@0{b}`AB`u5wXoD56+0s@a>Tn^kApo;>bxYTRiPeSSE6n@1KZDN6l)~-!RZW&ieiDA3Lo7jes)$5YQ$a%=RZG7kVw;nJ^>- z7s};)Rj;*hsFnjO%GB)FcOH?j`rVK#ACyoXb;Q9)D9`rk28iAd6V^a~s{yY!224wR zo-Qfg>=V$+rf`+Q!xdspr$%eWPi?cVc@Lc~^2W5TCgRz>`)(YHW*<|fw2B$8V$;fZ zs}(Rl3F>PfdLtx_vMB} zgf+f9ly2TB#ZZ6pmHm^M(DcwLxtb_`_2eX~ccHY?771*HTLhRAh#XJhoqo_6f@GcaUq9j*G^+HR4B%raq^iUsoZydcP z{G%E@FdV?Ab4|cb9R6t7pfv)}=B@!ro#?&V9!Y7P(%!Dq99<8@fd$6lodeAD*S8+$ z(2GnCo1qV3bpy`K@zPjVLB^C3_7LJe(uMu%=8ZOsmsOiQSG-~v(rbUynihSA!&$%! zVSS!tmxB7?d65H|JCRv%X8i5)^OKk<}rBzW}EcJEN%H(Ef&t>~xF~h&6 z^W`#S%AW-zB2_{s)JKwZ0$f1tGU=5v)7v=r$FIW%FTr%Xg>qcVHlWt)5=8qRF}*5h?y6&%@N6Gi=)E&H2S9yYH1_ixmrGJ@)^GU~sL*p@{}nyz%7 zT;5*TJ}Fek-1NRkdjZ-9(zpMP68@hKIoK3fDP)$ZxqLR5t_u`&wQw+PNp;g!UoyE97 zlpcUrL`_9T+xBIPyM*v*Ngv;AaXX(dv?SWFyyuRUa4nIZoxdp#HiV%(>^$m>KCvV- zOY+M=%-XoLyxg+rqH zIuzm9CgLMe_}&cjtR{hF&ZRv=rx3m@Zh1ge*z;8WjT!Wm*duGZ;CnA;)}kPDud!r| z-#Tp4@hEM!AQz6^I%zXn4tr~hjDCNrroc!y^onI)&^cxqg>u_EuN(OESt8I~=4YS2 zBSPrX#;z^#_RI3C+)4QCS1HG6u~)hbqZ!F-8NeZJF++M}dYUYBX(n34tN>R=;I|}V zdbFBw*wELoTBI4hn#6=TXw~4(&<$-OzE87Ikm@YOM^)}pW61Knv{S=}@2|McAW}=A zR-jFRmV9HI0_T3yj$|Wl>)dFwrVVpO>ozMh$yM~+sz%sLFYwR1gs)3!0oT22?MC2F zebUQ(&l8@9Nbr+BvePaBA6{-D&so!#H5#!e2wYz87@eY>`TYlwpJ>kNK^hGfgViYt z@}ZIP;H-H;=Y$ScOFQLu)>{Gfj%z^mg{W~gk#2@Xm7+0iIP_IYl`g-PY+}m8Ipx77 zcGL(c8zqx^;MAu5NzwJI(=F?=RkL|+IG;e+?D zPvUhNRuZ_NzI{Ak4Br7hLo9Au=5S9NHb+i#&D!vm=J7oevIQh@ic895 zMroff4DLvaKIGKyV7MiF1mWHNWAuvMF@3Ga?&G@1ibR7ap?aixL{kmb^HfinC*^Es z?I+)D7bqdRh`)G4W+6R7zl5&Iseiu{dWU~wp9I~qHxGGQC?eMHTUBzcEPAxp9!$GPJwOGt?HLFK0=<8Lhl)AQ)4qU^Lya#&Jn_jG1 zvR{z<<>CqahHu9oH^U-5d5Sc1!|5jSLJHNBO$9`aASN}4ef0omY<`uy=UM{JsFDmi|7k8()9ij>Hgl4& zYU!zHZRO~eF@S!ttFBe?fKd$*yH4mWM$M!Q{beO5DM3pHXJYKRu%Hzl&VyetM^Ke( z=rl_{?=W-7wV>i^eNE_Z?R=|rA{$Qmgn~YK1J(r8i84D6?7tDHS_ITF#^P?`OacZCR*HhxnxsNOXt8%;Um!|qM zzMA?;cQdPn?uTSQFPAHLlaa5!JZ1+dF`%qQy0WceXWt@|n*y|v`hw;Aqwoh1FBE-B z1^x#1#ku+qshg;J0>0lzEU6jis5PT20gwfObkPTzech+#nY6ARy*VbvaSL}wo;i8v zld+cIt=h6WqQIjguMo}H(IVn9@NSWkfh#ZCLnk>!HZ_#=sb_+ZuUy+mxGf2!JgfJH zUNrJv@}0r;!b8o3j$>Kk^fonT^In@82(64aIi`zrTw$V);dm`4rTR8Cdjy&PmV<5+?aDnV{sqeHIEmy8)=4D?!Bs7M> zu!t|lVJ4MnbLCL11b@(NhwUEyu;iUjpmV@ijE_RFr*yFcC!e@{Omg$WdB|I&qD_fD z*J!jgsU~IQ+@aLad`cjf7FfRTQy~)zce4UtoI44`B&X?67j}z+2n{qWz=>_Z^<>la z=d-6a7vKD)-4t{8(o*~e>$Bg|J#0~gAoYS z*~C~smxYT>3n*)!~HlZWOPS%d)n-)#Q;skbMlmrEHr7F?2Ozn(v ztLdp{9%Ohyw|kUpd}VpjchOgij@`6pOx8+Qd}Z}<0k~H7Uh+dc1j4^UKJ>#Gp9s#9o?aPT`Le!_1Nq?2 z;4H#>RrB=>a_ve%Qlm{_=uJaGPw!Qd|pS&yc4gA=7@;JsvzZ;=`sQ_P~Hj zbDUt=SX_ec_G#jBRx zA?b(wuRG91IGpJH&fhziqZFdv;fZ6_1wUj#i)E%8#m2%%`q0Gpp>nq>pECsaFs*ui z3?%9~rVYzWo*g8N0Rkvj(o;y&FJMO&>~Pn$jG)eyGk`S1|xt2 z(NoiW1t{y%Q}{iK2BG3|U^}oe2LtqZ~&nwV>A!?8G z{sFB%jpVpSOh}FxuO=Ni2z)De8Al+fVh9%Cm<~44-vP7ugDYrIZ$qgxwKY$BZy=lgM@vs(O74J7B$WZGPpAk_`ls;?B&kxPaJ#sRA;Kj?xn-A5e{8Pu3TN z-413Glk+!y>TwJoBkzH>c>0a1+`cok z(Ni0QG?h=7cftsIgjK1~b*RNp9-;@`CsNBrzMDRwIaiSF1GFh(@I(T<8ikurJ4^dy z*zDnI5#HRn%@5tYv@p@`Tl`ivf_~s5Y0kNPIY#kyXjZZmYjQzV-dChTXj9@~$YCpC zJC_uL_;5)BZCg_mnkE)IuNtv=lnszhBZY1Ce5B|W9I8GOo%`(6Nw+3AHzN`7qt z@tAjV@*^VR(;okCz*Ahbp#!qQ%{qn%YI!mD#Fwd?=s8658e6a8oI1L7xr7FAVslY* zJ*NChbcG^#I{34KshlKN^MbqTHUt~W*4JLxWFXp9;8*2b2~Gj*N18_U*Ksa#@_8J8 zt$uqx+NK6O#$We~>ejgwqV&EMkcmO>wQZWMfpa+0Xn@g z9deR|R?rU{LJfUz*s+>;RTPJsgT9$aO9g&g$7Jf?0Z5Ois$gdvb7|pUpMAgly{!@M;CRI;PQqA5!|2#PKMAc_+GVg=h5W*_%nWW<#e+kJydN z1%rcphxB`;9lr|~ZvwzE$cwgB_&nx@jgB^RcuM0(e^sxtfC{ir)pqdnHLz#!h2%{c z6tKSI5yG;lH{46`9oj{lYo8_>*@O_7@dkivv`2-VD#dp`>=~_<=g?+9 zOIR}WXS;uh8jH{g^Rjtz7lKEabAvH$Q0*71W6;mq$o9229Oq2SQ@e&NH*gQlcUUWA zNq9ls5VZPpvp`#c9FDLnrh2pFc+|JCyCp!7X@vl zDQ~;sFL?#e#nQ7yT_tS5E~EI9Oks++k~*4hE!WL2at%bb2-X?U9tW+t#h6dF>9%IC zr8P#wo-)P2g*|DKD}}I~NvZo?sO*w0$;1U6ewCY z?my&Ix|nb-HFwF$L~=|*b5=F8a1c(z>ycBtdWABz_kP1$9G(EMqN2=8b@@SM(cjSe zdz!Ksy8XLGme$*o+1 zSyw^)ED~5J>H)hq($(*nXeM+in7Im>+Co1JYkG_H0pCuGbUQBH-1YBDjJdJ0u&oTe zKzYeLvNYB2c?jJJ^2w22IS~dRMBvaubU5+#W;zRgUlyM{7bPZD2T#*kb-z@X6*{vk z&aPx(I9aszhH+AdqoDc;^nmncs*y2~pQ z_^5SHx;$le4Yw|kBpuNGMk(UW7p{z(i;j8O(ug>T^nvQVA#2K4r6OgS3vE(>`@F{k z>ofAXu`2Y;*BpJ=9Lcf{qhO^vuCO@J_~S>Nb{C;lcMJyn{L*@2z7I&&O%T%T*{=~q zo0yxXGlmm{+@*nRkm=ntXO}$bd~|!??BVw= z{j-wA_6@2BwB%!7KN%lxD^4uDNvBj|4Rv^=gYmFG3o4#)Hu;?*T_9LC@Fu|nXInJq z)o$3-ppF1o$pG*95l0cDM7FF-V%Duw!Bg~kD)Wr0U|!v@oatiT@@nsk{MZR*JZF8Ma(f7-L0`}9hhEQJ>pt|oqLjbDS%l&kmI9d+KI0M=Mdw6$@=s?c zK9^+iz9C%3Rg+*@HM#j0l8#5=JHN*|&TOzMKlpm&9L-WW;65F=h)XfuNHgBb0?R5m zV9lk4)>W};mM0h2<gcc>@?iSQ~TC04uifV(Ti{Zsq#N@Xl#9di#5TJ?U}} z)pqr{0GvySLLTjrGilq3?$aM#fj|4LfKs1Ano1gnT@K6SzyA!ZbD=E4kpOt={YLh9 z<`rT`Y!Y2SYy?%EusenbqUzjnfU+D?JR-j-a+0ls;b@{>^<3kQ%}VLr&TxC&V_J)Z zsG*(O@z;YWbz z3>KPY?x$Xo)dgxJ)oX-x>~T`9wOoroYPryn@9_+mh_>hT zVF9nvBwRU&KewqQWLd!h$e`q_)*t&w}J)0fJ zl=zxCX2;A7F2n;XuEB^d#NfY-`KjJPls4O56Nw+$lZzPxQC5pOo|u z^Fbqedv382FUpgKCbA~XYx>O5chaM9#$W{nWLwSoK@D`}%vw#)N6dULiQ%)u2Y1Aq zPIa2Y1@}#kfM5=j8XUMN+YEXs7;mZgGEbp*D4*gFgm>gZhB5%BpP2{%(}->74886H zf^vyu)KUz|>Bn2v3Y@kO0d&ddnW*ez_e>U$?>LZCcO{PK2sKE+oa7C$3N}$=9(qWd zs@7SokXB!+2IrI^L34;kfEWDs7=jqiqMmK~5IOA-mcx9ur&3DZUqE@`Z4kJYz{ZXcN2^ENR}tIWL^foKO7kP znG+VZaIQ8bsupe&7;@1;PtrOc=!Yt2y9UyKvdHz{dFB^^GcQ5+kh7osGEARU6C^1Q z(2hOQzZVblt>@%yREKxlkxLi$2GoncS!7734r}Fcd$Q`uq1oZjKzTX@7~)|PPX5|^ z4)EF_Jnp3(W%)*3JB8At?UqIVkY%l2_b|N*uPa<{4yB&CY4#DC~ zz&nBwv%xz=t@>X-G*jr(k##fob}qx3RQ)f#!<$3{q`AI%95u&I~%sqkvJ`7_2DvtpH^<~0qiU0=!+w~_?9JTYfXl{8d05Xv5YucyP|uX zPyD|k*58YPbAi_Q{1!b2qB%?OKZnOc-w)vqiuI@Ne`4#Ox)rR$T8MXxF0Diew;e?F09)Sh;ph05oaM_ckxuO1ooEH- z1ixPV*}t;uxF+>giNmw~hkNEyiKh0QQU{l$6wBvesFxzZ>7Mc|v{1jYK5_T=rh(TI z;C8t4$UxO5ywQ1gLUUrGFO zEbHk4H+Y4QC^{WIr&`;!$5hS-=SF*0Tlm8JdjUeR$f(y_69`{(VVVCBGGV`haLt>Q z&$nK<8Dvs37KzvJ!{E0_*8N^MPsjbYTaa|6QMO*DX=d*l-0OpNTJ<{6ZL+z9lMH#6 zKD(?oxYVvgYGINw61W`kG>NHqYgOz)%l;b1o=`tE8e5FJ>O8>qSNcofH@fX;v)Z+X zPcpY?WB5T6T4I2txm>{0qJD=UYDLnBcCTO*w9p3F2I=)wwU)S?Va%LlEc{=KG z&5~&H8%^FA&D00c9--h$1MnJ0Y&Fu?kQ8rz%>QcIDc1Q{Nq8V*$dux6bXSu_A@epLZZ zIW4mK-h4SOJZfQiVI5{RC*DtFsQYiFQg6dei}}aB4#svmHNVaUzb?F9R{|)IZ!^dt zEI!&H%{IU_4tQ56wp!n*ZVNa^-w3`Om!JA6a)TS{R@mN!!buo&(QwGc5Mx9<#XbBE z#~t##>%y#b6qm^?(LzzbUGT31HiGf6AAR(YM?o6L!ObOWRfuQA1verm?Kt)zoDxJs2Y-kw{UrdpLMKe8y7s2vM3nxyJIL2 zPr74Laf-P6f%BH(Xdqk1MBQRSkU4oNUB8lY38Wu2V&cKFh?SW|H1)iPm92}mSUBD} zA2Id(6j?p;yg`CZqUpAX!MpkTgY{kUG(!eYhGrgPYpSRIeqNC3&u3cHJ$yFKO=}J} zGQ#j5&d`KGJ6x`rW*?J_rEFmOaM~*#a+=Rvwm;qz#E>`A5tOrFcccI6oF~>fpW-eD zDyzQ%(+l5F04Ii5ErRE_Xz_G9oTl%VaLc9Mc&usm$p>84X!aVLQ*(;~#o2;Be?A9s z=M->YRxinxX)l4xpU=QtFrJ5{w#6L9qlKeu!>{wZ}ojC>*6)S^jBC_I5SQlEN0Gfrf`W7+&+Z zlD&xfSERoa)hqvxr*lG{Uk6|f-q#a#E#hZpjKm<06Ub9jG7I4m;$zNJlS~VF4ZcP4 zgK=9sl4@eO@T3*zKhL~my`7j+H-248f4{A!JqA5Vo`4;=!q;B*duXod^m~|xl25kn z;e(>G%s>8`{$3}4=t#BJj|t7FJf4b7RdM^+yB>N^y_EFSO+&}r^qq<({#8b2ly*_6 zW(H47`e}mN)Y0D9O#1M_8@nC)nExo4Kj(*Nm-^Gf?Q~<;bagPTy^xp1F;c6xxW~>| z9s`oK@`Jt+<=XXp%H(01PZu?N;`CCk$pCV3)^lS6`;^S$1J}HLC$ba5f%kOg_kc&x z<)bVWZ;A*SVvRy>OtT9{rwK+|nV=&;LD*@Vj7 zi7Xgu-zHke_s_*pThc359*34Uu4t4ScJXl)T+&=Hia-L!TcxMw6}@xCqlyntQ#@7T zH@YBJu}|I_iE89bmJdvI*hS2)X}^fTM?bBbi(#W(&S>3CClbfSR;mW13OntIx*|O# zLZZHz_N&!I5zA=Hcf5f ze{747RO$4=ptzke!ie>iBofxY{YuOy^U?jYdBo#E3zc52jRWOZ%AuOS=BA2vPe(|~bkBaBw2B~*)yszevPMKM-Q zk~QpsfYH!)CgNU{EJqQ)>^<{lqMYc=U z^1bgh$1#X+p+l#-Ku^~1ZrlnOuD5o5p)Kt=EVlzNF@ zgrc`9yarfUohBsCBr~1NRxQ=YB;stSanRr7u=KqRYk{3$A0{SE%Ii{&ahrrBsxoKsq z9$}%gYFavZ;jNJm8?3)QVXPSGE*g2bOw!GFIpi|#xHP#VYMzVv;89+CcEsTet>?vv z=}#Rl>E<0kI6kG2;}e>@*V-Fux0VjL%m%Njri)y^gWjaG|9ywMCcp!9lbOoJaO_(N zO+2Kr?0zQB{>(d@bK@qiBz=Ly)<>PSKX(cTW;vgDnKf;I8!%_v-ydLF5Szs%M?UPl z)}mBQM2kklA*HTjz8l-Jv?hjqgOt#Kr?{;8sPVj?NKV8sVK(DeYhs}!S4S9^fA6`GN8)17b^tE1ot$bAu z8OpW%sKl=3NLrfy=-5=YFdn)nEWS%<5aba%#d<>S)f&IahCCgqRVFYuwRtSMS`W4U zDHQ0|O;!P$h4F~jgrzpR`4ruTm$JKs%nacLF?n^VnqJ_7mG>EVo1j-nxwuie_x^_P zY+13V2Ol^5kLW|t*XG(K>4QvDpJrD6huP@@3yN8S@Ul{bZZ>W`e}=>|pu{9{BUoA& zEmhKy7iuyW?`Za7-;^D^IeXCUR^a4(lN2|R*3?!EMrb>QIw7Z-WjuOEIpW2CvM_f~4_=4RcfcMcrttt?q$$?^bjg5?i_d zyMz|RlV}IIZr)iE+e|iMDG5TIAUitmkb|O`3&T3$4HfC4`1O!F2W7dlmN0X zb!>h3vre@}aG!m`yqS3XpVuLaz%Y&sBm**6w`C707Hbs;hO zF1Fh7$gC8^BH2cEPz&OxRiu zJV$6+@!eH+f09kt<0%PNc!^hcV7>@1Z1;3dlgU+?6}mQtVZWw{?X!#y19P;Z3?km`qrNI zyA#YJ@%(`N=0YMVH{VM{7JV}ta44@eutKqkiSX#&;>H<9K1vVI0aa z;!-hwIgqAD;JD#-%T>X$63#pN=z(7d)v&v;rMdTxwamDS8QH%7wknQetufQ}9qpE* zvklMg6XHT-otUP=Mg-HsEO2>szkTGj#N)|&QvVkBb3@z%yeDWP#wmnD`_eFaNjYfJ z{GaJ7`wHP?T~}}?^O&bpyZTz@HGF3V5c{m!dB{969a@wr#vZrR%(g|wDHo@8YT0WM z6#7IU&!wHtxid|+lvC--a|>Lq=>K7Dm9;pWO2?)lDiRsoI0|WaL{q|Z#)CMuntSen z$tF+6l6Jwf+(D;ZV;g4E+)E2yb>?SZ<6=hkY9dzESFA@N@pM^o|qL*jCl{;GnZ$9F3kzw_(Wtba`=$>$(5 z598&m<0kUWhbPOJr3cA+9tA6ztaFgQhrN|d^!c;SLnk+H`0v$jYn98_E*mlObumsc z6CKrAyl;M%fh3Nq{X`W0G!kHPYKFF0Ca5!Uc6eyR>n;4`qEHx)w)3E$DSD1W&~`&X zy?^YmFbGGunx)rCa%{YBJub5!d9yLzA09Q7nrXdcGCeLhn&Vl?iWp`_2NcQFQ%#NY z!oozzuv1g}1`NqgK&b;lcmMz>wMU2s07teXIZw}!6=o+HX{3(;Sddg?kQ)(#2JA~F zGRTbz!2t#(Q5k+3G`h9-`{or^2oMa7>rm3<_x%vVlf&OqD07kL` z$ty|GR6Jt;dhT)nF;G@6u1K?x0gGi=rvcp2AZL~uOsHVS$CG(ydxJ-2gg{7pr#)WM%UPAz2 zQ=bq4Q%u*mfLD-fa+pb~Yg$-w>hkb_Hd&ToUUnFdBzNzCHQ7t*krC0v045&?&jrKTr*7Ne{!5TpJw7lw9i_s7`Ik3|mcY zNea_QZ2^U)r#_JaRzWRsVP9i~1S~PtMunZGE{_g0N^15Gd<`87pu%*mKvt!{BTlBe zBKUtn8%XyVS?~WVX2^Q~oqtGr{~JKd63~VdW2$$_IIW#Yn}#%)!|2*If_= zo&{e&V#w3VBgsRxBM}=JWUGn(Dv&(mgrp38gpPd^tr@cd1ySAbyo1t3xm?KS#F}XZ&gOg6sk-v78Ar94G^OwH0OX1~@a~jV|y@jTlF> zl_tz1l#X}(0w+<7UzNh@0S(yg7elKmzbYkH(ZMTwCX)@u;N#>)F$ie{)x#hEqsi`n zZmzGbq7k+GLV8peK*J>S#nbPW=QdVol z9cy|(sM5({Yn1BwtOw0gY0F+7Z8?4|<4tVpV9#hIYD9_$Cm}6LsD7rt)@=7BiU()& zABBpIsCJs>ri0l{{9fDMAkS&M2dRqPp;(n4C8@AQ zSfGZ5CXVKq#S%$-Lb*pTWfxwB^wv)~O1q z3W>@?g(xlGW#1m-le9P1^Wm;y& z91|Buxw)}DOv7bGT9)L4q>Qs-Bk8KgN_?e~LW07!r-YJ1U28GrKUEgef748)9Ia)% z9B{#tZc!UKDQvTJ^b7Etfw!@6!dZcbp@)IMQ8#Dz2M^c!UOZa~dqi5s+67_d7Fq`@ zhijO_a%r(XP`ZwdZO4i0=5?!}xfr`W{3%EK41U8cD<`YR*qyuIuG8Pa{XSL52icYl zU1AuG9x~8fYn0~5HHqjqU?hJB%F5kOjhrl>v}r^gEa2b!wL4RV?syBEmC_7W6Y^Gf z6KB|W$%csy%5Hb^lnfq|16qNq^u`ELGU-h-EA#ZIVHNB3(PuK|^E;<;$y+YxC$e$# zl~&M+kifK{qQkVIvg5`{V|hLkAWD4Falo-}U^R=S%RCViVL%s?Q550DSNjQb_7+Bq zpFEd9kaNR&8j3mIP;;&>3&MgT2*FSl*7k>*x@ zSg9@enQxA+1`q5DTDbdMuvnZuy$T96pnak9sll3lTezwZ&eZI$nmQu~%pSO3y{Q*K z$>WxiSp{n*M-J!Pnaxq>)QTF+l3~M?$Cb?%jqoR#%}M5jH<+=?a%fWt{+3F=@e{8x zvRe@%x072DTFS+g|Fxm*`zgRHkIFSBI663KA4?>vS8&!4CK5Ys<#B8-mx@ z0qDC4iwn~MJA4Vz4e5$=h0&AkgaNfNiw3&^^^rh}#$Esq`|-^c^6s?Fbc>~@+&94X z9gY3*YYy<+4EVr1O8L`Wpn>ix*UWsSvHt9b;V1zCyS1^&?=uCN1xbQ*9x`PDJ_VMw zSoNK|@EqxEt_taFp$d*0?g;kG?^XuPxxbOOWfA^x)>q3n(|4F91qy#o6Wdj>{?}Eg zu|W>7p7M%*>sL>JFD%$20s;TS}UbEbr@W=b+^DapEBgOmn z^ABG;yK1xXB9d6u7P4XG^|^)HeeB6bu7=5n>Tc8B!Ts z8A2H>8Il&N01N{x89ezbv6dP<1C|}52D9dyEt2jpU2t7qUHlw)dJKA4dK`LqdH_A- zG@R)7Zk$@xS#VR>2Jj+qb#Mi68ee06K+ex;uvCatgc4Xuhd4*dMB z$MB45i*V)ABiBRj8v{-N&I|R1c%{+<>r3qW2p$4{3BCc{@jo;LZUepn^#*7A?F!g~ z0~OVv8qm<~7Y196+(^F~hp`G06SLK4FK2nC1I2lK<^|9@)gegINGp$_=`T4i)E z0I9D~2fY8Q`MD{6wfO?N_aS?-d1pVI+BF>(? z-BG#*Wu#D|aU=m4)8!KwH&xMjc=6TFc=3I0HTx?l` zn|aFO1@>;;o5!O#=`+)2HJF9i5i^D=zsJd}q}SK{$}P25LY9pCyI|CNGIDbhW~CUZ zQbvMWT}s!p_v(V9AIzc(IOgfXZ9k{OcoDxL0?dEFu_^r%c_{_(Hujkig&59_J!8+t zqkT8=sa!D41a-x#1JC4XidoD_V?weJJF#~JS7H~>EZE46#AxxqJX>y1TSc3YzXCO@ zXwI#z|C@%EXol7ivt)t?j?b}l;)9c=ZEEJ7T@Bd3E|iPm>iW;QUDH+nCvU*gZSJ^j zOJ4kzfjxzQXRu>sJZ3$lpJjx2oBr0WQO63(%}X7kkl3tzCe;q|LF@hO{hrs&n`=9e zZXZn@4U6lkPP{mN^bWtBxpIceP1|hR5>FL*(*EQzE;fz~0$-6DB*z%E)^Wka}oI}I$Vy)C453%ALoK$wZ?O=0GlL~h;3SuTr z>)+)R6JQ#vM|;<|1r@R=-$6&?wUMHfaEgtz>I?Kwsl;qcfBGz%=ziA%EpA5-rAM)F zZB-_$B?(fOwYSsKc%J>60?3CaGcd`@hw03!N9v)8W@+O1Kkg(nz8A|>F_w?5rbviZ zw61Y2qhYUdUTvg;b|C_kHb$La(xc!*q(vJU`37))E#A4e*2>LHyHYA()Jm7?S^77 z>6*;Vt9){_y&2!gsZ>&V_>qXz_Y0_gyij>rm&TL*e4>ywG7%JP154%ZK=p{WDn+U| z%F3|kQykWJZw-lIscIeNMoZ^TAmwhMc$B=(Y+G5Q!|BfGjquWxncBLtv24ly8-D&= zMe~6O_uS?CPIS8rAMX2e>xj%}O~lI$>y;4` z#+LO@?td6lgy<*P|A9(%R3C;(Ekl=hjQ1ov1Bd1W{fqZmnwLV2h7u0~!>ivlC9IV; zw|5Cwv{)}h^;^FVT(q*Z-0Ab1=n8ETW|EH+CGXfASw^s`iZJ(8S2-`a>^`?l{56dD zT<@Zr){Us}yH2jPaPTjxlGh%#N?%uI{EXKe?iLH%t4+DB%Kp9Kx_*z$*aRbgW4 z-Pn%~^+x##MEjo{r=+6%P9imh>)Tp;7XnRNAtk))-KeJq_S<8u*UUBw`#O(=9BMC> zSz|g&hU$vgA<19D!Q+|AZ`nEHUo5slF&(Y!H3T?{^D>?vOr4_OiQWW+VT{sel0GBK zH%fEZ60=0^aTiKcCiD*HWE3R*SSt8Etw1VNsvtq0&SOl9EoSzhI)R^HZwnedYD`@h z8Pu(v-OFV#MetW@6Gd1ph2%v;p9?7fo|v(--sW5C*x z#^BK_#ngodv94$OH-Q@Lbi_>&C3>#H-vb!xp+Rav*+{!82z>!^J($p$vg!fWCPhkc z=%pBw_%*J2H43OAF%vrsr7*nmN2rWgo}vW#Lsz{mhX`I|ovP@2J8K^7d>z^W36sd= znFP|<-I?YzO7zO)_lS6pmVr>jVSoL<5io=*GyaE}VL}mt08>)P_s%(0EXn}0oQtvX zis*$iV)MUw^CWCq>v}=UbySODop404a8YDKH-cJPu)zTwjoM`AyJ4v3LduYJY^3GN zj|ppCicY}DheYW?&Y4OiA*p;CcM;sO5@tEJd^_=)`Y@5VxWA-H+SE$sXe(uIDN|ir z+Yvhnv|dMRcBf;o$RJ61w2GW&i!$#dPMMqzI``DR* zmYCy&qX>+ISY_tw|KKQ4c@(HV)1m&N+YwET=w*-nvd4TkVs?};H~qIL*P}LjkA`U+KQ+w6e-hc^0B4XIMA*9?tM%=0y9iKg_ z{$@o4FA?5A8&H4cFmB50=aW0{lRMe$&Rocf(yJ((iCm~lLga+tt6Jws{&_fzEt4=Q*jmhYgzkOht7?`SZL5&j~$1;WB7 z8mv>a%2<->l_N$?f|R=SIFdnDjc=J>8^&f-!ktSaM^f(k zqDtNG~Q|uMsX8X`u%kNPA0vgDsVqUV$I+9X)P%xu3(S zd2~;hFCM73jyc>(IUuv^pO(aeq9qqcjIMyenR)Ty!vxAK!uqTXj=&0aWY zHYW*4fE!mzVKSB5^O!_NH{wt-%#745w1e%df=9%Ua5hAu=4jN)Rlbt{`;w#B;q>(O z?xv>h5`B1w@Zs%~C6QnEWU0TmM#5yb+xi+*!LCoQDqIh5`9qET3eMcQ+|;>T*SWi` zrY110bHFTzV7g|Yr0{!M;xw7aq|QPWEwfMoZJV+J0l-pd;ti5&Slp~Mm+us&*cG;( zGK~>8I`GVSH3oBjic7pd|4pGy%*5gJ_j;V{UshM|nnkKO(ZpomIV^gr+x7D<(H;{b z15Y&4L1_q34Cz)K?8NAZGR41Twg0(sK`+_aXm92EqN*oTRYpLaof0e3* zO!*#G3F0p||6_`6bVR%q{3Ij(@88QcLX+1n0PPg}Y&73n$T$D~OI#R9A63 z4&^>?9TdwKQ^r;R#IfP-c*pQ*E2^@4-9BGMvdV1WVmwSvqOt*H<79a`JeI8zqdj{X1erMti@9iV zf|)^)!v*^lcbD&JtER7AiMIX!undpR8ss?38n$#KD?ILYaFmh}FrpmXto6q%)ZFzP zE-q@B+HNk}yiVd@s6U2+y488DYiwO1{KqJ8uUk{bO|_JZ2%dONZispn%#HYv#^7B|GP;yu-* zfS8PPi}h$ee^vZ3zRxNQl}SJ}WFqo-emOzFnA9 zLtlER-|?2hbX5D7?`EM_oUx&&{Z7(N6F1)%@6G>Rx2;Vi5trfimpacl!#9yU||1HnS?%V?^XdnzSFj`_T4?XiyJ3 zby(NaJvzai*k!-4s>@F_8NTw*Pch4RIjzmFw>IlM-;yRI@V-CmIt(qF)l5p_b57Dh z@YxV@q-M_};hi&KiaAu8PO8t0H}3paph|0O(uvOwO(vmMp4E)^&7dwPDHl4moAuyv zjC;h4x`VX7o(3NNqoORL@~Q@k9zQ&`2{jS%>E(>HH`x+|*(S*f1Oc!WYT^~inAK-3 z^Sb2=ippjc&FW(E3ymv*$*X!HScD>~uA0MA4azYh?UBP#%ma~zx5gdxDDG77$2Q9a zlCp+Dj|G9+4ra|B@&etAE7!LC!R`6_OT@Wq?jk3utQq22ojfFm7*d)pE-L5YSO$35 zqVP#Cvu5Sk zn)HWl!lVznMNC|}k03M<$1k7#hS||lg9r(WqH1%i_KNzRt?#PLWW|GLjU^qwva3x6 zoCoLaNDFtllxL{t!Q?(@QcXZ>#<`5PWTuFgdCr&lr4QYBH)d_d*el)XlT583>+eqk zCE5^$eHi|3I-%IevN*;2y!ADJEd#p_Lqi=5*7LHidZsBuA-s-7t()n3(jh+vscINm(ncaPxHAN|~#wutviFGG=r}`Uc z=J@_id;FiU!t#IRQ9QCiJx_`3J!vTLdz);?YSj7Hr-B+T&fpEq&lfLUZ}_#&iep#z zbfn}%640Ebl`cvLYH0O2hvs5i*xm>g25r_h<(gS(DAuUMB$9>Dx!d0crb%R}4u_-` zO8aoUmZ?EMGc}KI;pJNlUB{jhfJa2_deiQKw(X$Mi!V_C$A)9UA!P+bmk1=~Q3rC7Wny@4x19sJNwHHCEdFXi4;O#OgGIkoxQEjj%J`aw`;kV*DhVk;3UM$XPEAr z%;C7#I96pb1#O)BDp}GFOtXJ-RV7N;ZhrH|V3zzQ87j5K@*4<3&nSv?*T!;cV)Lo+GBV}G3qn7@90Uw8Y3}yO!-+AnV5vO zcyJG>IkW(gFe#jHDKE2sXjw%hM$~Fa>YbKaEOgK&`{RdBo|d7zFiYr$rNhPu7Td)# z4#QKf=oC%o@(dcGw4=UI-{DE1v6>Her{}$M8stB)24$Ae>OJR=Ko>mh=f_9R+A}o& zm=cBlRMORKm|OqNYklXw2L8T`vqDyFO;w_HyETjWuv5CQi@}O&krdlZ#SP$`qSA1^ zzq{(xI7OHFHlC*3uHT_h9z-I?#igCC<)dwNJ34gsQfIc0uk*KUL<$x@|)YdM;mG>Dxb0`iS7LZGu{! z*pa?_o{JZXXo-^ogxb5%tclqkA5D>+QenD$#-_|(yCRLF3z56#6Xpg4H(^mHoK?@g z*mtg)Y5a!*>ZrlDV#<{f>y@zZhj{5fY<(9&HPBDH)uekZXMcg+iCY0Epgxu=Gh@qb zsl()@sx~L(hRUk7(s+q+PC-LW`|-9hMii~xGOk@Yno1cTD|?V*m1QiXcmZFlGq1{`LM{y zHw-q3>J;$@i4hBVq9k{N%V3<$Ve})F6H@mDhHBlbs+snuqq9rlnWsJ+X1!)Yg|tuo z6QbN0+p~4W7P(9A%MqOIBU`G54F1vUjTIe+NN0~}f!VAI0m4PzbiBu1RCxE|8;_2O4{ojj(ZMMjA?N3&Vz(W|U zxkrzpnXkII6UaIZy3Ks9zv^Q=hm&kYu6Bz=Z0+3yR900LbYvG~r_aojS$6SdobHbV zTGhwPt|Ydzw4`Da#$M&6q8bHkUgkmT9BMwQk})e4s0Sf^cXZOBG1FvK zY%R;nhSii4e~PJ0<zDK%vCt+~vCE7X z(6HcF(#T9ET1tLx$(tYT&P`-cavO zy{a+sI(fr#f91OAxSqgxp4<^@i`;ncjeL+_x^9ViykY0ZSyjMmoaH+&jktK&GOf!* zWy)eOAGFqCFYhv{%mD}Sqpl;#_x>pnuH}hEwZXcKer8YYO5UzM;hDPB&#EoUD%Nj@ z1b4L>J-i%5{=CIj|43r!4TU$|7h4MG*A;F9+|}s&q~_|d=M1(qRNHoKN0-ew*n&TvT}IRgD)VS( zDr&bU@@O9d+C>WJj7$sKMNs|{XndS&5r15zF2p!jx7fG|-=6@LAyvLg9jh&_)HKlc z19TQSjnuSaJsaLe%G1a!PflU1p*E&#_A^fEo;B35o2e^k)0>4Ox#M92BM*OXcTSGl zqp*e|vEH~_9tHlWN6dr8E*S;^3s>gpGjMjqoCVOV5O6GeVQ}tge*K7D22W;CfwxJ| z7Z7wZFDO*V*fr_={>os3VqB|v<117p{~NE1I=#HaQ}W1CXS51W;e5`>@VP-g>*{d% zoh(VbumPP_1?lW9mrYAs4uj!JyivXI(N}6EI9dY9UkW=^?uy*1f^uVi#Zhf;SE^2K z@QzLYC(V-_jg$bj3EDpaJE;vRsG2-x;jn7m@dlyUvuHQ}*DIcO$vP0D&I_{{+O z=Q&gp#x#F2(ec5&XS`f}>%@OCj54^iDaU2cI;E+kuo8z>Aa!N~`8X|_LNq((4Yec{ zm7Oq>j{q+VaO++6sdkqZF0hbcybU^kAOsYgKUgnp53K0VoqiP385A+OWJ5Vd(l}-s z(ZmuU?wDPo*nTNNsRrp+CijrDW(>3RZVL5SNqob}{H|oibiy*e+C6jS%5kI?8@7vK zv$bWyNw)_qFDgqdw-wVd?qB5Q=4CBv=g-HFW<5iC9XtX~PE@URd>44?vG2wkilFoA z>WSfXmgn5KZBLe_do*A14sVr)HLTdc927^PI;Gl!w42d^a49@c?FVN>KaJWMzSx6= z|L~=q$ZYP3WR$$xYHggX>)^s8s57`&j;k$3-W7KwuAs?6%!(~x#hQ%eICh?bPwdkI{viz>1W5iP?jZIYi%d3jFk9`lC7>Mn^gH?6%{dX-qD{ ziR6KzKU_`INN(xq)JVO4uraZco*?|~3zENj^CyJOkTcrgZtFK>wPPiyki%u3 zQGa+X!RIL*ipKVRGgS3;N9mFHDLzqHgRFc?eeLPF44*}MpDCe)Z%K4));MrM=EeEL zI%=yTR5+-FG>C$@_7~n|OsKtDcSnxa%LO&FE*!i<@kaW3QA>FO;kXF0h zaufmcCRhC=>*nzL*hh*U$B&Jge$(KO@Q$09-{sqGIl;EqRVGom0$nJS_hdFHI6eSg zf-B+_;3Gw*J6dme+;DkF+1mTt?W*eq4Uf{lv;0KC3#^aI>j@!2pEC}RGEpU#P#Xpo z^(f;ljS1%3-tQ?2KDnL~JM593GK9N(9h~khaK?P+imtqWzg9Ih1(N>a`dQ%#@&X+7 zPn2R_o0@<;^-phVM1=Ya`)l@-GT31Ge)r;$&g$|kPXO}S))lQGc9CkGqdF~xx6klV zv<8PI)h!oXB8y%E>W!-)O8@!W%v&HI>hi{?Zt8n z1{jT%Kh0}kT$K`h1()N=Y~z#FAwv~_GM1K! z8sW={%|iW|Dld3Qyqp~(wEFq(Q0t=hcxkk3;yJ8aY#rRE(3Hrtk)pLs(=6hzEAV>2 z!zBO3bn}gwpE};F5~~) zt-IZ|zDqsu8}ZvewppMyj?{!m*Ao%@M}y9%M%DwJ+bwGAZ=(1!^;j2L!xJ)A5{hdTy{bA=QKbEP+l>p z!i@VCzMFGS42EN7I$Iyp=s(`BMF*Y96ZX%r{jrb!Aa10=BcT?OAUTEpYB{j(-3YcW zmPf*=U~9eo_nWT$h3Yu9R@Elrl66{+z2*oCnt1XNavD52GQvh@Wxcq4!J^OhURRmZ zGiSQ4ZVh4DfU0wj+1*AQJB}(xO{v}qa`QmewQ;kvO6BqCcST35%TXI0x!_OBy;{15 zr3%Wm&%KB3OYWB*!;q1SAC=C<6W}=J309}kJdG3h5C2w&F54@;fG+bVUv)^hc8wHYGPRp!=4ImTTdzE@%Yo-r?ps7yk;*PTg04m^*uP0iSCKhju6V{M*gtsE@p zn`j@q;-@+N8Tg}YzgE?pVVkrUUH*(aLO9$Y71j!O<-u7qc?Rin_Vvy zbFoOcATy*)51TQYbhIDg_)P9+2C#w||nLu-cZp)ZIYpe@<|K z{zR{`v4+cS)Y{!>D1q?0CP^?#$MDzLuuL{&{0b^rrvGN0vfJ8ET>u{&mnznmmTGBq zW@=7l$eekZ)q(mt!a{od!CCr>x#i7G=&y zlYWz7QWjKWuQ1I<9^EyqrQWtWDsvA}@8X6Nf02xVRyHf$4h3z+`IQ~dS*_&q7Anrl ziPc9J)i~`2$hPn1IZXt!;{j0UrL4C)yOzpH851P6JLTWrNv=`Y;s*>h2as*!&Yj|* z9G4zbNd!dYCS-((`Gh0(Dbn1&FS&$8$NW~MWE|-jk&MT_2`!XCO3eXwx^;s71SU!{ z3j;|(w~F3`OpN5G{(HZyU+Fn==}4J>z(-z?Gj#A=bXFG7<)afhc)J?s+UzY=Qrz<+y!RQr=4I+0XAk&f7Id|Z1T)$?XxmJ z3%(Og12*p#BmsW=WS$>aE4hR?7PofpH*X<=z}xyK^XaGbeKBJ}@CG3BRFuk!h#Ltm z!oE39Y^XhXcp)hM<9-^_a3`07+pzG(44W1l?P?sG#GhMb-M=sUYYD^b0OA^Y4_#L0 zeRA?j~tz2P4Qnmt&pomXrZX6=ebkTkiV zQ9wW+#!)j0`*>!Rg!S9XX_EsTV}^b8zr7o7@5ms(X>(SGu7O+Ba1F@CQGM?f>$=dc z2E~ROzd>C172@!BN~H9%Y)){mJNlg%j1%>C$|ZM9%04dr?`mllV@i@Sp%)CNds*~7 z)dIjU!7Q_42dT+|cg{8Tl?8S2C;D&cd(sHY(Q2E>IViO>p7n!W)qWKnlx4aMwgI>r z%|XoYiq(){yY_^_KR<&Q%SDSuusu|T2|_6Q>DX<;w{>dADokkCz`6(7!${r(4^Ydf z@9C%ha88<7+jjJ3T&5`6rdv7%v*2Z%D#LK0Lxr*e9d(`#n*D6p4z*maAL!=)G)8UU zIv&tU{RYrpJZjf_tVi&=QJ{ifCL7jZ6a40EZRK!d+Z(s;sI(iL4a>=HGjyD}xRH*N zqBLCO+*hx-T8D)rAcgC~;Kcq-jTgRRkyp7Xq|uQ-^5^a-Gt8KC`@(4tbS2I0p4l9g zO!<>_Qx8llqVFsD@>nnmlOfN=bA`SlsuVN=8!Z;!=}OtpH3{FN8)&* z@R`%EC2MMSG=H_DgRF~D%=$FWXQXAHJSts5X=r4uInXo47HK#f&FB%Y-6HYV& zs;$`24A9=u%-%+veb2AAGt@M!Cm-ePr1sM3k>nd&$H#0qG}C!;RVtFkFvw!)Gw+jo zlWj}48Ptwi8W$eS#>v=GrU)Nax*8^bBqgl5yQ?2B7-o*Zq$7yA75|&|3v$ZWj>}L_ z5?!xU;Yt};bm7vDDP-2g=&L7=Rl3zW>{r*vzu!s28`kBb_)VNZ6;=q91!F`bOHe^4 z@9C{{Lv?2H_VcpwV@~!Ui9bn3dayG0Xgn`OY(<}x?Pt7Unpjevn67XHU$sgMd<8kX zKNu|m?&0LY!bn_AEn*2(1U4#0!k-#!7QhS$854CYbBs1RN&cX*RNuZe^{LMOyOsVw ztcoC10u?$soOw-Lw%L`kwzhbKNe3$aeTm?5Xi0m>x6pBif+S&{=N$2dz*-B;oAWGI zU91{&7+K0c&+jeiuR6EXojs%+Uv|YzgEjwp)2$p}E56z-I^w8%+pnFz8K3{w6~>71j$Y{xC9_?W@uV%w-)meBj5HiO zxZ6`N3L(EuX2$XxoKRU$ta)U-(WhBy%2!{l3Z_*Mc6zBEAN?B9)E{!jy)>OVOk<3C zC@ob~XxSaM^D}DKdwR3RPWH2Xi5fBRi--`NhJeo;m1z?O0$P6mOz13PjqfSrH((Jn)NFN-Wb`B{G zVBjO+MuisW@_AuWhz}Vq6JTO_T(-Rqn9D=<6VYA~bt)qX4}mg`DUH8Z^$=RC^Lu_*1jw`P zKqbJKiEv~FK9NbdG^wSY!|w*;&-%=;OI~n8pZaoz{cX#1MC0bj=x-xU99ciBv{(O( zEPz=>vI_Gd-ypTt-YZgl&MJYAwj}i2SJ}e;`N}5q2}?zt&++y<-}TqcY+6*^sW#`P zy$yD^iIz&)@7Dn36#i2gBtjocKO=jSY`7(Lwn+ADQF&t|>l$O0?bhm>NBYGWH$HCG zmtvb&%h%PhtMzsb+wqY1YMqW{fsw5Bm(5|qR(?tuL`jccv^odZFrQ0)%9i9(Cp08P zJI{j=`P+c5XTP@+<7v#f$8$F`M_#YWaNff18~*Wsx}6T#h$I929zHh!hOnD8v!Gjy z;0Zimj6DN}zJ|BI{XC8M9G}3tZ9ts!DKM^f13SwUqvivqt(GqAdGB$Tw+H`|mNV2) zBP%d-vWKwjP!E(pMekwc>W{efAi(j%-{M1$K4FYsLV_L!G5J=cbT1Wn-e(O{ozmjBks<$KW zg1(!ch}Rt{IugWU8*ZVnDF8+#XH zaTOhUQhxd9Iue0e=nzuuG(OID_L*K=jhnh%fmsz(lauM$@}>or$ypvt34R97I)AsD zwJCswKOeu{$9q&$VM>l@OR>UD{(4ie+0OFa5caXJp*rYU-G6{xRy4&H)%RBb!%(f& ztB2s5U&m&+eWY3}#(}UOc;h7Tk43T_2@9J>)E7`yg}wek=&#+&1w^mm93)S^U>bGT%u_*KLztS79{&yUc%>RoS``fY5%LE$= z1@g@$-^zf*|5riT{#!wr*qPb>)0x1^#=^q%|H-Ayw=TSXxT~o*U-1~LA0eZ{pa;W> z_bCM!rlG=<{0T%31rer=5D7s?E`W!PjV6UbcTd((wm@GiXUrX(R3qKAf9vwye(t`;czx!p>3UwXs`ep{2sg5Tq*mi{ka3+l z;0FkXCVdFieXfabWdxQ(M-MkwcwMMJCO?1MyWQmEvm+kQ}9bOoQM)P!SC=L$P@XamK?VQ z&BMUXsed)bU!VHDC&Cux ztN4{;ePk?2gBLqfCv&Wva;p#leXRbOI3o}gy;;E76ooAKPd*Y5kXA8G=6O^XyL*ej zNUD*Q7(b#gA`oA|dE9YB-5_3nv!Acf7PxwfXy#}@U>xGTKymHt@M^tjQ~U2|W4w2r zfKss|_yIc<3#gD8-r0U<_86NMj*d}!#y;RiunV`?HOVP%h74piKYS`s+TuZH=7Tlb zIMaFKvqUE-+z=Z+(T;xWPkGi6U;&gLwiodqR1nitrQ>7> zT;7daT2+9nR#E_nG?|;dCr%m?_6n3k$lxRn4EXpM-BxBuf}js|*_gb9zUcgVx_vy& zOdswZ<({9U&bKD#n`AAI6{trE5_!le28IWR#3bAF+Dm8}#I#f@;@;4JdGN2(0IkE4J4Lxhc82_;n=ZzapId`c1A0l~KmjvNrQ^870S*6g_Y~r|i)= ztYcY*^Ku_k4Ts}H0X^pvaqXdfU#a{(7knwjXKY8P&$0NBo_d$9xcFZY56*yO6e5Sc9bC<_9s5Uf8E5(lA3UPfA^7VR=vhXst1uOkf#rE~aZNE;v z3jsvn(qdAL604y}@7W|SY(+`8*pBNAt!w!kPBVFI3n#P)lc3_F|NgS^n<}$y;yr~@ zLi50jD8aY)t#DG$prh$s(B|O8K%o9uKqm-F!d4JMgUcvd0h5L}See_EXKC9P>Lw?& zr7oPM(j^k>)dXuNDcxVqGIg2`9ibCpr(BqY)e2&IFzPo!=;Ixxs$wCklgQRgc}daS>~8ao3qP!Z(~< z>wl;)KiHQeb>-L34Uy_6Tr8QOb=32bW0uE}UKSa>2{`$R$)@Gg2%vcBvC6 zqo!Faf``QO7>RM=o1BxdbN`TIUPLgmT&dlf8$yNB9JneiFVjP#vbjmlxkN^j6dE-* z;N;&t**lKhwWmg^X9%9v5tSHPy}eJrdHES#x7YENN$D2#-&g<#?$L~K2}(!r{4(ltT=X|_14Op(8Pof8~5I7uxHX; zwysIry{7>7$=BEKLKX|xa($xC!3o~mE2<^c6F5rPIVw65P#Ahg5zn_+4X1Bg!>m&63m!0k;h z!+O)?;-XcZX$@11QOQ>3F^iO^yO8s`XF|&QQ(6%J;4Gkco(X3GMLHBI4N7}ejFU55 z&a@72fp?rDq@*;VIj*vI)UJf~`PH%zNqxM!9q+}v@h|mYavbvktBUi_MR^~-;vw#p zuGc9qCNw(0I_wXiFW+47msa=eDkBZccLlURLf~3BH~xgPaj%z9(YJ}S9{g8!FpKfK zcVMqF5>P)r4WQy!KyrwuLa9J`qyBFzd8%#1dQ)m^&VFXgB7VMsF-WPu?KqSrLO^cX zIQcs6U?1lS>tga~4ada0hVN7(qJB|=@7|Q`Gu)m@U(ul#P9ZpvR~n+TcneD3x*v}Y zg)V;$Eq%k95H^JgZXm8Le0Xcmo_?-*)9T|dgL7eRuSAc9s7t?nqsj^r>kXoC%U+`z zq&3Z<=LOoJPx8Im+EI(jEOpS}@IP5jC|94K7Dv|?k$@*J(n8}klT_YSLn2vz&O3HeRpmrQZQk;7C2ihfiaNA{dN&*O9S5z1s37r0 z`K~yul^^jPN=0K?V-fhbj=?nKjZdu?n1}qla1k2ey6WWN?mmCTNGC6gq}8_RbSxqi zGNRcQWoXeYQq+_))<94pynj8!DgVOxrLu{PsKHuap4bFh|JMid&q#M5h4hkfjQREi zDcO+bz$qEGPf>D>Q~S7P@Fk#s_pp!<5orJZ&ma6CzQP0U-Zh@JbF$f-;08eYSuv?G0Qops%hM^| zYKCzRgrib)M>zIa#?E`~tANZ>w}(8*vne{{4tR{(u`2Qpg5zOZsl~u)*Sar<-uS!7|U7uq06~b zBGmKn58~yc6uyGAlSKZh4HTaYRZ>3(v?kOw`iC?uI`jSs)iov9icIt7C#x5o0B-b! z2IOs7VGqF@w%0~+DZ9M9PgK2{NodXZON8NNgek@i|8{^S@eZ&`ciwlOT!#bL-@|K^1(pbaEFZCZ%A zR6U8bmIbN*8Po@4Qh`yk2gS+tHfvE6d8jk_=hFM3UQ$_=B#@Vbz}kF!7DhM`&i@ni zsGrRVWUVP|Nec2#f=0==0KTNMU`9xI9S&q(0JRe;e&^9X?`rtvIuGO;^pWsh@(~F} zGGGb!y&GLgp?5p{g$Z^938Y8J%Yfv=3HC%xbrH!Qz*MWF9Q&a+;svN!WID{BL^(4$ z%j@yyf$N2?m=(-dy!xI4600JMJKyEM{rNo$D!^@L?+e*Kr`gCsZ`gq>!aV&u@S~O+ zC;#6<4cUYm0n+})CCSd4ojYEDJT?q=PLePOH*a*L zRAL-++LS%iG;e%IjY*XZ%&jU_9<$Ht$X?Jn4e^8-4=W#Wp~evV;KVR*Q`^Z1u!rl@ z56%s_4*aqr_J7z9cN24me(#z6bF(4i!G-|IgPd&vMkwx%$P`po%(-WFFnjc4hc?&` zw5nm>ASY)2F}$Z&$Qu{jf@V*Uv=gBf?v{%8(;tJg2Sh-`{ii>0g$Sh2jydj`+a7(_ zE1+p)eWEul6igJEFwnVC7+X}5jF1+XHaMK|#-Q3| z2}P{1Wq$C(za)Emg4~R6&)o}E0-Ca6vL0JhBGwX3VbS-yJy1I*;u-DzECt%7Hm1Fi zZhbnlaR+^(yfnty6}cNApYEI;%xs0VMzGK37j!nlj3=%iBql%|Lq5s(hApDa{YpK= z1g!~`KTQdDJ9MXo@huA8Mef5r@tu5v2$fpq>0Fv#IbM2A##&aMkyL_!8L#b9egLU0 ziI(!~xnJx6o=T#^cl8CmHiT!Em*$ep;ROO`0Fc}Kfn%*B^v?p>CPI5LnZT4cf-zos z7_x-lhCs`t4Om6zy}*{(ONK(Q*qJ;{+^ASDl9%fwzwo|(|i zmUPn3mx2AG?WP!K=6jt>^v7X-7L7&#hmHr=OV*Ak742AIG+#>2VE4m_@#K2AFVCRY z9O$*G339d(jP~=8_N`|Fexv`KJHK9wQlRz^-#fD+W|3YrbowQyT6(h2C4JeH{koJh zw*|=_h{i!}OGYL3C!ykXS>fkFHu+kR+E#=|&w_Ue8mBIrHMw1Z#VC@XEq~zekz6{~ z)w>+}ju>ReOn#_k-i3cI_=iLd!2SA@pLz6vW0EtHgIJfmLDG$W#(jnj$qy~x8A(+Z zcl#Pl(Nv~7qVdHZrG{pNPY0b(5AgGwhM$#XzB8b1l}mwaDPG+o>0L?t31u6H0p2^s zY(9i@6#2Q=RGPVgH+l!V0?C&!Ux6&~`r~drWc@35;ebO%GkBn@%u=TKditJ#AGpoi z3@6~2dSH33*r=<;Sn(zY2>&S^4SinQBR^_MGqnkE0Vx5`L|_%nKjccvPy}k|d8m+ErzPyc+{xLwev~W*)=8z&>5V@r(#+OX8&}kv|#Q zMSNB}HDyb0rN)DDhd*diXa8&j&2O;wmUcsKuL!{<|67n;BrYu9vBM+AbN-jJ;s3D; zd29zR4{h0sZ%<^8Q74wP4&vK)Sk0{ZOk7cW3 zxp`62OJe9>;?xhx;RQPZ&b50wBB9DOpoK zxgPLoh#SAp!8f+SbdYwOxcWj(jT!6-*48X{C%oYV>wO(i*6>YQMx9zAR-lEJ%}>ql zLA@(?Ivxlo3a=8CY@2lV~HcvlqkmjMySg&4c7X)Avqe#_x$jqFz6f+`6 zF`eVLVaiR+A9xUgdP>fGaOM??)~1r$mm*LCPTweq)5@hmV0 z(gIjZVl*#2{t`AX$6gDZx4{2>*+~xz5HUOwy!8T0oB|fqc4JP#hgj!O94tna$#vm1 z;Ed-0R17|F$UKS-(C-Li!;dq-ntPvFD zfV!3t{D43bNVQ??qo_z;b)675d*yoGZJhLA7+Jm=M(z$6wr(Qw5FB}%q&Lz>+;+2$ zcl8qqHS_S{ANvw>!tbcAD{cO3!qS7~VV&89`%E+bK)ApN!GEO0xpXX+t0?N)iR4m2 zOt$Ls%g=tsa@i)#Y0ZV~V(v1)!-DP$4!B}&+|gvSj5uZ1kI_D+X=c-eW&QU<(seyH zFUSVVt|>-xWmu;k0=SBL|MP^_M?5zd#IN4jv_6cR$SRh%pt5egOGe=Fx%mV0uBUTQ zcXYufj)>mPq8P2keZcW!&TX*QLZ5 z=pBs{?Yfc9IoqsKb3D%n6~)1M7aKm%RY{NHA-Z4*cxh8@eeR8B5+*df7Um%WnClrL z1W9r;53FnIj^Q?d`>=pONFXA`5?yKB_OA&B-cjF+r}R4`8 zd0Cc-jR|_ACxf+zaDXH=A$C;?ch~ucW5_ma{m@%{M?=F0g1V zW1W46wc-G47-2HukvGPRYQ}ZkwjE*a$se7eErsE==R;V0BJtrpI|#`AYn?1SpNw{7 z%N}PZz{ClMcVVF1gX%&glKF#6Ck0_Jp-^Cen-^;HTy)(O zwhJe%1~Gq(Dh5n>M-k{UQ|$h`xJ^kL9^zTFdvA;XQDplAkJ!skVbb#MklR%^FuA zdR>|!jP=o<8JEEG>ii(w-RX3F)v@6nu4(3~CHN#--NOnBTel;qz9xvbBjgzH%!|=j z=R5g%q8Idn`O;B_%O~jXrMv<%DBzZ;*hX+`x<)z$ai8P{(v8;ZCj2#ers|sIu|z0? zxgrykEPcdT6U$Y3oknZpt6gI|^r~+QSFL&ktIZi* z%-M%FLEkzoP0NgAB~UdlQ#6P|y^XeN_sZ{VZdx;Vat(6?Qa#+X$#($+GYV~dd8p25hi?!SYe$e{lJK3#JV)cel|eMQ|yO!+T{$p zPj+D}WL7pw8%LkGMM~SZN!!OCz%q`Vu`lQ_L>#Vm3-qHLz#A3}aDRK@{O9|8LSx7J z4AOz35Bg=5hqD5~wz^`PO5fD4eAB~qt;5qZ$V9rO`iXIaH_-$4W!y0b*_Z6%n{}=C zuKRrPg{WJbP1LMsO?P!~+`E10t{L0|@dTE;!gaDTb5ZA>DtNu#?o=yzvknK@6ZDZA zTzUA8{Jw5SxcC;(Qw7pf3He26oij83&o9+~*&F2Z4)^8R=}7t6_9p(%Ko98GmRXLy zAH-)i%oY#P$JBHg0xm!Uc2~GxtgFhdLD)mnj*U2#L69qa<6pwd1!7)>SC;rcnE*N>laI4o#KkCWi_tni#k;c zEXy5B9^v6q`Za5-pzrhop@`Qcdi7=CS4JJB+F5N*Q+c@E0_g?m6du+3AMI^nvdbTM z<Zb^n&heI-Z;bCwVIU|goW`ed1&_cMpdoQSM5 zG5DfY6+1s7oG99hlLCFM7=+~HmOdENJRbQ89amohB zQY#xozhuVMZ-eFiwTL+S0o4;y;n%n&xG4JccC0_P+oJSJb5b1dDR|yu4F{6Nsg^>i zv#m__!r2qlT>r07-WTc6P32JDsal)(VH7*X&1IxzjrwGjz``GKRm1G#3G)OtB#Gi+ zJ1D7YvbSv;_T$oa!^W>PziRn(_>yxPbVpeege;%&6U0+!2+9w!l_fsKX55Nyo!9lT zgG$^l{;m-nx3J9u{#O z4Fl&1M^M54ShBTIHF=SZ<=n>b&}L;o!kON^&6h)7qx;N~kx{;NLxyf4et zf|zTy?fmv7;4cRKv$ zUraCi#?Fl@O@#aKJ2rVWgN6s9(wwO2MV6h`mm^lu5BQf*mItmed-) z?3`5yZlvj?LuECl*^aXIg#*+WZ5uxi;Zl$~@!OKIFVym;-+7odfSuivHOltRXU9#Z zz3tRI_v^N#|C;+rC)Ry<*RId;#OSA7Y6X(^b{O||D0Pr|=Q}DwO0J|f=NV&mp2{bO zoHthU7LY;C7s+_%y8ps%K)VO-Jo+Qo!iOl-6?NuQ=8&f9(Yfl82jZz0U99cS0{S`k0;T%Y#~`T;efrIkMMG-qjeFE*xjX zc`EK072zn-bo0Os=w~zTt3f*4f$g1uPc)(7S#2nDXOR1Mh==w_nzXI67%rzh9lrZu zUBq@l(6vbs!N0R^*?AVIet=S4X!633XXczXuHoO&%yPx=)!zs6Ysj<0)&T7dn|FGm z??0@c70N4r2Awjb5`}?C1|LS}ut$`ih_@F?Li60?ozfZ7LHLbH5*-pGBLVED2QE_* z&394?DJ`~@5p}MVp5B}`=B@ddKc|N}snl3Om1=>|(ou()9?cgkk2TIRtb=$H!2o;# z#z4I!tt2CwKi;}|<>d!g%)`8EE5Zz73lBXwIO!X_nmv_ZhB~zCnXmk+NgMpBdPLMzkW%XV@!997ls`re>^W(`uA7r{N>V7 zbXTm+Qe3~(wEy-ZRIN{B*OSd~ytq94tNa;b_wUgmLQ!mQ0c}F0F5}L}Ny;g`*gKsa z=8N&;h$8xx+H>Oln!@5(B*OH<3Gf`T*HU}JZjcm}*!LfQD!3aHNM0;cCb3@Ef8D4g z6IX)AG75s-e9fjsHhO$}r+>Gvz53xFg$acow#X%LkbRjXZT{>gs!)zPmHlLhoTl(2 zqCpzq%Poo12>kox<@qbXp5(gN>hMRSd?uup1=b`K#o8xE;Pz#~!bxIWzC%lUiAeW` z_|Nwb`1hy+@Hh-NWjp`<#6`U$zx8b*JvjJ)4gR&qlGmVf2zp2cz|D6efwz0(3Gea- z|3g|koVRM?R&RdCPt*k72BE8hzC?Zv;GBAnvqt|i-Z6)D)^T*Ho%0%>LTO7CJWi!@Jo7CodBFpC8oH}9Bsq~}x2wa7;qB?V=_k)@`%^7`{>c!*GN z?q2M5s0_1Jn%DKf+*r_=I$t2!O#o^hL_y*-=uET1lYN)4=tF-T|B$evzwTZnXHU2% zrtwG^{Lpr_fEa&)ZGe7VF7D9M zp$vjTomZ(f=sF~#`I+Q<)Aik#5Dj;#u;E4ej8t~uS-R#QjBWeJWE*4NQQBgDoMf7q zM-JJ|Y#~m{nbjZ8j$qOXc|mAW_FxVQ#A`pqxItUcX0rW{AQt*+#ZDUS{m`$L`#$7a zb77y+c75qKo*>l3Ub=mj#=}~Uz z1b1k+Rt9_hwbz7wrr51PzH;1UK)X`eRY0{ZwjU4S4c)v@UR9xpfuI1J4|wf$+~F{! ztpj&QbO#U5Csbh^gOUJ43pnldHsrR)tHW3U<%1qDB=HGZmi6OaD0gac+Y0&XE=@VT z_fv1n8*bOCHi*>?G>i7Qzs*RWavI}4#bDEAmVK0Z)0DF>ogI2=BJ|JnMChWX%Vk5| ze9WNUoE?ZRqnoeR=br3n&&iMSd)xA7uYa3xuC*)GTOC?YShgu8+axycAs2QW01S%H z$$5Up3W282L(f4SqSUzI2(3b|KL zqdic+nzZk?;oU=vixB0daS{^PxPJatlCf5hSrDfN_M-pf4S_0RliljW7=%1c@7jNR zP>?#IeB?F(Dt^S-@BMkdz21k;!FHDsaFsbb229^kK0FLQ-~B9l4FAS7q@*s8@h}L` zDmymnBP#|I$cN8l$|U7P!~^j~u|!SMF`A^b&>ms-`jSdc(a>)rrN%HxkH7sLbk)0 zrcoAEc97Hz*DkG=`QZ~SdxOk*w1CvaLvo{qlI5~MK6oY46DEV0CLH&lB3v@&?WcW< z$h`Xi8nFH8n;v`;ufbrrjjk2o9_gEeVeYlXC_WSFWB9`>T1 zOwiU0!3mTz6c4Dh5HvApICwz-RWHJcKU7)BzG$haU}!g@4Ns~$d#BW>#SX4JJyy3OyP14OB`DV%e}w#4K9D^~Sa6X&tMO!Hk???WAOLW$q zsmdK5<^T5R36I}l+UUH~!c|YpHuRp{^^E$wqC4qaQE(bx5!ViFh+hqNk^>UWJ{hvD z(zK*wjci999dVs>2r2B0u894j+oIkvxP^y2wP~4+`K!se(L$Q6M@p1TGfbZBNJO``HBEJD8?90Y$=>c@zb`=W+3C->2QfOG+%qLaf-`j%i9oA3xt~pC_Bg z;nT+PK6!oopOod^H)V;Q^(#4>)#G^|Kzhi8T$QWSLj2oekE_6jg!HurSc&On z1zSQ$oDfH$nAT+Yv;mke(HAeWrijdDdAqYRbCLJ;!BP$pKG0cV`leyXznWvjkO;)Q zMDgN~9}Py+#ePVlTrV=Y-LhXF9e;&VF{hhLeIDMQpBHHozD1k+G7dx?E$RKu>nHm2 z@G)bX^gNZ_*2=*2rjl6Jh!Ky;+DL5;2+beeTgxiOM3bv=vu%5!XOUu*Qt%$-dZrp{Y&n z6ceoU)R)asJ8qZsT$P=}oKi)!RBhu_X=I|3{$CKxpl<}za%=qmL@>v`5lr!K1e5ST z5lq?yyI~+lZ%@?!L@+VF5lo^JzmNY!FjM|F1k{IcBt#NUXAQnq!23ORHlY!6^`3!8-C%Mb}8l5p9r= zg(@V9U~*9A7|-V&TZ&YqfPIXk=-?WmypW_gdiYx{`fm~OC?^D}IA6lR!W@wb7d9vV zR5_~PbgPb&k9+1fa-h)+#?Y2@KuOw(k-_bRIeDB^Udah|(SSWz#;+OjK};!9;^7oT zyM$2!=)0e{_OduJ60<;Jux`{D1a5-q1GdZ#PBBxI3hw+^jS<}7d@MW$E95P13FU0z z^DcR&X5pzot+y$`*sKKQ#joF z!<|-%bq#(ndS*T-^-mDnp;4dE3hS#m7|H`}0r3z$3nx3AdrEXy?bCcRt!yr_sfD{Y zxV7~d{V^l*W>}fT7@|n2z!^MTS{wX9*@Vq@Ya`B-uz@}F>e_o;T2nS{uUgxnzhCqH z5fT@-&Q*v@(Cp&knMwJEWJqoGv87sTCkVB<)Fti0atLpWI%~iBb|P0k*f5%`z={#N z=U54h_F$-RF3(F!@xJq>%=iq4BugPoo>n6xT&%tVXoNk%x9E7{s=<<~1Gss^1?>rz zyrT?C{fk_bzf|5Ys#$UQ&f~GvU~=NXUhu4G?_=&AQ58GvWy4}+guKn7Z@0|efSse+cCPym5ylP zLi`S+vzvw^%!=M z7(ah!z5mqgPBo==8#@Tyj<`xaQQ=2E1tlNiWq%Zq&O_j{W}Vy<-rz*|iqaxpJRN9y zq4D}JN>i~8O;f_)Kl)!|M7&b{q{LO}CUMzw1~b68&^yhFnplcCphtkd%*N!Ve`A4R z&+@UQN<8U*;L~_TlorU@75KMhU6ZXmbUc=5n~bevGr(%cv4;c)z5j>~-MJ&i)s`sM zt8-?vGsw~T5A`2v1%LeLP?ZIMx-t31Do4@ZKgoCR9c ziQK_qvtuYVXyL>)o9&?F8-M&P^JT+$wsjq#IOqHYH{L?+KNw6YZ5?&A70}t04p*7~ zU@!|SGCfHc>%d9f;-!+m@6YDmJA_e}GQV_Kr62QhMMtSdZmW<&z6F{_h-IuxCzf?< zHP4}Dv*B1&Bx{h*(UljlHGz`DywshL6qd2r`?!d5{hAyoQCNZ+n0ms9BYA_(AlCx0 z7x=JB;xKnBXX%fehG?`;oic1wS^ME5G7>%7&xGwGLE#ev)FyS(TB5RcZ8+rZXO{nY z%p>scqk_P5j2T=GG7v^N7UBq#12{AmmT$S-GifHq$ImMf+^mAARBXlaL#R3+lc>;K zUND7e6lrN7Jz@1t_Yq9QTu($0+ryJK6SlS9N&g>HyC3Pu1Ls7Ep zL%XP=V{r1NZiyqOD(FeujF|5{i5kv=^p$jqfi%_Ax&4F26{G1$>mtbs|ckV?>6hkTgt)&G>*PVP4* zicB*uI-tzrpy{<8N!G*1scOOd>(7RX2UEYdemb`C12&!J#qI7#^&)xMbJhYU9UT07 z%Yx%!>)gF~iF|P+QDrv*p&Fz7tn_O*Q!9#W?M>HlQBLXT6P zrmNM-&17p8Q~+tavKS?cj1ZXJf3TSqbdot>v@OsO=?Esg4}`Qy^H9N)5q3eFT=IqU zgJTK{)W+QNqN2J6&!Na|#y&+rUoa?;ZF=pkUMTYoalC1QJ@7D(T*{WPa5B$YidWH< zKT!V4R9Sc~3u;fH5f?lL)r@}S4;r2)oZ+wJ^g#ONtFWL=e>G7F8VgxhW9eP@Q-YLkaEs=c?WFm4jURwm` zjd}=uf!zPj;0C!|6SXP=^B}{ZDy0fKt)OC4nt9^uZ3IBn3X{9@^~ChgyFk_tqF-F@`d&TMH)ePx01%&I+t?~qNLn*l4=9e2!_kCN$A>PENGh&dOGx%90( z)w}1F;2qx(JI=Zky7AxtSoD6jUmwUeeuncqK``1`&=2&O)%Z-4YoaqVp!0X%qm2#D z^B_GXV8gi0Mc#tl2yjm#=-H0UGyowY=|mOsxj+KhZNVOS z!{-XT+3eLm*zEuRL6|}RFNCQEvk`J*?E~^5@0-Pd`I&WF)SJkzP{Lt*FK5wl zGBMUVpo>p$BRx|YlO+_$_K5ksi+%6ah2rF|n=csg!i-C{w*8xM2`N1+xhFI1m0{Tl zSu%sFXN0ecuwQpO?`_eBO;*pQ8$rN6;*Q|y1AHN`+q9cuZksHjWsd%=gH2X%ef$(#56e4htSSUux&gh9*<4uf(ZbpZD*F*o|=LakBac+5-&47FT#ZNRHda zhv>REI%ChGtfKD*v7yMjSwm82;4~y}P<=l4*ofh&`h`>s_flu@$%4dI0-Re8Rp1GU z&`dkqQp9q?VJ>Lm(D`Y5IMRaTO+pXBA4H(+T(i1tPbMNoY1DLK+I#BKOh2|chZiBR?%gBdpifQM{vnEi_WjYX;4;l;bLSIH{qsh-!tJXoW z>lX~ITX}HRh7{kqi}*1j^nljx-0+I%E^g2}{KA~L0*5!OW`RsWnKhMKNEWz#J z-1|@oyXP}hk5lew1l+);B3}tk5a+g+jr|x*{{OeZy!g)z<~86Q2z+E7^dT~P3ly#L znOT`-JE%9`q@mfeVsUqh;2E-0M>5!}889lOFF8W4CBirAM+G9=UrxG0!9rySUvll@ zZmX@TqItK%!@lW#pCl z(6MB&`2=j4M|@eLC*6qg&eDst{@tV{M1A>U-OGvX?&3poM9sNm$6|akY({q#EosaO zJJZFCU|JOOgmm)8YdxD$s`Jj|tX$KVn%-M8?bum~f4ik>A`{s%If0ryH;p(yccc9p~G%xd*Q`$vE_WF$woW@tXxdCaUGE$@+0NJI?;5 zu%UmJ;SqZ}n$^Pu+k5KcDwA`Y-kB}p=OISc&ZTre#PVu&_e5wdxuM{Xj#D^vl63Zoa>ofLpgzwH?_mSD*PBLd*VEkO++BTnGAz4Kl%iXKGs z3qHy_NkV+%yecbWmO*o5N|81=&O4e7VBWokSlhhd!v})?oRyQ1278<@t9L7i*EK3) zzpNQWxCa2m!`Tu(;BJvLHUPVi`FEPe*30{W9j-mn#&_a5aDvXk`1!W$`Iw(Wi*+k+ zzjsZ&b3iXRv6UIC3D9a$O--82Y};Lwb9D6F$vBq`?$AiTE&!)L$v&*`wa4CX))iXN zEvp90?h9DQr-4u0bj=FZ?_SfiKU>3-$(z-rSYd!j{va78AXPq^Z$Nbr4O4NJeSf)S zvXAw1T|qW|!8th}JSc%$*6r?6r)pMT5@QS4a>XA0=`nwrUw{(=D3jMx`bu(ZZn;qns6w0+S zC-nxkX#}lZy&3&f-FRv3IJ>RY=*g2L)HvJ)_*sX;{Hyn{mlkzwQEpYt`XaVa?so zyA^Ssm!oal4dPu?b8?ToQft z>*N|>FwISE;b(TGpw%>s^I-J@yVE%VPWf@x_i-CrB)$XitZGcXS>~QT;4h|WRO@U1?$fAIJMt4vI?kD7Kz*30P;A(#E?unJM45k@%udKlbuHpwil%wzk z*yU4-8o>_Yg_T?|O56^0T8Imsbvaa8qw5hecfhl@@)ok&SvgzZwQ_kIX$g6jB~3@Hsd0z7F%cuO(apwr*TI5}+5j#`?=P zur0B;^9r~T*$+nX)Ry5jRu#rJZ(>iDTG9!8lLgQX{U)c9Q@=ma;G$IDi-uJx&Di7Y z{8!z3Sj+r=-r*51^V;~x%N^Ixv5a!Z*)@Rd`8I9HEmclP&JP9@b390EwV!c=L62w; z>Y!W>kr$w+H(pNedp5a%9-K}9Z+z9#|GVDUu(=3clym)xe2t>^Z~}Y!f%xFYTxIR_ zws{)?aofT$DL9#OFWcmGAo+3yopl@c2=OVnv)A}-#>^Xc>ZB^MN+;Oy!*s?1ds1-= zTxM%H%^Ti>oW%JP`@}xOEUi7u=#Ve&8RgN{tNE6SZ%#WPnqGnT>aJt9TW(dB@K*Gv zQ@a`0ci~M|dGTz$StVrUxW;dqE>C~WKD~THDs9Y>eINZ+hYkK5(6Q&MzD>7dV54#| zgYSebHPlI7?b^RlKXsYxeew(D%N%$4J{CWR4ZZ_D?Y)33?R}GHVzQd}2ws8VD6iCB z_=+zVuh8>Tv+)+WzlYGlS=3wn0gD;sMs<#`se>!ehI0+u&}JzQwH10o=<15XlV?s# z3*UIP+atREN^+#)JS@K@{k;HxD0PdGO-x3_tHzz;P2i=yO*go?(0M@3gP6N-Bg!+g z5$QhmXn?aySOX{S4mj>Jd0QydT|S2Uo75K=pK&Dib_w+KjBmZ zTIIin`3$04^r9URbOSg92g0ucIB*)aAiuH@Y;nFp_Ad9gLEbkDDmoW8U@rvSKtF2y zP4tjwj0`KZn-}23`o8xvZBIYY2EyFrUR8T-e|^(^)Lcp)L#i&d*;l*XHf%P0liPK< z*sQqJ)wNE?0Bx__RzvtgUI6me+4t7vt?J*>`A)SsAM3>Iv>ZeGfWP-Zs*bl2zO-y} z=RX7csss9{LVxl6u&|WCZyk7@d%%}*%bo4%G_j42Ua@$@Z?q538uyJ)#1~g0w{x!r z!|o3J&STpho>z)_Ozu{|@N6dlYaWPK=RALYcZ~g zbv&V09t!xciX46}PlRur%fkL1tW(RrbnN+9Xg4RSF&buwMHQNIklGy8Y~Yt)bci{MhC|HJY!W% z+opEDAK7I*VNdCl8tahXEc$Y#3%WdpN{HK~A}b=9Z1T;cjopEwYsjpMm^}iVJ5Mh> z3ELctr$>VS7r_+#j|5Yb;r}F<7C!`2?T26@{-*@9@}C4V@`qps{0qUf{|CXW{~?%x zKLiu+9|RNXze_MB{)J$Yoj{5F8^HwrC&2{zyp-Lr-kyBTx%K@&IE;L@h!y12z*8YT(oYgJlrVSo4v%wnROnfSTWeRjh>M63&a-~}$#P$h( zWGyGpnVk>HM$fb4xUPw_t+jSb!FI|Jn1yTQ@sT=YQ#oXEY{Ej}6d@X774OM%;J;>c zhWaPL^lQEX?@ZTqx$^VmJ68+x<)B1;C>ijQ)d4z{WegO%e$~N|#&PKIA zO1y2nG~NRWm!W(9NK!YI_jYj&f^ClSB-N}alFk^BpCnp&onu~{EwTUd2k+g4(P>)a zqHp%jp+SdbVqk2ZS;2dB&NtJ8j#qWu&u}ke8s?E{M{{gupJIR|4yuu3WgD`e_edxQ zez(#Svc zTkRE(^NwGyJW>8V@C`kPmY;N$Oi#YWkKPz-68!JfNz}DV^L5Sl3NA1r_s=FDJZbm1 ztE*!tw)!>Q`d?@t+!WU=t{tKo;EPJV8An26kw-R%9y>wqT9_tyzhwivSr$;+H`G|d z+gn+cLOwhtWBGo`&`xnz@tS>weG))w;=RDGA2rGiuA0AZRv7Xba;;7tdG)n`DH&AY zI>c0E1i~}wBAHeZE7$Q(ws!~~x%NlD0zXY@VD)XUkLv343M9U!Lj60zMEoI`;{PC+ z3XHQLZSYsq4jYl`%wau!z@OxP(FIK~GiH28uaGCspvu3x7SHXD{K%KzH0K_@@zvdh}i=-wXVNt@_t26e=QN+ zc`~c#L*+_$hcUZTxy9V0eFwcf5s_HuSsvsq;Ey2gN>QleLFsU!wBIx9Q7DfQo8kS! zwbvynl+)ChQNen)p7!MSRicm^&Mg1031+#plFU%HIIE^rCXkQl+w^~fV56ZL-g$uTMoM`$Jn*MSRH*1c|5COPjz5aM|3hLubWXcBfJ~ZVNSpM z3y_*5#~pcW+0l$-$WDbitL}lVVV{(8KqVY|_s6f^Z!yE4vH!kplVJ0_`)~FMcz>92 z+cc8Rz>gFKmy#EsQc>Ds`qvH$-i#0LQf`EMuXI5T$f-5MhghIp!7U-xQDn0UR_OXU z*>qUx#?Nt(o^^?`S#koQeH&+)V6V0W$(MJ`7j$880_v;6Er4P23a-iT<{rLwC=8%B z&&G3^d$DDE4Ja+FT{a+N7q7NUwzXZ3w}eIrSGBbLj^e)W0_=52!qmllE-h`C-Uyl? zSM!sNpyx?HeSu%GRhEQGhRZp45HR2lehkg9%+vMCcP*eL(Lgh`vY(JIKaIUWv*E`8 zW}4(4ty{T-Z-gUw`?=)&boPT8y23n>3bU{Ws7T z(C3jZ9cR8(Mq+ghFZlj9!GwC{;(N~8^X$RT%o4EqXPI;C$L5D|M);U-m5Y!HAq{>6JnpaQN89VN!$ANBeM;Rf z`gYzYo7K^EPnSu$?0QGj);*qKOX#(@Xm>>C=lJTyo-%oU&}OxD7p#r0o0d6e?LwTX z?zl5yCH^#FrRFWNOc%+it-3+_snPrBaGY{T-<|jonG?%-9q-YDzR{$&9HD)-`8@KK z?^$@-B7yBo`kpaaAQJBT>@*!&E?4E-rgOVAOnP8%uylfl=^hS0sg>-yt=)}R=4$dZ z-f>Si%6CL(K95_^cN^WG-^sU4IEaB~n3NY4m7s-W1AHgdep%66gPIgN+JmPC9;ABy zg`F(*RW#20U9ZgJS*cC?x(raEV)=y)I9;2#kVi==q!Xowv3He#bOD^+0ijN$f6UO%>^wGNyEH@@5C;9nttNs;~-Tk7| z9n^?-yM+e{8IEgEkZ)+$y&nq4l zk%vJ_wkz2Ft6Zb(PrIag=8ff>^UtS;EB{OImaEXI%v3=!Ksq0;%!s>5X}6+W>@1Mf~i(!U;l3eb57L&hyEV~ z^NL#C=)WYGw1TRU>^}rEIMw$3mRaQXFEx4055biBSAr?3jNyrht)XuD_f3>mqp>vn zV2@IUk&82PZLN3YN)hWJmr5N^vxAeky zr3LARwVdmFi+gi9DmuTX1orUOZH+1WUwuBo{UU36Id`Ec+c)Z zt+%WX1ufkse4XFCg|yMhlb=oI*>d#RUg@P7MdL(J9ZgMA3R2~1((GV`ENJG+rDs!a z={aR9YOC}4=-KDn@jz17aG*bo=>mR*WIY;pyocy*Zgn!B&)bf#n|yEM9Ux45Pq`N^ zQ|}C)aCXj>Bf}1$WKkV(P?kZ2GfSmlmNuE|&Zhnms!S zmlDJu5 zxQmJ*MICG%vQ|einBmzoC*s}ldnVSVUiY*nc2lpRJR~~iW!=mJeS$q~k}f!S4@}7t z7-!&lQCbwm#v+-9{nL1sjE_4RaX1)t`&l+Il9pE8;l_Ht$t_vbBs|mzchtap%c=$J zpM5z4%DQNN2jLYf0}?z_Ya-gkfvWY;Hc>N5Z6Y0|1W7Yeq?U1^ z-{j8O!W$G8-Lu?otDCy7dy}{oiXj=zJdIzsA34wX!B08XZ{@9I-+R$jujF^rN82Oc z%@*Et-$8?3*hV^@c&vPS2a5U5seF%nyn4WhwW>QY^JoHb_SlvUc++bL>d|Av63K

Efh==!;rQofkU;IQ%?sij0AD(v-Y7i9*@w!Pb*HtwvZC^ZC`Mj)& zR?+MG>;ZV3jW($$TUT*(IL6cOI4E~%iZZwb7nxeg0dC#GE8ItEx0?Gz$C!$G|?DZ#ugV-*m4bw?LL<(qi9wI7iwaq$CZ&xt*Wd zM&i+TGTy|{7gEWgGZM+BMTJ27Hdi50GFRP`#K6`;bajwEDtKSkVHoaDr2bI0>#&zi zg|=(L*TC2wTKM}NpZfaVG}qV})}87Ci(0WSJ=~_C5oq`e7U$*ETFavDGaL)L zvLsHKpFqdfNH(cRYe6b0L$xIAOYQXf5vwZJUl1Ingl1KJW(Tm?;Bqo!e=uP;XO3O5 zk9`jBUn{Z@I7zW9ybH%NvU$;6P7jfUD=N1>@Vk?~wbOJ;WYL zENet+#Q1Z^7z09F1);tF#2257fYI!+eV5}D)?F|7a4WtD_m@;1VUjn4W|ArMZm;0S zQ;Yk;h9c4`sHzM=wr;tLkQV)(xstTk6|HJuW6t7aqqaBMb}J2eWF3F@+VU zNf?VZEjj|mlWPUSkwz^vnKhSDj0XVjfxs$mi1*fEv1WXrqyjP$Ju55D!2`vmN-u_KB3%^z{l=jkzgkF z#v~N@9xpu0=441y&JX-j<|i^{0ZERepV;fe7xn4GUg@9C9uZ@y_UFw_C9qs82wZT_ z4NZeK?g6l1cr!5!C-!bde)@0D5R4>x8PhlGG&m%8TtEu%GE5B}r_mG#IyW+Uvp#GQ zLx(i?p_dPz?GZZ=(bNi}SEiU2$LAGHrnTplwRH2lrfZEZ^NuYPozyY>lCx9C{$d%Y zOs-)lasIi}>YIyG_4mh_WU!&-^`Fnrh>5w5>vMxi99kZ%S?zhbP&9bf zEjQw&+3~5aKiU2EQmAg-es6)2HEafZinAU#ys7-FbM?-~?9~)Z80_0)Si%f+)nReU z?A4_a!U%%j=ZqQS5INb-~t0N-7 z>HQ-dU9)P1m3$F_=5%4K>2BovdjUd*_Kq8LIlAu^^_yI1l@elX&#w3*%G&p~32ikn zTZOuI?ouAcj1Ggv-nwR(-n&PWJy?D`s+VvF8d&e11z+Q=+M8|HUzuB(zV@SMc6t)l z+PZS_o37{W-sIrYqNxWMIx)n;P+fl<13}z0^vLW@f)n@S8XM$7r9*}0%SS0#6puDWr6te1R*&%HGQxwf-+wDlCiGTSA z7mfa>He}2G;e4p6f=!vzK?<)QG9{wxQ12^Ux+6n{n(-zjf46VwsC<}8E!ZcxH+%JKiX~nB@`O%ZlA89Ilji<*S6Oj$s96E%O09YPd9Hx&YHDs+AS9w z9lG9@IiojI>4#fiTrStV%|uh`vJ(~45#;{BzjnC#ah2D{OX^*A{J`Mvr0c;XiG=Er zk;2`msN+UZVW7%{D46@o|1h>e`ZI)-LE#if@TTm;nT`Oo6m4WH)=XJhDIrg%k4a_c z+U*X)UW|2@Crz|8-!UIX#0)!bg9ZVZ_nS(j9O1`BVJV`oOs)d zUr&Fxx70A8t8d|-RRm^N2Mbi>i}*lasNMCgBG>3v6~46`VMOMOFu_)@CcLjr<$RGO zRt!KmM7=PX2xAW23+-GnNV)L+s|d z28awX=3+OfX~BJ_7M`SUbKrtEH0F&mj>}b|HO9Oq&QHwNKu4wCPl3&v?diy7Yf}ET z%tHC}xbM+=e#7?Etw2 zzT|M%ZO3)lvR~I0tGi+b^7Gp3@I%Kzw~IJ$0}+tJBf5nmS4UbaQc|z$`qLEuGf_`< zPD@`i)6foO87!>KK!)_{t%3Vj%7?>VBO^EaFiV&rq^=W_J|6gd921Z5m|XT3@{rfV zofZ_AGOekpA`U@7w?6AE5e#*x zA~JQ71O^n4TlTB%p&^N4Ko;qG7!haU`i}gJQ&F;oNeidTO&VjJFf`e8Yg{mUskX7n z|Lg;X7 zM?E%wDpyr9kCdb{0)5Kjph@jXM&GxD^D)##?E!u#+}&Or@?k+vA+ZzIynES^q}?KR zqT6=}A3ld$ZIw(}nMI^5mTcv4c0aSZUcGENTVGBJaa6+wO3U% z6;v52WDM_b`VROH90gx|;+hrdnE!M|+~m^5H*z&DZ#F(k@r0ZyTc0}9dAg>bT0;ie z>a@I#82bd1eD4Fli@IKSxEzO)Tcyc+o*Qddrv{EYp4s8}0yppK?y;6QYRvo}$J#=q`qb6j7fEX?;_>P)h)SVUC@+^$E7r*Njz z+%j`LWg#m3^%Af$m#@r2%ah=FFE$Waa0q5jRsch%0X>Kg7WpOR73r# z6JkD5Al@)cIruj6OlcX6v@x{+M1UQ}Fq&(_ZX&6dD@}5>#GJCzkf5*tIP`Oq}`rvJ9hJ8r|aux`|wh8=mP%XYA87iDvwN5o$_FP{F^gqR5-@a3P>^(#(bkbl@u^CiUjFO znRsuihPDaX%I`u&Kq?0xRVJqQEk2Kun>zItq7wHa|0(F2Btw8Dh*7DP$b;U5{xh{S zvGBkONV@VM^}i8nfA@Oh$FkJw3|@b`fST9;Cgu989bP{*Rb6IP;xa)89kaM*X?gj{ zF~iy1s1_&51QRSlxDi(yj8kL^#MI|?12|fesSL1}U$9rI3LzFWjE-L?fraQA&F(8p zvO)>Cd>;Y!hqqh zgDYqJY!ZkhTN^)kt~rIFWWv-by4G4itEZ~3@286(yP+%Y3#yGIM2-_pW*q;GmOT4~ ztWyInMq|WZ5pEW167WYpoFUxEpJ!(|X0;7=-_k3SE4A(fRDSv$c$oYT`#SDKS89!f z7LIONxMTYu50cD5l|qb0KIL+AP1A)3lDJAqJn2SjlQ(9yh(kNI`iHlNdcI`#*g$ zqXv(uOo-x~gOZgGkX<^VPD+*8QE5cU5E0U~Xk({hUlL2^G<-NPWM&26$GVbN+0wV} zuF5O@f}P)IG`O%@XE2WabAM}ek|O+QCCEF<;xnzQxM4ftOBkDF*Kt+vkv z+pnv{v)vYbPlU3TUOR|@0~)lyfiOvl55&m~Ad6&A6^W|E3xy@8FkWTdxUb48Lz$D) z#*6DsFsYNkyx4)MbISVnwY;03=~O6NJN>9tP=Iz$N-|7r`0ertL8VNoxJCBMC(vv4 zdgNWb%#DS{C9J6|Dx*(G)AhJ(a*Q)PX71>mzqZe@s+7Zx7{5=}s$;#n%lb+mcPgDp zMgIWGq2`dZO?N$Mb1YWdbv#~OXL%ftS1V#>+O$7mvHoS$Z+`JT+;iFF=od)@PVEI+@UV_jWY z0he~psZy*GP5T>D#}r-T+|r9BJhsQyNMZVlj{Y7^bSW~9RG1zB`z613xK@WZDd|iC zsT`rq){t^;sJzrAV>0R{Qfk7PQ!f_=D=jbfJ7*{l&Kb(IS%wL|-L9e+nXu}!5Ybfe z(|s9D=|k{m{gBnDq)CCli<8s(kz9l<_RO}x@vzsT=l<2=v|$OYs$O$t#r^~jGG7kS z2=nY!%eP%?$evf5%7Is>^$F1hLbT&JXo|2F2In{O8!c9RXhl{n@z90D*&u%5AIPlpY<|(#76vDwv}y0UF{ZK1N<}d8!Ke)s5}QbQdwH zV(j=*MyfGe(#^Y$vrvPl`y?W;i5+N}%lf3~)N~1!ElDhe;if&h*-tqsZ3=B%$jsek z6xVaNdCj8)b$A~G(Ysq|VT|~$)K9!?6`Q|N&eS=0ki8^*3`>G5SDbQ-o3a^GzKTW_ z33Pz4-oR2AI9||&>k{gh$`znX04MJ71nVs*{ESlw8%_nZG7ecB0^T+1hv&iEv4MyR zTwf$i3NpGA2_eE?Sa%xpFE&IE?_E=b7q!4bVb}X9VrFR-eH2p<%;d8z5HB(T&{f-&5x0Drt4Y4-qW5xw)pVLE*CKLZw!=I!l|cOc z5da860TOmis+oBEQn}dqJ+5??jpZxx`k7e6af2!JzEfJR>c{%Br#}S&U@$rd;B&4ruW#8E2W)hN$|GZBr@!!7r@r}+8 zF!Bwb1V~UVvf>{kZ%0n>lJgN*gOD;O6C?su$j^Gs4chpk9TN;T6shHlF^*`*(+ao& zVFQ!{nlmu03*ZZG1J>fF*~iZNMwANB;=dmJu+39riO^KIt8jQH6`LagMTbxxm_BwglA_6?3sYmbJxb zb9nD<&XeIP@J0S;Xf;Lm(G6lDVYX%Su+O2z7}v-9j(m*rgUNQshb|e<^4(`t;;i|8)odZBy_6?iK&FI>e_e zy)zFcdpMB02(n ztR4ZB9lO8yJ3LH*9twbeuNlG)2*A%6e!@K@-G6pfw*Q~2GO_$(WcpuY_#6xj9E|_^ zG%h^dy%I&1uI{U|f1^-43QP!n|`orQElsoDAuqlISVm4DJebf z%M0P15U%9Zz0#p`^YcsyJO(EE87AD-Lyxh}mRz!tLD}SDvJrymQR7kWx_f9YUB)!? zX~BD=t`T(;KfHC`J5N;$WwOH98=y8hpHM%t?+HCK)D+&L?I}11y*9?9 zBj?zYiKW@^_>SObndMeKClj8xnOGoi9^sf8@{OM3-WXie*s8oy5+Co$5V+J7W=vUE z>Yw62W>>jewq5e@S7L774wouXxCkE3;7`1tF-}kL!uoCET&N+sUdkM-Y1@~P8b9I(2(0tgrAG`I-k6 z&YOewedj%b$0wBRg0JqKFpv)s1)nVRDK*o?6GZqsCLOa&Htn4ZmAm4PXD_!wx2i1bW+oJQ(~qGz9-l^sITx)tY(Bs}HM_n{ zzV6je2~TCWZYTIdN{{BEjs;SmA8&_I#=du-$*gDLjt(1HV0=dy3?2b$L9Aw{?29RF6t%Z)72Br#PRj z^sRPl3$C+PX*OBSa(AoGx2}*e%qqam&#)*9z?1e#ia(nqYhKQMs#J0f;9l1o412RQ zw*;e23A;L~_H1=$KT(W}*Uc~vTO^%V1(GkCrct89W15;v-0G4$+^LmN&(9^i?BgL* zG`AnRBX8c?a$&!DXBsxiJ(H1f(z1l}tzPU+r}|Z_L`;+N%wiTBX^uQXUBG_QCJ7gk zy}e`|H*t!j^KR2Kw8hY!_lj6WD+Sy-*Imvr(KMC|U2M}dq78IQ8mBWXoFxm2?x`nK z&XqA*mH0-vBzZ5xZtaquj$8u`sgx{s ztW+g)J5T>x*fB3rqTg!QHfENF^3c|Nc3dc3%11a=)jK&#s70vMT!^JdAsK-x7OJfh+ zB>!a-^FnE^izOU9Qw2IXP30biI(lF)Im^kSZz6~>#SAQvh3*`$e!Y}U!D}7@X~g5# z{N!eu!FPC{8}*YkkzDBUK$=5-)tG^A zn_e3?!QTlQSJ34oaRtjFvqn`_6Za6mRPpm+;VHTYljL@$X+@H$;f1p1!E3LVExgCL0k-r zX)B%j(pNoa&DS_pIj;O0ZF(Q*2UV0^3G+#$T9Y~+5GANNRMj+?=_iL-6!A~gJ#MOZ zZLLZhSd%G<>dCg$k;&%RF*p9mR#fN`(kRd7n>z5t4f@J*HzDhE(yqLKa@RlKXu1zL zVGoVj6dvWoJh1bhHrbkjvR^eTu7>MytgbC~uxGT7^xC#{&bfY!J~1r+C%L*wSK5{tV^d&44#r@g%|$F|<8WYuMLjgw!+$#{vzfTN-Jx4z zZ)%-vo0nzBkeuEyRt&xvi)tb=PG^X)VEKU}gACj87=lZk;9XUwtV0W7Dno-=WX^S{7 zu}PoC(DJobwsQwZFz|Tkb@CTWJ}V%Z7oH$Xyn71oG6SGB{;(!^m%(P|^;#Mi38TTc zh!wG8vx(_0WZ|9`zqc;6MWMFDa$wM)?FIpJPjQNe+IGKW$a$6{#F{mBiLf}Fr%?_BLgKxfWViuNkw-Oe=pY_ho-*mA^ zD$pGHL>1du3LzsftHUB432&Q7!*<7S9D{dtD=d0mC=zVGxI4RfF{^M9j?N?JUxsaD z`l1A$rzaP+8-6G3X|Twil#WtJF76&-Sb%yFrM!n?in~0KaL^^`tlc==CRd$k8dG^B zE>K~U8|TPSIV-q9PxJEk9!Z+!;VKGrIb|Csj*K^|53-1vpe94Lc;)WEBjsH(&?o1Y zawDX!?i=W{om#mkI|r*_6^5%s`r_X#vJ+wuZ{buMsP=&@(PM$-J)~&H6W4inMlbi> z-(LNIVdKSQZBHSBQG8+;El9LX=1_e%C|P@sv*1y?tqMRs@nY(WB7l9Ntq190L8~IX z)aCjDaHGxnZGw$mKw?It97G`wiik2aJITuNryAwn$@C&tXSB%Bty&XgVjbX`CJt^g z#OhWH>*!XySJZ)ZX-0!2i(y3Ro#DTTC}mmO(&#Hm#ArC^9U3Y|uA$b&d28ykX?zSa z^(7%4iFn$CiH6Kwi7tH8{|>6nb_o}{j(8;KXvOlu<sx4L#N2H}vhDHieg zuj#8c?*#L)7%9Ve%hE9E)8B1Ko%VsuJCK5RRJ9gf0BkzD`5-H9l*Nr|QA@`E#i9=> zgClgW^nydVfaTe#mb7}v8`rZTrUTwF0=x33cVp;FpQuH4W?+$x59}*#)y+m&QvIzZ z#KD1c7;&;{8fJEkl$ZPjhQ7~~WI<*MzEsqFLSG-rsL|*toyAEfk{m%3Xoz9MuH-kX zyB{p+g!=xMqQ&m9zwC2dK(au9NINkSd_PoJBVrQ@-*zV5UH|8(D~*&u@j}PttCW14 zKfx@Ct7^4zaRk9$)GPCE2Y6&Ivzja(>CSN-ix!Fw#9Cgf=%NVSwNpADy3y}(CM*h1pC z5Ksl75H+&nee5j6@_Wf?4L1_{m(Y05??io=FztcKouleF6Nd?db>RVg_lg_-NZHjZ z)2I}6#4f)oaqH5V<|o&+iI7qW73t8kcAajONfKVlzECXk-D^c=SSZ9xxRY*$<>=B6 zOec`?MoD8hcbp={biJC*UR&ke^qk@`FuG9!GB_xmm2f4FDep{eB;D*1wH8V7yV~Li z??S@Iym+5d1qtOKY7Rydbv@{0oJ^Iv@HCRV7&~a12<~EI?;8exn;!J`&x^+?40hW) zON^y&49!|ZERvDi)+a<f0tZZe?g;vx-<;15(7_j7sUaCt6Yv?W3#EJn;J&1U@S$P zs4a?x?91J#oo*{g3#hev=nGZu>Z<2-4uU`1!vAL%Y!!m8QH1Tb3lp z_{6m%*kwq)!>hothb*GvIbWYsY4ny9!SWg)N;@L+dIE3H&IUwF>57l`kJFx$4$`B8)vYSM~%eu1RBF%avgfg!JaolX=5S z{^83N_C*|gd%U78{!Y{>w@D^n3o6nWE`k?sPqG&=&f4|WyAAI=O0OeR#!M2y(nTf0ncSdTQ zu!^*OZumikPXt{-HD^%m-Z?4;FXXnrd$L7c&hXPG%9YvF9ogJ8ysB`x)|>nkYY2Ps z1{2KdjAE-#p%v!k6nRf*X&EtzzboftpuH>_DoY=~U`?(At4SBd+6&7g{qh-PrCZ9+ zFh0DwGKXZ#U{m66{TH3R_yl=(?EUS$&;>SSuZOswHy_fmns3C)cy|iu$g~CEQfRzS z^dVMrgW7ktaZ)`lNuYgtSiSz*jD>w@dPql-W2?Glgto9`;qRCol3DpV zykf-TadnIm*C8Cp-iqt|nD7I1!!Yz&xgit8&}!&oIL56A_IEhLo-ECoWNPD${{ehJ zgTE{xojHa+9erd>{2=sS=4dPwd4-vdzQ$bo;%{IYJD4+61KK7&pBc}M6KoG=4k5HzKXI@=)GwR8+cwzkR7Vw0=CV3T-x)MvbSR z`W6-JyN0nXMSBcaXcqn3Kn!J$aFw2lm86YkyMpy%F^;Gs<`OH#IN|}~I^t$IZXjlI zkCp1j=%F1)ckKjuDW*UAjAu}YrP_O3uY&V^^xYgsJYkpXiLt~+Vij?_99KbKkw#yY zhUCh#5qwDAh^0jp+NIm`fhVn_u8MM<-mzavsaF7$?u70?UaN zcKM))N1~0->ML!UKw6`E1oIgW3-ly(6*izxL4h_CS;k17IpdFv8HLzwuE1pDVYJtC zaW~`EluPATzK<;CLU%CtnLz!%%W^W&irCEd8Rkx35~t`(9w)6m@0=*VCf;KIRd#td z^Q?22u1(=t|C#TA+mUEYMkj3s+*&cwnK{{iXrKR7{?{N+b7C$1k&s8oc_z%OkVne0 ziT)-c%S7fRLXMNH3z_;;4k620G}D)2qL4$s9jVMWMrf;ej(J$G^+7u=5tG%&_%5yB z{`qL8jYK)uU#|@(Z=H}R#;GUKLA{avLXKOQA775eS|tkAP1M0owo|#sWvriNIgq*X zX!7#kKnC%4(GuWSyJIKOR~w620{R&QB6W#w$Rp+xU5LR%PvS~q2H_)y5dYWKp?{yt zJfsJ~{Jg#;+Y5-=aQ!Yqm1XVNXGiX%v07d&+CXKW=rN;|Kzwgm`mNqF>^88m>7CjO%MHD zzB8D^8beUY*gBE&4Kcc6ntl))$X92^_8!`6jOD#B+wmKe8H0FdHgnx6GAC`XzlPhH z_jeP}m*X;XG55NO`uYU5^pjJx>7hwRDQb-y(Zt-v81gJ8*kvwrSXmmWs3H6|YDB*P z^A>@CV>!otg5pSNe$IY@bM|`YV2O3aTh81_`bMmAByw&d%A#vnZo&fnUd+&0C;l8M zjaDpg#6q)*@69S)YfM0)V+i(}Be9$q8{tD+q73Aj=U&iWBIQ_SW@5T51&VOP1tsB7 zupsJQ@}RJNn)_LNQ=Vo{#4>7hxNW>k`QODv8#RuO9N!W99B;FHJ1n!5ziC+BNNIio zi&$WO#GK$+6tTQtloH4JCTxr|Sm9`kon|jQMEC{Gv7U1U|0gBCVVzS~jszR^Qil>z z8?b$Fwe8c8Ro7)7Rk%#`oKr@AF63kIn zscCpr@5*r-=}Ye;Jz8QJW!xpf^@Kf2oBRXs!5^^RY>ih0jBAPB)Jc69(VvH5s$oRv z#<7dej=kX5K^DYWBs*62X-a**GbqvEv#cNj;)GDoSIST3{^0 z@5806M`%f6O}#&09K@RfO-^AoF+e}fI7b+Vco&nHJ#_| zK8bAgUU=2D=&1jd^*fMF+w}5Wy!s<@yqG(ean!3Ff?tcFKl_+(=zMfEmvEo{h!=J3 z8}8pc^o`-6&pXJN5M)U|sGnd=jbZyu`ot)rX=t>uk@S%mWWI(gjSq-2)X>Kd5~b0O zeM1?iU*H?>dh9S1Orwu1GrEU9*TwHYo<@wmh%q{s@%b^9_c2fTp5=_tf03_Fw2dj0 zrB*#2^6TZS*C1%_Mgre133@tx>tdGUIpg`};D7DHOJ5w!<9W&!$|r zPCrchdY5DR6JyEGcJfJ?^uDy4YRb|ISLp?qqIY3G<kh_Xf#w1N(xsm7nOhj?zzFK|gtneli&PoNt3t zqZ$3A@Qd%$E@MbfX1#=1#Wy1F6?4rg>i2x-bflmBnDsLVI%d%pd(x)2&~CqD`8LPr zpslXcPfo@n<8soDAdx&?$uXVuSK!b)qg{hMt)&ldCgtJ&LKfo_-b2bGWFe2uBC_aT zk%te$@=BRF&S-1PGX;IkJ9!T&3-kIp%r}~H-8$;0jQ6IQ{wA@V@7c?E2k9&HqvVVE zzWNYm>c=SWD)P{VW7hKiCh{Iq9%DK0-S?z7;W@m`Ijz{f4GCr(rWqqcZ$)?<#_1?x9Ba8gs z%D2W}+1@2+p)-v8i1KjUIbt_uJj?MPa@}#nWVAL!KJo>}v}OA+-}8TAxd;i48t!|N zdhgG7+${3{0mjKSI-ymR_`6zn*8PZa_*u3AqE~T^1lC_enJH+GqL)co^_RKMQS$#g z^7|mikRR#?<{Y-4Byy3%JPUd=@;{IK59ZtaBg)`qu4;sS(5MUjO7is@%jIxJm2z%p zu3yCWoP+#NraW9vUm<_*(AjLtej;ij$E3iZ{eX6uU_6bXW*^#C0K<)JzKL>>#$30O zHr&$K#k+VC@lguLbR*^=nKn3pxpy-2&|>zB-zD^=pC8~jhyg}CZQ~&A{8PS9&!LC< z58A;g-t+#bP%9aGz&qhUU$qDNtK>ngV~*FIdygS6!zj}`%(*)tnYL4*e$Cv$hk@!c z-urC&kPmUW*^Fx!AWm@I*@79Mg-Y!rXB_b(Mt{`g63yZs@}|N12hzJ8PkoaeBOdGxazb zBh()mi%*7rq+N|rzr+Z~sN&=;z+W)%1T!oRiIbvzd8{ese4D ze+~U@4sx0A4K=6ouD*t1a}9=y(x~EDPiJ`+@w~U4ct1N)-<{|yIz`PvhPjS&9-!{M zERV3P#z?9EZ+Xu@p#G;|0N>{W4BlC@AJ=?<=QaZi^sAUl45rRAk;nX`g1)q?KAmkZ zQq{ZBR^3dW{3W`ncVdKjoWAZe!o!?(HSL-{TwBaM;dY+a!;ByA$h+FgTuIswh}PG! z%tk8jRh+&Dhv`EW^WAfpXMC7vb(rsR@i)%HYPLY=xW0+>H*uIU9OfJTF#D?XX?A%V z`(8zX{M%YP>|^fO#xWJ`nco`BGuzV7{SL3n-<9LVfh<%jj0OiRd&pyiY0=8+7z|Yc8pX1k}>C+dHz7^Zl0)f!0JVRMGKfpFY zrymyMw~0BtAKMs*)72k%K3j1o??qel8g!t(V)Qnl_qp~+Bbs;XeR$|!E9gT#%%l8z zG0PX&9tV#)mDmyT^A32laTsaNhKFw;5B*F9`5hz6?HnIXAK4Cxw8^E+1vffA=9_ah z{kxC4e3oT*^1YaA9AHd2D&tDAwgTz;Lwr*VDY$3lr*gnX$k8%x# z^1Q%uGe$Zb+zae~mi?)e=UMstA&)+h@)S{?jg)68Hbxavo^Qy)KEe{>Mvoj z`W7D4kMj=JAXz_$-TDADVeVHf-mi?~O~`+(c7%TMJJK9%Zw{R>6Il<0PMNEbXNupA z*HPvZ^oOx9^*b2b29UM`73S9*|0@0OtJqFd603>9#C^m<;s#;{QN*)dsqI7$+Cz87 zuED%JqxEY^Z%sQ)$7sqjm-Wcsdd2S?XA|OYqZ5b+i0g@2g!sGhWS-$lVh>S8tRVz# zKXJX?o=q%ZEVPLI#3tfVVk+?x@q6MnVk5DJezlwU{l0nw-}$r9H1c=ANEvxIs~u6J z)P)u`ly;sN$v-0TyCD`v{IMNpgbx$`EaC?u_a|a^e3zxEn=qEKwYgS-p*$0>Hh{iv zGJXH=u%6gMtRc1#6Ntx&n}{96O1+FZ;T!mU1lkNdPINZ5)3yZe!J6UUO1%rS)D@Iz7vBPFG0{;* z|LWlR9^!Zn0nS~e9mFi{@AzN5n+JGRMf$kEQ}0daQbKPbAl@K^L@*1Q1T{!+QbZ6b z0-=hDGyxGsx`2vEaY0uF5fy?cxQbXo7ZBU3xFQ0g3n;kjf(1DLcjlfGZZ4p1`Tg(n zyyu&lGc#xUeBV8D##?n5FTW7BOd7iXl4f>)#?Uf}pugq?^|3cmo<5XE)raS+x~Q_M z`lz}PC#k3|NpiQY2YS7#6Z5B~uFGI?-9tQ|dbqzx8}jJxT#4V2_w45-Ogl}r!*aLv zIQ997wfKlEHeZ(y?2pln7g6tDaQDU5e}((19z&%Ha;?)urdUS^Yl8m^Dd~2?Jq9^U z`npSH3Sm>NJ%l~Lo;#m?>J;uPq`;kpf34hOH8&Eh=B#yJQEmtgB2W4jn|`T+^*`*4 zlveg0nS<@#%BcY+w2*nOC9Sa6T48ew>rN~CCTSH)WL+ysev62oN<1Z7ac>0edKmxP z@}|>Vda<|laqgrH9(Kb&B?URvR%=kAOywC<*~6wXcS%q@NZV3sV84aYm0QuC zt(;Qms{@eDB*ncB*@gCRi!NIZcXKJvxXE^Jq%IB6z4lR$lY}op-m24=*Y#^foHW*0 z>f(--JDfKumn{!E-KfW8bipl*!?);%Fm-FmI`$s-%h9)UbUzl@t0_||@s<#;J8P1v z&$W`qIO#ySCR$$-r!@V)j4~#mFZJ?Hxjk@CmPyz=Q|$UY=O*fRxzs{morDfGJ5*ZI zf;mvsZm-D_*aQn;HFSqJ;6d2vhfhZTe=-1F?pbK+R>fXalwz*$lO^aUkGY+ZcS0#R zjDM;uu~MOyT){k8!aP`lzPrSo0Bz(k)_|z|nsV%yN0{f=y4NyazK~|&x2Z37wX*=~ zvG47s9Q_y<{mEwp@pqALeYqVQakw*xdhM5~=3gjFMag5{=Y>wv1_h8o{LxZC+QrP@ zspw4eD1SR=2w^28J2X=|uy3_cZu?G|QdFNX?3C+ueR#gAiz=(CkFLw#rCv}MXPi8s z?xA}xQFUUUzgE?S^i@LL85`6ibeHsT7swFjRauPQdX%}+(5Wkn?3-n&b&50v*zP^$ z8S+2sbfs)H^n0qKjFn5--=qf0tWAF897b z=ibAb_#FG?dY{W87d3o5HW7N0iNY`L~hwI4--M_xiqBow2K)3cd}+rK?e1i0!ztH)raS+x~Q_M`lz~4 z#;QSGu;II_dn!&*ou-hM`Z(W9*O0~9PF+IXh_gVhp?&6H$3B4VHIucWs#Be^b(J~x zJpAf^m8tR^cI=bb1Tz_15$7*RVGceccj@}9#}0iI_fpcOk*+5?S6I>*cXOBzb==Qz zpCMjn?iC=vW`3-d40jpsbXm(dz9N_dLAzN>-<>5AnvbsVJKXA=fWi?g!%4B8!e$bM z3KKc?7uc@AMibUFekb37w?%%)ps!V&g|J@TSMOom-ui!$v+tl@pbc8dGx|MX4QX2J zo#>f3)Vs}V(5W6`?k_>-%wx?NEltA{rD@`H?Dy!o=yuGPcGwc5aJST?vbSC$x#p*G z5Z&gWl?MIfApS=98{uz+zmfHjJZJrYO|=hweXl%-KL>vf{v7-{*dGV66ArS@9<;M? zZzat^_LS0)C5`-dN|UXM&?owS2`-k0Z`(5DvP90V}5A|N{+;|<&eTSyP z{r70!OETlImTO3|TNCO@GVPn}J}GtGZBjQhM(T#^O5GAWq^|v{+}0RPst*g?}7!x8#-0*8gLU4&oJybL-hSPNisG38RdKfm_9obtjZJHYP5Us%4*$ zr<2mKohp$2BFQV4CV5G{CC|z_J2p$_Ggj*;`wc%~rAOkAzn>L%U&Wv0dD=fZ@cZ`z z|1J0z;4k?1{pgIsJ|iVw5-Ih$NV#(74-5Sh|0evO;xBcsU#Iy!Vc(u7OwEs-?2RV! zA?C?W>?{+TtS9qBu^xVgt0W))4E!_j&roN4%|)@^A`D^h+ts;lHxxI(|58>rSSwU+$ zocGut1JpbIO_HI{COt2?us7UL2EodNri_)Olt1A0aRT*#QvafgJ{?*ZPYX+cS_CkLiPCW<6czrKQS1ngD-V}j9kZ+0u zwF7y+vp?bOGX8g+5sD$9XB6!BY4LYA1J4>$fmP~W!(1zG#ZhKi75Bl^Vh1r+3 z1#4E6;QI&|p74rH*U#9FEqLykocpnVi=OF5qJ8KV;s$J`fSY{oRxlS=D%~kS=|qZi z@;@Tag()ZfKM1`fH}t41QtQik&ycmaz?m`KcE(QU1*3}6-C!}SgEi56W;pIlR?UDQ z4|6bWd4&G=&)mUnKG8FH^L(~P38l(|3g=n$I0fs326u3N&zBi)g(&FMTc84AmqEHu zMhr;`t#@j-_p|ez41$&C)O)|r`OfUc5MIl?ER;p1+;i?t@a4k)Ql9Of;LKNiSZ^bKdX%s!CChN0v zYl87*{W*Fju!!h6z(vSKp(|+D5NlP(xHyVn{HpV#tgiv~A;!=l`j~aqy+|ghwJ-EB zd3}7gech*+kKA_#VW+Sb>hq^OhrzgCp-(FFybct)x&t2GPc`7gKEy~-; z=N{659YV(sVT)^dmQYEnR}`aus3hfy@@$OzxfpkGRNFO|&bqCF_mqZgb{a`Z{hl(H zHG6LK9i)0ssoqhlc)>eL`yLsf-%n0H`@Yg1AdS^~O7&jSZ7TiLJ4)t9Ki1BEI^Wai zJqKj1ox(c(xD2*Fk}=WuM$)tBz0s4*iAi#aeg}COHuwq|qTW+Fb=m7y%R|9?BTJnR zdjlJ`6n)gf`^deVJ#(1<-soMqiGI$pr%Rof_eM>F_kB)z%B;>xs`q`r=yL}8ot}E% zr{49cct!8}GN>o_T=m{Ic<+};JqJo1^?pyE`TnPraXZU!w~w@O8X09BWefC?GWPxY zf5ky|8uXKK_6w4YO*hC??@V8Xx2WfL#JdLFxtEO8@B6T^?GuDuf7rh(NPwp58CWT7Ld3;0fpsufsf844Oud17gjqa|eANxk7^S85H zDBOC*SYod;vdulLyLqe$k28<&kwSMQ>*t@OFdShGeMJgGz1dqbNt0=+GsB{=?n4j0 zPg=RJq5t`C|9X3!yd4nUZd6nMsj2@EV5Zd^*_`@kM5Xc@Z;P0(MzQQDp)6TrJkPxs z2=DFlAiM#W0(CXsM7}E$|Nlv-y)-XzJ9|JNM@HK(kY+F1AqQI~2Z;>_Vm~7jp-9R} z{r%J}>KiS4A@OdcTwSprx=MZjKe(1b|5!(<$5Clz9+d;o$QmU5;Yxckb9=G0vM!PX z(8xL^H$#q7AP+;1bv5BvOC$R=){@uc8qywA>EosKKJENI{)KYVsbkzgUI%r4@$v-n z1o0k~llBfdN!|xl{_)bTF9)HKxtaV*%SrQ1WJgtFFB_Uc8|vN?@Spw=UK2U>3p{t$ zfBI=y=YQk2<~;K0s5~=WeINC2u~a6+krC@RABv*B5sTrLV*Xthpt1B;xC!USULY3* zSl>wJ80^KX$PL*r-= z>o@yHvG1ZBXSpHPkKT7)*biDOoPOuWt|XO;7{xQTFpoB}Pi0CbYubb82@{-dkVW4= z!2LhL1AbeMkWT*hox!)ASHJ`QxSIeSAm9H+a$L-Jmy7-HE-S-8|2xaiaX0b5t(@)0 zc`W9e$p@m}OnU31oT)$!|B(d-iCbUz0@nz1y&-X{I+sWJ-2IbE=$ zZ5`gveoW7yvFyte?RMT8^pO*v&3HqDMlgy)Yk#gok8&_&XWzZj}k_GZR9GSqViqii`I21jvmyB_y;J=RWHMEJUho3%f?HQ-n40Vq-wcANU)dtqj=voIQmAtCk zpG4D{1=!=c`dJN&(i|lJ0M#e$WPCj5SraFyZ)tTKs4||Vzmn9;glyeDK01C3=-Iag zsP-vFeEsH-W=^zyVxiy1#G~pS%X$0qL*_e#`bDwtlZu)J{&)%KF6nl6?+DLM)qOJ! zdhl#@k1>osJ;ClT^`MD;3vpYp=G+45=$s?GKPueu=$$=TBb!PmbG(#bEv|$v+szrv zT5^N5u*S$>^A$-^>yA@JDp-G#F4ih+*lFz1Pf2pPJo$ByEcYSlrq+4Z9?@%cuqMY~ zeJ9<6{lImQKS&s|cy?B>#*=rBS;zZ9<*V~A-0-5q@>wE)~ILdw)e4S`0XD@P_GznL;d$e!R~14w;`CR8iDd=s(0F5E!_fCTNWd}E%IqUP;FTZ)edo}@es@T`kVGC zufX=Jp|JK!l0vt+YF8g!AM#Lf^gT6>T1M-y$K*GXZhr2)YZp*=bbp;D**j&em)_Q+ z=$eORm{W+|SQ9&>JAK@S@b4(+G3rz(S35m*cz3%FwiA6|eJhi#kG#hjw|VwN`Y^hO z*RUD$?keeMzrnNAzWqA)_mTE$`g<4YzGVH*#QstH?`^EtbJ?Q{q>}X+W9yLgg$dTb zq*r)^3`?lb+O(Ja?qMzQu*05ajYXf}Ipwup;P3s#h}Anf=y{c=$`t4k>KQ@a>Rzb2 z3=RE}IX;QHVJpV#EM|Xi4bQWRbdh0%EBxoF{8%H0vbPPjn~*>CC`w;kpUKlY2=`Q* zS})L6w1M@Yv}4a|Kwf3-*3ook3kliF^s{QHG-g?O%jziG%(>FQEFq8U{Kt^LkM5&2 zGVC1A)w_nWo(s9Z4%2Pv^L&aH5SyUP| z&Oc&pQRBXktW|SDuPftWwf^?9pS4+^-5hGK0_LMy!!$}yoa=q&E@Q5a^ZsQ2L9eCV z?1=O?Q@j~wcTjVCy_8^W$+H`%IZb)g8ckYsCv-LsEA`Cna15&B51~)};Ol&=eEn=X z_qrnA^lhKHQGM@pUqAd2pE16U_*^va(|i0p-t^N1d2aOmdwi6Cqt-8c-AzgN59~#M z^S*aGG56LmPg-H8PL*bmr=&enHrhk5>($&+35yH_?oWFa!++1&$Q_ov&pYs0YI^KRaOT>B6+okU}q8xE{+^?kxrHZQvSMhd* z$Kt=vTOLaF{uRE=+aE@w4;?1m4f(i7%91^44uXBrlhb^&p=d&}L{ z_&0d_)j0?EXTs(q(fXA>^jmR5&!8)A7D?FV?Mm26nSS(^he?}oz}ugo!Y}c5>2Isn zQ{OeX_j}8&{^}bbZ@;a=D-iZ1ZNHFx=^?pH>y_$zq%-7w1J7jCgsSp9G;#;c-ld-$ zm&N|F8JB{~!3Bxa)qK^X+-X zIPkwE)a3+|;`yT7=-&lKC?^$biu?8&t{UzW$Um7)WVQYevYQNaX6gS^F4eYiE;juKG9k18eM0?rFc4dHG^ER= z?$y}A*sdW5mJqg>{aWqe%0>?UbKEZ#-S>!RNn^*9#r6XdSt8}U?O25-(-K5jyDZNnZhObl3*#A<=)4HE> zo?>r$)cdpbu5aI=f4ZsIPj_KsydbUJGT3(A$;)7#e~R6p^wFCs+t=DwtD)w<^*(k) z8urpA^fP6bJfhicuGUb*W2Ov0#>wi}eL9sEDqODegw@sE{D^!vh*==+yT zqC%}p?(^t-kCJvB?f0>K(x(_e#CTZ2mD+jV_)S-&oB7g@g$UR5qGg8Zn* zP`ACR5B6nAt>c%Yj&0o1(uTfnZyk~L?l7t6J`(*e!nug{z#gTZ^{f-DFQW<1m$ufk zxje72bhMgFUG;8K+xI=ZRpu0LmDNb z-9~Twacr~s*wWQm6N3MiPRkHGTk7!4I@TGUeLd~H7Tf+S;=h0$URugC)@xgfX@?bZ zojRY&*h^9K!Y-rF77wEwL!B&1R`bzXNB`}X#?~Un)k@m_Q{)YBGxKs8ZGS@g8pq&k z;yz1wRmPZ-|IqZt78zuXmtIy+{7ayZq*@;`PHvEz<}qmxX;ypEjFxWn>*d(qea-JQ z9nD9jt@(g7Gfzs6@fu^X3Twt^^m|)KCC*!#-THtBwnGU^*e^KSBK7mZgGCrn@aaop+Ze<5#+S|7~W-rwCl-jDW^ zFxh+08tHv!b@29BYq1YL_x@(RsL#NLtpe7gJ#w*oQc}!ml4P!u`s@oO>=hEm*7(`~ zZ!=H*SLC#!-~Io<{QtXhivG`1|694<483-$|DpW<1oeCyum6MVq1Gk67B7{4%Dz>$ zv^mQ=qW@Ez&)8}&SD8;ym-lI(Cdd_%Z5)wy#!e~CT;}W90q5bkuD*SI>iv^iNyW-i-G?<}&GFoM0bS?VeBFQ+Q4@X<=2CEZVe+ z`HFO~x=07}FuWjF^2}jY8_Ly2I_d92X@B!}Nj0}JCc>;eiy3G1h4GavB(H_Wo012u zwLC!iz$}gKURo0EQ8LM=Kw;b|)69m_99n93d&XBo;x?2~W*Q{WHnn6t45Gbj#$pUV z^NabRTx=!q?9Gy`>ScZ-^;nk@tqjI*Jg4HwU_PCaN>CmuK$0edHaR8sIb?XAb;>&v z!)Z80_$e*V@{1;#e|i5Iv0SJe#mf>cN9A+S<&f&}JImL(&mZDZRz+ApX4{y5t|7wpHPa>SRVSUDK~>opssDRW@3 zWw2J^Hb*k|jxk;VT{K6HU2CDHxw%|SV~XUP!)30iz6189HBGD1Z5Ul%&mV=pH;VF& zk^%N1_Ty2ktE13YN6CnASs4_1Nh*d$$`lwFBlF=8zW*Ly=KF4S=I}lz)B9YVQHhnI z(d7G?bYR_@V7vO6W$o>R&1Fqaz+N6AgYAf{V?QcyEtShzU-PVeQo;W(ZxUd6oSsH| zTm$W)0LH>qQBKcOpns6&Bo@@khM`K*!F`(Ned+xp)Ej;KuTm}{jK7Txaj%l5v|H`) z5p-*8gzzg-R2sXjjC7W_njZR)e z+X>hPp+8AU_O+~d%#Y+?F?Pz1B0iExF?LEatWnYuIcSxFIuL;hF$jHG3hF=vDu`uO zFnTHJd?qvOM%WU4WUO5%d+m>8uk(~lO(<{Nkhn}Xlzl>WC8ZhHGhaG7Io?d?dvBxN z6?@$9HezRNbnAH=oioTMy%*hW-ix6z-izV7-isx6crQ9B@=vFdH(#?tdOI_UzLUsR z-%hCW$98X6PZ?g7g>Hcy3g^n9#8Gl6G*D)QmdnC~N99n-s|c$oGZM$i!jik?P}yub zWWOsDna?wVG}zkCKwZA~ur@gS!c6GUw>VJj8;fA=X!l#+NnGd~3H7bRdB)?~IC*~5Hw3TgZv^yr0PMdL_1XSG^y7N$ zLG|6+=YZR>Wr&{3Dc*8*Mk@YWQ*~xDK1{{4*%etg#7>s!$kk2{ZJ)MQ>%2Wh>j~ZM z2es@1qck(L%(GvT9QRt*;*&B>sU;HqU941`(3<7nVG5;zV8 zj;{j8!N74KaO@8pUj~kSf#ZX~@qXZVFL1mYICce&oq=OV;8+^>u^3uGiOR_4RRmeN10h>g&DwI!|Bc>gybRovp94 z^mV$v-mR~9am~K6ZSASrcZa@C(bviPIzV5$=xb+vy;fga>1%0qEt4}41E3Z(hAij= z{a`fQ0rO!6JPWVDyHE;s?=Vwus`Y~`fR(Tgw!&`M2glW)8|0c!uIc2OPOjExPDuIZ9U88V2SLF^1-XAnDs*crsmkPuHzmM`EKSW<>-Ey#j?u)H9$EvCMd z$th>oA>%q2J!Q>a#4f{iADBEgQTgrgb4Ho^Mwy&yc1ZhOu6LM8I_`3*1&tvKIzc~h z*XZQ?k^Ks&=l2Yah(msM*PTD_8DeoKe-ogsW znVWGeRgRph<}`CMT^up*G$)CJoPvF6BPaWEqS;f2k28m8ImGN)=tOF7GH)rYRy*@$ z^H%Pwc%ulnRd~-0Y3Z2>IXUJSsRC=bze&f*!?y?5H(;4}n-gf!h&dIh(%*qp<+$CK z6U-j^{&@CWL5@YL@Y{Tu@5{k{yaJ@?@TeSZ_9zTR8s>DyZ^%9BYW6j6H2cwnUCgd# zH)Kb%li8W3EMazpE|O^Wl@_?K$2}Hq!@mswM&zf+L^F>R!)efg4p z2sc4r=mH(#YO|$owX4i>bX3I5_Wf7lSGB&vEJv&5=2Rryz@~30Z-HsH;C_hvnMhT; z=6?J-#1E-fPA@E9DKn>%+1S5vsV^HL)dNy}f5exUkkE;=&S{0;5QppIx=1a|bZKX* zqn72QK*cp%nPv5(bC4>hETk&>AN=skec8;Hm-(``FEjjfX})aYhd1=)#b#NmFgs@y zenYBq-E20c%1LHrvkIM3!YpZ)LWa!*Gf{U=7)sFiNt8BB=aisxO3*n;bWWJgNuqPY z+)pM&3Y}4doN6Jfl2dhLG96I^szMT!fUvYQx)~i*&5Vw|>|yj#ZDn-#Wly9E-(!5p z+7>ZB@#R;>K2hZL3u~ zlNeTEYHH?-hGozcg|+G?Z&uC?TWi)#4gzb`2m-5DFAA(yEeNbo)pt!TQQmiDCnVxB z4P!%g=Q+3x6^1J(kwB47QcDFXNr9xWb9Y@b*^r#9N+d7TsF|7lO|@#em|xdR$?UPo z2xpf!KL5mtwD@bgzna8H8LkrD>ft3et8)(%YSgH(}AAhcOt(45aY%&tFs~Zn3G9u0Y zXgs*cj8tA+|B}q4#YWjhS=pJNE;3#+ni;9=7ZIaL;Z8e(a#6TLiAIGxEkvpce935U zwAFFi7T)1RHXAn>*DMvAWEvXp89NGH)w7|(rcE=Ic-B(Quwida-L2W>{#Lna=G*UBk$1M+ zk?iet>Z;HU+bbq%`4+9IWu>Y*cJeEY(lR@Dp`E(W-d|Czg9q>&xa5+|ojVvoJ6c_> zj@3)+?^a-1@8? z`QTY6^6X@m>pd4$%6#)>qxQW<*?SF@<(y`h>#XNAi0Gm;okQMp=Q)viv+c;N*-m6O z?fAnnEAo$HPUQQkX5{!vJ93Ps$v)aNBQyIbPgBWPcIg_G*R+nx%UkN~O01;gzgTIk zB&7;}fbp-wKb%VY+1^N4TZlRJz%rl-`JIo*iNfV+9hUC?lP=JYnxt-;fc z-04QM=|=tOMz!V@D>tiH@v@2+WmGJaUa@4;iV0~I-6j>S#ueq#ia-5aruI)welqJf zD1C8*GM7Y3r$)-uO)gz8xlGMkrEAwJBhLTh-OIz`)0}3YRi@_ zTVq>x950D+oYgq12!RNakOTrWB#;=wjsO!{ZfPiqO>^moDQz$Po~I@4O>^mD8oKcG zqwUwGC2d*4(!2DAB+B=m8Oe5n+k3x%uADO(&5Yi2-rxDX+c^p=7G>Jh%FM3J=QEgL zH7dD6sgg)#Dol%25Fk_%oOf&wAtr>BOg{sjqLs?wUHBiVUojFTrNm06m1>o*#-s9E z@iWvj^3OB>hf;kDDUpf`F*a0FWtLj246Lb2OY5tm=eM2z()lCje{%lxc}ey>cmAdG z)8~J8UQE4;lwXUUkN$6@q_RlK#pnx}^O?V9{ykHd31xyAf5w|}XPg;(#+ET>3>j^P z$;dO349-v)JT#OXLDSlPs(++&T8H3$S?6>z-2W!o^w9V5QUg))R*Y3*u&Ryk8@W;Pi4*I*NL){yu>$=zH!j-H13+;rL@O=4O zv+wg>Aak~#@ZWsxoO?t38MTWD+eNPI+I7W)yA~8c{f$q&#GO}uhpH%CQUAa9ozKEn zd2ZS~orNj9`hk}bnaiQ!&S_ECwf)oi;r?m+(CGSUtEaPn`gQn}8XBEedpbe(PT{qS z{M)^gOhozG%ao{VF!x~gLnDp7g#DYWy@{uA0?q5TK6kD+}8?L%nipnU-C zeQ1A#b{5(@(Eb4J_t4Hj`yI5OLHjARH=+Fm+8fYjp#2!y5onJ>dj#48&<;Vn58A!Z zMxm{Nwi?upbbFlht>xz1uX_G3auVm9W*&KDKs&6L;m0Lf60H6|2Y3q{#^cp z{CoMc`FHYv$e+po-~8M8U*><7pUM9?|HJ$b@~`Jla$9qZ+7w&S!`=1Z(T4x*BCX(om<2M3i+6bYqID4absNolb2wN8*^u z&LpDnFZ-LfW)d1LGNq&NVrSSHO_H5Su)jGKkDb&=kyz-+Q-nvOA@@{ zVl(=a(dY{`1}xEJ+S5O*_a^N3*dsN`o?3rz0ulx2_$HT68U3xVr7)WQtv{av-W` zoFm

XFxi*@2|9IMvMFL$wul&x{qwye^I$x14WHHETrp=@Ts)q1?4*fa@YNE1ak3^ZI<>)fkubcKhK7lUS~L(EJ=_qLifhX1|6^_FhH6r z5#vcLc@T7;t&pTCS_bTRsDlfUy*Z{H#Zh~s&BoI6u?fKIuO^Gp3+uAJ52)`Ow__;h zwJUw>UT>rQK%!;Z_|e0S_PHr~94%%X#Zi&f0te{i>`lN%?BR(DENYR`@)3_!t(Y(s ziqwHhB6Ovd(5OL88QvPYbq5wpX7xhV=eoX%Bh`tCTqvu1r;elXgp)eYE)LW!viKZ{ zKq7M%3#ZZsgDGqC*-(Mm8;o2r>eC@3b~!VaP^A%}in2Zp!op|}RC0OqfdxiDM7u#uN zcwU!}tvQc;zdAol!mFPggXIv^K=8r1-Y$65h5jm9mPboE46LY*gQfUF5s}V zFn^Ua@jp^=*OCOHTz~RHfCsGyzpc>D>oo{^QK8+m0-XB@0#Ge^cpMCBwD3C1O280Y zm9xNV*)tgyH)T)zVt3Z~-ERhxLl0=9bFx?cepZz(4t*saW)|opvZZh9d;0!_@Gt9HSt%1J#V*Wd7-#S=TwQgZP8-pqC(2loh^nFmoeN$ zr^tr)-=|az3to@8^Se;VXvcF-@ql?j5tP6PKZ|mN2v*350u9~Lq3IxgFd`f(Mi1>* z9+^`iNx2a4*2!W*hG6HxQZK?~CvCKz1+qL78@s5pg-em^Q%!eZv|g*)Svc3OpxjkE zW4mC#ptGaN&hzlRD8KIu(e=F8qrt3e;a@WAeab3pb5^W-+D0`~7gL3+2&>S4kkJ&Y z)NEDu72&N#n{L#iLz+BxA~s`zlT~?4I%SR3sAELql!}AVz-yY0e$Z$g{+sbtqK4Vj#`;~u}k@WfTbw0(7ZG6b|Uzf0eI%Bx8J%w&%L8aR~ z8qUP7o6`N&leAQ|ldfwiFD72X3h26!RvXH^uz6K^T%*NSu#=G|ovrJj`BmP}yUC?*d40ZC|6~<%x$@LGiF9p(rbSsASTa8Y z{2CqnF({h|FcVhLL+ag19SBc6%1xs zWSkKl5CTFN@sj}hcqy{E0A&*XL4h{ZyUY<8qJQA=k3i~v7UWVqNVsASIcyBLLNyQp zduNQ)x`j>|%erJq_oHK97LzJAwJJ1r1x!{_DTiz;I?KLV|0NIeh}9C|sdsy)6`n~O z>)z-!UrObTri!VXyI*LwIFg>39Vp7rIc&&B;RK|nPTgr(jxzl&E99&euA7rNZ~}^= z)0fa@5LEuid4V4y;td3bW9TXnxM$lp% zEMTz~=lx;KK*N5eEHalPr81_P3(7%5hd!=+_$AL00z=*jXPsbsadA7=TdV5FlFgIF zkh||ecU!4g)j*_Do2IKPz~_{uIYlVR9%GP9~HsSFV+FLDjX_jl1`pmUPTA%Ifd zXPUP-wag;Ok9Jdh$CDKB*p@&*A`g;l0QMBTA_aI1{+*-4)Vi%SR!Jmy?`rNP*3J?O zO`DDBZkae^)7-6nUVFnrH`)b1on_TFz7U9|Jug0TtSqlBceyQ%7wf_~^uWQ6-7GKRu?XGzx^MXb>7M{~Lmhz;r<^Tm~?$osM0vBd`3Yl0^?MT; zHKI=VYM$3ZCP*#*}}) zPdbO$014!)=UixvnDQdMl}*lBI4=SqFbKl1Il$o0eyn!&2vg=Dx}f%@FWJhjG{1Gl zl4VH}^?^jR6_a(=*8J+Y|K?1mXWn`4_93+XP%?EmP;hCs-p@S{g8-jgQ=osCO+e_B zDPnwJ>(RA;*uiI>UTD?T2Ni{+*DkJp)Sy0mJ2kH^vyaCLu!=giJD@bx04 zi2qT0ME1MU1$n<${ZlS+5q_$f6gi$qmHMt&oVQrs8*5C~x)Zbgw4oI>zmJv2wWAEE~(?uMUTP0B*tV_ z*f_2Q%9Ko!m&Ag4l})0DrK71EpWm&`?O?tA=4zYuII=X+n$7KYO2_i1vbB;PCvN@c zQraXo@l(_4hkMQXhO%&SYxI`XYXmX_KOL2v?0r@lDpaou?WpkL^Wu#X%?SqUq9Lp4 z(v|PJ`tcJNcI6Z&cC7;yW$&)3({*jFY}ad+hx|(<8SKV}w%W8zY096pD?7r2+{%(} z5Crn4=M6ufQJ@PDtNMo=Xlax?Re=HF8lkeRnaqg=qC=>N_Rf)<4FOw8$+w!8)>JpkyBOnig~S+>W0!My^H7~ zUg+i%{y( zpQfj4TwQl{a*sbZ>HK5J1LGL3Vd6=VNv`1*zA2wx(vsMcK>2~xVz?wfX62s!nQF$( zomv;qi!0A8Wzjmla^gJEacuayRzhUT^PX{rMuW~umO)%t$V0UaYACqe%xCrxHCa-i zg|d$wiS9v9LdAD9JWv=SjRIi+r@CeJ4EgGjp>OjWq9uL=7djvVWWR1-E1;S_%vm9< zvJHMSbI+Ya4?Eu2cD=r@g>~3|E(Qf2OJvG(o8NI)%#%a0ANYEkogZ(o`ZpT6PvSp@Qyun-XwT9Kw{+g|f2wU^57Dp1m?vKOP_7rieY(%t?^0@=sbAZmd%R4-q z&oOGicCx{k;8jC#;bL}$H0wY#V@1UpwGJ8FxZ=5T=|=efY|_huOfVY#IhDm6+aRRX zkZk0@mCi_%&XjQ_;zntH;7rePIMRA z!W!(5QOd;CkFjIWE1QOso5<|F!^&DNu)_p~SrPnq!C;S;A?giVV_uJ#a_Lm!W5Faw zhrn?74`0b^KbBKd3!JR9BZYn$3pWq!`xjD-BlY^{rAU;Sg%dqJ(j(<~J)kr6fptq) zpLw+Mr}jUWaUnuyvBkv-H_I=!c;}stiK!%a@ogcRPt)0HFYPQeaHW59y0oAEC6Sd^ zN>$j?nX=*NTt}VZ_bayuPh4Z#$JKkq6dchDh@-oPtT}d$R0;+ol?%m!l^m-~)J2|-swUM=7w1AOs+>WCJMUd4Q{xO2mK4H^t4K?JUb4)N?2*J**SZrht= zcXy{q4^eHpe6ob2fC-CXbX;)~zg+FWN-G}hfCy_fIatnWkf>(aY@CTB)KizGrfk-( z66dQIJSZ2LphmrPMImJdKT&i|X|&c;Ojf7KoV|i1Bf~=hL=@&}bS5%8WOV3Ah+qH| z-f&$fELoCG8^S;k(yzsJf3j%b;?_MLs%H~#y@6jai=OZ=*r5rP*Wk4aXmv3;evz7v zN51_`ZG_fIV!_C8?!7Jgc7a`=B8rY@eKU>7LUYI(jP5gF-vr=l51OM@dE9fi1%#N1 z*~%)aZA;e?CsK^ed3LN}jVg{vjT|L7i$&KIrQJBQ6B0ZaPB*)b_SC_lk)lB;TTYzN zFHkPO7A_R@v?VQG`!DrJ=AO9dcPi`Qb-O1RBt&LbNG?>Mpayx3cnY+r&PKPzxGWc* zh6@?mgLhOsSFY+V!sdnbjn$7YC2DP~msB*dE9;AW587jx)a$#EYvn4ult0X>S5>P3 zN9CR>@8Uzfzm)|%Caxi-0hVTK-P6h9=1TOT9)nEgxN@#^fy9M=8ksI(N4?9)d!6Xk zf@R(4w1fm04+x?y))XLrs(>~qU(vMxHy0yS!G1m`C?~S00xYi2^TTaNPR<1^RVpBk zN7Po`c72Xop2A{Ek}4b}zA~O-l&VH$%ZNfq-2Ox}j_s3Yxf5ToGWrtkg6!2f295~V z19pT!L0$Ul#X)lEl!9>uy8$O#0~%VhytYQJ9({8>aVb8zM7fg#NTi6cg$`K$gi#_5 z)~PgWp;0!WB2o?~hc&aelemYCI2+H^U+Qna@H@so>9qqN>RrSUYZaMm6n82I5EPHx zC*x9FWyb=|$Wu#FjP)?Mo^1eGG$o;~gtRo*OQ6ux;RxroJVgHn>Njp6$cMQl(kALR z-@amD_3{%YB}(ule3MMr#ffY54GCu-DqGJz%}&nLVXm#j>5if5&UKq+eGI<7zjCu* zOhll33+kQ+E`N*|@TY=X|CbX7LQ%m7L0#Di1oF_*4#8?4$Tj3NYh`9W=5}X& z^Z34UiH3^ycl{3zU4kAt6r9?`g_9-_J+?^(owIlmd^z7lMaK0yY-X|k*7FxPH?(DIbtiS#&u(`6S}RNY`tl=& z%Xm^Ytnf2 zQYG`IE>?|alyhf_m{sCqds;jV(bSMuPFg%|3yyY73nDgrFt_Svqi>M%5N>jsljR1m zTD7>h0#!=e=96~TlWHn0A=>R1%^9C^!3s1kzbe6wR)uKj+>z6Y?!)zduOrg#-e-WR|G^!oN%4PM32nEKEdKegJoE9 zK1uGKgD~~=5uJ%&l6cc)?!0SGh6bQ=F*S@ad^I#GuvJU5%b{39Tt-$s7!OQ{sA=41 zRG~4dKr1k_HV5r9Vek%bC*=i`ie&LsHLb3s*Vf)(qqe@#lFOpf+Hdgmn_DcC=`bBv zK5SL-4^q?fZl^q967cV{n~EAqN}g9uj?09vfT!$R##;UCb_QS*{+LPQ{(Bv$16dKI z6<&MHsJ(W91qXuCR7o3ZibSRyDZ#0TP z_*^vs?>_|64_#s^ha{Zrp+!T9D>Fe3{lRxdUJeH>x)KSr;8Ki8YEELGwv(zAd zk~rlgI4MR^84?=Ei`Mcv*%leL8l(W&B!Wuno-579GN+XJ;aPpfniYJKF_#6^w^^}ITo@tI(q5R&@1T( zKY$WR-~HX+lsx6lCRv|k>R!-bWW`%^D&+Q-jQ~0)^O`)r{5^Jz)8a+8pxwc8$gZ-H zMhERoY*5k1rn@0Zn-~v}XG&nAnc=F94b~2qey#oERZyjBnXAi5g6ZE;-sMi9)5X1p z)Ic%q7THaGAK>wB3b5CGh?9{}nxh^n(-N9Dr3sS?F&V*TJ03CEKS~5vAIu)J0GMc} zQ$j)B6~$x}Wx?U|0OK7N1mbj^g8*#)m4Z8hln8@nOQl09AJ^EB+HXvg!>jEk4JJ>V z_mv6(8N=gbu~(f9Os9-$8@JZKHMUAF?LE?Y>wCN8T;OC5|IXD;VwJ=?MbBDy{-AQ- zD5G;J*6j%^yR6(3=2$92HvUk~so5&XpURBK9uT#?!ZnrS#Az%BE?Rc)$@lhWZq6d) z7(xu@s5NgoFV`4cak(^QGM{duDsuftYt2DaJ-30Cvz%e`OJ3jF)1|+=m)IobTv+zD z^*-wRxDeg#LoIXo;`ytHpLP=T&y*Oah5#B30WjKtqCM1e;>$z+yXGlQwov z2$8K^vaHSBp_ZJ8|AeseuCl&B zfA#qH#U2jodY1|AH)AWF>SM81VG80E=|}7*6PhfakrP5( zyl%3LJ2qFd2KK9|J=4GVTl3qkh0}%eZ&%Xoi0*W28{3Hf4Ifyy+pM93CvnTmFE1aY zs$Ti^E#tRL)e+U+^|0L+GTHIHZaV_@1P(K}Yw3TnEgZ8{n*03T+T{FMuW&GID0m%D za#yyT35yrkm=)B!_;VexU7)^KdF&}2g5!YLnUW_(nqZ31Gu#^N10Dd6FMWi znX(>qAr1wdV64V68YBkglMrNe)q(lbWWfPEVmgM$=xA-5h~_|FX3juT%L6j){LQxq>p)gmjcPEair+y@L*0&OX;uM9ld51>8+%GdzY8Qp;! z^6kLr_a;|oQXp_5gHm$)leg=TCYk)5Dv>SW|EkWdzxBUbWB+MzIUm5)wbri1-SW2Y z&;ELikMC{1`Rq=!Yx4fFi$Vw%P}iG1wN z5U#i98TKn}7wJ-Ra`t6!DSw7`8q2QlPn&Jws!O%1E>;}%pFSIMt(`WG2mD+4ydA|O z8)JH&#Z6oms=I9CY;;aJ|BsQYm~PTdJoHc4I&c#pQ-5Q2tv_j%Ill@_qpxvam|&HZ znAFH84YJ*OqK)V@)|cO{AF0_1lcp_z<@k*$zcD!_q-IA>VH2|b^5f&{ced80{ywez!H0HZ)G=W*Kkgh7rLufK@Zgq z%bYj12^W&dI>OTy1pA6id1kU}IeX?zr;)r?lU*1ffwh^A&W zGEc;czVNp?!CE!zix^_hh~G+WmA5KUew8BWP)d}lV-?|wSE>e`+KLE_!ih}4AtEE1 zyokmXV>D@sz&M41|MrdC)R=HHcBhY#_lg-EK%JNF4p+%|`ov)eN?H`gr=a_*#y`m4JL6YN1(UurFLrmB{aKX@iTi`@x5g9iJL=tKcqrD;h*7Wd_*-!=m)z*n<@zvLvBaRnH~xnj z-tMyFjrrf+%^KaNm(e6s+BO@>v;vvQyQa2~J~9(aiR84Bw?!7)&9ZnuO{w?IKC;m@d$T%{?69Y+HU8bT`n}Y? zy_NIJ-A-}lvm8$ISxyBpXwgWV0GW%Ncu^_aIuRpu$P({AgRh4fqI)BO0SxW=!5cJs z+|Olu@t=@Ihq|53T`U!FHh$lWdD3p^<7PH$o;_lfF5BX^1K36$hIRUJL+YdQK%uhX&Yx1U(O>etn}t)KoM8)12gT-D6=HI=6mz$y4& zd#e}HG1=dA6ks0{KQryQ4O+DDtXi&dIEm6C(QxECUbc)hVlOl*m#-YxO)>}~WY7xU zJ|e+{(X-*O68Ni6I-6QtEI6H;W|dgHAkVi*xN?WHisK}5IFo;qta6)+hDcV~oAtBe zR1z#4saq_eE~$BDq_>4aS5HFOjs;VD^=Vb;xVHOzYJ~pQ74}arYPYSSY@D^G4$+Tx z`fOBMpRt#@OLU{PZ+Al5>FZpn9lWi{{bWuG9wnyZ#fOlTh?+S=j0cEP;TRw!6El_E zFI1>o-f$3nDijOUt!je^RH_olRkUy6k`;>_x)8k7!8rxu^Q(L%fn1q^1`}4Qj1=y> zsAt;M;X$pYrTX%rd^!vir&9MlO4U`BK*f1RN7-Bx8()*Fm7~wtRI;oYHmZ1O68i9~ z7*kS>C32i?kEDdY8~ANgktrH%J?V#zp6hoH-gZV|hDOmGo)-*(Bl$EJiq!$*F8?ba zpyuJLxC>nFsJN#%sk&2?jXUnMDuv8--7n7KKJBus0LC(n89# zla&^1)v6Y(nl^ik>a?I-TvU(66*m)&H|)AZMuJxMKT&3q&%j)@VaPmHLTnm5-UyZ{ znsj?<_DzTJjOcw)MVT^r73lc6NrsY@#MFs28MQR>cf@`kOo@88l`e(d+Sa4TvyVd4 z`-b_RT{5AE+Sh?Dt>t1o87Q_Dus(#gXff7tyH_r-c&GR9eB|f+N*94(r4bbv>=44r z&7O5XA)a)ObQ*GDK=G+i#8CnYEsad77*tGH8&UWLUtkj+<)s96~HWP!xCmQK~@#hWHq0Zd!Q@o#2ci)tq zM#%!cY+0*4p7$hXOiItY*h8)nZ?{jOy!;ZcMT7>dyP`!UD`UFp>?%8T;xMcDF+?P2L@|A$OA^Hp`hwdl#a9JIzq$Y!nEmDLzNeV@vmOu#- zr$|c(nk4eXNGe~BK@D8N;#H3*#|M5V6Ikg#!9-(|NMzYf; zpl>e*C6jY{EgZah9vtTj6R72SD%QcMIW_KoC1?}!sa-Ip#M2e?Th!JQ2MJd=XVReP zsYCmpSl2%>Gr?Ij*nA}&f(!6l0!R%2PLmL?N#XM9S0Jgpa!_Znx|jP>>}+pVm$@%5 zt+K4nvxa3O$+G^IRoYn?ciqa)d&z?DI8qcE_Jp>hpe%EjN_$&?t}Aa?xvMdxM#H9W zZe5|@DpH8J#=XA}*10H9;94ESAdc8ny)K7wG>Xm6gy1i+QkFEuOh2&YjyuV3yY=Ab z&jyS+BXv-%M0RzRWerb~3DNHO+9M@k3_B&4E!2Qf^`|*xA1<{*j|;)QH1}7*0J5 z)sQf?6j7kgqUf2}nPOtumBKgc&CRX($5mp-_`cONRKtw7HTlZrBeSzNgQ2$vQU5CnIsCQ;KIYuw;U z<;mM~+n)Sq;+&OKY#{oWmLgPKHX23 zU%367vfG}vbmM!r9t3$1(C+wik5lpvSNH>b-SUOdAaT>R0~AOMpUmz`_sNb8$GIph z>2py?(qO`lLm-E%UdlZ3?A-KZL5^Z~xBw^42#xD3pt+d@YXRt{Z9uEzZ~?4chI> z6?Yh4C)XIN0Mm?OJ?zyhR$G(+BR1S<6ABY50@thiO;4i1z<9^y9rcC!f&G$54H1@V z8HCwj*%hA%$tRj;10W)Z`46|f9ScR<$4GwydO1sEqDJt0VK78VnF46Sjqe0cda#NM+dO`1{r96F_0+=5Hvb$p^k=dgo}{-=0&F^|~457}Ae z=?H2fIu`SsbR8BvIm)EDFxrEDJt~R-UBGRvRro zzTKC9m4l}AtxuTt7>qkj&5b?g>R0>wNrk5Lb=TT}AE1yL->VNNEZJ)gUv*b_9xC@w z$tmLxvzw|gq$w+PSla7-u96~8*D9DkI$hsc)~k)_>p?k*d8EcJFtR?tO(nZz&&hL6 zSVHB@8>4dF$!>g*nIbfVty?RhR>-zeq{}jrkg}*sp)Lm`C!=B?jY&xbbo6t1-ZJIT zQlvK9))=x}4m0(|!k!31Xv#ff>7EAfA#z=|8crq7&C80f=u4-@4gr~5A0httce%+mVa z4Nm34liF`A{Jx&`82u?g;+uS>%!hzq>FnJs4e`BOTCDy_yuOOT-}qQKuRo}%Cfh1f zwOY5h4Th1ffjiaQP&c5c0T1vHcc7^VL1PXEMsbu(ReErmwr4)dc)BU;dFIjX$!E%l zS+o(p4fc`y-O$5SXAc`hD zfBu-Re2+Z(UZHJu0 z>y0)CxHja2mqWN_mM5VnSUq2nEm3ws!eaEk2*$7xyI&T}jIf*uj_68#Xhzt5iy;cd zaXG5xkp}Bi3MtN=iT9#`+!L=$+6*SOv8gaXW!`=8^?c24aNlcsLdf0Izjf&K7S31R z4-tp5N@5i^0CXAIIJ@FLnjIZ8VLie4FPr+WR8rj2!_dHZ1CDQaGj zkO>)evF_FSGzXB^;}hvSF$t`PJeM+mN!dyz$b3|63nQsn$x&yg+bBn_eXhp+E^@A2ZkFj zq-i{jS^sdJ!L8|SnVw<3nLo&*!K8hmt+@H+S;V6p;f61&qBU4`N3LM3UO96_C{p9G zMDh9nMu1R#Iz%AIwJJpo+H8|T?yzgQ1dO#gR2UJ-oKRNpPC%tRI+WnG*bn5v@s))cLQvQFSO3SM3e}#AW$N8RvaEdy&6T)Y>FD{xyo7$&aWR^E6*!Gg`=|+mNu`&X2P9w8GRuPvYnL+*onEj0igI&33md>F~P@ zAJF@q=@PgTOger=I%jVlyUkoF4~$;&6KKjA1=;Kcl`ZKfw@njy(kHF5kT6nY7-D2^ z9??QzfQ->2QBkv*jwQ@C9EQ2&yplljuVRMrhHZ>OK_W7&4yI%pdAi3AWl8y$LQ=9` z-qdAlLS?2z6A1h8$%xU(uZt*rT6Ufs$ExO~OcD86ZQ_eu4pO!$$NA&)>78tO7uMZ| zGOtJ1h3~b$dJjWIwRMTRy54em=Uq3Ib&WGS#%g7UGBq`CX(wyDJzNBdV(9jn>|S2; zR~-!Nz6N``l~*HcH@Z!ZR|5!XJ8u&3+@RD5t#1UQH&7Jib7VnCn$b#>vxtyRH9*w1 zxe^v2K#dy_b=y;MixTOl%V-LWa0xY^?II(`B-^uEs+>QIp7{5RjaC(G)H?6^YPPhd@T zy!*yHaPk5a$Qi0^NLmjSwX{;1vSQP5WGQWuTf}Twy|z|?+5*r@knL#n&&luPOFuI8 zWzS&2%9gw3N`hw{8rQ{e1DIu5?o92*yON&fYp(HG&eQ3modZMF-*f1PrK8ExO+(V3 zs46FhRW?np~`ysB)zD13(GY(kgCChSlF}atR zvo0t2n`V1$UUN6JTlJPY%DaM|k2hEwKqt$uXEycUi^;y(bU2@G*FyuB_A+|?^$T<|4D~lzeIv&No~(r37ivU}qi%r;6=@Rl4}L6!i5Wa(62l>p ziryCTQnjcZG83+ex33?;b@$sg1cX8&i*umL9fMP=VTjqvbFS8WSt$}cI{p&~i%FxS zG0yQ{CamPxId4KzCK+G+lU>RP!4n`uapGKRp(pWu%+L3{aXF*#HJdye3$O2q`Cmp$ z)e5c=xpca_2Z@l*A?!C<>0^F9TTmPHbRxmqLnORS%h*9S`a5ESbkmkvIaL@MjBxRQnM;uI;k$E zREA6ux)Tmj#m^3pzq_lJ zCDA#8Y(P}ZsVpY6p#=HaUCk%RCY-&<_hb$b^TBooh=vVbQ1?+$Y)aVT?L3VI^3vPZ zTv`_Ub-g{)`=4~~9xqE;%i2#D%`|o$wB>r2ymSSw&eEhfhcw8A#te&sxl9+2e%U!H6#J85aLmS zF=IPv2>?_K0D?##vI|&%axZFv6ToRPTYTPZgAULr4KM->phDt#w?BB4FTTS5^QB;$ z6I#b2_st)8qOkN2et!;N8SiW`7(Cuzep%HA@0pt~ek{$Okzi;02_JwZAG9D8us{`1 zV2cdkln}p$7iPfcxSO^k7aSgs$K!X_;QznQkv=wb_y6NO_whg!1Mc&QVEy$*2w(yfUFrZ^!v@Km zt_97*6s&wJ_p)y4iqex8T~8V zJ&q>E0u{xF#|~t%!@b4A+3X-VE|Vn3@8&lL7ZArCek6YGH2n1o8tZx+ix>9hoBd|) z6z29m(!L#FVmZ8Uiidf9zplK));QVVIK;p|%z2$|?#5`d?=E&@uh^e$FfQ>S1H@Qt zZqC;O_kXerFGNb}Mg3_c!H#Zq-{!tw?74RUq@!GsazIJ<84f+6Dg+R=p#qLEc%nJ; zB$Dn9^KICb!__FOzd>k>h_vLtUanSt^^{%cYM+j?;kNJcG5zBDjW&oIAN+t|0Pp#k z3$Re8b|%g)PNs&ou)jTfBP&=&0tSNrv^+fY!uED9rgkpQ1Wdm%C3;~edj}zV4{e6u zD>g;9*V@|l#+`|Nul4iAJpuBMet;l=lX49MK$;|&{jd)N8xJMTJ2#rYDD}?|mBuKZ zW6ly2Zr*Sy`24%M_BU$x^OWOwS$(PNi1q(6^0A6~_V?_TL~t6Ukk z=5VM4hvgkWmtUK|dkN?!wYyECyZ8`C>iIzHQ`*A!{|ETpx&?nL|Mca&D7P$(vOLGV zPBO=VP~lp8@ESfh-zD8!wNhcgE;i0x`&)z*Bf^Y#QklQEO>TPY_!f$? z=FiUK*=vU>QI2vf_^V6*<-i36y*4S0%Ok4WERT3l{MF9UxHS#nT}VHF&io-p5M?*$ zxlnfR7**+YD6GqHXqDYkm}#@S|34Y*=N1d?UXzWLp6gW6ucT=>f><&*xK@WkfZ}4j zZhM$vN_*k=x;82aY z6y|}uWg+_%E`PbG&DBG#F)3G5tx&BtmC1=mqYN;1wW%PbCd6zr5v4p-ZjOiHx?UhS zzSWpBFIqAo`z{pjA*UG>Y*~;*YJ)qy;dp868!>5k-+{Vhtq6;KaVSI@pLgE*Xk5R} zbmb8KpzwU~_ZS6kCFF)scO6<4eTnXI;B?V>uYv~;0GNdiQf>H}!i2bLkiT%>@#2f? zijPL{Dfq2H^+PBP_>J;jVsokT-X=yaMJ8AzZNCOXvKX;2RhPPo(lj%9lu({{{bd`F z;A$}DFk+XdVg|${#tg;+O!HkVq!vyv&ps$p5GpKR?%{1{+++5Y+BwjW!6{JT0ioof zGZHpHcB8vu#pH}wj#MaoZrUo2L z=`9k_s3Gbzt5D;fMC($W&a%{(5twB7^)mK;K^ z9I{FoV2JzTgFj@xhw@mRjEbd@NZ~EPi+GYi_KP@%)SLKALgcbjmT-yc`KOdCNxNi( zzLkpuMjbVo&8pU;(jbTRo3OESXfyxc(WE?EU1rPkl1yvRo)&Wu)^HYDZwkdz1L^fT; zrArQgg?2wjRUp%SN5W`uqc#te&NfaSpYwG<)PukOgi@E$siX?h0+HT}}+DA81$g9V!(;CQ$Dcx=y?}xLH)+s$ozu!^{h8^@oA$8)BYI;Ty zNhOM*9>*j<)=o%S-+Gh^ef*#|lu*+fo_Z(dk&R@)4MicC{IZ%u3a|oc!2itsdi7&2 zJp65Cna(O~<14K%0vbaDJBWUJlmYbtat3@V$81>1bY4`>YP7`=^fpX_DHUq zN$iIvTQO-Q=3AJt@JE7D>_^Hb3lZ@heiZUcT$lN`^(*iI{{mc21ZR9lpNB_1AE!H? zLue0s2Rr#-&{JSxr+f2RYa2Ut?qYN1hX&3|Nr(mIXWEYbBZ!3R4*++V>6rl&^v7$$ zIOxYjmZd99H?R4Mw;JzKwaMn?am_82@l6AxFMFGF>6M!K z263=0tEPw`1f5yz=}ri} zCE;D}%)k<<=qs)tWjVr+$(*j8YQG@K9ssV2qi=5rh%ubVR48){DLG@nn8NId;z4Y} z_cb&IUsGelFo`)J<|Kqbcm_j=s?!o&41+0+90Aj9j)E!eBk&y;N73xT4wfXm{s6Dz z8joYQdi<^HP=8*u;l~Y;t{b8#o95~LieO7adm3Qh3!s61-?O-Qp=2fS%;{8fnLW)C{C=D*r|%c#n7Ze19M z!rh(1-5m;dr;x(k-5m;dcP-rA-Q5azcXyYM>VCCPpT6gg@7#ay9t?I?Rx&g5Bs(K{ z)|_*B(e`>oocW7#wW8@>9%u&j_P7z?{`^Sv`MMFrz@Gc7yj-~v82reTU56rHU4g?aGpdJzbV?2((?e_o`ptC0{-#PK4QJ)xAS&s34ETm6G0=ci%a}9_>qGY z!DS#WRe^#^sTX%LFWbzmqkUp)gw>wgv4k@(h96&=Ng4wkz(c5W1T-RS2N=RPWtf@J zL|o(rBUdwta}m zwwt0YWmN-@I9o0Bc=&BWx4(DpR9s423$TI437<=Otah#R_GdhgJNZ2BqdUsba_lwx zXyVxZL&TIJ-5UM+<^jJTL<>FZZljaS^O`XZo9d@3wY$pYTuuTW=R}`*Oo^{l3USX2 z0wWd>Z6kx6PhZJkG!91CvD8ms;H6N&33%cHpeHd6C+dtvbomc{BoQG(T*Hj2X?`IH}+LNBdsI}ID=?Mfvh%6*dY!&IR>asjyZD8E4BoARzd%z`p zK=M<+QkBZ8K%ZWaHPZucr0A`%z1XoU4V0KD<@vB-R%^Us3TrPnIDlXsla!C%9cQGV z`_y;bB*+9^6J-^37v+(W=Jb$fFOmU)vZg@O#=z!LZYDdp^f-Qh!tn2{c2w~PqU21X zcPg<_J#4N&W1=|5$Y_-{t0nQEP+F>zf;Mf@8*}yJ$!w@6-E;#2DZmx&5~LyV3jm*2 z7#cy}Wjp7}J?=d5H_CL>*3o%tv;laeT#wt9Qve4?0Zz)jE{!O@Opq=pNth0_x0t;Y z42Ji*yS`=^w-$Y~LrILX5nrNSkCrESAI;_Ls) z6uELvHsQP5BN$1AXW&}to^%uq&N6&Ec*R!@9vZlatNM0j4+le~6u>CR_g;eFuhV%U zp%7rorsdB-XX+)DjjseJzB7tpiaW_8M#iVXNNd>ddGVb&GFrp1qXpvq=R5z#yEE=v z59He`#sl1LJAIdzJP1DV1^KvJ@jZGjK*tC;2h8-&9W**wyueE}%%xo##6AOq+w$c| zu%6gwPT*^UD4aA>JhgE(QVx>u*iRD{6-i%E2nxuW^gY~3-QQ;+zR=gH@Q>>37qz&Kn_Kzfg~+$Z)BK08PV`2SAM^0|LHxh`94`(h2Snd7=P=zZOK=sWQQrl0=X+;21+mi=5%eH1)f~@mV zP`_pdqXKKfixG38)lV#5g%7ca%RYh0k%0>BZAbjxIHZe@1wQUnfP&)Dc{ ze_Zi#UK}mjRS=cjW*)8!tV3x^>u!S%3`33E-=5+ZvQrwAS~hk7Qs`WSV=@hhDmt`QLe+XOg) z9T)8!c$Wk?{v9gZfWexVT>@J@oi7RX+fl<6L?obW1&aW-p9oZ`}Gk=)^(pE7V<6qqd) zEotwa7Z0rQEVBS~E-@Qx`W?F<#CZ9}>&^xbrQ=^b>>^2j)tEgu;qQr7s7$catoU}y zpLc$Kmr!v!@^wQS@!6Wx%-ZR+H!PuC>C2Vx*uk-RqoGu>S=Mbz%5F-vn(ik|1L-a{ z*(t!bk}%zhpqAa#wXYjpGm&m8%5u7ECF7i*K~=s%-=S>{mt2>(YE>aSCFJ#{uHv!jRE?1_E0)5uxH%#;zGLhz*FqF2XxyN`^O6@*D zt9ku){;raTIZQ$<_v!0m2#L6Cf+swrG5bK3aRM#Xo>6*WT&h+ch&G2-YZ_u!lT_k) zJKL9^Q5b5pl+YxzTysMpQmfYAkw~0!z-ni)tz5pgd;c_)F6EI3YTP--Kv2e3Ak497 zE|um0@%5S?{oW@S9H5&oD6|IAblx6CE{8gv=Cdmq+;5vLC@_|U`1RN7O7>GFgY0Le zTfU%P6JB9QzMzr|bV5G~YNaUc*iO((Vnb|BVk^jNghrbCP=jDQ2O|dXDujrqbk=pv zh?2wxdY-n>%hGvhuSRh2UGHJ5ZEEJ#hERxT{?A>FUO^${5u;)zNs*!8xHFZkNv-d2 z8l<6#g^o#|EL}KdHKBIXYN6@Al4=}Oew}m-fE|;SH;P@nPTojxp-^Ogfro3JzwXI$ z?$5lVg`mLGL{x;;q9`<{*Etp9Gx*pRkZp!+XH|ph6*9&RssO?UGe5|e1uQW$KYsd| zl`jElCnaB5o`#3MyHsLRAiPFrZpydNl2E*hCRv5)%1w;V!&?2)X(Ef$ zXXgOtU0XPQo(VP$+0r4-8z_cqar?q$T5frCMCNF?1}m|9eO$!nfUG=AY`UaaF!0s) zM~=NGvwujv8hu9_rsBQvz}`5{-Xrtu>te7GJ(TI=Iw(3oOEJF2pAc7!f5{sOo7mdf z<1_!AKVoO3mBy$4oqm$hHC3>;_*XWGp;neowzBG{QyG~J9E}*27-;pXFARz#jQ19w zqvMn1qYLquswnuZBzjTkK_+=RW?zPI6iMnVNhDB4fx>+6?3bO5nHb|&05sOusF{!$ z6;4iX0APR+Ni3c}QT!K4_D9Bz`8S^Ie}i#j|4owoUomdK8v7qGZj5yQiqS8|O>HRJ zbG~AO2<6LwM+X3i&u1j6$}itP=QMQj$Re^I_tuldfb+e16gL-J?Wd6tm!)5VxkQmy zJ;|?Xd|jWP-F14uZCiPHaKBAmE^%sTuq9$`D4?v0)(z3I6Ts8evq;+@wQOaIl}lZY zoZK5I5rZ&cX}G@_I9;!BiACY-LXVZ7Jm569hYN269L>Kr=aJeo zq0uAJVOf$wC}{Fw_v_18K97_+hr=r`s>p6PwUu@~a4>wqvII#P^w#qb$th+!!ow}_ z6lG7wpM4~_{aoukb_5n@(ur5!;qh|wcxVlCOuzg*G5>D&ygqi|8q%M7og*U-X6lnO zm9>tOd7inpon`YpU6(v_cg;*CX|c}hnIfe_N>sz}3`);d^``<%xOixx2^Esddi z$0sy(aX&Ee?gmqRy4}OiO_}G}H&BOD^W42F=eUi##3gm(!O&@ZxfA^EAZ5tz{#t0@OoUckee^ zH)PInH+n4a)?T+wst^)cHKkeDTI6Eum-N*NF1_ww9=TH_L3n2m8V3UVK%_-n*eP^! zQoVe3XSfkh%I_obDyl#`k=~v+gAfMbB^Rl`p!J^+E0G(}qEEuGn&wM^jp&?jUL-@` zvSF#U?JRudz9Y%@9MS`i>W2rHrdB8GJTMOUU}EzZFzRKzJT#$suKd?mHBB0R!XK;} zGVlOd0eulFzp!uRpw^dXhmV!CT(c^FtM9S^OaNyxBPz?(hPlU^Ru(-0isG(&wDwP5 zS_gH{D1Y zWK;-7GBul(Mf9)fhL*MByfJmnBkSkU-Y131N1swur^1#UW9Kh~ej>QxZo&mGfbi0F z+$^p__twxstq>;QAXS>CE45{wM8wJP4meWY55CBz1D~XirmTHB#d#4Vh_vW~}4D`VSl+T$T@SZ6X^x*;VrqZVcZ}6qmJ!be! zOp7PBI1<_zf0;4iMJ)qQUn zQ5Yz7{C?loS8$pBLO{tQC+~j9l$evP`BSs%&B-^!>$-p(r>;FuwAs_9!u zzK;s0h zP$YHOsdD?0%v}UikseI!*b@$%yD8Q9#OkTpcYMi9;e(Rk(JwF9i~>Kb zt-cC#`N*ZkP0s21{XE3_j0o#hb3w$H5CoDjDQ38cU_OV=x0cW45_Nk3B^jxGtpk1w zh-Io*H32-f|J4y=Qe&8C96H_FkHU9O2rlWXNh)D9PqHI`p0hBy;v4nKxkAJ255+ay ze1C6JQS)9xGN!w9el?z6-Oe#7!S4b+1R7fyD<`*-zMQa)VB*v=mOemttOPNL^XOv9 zX2>>_+hWQFqs-N%x(va|X3%}T%);XI^TxgTY6v#rKiF)-f6k0D|Dq_}{mq;cRg`xz ziAUiVA^gq#`b!b{8DZj9qdci?>fN7M)vsiB z?xV*25Zq)s8#UUm{k&taw%gPB1tBr3klZTKMvKNq%dwG`cDr47g%$MPqsyaZo5nKe zJ`R1{+G<}gZ-6sZZ_%So9(AxKrz59Azjk$bPRYG%jByStdR;uUFsr; zBiQJbF$2_Ksw6bqqc?bVn(s`dhnZTuz6OuE(-}|S^0+h!;+Cetp&*PY0&M3_;40#5rwhA{LEp^c zi{Qth@dM^n23rXdm^Pq%9fGClRbW~LrV{ajfJ}&1b|gSI|ZmhJuzG?qzOV$Nb1Cv0i69Ytq|@=7Q&h2?0TfBEjr=Fj;zzs{u3} z&s5DQSbqIR=$Dxjm`)iSk{!YU&QE`oB}|4tpY)qvd9Cm@j)5VfmKr! z$4Cu?&d8AY^&46+2|kTKF3~mnuohYvac()2WS%QJ!Y)|58fM7}FV?`r^1muv^tCQkgD<5hQ)Nx-LLyy$?5v(fX6u`yhhTVk0 zh1s?t53oBWz$(mFsz30Z#XuG!B3Hj~ z3@tvrZl}?j|jysCT@?@A{~#4FMDCb;+^TGO%dC{rNE30?%Z^C1CXO^BB5jA z&LEjxjCf)q6Yifiy!MC|pBV8b*j@LCE-#WJ`*MtU5aBW(orOLUsBjsNq8#pfdLNPD z+SzeAf*KwDZ!zLE!x^h=hbJZjiEBw%;TD>p>65(X9|0h<=C2||^K zeM_PI2~bl)?;O#0_!fW0>9#j}oj8h`Y49wF;Ndj{`9WfZvJ@CD#k7vWL4iOLKNxY* zqSZrHKr?T5>F_cY`6h(z)K$kkz9@X_-3L!`AA)V(Q^>})!*57vBAc!oI_&#dPpX10 z;uN8Q%5E<+TII5E$Lt${FV3=luD7N^NSACosi4#@IUDM%!e5^02b%fvtqJ)vLv$4( z?>B-Bq%zeyfab|FhF$Xe1%kT6E*uvrPt0hVWkO8<2Ku@E#Ksc3aPz9EM9D}SD6+kc z_5cls3Q6R_!iByYp(lMvz@Z98QV7QzCL0A(GMck?2m#w&7~h93Wdl*xvy(Bxv|Vw5 zc0Z+`9fdfEVuV*aNnesxi-~xhjd2DYdVP9`Nun9<{ge5n?64_(wr*KhiaZ8^^cZek z_*vMKE&$HS2jWF z+pp;rGup~U?G0}I{zc(*Z)WH|4?J;=v3DecL2^&BnEX-Hw*(B5(=v7n)6$7%m2O09 zeHPg+wh9%ai{3!etUEPoao0A$o-eT_|EAZ`YRrhx*t6!W_MZ8j+P;OpZb`qL+cA+K zm<@)odMTc($AyHQ_S*=pP%@32bODz~YVkKI1fIm}n$sbd?Fg-b)t4E!w7 zfuYPydP6Gbgb#3?R5e41z^>$Rs>)TVBPY3y2B9c#5rAE2qEs^5l|-R;JhR>)%OD(& zO6Vy|DtG&Zc9UXqJlfp~T#sX%n~q~Un_4G#ulQ%<&|nAoBPlDWUO>P{{QCAQRW+fe zR>jZeh6QOAnG(UDSlZ-hr%iYUxQb<(*NFK z0b)DnPayNBr(HsS+!N=OKvL#@AGmSEb)+0Bz76NNafz;$3q98Lw6uaHunPlzOOQVK z2ruW~exTac{gjY!1>im?cNm*_E`&+?l)skk!kW<3=qQpFIpuT>nHX?9ML(#{%edVD zQV{~k$H-Q@PJJW*GlTPrw-!!^A#-$nh-8$t`y&|iFoYmI7Aw0Yc>@DyG(r@|ILIiunj)Hn4_ zw~54pf{OLpCKYJJzqF|0#5$-?%4N5>QAxR+d=^>R5j{m&(Tq~LFR#|t;wZn`_Up+! zidNS=I!VR&M#-a$#%@P-`PDl@f>%vm?4|qRP6u@Ys{@)A=18DwN<)^b!lx{>cz|*j z>cMzGl0=m^x11+acQ?vn5x@XBZEn6!fVrYwEbDX*RBahM`%YYgwn2dso*_$zq+UsZ z)8-8IHui(VnC_KWWOL5_E$K6EEf%<|1cMP0r%AX8-|SL3snM?^w>dKn-F9n;@R@3= z<+M2VA~vUIps03^t4(kAm1WMQ)%Jl>s2=y~nctdI%Q-{LF#KlicI{q|vN%Ih&k&hU zn-x5cwGYW|ci&^Pv)jn`p62gTbBJVFlG$D?AzpN|B^BL)!6@;F=L}=_#V765!SA`ZJ&3$?EV@c^N|IU zmCfz>0%7UJnK3NKrU5SUA~Nv3X)$v88sc3lFz~&#>E7f*ubQr3o0{nf7K@vo$ONE9 zibE}Th;U+eg|2y-9GX$u4$dwN*X^vGx1*KUvvIpU;dzMw1nI}T|K)ieg0(JU#4S#w zsmYAj8&j=7N*A#nEgU<{Hq-aY6hIi5hn_P$p4Xe*U1#uPo0b7ur}wuDnc0JBx|Rc) zNFJ5gM$m|1Ur(pEmxn7{@N_5M^`@?~_LZ*gle5=?OjL!3uH+%DjBaS141?$ng!6g* zv~u%QyzdSqBVFU8n_A;qZ`-iOEiy8ccdhi(Sb}C^^(`_J)OG^j4K(G*2S&eAfNo1w zE5Ba>L65h{L|%}dd2V{8^RD@?Vh|rY@pjP~HXvJ}j~-N9d|0Z@hXhVbS35Bs6>xsM z-KqzKu@jEgiSFVoXo=w*HyG{d6$xq01CDobm6rD%`u(N_?tJ3q*=WnMG?DF!>->ut z&o+P7{3^)%`vs^l98-x#8Dy;uY_>^i3wD<%({WYw{^K+f{j=ZIb<6esM9FIe!RUNk z5ZK%8?TaR69cEU~`ymmw9Q-9MZ`lCs(4tu?c8*;~yu;!K_CSMl|2ybC!R`>6D-|Rh2 z!BNaSq$p+}z{8Er9*l!!-+%(q#;03IACMen&flJ@5qllFQo9N^tWN13hl@1tsuR<_h3**=&|lPZ8T3B zR(QnMy@dd+O5~V+lUJd4lNq2bE!^+>*cC5Zj?^oo-p;Q$T2C2oZOBFv7!0602Y7LM zeO^v>qDd-}`sAYlRB2?zyP{q2^bFyZY4wIO&_JVv^f0vZ$s1kIlr4vszt?dz z4cN~J&7Fw3S3+^8o@Aa$$268@QE@tfirp?5S{K42pNq}_v)W8ae^kiUn`k|q<6Gy3 z$GG5}83V9u!>1~vg>s-OIh;o-!0(Y6JcY*hvB94lXu`J5H-NQ_@W*Vhr!n3FfWHG6 zM`vAX->rPsiA9RsxL+aWOI+*%pUaS5pw?#f`hrx2#xW6M)JY$shVD$n6+!+<0M-qk z=wcZ`gngwzXG>4_G4zUN42gyNQ_fO6dUyO0g^6qr(kBT$3s2$Q+|kkWuyW>0rW=p` z%~wzMQb>66Lx`7gH=H0t_Xo~;WNA_?JOjAz(2~zKUyiF1zk;H0rx?J4Rind^L40%9 zq`R_dWNkG7&tXs_;7M^zSYzA$yetzVU4nym>Z~j5@MOa?iK_NwL+tIkJ>{vkROeak zS73@1`|=!yha9k60#J-1^Mdv2rq8Sr#6CfXOKGCIgk@dIXmZ7u3=)V0)neT~)IXpD zQkwIfk*EfW&_{>CEOK<|;6m9La2=*nk7NaY2F%?2fGyeEcGK!+6IX|6zjCb82YmsVNmZ!0PC+&w_cy`un^3^B4IZ-*%c;D!}7|%k}VVj&Wp3wSm_nA$$ zL3mOnoK+r_JvQ%|gh5xyBS0IoJzF3OyPBq{XCS%C1|vff&9P`S1Y?A4#tLV_MVw7W z-!vHcvf>%WiO_51oXNGPafIPVs3hEaDKOh=`-)~Ia}bzlbd}mHc0(eZ4Ld>_AAv;+ zk&e_Fq!e!b{IddbAUBDWC1oNILwG9ibIX)Nk&JwFGP8gKqr{#=oANY> z$g8+WbqsuRiH(I)bFwBBS_=A+eja7R^0axC&W(I4wjxsUy|jjsYK*M!cGMP~3MQE9 z!cx@w6vn}rZ8)@Y4Pi;&8bNAvgUB8T8o@N_;t}K`DT2si%~B+r#gGJZYrkVBQ3VxB z7z)nliNnhYIgW*(BRCBC1-U9f5gx_p1=@TOgu?dAhGGH!5$46;#ao(S%M;McY1FloI|P)YCjW$R-uALa|fckkg8MW9MqqH zmfB^_x$$g*9?y+IzGkfOf-usy z;~Aeg1Rc8K3GX_$D)Kb7Y;+q86m8<1zZT2ddxE4z6hOyi12`#BuJ?kL?4n|$EgS1Y zqu8R=b`A8NDSO7tyy%m*Z|>zBTkKlfz>!a^2ozbeo7q->49D z)kQ_$dC){%Hnu%H8{U%faAZzUDZz$+7gm;&${d;MEsb7ai4|4ryxCV(`>Zrhb<{c` zN{VQyiyW{{osJ`{qa?eKOJ?qfbg2`A4hes?la^JCeM*QKQ%WhhRZFYrfV3MytLt3$qo%*5D za!$l1;}(<-9dHO_vt{01&g8E4eVQ|IYOBi;#vOTMb`0d;N!{=j~HkyQ*X|{!9 zny()o#(Clc5fVbCC;c{(r$V-ps}Z|N^*CcgX>HCCL#sj3gKbG4--XgjGoi+77S30`iP1L8JIzK1Z#NVr}#k^H&t=V78BL9eb55xSr#p=jkGc~Cxs$KP+ zL|d-c3i-9&icUhy^7U4vyh$~zImb~}(sfoB!rmuY2 zvodI=)b8Qvb}1}_ldh87`4oGv{-aJf-ZbehP1TNwLIv4RY7N_bcIlNBo`wTOmd?dj z6%`>Sxv?biFyQM#p@WwAzyy!+ zfir48(kmihl4pd#g!j>a6@{VDNh<HwB^+0ky!ba9PO4!#}4QFeHL*79{z@q~oZ&;=uv^29gRLhplLWLYZ z=&Ej82Vko6prh~o=$Xc3MS7ku$|pOplTJEL@6A~On*tCkAsi@VTbx(M0O1}qa{Kh) zA}CZHfIDtdC>u^AFnMeD zm~MPZR;h73a%v)BZ99A648K5ayKLuSzS1o-CUl+Dq`t?`j|#FKPu2vVd5xbua?0-~ zyRoIdcu*G)MLgmwLZG}b*X{10o3|of2O1s%gfi@pZJ6-A|6%WY|Iro}v)HJF1K!UL z?g}Leo##q*o-wJ#y_SSwX<6_q~cyi@q5_t9W- zoRLgHb1u1Ec8+)^@J;WczC)`bn1W}#QyVA_cqVjB_oBXquOgU|p1`f*+Z)}W&JIs| zYlbUYo@oSpIY%5sC>2g8!geT_OM-3v8(OtCq@#yu0=wTB((iK-f4Ho+SG#>>m)H4u z_AEo6!e6H%B!ht_KNej<0eqA-9L80z6Xx)U(pw$ju65>J>nb^|bo(6Xh^Mrc<==aY zBHPg3PEC@7Na@(5WQI4^{H^S+p4Z$oZ7y#XU)kKXuLD5Ri7r__guWrq;8>aCD4Yyf zWsFmLgyN;w04)qS_F*|?_R5fK&s3pdz4XRUk5@-*6%SIiAtNx2rhE43@*s8dNU>)& z_bW<)ytVtPp@y4CmqDEE-c?sfJP_@a{;mh;VbN-cglQ78I3zS5b{#KXZwBOk38O|v z@PR^fEXirLlz?DXUQRFzy+y)V99lQ1nnnvOCu9VN{E-)VpMBg05~>`;5q zwWCAz*nD5a8#9Dd2yegbahqhlC1LI4Onol&bgQP!60vxW3QHUiVgXrrswSujjBKd& zfyH~e1?WuUt}+1gne%25HB*wmKSUNyZDC*`^o*+_plP!DwEmh@3IKE7SLeV%pqXZU zFjMY)kixI}^QA#P-x4Lil(E(U)X}gzqH6&&@4JyvPntZaeKAQYt5OrIBpFagd@TWw z`(l%x>IWU0ja}3SG&82@9*sy5`VH6RVah?1cV|?Zf4#_9$fdmhdic53NBMA*B5`pH zh=mOYpx^a0W#x*&J2SSInmyqKsH12UE0mZl@2pk|td~BQ_f6Vdbx>hF7-t=f*wg>H zvL-)sXN#FMT~eK-OHq(SYbK>PzAjC?`&QXW=a@Lm>@3_TLMF!rnyvW>$)yUa2CPYz zP>YcpYcBf``U`>=Tju36n@a_J^&GkD3K_>&K3ZTb-3xihR$i%yb^1lU@m(i5`kS6g zoa4YT8q!)x*Ia_&iN+}JlP}{7Y*wR7ha6o1DOFW5T~$zA8%JT`U%56|E&$MCn(wN* zj~)xX#zF&4;l)=VNH);7YFo=jDsc0Edaag#msWIr>pwQZGI?}l!pC_w!2(CLFHdbi zu%)#j+BqE!hi_0|<*=f4BD%4>52^#L`fq^~$-C1`-)ug^rlg%Ix-0@NsC; zFsJiKMbqy9XDO@_O)Wb70Ww66oqJSUl!xYBIcRU5?_Z73`jW9dB>*c#;G(8G1Wdic z(#y#rx$by)aOp&=_vqE|3f7=8yHdWwV&HpH;&Hd4f~P!NWqNv4b+tGkKwbx!Id&ho zQ?tEfq)=b_sk4Yb=}I@c$^*w+0;gTflcGXcURqhTlFeFv;MNzNyVlXhhY0u^r|kew)?jHE6B_w39WWxbHRq6^u!lv z2^qu6vr;mCSK35sU-#8&g)V}z3kI?&in)GbGf0I-E1PW!M0~Ap$=ONLPM;IcYy>MO z?a`v95lT|K-1pA#cdAay(aD^gq?|s3D>Dd5?4b}kG!r!)Sw>Cga}pJfPeo%YoWX?E z7Z(DQOmhRJI2l}dS9qqJU1o3iQ^hrRy+hIgsE69<{0SxZ%gpS*XT<)pylvRuQH&Z-e(zM4~cf)gkF+5VJaXxB$ z4`H@O>zY@qb_RQ)bASHv7G$@wxa#FqUR1M8*NPZGtTy_}0~i{PPC`|HHSNz7+bM3 z@FtDVc*@kRn&(l>NA2Nc@FLY8)=Z9RTP8gQRaqX>bvqKa?ROX4@xrF{a3%L3yf8K2 z+ksT??VS)a=9fH$OksBG-I_DO=Sdg#P(;~b%fBNp)YvL{xdZ^%-P?ONEO_k6^lVeu z0~^jc;cW(=MNDJ4mc7J3RI#|jaM_#fo(vvMLqbMysaycSWhiSmE)#vTb;?pXctnD- zTyo} zvp;ilNMwx8@!0NtGvXRq;N}HZ;r5A78P@>?e;JA9JrI!gA9<5Jm#Vxb3LxwqcB}Ei ziFj^uB+)wEuQkqa6)HT`#9i~kKHC${Q_~uOq~^~-aDz!q_`FL>rde2!%IOTXx;jQX zK^okc;k^2c{4#Yjr>0yve&^-x;_+orzfd96pK~Rh4T9zPSmP5~nHTVmB)hzPd0@c+ zN;!aQw-+z;!UstfckbO>X_RRjPyYt#Jy%_5E8!hq@6_OBkOeDJKbDByk{r=?RJeY% z;FDX`$0t`3C9Dg5vbnz*?P_$C@&0J5+xiuX_Y9SV>VvVaJkc1XV+H)NReHfibta>~ z1Oi_pNsE^d>P1aYO}E>XR5!zOR~gtt#NFLR(^YAdfQMSB_+Ga0>UpVLYo%U_?OY-P zjvq!pMwr8ju*Cs8-sNW$u_bI0l$eWdL0xWuIHQ`(T$F$lxN~DbpG#2ddj%ht5xi zj-}3s4iwmyuoAk8&pB+St2-o?M8gBQl?vl(h>*}AHwIb%GjKo_HQ7l+c>{VR3KW7n zUWir|;Dt=R6Vc#4L}sT{Xgls&E(?%*gk@A7LT9nE9aE(uz)BP)d8B>?K8 z{Uj9)fMqafXLuH*H)&PssVKk-BBM7}Ih42B)&c}JfIEm9jLXFItaUa^qf0*ktq8oT z8jcQUP$JzX+|M}QEH0o?pl(Urai3wY0w$pG%dsuvjY`laV`3O2&{ z8|#k+{TV2sH(6^_YE%Fu4yA{6XeXf0XQKV%>N{&wP1rf)D-}iTzu)?K-HOQ*;%>?Y zC+GY4<@?*HIVaBJre}d30Bj&rM)TlAJ#6k?kS`6qc`q&38J`#g zbEfXw2b%5%5p%$*50L^~B6OT%ifp9ol))%mL*MaT1bzdLsPK#VJ~M~ zXy*hb{&3(sNbgdkEUlt(pAZX?CbG(@@- zg-{tsFA7)EGCS9VKb$ zYmc@%WOuuDu8+B^gH4IkxyBr$lZhbD%=Z$RGv>%!7hW9 zR8kRxTk+&Nr`HB{Y62{kHReWWiI5pI!I%j#p`dlSyu}mEI#e;Jc0zhZ@){pr_fRp2 z1wyt(0*v~oEQ=3qafS%`v>pdEw$PaU@p7tUVE;V^H33giA}oWB*_S}YynU7X#DK|Z z5=IZ!m-4W%AC9CRGvWl%ZZ|oMjrUWQD5Di9Fz22PNvgA&RJ$>RJ9LujN}bKZ*m}1y zdOfNVF~CP|RinKk;mcR7MDNtSoY9+_&51^MN4S_KI;=fmgWyJ!T=wju1iOMP4^qLd zX`h6@$88T5bF6g!^da$Q{eeRUblE2;6%bnjcgx7404QU)2 zqq4MSgu+^(@=RSBy<%YvZT-lyva2yK9U3FFvSAEeUZJ|8-8Te&b@JqnuMmb}4Gc-` z5wheF86lF;T^>ut5U5BViQWRb^~OLOu%&G6+?k%I<4mJU`7XZ}+-DICX*Akx5wxqhQCXTD)jdDg0J@tnBQPSgtM>`$ zL_@Hg6||Lom)ZFV=+gNljIgU|kF`La0F2v|tms%HUcyB>gweMb-T41mW z-^NPS#B0@uZ%}S3*kTfRiFg$z_mr48n{#T?J6)DNz+m$k~ z*U{Ip*ZJr3buM0KYaKl^1ABa310xelZo>1H4nlkreQrW!W+^%;YXJje6H!-N0|i%U zMLkzDJ$8LUULHs;XAWlzYl{zQ_|6vQmUbM@+=MzGac~ScKGMIkX$kRvD`IcPP007_ z2EK}vEWUu1tpPqW4HLB<9UU`1D;o_x6DuPF3l%;C9X$gr9UCnJBQ-rE2i>nf{J(t& zc_2ShT(&=+mY$uRotBP)mVtr#qXe~` zi>1AeGqt51(eFb3E=SP7PS4iF+TO&<691Q69bGF2du~F)Uk&}^^S6FkSpTCTOFNq1 z`beW^WkKt#V@*p>Lr42(mGt%gQODZB*8Dfs^z~>B%ndAl#RdAPNB^hwtpBA~|JK;Y zjgLx^38 zP||%Q=zbUSFD3sV<2O|d{wFg2rR2ZJ(AVQIw6e9(vFFjTwl+7>)A=>9v>%vp(f;$+ zzn8Z+u{SsPZDRdnynmZveCGE5p8E@~UsJ@~tzu=?Mx6*UwqW!(We^=!9+<({axBmUHD_kFa*86>M{~+O) zSOo){f6x7A2YEh5$iU9t!S1gV`1kt1Dezw#$0YpUO#HLM|C>_(AnQMk`~i@^zWfhde~r%{?*0d^KLGOA zm;Zt5ukrcA-T%P#2SEP%@;`9>H9mj1`&V#5{`1uJ5k8cg(COn$^=HSrzm72Qhodpe z|KaJ7-0zm=m{h4b2S4Qv*bgX~%VM4CPme16_^ z*XzqzcgDREas{pdj`6~IOZyd)SQ=e#cirGwZ1%q2$Oe0ej#1s>LD?#LPI?XAQfaN` ztDFUE2B|o$BgGE1Rqnqh3%lP!#hN=bI51w*)dc_~5$@kZ1|z{QK@fyg^IqiS`%I)F zcmST%h9njauc8mGl8Yf|ivu2d0u*ZRBieqf9lfY6k7hjLMF4kw3xjW1nto?`&&e2m?t^&jJHUOe`cL3 Date: Thu, 20 Apr 2017 10:19:38 -0400 Subject: [PATCH 017/245] Grammar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4d20245..bf0ee216 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) [![Join the chat at https://gitter.im/tabulapdf/tabula-java](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tabulapdf/tabula-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) =========== -`tabula-java` is a library for extracting tables from PDF files — it is the table extraction engine that used to power [Tabula](http://tabula.technology/) ([repo](http://github.com/tabulapdf/tabula)). You can use `tabula-java` as a command-line tool to programmatically extract tables from PDFs. +`tabula-java` is a library for extracting tables from PDF files — it is the table extraction engine that powers [Tabula](http://tabula.technology/) ([repo](http://github.com/tabulapdf/tabula)). You can use `tabula-java` as a command-line tool to programmatically extract tables from PDFs. (This is the new version of the extraction engine; the previous code can be found at [`tabula-extractor`](http://github.com/tabulapdf/tabula-extractor).) From 0c056c0fba0766639fcc1706e090eeef64518ba8 Mon Sep 17 00:00:00 2001 From: "Christoph \"criztovyl\" Schulz" Date: Sun, 14 May 2017 20:35:41 +0200 Subject: [PATCH 018/245] OptionBuilder -> Option#builder --- .../technology/tabula/CommandLineApp.java | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 44fb646b..7ab90ca9 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -13,10 +13,10 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.pdfbox.pdmodel.PDDocument; import technology.tabula.detectors.DetectionAlgorithm; @@ -56,7 +56,7 @@ public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseEx } public static void main(String[] args) { - CommandLineParser parser = new GnuParser(); + CommandLineParser parser = new DefaultParser(); try { // parse the command line arguments CommandLine line = parser.parse(buildOptions(), args); @@ -281,41 +281,48 @@ public static Options buildOptions() { o.addOption("i", "silent", false, "Suppress all stderr output."); o.addOption("u", "use-line-returns", false, "Use embedded line returns in cells. (Only in spreadsheet mode.)"); o.addOption("d", "debug", false, "Print detected table areas instead of processing."); - o.addOption(OptionBuilder.withLongOpt("batch") - .withDescription("Convert all .pdfs in the provided directory.") + o.addOption(Option.builder("b") + .longOpt("batch") + .desc("Convert all .pdfs in the provided directory.") .hasArg() - .withArgName("DIRECTORY") - .create("b")); - o.addOption(OptionBuilder.withLongOpt("outfile") - .withDescription("Write output to instead of STDOUT. Default: -") + .argName("DIRECTORY") + .build()); + o.addOption(Option.builder("o") + .longOpt("outfile") + .desc("Write output to instead of STDOUT. Default: -") .hasArg() - .withArgName("OUTFILE") - .create("o")); - o.addOption(OptionBuilder.withLongOpt("format") - .withDescription("Output format: (" + Utils.join(",", OutputFormat.formatNames()) + "). Default: CSV") + .argName("OUTFILE") + .build()); + o.addOption(Option.builder("f") + .longOpt("format") + .desc("Output format: (" + Utils.join(",", OutputFormat.formatNames()) + "). Default: CSV") .hasArg() - .withArgName("FORMAT") - .create("f")); - o.addOption(OptionBuilder.withLongOpt("password") - .withDescription("Password to decrypt document. Default is empty") + .argName("FORMAT") + .build()); + o.addOption(Option.builder("s") + .longOpt("password") + .desc("Password to decrypt document. Default is empty") .hasArg() - .withArgName("PASSWORD") - .create("s")); - o.addOption(OptionBuilder.withLongOpt("columns") - .withDescription("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3") + .argName("PASSWORD") + .build()); + o.addOption(Option.builder("c") + .longOpt("columns") + .desc("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3") .hasArg() - .withArgName("COLUMNS") - .create("c")); - o.addOption(OptionBuilder.withLongOpt("area") - .withDescription("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") + .argName("COLUMNS") + .build()); + o.addOption(Option.builder("a") + .longOpt("area") + .desc("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") .hasArg() - .withArgName("AREA") - .create("a")); - o.addOption(OptionBuilder.withLongOpt("pages") - .withDescription("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") + .argName("AREA") + .build()); + o.addOption(Option.builder("p") + .longOpt("pages") + .desc("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") .hasArg() - .withArgName("PAGES") - .create("p")); + .argName("PAGES") + .build()); return o; } From 993eea205af179d8dcb24e0ee2823f0e2a7bd2d9 Mon Sep 17 00:00:00 2001 From: "Christoph \"criztovyl\" Schulz" Date: Sun, 14 May 2017 20:35:58 +0200 Subject: [PATCH 019/245] Better error message --- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 7ab90ca9..546cb698 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -94,7 +94,7 @@ public void extractTables(CommandLine line) throws ParseException { } if (line.getArgs().length != 1) { - throw new ParseException("Need one filename\nTry --help for help"); + throw new ParseException("Need exactly one filename\nTry --help for help"); } File pdfFile = new File(line.getArgs()[0]); From a84db1bc180edaf25ebae23067333909d053bff4 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Wed, 7 Jun 2017 12:57:41 -0400 Subject: [PATCH 020/245] remove deprecation warnings in org.apache.commons.cli --- .../java/technology/tabula/debug/Debug.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index ed1df566..f58626b3 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; +import org.apache.commons.cli.*; import technology.tabula.Cell; import technology.tabula.CommandLineApp; import technology.tabula.Line; @@ -30,13 +31,6 @@ import technology.tabula.detectors.NurminenDetectionAlgorithm; import technology.tabula.extractors.BasicExtractionAlgorithm; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.rendering.ImageType; @@ -299,19 +293,23 @@ private static Options buildOptions() { o.addOption("n", "clipping-paths", false, "Show clipping paths"); o.addOption("d", "detected-tables", false, "Show detected tables"); - o.addOption(OptionBuilder.withLongOpt("area") - .withDescription( - "Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") - .hasArg().withArgName("AREA").create("a")); - o.addOption(OptionBuilder.withLongOpt("pages") - .withDescription( - "Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") - .hasArg().withArgName("PAGES").create("p")); + o.addOption(Option.builder("a").longOpt("area") + .desc("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") + .hasArg() + .argName("AREA") + .build()); + + o.addOption(Option.builder("p").longOpt("pages") + .desc("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") + .hasArg() + .argName("PAGES") + .build()); + return o; } public static void main(String[] args) throws IOException { - CommandLineParser parser = new GnuParser(); + CommandLineParser parser = new DefaultParser(); try { // parse the command line arguments CommandLine line = parser.parse(buildOptions(), args); From 4768b6df3206234b7705beef6c9cb040b994a1f9 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Wed, 7 Jun 2017 12:57:41 -0400 Subject: [PATCH 021/245] remove deprecation warnings in org.apache.commons.cli --- .../java/technology/tabula/debug/Debug.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index ed1df566..f58626b3 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; +import org.apache.commons.cli.*; import technology.tabula.Cell; import technology.tabula.CommandLineApp; import technology.tabula.Line; @@ -30,13 +31,6 @@ import technology.tabula.detectors.NurminenDetectionAlgorithm; import technology.tabula.extractors.BasicExtractionAlgorithm; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.rendering.ImageType; @@ -299,19 +293,23 @@ private static Options buildOptions() { o.addOption("n", "clipping-paths", false, "Show clipping paths"); o.addOption("d", "detected-tables", false, "Show detected tables"); - o.addOption(OptionBuilder.withLongOpt("area") - .withDescription( - "Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") - .hasArg().withArgName("AREA").create("a")); - o.addOption(OptionBuilder.withLongOpt("pages") - .withDescription( - "Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") - .hasArg().withArgName("PAGES").create("p")); + o.addOption(Option.builder("a").longOpt("area") + .desc("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") + .hasArg() + .argName("AREA") + .build()); + + o.addOption(Option.builder("p").longOpt("pages") + .desc("Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1") + .hasArg() + .argName("PAGES") + .build()); + return o; } public static void main(String[] args) throws IOException { - CommandLineParser parser = new GnuParser(); + CommandLineParser parser = new DefaultParser(); try { // parse the command line arguments CommandLine line = parser.parse(buildOptions(), args); From fa1c686087b8a5872338f3739e363822d0c8e858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 12 Jul 2017 17:41:07 -0400 Subject: [PATCH 022/245] Create appveyor.yml --- appveyor.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..1170a329 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,21 @@ +version: '{build}' +install: + - ps: | + Add-Type -AssemblyName System.IO.Compression.FileSystem + if (!(Test-Path -Path "C:\maven" )) { + (new-object System.Net.WebClient).DownloadFile( + 'http://www.us.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip', + 'C:\maven-bin.zip' + ) + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") + } + - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% + - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g + - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g +build_script: + - mvn clean package --batch-mode -DskipTest +test_script: + - mvn clean install --batch-mode +cache: + - C:\maven\ + - C:\Users\appveyor\.m2 From 89c1125d8fe763fa6beb29804578da827dc305e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 12 Jul 2017 17:44:13 -0400 Subject: [PATCH 023/245] -DskipTests --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1170a329..26b1d25c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ install: - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g build_script: - - mvn clean package --batch-mode -DskipTest + - mvn clean package --batch-mode -DskipTests test_script: - mvn clean install --batch-mode cache: From 8ed95bc4d4df63b39f5c003ce94e651fbb1e8f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 12 Jul 2017 17:45:31 -0400 Subject: [PATCH 024/245] Update appveyor.yml --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 26b1d25c..f60e8fd5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,6 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g -build_script: - - mvn clean package --batch-mode -DskipTests test_script: - mvn clean install --batch-mode cache: From 2ca949a6af879487f8b58ac343b9f2891fc4e8aa Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Fri, 21 Jul 2017 22:35:51 -0400 Subject: [PATCH 025/245] update pdfbox dep --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6517f2b0..1bfd5ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -234,13 +234,13 @@ org.apache.pdfbox pdfbox - 2.0.5 + 2.0.7 org.apache.pdfbox pdfbox-tools - 2.0.5 + 2.0.7 From 97f5c9970c42d6112815453abc134f69969b13c1 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Fri, 21 Jul 2017 22:36:06 -0400 Subject: [PATCH 026/245] prepare for 1.0.0 release! --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1bfd5ad6..c2531439 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.0-SNAPSHOT + 1.0.0 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java From 8623392b870c5abd32518b7898d36b2fa9dda521 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Fri, 21 Jul 2017 22:41:31 -0400 Subject: [PATCH 027/245] next release cycle --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2531439..5baccdf9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.0 + 1.0.1-SNAPSHOT Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java From edf0a194e9cea800425197bd06b406224f958612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sat, 22 Jul 2017 01:44:30 -0400 Subject: [PATCH 028/245] Fix password in CommandLineApp (#168) * Use password if provided (#167) * test encrypted files * test wrong password --- .../technology/tabula/CommandLineApp.java | 2 +- .../technology/tabula/TestCommandLineApp.java | 23 +++++++++++++++++++ .../tabula/TestObjectExtractor.java | 8 +++---- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 546cb698..d0e405e2 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -152,7 +152,7 @@ public void extractFileInto(File pdfFile, File outputFile) throws ParseException private void extractFile(File pdfFile, Appendable outFile) throws ParseException { PDDocument pdfDocument = null; try { - pdfDocument = PDDocument.load(pdfFile); + pdfDocument = this.password == null ? PDDocument.load(pdfFile) : PDDocument.load(pdfFile, this.password); PageIterator pageIterator = getPageIterator(pdfDocument); List
tables = new ArrayList
(); diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index f4f19c26..b5b9663b 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -122,4 +122,27 @@ public void testGuessOption() throws ParseException, IOException { })); } + @Test + public void testEncryptedPasswordSupplied() throws ParseException { + String s = this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/encrypted.pdf", + "-s", "userpassword", + "-p", "1", + "-f", "CSV" + }); + assertEquals("FLA Audit Profile,,,,,,,,,", s.split("\\r?\\n")[0]); + } + + @Test(expected=org.apache.commons.cli.ParseException.class) + public void testEncryptedWrongPassword() throws ParseException { + String s = this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/encrypted.pdf", + "-s", "wrongpassword", + "-p", "1", + "-f", "CSV" + }); + } + + + } diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index cd4c8365..0980e56e 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -39,11 +39,11 @@ public void testCanReadPDFWithOwnerEncryption() throws IOException { assertEquals(2, i); } - /* + @Test public void testGoodPassword() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document, "userpassword"); + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf"), "userpassword"); + ObjectExtractor oe = new ObjectExtractor(pdf_document); List pages = new ArrayList(); PageIterator pi = oe.extract(); while (pi.hasNext()) { @@ -51,7 +51,7 @@ public void testGoodPassword() throws IOException { } assertEquals(1, pages.size()); } - */ + @Test public void testTextExtractionDoesNotRaise() throws IOException { From 7418f80d29e9ee8281bed991a5fe3888835e4362 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Mon, 24 Jul 2017 18:19:40 -0400 Subject: [PATCH 029/245] fix #169 --- README.md | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index bf0ee216..cdd1bd81 100644 --- a/README.md +++ b/README.md @@ -16,45 +16,52 @@ Download a version of the tabula-java's jar, with all dependencies included, tha `tabula-java` provides a command line application: ``` -$ java -jar ./target/tabula-0.9.2-jar-with-dependencies.jar --help - -usage: tabula [-a ] [-b ] [-c ] [-d] [-f ] [-g] [-h] [-i] - [-n] [-o ] [-p ] [-r] [-s ] [-u] [-v] +$ java -jar target/tabula-1.0.0-jar-with-dependencies.jar --help +usage: tabula [-a ] [-b ] [-c ] [-d] [-f + ] [-g] [-h] [-i] [-l] [-n] [-o ] [-p ] [-r] + [-s ] [-t] [-u] [-v] Tabula helps you extract tables from PDFs + -a,--area Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page + -b,--batch Convert all .pdfs in the provided directory. -c,--columns X coordinates of column boundaries. Example --columns 10.1,20.2,30.3 -d,--debug Print detected table areas instead of processing. - -b,--batch Convert all .pdfs in the provided directory - -f,--format Output format: (CSV,TSV,JSON). Default: CSV -g,--guess Guess the portion of the page to analyze per page. -h,--help Print this help text. -i,--silent Suppress all stderr output. - -n,--no-spreadsheet Force PDF not to be extracted using - spreadsheet-style extraction (if there are - ruling lines separating each cell, as in a PDF - of an Excel spreadsheet) + -l,--lattice Force PDF to be extracted using lattice-mode + extraction (if there are ruling lines + separating each cell, as in a PDF of an Excel + spreadsheet) + -n,--no-spreadsheet [Deprecated in favor of -t/--stream] Force PDF + not to be extracted using spreadsheet-style + extraction (if there are no ruling lines + separating each cell) -o,--outfile Write output to instead of STDOUT. Default: - -p,--pages Comma separated list of ranges, or all. Examples: --pages 1-3,5-7, --pages 3 or --pages all. Default is --pages 1 - -r,--spreadsheet Force PDF to be extracted using - spreadsheet-style extraction (if there are - ruling lines separating each cell, as in a PDF - of an Excel spreadsheet) + -r,--spreadsheet [Deprecated in favor of -l/--lattice] Force + PDF to be extracted using spreadsheet-style + extraction (if there are ruling lines + separating each cell, as in a PDF of an Excel + spreadsheet) -s,--password Password to decrypt document. Default is empty + -t,--stream Force PDF to be extracted using stream-mode + extraction (if there are no ruling lines + separating each cell) -u,--use-line-returns Use embedded line returns in cells. (Only in spreadsheet mode.) -v,--version Print version and exit. - ``` It also includes a debugging tool, run `java -cp ./target/tabula-0.9.1-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. From 36cb8662590bae22f1242e4499b309d72425b2d4 Mon Sep 17 00:00:00 2001 From: Alexander Belov Date: Tue, 25 Jul 2017 16:26:47 +0300 Subject: [PATCH 030/245] Delete duplicated addOption --- src/main/java/technology/tabula/CommandLineApp.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index d0e405e2..ce3d82c1 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -273,7 +273,6 @@ public static Options buildOptions() { o.addOption("v", "version", false, "Print version and exit."); o.addOption("h", "help", false, "Print this help text."); o.addOption("g", "guess", false, "Guess the portion of the page to analyze per page."); - o.addOption("d", "debug", false, "Print detected table areas instead of processing"); o.addOption("r", "spreadsheet", false, "[Deprecated in favor of -l/--lattice] Force PDF to be extracted using spreadsheet-style extraction (if there are ruling lines separating each cell, as in a PDF of an Excel spreadsheet)"); o.addOption("n", "no-spreadsheet", false, "[Deprecated in favor of -t/--stream] Force PDF not to be extracted using spreadsheet-style extraction (if there are no ruling lines separating each cell)"); o.addOption("l", "lattice", false, "Force PDF to be extracted using lattice-mode extraction (if there are ruling lines separating each cell, as in a PDF of an Excel spreadsheet)"); From ec0216542df98f874dbe39688d80e5e15e69816c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 12:18:07 -0400 Subject: [PATCH 031/245] Fix/171 (#173) * Started work on #171 * using PDFTextStripper instead of duplicating pdfbox's code in ObjectExtractorStreamEngine * moved textstripper to its own file * removed useless fields/methods in ObjectExtractorStreamEngine * adjust test expectation --- .../technology/tabula/ObjectExtractor.java | 16 +- .../tabula/ObjectExtractorStreamEngine.java | 243 ------------------ .../java/technology/tabula/TextStripper.java | 82 ++++++ .../tabula/TestObjectExtractor.java | 14 +- .../tabula/TestSpreadsheetExtractor.java | 2 +- .../technology/tabula/cs-en-us-pbms.pdf | Bin 0 -> 157922 bytes 6 files changed, 107 insertions(+), 250 deletions(-) create mode 100644 src/main/java/technology/tabula/TextStripper.java create mode 100644 src/test/resources/technology/tabula/cs-en-us-pbms.pdf diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 92b12bf7..2b97a5a8 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -7,13 +7,12 @@ public class ObjectExtractor { - private PDDocument pdfDocument; + private final PDDocument pdfDocument; public ObjectExtractor(PDDocument pdfDocument) throws IOException { this.pdfDocument = pdfDocument; } - protected Page extractPage(Integer pageNumber) throws IOException { if (pageNumber > this.pdfDocument.getNumberOfPages() || pageNumber < 1) { @@ -26,7 +25,12 @@ protected Page extractPage(Integer pageNumber) throws IOException { ObjectExtractorStreamEngine se = new ObjectExtractorStreamEngine(p); se.processPage(p); - Utils.sort(se.characters); + + TextStripper pdfTextStripper = new TextStripper(this.pdfDocument, pageNumber); + + pdfTextStripper.process(); + + Utils.sort(pdfTextStripper.textElements); float w, h; int pageRotation = p.getRotation(); @@ -38,8 +42,8 @@ protected Page extractPage(Integer pageNumber) throws IOException { h = p.getCropBox().getHeight(); } - return new Page(0, 0, w, h, pageRotation, pageNumber, p, se.characters, - se.rulings, se.minCharWidth, se.minCharHeight, se.spatialIndex); + return new Page(0, 0, w, h, pageRotation, pageNumber, p, pdfTextStripper.textElements, + se.rulings, pdfTextStripper.minCharWidth, pdfTextStripper.minCharHeight, pdfTextStripper.spatialIndex); } public PageIterator extract(Iterable pages) { @@ -58,4 +62,6 @@ public void close() throws IOException { this.pdfDocument.close(); } + + } diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index 4796d46d..d9c4f092 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -40,11 +40,7 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { private static final String NBSP = "\u00A0"; - protected float minCharWidth; - protected float minCharHeight; - protected List characters; protected List rulings; - protected RectangleSpatialIndex spatialIndex; private AffineTransform pageTransform; private boolean debugClippingPaths; private boolean extractRulingLines = true; @@ -52,25 +48,16 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { private int clipWindingRule = -1; private GeneralPath currentPath = new GeneralPath(); public List clippingPaths; - private int pageRotation; - private PDRectangle pageSize; private Matrix translateMatrix; - private GlyphList glyphList; protected ObjectExtractorStreamEngine(PDPage page) { super(page); this.log = LoggerFactory.getLogger(ObjectExtractorStreamEngine.class); - this.characters = new ArrayList(); this.rulings = new ArrayList(); this.pageTransform = null; - this.spatialIndex = new RectangleSpatialIndex(); - this.minCharWidth = Float.MAX_VALUE; - this.minCharHeight = Float.MAX_VALUE; - this.pageRotation = page.getRotation(); - this.pageSize = page.getCropBox(); // calculate page transform PDRectangle cb = this.getPage().getCropBox(); @@ -85,62 +72,6 @@ protected ObjectExtractorStreamEngine(PDPage page) { this.pageTransform.concatenate(AffineTransform.getTranslateInstance(0, cb.getHeight())); this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); } - - // load additional glyph list for Unicode mapping - String path = "org/apache/pdfbox/resources/glyphlist/additional.txt"; - InputStream input = GlyphList.class.getClassLoader().getResourceAsStream(path); - this.glyphList = null; - try { - this.glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input); - } catch (IOException e) { - this.log.error("Error loading glyph list", e); - } - } - - @Override - protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode, Vector displacement) - throws IOException { - - TextPosition textPosition = getTextPosition(textRenderingMatrix, font, code, unicode, displacement); - - if (textPosition != null) { - - String c = textPosition.getUnicode(); - - // if c not printable, return - if (!isPrintable(c)) { - return; - } - - Float h = textPosition.getHeightDir(); - - if (c.equals(NBSP)) { // replace non-breaking space for space - c = " "; - } - - float wos = textPosition.getWidthOfSpace(); - - TextElement te = new TextElement(Utils.round(textPosition.getYDirAdj() - h, 2), - Utils.round(textPosition.getXDirAdj(), 2), Utils.round(textPosition.getWidthDirAdj(), 2), - Utils.round(textPosition.getHeightDir(), 2), textPosition.getFont(), textPosition.getFontSize(), c, - // workaround a possible bug in PDFBox: - // https://issues.apache.org/jira/browse/PDFBOX-1755 - wos, textPosition.getDir()); - - if (this.currentClippingPath().intersects(te)) { - - this.minCharWidth = (float) Math.min(this.minCharWidth, te.getWidth()); - this.minCharHeight = (float) Math.min(this.minCharHeight, te.getHeight()); - - this.spatialIndex.add(te); - this.characters.add(te); - } - - if (this.isDebugClippingPaths() && !this.clippingPaths.contains(this.currentClippingPath())) { - this.clippingPaths.add(this.currentClippingPath()); - } - } - } @Override @@ -327,180 +258,6 @@ public Rectangle2D currentClippingPath() { return transformedClippingPathBounds; } - private static boolean isPrintable(String s) { - Character c; - Character.UnicodeBlock block; - boolean printable = false; - for (int i = 0; i < s.length(); i++) { - c = s.charAt(i); - block = Character.UnicodeBlock.of(c); - printable |= !Character.isISOControl(c) && block != null && block != Character.UnicodeBlock.SPECIALS; - } - return printable; - } - - private TextPosition getTextPosition(Matrix textRenderingMatrix, PDFont font, int code, String unicode, - Vector displacement) throws IOException { - - // LegacyPDFStreamEngine - PDGraphicsState state = getGraphicsState(); - Matrix ctm = state.getCurrentTransformationMatrix(); - float fontSize = state.getTextState().getFontSize(); - float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f; - Matrix textMatrix = getTextMatrix(); - - BoundingBox bbox = font.getBoundingBox(); - if (bbox.getLowerLeftY() < Short.MIN_VALUE) { - // PDFBOX-2158 and PDFBOX-3130 - // files by Salmat eSolutions / ClibPDF Library - bbox.setLowerLeftY(-(bbox.getLowerLeftY() + 65536)); - } - // 1/2 the bbox is used as the height todo: why? - float glyphHeight = bbox.getHeight() / 2; - - PDFontDescriptor fontDescriptor = font.getFontDescriptor(); - if (fontDescriptor != null) - { - float capHeight = fontDescriptor.getCapHeight(); - if (capHeight != 0 && capHeight < glyphHeight) - { - glyphHeight = capHeight; - } - } - - // transformPoint from glyph space -> text space - float height; - if (font instanceof PDType3Font) { - height = font.getFontMatrix().transformPoint(0, glyphHeight).y; - } else { - height = glyphHeight / 1000; - } - - float displacementX = displacement.getX(); - // the sorting algorithm is based on the width of the character. As the - // displacement - // for vertical characters doesn't provide any suitable value for it, we - // have to - // calculate our own - if (font.isVertical()) { - displacementX = font.getWidth(code) / 1000; - // there may be an additional scaling factor for true type fonts - TrueTypeFont ttf = null; - if (font instanceof PDTrueTypeFont) { - ttf = ((PDTrueTypeFont) font).getTrueTypeFont(); - } else if (font instanceof PDType0Font) { - PDCIDFont cidFont = ((PDType0Font) font).getDescendantFont(); - if (cidFont instanceof PDCIDFontType2) { - ttf = ((PDCIDFontType2) cidFont).getTrueTypeFont(); - } - } - if (ttf != null && ttf.getUnitsPerEm() != 1000) { - displacementX *= 1000f / ttf.getUnitsPerEm(); - } - } - - // (modified) combined displacement, this is calculated *without* taking - // the character - // spacing and word spacing into account, due to legacy code in - // TextStripper - float tx = displacementX * fontSize * horizontalScaling; - float ty = displacement.getY() * fontSize; - - // (modified) combined displacement matrix - Matrix td = Matrix.getTranslateInstance(tx, ty); - - // (modified) text rendering matrix - Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text - // space - // -> - // device - // space - float nextX = nextTextRenderingMatrix.getTranslateX(); - float nextY = nextTextRenderingMatrix.getTranslateY(); - - // (modified) width and height calculations - float dxDisplay = nextX - textRenderingMatrix.getTranslateX(); - float dyDisplay = height * textRenderingMatrix.getScalingFactorY(); - - // - // start of the original method - // - - // Note on variable names. There are three different units being used in - // this code. - // Character sizes are given in glyph units, text locations are - // initially given in text - // units, and we want to save the data in display units. The variable - // names should end with - // Text or Disp to represent if the values are in text or disp units (no - // glyph units are - // saved). - - float glyphSpaceToTextSpaceFactor = 1 / 1000f; - if (font instanceof PDType3Font) { - glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX(); - } - - float spaceWidthText = 0; - try { - // to avoid crash as described in PDFBOX-614, see what the space - // displacement should be - spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor; - } catch (Throwable exception) { - this.log.warn("Error getting spaceWidthText", exception); - } - - if (spaceWidthText == 0) { - spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor; - // the average space width appears to be higher than necessary so - // make it smaller - spaceWidthText *= .80f; - } - if (spaceWidthText == 0) { - spaceWidthText = 1.0f; // if could not find font, use a generic - // value - } - - // the space width has to be transformed into display units - float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX(); - - // use our additional glyph list for Unicode mapping - unicode = font.toUnicode(code, glyphList); - - // when there is no Unicode mapping available, Acrobat simply coerces - // the character code - // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't - // necessarily want - // this, which is why we leave it until this point in - // PDFTextStreamEngine. - if (unicode == null) { - if (font instanceof PDSimpleFont) { - char c = (char) code; - unicode = new String(new char[]{c}); - } else { - // Acrobat doesn't seem to coerce composite font's character - // codes, instead it - // skips them. See the "allah2.pdf" TestTextStripper file. - return null; - } - } - - // adjust for cropbox if needed - Matrix translatedTextRenderingMatrix; - if (translateMatrix == null) { - translatedTextRenderingMatrix = textRenderingMatrix; - } else { - translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix); - nextX -= pageSize.getLowerLeftX(); - nextY -= pageSize.getLowerLeftY(); - - } - - return new TextPosition(pageRotation, pageSize.getWidth(), pageSize.getHeight(), translatedTextRenderingMatrix, - nextX, nextY, Math.abs(dyDisplay), dxDisplay, Math.abs(spaceWidthDisplay), unicode, new int[]{code}, - font, fontSize, (int) (fontSize * textMatrix.getScalingFactorX())); - } - public boolean isDebugClippingPaths() { return debugClippingPaths; } diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java new file mode 100644 index 00000000..842d5299 --- /dev/null +++ b/src/main/java/technology/tabula/TextStripper.java @@ -0,0 +1,82 @@ +package technology.tabula; + +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.text.PDFTextStripper; +import org.apache.pdfbox.text.TextPosition; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class TextStripper extends PDFTextStripper { + private static final String NBSP = "\u00A0"; + private PDDocument document; + public ArrayList textElements; + public RectangleSpatialIndex spatialIndex; + public float minCharWidth = Float.MAX_VALUE;; + public float minCharHeight = Float.MAX_VALUE;; + + public TextStripper(PDDocument document, int pageNumber) throws IOException { + super(); + this.document = document; + this.setStartPage(pageNumber); + this.setEndPage(pageNumber); + this.textElements = new ArrayList<>(); + this.spatialIndex = new RectangleSpatialIndex<>(); + } + + public void process() throws IOException { + this.getText(this.document); + } + + @Override + protected void writeString(String string, List textPositions) throws IOException + { + for (TextPosition textPosition: textPositions) + { + if (textPosition == null) { + continue; + } + + String c = textPosition.getUnicode(); + + // if c not printable, return + if (!isPrintable(c)) { + continue; + } + + Float h = textPosition.getHeightDir(); + + if (c.equals(NBSP)) { // replace non-breaking space for space + c = " "; + } + + float wos = textPosition.getWidthOfSpace(); + + TextElement te = new TextElement(Utils.round(textPosition.getYDirAdj() - h, 2), + Utils.round(textPosition.getXDirAdj(), 2), Utils.round(textPosition.getWidthDirAdj(), 2), + Utils.round(textPosition.getHeightDir(), 2), textPosition.getFont(), textPosition.getFontSize(), c, + // workaround a possible bug in PDFBox: + // https://issues.apache.org/jira/browse/PDFBOX-1755 + wos, textPosition.getDir()); + + this.minCharWidth = (float) Math.min(this.minCharWidth, te.getWidth()); + this.minCharHeight = (float) Math.min(this.minCharHeight, te.getHeight()); + + this.spatialIndex.add(te); + this.textElements.add(te); + } + } + + private boolean isPrintable(String s) { + Character c; + Character.UnicodeBlock block; + boolean printable = false; + for (int i = 0; i < s.length(); i++) { + c = s.charAt(i); + block = Character.UnicodeBlock.of(c); + printable |= !Character.isISOControl(c) && block != null && block != Character.UnicodeBlock.SPECIALS; + } + return printable; + } +} \ No newline at end of file diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index 0980e56e..4f539b85 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -44,7 +44,7 @@ public void testCanReadPDFWithOwnerEncryption() throws IOException { public void testGoodPassword() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf"), "userpassword"); ObjectExtractor oe = new ObjectExtractor(pdf_document); - List pages = new ArrayList(); + List pages = new ArrayList<>(); PageIterator pi = oe.extract(); while (pi.hasNext()) { pages.add(pi.next()); @@ -111,6 +111,18 @@ public void testExtractWrongPageNumber() throws IOException { oe.extract(3); } + + @Test + public void testTextElementsContainedInPage() throws IOException { + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/cs-en-us-pbms.pdf")); + ObjectExtractor oe = new ObjectExtractor(pdf_document); + + Page page = oe.extractPage(1); + + for (TextElement te: page.getText()) { + assertTrue(page.contains(te)); + } + } /* @Test diff --git a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java index ecc4087f..d63da204 100644 --- a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java +++ b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java @@ -455,7 +455,7 @@ public void testRTL() throws IOException { assertEquals("اسمي Jeremy في الانجليزية", table.getRows().get(4).get(1).getText()); // conjoined lam-alif gets missed assertEquals("عندي 47 قطط", table.getRows().get(3).get(1).getText()); // the real right answer is 47. assertEquals("Jeremy is جرمي in Arabic", table.getRows().get(5).get(0).getText()); // the real right answer is 47. - assertEquals("مرحبًا", table.getRows().get(1).get(0).getText()); // really ought to be ً, but this is forgiveable for now + assertEquals("مرحباً", table.getRows().get(1).get(0).getText()); // really ought to be ً, but this is forgiveable for now // there is one remaining problems that are not yet addressed // - diacritics (e.g. Arabic's tanwinً and probably Hebrew nekudot) are put in the wrong place. diff --git a/src/test/resources/technology/tabula/cs-en-us-pbms.pdf b/src/test/resources/technology/tabula/cs-en-us-pbms.pdf new file mode 100644 index 0000000000000000000000000000000000000000..abbeeafb8f7ed1c12090caf74d1dbc0bc3f13390 GIT binary patch literal 157922 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%0D&bO5LXvB`9me}Nh(j&o%r!5{ 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%0A9G&N|Kn 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 literal 0 HcmV?d00001 From b66779341c98481d9f2691d58cec5f3d0a94d971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 12:46:50 -0400 Subject: [PATCH 032/245] fix deprecation messages and unused imports --- src/main/java/technology/tabula/CommandLineApp.java | 3 --- src/test/java/technology/tabula/TestCommandLineApp.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index ce3d82c1..8f29608a 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -1,13 +1,11 @@ package technology.tabula; -import java.awt.geom.Point2D; import java.io.BufferedWriter; import java.io.File; import java.io.FilenameFilter; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.commons.cli.CommandLine; @@ -21,7 +19,6 @@ import technology.tabula.detectors.DetectionAlgorithm; import technology.tabula.detectors.NurminenDetectionAlgorithm; -import technology.tabula.detectors.SpreadsheetDetectionAlgorithm; import technology.tabula.extractors.BasicExtractionAlgorithm; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; import technology.tabula.writers.CSVWriter; diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index b5b9663b..fd79e9c2 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -10,14 +10,14 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.ParseException; import org.junit.Test; public class TestCommandLineApp { private String csvFromCommandLineArgs(String[] args) throws ParseException { - CommandLineParser parser = new GnuParser(); + CommandLineParser parser = new DefaultParser(); CommandLine cmd = parser.parse(CommandLineApp.buildOptions(), args); StringBuilder stringBuilder = new StringBuilder(); From 1ff7e197689c3120bf3e5022738e619176e7b5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 12:49:08 -0400 Subject: [PATCH 033/245] we no longer need DummyGraphics2D --- .../technology/tabula/DummyGraphics2D.java | 461 ------------------ 1 file changed, 461 deletions(-) delete mode 100644 src/main/java/technology/tabula/DummyGraphics2D.java diff --git a/src/main/java/technology/tabula/DummyGraphics2D.java b/src/main/java/technology/tabula/DummyGraphics2D.java deleted file mode 100644 index 88026fec..00000000 --- a/src/main/java/technology/tabula/DummyGraphics2D.java +++ /dev/null @@ -1,461 +0,0 @@ -package technology.tabula; - -import java.awt.Color; -import java.awt.Composite; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.GraphicsConfiguration; -import java.awt.Image; -import java.awt.Paint; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.RenderingHints.Key; -import java.awt.Shape; -import java.awt.Stroke; -import java.awt.font.FontRenderContext; -import java.awt.font.GlyphVector; -import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; -import java.awt.image.BufferedImageOp; -import java.awt.image.ImageObserver; -import java.awt.image.RenderedImage; -import java.awt.image.renderable.RenderableImage; -import java.text.AttributedCharacterIterator; -import java.util.Map; - -public class DummyGraphics2D extends Graphics2D { - - @Override - public void addRenderingHints(Map hints) { - // TODO Auto-generated method stub - - } - - @Override - public void clip(Shape s) { - // TODO Auto-generated method stub - - } - - @Override - public void draw(Shape s) { - // TODO Auto-generated method stub - - } - - @Override - public void drawGlyphVector(GlyphVector g, float x, float y) { - // TODO Auto-generated method stub - - } - - @Override - public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) { - // TODO Auto-generated method stub - - } - - @Override - public void drawRenderableImage(RenderableImage img, AffineTransform xform) { - // TODO Auto-generated method stub - - } - - @Override - public void drawRenderedImage(RenderedImage img, AffineTransform xform) { - // TODO Auto-generated method stub - - } - - @Override - public void drawString(String str, int x, int y) { - // TODO Auto-generated method stub - - } - - @Override - public void drawString(String str, float x, float y) { - // TODO Auto-generated method stub - - } - - @Override - public void drawString(AttributedCharacterIterator iterator, int x, int y) { - // TODO Auto-generated method stub - - } - - @Override - public void drawString(AttributedCharacterIterator iterator, float x, - float y) { - // TODO Auto-generated method stub - - } - - @Override - public void fill(Shape s) { - // TODO Auto-generated method stub - - } - - @Override - public Color getBackground() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Composite getComposite() { - // TODO Auto-generated method stub - return null; - } - - @Override - public GraphicsConfiguration getDeviceConfiguration() { - // TODO Auto-generated method stub - return null; - } - - @Override - public FontRenderContext getFontRenderContext() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Paint getPaint() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getRenderingHint(Key hintKey) { - // TODO Auto-generated method stub - return null; - } - - @Override - public RenderingHints getRenderingHints() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Stroke getStroke() { - // TODO Auto-generated method stub - return null; - } - - @Override - public AffineTransform getTransform() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean hit(Rectangle rect, Shape s, boolean onStroke) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void rotate(double theta) { - // TODO Auto-generated method stub - - } - - @Override - public void rotate(double theta, double x, double y) { - // TODO Auto-generated method stub - - } - - @Override - public void scale(double sx, double sy) { - // TODO Auto-generated method stub - - } - - @Override - public void setBackground(Color color) { - // TODO Auto-generated method stub - - } - - @Override - public void setComposite(Composite comp) { - // TODO Auto-generated method stub - - } - - @Override - public void setPaint(Paint paint) { - // TODO Auto-generated method stub - - } - - @Override - public void setRenderingHint(Key hintKey, Object hintValue) { - // TODO Auto-generated method stub - - } - - @Override - public void setRenderingHints(Map hints) { - // TODO Auto-generated method stub - - } - - @Override - public void setStroke(Stroke s) { - // TODO Auto-generated method stub - - } - - @Override - public void setTransform(AffineTransform Tx) { - // TODO Auto-generated method stub - - } - - @Override - public void shear(double shx, double shy) { - // TODO Auto-generated method stub - - } - - @Override - public void transform(AffineTransform Tx) { - // TODO Auto-generated method stub - - } - - @Override - public void translate(int x, int y) { - // TODO Auto-generated method stub - - } - - @Override - public void translate(double tx, double ty) { - // TODO Auto-generated method stub - - } - - @Override - public void clearRect(int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public void clipRect(int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public void copyArea(int x, int y, int width, int height, int dx, int dy) { - // TODO Auto-generated method stub - - } - - @Override - public Graphics create() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void dispose() { - // TODO Auto-generated method stub - - } - - @Override - public void drawArc(int x, int y, int width, int height, int startAngle, - int arcAngle) { - // TODO Auto-generated method stub - - } - - @Override - public boolean drawImage(Image img, int x, int y, ImageObserver observer) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean drawImage(Image img, int x, int y, Color bgcolor, - ImageObserver observer) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean drawImage(Image img, int x, int y, int width, int height, - ImageObserver observer) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean drawImage(Image img, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, ImageObserver observer) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, Color bgcolor, - ImageObserver observer) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void drawLine(int x1, int y1, int x2, int y2) { - // TODO Auto-generated method stub - - } - - @Override - public void drawOval(int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) { - // TODO Auto-generated method stub - - } - - @Override - public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) { - // TODO Auto-generated method stub - - } - - @Override - public void drawRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) { - // TODO Auto-generated method stub - - } - - @Override - public void fillArc(int x, int y, int width, int height, int startAngle, - int arcAngle) { - // TODO Auto-generated method stub - - } - - @Override - public void fillOval(int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) { - // TODO Auto-generated method stub - - } - - @Override - public void fillRect(int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public void fillRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) { - // TODO Auto-generated method stub - - } - - @Override - public Shape getClip() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Rectangle getClipBounds() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Color getColor() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Font getFont() { - // TODO Auto-generated method stub - return null; - } - - @Override - public FontMetrics getFontMetrics(Font f) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setClip(Shape clip) { - // TODO Auto-generated method stub - - } - - @Override - public void setClip(int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public void setColor(Color c) { - // TODO Auto-generated method stub - - } - - @Override - public void setFont(Font font) { - // TODO Auto-generated method stub - - } - - @Override - public void setPaintMode() { - // TODO Auto-generated method stub - - } - - @Override - public void setXORMode(Color c1) { - // TODO Auto-generated method stub - - } - -} From 56deffa9ea6b54eb8309e976465c4eff3fd81821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 12:57:59 -0400 Subject: [PATCH 034/245] style issues, compiler warnings --- src/main/java/technology/tabula/CommandLineApp.java | 3 +-- .../technology/tabula/ObjectExtractorStreamEngine.java | 3 +-- .../java/technology/tabula/RectangleSpatialIndex.java | 8 ++++---- src/main/java/technology/tabula/Ruling.java | 2 +- src/main/java/technology/tabula/TextElement.java | 6 ++---- src/main/java/technology/tabula/TextStripper.java | 4 ++-- .../tabula/detectors/SpreadsheetDetectionAlgorithm.java | 2 +- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 8f29608a..bf65eabb 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -178,10 +178,9 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException private PageIterator getPageIterator(PDDocument pdfDocument) throws IOException { ObjectExtractor extractor = new ObjectExtractor(pdfDocument); - PageIterator pageIterator = (pages == null) ? + return (pages == null) ? extractor.extract() : extractor.extract(pages); - return pageIterator; } // CommandLine parsing methods diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index d9c4f092..bee52511 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -253,9 +253,8 @@ public AffineTransform getPageTransform() { public Rectangle2D currentClippingPath() { Shape clippingPath = this.getGraphicsState().getCurrentClippingPath(); Shape transformedClippingPath = this.getPageTransform().createTransformedShape(clippingPath); - Rectangle2D transformedClippingPathBounds = transformedClippingPath.getBounds2D(); - return transformedClippingPathBounds; + return transformedClippingPath.getBounds2D(); } public boolean isDebugClippingPaths() { diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index e3aa633e..ed06570e 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -17,13 +17,13 @@ class SaveToListProcedure implements TIntProcedure { public boolean execute(int id) { ids.add(id); return true; - }; - + } + private List getIds() { return ids; } - }; - + } + private final SpatialIndex si; private final List rectangles; private Rectangle bounds = null; diff --git a/src/main/java/technology/tabula/Ruling.java b/src/main/java/technology/tabula/Ruling.java index 8d455dfa..8eb16b5e 100644 --- a/src/main/java/technology/tabula/Ruling.java +++ b/src/main/java/technology/tabula/Ruling.java @@ -16,7 +16,7 @@ public class Ruling extends Line2D.Float { private static int PERPENDICULAR_PIXEL_EXPAND_AMOUNT = 2; private static int COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT = 1; - private enum SOType { VERTICAL, HRIGHT, HLEFT }; + private enum SOType { VERTICAL, HRIGHT, HLEFT } public Ruling(float top, float left, float width, float height) { this(new Point2D.Float(left, top), new Point2D.Float(left+width, top+height)); diff --git a/src/main/java/technology/tabula/TextElement.java b/src/main/java/technology/tabula/TextElement.java index 7e58ff8d..6e232854 100644 --- a/src/main/java/technology/tabula/TextElement.java +++ b/src/main/java/technology/tabula/TextElement.java @@ -95,10 +95,8 @@ public boolean equals(Object obj) { return false; } else if (!text.equals(other.text)) return false; - if (java.lang.Float.floatToIntBits(widthOfSpace) != java.lang.Float - .floatToIntBits(other.widthOfSpace)) - return false; - return true; + return java.lang.Float.floatToIntBits(widthOfSpace) == java.lang.Float + .floatToIntBits(other.widthOfSpace); } public static List mergeWords(List textElements) { diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index 842d5299..3e1c82a1 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -13,8 +13,8 @@ public class TextStripper extends PDFTextStripper { private PDDocument document; public ArrayList textElements; public RectangleSpatialIndex spatialIndex; - public float minCharWidth = Float.MAX_VALUE;; - public float minCharHeight = Float.MAX_VALUE;; + public float minCharWidth = Float.MAX_VALUE; + public float minCharHeight = Float.MAX_VALUE; public TextStripper(PDDocument document, int pageNumber) throws IOException { super(); diff --git a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java index 87a2193d..04934f11 100644 --- a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java @@ -25,7 +25,7 @@ public List detect(Page page) { SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List tables = sea.findSpreadsheetsFromCells(cells); + List tables = SpreadsheetExtractionAlgorithm.findSpreadsheetsFromCells(cells); // we want tables to be returned from top to bottom on the page Collections.sort(tables); From 0af623a6e0af756f71af417e3c9c5731e9f3f6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 13:02:19 -0400 Subject: [PATCH 035/245] cleanup: remove unnecessary imports --- .../tabula/ObjectExtractorStreamEngine.java | 15 --------------- src/main/java/technology/tabula/Page.java | 3 --- .../technology/tabula/RectangleSpatialIndex.java | 1 - .../tabula/detectors/DetectionAlgorithm.java | 2 -- .../detectors/SpreadsheetDetectionAlgorithm.java | 3 --- .../SpreadsheetExtractionAlgorithm.java | 2 -- .../technology/tabula/TestBasicExtractor.java | 3 --- src/test/java/technology/tabula/TestCell.java | 1 - src/test/java/technology/tabula/TestDebug.java | 8 -------- .../technology/tabula/TestProjectionProfile.java | 1 - src/test/java/technology/tabula/TestRuling.java | 4 ---- .../technology/tabula/TestTableDetection.java | 1 - src/test/java/technology/tabula/TestUtils.java | 1 - .../java/technology/tabula/UtilsForTesting.java | 2 -- 14 files changed, 47 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index bee52511..5043c75c 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -8,31 +8,16 @@ import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.fontbox.ttf.TrueTypeFont; -import org.apache.fontbox.util.BoundingBox; import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDRectangle; -import org.apache.pdfbox.pdmodel.font.PDCIDFont; -import org.apache.pdfbox.pdmodel.font.PDCIDFontType2; -import org.apache.pdfbox.pdmodel.font.PDFont; -import org.apache.pdfbox.pdmodel.font.PDFontDescriptor; -import org.apache.pdfbox.pdmodel.font.PDSimpleFont; -import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont; -import org.apache.pdfbox.pdmodel.font.PDType0Font; -import org.apache.pdfbox.pdmodel.font.PDType3Font; -import org.apache.pdfbox.pdmodel.font.encoding.GlyphList; import org.apache.pdfbox.pdmodel.graphics.image.PDImage; -import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState; -import org.apache.pdfbox.text.TextPosition; import org.apache.pdfbox.util.Matrix; -import org.apache.pdfbox.util.Vector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 7128d993..8177921b 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -2,12 +2,9 @@ import java.awt.geom.Point2D; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.pdfbox.pdmodel.PDPage; diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index ed06570e..498106db 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -3,7 +3,6 @@ import gnu.trove.procedure.TIntProcedure; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import net.sf.jsi.SpatialIndex; diff --git a/src/main/java/technology/tabula/detectors/DetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/DetectionAlgorithm.java index 6f717c5b..c292c282 100644 --- a/src/main/java/technology/tabula/detectors/DetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/DetectionAlgorithm.java @@ -1,10 +1,8 @@ package technology.tabula.detectors; -import org.apache.pdfbox.pdmodel.PDDocument; import technology.tabula.Page; import technology.tabula.Rectangle; -import java.io.File; import java.util.List; /** diff --git a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java index 04934f11..06f966e1 100644 --- a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java @@ -1,13 +1,10 @@ package technology.tabula.detectors; -import org.apache.pdfbox.pdmodel.PDDocument; import technology.tabula.Cell; import technology.tabula.Page; import technology.tabula.Rectangle; -import technology.tabula.Ruling; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; -import java.io.File; import java.util.Collections; import java.util.List; diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 78b039a9..7429abf7 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -1,7 +1,6 @@ package technology.tabula.extractors; import java.awt.geom.Point2D; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -19,7 +18,6 @@ import technology.tabula.TableWithRulingLines; import technology.tabula.TextElement; import technology.tabula.Utils; -import technology.tabula.writers.CSVWriter; /** * @author manuel diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index debd9fd1..da40db78 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -6,11 +6,8 @@ import java.io.IOException; import java.nio.charset.Charset; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import junit.framework.Assert; - import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; diff --git a/src/test/java/technology/tabula/TestCell.java b/src/test/java/technology/tabula/TestCell.java index 384645b7..92796920 100644 --- a/src/test/java/technology/tabula/TestCell.java +++ b/src/test/java/technology/tabula/TestCell.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.ArrayList; -import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.junit.Test; diff --git a/src/test/java/technology/tabula/TestDebug.java b/src/test/java/technology/tabula/TestDebug.java index febbbd15..2e8de98c 100644 --- a/src/test/java/technology/tabula/TestDebug.java +++ b/src/test/java/technology/tabula/TestDebug.java @@ -1,13 +1,5 @@ package technology.tabula; -import static org.junit.Assert.*; - -import java.io.File; -import java.io.IOException; - -import org.junit.Test; -import technology.tabula.debug.Debug; - public class TestDebug { private final static String PATH = "src/test/resources/technology/tabula/spanning_cells.pdf"; diff --git a/src/test/java/technology/tabula/TestProjectionProfile.java b/src/test/java/technology/tabula/TestProjectionProfile.java index 6a953ad0..4bdd83af 100644 --- a/src/test/java/technology/tabula/TestProjectionProfile.java +++ b/src/test/java/technology/tabula/TestProjectionProfile.java @@ -3,7 +3,6 @@ import static org.junit.Assert.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.pdfbox.pdmodel.PDPage; diff --git a/src/test/java/technology/tabula/TestRuling.java b/src/test/java/technology/tabula/TestRuling.java index b25a81a5..e21e3a27 100644 --- a/src/test/java/technology/tabula/TestRuling.java +++ b/src/test/java/technology/tabula/TestRuling.java @@ -2,10 +2,6 @@ import static org.junit.Assert.*; -import java.awt.geom.Point2D; -import java.util.ArrayList; -import java.util.List; - import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/technology/tabula/TestTableDetection.java b/src/test/java/technology/tabula/TestTableDetection.java index 6e90a08c..33e8cff9 100644 --- a/src/test/java/technology/tabula/TestTableDetection.java +++ b/src/test/java/technology/tabula/TestTableDetection.java @@ -13,7 +13,6 @@ import com.google.gson.Gson; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index 6837364d..5a961354 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -11,7 +11,6 @@ import java.util.List; import org.apache.commons.cli.ParseException; -import org.junit.Before; import org.junit.Test; public class TestUtils { diff --git a/src/test/java/technology/tabula/UtilsForTesting.java b/src/test/java/technology/tabula/UtilsForTesting.java index c4f2fe93..524b497e 100644 --- a/src/test/java/technology/tabula/UtilsForTesting.java +++ b/src/test/java/technology/tabula/UtilsForTesting.java @@ -1,7 +1,5 @@ package technology.tabula; -import static org.junit.Assert.assertEquals; - import java.io.*; import java.nio.charset.Charset; import java.util.List; From 78237c46d20f9e10579919bc15c6a02efbc0a724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 14:24:39 -0400 Subject: [PATCH 036/245] Remove oraclejdk7 from travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2e1366a..46e41e94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: java install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V script: mvn test -Dgpg.skip=true jdk: - - oraclejdk7 - openjdk7 - oraclejdk8 sudo: false From 7227fe00f6d2d034f10923d6b7b02695ce5269fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 15:10:13 -0400 Subject: [PATCH 037/245] Correct assertion, fails (as it should) --- src/test/java/technology/tabula/TestObjectExtractor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index 4f539b85..d7ac5a69 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -71,8 +71,11 @@ public void testShouldDetectRulings() throws IOException { ObjectExtractor oe = new ObjectExtractor(pdf_document); PageIterator pi = oe.extract(); - while (pi.hasNext()) { - assertNotEquals(0, pi.next().getRulings().size()); + Page page = pi.next(); + List rulings = page.getRulings(); + + for (Ruling r: rulings) { + assertTrue(page.contains(r.getBounds())); } } From 9f62c30818a8800e432c5905f093f5f7ec947f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 28 Jul 2017 15:56:44 -0400 Subject: [PATCH 038/245] =?UTF-8?q?Account=20for=20non-(0,0)=20CropBoxes?= =?UTF-8?q?=20=E2=80=94=20Fixes=20#174?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/technology/tabula/ObjectExtractorStreamEngine.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index 5043c75c..1538cfa6 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -57,6 +57,8 @@ protected ObjectExtractorStreamEngine(PDPage page) { this.pageTransform.concatenate(AffineTransform.getTranslateInstance(0, cb.getHeight())); this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); } + + this.pageTransform.translate(-cb.getLowerLeftX(), -cb.getLowerLeftY()); } @Override From e94e2910b85605e593dc932b6c23d70657af6d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 31 Jul 2017 17:01:37 -0400 Subject: [PATCH 039/245] remove dependency on pdfbox-tools --- pom.xml | 6 +----- src/main/java/technology/tabula/debug/Debug.java | 5 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5baccdf9..51e3a0ef 100644 --- a/pom.xml +++ b/pom.xml @@ -237,11 +237,7 @@ 2.0.7 - - org.apache.pdfbox - pdfbox-tools - 2.0.7 - + org.bouncycastle diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index f58626b3..0c62784d 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -34,7 +34,8 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.rendering.ImageType; -import org.apache.pdfbox.tools.imageio.ImageIOUtil; + +import javax.imageio.ImageIO; public class Debug { @@ -272,7 +273,7 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re document.close(); - ImageIOUtil.writeImage(image, outPath, 72); + ImageIO.write(image, "jpg", new File(outPath)); } @SuppressWarnings("static-access") From 734b6b98aebc0d9e2b09708b2959fc1958e24a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 31 Jul 2017 17:03:27 -0400 Subject: [PATCH 040/245] fix pom.xml --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 51e3a0ef..1f381f14 100644 --- a/pom.xml +++ b/pom.xml @@ -237,8 +237,6 @@ 2.0.7 - - org.bouncycastle bcprov-jdk15on From 173575835fc9ce28f4589b09761771b676a051c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 2 Aug 2017 19:40:34 -0400 Subject: [PATCH 041/245] jpeg2000 and jbig2 support --- pom.xml | 56 ++++++------------ .../resources/technology/tabula/jpeg2000.pdf | Bin 0 -> 34154 bytes 2 files changed, 18 insertions(+), 38 deletions(-) create mode 100644 src/test/resources/technology/tabula/jpeg2000.pdf diff --git a/pom.xml b/pom.xml index 1f381f14..2bd50d10 100644 --- a/pom.xml +++ b/pom.xml @@ -63,19 +63,6 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - true - - - - - @@ -105,18 +92,6 @@ org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - org.apache.maven.plugins maven-gpg-plugin 1.5 @@ -167,19 +142,6 @@ release - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - org.apache.maven.plugins maven-source-plugin @@ -273,6 +235,24 @@ gson 2.8.0 + + + com.github.jai-imageio + jai-imageio-core + 1.3.1 + + + + com.github.jai-imageio + jai-imageio-jpeg2000 + 1.3.0 + + + + com.levigo.jbig2 + levigo-jbig2-imageio + 2.0 + diff --git a/src/test/resources/technology/tabula/jpeg2000.pdf b/src/test/resources/technology/tabula/jpeg2000.pdf new file mode 100644 index 0000000000000000000000000000000000000000..815a5010494fa37c922be709a6dd77b90c3c9c28 GIT binary patch literal 34154 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 literal 0 HcmV?d00001 From 741cc0f8c3ccc889b92c91969e924b9a99b0d7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 2 Aug 2017 19:43:12 -0400 Subject: [PATCH 042/245] test, fix pom --- pom.xml | 1 - src/test/java/technology/tabula/TestUtils.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bd50d10..1f0c99f1 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,6 @@ - org.apache.maven.plugins org.apache.maven.plugins maven-gpg-plugin 1.5 diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index 5a961354..75146565 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -5,12 +5,17 @@ import static org.junit.Assert.assertNull; import java.awt.geom.Point2D; +import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.apache.pdfbox.rendering.ImageType; import org.apache.commons.cli.ParseException; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; import org.junit.Test; public class TestUtils { @@ -115,4 +120,11 @@ public void testQuickSortLongList() { assertEquals(expectedNumbers, numbers); } + @Test + public void testJPEG2000DoesNotRaise() throws IOException { + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/jpeg2000.pdf")); + PDPage page = pdf_document.getPage(0); + Utils.pageConvertToImage(page, 360, ImageType.RGB); + } + } From 179c6f3379596cb3c6c269a111c00f0695e332d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Thu, 3 Aug 2017 16:52:34 -0400 Subject: [PATCH 043/245] Use custom sort in SpreadsheetExtractionAlgorithm --- .../tabula/extractors/SpreadsheetExtractionAlgorithm.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 7429abf7..f5052e69 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -241,9 +241,9 @@ public static List findSpreadsheetsFromCells(List(new HashSet(cells)); - - Collections.sort(cells); - + + Utils.sort(cells); + for (Rectangle cell: cells) { for(Point2D pt: cell.getPoints()) { if (pointSet.contains(pt)) { // shared vertex, remove it From 75787845e5c68e5834803d2818ade4eeabac66ce Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Sun, 6 Aug 2017 14:49:41 -0400 Subject: [PATCH 044/245] add comment in ProjectionProfile --- src/main/java/technology/tabula/ProjectionProfile.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/technology/tabula/ProjectionProfile.java b/src/main/java/technology/tabula/ProjectionProfile.java index 6479964d..d80f18b0 100644 --- a/src/main/java/technology/tabula/ProjectionProfile.java +++ b/src/main/java/technology/tabula/ProjectionProfile.java @@ -5,6 +5,8 @@ import java.util.List; +// NOTE: this class is currently not used by the extraction algorithms +// keeping it for potential use. public class ProjectionProfile { public static final int DECIMAL_PLACES = 1; // fixed <-> float conversion precision From e9667a5782376100f20c9eb5759d2d2de6f6e6d9 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Sun, 6 Aug 2017 14:50:12 -0400 Subject: [PATCH 045/245] Prepare release --- README.md | 4 ++-- pom.xml | 2 +- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cdd1bd81..cd9717c6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Download a version of the tabula-java's jar, with all dependencies included, tha `tabula-java` provides a command line application: ``` -$ java -jar target/tabula-1.0.0-jar-with-dependencies.jar --help +$ java -jar target/tabula-1.0.1-jar-with-dependencies.jar --help usage: tabula [-a ] [-b ] [-c ] [-d] [-f ] [-g] [-h] [-i] [-l] [-n] [-o ] [-p ] [-r] [-s ] [-t] [-u] [-v] @@ -64,7 +64,7 @@ Tabula helps you extract tables from PDFs -v,--version Print version and exit. ``` -It also includes a debugging tool, run `java -cp ./target/tabula-0.9.1-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. +It also includes a debugging tool, run `java -cp ./target/tabula-1.0.1-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. You can also integrate `tabula-java` with any JVM language. For Java examples, see the [`tests`](src/test/java/technology/tabula/) folder. diff --git a/pom.xml b/pom.xml index 1f0c99f1..dc985bf0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.1-SNAPSHOT + 1.0.1 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index bf65eabb..b8cfa3cd 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -29,7 +29,7 @@ public class CommandLineApp { - private static String VERSION = "1.0.0"; + private static String VERSION = "1.0.1"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2017 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; From 9c154f6a9cf7522dfe10199e226259a39e2c19ed Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Sun, 6 Aug 2017 15:27:44 -0400 Subject: [PATCH 046/245] We need javadoc for deploying to maven --- pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dc985bf0..6c701db5 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,19 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + true + + + + + @@ -90,6 +103,20 @@ + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-gpg-plugin @@ -123,7 +150,7 @@ jar-with-dependencies - + org.apache.maven.plugins @@ -140,7 +167,20 @@ release - + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-source-plugin From e89cc0c54a58a0834c8504009f12eaf27d708d2c Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Sun, 6 Aug 2017 15:28:41 -0400 Subject: [PATCH 047/245] prepare next release cycle --- pom.xml | 2 +- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6c701db5..2145aa06 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.1 + 1.0.2-SNAPSHOT Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index b8cfa3cd..21df07b5 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -29,7 +29,7 @@ public class CommandLineApp { - private static String VERSION = "1.0.1"; + private static String VERSION = "1.0.2"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2017 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; From 3fa8a324e4200b80010d3ebd95696cd361d8e483 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Tue, 29 Aug 2017 21:04:44 +0200 Subject: [PATCH 048/245] Merged the implementations of compareTo in Rectangle and TextChunk Since both classes implement Comparable, their compareTo implementations have to be compatible (previously the result of comparing a Rectangle with an RTL TextChunk depended on which compareTo implementation happened to be used). --- .../java/technology/tabula/Rectangle.java | 24 ++++++++++++----- .../java/technology/tabula/TextChunk.java | 27 ------------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/src/main/java/technology/tabula/Rectangle.java b/src/main/java/technology/tabula/Rectangle.java index 41b79374..16510b73 100644 --- a/src/main/java/technology/tabula/Rectangle.java +++ b/src/main/java/technology/tabula/Rectangle.java @@ -19,20 +19,30 @@ public Rectangle(float top, float left, float width, float height) { } @Override + /* + We're comparing based on ordering in the logical ordering of text here. + Assuming identical Y-axis positions, if TextChunk A has a lower X-axis + than TextChunk B, then A is "before" it -- iff this is LTR text. Otherwise, + it is A is after B. + */ public int compareTo(Rectangle other) { double thisBottom = this.getBottom(); double otherBottom = other.getBottom(); int rv; - if (this.equals(other)) return 0; + if (this.equals(other)) return 0; - if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) { + if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) { rv = java.lang.Double.compare(this.getX(), other.getX()); - } - else { - rv = java.lang.Double.compare(thisBottom, otherBottom); - } - return rv; + + // reverse the ordering if both TextChunks are RTL + if (this.isLtrDominant() == -1 && other.isLtrDominant() == -1) { + rv = -1 * rv; + } + } else { + rv = java.lang.Double.compare(thisBottom, otherBottom); + } + return rv; } // I'm bad at Java and need this for fancy sorting in technology.tabula.TextChunk. diff --git a/src/main/java/technology/tabula/TextChunk.java b/src/main/java/technology/tabula/TextChunk.java index 046f10d9..ed8614db 100644 --- a/src/main/java/technology/tabula/TextChunk.java +++ b/src/main/java/technology/tabula/TextChunk.java @@ -126,33 +126,6 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { return new TextChunk(everything); } - @Override - /* - We're comparing based on ordering in the logical ordering of text here. - Assuming identical Y-axis positions, if TextChunk A has a lower X-axis - than TextChunk B, then A is "before" it -- iff this is LTR text. Otherwise, - it is A is after B. - */ - public int compareTo(Rectangle other) { - double thisBottom = this.getBottom(); - double otherBottom = other.getBottom(); - int rv; - - if (this.equals(other)) return 0; - - if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) { - rv = java.lang.Double.compare(this.getX(), other.getX()); - - // reverse the ordering if both TextChunks are RTL - if (this.isLtrDominant() == -1 && other.isLtrDominant() == -1) { - rv = -1 * rv; - } - } else { - rv = java.lang.Double.compare(thisBottom, otherBottom); - } - return rv; - } - public int isLtrDominant() { int ltrCnt = 0; int rtlCnt = 0; From 6fe0c8948de52564de2002b991d0bd32e0972abc Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Tue, 29 Aug 2017 22:51:22 +0200 Subject: [PATCH 049/245] Added test cases for the Rectangle.coparateTo() transitivity issue --- .../java/technology/tabula/TestRectangle.java | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/test/java/technology/tabula/TestRectangle.java b/src/test/java/technology/tabula/TestRectangle.java index c763fcbc..5e156f1d 100644 --- a/src/test/java/technology/tabula/TestRectangle.java +++ b/src/test/java/technology/tabula/TestRectangle.java @@ -234,6 +234,43 @@ public void testGetBoundingBox() { } - - + + @Test + public void testTransitiveComparison1() { + // +-------+ + // | | + // | A | +-------+ + // | | | | + // +-------+ | B | +-------+ + // | | | | + // +-------+ | C | + // | | + // +-------+ + Rectangle a = new Rectangle(0,0,2,2); + Rectangle b = new Rectangle(1,1,2,2); + Rectangle c = new Rectangle(2,2,2,2); + assertTrue(a.compareTo(b) < 0); + assertTrue(b.compareTo(c) < 0); + assertTrue(a.compareTo(c) < 0); + } + + @Test + public void testTransitiveComparison2() { + // +-------+ + // | | + // +-------+ | C | + // | | | | + // +-------+ | B | +-------+ + // | | | | + // | A | +-------+ + // | | + // +-------+ + Rectangle a = new Rectangle(2,0,2,2); + Rectangle b = new Rectangle(1,1,2,2); + Rectangle c = new Rectangle(0,2,2,2); + assertTrue(a.compareTo(b) < 0); + assertTrue(b.compareTo(c) < 0); + assertTrue(a.compareTo(c) < 0); + } + } From 3310c0e6f919bc8649ef9599fe00a7ccd9c98c23 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Tue, 29 Aug 2017 23:10:21 +0200 Subject: [PATCH 050/245] Cleaned up classes CSVWriter and TSVWriter --- .../technology/tabula/writers/CSVWriter.java | 62 ++++++++----------- .../technology/tabula/writers/TSVWriter.java | 20 ++---- 2 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/main/java/technology/tabula/writers/CSVWriter.java b/src/main/java/technology/tabula/writers/CSVWriter.java index 16382585..2466cc6e 100644 --- a/src/main/java/technology/tabula/writers/CSVWriter.java +++ b/src/main/java/technology/tabula/writers/CSVWriter.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.apache.commons.csv.CSVPrinter; @@ -11,47 +12,34 @@ import technology.tabula.Table; public class CSVWriter implements Writer { - - CSVPrinter printer; - private boolean useLineReturns = true; - -// public CSVWriter() { -// super(); -// } -// -// public CSVWriter(boolean useLineReturns) { -// super(); -// this.useLineReturns = useLineReturns; -// } - - void createWriter(Appendable out) { - try { - this.printer = new CSVPrinter(out, CSVFormat.EXCEL); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void write(Appendable out, Table table) throws IOException { - this.createWriter(out); - for (List row: table.getRows()) { - List cells = new ArrayList(row.size()); - for (RectangularTextContainer tc: row) { - cells.add(tc.getText()); - } - this.printer.printRecord(cells); - } - printer.flush(); - } + + public CSVWriter() { + this(CSVFormat.EXCEL); + } + + protected CSVWriter(CSVFormat format) { + this.format = format; + } + + private final CSVFormat format; + + @Override + public void write(Appendable out, Table table) throws IOException { + write(out, Collections.singletonList(table)); + } @Override public void write(Appendable out, List

tables) throws IOException { - for (Table table : tables) { - write(out, table); + try (CSVPrinter printer = new CSVPrinter(out, format)) { + for (Table table : tables) { + for (List row : table.getRows()) { + List cells = new ArrayList<>(row.size()); + for (RectangularTextContainer tc : row) cells.add(tc.getText()); + printer.printRecord(cells); + } + } + printer.flush(); } - } } diff --git a/src/main/java/technology/tabula/writers/TSVWriter.java b/src/main/java/technology/tabula/writers/TSVWriter.java index 225ba980..16f05ad3 100644 --- a/src/main/java/technology/tabula/writers/TSVWriter.java +++ b/src/main/java/technology/tabula/writers/TSVWriter.java @@ -1,20 +1,12 @@ package technology.tabula.writers; -import java.io.IOException; - import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVPrinter; public class TSVWriter extends CSVWriter { - - @Override - void createWriter(Appendable out) { - try { - this.printer = new CSVPrinter(out, CSVFormat.TDF); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - + + public TSVWriter() { + super(CSVFormat.TDF); + } + + } From 90c52327a9f9865542619c305928a8798a03b97c Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Tue, 29 Aug 2017 23:31:44 +0200 Subject: [PATCH 051/245] Cleanup of JSONWriter and related classes --- .../RectangularTextContainerSerializer.java | 31 +++++++++ .../tabula/json/TableSerializer.java | 64 ++++++++++--------- .../tabula/json/TextChunkSerializer.java | 27 -------- .../technology/tabula/writers/JSONWriter.java | 62 ++++++++---------- .../technology/tabula/writers/TSVWriter.java | 1 - 5 files changed, 92 insertions(+), 93 deletions(-) create mode 100644 src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java delete mode 100644 src/main/java/technology/tabula/json/TextChunkSerializer.java diff --git a/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java b/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java new file mode 100644 index 00000000..31bf1060 --- /dev/null +++ b/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java @@ -0,0 +1,31 @@ +package technology.tabula.json; + +import java.lang.reflect.Type; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; + +import technology.tabula.RectangularTextContainer; + +public final class RectangularTextContainerSerializer implements JsonSerializer { + + public static final RectangularTextContainerSerializer INSTANCE = new RectangularTextContainerSerializer(); + + private RectangularTextContainerSerializer() { + // singleton + } + + @Override + public JsonElement serialize(RectangularTextContainer src, Type typeOfSrc, JsonSerializationContext context) { + JsonObject result = new JsonObject(); + result.addProperty("top", src.getTop()); + result.addProperty("left", src.getLeft()); + result.addProperty("width", src.getWidth()); + result.addProperty("height", src.getHeight()); + result.addProperty("text", src.getText()); + return result; + } + +} \ No newline at end of file diff --git a/src/main/java/technology/tabula/json/TableSerializer.java b/src/main/java/technology/tabula/json/TableSerializer.java index 970c7310..e3f211c9 100644 --- a/src/main/java/technology/tabula/json/TableSerializer.java +++ b/src/main/java/technology/tabula/json/TableSerializer.java @@ -12,33 +12,39 @@ import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -public class TableSerializer implements JsonSerializer
{ - - @Override - public JsonElement serialize(Table table, Type type, - JsonSerializationContext context) { - - JsonObject object = new JsonObject(); - if( table.getExtractionAlgorithm() == null){ - object.addProperty("extraction_method", ""); - }else{ - object.addProperty("extraction_method", (table.getExtractionAlgorithm()).toString()); - } - object.addProperty("top", table.getTop()); - object.addProperty("left", table.getLeft()); - object.addProperty("width", table.getWidth()); - object.addProperty("height", table.getHeight()); - - JsonArray jsonDataArray = new JsonArray(); - for (List row: table.getRows()) { - JsonArray jsonRowArray = new JsonArray(); - for (RectangularTextContainer textChunk: row) { - jsonRowArray.add(context.serialize(textChunk)); - } - jsonDataArray.add(jsonRowArray); - } - object.add("data", jsonDataArray); - - return object; - } +public final class TableSerializer implements JsonSerializer
{ + + public static final TableSerializer INSTANCE = new TableSerializer(); + + private TableSerializer() { + // singleton + } + + @Override + public JsonElement serialize(Table src, Type typeOfSrc, JsonSerializationContext context) { + + JsonObject result = new JsonObject(); + + if (src.getExtractionAlgorithm() == null) { + result.addProperty("extraction_method", ""); + } else { + result.addProperty("extraction_method", (src.getExtractionAlgorithm()).toString()); + } + result.addProperty("top", src.getTop()); + result.addProperty("left", src.getLeft()); + result.addProperty("width", src.getWidth()); + result.addProperty("height", src.getHeight()); + + JsonArray data; + result.add("data", data = new JsonArray()); + + for (List srcRow : src.getRows()) { + JsonArray row = new JsonArray(); + for (RectangularTextContainer textChunk : srcRow) row.add(context.serialize(textChunk)); + data.add(row); + } + + return result; + } + } diff --git a/src/main/java/technology/tabula/json/TextChunkSerializer.java b/src/main/java/technology/tabula/json/TextChunkSerializer.java deleted file mode 100644 index 5f4252c1..00000000 --- a/src/main/java/technology/tabula/json/TextChunkSerializer.java +++ /dev/null @@ -1,27 +0,0 @@ -package technology.tabula.json; - -import java.lang.reflect.Type; - -import technology.tabula.RectangularTextContainer; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; - -public class TextChunkSerializer implements JsonSerializer { - - @Override - public JsonElement serialize(RectangularTextContainer textChunk, Type arg1, - JsonSerializationContext context) { - JsonObject object = new JsonObject(); - - object.addProperty("top", textChunk.getTop()); - object.addProperty("left", textChunk.getLeft()); - object.addProperty("width", textChunk.getWidth()); - object.addProperty("height", textChunk.getHeight()); - object.addProperty("text", textChunk.getText()); - - return object; - } -} \ No newline at end of file diff --git a/src/main/java/technology/tabula/writers/JSONWriter.java b/src/main/java/technology/tabula/writers/JSONWriter.java index cf9a843b..7d2fd4eb 100644 --- a/src/main/java/technology/tabula/writers/JSONWriter.java +++ b/src/main/java/technology/tabula/writers/JSONWriter.java @@ -9,55 +9,45 @@ import technology.tabula.Table; import technology.tabula.TextChunk; import technology.tabula.json.TableSerializer; -import technology.tabula.json.TextChunkSerializer; +import technology.tabula.json.RectangularTextContainerSerializer; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import com.google.gson.JsonSerializer; public class JSONWriter implements Writer { - class TableSerializerExclusionStrategy implements ExclusionStrategy { + private static final ExclusionStrategy ALLCLASSES_SKIPNONPUBLIC = new ExclusionStrategy() { + @Override public boolean shouldSkipClass(Class c) { return false; } + @Override public boolean shouldSkipField(FieldAttributes fa) { return !fa.hasModifier(Modifier.PUBLIC); } + }; - @Override - public boolean shouldSkipClass(Class arg0) { - return false; - } + + final Gson gson; - @Override - public boolean shouldSkipField(FieldAttributes fa) { - return !fa.hasModifier(Modifier.PUBLIC); - } - } + public JSONWriter() { + gson = new GsonBuilder().addSerializationExclusionStrategy(ALLCLASSES_SKIPNONPUBLIC) + .registerTypeAdapter(Table.class, TableSerializer.INSTANCE) + .registerTypeAdapter(RectangularTextContainer.class, new RectangularTextContainerSerializer()) + .registerTypeAdapter(Cell.class, RectangularTextContainerSerializer.INSTANCE) + .registerTypeAdapter(TextChunk.class, RectangularTextContainerSerializer.INSTANCE).create(); + } + @Override + public void write(Appendable out, Table table) throws IOException { + out.append(gson.toJson(table, Table.class)); + } - final Gson gson; + public void write(Appendable out, List
tables) throws IOException { + JsonArray array = new JsonArray(); + for (Table table : tables) { + array.add(gson.toJsonTree(table, Table.class)); + } + out.append(gson.toJson(array)); - public JSONWriter() { - gson = new GsonBuilder() - .addSerializationExclusionStrategy(new TableSerializerExclusionStrategy()) - .registerTypeAdapter(Table.class, new TableSerializer()) - .registerTypeAdapter(RectangularTextContainer.class, new TextChunkSerializer()) - .registerTypeAdapter(Cell.class, new TextChunkSerializer()) - .registerTypeAdapter(TextChunk.class, new TextChunkSerializer()) - .create(); - } + } - @Override - public void write(Appendable out, Table table) throws IOException { - - out.append(gson.toJson(table, Table.class)); - } - - public void write(Appendable out, List
tables) throws IOException { - - JsonArray array = new JsonArray(); - for (Table table : tables) { - array.add(gson.toJsonTree(table, Table.class)); - } - out.append(gson.toJson(array)); - - } } diff --git a/src/main/java/technology/tabula/writers/TSVWriter.java b/src/main/java/technology/tabula/writers/TSVWriter.java index 16f05ad3..c3ddb737 100644 --- a/src/main/java/technology/tabula/writers/TSVWriter.java +++ b/src/main/java/technology/tabula/writers/TSVWriter.java @@ -8,5 +8,4 @@ public TSVWriter() { super(CSVFormat.TDF); } - } From d5761a381ef4e5568b2fe6a30652f6fef969630c Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Tue, 29 Aug 2017 23:33:16 +0200 Subject: [PATCH 052/245] JSONWriter clanup --- .../technology/tabula/writers/JSONWriter.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/technology/tabula/writers/JSONWriter.java b/src/main/java/technology/tabula/writers/JSONWriter.java index 7d2fd4eb..eaf77e77 100644 --- a/src/main/java/technology/tabula/writers/JSONWriter.java +++ b/src/main/java/technology/tabula/writers/JSONWriter.java @@ -4,19 +4,18 @@ import java.lang.reflect.Modifier; import java.util.List; -import technology.tabula.Cell; -import technology.tabula.RectangularTextContainer; -import technology.tabula.Table; -import technology.tabula.TextChunk; -import technology.tabula.json.TableSerializer; -import technology.tabula.json.RectangularTextContainerSerializer; - import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; -import com.google.gson.JsonSerializer; + +import technology.tabula.Cell; +import technology.tabula.RectangularTextContainer; +import technology.tabula.Table; +import technology.tabula.TextChunk; +import technology.tabula.json.RectangularTextContainerSerializer; +import technology.tabula.json.TableSerializer; public class JSONWriter implements Writer { @@ -31,7 +30,7 @@ public class JSONWriter implements Writer { public JSONWriter() { gson = new GsonBuilder().addSerializationExclusionStrategy(ALLCLASSES_SKIPNONPUBLIC) .registerTypeAdapter(Table.class, TableSerializer.INSTANCE) - .registerTypeAdapter(RectangularTextContainer.class, new RectangularTextContainerSerializer()) + .registerTypeAdapter(RectangularTextContainer.class, RectangularTextContainerSerializer.INSTANCE) .registerTypeAdapter(Cell.class, RectangularTextContainerSerializer.INSTANCE) .registerTypeAdapter(TextChunk.class, RectangularTextContainerSerializer.INSTANCE).create(); } @@ -41,7 +40,7 @@ public void write(Appendable out, Table table) throws IOException { out.append(gson.toJson(table, Table.class)); } - public void write(Appendable out, List
tables) throws IOException { + @Override public void write(Appendable out, List
tables) throws IOException { JsonArray array = new JsonArray(); for (Table table : tables) { array.add(gson.toJsonTree(table, Table.class)); From 6bfbe07f8b750028092456e014ebf23d845ddf48 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Wed, 30 Aug 2017 00:14:23 +0200 Subject: [PATCH 053/245] More cleanup --- .../java/technology/tabula/Rectangle.java | 1 + .../tabula/RectangularTextContainer.java | 55 ++++++++++--------- .../tabula/json/RulingSerializer.java | 13 ++--- .../technology/tabula/writers/JSONWriter.java | 27 ++++----- 4 files changed, 46 insertions(+), 50 deletions(-) diff --git a/src/main/java/technology/tabula/Rectangle.java b/src/main/java/technology/tabula/Rectangle.java index 16510b73..d188944f 100644 --- a/src/main/java/technology/tabula/Rectangle.java +++ b/src/main/java/technology/tabula/Rectangle.java @@ -26,6 +26,7 @@ public Rectangle(float top, float left, float width, float height) { it is A is after B. */ public int compareTo(Rectangle other) { + // FIXME this needs fixing - see https://github.com/tabulapdf/tabula-java/issues/116#issuecomment-325798979 double thisBottom = this.getBottom(); double otherBottom = other.getBottom(); int rv; diff --git a/src/main/java/technology/tabula/RectangularTextContainer.java b/src/main/java/technology/tabula/RectangularTextContainer.java index f9e0036f..5f4d3716 100644 --- a/src/main/java/technology/tabula/RectangularTextContainer.java +++ b/src/main/java/technology/tabula/RectangularTextContainer.java @@ -5,31 +5,32 @@ @SuppressWarnings("serial") public abstract class RectangularTextContainer extends Rectangle { - public RectangularTextContainer(float top, float left, float width, float height) { - super(top, left, width, height); - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - String s = super.toString(); - sb.append(s.substring(0, s.length() - 1)); - sb.append(String.format(",text=%s]", this.getText() == null ? "null" : "\"" + this.getText() + "\"")); - return sb.toString(); - } - - public RectangularTextContainer merge(RectangularTextContainer other) { - if (this.compareTo(other) < 0) { - this.getTextElements().addAll(other.getTextElements()); - - } - else { - this.getTextElements().addAll(0, other.getTextElements()); - } - super.merge(other); - return this; - } - - public abstract String getText(); - public abstract String getText(boolean useLineReturns); - public abstract List getTextElements(); + public RectangularTextContainer(float top, float left, float width, float height) { + super(top, left, width, height); + } + + public RectangularTextContainer merge(RectangularTextContainer other) { + if (compareTo(other) < 0) { + this.getTextElements().addAll(other.getTextElements()); + } else { + this.getTextElements().addAll(0, other.getTextElements()); + } + super.merge(other); + return this; + } + + public abstract String getText(); + + public abstract String getText(boolean useLineReturns); + + public abstract List getTextElements(); + + @Override public String toString() { + StringBuilder sb = new StringBuilder(); + String s = super.toString(); + sb.append(s.substring(0, s.length() - 1)); + sb.append(String.format(",text=%s]", this.getText() == null ? "null" : "\"" + this.getText() + "\"")); + return sb.toString(); + } + } diff --git a/src/main/java/technology/tabula/json/RulingSerializer.java b/src/main/java/technology/tabula/json/RulingSerializer.java index 8a3fe297..19fe8bcd 100644 --- a/src/main/java/technology/tabula/json/RulingSerializer.java +++ b/src/main/java/technology/tabula/json/RulingSerializer.java @@ -2,21 +2,18 @@ import java.lang.reflect.Type; -import technology.tabula.Ruling; - import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import technology.tabula.Ruling; + +@Deprecated +/** @deprecated This class is unused (Aug 2017) and will be removed at some later point */ public class RulingSerializer implements JsonSerializer { @Override - public JsonElement serialize(Ruling arg0, Type arg1, - JsonSerializationContext arg2) { - - JsonObject object = new JsonObject(); - + public JsonElement serialize(Ruling src, Type typeOfSrc, JsonSerializationContext context) { return null; } diff --git a/src/main/java/technology/tabula/writers/JSONWriter.java b/src/main/java/technology/tabula/writers/JSONWriter.java index eaf77e77..59e9b274 100644 --- a/src/main/java/technology/tabula/writers/JSONWriter.java +++ b/src/main/java/technology/tabula/writers/JSONWriter.java @@ -24,29 +24,26 @@ public class JSONWriter implements Writer { @Override public boolean shouldSkipField(FieldAttributes fa) { return !fa.hasModifier(Modifier.PUBLIC); } }; - - final Gson gson; - - public JSONWriter() { - gson = new GsonBuilder().addSerializationExclusionStrategy(ALLCLASSES_SKIPNONPUBLIC) - .registerTypeAdapter(Table.class, TableSerializer.INSTANCE) - .registerTypeAdapter(RectangularTextContainer.class, RectangularTextContainerSerializer.INSTANCE) - .registerTypeAdapter(Cell.class, RectangularTextContainerSerializer.INSTANCE) - .registerTypeAdapter(TextChunk.class, RectangularTextContainerSerializer.INSTANCE).create(); - } - @Override public void write(Appendable out, Table table) throws IOException { - out.append(gson.toJson(table, Table.class)); + out.append(gson().toJson(table, Table.class)); } @Override public void write(Appendable out, List
tables) throws IOException { + Gson gson = gson(); JsonArray array = new JsonArray(); - for (Table table : tables) { - array.add(gson.toJsonTree(table, Table.class)); - } + for (Table table : tables) array.add(gson.toJsonTree(table, Table.class)); out.append(gson.toJson(array)); + } + private static Gson gson() { + return new GsonBuilder() + .addSerializationExclusionStrategy(ALLCLASSES_SKIPNONPUBLIC) + .registerTypeAdapter(Table.class, TableSerializer.INSTANCE) + .registerTypeAdapter(RectangularTextContainer.class, RectangularTextContainerSerializer.INSTANCE) + .registerTypeAdapter(Cell.class, RectangularTextContainerSerializer.INSTANCE) + .registerTypeAdapter(TextChunk.class, RectangularTextContainerSerializer.INSTANCE) + .create(); } } From d299ceebf9079f91e4690b7b824aeda61b157984 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Wed, 30 Aug 2017 00:21:07 +0200 Subject: [PATCH 054/245] Even more cleanup --- .../tabula/json/RectangularTextContainerSerializer.java | 4 ++-- src/test/java/technology/tabula/TestRectangle.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java b/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java index 31bf1060..f6359b91 100644 --- a/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java +++ b/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java @@ -9,7 +9,7 @@ import technology.tabula.RectangularTextContainer; -public final class RectangularTextContainerSerializer implements JsonSerializer { +public final class RectangularTextContainerSerializer implements JsonSerializer> { public static final RectangularTextContainerSerializer INSTANCE = new RectangularTextContainerSerializer(); @@ -18,7 +18,7 @@ private RectangularTextContainerSerializer() { } @Override - public JsonElement serialize(RectangularTextContainer src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(RectangularTextContainer src, Type typeOfSrc, JsonSerializationContext context) { JsonObject result = new JsonObject(); result.addProperty("top", src.getTop()); result.addProperty("left", src.getLeft()); diff --git a/src/test/java/technology/tabula/TestRectangle.java b/src/test/java/technology/tabula/TestRectangle.java index 5e156f1d..2be0830f 100644 --- a/src/test/java/technology/tabula/TestRectangle.java +++ b/src/test/java/technology/tabula/TestRectangle.java @@ -9,6 +9,7 @@ import java.util.List; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; public class TestRectangle { @@ -254,7 +255,7 @@ public void testTransitiveComparison1() { assertTrue(a.compareTo(c) < 0); } - @Test + @Test @Ignore public void testTransitiveComparison2() { // +-------+ // | | From d0b93b063e8fff09e78f56c7fdf1031d11171cfe Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 02:55:12 +0200 Subject: [PATCH 055/245] Additional test case for #116 --- .../java/technology/tabula/TestRectangle.java | 166 ++++++++++-------- 1 file changed, 90 insertions(+), 76 deletions(-) diff --git a/src/test/java/technology/tabula/TestRectangle.java b/src/test/java/technology/tabula/TestRectangle.java index 2be0830f..72a9c0b9 100644 --- a/src/test/java/technology/tabula/TestRectangle.java +++ b/src/test/java/technology/tabula/TestRectangle.java @@ -1,10 +1,10 @@ package technology.tabula; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.awt.geom.Point2D; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -13,227 +13,227 @@ import org.junit.Test; public class TestRectangle { - - + + @Test public void testCompareEqualsRectangles() { Rectangle first = new Rectangle(); Rectangle second = new Rectangle(); - + assertTrue(first.equals(second)); assertTrue(second.equals(first)); } - + @Test public void testCompareAlignedHorizontalRectangle() { Rectangle lower = new Rectangle(0f, 10f, 10f, 10f); Rectangle upper = new Rectangle(0f,20f, 10f, 10f); - + assertTrue(lower.compareTo(upper) < 0); } - + @Test public void testCompareAlignedVerticalRectangle() { Rectangle lower = new Rectangle(10f, 0f, 10f, 10f); Rectangle upper = new Rectangle(20f,0f, 10f, 10f); - + assertTrue(lower.compareTo(upper) < 0); } - + @Test public void testCompareVerticalOverlapRectangle() { Rectangle lower = new Rectangle(5f, 0f, 10f, 10f); Rectangle upper = new Rectangle(0f, 10f, 10f, 10f); - + assertTrue(lower.compareTo(upper) < 0); } - + @Test public void testCompareVerticalOverlapLessThresholdRectangle() { Rectangle lower = new Rectangle(0f, 10f, 10f, 10f); Rectangle upper = new Rectangle(9.8f, 0f, 10f, 10f); - + assertTrue(lower.compareTo(upper) < 0); } - - - + + + @Test public void testQuickSortOneUpperThanOther() { - + Rectangle lower = new Rectangle(175.72f, 72.72f, 1.67f, 1.52f); //, (Comma after AARON) Rectangle upper = new Rectangle(169.21f, 161.16f, 4.33f, 4.31f); // R (REGIONAL PULMONARY) - + assertTrue(lower.compareTo(upper) > 0); - + } - + @Test public void testQuickSortRectangleList() { - + //Testing wrong sorting // Expected: AARON, JOSHUA, N // but was: AARON JOSHUA N , , - Rectangle first = new Rectangle(172.92999267578125f, 51.47999954223633f, 4.0f, 4.309999942779541f); //A + Rectangle first = new Rectangle(172.92999267578125f, 51.47999954223633f, 4.0f, 4.309999942779541f); //A Rectangle second = new Rectangle(175.72000122070312f, 72.72000122070312f, 1.6699999570846558f, 1.5199999809265137f); //, Rectangle third = new Rectangle(172.92999267578125f, 96.36000061035156f, 4.0f, 4.309999942779541f); //A Rectangle fourth = new Rectangle(175.72000122070312f, 100.31999969482422f, 1.6699999570846558f, 1.5199999809265137f); //, Rectangle fifth = new Rectangle(172.92999267578125f, 103.68000030517578f, 4.329999923706055f, 4.309999942779541f); //N Rectangle sixth = new Rectangle(169.2100067138672f, 161.16000366210938f, 4.329999923706055f, 4.309999942779541f); //R - - List expectedList = new ArrayList(); + + List expectedList = new ArrayList<>(); expectedList.add(first); expectedList.add(sixth); expectedList.add(second); expectedList.add(third); expectedList.add(fourth); expectedList.add(fifth); - List toSortList = new ArrayList(); + List toSortList = new ArrayList<>(); toSortList.add(sixth); toSortList.add(second); toSortList.add(third); toSortList.add(fifth); toSortList.add(first); toSortList.add(fourth); - + Collections.sort(toSortList); - + assertEquals(expectedList, toSortList); } - + @Test public void testGetVerticalOverlapShouldReturnZero() { - + Rectangle lower = new Rectangle(10f, 0f, 10f, 10f); Rectangle upper = new Rectangle(20f,0f, 10f, 10f); - + float overlap = lower.verticalOverlap(upper); - + assertEquals(0f, overlap, 0); assertTrue(!lower.verticallyOverlaps(upper)); assertEquals(0f, lower.verticalOverlapRatio(upper), 0); assertEquals(0f, lower.overlapRatio(upper), 0); - + } - + @Test public void testGetVerticalOverlapShouldReturnMoreThanZero() { - + Rectangle lower = new Rectangle(15f, 10f, 10f, 10f); Rectangle upper = new Rectangle(20f, 0f, 10f, 10f); - + float overlap = lower.verticalOverlap(upper); - + assertEquals(5f, overlap, 0); assertTrue(lower.verticallyOverlaps(upper)); assertEquals(0.5f, lower.verticalOverlapRatio(upper), 0); assertEquals(0f, lower.overlapRatio(upper), 0); - + } - + @Test public void testGetHorizontalOverlapShouldReturnZero() { - + Rectangle one = new Rectangle(0f, 0f, 10f, 10f); Rectangle two = new Rectangle(10f, 10f, 10f, 10f); - + assertTrue(!one.horizontallyOverlaps(two)); assertEquals(0f, one.overlapRatio(two), 0); - + } - + @Test public void testGetHorizontalOverlapShouldReturnMoreThanZero() { - + Rectangle one = new Rectangle(0f, 0f, 10f, 10f); Rectangle two = new Rectangle(10f, 5f, 10f, 10f); - + assertTrue(one.horizontallyOverlaps(two)); assertEquals(5f, one.horizontalOverlap(two), 0); assertEquals(0f, one.overlapRatio(two), 0); - + } - + @Test public void testGetOverlapShouldReturnMoreThanZero() { - + Rectangle one = new Rectangle(0f, 0f, 10f, 10f); Rectangle two = new Rectangle(5f, 5f, 10f, 10f); - + assertTrue(one.horizontallyOverlaps(two)); assertTrue(one.verticallyOverlaps(two)); assertEquals(5f, one.horizontalOverlap(two), 0); assertEquals(5f, one.verticalOverlap(two), 0); assertEquals((25f/175), one.overlapRatio(two), 0); - + } - + @Test public void testMergeNoOverlappingRectangles() { - + Rectangle one = new Rectangle(0f, 0f, 10f, 10f); Rectangle two = new Rectangle(0f, 10f, 10f, 10f); - + one.merge(two); - + assertEquals(20f, one.getWidth(), 0); assertEquals(10f, one.getHeight(), 0); assertEquals(0f, one.getLeft(), 0); assertEquals(0f, one.getTop(), 0); assertEquals(10f, one.getBottom(), 0); assertEquals(20f * 10f, one.getArea(), 0); - + } - + @Test public void testMergeOverlappingRectangles() { - + Rectangle one = new Rectangle(0f, 0f, 10f, 10f); Rectangle two = new Rectangle(5f, 5f, 10f, 10f); - + one.merge(two); - + assertEquals(15f, one.getWidth(), 0); assertEquals(15f, one.getHeight(), 0); assertEquals(0f, one.getLeft(), 0); assertEquals(0f, one.getTop(), 0); - + } - + @Test public void testRectangleGetPoints() { - + Rectangle one = new Rectangle(10f, 20f, 30f, 40f); - + Point2D[] points = one.getPoints(); - - Point2D[] expectedPoints = new Point2D[]{ + + Point2D[] expectedPoints = new Point2D[]{ new Point2D.Float(20f, 10f), new Point2D.Float(50f, 10f), new Point2D.Float(50f, 50f), new Point2D.Float(20f, 50f) - + }; - + Assert.assertArrayEquals(expectedPoints, points); - + } - + @Test public void testGetBoundingBox() { - - List rectangles = new ArrayList(); + + List rectangles = new ArrayList<>(); rectangles.add(new Rectangle(0f, 0f, 10f, 10f)); rectangles.add(new Rectangle(20f, 30f, 10f, 10f)); - + Rectangle boundingBoxOf = Rectangle.boundingBoxOf(rectangles); - + assertEquals(new Rectangle(0f, 0f, 40f, 30f), boundingBoxOf); - - - - + + + + } @Test @@ -274,4 +274,18 @@ public void testTransitiveComparison2() { assertTrue(a.compareTo(c) < 0); } + @Test @Ignore + public void testWellDefinedComparison1() { + Rectangle a = new Rectangle(2,0,2,2); + Rectangle b = new Rectangle(1,1,2,2); + Rectangle c = new Rectangle(0,2,2,2); + List l1 = new ArrayList<>(Arrays.asList(b, a, c)); + List l2 = new ArrayList<>(Arrays.asList(c, b, a)); + QuickSort.sort(l1); + QuickSort.sort(l2); + assertEquals(l1.get(0), l2.get(0)); + assertEquals(l1.get(1), l2.get(1)); + assertEquals(l1.get(2), l2.get(2)); + } + } From 083925a0835a0a854030771a83310c14f2018f78 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 05:55:18 +0200 Subject: [PATCH 056/245] mvn eclipse:eclipse will now download sources --- pom.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2145aa06..63608059 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,6 @@ - org.apache.maven.plugins maven-javadoc-plugin @@ -160,6 +159,15 @@ -Xms1024m -Xmx2048m + + + org.apache.maven.plugins + maven-eclipse-plugin + + true + true + + @@ -279,7 +287,7 @@ com.github.jai-imageio jai-imageio-core 1.3.1 - + com.github.jai-imageio From 19d8c84af3165879a83dff0eecb90b302e21f097 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 05:56:13 +0200 Subject: [PATCH 057/245] deprecated a few seemengly unused methods in Page --- src/main/java/technology/tabula/Page.java | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 8177921b..2f5419ad 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -116,11 +116,13 @@ public List getText(Rectangle area) { return this.spatial_index.contains(area); } - public List getText(float top, float left, float bottom, float right) { + /** @deprecated use {@linkplain #getText(Rectangle)} instead */ + @Deprecated public List getText(float top, float left, float bottom, float right) { return this.getText(new Rectangle(top, left, right - left, bottom - top)); } - public Integer getRotation() { + /** @deprecated with no replacement */ + @Deprecated public Integer getRotation() { return rotation; } @@ -128,7 +130,8 @@ public int getPageNumber() { return pageNumber; } - public List getTexts() { + /** @deprecated use {@linkplain #getText()} instead */ + @Deprecated public List getTexts() { return texts; } @@ -213,11 +216,13 @@ public List getUnprocessedRulings() { return this.rulings; } - public float getMinCharWidth() { + /** @deprecated with no replacement */ + @Deprecated public float getMinCharWidth() { return minCharWidth; } - public float getMinCharHeight() { + /** @deprecated with no replacement */ + @Deprecated public float getMinCharHeight() { return minCharHeight; } @@ -225,11 +230,13 @@ public PDPage getPDPage() { return pdPage; } - public RectangleSpatialIndex getSpatialIndex() { + /** @deprecated with no replacement */ + @Deprecated public RectangleSpatialIndex getSpatialIndex() { return this.spatial_index; } - public boolean hasText() { + /** @deprecated with no replacement */ + @Deprecated public boolean hasText() { return this.texts.size() > 0; } From c4fa2d892f2e9a7c97a80f95f0567157272eb2b9 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 06:03:15 +0200 Subject: [PATCH 058/245] Redundant type arguments removed --- src/main/java/technology/tabula/CommandLineApp.java | 2 +- .../java/technology/tabula/ProjectionProfile.java | 4 ++-- src/main/java/technology/tabula/QuickSort.java | 2 +- .../java/technology/tabula/TableWithRulingLines.java | 4 ++-- src/main/java/technology/tabula/debug/Debug.java | 4 ++-- .../tabula/detectors/NurminenDetectionAlgorithm.java | 12 ++++++------ .../tabula/extractors/BasicExtractionAlgorithm.java | 4 ++-- .../java/technology/tabula/TestTableDetection.java | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 21df07b5..0feb9ea5 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -246,7 +246,7 @@ private static TableExtractor createExtractor(CommandLine line) throws ParseExce public static List parseFloatList(String option) throws ParseException { String[] f = option.split(","); - List rv = new ArrayList(); + List rv = new ArrayList<>(); try { for (int i = 0; i < f.length; i++) { rv.add(Float.parseFloat(f[i])); diff --git a/src/main/java/technology/tabula/ProjectionProfile.java b/src/main/java/technology/tabula/ProjectionProfile.java index d80f18b0..aae1801f 100644 --- a/src/main/java/technology/tabula/ProjectionProfile.java +++ b/src/main/java/technology/tabula/ProjectionProfile.java @@ -105,7 +105,7 @@ public float[] findVerticalSeparators(float minColumnWidth) { public float[] findHorizontalSeparators(float minRowHeight) { boolean foundShorter = false; - List horizontalSeparators = new ArrayList(); + List horizontalSeparators = new ArrayList<>(); for (Ruling r: area.getHorizontalRulings()) { System.out.println(r.length() / this.textBounds.getWidth()); if (r.length() / this.textBounds.getWidth() >= 0.95) { @@ -136,7 +136,7 @@ public float[] findHorizontalSeparators(float minRowHeight) { } private static List findSeparatorsFromProjection(float[] derivative) { - List separators = new ArrayList(); + List separators = new ArrayList<>(); Integer lastNeg = null; float s; boolean positiveSlope = false; diff --git a/src/main/java/technology/tabula/QuickSort.java b/src/main/java/technology/tabula/QuickSort.java index 21d26dd5..29491028 100644 --- a/src/main/java/technology/tabula/QuickSort.java +++ b/src/main/java/technology/tabula/QuickSort.java @@ -58,7 +58,7 @@ public static void sort(List list) private static void quicksort(List list, Comparator cmp) { - Stack stack = new Stack(); + Stack stack = new Stack<>(); stack.push(0); stack.push(list.size()); while (!stack.isEmpty()) { diff --git a/src/main/java/technology/tabula/TableWithRulingLines.java b/src/main/java/technology/tabula/TableWithRulingLines.java index 54de67e2..df1527d3 100644 --- a/src/main/java/technology/tabula/TableWithRulingLines.java +++ b/src/main/java/technology/tabula/TableWithRulingLines.java @@ -79,14 +79,14 @@ public int compare(Cell arg0, Cell arg1) { Iterator iter = cells.iterator(); c = iter.next(); lastTop = (float) c.getTop(); - lastRow = new ArrayList(); + lastRow = new ArrayList<>(); lastRow.add(c); rv.add(lastRow); while (iter.hasNext()) { c = iter.next(); if (!Utils.feq(c.getTop(), lastTop)) { - lastRow = new ArrayList(); + lastRow = new ArrayList<>(); rv.add(lastRow); } lastRow.add(c); diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index 0c62784d..6619f2ab 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -314,7 +314,7 @@ public static void main(String[] args) throws IOException { try { // parse the command line arguments CommandLine line = parser.parse(buildOptions(), args); - List pages = new ArrayList(); + List pages = new ArrayList<>(); if (line.hasOption('p')) { pages = Utils.parsePagesOption(line.getOptionValue('p')); } else { @@ -353,7 +353,7 @@ public static void main(String[] args) throws IOException { PDDocument document = PDDocument.load(pdfFile); int numPages = document.getNumberOfPages(); - pages = new ArrayList(numPages); + pages = new ArrayList<>(numPages); for (int i = 1; i <= numPages; i++) { pages.add(i); diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index 69f50c9d..6b946333 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -517,13 +517,13 @@ private TextEdges getTextEdges(List lines) { // get all text edges (lines that align with the left, middle and right of chunks of text) that extend // uninterrupted over at least REQUIRED_TEXT_LINES_FOR_EDGE lines of text - List leftTextEdges = new ArrayList(); - List midTextEdges = new ArrayList(); - List rightTextEdges = new ArrayList(); + List leftTextEdges = new ArrayList<>(); + List midTextEdges = new ArrayList<>(); + List rightTextEdges = new ArrayList<>(); - Map> currLeftEdges = new HashMap>(); - Map> currMidEdges = new HashMap>(); - Map> currRightEdges = new HashMap>(); + Map> currLeftEdges = new HashMap<>(); + Map> currMidEdges = new HashMap<>(); + Map> currRightEdges = new HashMap<>(); for (Line textRow : lines) { for (TextChunk text : textRow.getTextElements()) { diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index 3b22f44e..b6a7bcb5 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -54,7 +54,7 @@ public int compare(Ruling arg0, Ruling arg1) { return Double.compare(arg0.getLeft(), arg1.getLeft()); } }); - columns = new ArrayList(this.verticalRulings.size()); + columns = new ArrayList<>(this.verticalRulings.size()); for (Ruling vr: this.verticalRulings) { columns.add(vr.getLeft()); } @@ -150,7 +150,7 @@ public static List columnPositions(List lines) { } } - List rv = new ArrayList(); + List rv = new ArrayList<>(); for (Rectangle r: regions) { rv.add((float) r.getRight()); } diff --git a/src/test/java/technology/tabula/TestTableDetection.java b/src/test/java/technology/tabula/TestTableDetection.java index 33e8cff9..899bfcec 100644 --- a/src/test/java/technology/tabula/TestTableDetection.java +++ b/src/test/java/technology/tabula/TestTableDetection.java @@ -169,7 +169,7 @@ public void testDetectionOfTables() throws Exception { ObjectExtractor extractor = new ObjectExtractor(pdfDocument); // parse expected tables from the ground truth dataset - Map> expectedTables = new HashMap>(); + Map> expectedTables = new HashMap<>(); int numExpectedTables = 0; @@ -188,7 +188,7 @@ public void testDetectionOfTables() throws Exception { List pageTables = expectedTables.get(page); if (pageTables == null) { - pageTables = new ArrayList(); + pageTables = new ArrayList<>(); expectedTables.put(page, pageTables); } @@ -207,7 +207,7 @@ public void testDetectionOfTables() throws Exception { } // now find tables detected by tabula-java - Map> detectedTables = new HashMap>(); + Map> detectedTables = new HashMap<>(); // the algorithm we're going to be testing NurminenDetectionAlgorithm detectionAlgorithm = new NurminenDetectionAlgorithm(); From 8247954b1d7505f529170b7dad5bf289e015c7aa Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 06:34:21 +0200 Subject: [PATCH 059/245] Cosmetic changes Removed several redundant casts and type parameters --- .../technology/tabula/CommandLineApp.java | 9 ++-- src/main/java/technology/tabula/Line.java | 2 +- .../technology/tabula/ObjectExtractor.java | 2 +- .../tabula/ObjectExtractorStreamEngine.java | 2 +- src/main/java/technology/tabula/Page.java | 16 +++---- .../technology/tabula/ProjectionProfile.java | 6 +-- .../java/technology/tabula/Rectangle.java | 22 ++++----- .../tabula/RectangleSpatialIndex.java | 12 ++--- src/main/java/technology/tabula/Ruling.java | 10 ++-- src/main/java/technology/tabula/Table.java | 8 ++-- .../tabula/TableWithRulingLines.java | 8 ++-- .../java/technology/tabula/TextChunk.java | 28 +++++------ .../java/technology/tabula/TextElement.java | 32 ++++++------- src/main/java/technology/tabula/Utils.java | 22 ++++----- .../java/technology/tabula/debug/Debug.java | 13 +++-- .../detectors/NurminenDetectionAlgorithm.java | 30 ++++++------ .../extractors/BasicExtractionAlgorithm.java | 12 ++--- .../SpreadsheetExtractionAlgorithm.java | 48 +++++++++---------- .../technology/tabula/TestBasicExtractor.java | 4 +- src/test/java/technology/tabula/TestCell.java | 2 +- src/test/java/technology/tabula/TestLine.java | 2 +- .../tabula/TestProjectionProfile.java | 12 ++--- .../tabula/TestRectangleSpatialIndex.java | 2 +- .../tabula/TestSpreadsheetExtractor.java | 31 ++++++------ .../technology/tabula/TestTableDetection.java | 7 +-- .../technology/tabula/TestTextElement.java | 27 +++++------ .../java/technology/tabula/TestUtils.java | 6 +-- .../java/technology/tabula/TestWriters.java | 2 +- 28 files changed, 187 insertions(+), 190 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 0feb9ea5..66de8b05 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -151,7 +151,7 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException try { pdfDocument = this.password == null ? PDDocument.load(pdfFile) : PDDocument.load(pdfFile, this.password); PageIterator pageIterator = getPageIterator(pdfDocument); - List
tables = new ArrayList
(); + List
tables = new ArrayList<>(); while (pageIterator.hasNext()) { Page page = pageIterator.next(); @@ -262,7 +262,6 @@ private static void printHelp() { formatter.printHelp("tabula", BANNER, buildOptions(), "", true); } - @SuppressWarnings("static-access") public static Options buildOptions() { Options o = new Options(); @@ -362,7 +361,7 @@ public List
extractTables(Page page) { case SPREADSHEET: return extractTablesSpreadsheet(page); default: - return new ArrayList
(); + return new ArrayList<>(); } } @@ -372,7 +371,7 @@ public List
extractTablesBasic(Page page) { // currently we only have a detector that uses spreadsheets to find table areas DetectionAlgorithm detector = new NurminenDetectionAlgorithm(); List guesses = detector.detect(page); - List
tables = new ArrayList
(); + List
tables = new ArrayList<>(); for (Rectangle guessRect : guesses) { Page guess = page.getArea(guessRect); @@ -389,7 +388,7 @@ public List
extractTablesBasic(Page page) { public List
extractTablesSpreadsheet(Page page) { // TODO add useLineReturns - return (List
) spreadsheetExtractor.extract(page); + return spreadsheetExtractor.extract(page); } } diff --git a/src/main/java/technology/tabula/Line.java b/src/main/java/technology/tabula/Line.java index ed2f6895..2dc8ce86 100644 --- a/src/main/java/technology/tabula/Line.java +++ b/src/main/java/technology/tabula/Line.java @@ -8,7 +8,7 @@ @SuppressWarnings("serial") public class Line extends Rectangle { - List textChunks = new ArrayList(); + List textChunks = new ArrayList<>(); public static final Character[] WHITE_SPACE_CHARS = { ' ', '\t', '\r', '\n', '\f' }; diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 2b97a5a8..1b6e91a6 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -9,7 +9,7 @@ public class ObjectExtractor { private final PDDocument pdfDocument; - public ObjectExtractor(PDDocument pdfDocument) throws IOException { + public ObjectExtractor(PDDocument pdfDocument) { this.pdfDocument = pdfDocument; } diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index 1538cfa6..70181454 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -41,7 +41,7 @@ protected ObjectExtractorStreamEngine(PDPage page) { this.log = LoggerFactory.getLogger(ObjectExtractorStreamEngine.class); - this.rulings = new ArrayList(); + this.rulings = new ArrayList<>(); this.pageTransform = null; // calculate page transform diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 2f5419ad..491eaf7b 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -66,8 +66,8 @@ public int compare(TextElement te1, TextElement te2) { }}).height; } Page rv = new Page( - (float) area.getTop(), - (float) area.getLeft(), + area.getTop(), + area.getLeft(), (float) area.getWidth(), (float) area.getHeight(), rotation, @@ -155,14 +155,14 @@ public List getRulings() { } if (this.rulings == null || this.rulings.isEmpty()) { - this.verticalRulingLines = new ArrayList(); - this.horizontalRulingLines = new ArrayList(); - return new ArrayList(); + this.verticalRulingLines = new ArrayList<>(); + this.horizontalRulingLines = new ArrayList<>(); + return new ArrayList<>(); } Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); - List vrs = new ArrayList(); + List vrs = new ArrayList<>(); for (Ruling vr: this.rulings) { if (vr.vertical()) { vrs.add(vr); @@ -170,7 +170,7 @@ public List getRulings() { } this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); - List hrs = new ArrayList(); + List hrs = new ArrayList<>(); for (Ruling hr: this.rulings) { if (hr.horizontal()) { hrs.add(hr); @@ -178,7 +178,7 @@ public List getRulings() { } this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); - this.cleanRulings = new ArrayList(this.verticalRulingLines); + this.cleanRulings = new ArrayList<>(this.verticalRulingLines); this.cleanRulings.addAll(this.horizontalRulingLines); return this.cleanRulings; diff --git a/src/main/java/technology/tabula/ProjectionProfile.java b/src/main/java/technology/tabula/ProjectionProfile.java index aae1801f..39ab9e41 100644 --- a/src/main/java/technology/tabula/ProjectionProfile.java +++ b/src/main/java/technology/tabula/ProjectionProfile.java @@ -73,7 +73,7 @@ public float[] getHorizontalProjection() { public float[] findVerticalSeparators(float minColumnWidth) { boolean foundNarrower = false; - List verticalSeparators = new ArrayList(); + List verticalSeparators = new ArrayList<>(); for (Ruling r: area.getVerticalRulings()) { if (r.length() / this.textBounds.getHeight() >= 0.95) { verticalSeparators.add(toFixed(r.getPosition() - this.areaLeft)); @@ -167,7 +167,7 @@ public static float[] smooth(float[] data, int kernelSize) { + kernelSize / 2, data.length); j++) { s += data[j]; } - rv[i] = (float) Math.floor(s / (float) kernelSize); + rv[i] = (float) Math.floor(s / kernelSize); } } return rv; @@ -213,7 +213,7 @@ private static int toFixed(double value) { } private static double toDouble(int value) { - return (double) value / Math.pow(10, DECIMAL_PLACES); + return value / Math.pow(10, DECIMAL_PLACES); } } diff --git a/src/main/java/technology/tabula/Rectangle.java b/src/main/java/technology/tabula/Rectangle.java index d188944f..61899a1f 100644 --- a/src/main/java/technology/tabula/Rectangle.java +++ b/src/main/java/technology/tabula/Rectangle.java @@ -57,7 +57,7 @@ public float getArea() { } public float verticalOverlap(Rectangle other) { - return (float) Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop())); + return Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop())); } public boolean verticallyOverlaps(Rectangle other) { @@ -65,7 +65,7 @@ public boolean verticallyOverlaps(Rectangle other) { } public float horizontalOverlap(Rectangle other) { - return (float) Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft())); + return Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft())); } public boolean horizontallyOverlaps(Rectangle other) { @@ -74,19 +74,19 @@ public boolean horizontallyOverlaps(Rectangle other) { public float verticalOverlapRatio(Rectangle other) { float rv = 0, - delta = (float) Math.min(this.getBottom() - this.getTop(), other.getBottom() - other.getTop()); + delta = Math.min(this.getBottom() - this.getTop(), other.getBottom() - other.getTop()); if (other.getTop() <= this.getTop() && this.getTop() <= other.getBottom() && other.getBottom() <= this.getBottom()) { - rv = (float) ((other.getBottom() - this.getTop()) / delta); + rv = (other.getBottom() - this.getTop()) / delta; } else if (this.getTop() <= other.getTop() && other.getTop() <= this.getBottom() && this.getBottom() <= other.getBottom()) { - rv = (float) ((this.getBottom() - other.getTop()) / delta); + rv = (this.getBottom() - other.getTop()) / delta; } else if (this.getTop() <= other.getTop() && other.getTop() <= other.getBottom() && other.getBottom() <= this.getBottom()) { - rv = (float) ((other.getBottom() - other.getTop()) / delta); + rv = (other.getBottom() - other.getTop()) / delta; } else if (other.getTop() <= this.getTop() && this.getTop() <= this.getBottom() && this.getBottom() <= other.getBottom()) { - rv = (float) ((this.getBottom() - this.getTop()) / delta); + rv = (this.getBottom() - this.getTop()) / delta; } return rv; @@ -143,10 +143,10 @@ public void setBottom(float bottom) { public Point2D[] getPoints() { return new Point2D[] { - new Point2D.Float((float) this.getLeft(), (float) this.getTop()), - new Point2D.Float((float) this.getRight(), (float) this.getTop()), - new Point2D.Float((float) this.getRight(), (float) this.getBottom()), - new Point2D.Float((float) this.getLeft(), (float) this.getBottom()) + new Point2D.Float(this.getLeft(), this.getTop()), + new Point2D.Float(this.getRight(), this.getTop()), + new Point2D.Float(this.getRight(), this.getBottom()), + new Point2D.Float(this.getLeft(), this.getBottom()) }; } diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index 498106db..46e5fd46 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -11,14 +11,14 @@ class RectangleSpatialIndex { class SaveToListProcedure implements TIntProcedure { - private List ids = new ArrayList(); + private List ids = new ArrayList<>(); - public boolean execute(int id) { + @Override public boolean execute(int id) { ids.add(id); return true; } - private List getIds() { + List getIds() { return ids; } } @@ -30,7 +30,7 @@ private List getIds() { public RectangleSpatialIndex() { si = new RTree(); si.init(null); - rectangles = new ArrayList(); + rectangles = new ArrayList<>(); } public void add(T te) { @@ -48,7 +48,7 @@ public void add(T te) { public List contains(Rectangle r) { SaveToListProcedure proc = new SaveToListProcedure(); si.contains(rectangleToSpatialIndexRectangle(r), proc); - ArrayList rv = new ArrayList(); + ArrayList rv = new ArrayList<>(); for (int i : proc.getIds()) { rv.add(rectangles.get(i)); } @@ -59,7 +59,7 @@ public List contains(Rectangle r) { public List intersects(Rectangle r) { SaveToListProcedure proc = new SaveToListProcedure(); si.intersects(rectangleToSpatialIndexRectangle(r), proc); - ArrayList rv = new ArrayList(); + ArrayList rv = new ArrayList<>(); for (int i : proc.getIds()) { rv.add(rectangles.get(i)); } diff --git a/src/main/java/technology/tabula/Ruling.java b/src/main/java/technology/tabula/Ruling.java index 8eb16b5e..2ad33aaa 100644 --- a/src/main/java/technology/tabula/Ruling.java +++ b/src/main/java/technology/tabula/Ruling.java @@ -297,7 +297,7 @@ public String toString() { } public static List cropRulingsToArea(List rulings, Rectangle2D area) { - ArrayList rv = new ArrayList(); + ArrayList rv = new ArrayList<>(); for (Ruling r : rulings) { if (r.intersects(area)) { rv.add(r.intersect(area)); @@ -322,15 +322,15 @@ public SortObject(SOType type, float position, Ruling ruling) { } } - List sos = new ArrayList(); + List sos = new ArrayList<>(); - TreeMap tree = new TreeMap(new Comparator() { + TreeMap tree = new TreeMap<>(new Comparator() { @Override public int compare(Ruling o1, Ruling o2) { return java.lang.Double.compare(o1.getTop(), o2.getTop()); }}); - TreeMap rv = new TreeMap(new Comparator() { + TreeMap rv = new TreeMap<>(new Comparator() { @Override public int compare(Point2D o1, Point2D o2) { if (o1.getY() > o2.getY()) return 1; @@ -409,7 +409,7 @@ public static List collapseOrientedRulings(List lines) { } public static List collapseOrientedRulings(List lines, int expandAmount) { - ArrayList rv = new ArrayList(); + ArrayList rv = new ArrayList<>(); Collections.sort(lines, new Comparator() { @Override public int compare(Ruling a, Ruling b) { diff --git a/src/main/java/technology/tabula/Table.java b/src/main/java/technology/tabula/Table.java index eda11251..525f1f3a 100644 --- a/src/main/java/technology/tabula/Table.java +++ b/src/main/java/technology/tabula/Table.java @@ -57,7 +57,7 @@ public RectangularTextContainer get(int row, int col) { } public List getRow(int row) { - return new ArrayList(this.subMap(new CellPosition(row, 0), new CellPosition(row, maxRow+1)).values()); + return new ArrayList<>(this.subMap(new CellPosition(row, 0), new CellPosition(row, maxRow+1)).values()); } @Override @@ -110,9 +110,9 @@ public List> getRows() { return this.rows; } - this.rows = new ArrayList>(); + this.rows = new ArrayList<>(); for (int i = 0; i <= this.cellContainer.maxRow; i++) { - List lastRow = new ArrayList(); + List lastRow = new ArrayList<>(); this.rows.add(lastRow); for (int j = 0; j <= this.cellContainer.maxCol; j++) { lastRow.add(this.cellContainer.containsKey(i, j) ? this.cellContainer.get(i, j) : TextChunk.EMPTY); @@ -138,7 +138,7 @@ public ExtractionAlgorithm getExtractionAlgorithm() { } public List getCells() { - return (List) new ArrayList(this.cellContainer.values()); + return new ArrayList<>(this.cellContainer.values()); } diff --git a/src/main/java/technology/tabula/TableWithRulingLines.java b/src/main/java/technology/tabula/TableWithRulingLines.java index df1527d3..69d0d475 100644 --- a/src/main/java/technology/tabula/TableWithRulingLines.java +++ b/src/main/java/technology/tabula/TableWithRulingLines.java @@ -10,7 +10,7 @@ public class TableWithRulingLines extends Table { List verticalRulings, horizontalRulings; - RectangleSpatialIndex si = new RectangleSpatialIndex(); + RectangleSpatialIndex si = new RectangleSpatialIndex<>(); public TableWithRulingLines() { super(); @@ -61,7 +61,7 @@ private void addCells(List cells) { private static List> rowsOfCells(List cells) { Cell c; float lastTop; - List> rv = new ArrayList>(); + List> rv = new ArrayList<>(); List lastRow; if (cells.isEmpty()) { @@ -78,7 +78,7 @@ public int compare(Cell arg0, Cell arg1) { Iterator iter = cells.iterator(); c = iter.next(); - lastTop = (float) c.getTop(); + lastTop = c.getTop(); lastRow = new ArrayList<>(); lastRow.add(c); rv.add(lastRow); @@ -90,7 +90,7 @@ public int compare(Cell arg0, Cell arg1) { rv.add(lastRow); } lastRow.add(c); - lastTop = (float) c.getTop(); + lastTop = c.getTop(); } return rv; } diff --git a/src/main/java/technology/tabula/TextChunk.java b/src/main/java/technology/tabula/TextChunk.java index ed8614db..d387a5de 100644 --- a/src/main/java/technology/tabula/TextChunk.java +++ b/src/main/java/technology/tabula/TextChunk.java @@ -10,7 +10,7 @@ @SuppressWarnings("serial") public class TextChunk extends RectangularTextContainer implements HasText { public static final TextChunk EMPTY = new TextChunk(0, 0, 0, 0); - List textElements = new ArrayList(); + List textElements = new ArrayList<>(); public TextChunk(float top, float left, float width, float height) { super(top, left, width, height); @@ -37,7 +37,7 @@ private enum DirectionalityOptions { private static HashMap directionalities; static { - directionalities = new HashMap(); + directionalities = new HashMap<>(); // BCT = bidirectional character type directionalities.put(java.lang.Character.DIRECTIONALITY_ARABIC_NUMBER, DirectionalityOptions.LTR); // Weak BCT "AN" in the Unicode specification. directionalities.put(java.lang.Character.DIRECTIONALITY_BOUNDARY_NEUTRAL, DirectionalityOptions.NONE); // Weak BCT "BN" in the Unicode specification. @@ -73,8 +73,8 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { throw new IllegalArgumentException(); } - ArrayList> chunks = new ArrayList>(); - ArrayList buff = new ArrayList(); + ArrayList> chunks = new ArrayList<>(); + ArrayList buff = new ArrayList<>(); DirectionalityOptions buffDirectionality = DirectionalityOptions.NONE; // the directionality of the characters in buff; for (TextElement te : this.getTextElements()) { @@ -107,7 +107,7 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { // and start a new one buffDirectionality = directionalities.get(Character.getDirectionality(te.getText().charAt(0))); - buff = new ArrayList(); + buff = new ArrayList<>(); buff.add(te); } } @@ -116,7 +116,7 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { Collections.reverse(buff); } chunks.add(buff); - ArrayList everything = new ArrayList(); + ArrayList everything = new ArrayList<>(); if (!isLtrDominant) { Collections.reverse(chunks); } @@ -126,7 +126,7 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) { return new TextChunk(everything); } - public int isLtrDominant() { + @Override public int isLtrDominant() { int ltrCnt = 0; int rtlCnt = 0; for (int i = 0; i < this.getTextElements().size(); i++) { @@ -159,17 +159,17 @@ public void add(TextElement textElement) { this.merge(textElement); } - public void add(List textElements) { - for (TextElement te : textElements) { + public void add(List elements) { + for (TextElement te : elements) { this.add(te); } } - public List getTextElements() { + @Override public List getTextElements() { return textElements; } - public String getText() { + @Override public String getText() { if (this.textElements.size() == 0) { return ""; } @@ -231,7 +231,7 @@ public List squeeze(Character c, int minRunLength) { Character currentChar, lastChar = null; int subSequenceLength = 0, subSequenceStart = 0; TextChunk[] t; - List rv = new ArrayList(); + List rv = new ArrayList<>(); for (int i = 0; i < this.getTextElements().size(); i++) { TextElement textElement = this.getTextElements().get(i); @@ -331,7 +331,7 @@ public static boolean allSameChar(List textChunks) { } public static List groupByLines(List textChunks) { - List lines = new ArrayList(); + List lines = new ArrayList<>(); if (textChunks.size() == 0) { return lines; @@ -360,7 +360,7 @@ public static List groupByLines(List textChunks) { lines.remove(lines.size() - 1); } - List rv = new ArrayList(lines.size()); + List rv = new ArrayList<>(lines.size()); for (Line line : lines) { rv.add(Line.removeRepeatedCharacters(line, ' ', 3)); diff --git a/src/main/java/technology/tabula/TextElement.java b/src/main/java/technology/tabula/TextElement.java index 6e232854..f54c4e2f 100644 --- a/src/main/java/technology/tabula/TextElement.java +++ b/src/main/java/technology/tabula/TextElement.java @@ -30,7 +30,7 @@ public TextElement(float y, float x, float width, float height, this.dir = dir; } - public String getText() { + @Override public String getText() { return text; } @@ -50,7 +50,7 @@ public float getFontSize() { return fontSize; } - public String toString() { + @Override public String toString() { StringBuilder sb = new StringBuilder(); String s = super.toString(); sb.append(s.substring(0, s.length() - 1)); @@ -110,7 +110,7 @@ public static List mergeWords(List textElements) { */ public static List mergeWords(List textElements, List verticalRulings) { - List textChunks = new ArrayList(); + List textChunks = new ArrayList<>(); if (textElements.isEmpty()) { return textChunks; @@ -120,15 +120,15 @@ public static List mergeWords(List textElements, List copyOfTextElements = new ArrayList(textElements); + List copyOfTextElements = new ArrayList<>(textElements); textChunks.add(new TextChunk(copyOfTextElements.remove(0))); TextChunk firstTC = textChunks.get(0); float previousAveCharWidth = (float) firstTC.getWidth(); - float endOfLastTextX = (float) firstTC.getRight(); - float maxYForLine = (float) firstTC.getBottom(); + float endOfLastTextX = firstTC.getRight(); + float maxYForLine = firstTC.getBottom(); float maxHeightForLine = (float) firstTC.getHeight(); - float minYTopForLine = (float) firstTC.getTop(); + float minYTopForLine = firstTC.getTop(); float lastWordSpacing = -1; float wordSpacing, deltaSpace, averageCharWidth, deltaCharWidth; float expectedStartOfNextWordX, dist; @@ -202,7 +202,7 @@ public static List mergeWords(List textElements, List mergeWords(List textElements, List mergeWords(List textElements, List mergeWords(List textElements, List mergeWords(List textElements, List textChunksSeparatedByDirectionality = new ArrayList(); + List textChunksSeparatedByDirectionality = new ArrayList<>(); // count up characters by directionality for (TextChunk chunk : textChunks) { // choose the dominant direction diff --git a/src/main/java/technology/tabula/Utils.java b/src/main/java/technology/tabula/Utils.java index 1f04a4c2..d41bbe49 100644 --- a/src/main/java/technology/tabula/Utils.java +++ b/src/main/java/technology/tabula/Utils.java @@ -105,10 +105,10 @@ public static String join(String glue, String... s) { } public static List> transpose(List> table) { - List> ret = new ArrayList>(); + List> ret = new ArrayList<>(); final int N = table.get(0).size(); for (int i = 0; i < N; i++) { - List col = new ArrayList(); + List col = new ArrayList<>(); for (List row : table) { col.add(row.get(i)); } @@ -160,7 +160,7 @@ public static List parsePagesOption(String pagesSpec) throws ParseExcep return null; } - List rv = new ArrayList(); + List rv = new ArrayList<>(); String[] ranges = pagesSpec.split(","); for (int i = 0; i < ranges.length; i++) { @@ -188,8 +188,8 @@ public static List parsePagesOption(String pagesSpec) throws ParseExcep public static void snapPoints(List rulings, float xThreshold, float yThreshold) { // collect points and keep a Line -> p1,p2 map - Map linesToPoints = new HashMap(); - List points = new ArrayList(); + Map linesToPoints = new HashMap<>(); + List points = new ArrayList<>(); for (Line2D.Float r : rulings) { Point2D p1 = r.getP1(); Point2D p2 = r.getP2(); @@ -206,15 +206,15 @@ public int compare(Point2D arg0, Point2D arg1) { } }); - List> groupedPoints = new ArrayList>(); - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{points.get(0)}))); + List> groupedPoints = new ArrayList<>(); + groupedPoints.add(new ArrayList<>(Arrays.asList(new Point2D[]{points.get(0)}))); for (Point2D p : points.subList(1, points.size() - 1)) { List last = groupedPoints.get(groupedPoints.size() - 1); if (Math.abs(p.getX() - last.get(0).getX()) < xThreshold) { groupedPoints.get(groupedPoints.size() - 1).add(p); } else { - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{p}))); + groupedPoints.add(new ArrayList<>(Arrays.asList(new Point2D[]{p}))); } } @@ -238,15 +238,15 @@ public int compare(Point2D arg0, Point2D arg1) { } }); - groupedPoints = new ArrayList>(); - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{points.get(0)}))); + groupedPoints = new ArrayList<>(); + groupedPoints.add(new ArrayList<>(Arrays.asList(new Point2D[]{points.get(0)}))); for (Point2D p : points.subList(1, points.size() - 1)) { List last = groupedPoints.get(groupedPoints.size() - 1); if (Math.abs(p.getY() - last.get(0).getY()) < yThreshold) { groupedPoints.get(groupedPoints.size() - 1).add(p); } else { - groupedPoints.add(new ArrayList(Arrays.asList(new Point2D[]{p}))); + groupedPoints.add(new ArrayList<>(Arrays.asList(new Point2D[]{p}))); } } diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index 6619f2ab..f9f923b5 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -59,7 +59,7 @@ private static void debugNonCleanRulings(Graphics2D g, Page page) { private static void debugRulings(Graphics2D g, Page page) { // draw detected lines - List rulings = new ArrayList(page.getHorizontalRulings()); + List rulings = new ArrayList<>(page.getHorizontalRulings()); rulings.addAll(page.getVerticalRulings()); drawShapes(g, rulings); } @@ -70,8 +70,8 @@ private static void debugColumns(Graphics2D g, Page page) { List columns = BasicExtractionAlgorithm.columnPositions(lines); int i = 0; for (float p : columns) { - Ruling r = new Ruling(new Point2D.Float(p, (float) page.getTop()), - new Point2D.Float(p, (float) page.getBottom())); + Ruling r = new Ruling(new Point2D.Float(p, page.getTop()), + new Point2D.Float(p, page.getBottom())); g.setColor(COLORS[(i++) % 5]); drawShape(g, r); } @@ -171,7 +171,7 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { g.setStroke(new BasicStroke(1f)); float[] seps = profile.findVerticalSeparators(horizSmoothKernel * 2.5f); for (int i = 0; i < seps.length; i++) { - float x = (float) (page.getLeft() + seps[i]); + float x = page.getLeft() + seps[i]; g.draw(new Line2D.Double(x, page.getTop(), x, page.getBottom())); } @@ -199,7 +199,7 @@ private static void debugProjectionProfile(Graphics2D g, Page page) { g.setStroke(new BasicStroke(1.5f)); seps = profile.findHorizontalSeparators(vertSmoothKernel); for (int i = 0; i < seps.length; i++) { - float y = (float) (page.getTop() + seps[i]); + float y = page.getTop() + seps[i]; g.draw(new Line2D.Double(page.getLeft(), y, page.getRight(), y)); } @@ -225,7 +225,7 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re page = page.getArea(area); } - PDPage p = (PDPage) document.getPage(pageNumber); + PDPage p = document.getPage(pageNumber); BufferedImage image = Utils.pageConvertToImage(p, 72, ImageType.RGB); @@ -276,7 +276,6 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re ImageIO.write(image, "jpg", new File(outPath)); } - @SuppressWarnings("static-access") private static Options buildOptions() { Options o = new Options(); diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index 6b946333..8f155ae3 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -108,7 +108,7 @@ public List detect(Page page) { try { image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); } catch (IOException e) { - return new ArrayList(); + return new ArrayList<>(); } List horizontalRulings = this.getHorizontalRulings(image); @@ -119,7 +119,7 @@ public List detect(Page page) { removeTextDocument = this.removeText(pdfPage); image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); } catch (Exception e) { - return new ArrayList(); + return new ArrayList<>(); } finally { if (removeTextDocument != null) { try { @@ -133,10 +133,10 @@ public List detect(Page page) { List verticalRulings = this.getVerticalRulings(image); - List allEdges = new ArrayList(horizontalRulings); + List allEdges = new ArrayList<>(horizontalRulings); allEdges.addAll(verticalRulings); - List tableAreas = new ArrayList(); + List tableAreas = new ArrayList<>(); // if we found some edges, try to find some tables based on them if (allEdges.size() > 0) { @@ -289,7 +289,7 @@ public List detect(Page page) { } while (foundTable); // create a set of our current tables that will eliminate duplicate tables - Set tableSet = new TreeSet(new Comparator() { + Set tableSet = new TreeSet<>(new Comparator() { @Override public int compare(Rectangle o1, Rectangle o2) { if (o1.equals(o2)) { @@ -317,7 +317,7 @@ public int compare(Rectangle o1, Rectangle o2) { tableSet.addAll(tableAreas); - return new ArrayList(tableSet); + return new ArrayList<>(tableSet); } private Rectangle getTableFromText(List lines, @@ -534,21 +534,21 @@ private TextEdges getTextEdges(List lines) { // first put this chunk into any edge buckets it belongs to List leftEdge = currLeftEdges.get(left); if (leftEdge == null) { - leftEdge = new ArrayList(); + leftEdge = new ArrayList<>(); currLeftEdges.put(left, leftEdge); } leftEdge.add(text); List midEdge = currMidEdges.get(mid); if (midEdge == null) { - midEdge = new ArrayList(); + midEdge = new ArrayList<>(); currMidEdges.put(mid, midEdge); } midEdge.add(text); List rightEdge = currRightEdges.get(right); if (rightEdge == null) { - rightEdge = new ArrayList(); + rightEdge = new ArrayList<>(); currRightEdges.put(right, rightEdge); } rightEdge.add(text); @@ -654,7 +654,7 @@ private TextEdges getTextEdges(List lines) { } private List getTableAreasFromCells(List cells) { - List> cellGroups = new ArrayList>(); + List> cellGroups = new ArrayList<>(); for (Rectangle cell : cells) { boolean addedToGroup = false; @@ -677,14 +677,14 @@ private List getTableAreasFromCells(List cells) } if (!addedToGroup) { - ArrayList cellGroup = new ArrayList(); + ArrayList cellGroup = new ArrayList<>(); cellGroup.add(cell); cellGroups.add(cellGroup); } } // create table areas based on cell group - List tableAreas = new ArrayList(); + List tableAreas = new ArrayList<>(); for (List cellGroup : cellGroups) { // less than four cells should not make a table if (cellGroup.size() < REQUIRED_CELLS_FOR_TABLE) { @@ -713,7 +713,7 @@ private List getHorizontalRulings(BufferedImage image) { // get all horizontal edges, which we'll define as a change in grayscale colour // along a straight line of a certain length - ArrayList horizontalRulings = new ArrayList(); + ArrayList horizontalRulings = new ArrayList<>(); Raster r = image.getRaster(); int width = r.getWidth(); @@ -776,7 +776,7 @@ private List getVerticalRulings(BufferedImage image) { // get all vertical edges, which we'll define as a change in grayscale colour // along a straight line of a certain length - ArrayList verticalRulings = new ArrayList(); + ArrayList verticalRulings = new ArrayList<>(); Raster r = image.getRaster(); int width = r.getWidth(); @@ -842,7 +842,7 @@ private PDDocument removeText(PDPage page) throws IOException { PDFStreamParser parser = new PDFStreamParser(page); parser.parse(); List tokens = parser.getTokens(); - List newTokens = new ArrayList(); + List newTokens = new ArrayList<>(); for (Object token : tokens) { if (token instanceof Operator) { Operator op = (Operator) token; diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index b6a7bcb5..40283f46 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -26,9 +26,9 @@ public BasicExtractionAlgorithm(List verticalRulings) { } public List
extract(Page page, List verticalRulingPositions) { - List verticalRulings = new ArrayList(verticalRulingPositions.size()); + List verticalRulings = new ArrayList<>(verticalRulingPositions.size()); for (Float p: verticalRulingPositions) { - verticalRulings.add(new Ruling((float) page.getTop(), (float) p, 0.0f, (float) page.getHeight())); + verticalRulings.add(new Ruling(page.getTop(), p, 0.0f, (float) page.getHeight())); } this.verticalRulings = verticalRulings; return this.extract(page); @@ -109,7 +109,7 @@ public String toString() { */ public static List columnPositions(List lines) { - List regions = new ArrayList(); + List regions = new ArrayList<>(); for (TextChunk tc: lines.get(0).getTextElements()) { if (tc.isSameChar(Line.WHITE_SPACE_CHARS)) { continue; @@ -120,7 +120,7 @@ public static List columnPositions(List lines) { } for (Line l: lines.subList(1, lines.size())) { - List lineTextElements = new ArrayList(); + List lineTextElements = new ArrayList<>(); for (TextChunk tc: l.getTextElements()) { if (!tc.isSameChar(Line.WHITE_SPACE_CHARS)) { lineTextElements.add(tc); @@ -129,7 +129,7 @@ public static List columnPositions(List lines) { for (Rectangle cr: regions) { - List overlaps = new ArrayList(); + List overlaps = new ArrayList<>(); for (TextChunk te: lineTextElements) { if (cr.horizontallyOverlaps(te)) { overlaps.add(te); @@ -152,7 +152,7 @@ public static List columnPositions(List lines) { List rv = new ArrayList<>(); for (Rectangle r: regions) { - rv.add((float) r.getRight()); + rv.add(r.getRight()); } Collections.sort(rv); diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index f5052e69..2e663bd3 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -80,17 +80,17 @@ else if (arg0Y < arg1Y) { @Override - public List extract(Page page) { + public List
extract(Page page) { return extract(page, page.getRulings()); } /** * Extract a list of Table from page using rulings as separators */ - public List extract(Page page, List rulings) { + public List
extract(Page page, List rulings) { // split rulings into horizontal and vertical - List horizontalR = new ArrayList(), - verticalR = new ArrayList(); + List horizontalR = new ArrayList<>(), + verticalR = new ArrayList<>(); for (Ruling r: rulings) { if (r.horizontal()) { @@ -106,10 +106,10 @@ else if (r.vertical()) { List cells = findCells(horizontalR, verticalR); List spreadsheetAreas = findSpreadsheetsFromCells(cells); - List spreadsheets = new ArrayList(); + List
spreadsheets = new ArrayList<>(); for (Rectangle area: spreadsheetAreas) { - List overlappingCells = new ArrayList(); + List overlappingCells = new ArrayList<>(); for (Cell c: cells) { if (c.intersects(area)) { @@ -118,13 +118,13 @@ else if (r.vertical()) { } } - List horizontalOverlappingRulings = new ArrayList(); + List horizontalOverlappingRulings = new ArrayList<>(); for (Ruling hr: horizontalR) { if (area.intersectsLine(hr)) { horizontalOverlappingRulings.add(hr); } } - List verticalOverlappingRulings = new ArrayList(); + List verticalOverlappingRulings = new ArrayList<>(); for (Ruling vr: verticalR) { if (area.intersectsLine(vr)) { verticalOverlappingRulings.add(vr); @@ -176,9 +176,9 @@ public boolean isTabular(Page page) { } public static List findCells(List horizontalRulingLines, List verticalRulingLines) { - List cellsFound = new ArrayList(); + List cellsFound = new ArrayList<>(); Map intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines); - List intersectionPointsList = new ArrayList(intersectionPoints.keySet()); + List intersectionPointsList = new ArrayList<>(intersectionPoints.keySet()); Collections.sort(intersectionPointsList, POINT_COMPARATOR); boolean doBreak = false; @@ -188,9 +188,9 @@ public static List findCells(List horizontalRulingLines, List xPoints = new ArrayList(); + List xPoints = new ArrayList<>(); // CrossingPointsDirectlyToTheRight( topLeft ); - List yPoints = new ArrayList(); + List yPoints = new ArrayList<>(); for (Point2D p: intersectionPointsList.subList(i, intersectionPointsList.size())) { if (p.getX() == topLeft.getX() && p.getY() > topLeft.getY()) { @@ -234,13 +234,13 @@ public static List findCells(List horizontalRulingLines, List findSpreadsheetsFromCells(List cells) { // via: http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon - List rectangles = new ArrayList(); - Set pointSet = new HashSet(); - Map edgesH = new HashMap(); - Map edgesV = new HashMap(); + List rectangles = new ArrayList<>(); + Set pointSet = new HashSet<>(); + Map edgesH = new HashMap<>(); + Map edgesV = new HashMap<>(); int i = 0; - cells = new ArrayList(new HashSet(cells)); + cells = new ArrayList<>(new HashSet<>(cells)); Utils.sort(cells); @@ -256,10 +256,10 @@ public static List findSpreadsheetsFromCells(List pointsSortX = new ArrayList(pointSet); + List pointsSortX = new ArrayList<>(pointSet); Collections.sort(pointsSortX, X_FIRST_POINT_COMPARATOR); // Y first sort - List pointsSortY = new ArrayList(pointSet); + List pointsSortY = new ArrayList<>(pointSet); Collections.sort(pointsSortY, POINT_COMPARATOR); while (i < pointSet.size()) { @@ -282,10 +282,10 @@ public static List findSpreadsheetsFromCells(List> polygons = new ArrayList>(); + List> polygons = new ArrayList<>(); Point2D nextVertex; while (!edgesH.isEmpty()) { - ArrayList polygon = new ArrayList(); + ArrayList polygon = new ArrayList<>(); Point2D first = edgesH.keySet().iterator().next(); polygon.add(new PolygonVertex(first, Direction.HORIZONTAL)); edgesH.remove(first); @@ -357,7 +357,7 @@ public PolygonVertex(Point2D point, Direction direction) { this.point = point; } - public boolean equals(Object other) { + @Override public boolean equals(Object other) { if (this == other) return true; if (!(other instanceof PolygonVertex)) @@ -365,11 +365,11 @@ public boolean equals(Object other) { return this.point.equals(((PolygonVertex) other).point); } - public int hashCode() { + @Override public int hashCode() { return this.point.hashCode(); } - public String toString() { + @Override public String toString() { return String.format("%s[point=%s,direction=%s]", this.getClass().getName(), this.point.toString(), this.direction.toString()); } } diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index da40db78..fd43f288 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -187,7 +187,7 @@ public void testColumnRecognition() throws IOException { @Test public void testVerticalRulingsPreventMergingOfColumns() throws IOException { - List rulings = new ArrayList(); + List rulings = new ArrayList<>(); Float[] rulingsVerticalPositions = {147f, 256f, 310f, 375f, 431f, 504f}; for (int i = 0; i < 6; i++) { rulings.add(new Ruling(255.57f, rulingsVerticalPositions[i], 0, 398.76f - 255.57f)); @@ -326,7 +326,7 @@ public void testNaturalOrderOfRectanglesOneMoreTime() throws IOException { Charset.forName("utf-8"), CSVFormat.DEFAULT); - List rectangles = new ArrayList(); + List rectangles = new ArrayList<>(); for (CSVRecord record : parse) { rectangles.add(new Rectangle(Float.parseFloat(record.get(0)), diff --git a/src/test/java/technology/tabula/TestCell.java b/src/test/java/technology/tabula/TestCell.java index 92796920..de1b8cb8 100644 --- a/src/test/java/technology/tabula/TestCell.java +++ b/src/test/java/technology/tabula/TestCell.java @@ -33,7 +33,7 @@ public void testGetTextElements() { TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); - List tList = new ArrayList(); + List tList = new ArrayList<>(); tList.add(tChunk); cell.setTextElements(tList); diff --git a/src/test/java/technology/tabula/TestLine.java b/src/test/java/technology/tabula/TestLine.java index 9748415a..90df0e31 100644 --- a/src/test/java/technology/tabula/TestLine.java +++ b/src/test/java/technology/tabula/TestLine.java @@ -16,7 +16,7 @@ public void testSetTextElements() { TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); - List tList = new ArrayList(); + List tList = new ArrayList<>(); tList.add(tChunk); line.setTextElements(tList); diff --git a/src/test/java/technology/tabula/TestProjectionProfile.java b/src/test/java/technology/tabula/TestProjectionProfile.java index 4bdd83af..44d488eb 100644 --- a/src/test/java/technology/tabula/TestProjectionProfile.java +++ b/src/test/java/technology/tabula/TestProjectionProfile.java @@ -21,18 +21,18 @@ public void setUpProjectionProfile() { TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); TextElement textElement2 = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); - List textList = new ArrayList(); + List textList = new ArrayList<>(); textList.add(textElement); textList.add(textElement2); Ruling ruling = new Ruling(0, 0, 10, 10); - List rulingList = new ArrayList(); + List rulingList = new ArrayList<>(); rulingList.add(ruling); page = new Page(0, 0, 1, 1, 0, 1, pdPage, textList, rulingList); - List rectangles = new ArrayList(); + List rectangles = new ArrayList<>(); rectangles.add(new Rectangle(0f, 0f, 500f, 5f)); pProfile = new ProjectionProfile(page, rectangles, 5, 5); @@ -65,7 +65,7 @@ public void testFindHorizontalSeparators() { @Test public void testSmooth() { float[] data = {0, 1, 2}; - float[] rv = pProfile.smooth(data, 3); + float[] rv = ProjectionProfile.smooth(data, 3); assertEquals(1f, rv[2], 1e-5); } @@ -73,7 +73,7 @@ public void testSmooth() { @Test public void testFilter() { float[] data = {0, 1, 2}; - float[] rv = pProfile.filter(data, 3); + float[] rv = ProjectionProfile.filter(data, 3); assertEquals(3f, rv[1], 1e-5); } @@ -81,7 +81,7 @@ public void testFilter() { @Test public void testGetAutocorrelation() { float[] projection = {0, 1, 2}; - float[] rv = pProfile.getAutocorrelation(projection); + float[] rv = ProjectionProfile.getAutocorrelation(projection); assertEquals(0f, rv[0], 1e-5); assertTrue(rv.length == 2); diff --git a/src/test/java/technology/tabula/TestRectangleSpatialIndex.java b/src/test/java/technology/tabula/TestRectangleSpatialIndex.java index 1c05daf1..46eb1ea3 100644 --- a/src/test/java/technology/tabula/TestRectangleSpatialIndex.java +++ b/src/test/java/technology/tabula/TestRectangleSpatialIndex.java @@ -11,7 +11,7 @@ public void testIntersects() { Rectangle r = new Rectangle(0, 0, 0, 0); - RectangleSpatialIndex rSpatialIndex = new RectangleSpatialIndex(); + RectangleSpatialIndex rSpatialIndex = new RectangleSpatialIndex<>(); rSpatialIndex.add(r); assertTrue(rSpatialIndex.intersects(r).size() > 0); diff --git a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java index d63da204..51375cb9 100644 --- a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java +++ b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java @@ -163,7 +163,7 @@ public void testFindSpreadsheetsFromCells() throws IOException { Charset.forName("utf-8"), CSVFormat.DEFAULT); - List cells = new ArrayList(); + List cells = new ArrayList<>(); for (CSVRecord record : parse) { cells.add(new Cell(Float.parseFloat(record.get(0)), @@ -173,10 +173,9 @@ public void testFindSpreadsheetsFromCells() throws IOException { } - SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); List expected = Arrays.asList(EXPECTED_RECTANGLES); Collections.sort(expected); - List foundRectangles = se.findSpreadsheetsFromCells(cells); + List foundRectangles = SpreadsheetExtractionAlgorithm.findSpreadsheetsFromCells(cells); Collections.sort(foundRectangles); assertTrue(foundRectangles.equals(expected)); } @@ -198,12 +197,12 @@ public void testSpanningCells() throws IOException { .getPage("src/test/resources/technology/tabula/spanning_cells.pdf", 1); String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/spanning_cells.json"); SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); - List tables = se.extract(page); + List
tables = se.extract(page); assertEquals(2, tables.size()); StringBuilder sb = new StringBuilder(); - (new JSONWriter()).write(sb, (List
) tables); + (new JSONWriter()).write(sb, tables); assertEquals(expectedJson, sb.toString()); } @@ -214,12 +213,12 @@ public void testSpanningCellsToCsv() throws IOException { .getPage("src/test/resources/technology/tabula/spanning_cells.pdf", 1); String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spanning_cells.csv"); SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); - List tables = se.extract(page); + List
tables = se.extract(page); assertEquals(2, tables.size()); StringBuilder sb = new StringBuilder(); - (new CSVWriter()).write(sb, (List
) tables); + (new CSVWriter()).write(sb, tables); assertEquals(expectedCsv, sb.toString()); } @@ -354,7 +353,7 @@ public void testDontRaiseSortException() throws IOException { 446.0f, 97.0f, 685.0f, 520.0f); page.getText(); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); - Table table = bea.extract(page).get(0); + bea.extract(page).get(0); } @Test @@ -364,7 +363,7 @@ public void testShouldDetectASingleSpreadsheet() throws IOException { 1, 68.08f, 16.44f, 680.85f, 597.84f); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) bea.extract(page); + List
tables = bea.extract(page); assertEquals(1, tables.size()); } @@ -373,7 +372,7 @@ public void testExtractTableWithExternallyDefinedRulings() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-007.pdf", 1); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) bea.extract(page, + List
tables = bea.extract(page, Arrays.asList(EXTERNALLY_DEFINED_RULINGS)); assertEquals(1, tables.size()); Table table = tables.get(0); @@ -404,7 +403,7 @@ public void testAnotherExtractTableWithExternallyDefinedRulings() throws IOExcep Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/us-024.pdf", 1); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) bea.extract(page, + List
tables = bea.extract(page, Arrays.asList(EXTERNALLY_DEFINED_RULINGS2)); assertEquals(1, tables.size()); Table table = tables.get(0); @@ -419,7 +418,7 @@ public void testSpreadsheetsSortedByTopAndRight() throws IOException { 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) sea.extract(page); + List
tables = sea.extract(page); for (int i = 1; i < tables.size(); i++) { assert (tables.get(i - 1).getTop() <= tables.get(i).getTop()); } @@ -431,7 +430,7 @@ public void testDontStackOverflowQuicksort() throws IOException { 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) sea.extract(page); + List
tables = sea.extract(page); for (int i = 1; i < tables.size(); i++) { assert (tables.get(i - 1).getTop() <= tables.get(i).getTop()); } @@ -442,7 +441,7 @@ public void testRTL() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/arabic.pdf", 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) sea.extract(page); + List
tables = sea.extract(page); // assertEquals(1, tables.size()); Table table = tables.get(0); @@ -473,7 +472,7 @@ public void testRealLifeRTL() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/mednine.pdf", 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) sea.extract(page); + List
tables = sea.extract(page); // assertEquals(1, tables.size()); Table table = tables.get(0); @@ -522,7 +521,7 @@ public void testSpreadsheetExtractionIssue656() throws IOException { String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/Publication_of_award_of_Bids_for_Transport_Sector__August_2016.csv"); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List
tables = (List
) sea.extract(page); + List
tables = sea.extract(page); assertEquals(1, tables.size()); Table table = tables.get(0); diff --git a/src/test/java/technology/tabula/TestTableDetection.java b/src/test/java/technology/tabula/TestTableDetection.java index 899bfcec..1bb86c3d 100644 --- a/src/test/java/technology/tabula/TestTableDetection.java +++ b/src/test/java/technology/tabula/TestTableDetection.java @@ -80,6 +80,7 @@ public void save() { w.write(gson.toJson(this)); w.close(); } catch (Exception e) { + throw new Error(e); } } @@ -108,7 +109,7 @@ public static void enableLogging() { public static Collection data() { String[] regionCodes = {"eu", "us"}; - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); for (String regionCode : regionCodes) { String directoryName = "src/test/resources/technology/tabula/icdar2013-dataset/competition-dataset-" + regionCode + "/"; @@ -224,7 +225,7 @@ public void testDetectionOfTables() throws Exception { // now compare System.out.println("Testing " + this.pdf.getName()); - List errors = new ArrayList(); + List errors = new ArrayList<>(); this.status.numExpectedTables = numExpectedTables; totalExpectedTables += numExpectedTables; @@ -289,7 +290,7 @@ public void testDetectionOfTables() throws Exception { } private List comparePages(Integer page, List detected, List expected) { - ArrayList errors = new ArrayList(); + ArrayList errors = new ArrayList<>(); // go through the detected tables and try to match them with expected tables // from http://www.orsigiorgio.net/wp-content/papercite-data/pdf/gho*12.pdf (comparing regions): diff --git a/src/test/java/technology/tabula/TestTextElement.java b/src/test/java/technology/tabula/TestTextElement.java index d662d5ab..feaaa5e6 100644 --- a/src/test/java/technology/tabula/TestTextElement.java +++ b/src/test/java/technology/tabula/TestTextElement.java @@ -1,6 +1,5 @@ package technology.tabula; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -12,7 +11,7 @@ public class TestTextElement { @Test - public void createTextElement() throws IOException { + public void createTextElement() { TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f); @@ -31,7 +30,7 @@ public void createTextElement() throws IOException { } @Test - public void createTextElementWithDirection() throws IOException { + public void createTextElementWithDirection() { TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f); @@ -52,7 +51,7 @@ public void createTextElementWithDirection() throws IOException { @Test public void mergeFourElementsIntoFourWords() { - List elements = new ArrayList(); + List elements = new ArrayList<>(); elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); elements.add(new TextElement(20f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); elements.add(new TextElement(40f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); @@ -60,7 +59,7 @@ public void mergeFourElementsIntoFourWords() { List words = TextElement.mergeWords(elements); - List expectedWords = new ArrayList(); + List expectedWords = new ArrayList<>(); expectedWords.add(new TextChunk(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f))); expectedWords.add(new TextChunk(new TextElement(20f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f))); expectedWords.add(new TextChunk(new TextElement(40f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f))); @@ -73,7 +72,7 @@ public void mergeFourElementsIntoFourWords() { @Test public void mergeFourElementsIntoOneWord() { - List elements = new ArrayList(); + List elements = new ArrayList<>(); elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); elements.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); elements.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); @@ -81,7 +80,7 @@ public void mergeFourElementsIntoOneWord() { List words = TextElement.mergeWords(elements); - List expectedWords = new ArrayList(); + List expectedWords = new ArrayList<>(); TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); textChunk.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); textChunk.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); @@ -99,7 +98,7 @@ public void mergeElementsShouldBeIdempotent() { * it was called with. Discussion here: https://github.com/tabulapdf/tabula-java/issues/78 */ - List elements = new ArrayList(); + List elements = new ArrayList<>(); elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); elements.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); elements.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); @@ -113,7 +112,7 @@ public void mergeElementsShouldBeIdempotent() { @Test public void mergeElementsWithSkippingRules() { - List elements = new ArrayList(); + List elements = new ArrayList<>(); elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); elements.add(new TextElement(0f, 17f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); elements.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); @@ -123,7 +122,7 @@ public void mergeElementsWithSkippingRules() { List words = TextElement.mergeWords(elements); - List expectedWords = new ArrayList(); + List expectedWords = new ArrayList<>(); TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); textChunk.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); textChunk.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); @@ -137,7 +136,7 @@ public void mergeElementsWithSkippingRules() { @Test public void mergeTenElementsIntoTwoWords() { - List elements = new ArrayList(); + List elements = new ArrayList<>(); elements.add(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); elements.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); elements.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); @@ -150,7 +149,7 @@ public void mergeTenElementsIntoTwoWords() { List words = TextElement.mergeWords(elements); - List expectedWords = new ArrayList(); + List expectedWords = new ArrayList<>(); TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); textChunk.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); textChunk.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); @@ -172,7 +171,7 @@ public void mergeTenElementsIntoTwoWords() { @Test public void mergeTenElementsIntoTwoLines() { - List elements = new ArrayList(); + List elements = new ArrayList<>(); elements.add(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); elements.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); elements.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); @@ -185,7 +184,7 @@ public void mergeTenElementsIntoTwoLines() { List words = TextElement.mergeWords(elements); - List expectedWords = new ArrayList(); + List expectedWords = new ArrayList<>(); TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); textChunk.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); textChunk.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index 75146565..ffba82e6 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -82,7 +82,7 @@ public void testAnotherExceptionInParsePages() throws ParseException { @Test public void testQuickSortEmptyList() { - List numbers = new ArrayList(); + List numbers = new ArrayList<>(); QuickSort.sort(numbers); assertEquals(Collections.emptyList(), numbers); @@ -107,8 +107,8 @@ public void testQuickSortShortList() { @Test public void testQuickSortLongList() { - List numbers = new ArrayList(); - List expectedNumbers = new ArrayList(); + List numbers = new ArrayList<>(); + List expectedNumbers = new ArrayList<>(); for(int i = 0; i <= 12000; i++){ numbers.add(12000 - i); diff --git a/src/test/java/technology/tabula/TestWriters.java b/src/test/java/technology/tabula/TestWriters.java index 63b3dcce..961d57af 100644 --- a/src/test/java/technology/tabula/TestWriters.java +++ b/src/test/java/technology/tabula/TestWriters.java @@ -31,7 +31,7 @@ private List
getTables() throws IOException { Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/twotables.pdf", 1); SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - return (List
) sea.extract(page); + return sea.extract(page); } @Test From c2eafdf7fae54d1bcc6fba256ea3afc68767482a Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 06:54:10 +0200 Subject: [PATCH 060/245] Table.CellPosition made a static inner class --- src/main/java/technology/tabula/Table.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/Table.java b/src/main/java/technology/tabula/Table.java index 525f1f3a..f0306f2c 100644 --- a/src/main/java/technology/tabula/Table.java +++ b/src/main/java/technology/tabula/Table.java @@ -9,7 +9,7 @@ @SuppressWarnings("serial") public class Table extends Rectangle { - class CellPosition implements Comparable { + static class CellPosition implements Comparable { int row, col; CellPosition(int row, int col) { this.row = row; this.col = col; From 5d3cebefe3f43e49a2323fc105a1be64ea8d937c Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 06:55:15 +0200 Subject: [PATCH 061/245] TestCellPosition removed (superfluous tests) --- .../technology/tabula/TestCellPosition.java | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 src/test/java/technology/tabula/TestCellPosition.java diff --git a/src/test/java/technology/tabula/TestCellPosition.java b/src/test/java/technology/tabula/TestCellPosition.java deleted file mode 100644 index 476168dd..00000000 --- a/src/test/java/technology/tabula/TestCellPosition.java +++ /dev/null @@ -1,45 +0,0 @@ -package technology.tabula; - -import static org.junit.Assert.*; - -import org.junit.Test; - -import technology.tabula.Table.CellPosition; - -public class TestCellPosition { - - @Test - public void testHashCode() { - Table table = new Table(); - CellPosition cellPosition = table.new CellPosition(5, 5); - - assertEquals(500005, cellPosition.hashCode()); - - } - - @Test - public void testEqualsObject() { - Table table = new Table(); - CellPosition cellPosition1 = table.new CellPosition(5, 5); - - assertTrue(cellPosition1.equals(cellPosition1)); - } - - @Test - public void testNotEqualsObject() { - Table table = new Table(); - CellPosition cellPosition1 = table.new CellPosition(5, 5); - CellPosition cellPosition2 = table.new CellPosition(5, 6); - - assertFalse(cellPosition1.equals(cellPosition2)); - } - - @Test - public void testNotInstanceOfObject() { - Table table = new Table(); - CellPosition cellPosition = table.new CellPosition(5, 5); - - assertFalse(cellPosition.equals("test")); - } - -} From db985d2411cabe066579ce7a83ec57d6adc8c0cf Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 08:36:21 +0200 Subject: [PATCH 062/245] Started cleaning up Table --- .../java/technology/tabula/QuickSort.java | 151 ++++++------ src/main/java/technology/tabula/Table.java | 224 +++++++----------- .../tabula/TableWithRulingLines.java | 13 +- src/main/java/technology/tabula/Utils.java | 21 +- .../extractors/BasicExtractionAlgorithm.java | 2 +- .../SpreadsheetExtractionAlgorithm.java | 14 +- .../tabula/json/TableSerializer.java | 6 +- .../technology/tabula/TestBasicExtractor.java | 6 +- .../technology/tabula/TestTableDetection.java | 8 +- .../java/technology/tabula/TestUtils.java | 2 +- 10 files changed, 190 insertions(+), 257 deletions(-) diff --git a/src/main/java/technology/tabula/QuickSort.java b/src/main/java/technology/tabula/QuickSort.java index 29491028..d6ada5b2 100644 --- a/src/main/java/technology/tabula/QuickSort.java +++ b/src/main/java/technology/tabula/QuickSort.java @@ -16,94 +16,97 @@ */ package technology.tabula; +import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.RandomAccess; import java.util.Stack; /** - * see http://de.wikipedia.org/wiki/Quicksort. + * An implementation of Quicksort. + * + * @see http://de.wikipedia.org/wiki/Quicksort * * @author UWe Pachler */ -public class QuickSort -{ - - private QuickSort() - { - } - - private static final Comparator objComp = new Comparator() - { - public int compare(Comparable object1, Comparable object2) - { - return object1.compareTo(object2); - } - }; +public final class QuickSort { + + private QuickSort() { + // utility + } + + /** + * Sorts the given list according to natural order. + */ + public static > void sort(List list) { + sort(list, QuickSort.naturalOrder()); // JAVA_8 replace with Comparator.naturalOrder() (and cleanup) + } + + /** + * Sorts the given list using the given comparator. + */ + public static void sort(List list, Comparator comparator) { + if (list instanceof RandomAccess) { + quicksort(list, comparator); + } else { + List copy = new ArrayList<>(list); + quicksort(copy, comparator); + list.clear(); + list.addAll(copy); + } + } - /** - * Sorts the given list using the given comparator. - */ - public static void sort(List list, Comparator cmp) - { - quicksort(list, cmp); - } + private static void quicksort(List list, Comparator cmp) { + Stack stack = new Stack<>(); + stack.push(0); + stack.push(list.size()); + while (!stack.isEmpty()) { + int right = stack.pop(); + int left = stack.pop(); + + if (right - left < 2) continue; + int p = left + ((right - left) / 2); + p = partition(list, cmp, p, left, right); - /** - * Sorts the given list using compareTo as comparator. - */ - public static void sort(List list) - { - sort(list, (Comparator) objComp); - } + stack.push(p + 1); + stack.push(right); - private static void quicksort(List list, Comparator cmp) - { - Stack stack = new Stack<>(); - stack.push(0); - stack.push(list.size()); - while (!stack.isEmpty()) { - int right = stack.pop(); - int left = stack.pop(); - if (right - left < 2) continue; - int p = left + ((right-left)/2); - p = partition(list, cmp, p, left, right); - - stack.push(p+1); - stack.push(right); + stack.push(left); + stack.push(p); + } + } - stack.push(left); - stack.push(p); + private static int partition(List list, Comparator cmp, int p, int start, int end) { + int l = start; + int h = end - 2; + T piv = list.get(p); + swap(list, p, end - 1); - } - } - - private static int partition(List list, Comparator cmp, int p, int start, int end) { - int l = start; - int h = end - 2; - T piv = list.get(p); - swap(list,p,end-1); + while (l < h) { + if (cmp.compare(list.get(l), piv) <= 0) l++; + else if (cmp.compare(piv, list.get(h)) <= 0) h--; + else swap(list, l, h); + } + int idx = h; + if (cmp.compare(list.get(h), piv) < 0) idx++; + swap(list, end - 1, idx); + return idx; + } - while (l < h) { - if (cmp.compare(list.get(l), piv) <= 0) { - l++; - } else if (cmp.compare(piv, list.get(h)) <= 0) { - h--; - } else { - swap(list,l,h); - } - } - int idx = h; - if (cmp.compare(list.get(h), piv) < 0) idx++; - swap(list,end-1,idx); - return idx; - } - + private static void swap(List list, int i, int j) { + T tmp = list.get(i); + list.set(i, list.get(j)); + list.set(j, tmp); + } - private static void swap(List list, int i, int j) - { - T tmp = list.get(i); - list.set(i, list.get(j)); - list.set(j, tmp); - } + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static final Comparator NATURAL_ORDER = new Comparator() { + @Override public int compare(Object l, Object r) { return ((Comparable) l).compareTo(r); } + }; + + @SuppressWarnings("unchecked") + private static > Comparator naturalOrder() { + return NATURAL_ORDER; + } } diff --git a/src/main/java/technology/tabula/Table.java b/src/main/java/technology/tabula/Table.java index f0306f2c..e0f27d11 100644 --- a/src/main/java/technology/tabula/Table.java +++ b/src/main/java/technology/tabula/Table.java @@ -8,139 +8,95 @@ @SuppressWarnings("serial") public class Table extends Rectangle { - - static class CellPosition implements Comparable { - int row, col; - CellPosition(int row, int col) { - this.row = row; this.col = col; - } - - @Override - public boolean equals(Object other) { - if (this == other) - return true; - if (!(other instanceof CellPosition)) - return false; - return other != null && this.row == ((CellPosition) other).row && this.col == ((CellPosition) other).col; - } - - @Override - public int hashCode() { - return this.row * 100000 + this.col; - } - - @Override - public int compareTo(CellPosition other) { - int rv = 0; - if(this.row < other.row) { - rv = -1; - } - else if (this.row > other.row) { - rv = 1; - } - else if (this.col > other.col) { - rv = 1; - } - else if (this.col < other.col) { - rv = -1; - } - return rv; - } - } - - class CellContainer extends TreeMap { - - public int maxRow = 0, maxCol = 0; - - public RectangularTextContainer get(int row, int col) { - return this.get(new CellPosition(row, col)); - } - - public List getRow(int row) { - return new ArrayList<>(this.subMap(new CellPosition(row, 0), new CellPosition(row, maxRow+1)).values()); - } - - @Override - public RectangularTextContainer put(CellPosition cp, RectangularTextContainer value) { - this.maxRow = Math.max(maxRow, cp.row); - this.maxCol = Math.max(maxCol, cp.col); - if (this.containsKey(cp)) { // adding on an existing CellPosition, concatenate content and resize - value.merge(this.get(cp)); - } - super.put(cp, value); - return value; - } - - @Override - public RectangularTextContainer get(Object key) { - return this.containsKey(key) ? super.get(key) : TextChunk.EMPTY; - } - - public boolean containsKey(int row, int col) { - return this.containsKey(new CellPosition(row, col)); - } - - } - - public static final Table EMPTY = new Table(); - - CellContainer cellContainer = new CellContainer(); - Page page; - ExtractionAlgorithm extractionAlgorithm; - List> rows = null; - - public Table() { - super(); - } - - public Table(Page page, ExtractionAlgorithm extractionAlgorithm) { - this(); - this.page = page; - this.extractionAlgorithm = extractionAlgorithm; - } - - public void add(RectangularTextContainer tc, int i, int j) { - this.merge(tc); - this.cellContainer.put(new CellPosition(i, j), tc); - this.rows = null; // clear the memoized rows - } - - public List> getRows() { - if (this.rows != null) { - return this.rows; - } - - this.rows = new ArrayList<>(); - for (int i = 0; i <= this.cellContainer.maxRow; i++) { - List lastRow = new ArrayList<>(); - this.rows.add(lastRow); - for (int j = 0; j <= this.cellContainer.maxCol; j++) { - lastRow.add(this.cellContainer.containsKey(i, j) ? this.cellContainer.get(i, j) : TextChunk.EMPTY); - } - } - return this.rows; - } - - public RectangularTextContainer getCell(int i, int j) { - return this.cellContainer.get(i, j); - } - - public List> getCols() { - return Utils.transpose(this.getRows()); - } - - public void setExtractionAlgorithm(ExtractionAlgorithm extractionAlgorithm) { - this.extractionAlgorithm = extractionAlgorithm; - } - - public ExtractionAlgorithm getExtractionAlgorithm() { - return extractionAlgorithm; - } - - public List getCells() { - return new ArrayList<>(this.cellContainer.values()); - } - - + + public static final Table EMPTY = new Table(""); + + private Table(String extractionMethod) { + this.extractionMethod = extractionMethod; + } + + public Table(ExtractionAlgorithm extractionAlgorithm) { + this(extractionAlgorithm.toString()); + } + + private final String extractionMethod; + + private int rowCount = 0; + private int colCount = 0; + + /* visible for testing */ final TreeMap cells = new TreeMap<>(); + + public int getRowCount() { return rowCount; } + public int getColCount() { return colCount; } + + public String getExtractionMethod() { return extractionMethod; } + + public void add(RectangularTextContainer chunk, int row, int col) { + this.merge(chunk); + + rowCount = Math.max(rowCount, row); + colCount = Math.max(colCount, col); + + CellPosition cp = new CellPosition(row, col); + + RectangularTextContainer old = cells.get(cp); + if (old != null) chunk.merge(old); + cells.put(cp, chunk); + + this.memoizedRows = null; + } + + private List> memoizedRows = null; + + public List> getRows() { + if (this.memoizedRows == null) this.memoizedRows = computeRows(); + return this.memoizedRows; + } + + private List> computeRows() { + List> rows = new ArrayList<>(); + for (int i = 0; i <= rowCount; i++) { + List lastRow = new ArrayList<>(); + rows.add(lastRow); + for (int j = 0; j <= colCount; j++) { + RectangularTextContainer cell = cells.get(new CellPosition(i,j)); // JAVA_8 use getOrDefault() + lastRow.add(cell != null ? cell : TextChunk.EMPTY); + } + } + return rows; + } + + public RectangularTextContainer getCell(int i, int j) { + RectangularTextContainer cell = cells.get(new CellPosition(i,j)); // JAVA_8 use getOrDefault() + return cell != null ? cell : TextChunk.EMPTY; + } + +} + +class CellPosition implements Comparable { + + CellPosition(int row, int col) { + this.row = row; + this.col = col; + } + + final int row, col; + + @Override public int hashCode() { + return Integer.hashCode(row) + 101 * Integer.hashCode(col); + } + + @Override public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + CellPosition other = (CellPosition) obj; + return row == other.row && col == other.col; + } + + @Override public int compareTo(CellPosition other) { + int rowdiff = row - other.row; + return rowdiff != 0 ? rowdiff : col - other.col; + } } diff --git a/src/main/java/technology/tabula/TableWithRulingLines.java b/src/main/java/technology/tabula/TableWithRulingLines.java index 69d0d475..c119f191 100644 --- a/src/main/java/technology/tabula/TableWithRulingLines.java +++ b/src/main/java/technology/tabula/TableWithRulingLines.java @@ -6,22 +6,17 @@ import java.util.Iterator; import java.util.List; +import technology.tabula.extractors.ExtractionAlgorithm; + @SuppressWarnings("serial") public class TableWithRulingLines extends Table { List verticalRulings, horizontalRulings; RectangleSpatialIndex si = new RectangleSpatialIndex<>(); - public TableWithRulingLines() { - super(); - } - - public TableWithRulingLines(Rectangle area, Page page, List cells, - List horizontalRulings, - List verticalRulings) { - this(); + public TableWithRulingLines(Rectangle area, List cells, List horizontalRulings, List verticalRulings, ExtractionAlgorithm extractionAlgorithm) { + super(extractionAlgorithm); this.setRect(area); - this.page = page; this.verticalRulings = verticalRulings; this.horizontalRulings = horizontalRulings; this.addCells(cells); diff --git a/src/main/java/technology/tabula/Utils.java b/src/main/java/technology/tabula/Utils.java index d41bbe49..561cd00e 100644 --- a/src/main/java/technology/tabula/Utils.java +++ b/src/main/java/technology/tabula/Utils.java @@ -269,18 +269,13 @@ public int compare(Point2D arg0, Point2D arg1) { } } - public static BufferedImage pageConvertToImage(PDPage page, int dpi, ImageType imageType) throws IOException { - // Yeah, this sucks. But PDFBox 2 wants PDFRenderers to have - // a reference to a PDDocument (unnecessarily, IMHO) - - PDDocument document = new PDDocument(); - document.addPage(page); - - PDFRenderer renderer = new PDFRenderer(document); - - document.close(); - - return renderer.renderImageWithDPI(0, dpi, imageType); - } + public static BufferedImage pageConvertToImage(PDPage page, int dpi, ImageType imageType) throws IOException { + try (PDDocument document = new PDDocument()) { + document.addPage(page); + PDFRenderer renderer = new PDFRenderer(document); + document.close(); + return renderer.renderImageWithDPI(0, dpi, imageType); + } + } } diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index 40283f46..31a5ca89 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -63,7 +63,7 @@ public int compare(Ruling arg0, Ruling arg1) { columns = columnPositions(lines); } - Table table = new Table(page, this); + Table table = new Table(this); for (int i = 0; i < lines.size(); i++) { Line line = lines.get(i); diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 2e663bd3..c00de95f 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -131,11 +131,7 @@ else if (r.vertical()) { } } - TableWithRulingLines t = new TableWithRulingLines(area, page, overlappingCells, - horizontalOverlappingRulings, verticalOverlappingRulings); - - t.setExtractionAlgorithm(this); - + TableWithRulingLines t = new TableWithRulingLines(area, overlappingCells, horizontalOverlappingRulings, verticalOverlappingRulings, this); spreadsheets.add(t); } Utils.sort(spreadsheets); @@ -159,16 +155,16 @@ public boolean isTabular(Page page) { return false; } Table table = tables.get(0); - int rowsDefinedByLines = table.getRows().size(); - int colsDefinedByLines = table.getCols().size(); + int rowsDefinedByLines = table.getRowCount(); + int colsDefinedByLines = table.getColCount(); tables = new BasicExtractionAlgorithm().extract(minimalRegion); if (tables.size() == 0) { // TODO WHAT DO WE DO HERE? } table = tables.get(0); - int rowsDefinedWithoutLines = table.getRows().size(); - int colsDefinedWithoutLines = table.getCols().size(); + int rowsDefinedWithoutLines = table.getRowCount(); + int colsDefinedWithoutLines = table.getColCount(); float ratio = (((float) colsDefinedByLines / colsDefinedWithoutLines) + ((float) rowsDefinedByLines / rowsDefinedWithoutLines)) / 2.0f; diff --git a/src/main/java/technology/tabula/json/TableSerializer.java b/src/main/java/technology/tabula/json/TableSerializer.java index e3f211c9..87d091d0 100644 --- a/src/main/java/technology/tabula/json/TableSerializer.java +++ b/src/main/java/technology/tabula/json/TableSerializer.java @@ -25,11 +25,7 @@ public JsonElement serialize(Table src, Type typeOfSrc, JsonSerializationContext JsonObject result = new JsonObject(); - if (src.getExtractionAlgorithm() == null) { - result.addProperty("extraction_method", ""); - } else { - result.addProperty("extraction_method", (src.getExtractionAlgorithm()).toString()); - } + result.addProperty("extraction_method", src.getExtractionMethod()); result.addProperty("top", src.getTop()); result.addProperty("left", src.getLeft()); result.addProperty("width", src.getWidth()); diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index fd43f288..a9e06575 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -13,12 +13,8 @@ import org.apache.commons.csv.CSVRecord; import org.junit.Test; -import technology.tabula.Page; -import technology.tabula.Ruling; -import technology.tabula.Table; import technology.tabula.extractors.BasicExtractionAlgorithm; import technology.tabula.writers.CSVWriter; -import technology.tabula.UtilsForTesting; public class TestBasicExtractor { @@ -254,7 +250,7 @@ public void testNaturalOrderOfRectangles() throws IOException { page.getVerticalRulings()); Table table = bea.extract(page).get(0); - List cells = table.getCells(); + List cells = new ArrayList<>(table.cells.values()); for (RectangularTextContainer rectangularTextContainer : cells) { System.out.println(rectangularTextContainer.getText()); } diff --git a/src/test/java/technology/tabula/TestTableDetection.java b/src/test/java/technology/tabula/TestTableDetection.java index 1bb86c3d..6e58f6a4 100644 --- a/src/test/java/technology/tabula/TestTableDetection.java +++ b/src/test/java/technology/tabula/TestTableDetection.java @@ -47,10 +47,6 @@ private static final class TestStatus { private transient boolean firstRun; private transient String pdfFilename; - public TestStatus() { - this(null); - } - public TestStatus(String pdfFilename) { this.numExpectedTables = 0; this.numCorrectlyDetectedTables = 0; @@ -74,8 +70,7 @@ public static TestStatus load(String pdfFilename) { } public void save() { - try { - FileWriter w = new FileWriter(jsonFilename(this.pdfFilename)); + try (FileWriter w = new FileWriter(jsonFilename(this.pdfFilename))) { Gson gson = new Gson(); w.write(gson.toJson(this)); w.close(); @@ -145,6 +140,7 @@ public TestTableDetection(File pdf) { try { this.builder = factory.newDocumentBuilder(); } catch (Exception e) { + // ignored } } diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index ffba82e6..db634d89 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -48,7 +48,7 @@ public void testBoundsOfOneEmptyRectangleAndAnotherNonEmpty() { @Test public void testBoundsOfOneRectangle() { - ArrayList shapes = new ArrayList(); + ArrayList shapes = new ArrayList<>(); shapes.add(new Rectangle(0, 0, 20, 40)); Rectangle r = Utils.bounds(shapes); assertEquals(r, shapes.get(0)); From af0ce5e5e5043176512cad7561c0eef970cfc595 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 08:58:10 +0200 Subject: [PATCH 063/245] Rectangle no longer Comparable --- src/main/java/technology/tabula/Cell.java | 112 +++--- src/main/java/technology/tabula/HasText.java | 4 +- .../technology/tabula/ObjectExtractor.java | 2 +- .../java/technology/tabula/QuickSort.java | 6 +- .../java/technology/tabula/Rectangle.java | 342 +++++++++--------- .../tabula/RectangleSpatialIndex.java | 4 +- src/main/java/technology/tabula/Utils.java | 24 +- .../SpreadsheetDetectionAlgorithm.java | 2 +- .../SpreadsheetExtractionAlgorithm.java | 4 +- .../technology/tabula/TestBasicExtractor.java | 4 +- .../java/technology/tabula/TestRectangle.java | 6 +- .../tabula/TestSpreadsheetExtractor.java | 8 +- 12 files changed, 257 insertions(+), 261 deletions(-) diff --git a/src/main/java/technology/tabula/Cell.java b/src/main/java/technology/tabula/Cell.java index b7e568db..79c64fbc 100644 --- a/src/main/java/technology/tabula/Cell.java +++ b/src/main/java/technology/tabula/Cell.java @@ -7,69 +7,69 @@ @SuppressWarnings("serial") public class Cell extends RectangularTextContainer { - private boolean spanning; - private boolean placeholder; - private List textElements; - - public Cell(float top, float left, float width, float height) { - super(top, left, width, height); - this.setPlaceholder(false); - this.setSpanning(false); - this.setTextElements(new ArrayList()); - } - - public Cell(Point2D topLeft, Point2D bottomRight) { - super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight.getY() - topLeft.getY())); - this.setPlaceholder(false); - this.setSpanning(false); - this.setTextElements(new ArrayList()); - } - - @Override - public String getText(boolean useLineReturns) { - if (this.textElements.size() == 0) { - return ""; - } - StringBuilder sb = new StringBuilder(); - Collections.sort(this.textElements); - double curTop = this.textElements.get(0).getTop(); - for (TextChunk tc: this.textElements) { - if (useLineReturns && tc.getTop() > curTop) { - sb.append('\r'); - } - sb.append(tc.getText()); - curTop = tc.getTop(); - } - return sb.toString().trim(); - } - public String getText() { - return getText(true); - } + public Cell(float top, float left, float width, float height) { + super(top, left, width, height); + this.setPlaceholder(false); + this.setSpanning(false); + this.setTextElements(new ArrayList()); + } - public boolean isSpanning() { - return spanning; - } + public Cell(Point2D topLeft, Point2D bottomRight) { + super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight.getY() - topLeft.getY())); + this.setPlaceholder(false); + this.setSpanning(false); + this.setTextElements(new ArrayList()); + } - public void setSpanning(boolean spanning) { - this.spanning = spanning; - } + private boolean spanning; + private boolean placeholder; + private List textElements; - public boolean isPlaceholder() { - return placeholder; - } + @Override + public String getText(boolean useLineReturns) { + if (this.textElements.size() == 0) { + return ""; + } + StringBuilder sb = new StringBuilder(); + Collections.sort(this.textElements, Rectangle.ILL_DEFINED_ORDER); + double curTop = this.textElements.get(0).getTop(); + for (TextChunk tc : this.textElements) { + if (useLineReturns && tc.getTop() > curTop) { + sb.append('\r'); + } + sb.append(tc.getText()); + curTop = tc.getTop(); + } + return sb.toString().trim(); + } - public void setPlaceholder(boolean placeholder) { - this.placeholder = placeholder; - } + public String getText() { + return getText(true); + } + public boolean isSpanning() { + return spanning; + } - public List getTextElements() { - return textElements; - } + public void setSpanning(boolean spanning) { + this.spanning = spanning; + } - public void setTextElements(List textElements) { - this.textElements = textElements; - } + public boolean isPlaceholder() { + return placeholder; + } + + public void setPlaceholder(boolean placeholder) { + this.placeholder = placeholder; + } + + public List getTextElements() { + return textElements; + } + + public void setTextElements(List textElements) { + this.textElements = textElements; + } } diff --git a/src/main/java/technology/tabula/HasText.java b/src/main/java/technology/tabula/HasText.java index 6f375dbc..99455afb 100644 --- a/src/main/java/technology/tabula/HasText.java +++ b/src/main/java/technology/tabula/HasText.java @@ -1,7 +1,7 @@ package technology.tabula; public interface HasText { - - String getText(); + + String getText(); } diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 1b6e91a6..87c2a2f9 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -30,7 +30,7 @@ protected Page extractPage(Integer pageNumber) throws IOException { pdfTextStripper.process(); - Utils.sort(pdfTextStripper.textElements); + Utils.sort(pdfTextStripper.textElements, Rectangle.ILL_DEFINED_ORDER); float w, h; int pageRotation = p.getRotation(); diff --git a/src/main/java/technology/tabula/QuickSort.java b/src/main/java/technology/tabula/QuickSort.java index d6ada5b2..34757ca3 100644 --- a/src/main/java/technology/tabula/QuickSort.java +++ b/src/main/java/technology/tabula/QuickSort.java @@ -45,7 +45,7 @@ public static > void sort(List list) { /** * Sorts the given list using the given comparator. */ - public static void sort(List list, Comparator comparator) { + public static void sort(List list, Comparator comparator) { if (list instanceof RandomAccess) { quicksort(list, comparator); } else { @@ -56,7 +56,7 @@ public static void sort(List list, Comparator comparator) { } } - private static void quicksort(List list, Comparator cmp) { + private static void quicksort(List list, Comparator cmp) { Stack stack = new Stack<>(); stack.push(0); stack.push(list.size()); @@ -76,7 +76,7 @@ private static void quicksort(List list, Comparator cmp) { } } - private static int partition(List list, Comparator cmp, int p, int start, int end) { + private static int partition(List list, Comparator cmp, int p, int start, int end) { int l = start; int h = end - 2; T piv = list.get(p); diff --git a/src/main/java/technology/tabula/Rectangle.java b/src/main/java/technology/tabula/Rectangle.java index 61899a1f..e4522a0a 100644 --- a/src/main/java/technology/tabula/Rectangle.java +++ b/src/main/java/technology/tabula/Rectangle.java @@ -2,182 +2,176 @@ import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.util.Comparator; import java.util.List; @SuppressWarnings("serial") -public class Rectangle extends Rectangle2D.Float implements Comparable { - - protected static final float VERTICAL_COMPARISON_THRESHOLD = 0.4f; - - public Rectangle() { - super(); - } - - public Rectangle(float top, float left, float width, float height) { - super(); - this.setRect(left, top, width, height); - } - - @Override - /* - We're comparing based on ordering in the logical ordering of text here. - Assuming identical Y-axis positions, if TextChunk A has a lower X-axis - than TextChunk B, then A is "before" it -- iff this is LTR text. Otherwise, - it is A is after B. - */ - public int compareTo(Rectangle other) { - // FIXME this needs fixing - see https://github.com/tabulapdf/tabula-java/issues/116#issuecomment-325798979 - double thisBottom = this.getBottom(); - double otherBottom = other.getBottom(); - int rv; - - if (this.equals(other)) return 0; - - if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) { - rv = java.lang.Double.compare(this.getX(), other.getX()); - - // reverse the ordering if both TextChunks are RTL - if (this.isLtrDominant() == -1 && other.isLtrDominant() == -1) { - rv = -1 * rv; - } - } else { - rv = java.lang.Double.compare(thisBottom, otherBottom); - } - return rv; - } - - // I'm bad at Java and need this for fancy sorting in technology.tabula.TextChunk. - public int isLtrDominant(){ - return 0; - } - - - public float getArea() { - return this.width * this.height; - } - - public float verticalOverlap(Rectangle other) { - return Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop())); - } - - public boolean verticallyOverlaps(Rectangle other) { - return verticalOverlap(other) > 0; - } - - public float horizontalOverlap(Rectangle other) { - return Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft())); - } - - public boolean horizontallyOverlaps(Rectangle other) { - return horizontalOverlap(other) > 0; - } - - public float verticalOverlapRatio(Rectangle other) { - float rv = 0, - delta = Math.min(this.getBottom() - this.getTop(), other.getBottom() - other.getTop()); - - if (other.getTop() <= this.getTop() && this.getTop() <= other.getBottom() && other.getBottom() <= this.getBottom()) { - rv = (other.getBottom() - this.getTop()) / delta; - } - else if (this.getTop() <= other.getTop() && other.getTop() <= this.getBottom() && this.getBottom() <= other.getBottom()) { - rv = (this.getBottom() - other.getTop()) / delta; - } - else if (this.getTop() <= other.getTop() && other.getTop() <= other.getBottom() && other.getBottom() <= this.getBottom()) { - rv = (other.getBottom() - other.getTop()) / delta; - } - else if (other.getTop() <= this.getTop() && this.getTop() <= this.getBottom() && this.getBottom() <= other.getBottom()) { - rv = (this.getBottom() - this.getTop()) / delta; - } - - return rv; - - } - - public float overlapRatio(Rectangle other) { - double intersectionWidth = Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft())); - double intersectionHeight = Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop())); - double intersectionArea = Math.max(0, intersectionWidth * intersectionHeight); - double unionArea = this.getArea() + other.getArea() - intersectionArea; - - return (float) (intersectionArea / unionArea); - } - - public Rectangle merge(Rectangle other) { - this.setRect(this.createUnion(other)); - return this; - } - - public float getTop() { - return (float) this.getMinY(); - } - - public void setTop(float top) { - float deltaHeight = top - this.y; - this.setRect(this.x, top, this.width, this.height - deltaHeight); - } - - public float getRight() { - return (float) this.getMaxX(); - } - - public void setRight(float right) { - this.setRect(this.x, this.y, right - this.x, this.height); - } - - public float getLeft() { - return (float) this.getMinX(); - } - - public void setLeft(float left) { - float deltaWidth = left - this.x; - this.setRect(left, this.y, this.width - deltaWidth, this.height); - } - - public float getBottom() { - return (float) this.getMaxY(); - } - - public void setBottom(float bottom) { - this.setRect(this.x, this.y, this.width, bottom - this.y); - } - - public Point2D[] getPoints() { - return new Point2D[] { - new Point2D.Float(this.getLeft(), this.getTop()), - new Point2D.Float(this.getRight(), this.getTop()), - new Point2D.Float(this.getRight(), this.getBottom()), - new Point2D.Float(this.getLeft(), this.getBottom()) - }; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - String s = super.toString(); - sb.append(s.substring(0, s.length() - 1)); - sb.append(String.format(",bottom=%f,right=%f]", this.getBottom(), this.getRight())); - return sb.toString(); - } - - - /** - * @param rectangles - * @return minimum bounding box that contains all the rectangles - */ - public static Rectangle boundingBoxOf(List rectangles) { - float minx = java.lang.Float.MAX_VALUE; - float miny = java.lang.Float.MAX_VALUE; - float maxx = java.lang.Float.MIN_VALUE; - float maxy = java.lang.Float.MIN_VALUE; - - for (Rectangle r: rectangles) { - minx = (float) Math.min(r.getMinX(), minx); - miny = (float) Math.min(r.getMinY(), miny); - maxx = (float) Math.max(r.getMaxX(), maxx); - maxy = (float) Math.max(r.getMaxY(), maxy); - } - return new Rectangle(miny, minx, maxx - minx, maxy - miny); - } - +public class Rectangle extends Rectangle2D.Float { + + /** + * Ill-defined comparator, from when Rectangle was Comparable. + * + * @see https://github.com/tabulapdf/tabula-java/issues/116 + * @deprecated with no replacement + */ + @Deprecated + public static final Comparator ILL_DEFINED_ORDER = new Comparator() { + @Override public int compare(Rectangle o1, Rectangle o2) { + if (o1.equals(o2)) return 0; + if (o1.verticalOverlap(o2) > VERTICAL_COMPARISON_THRESHOLD) { + return o1.isLtrDominant() == -1 && o2.isLtrDominant() == -1 + ? - java.lang.Double.compare(o1.getX(), o2.getX()) + : java.lang.Double.compare(o1.getX(), o2.getX()); + } else { + return java.lang.Float.compare(o1.getBottom(), o2.getBottom()); + } + } + }; + + protected static final float VERTICAL_COMPARISON_THRESHOLD = 0.4f; + + public Rectangle() { + super(); + } + + public Rectangle(float top, float left, float width, float height) { + super(); + this.setRect(left, top, width, height); + } + + public int compareTo(Rectangle other) { + return ILL_DEFINED_ORDER.compare(this, other); + } + + // I'm bad at Java and need this for fancy sorting in + // technology.tabula.TextChunk. + public int isLtrDominant() { + return 0; + } + + public float getArea() { + return this.width * this.height; + } + + public float verticalOverlap(Rectangle other) { + return Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop())); + } + + public boolean verticallyOverlaps(Rectangle other) { + return verticalOverlap(other) > 0; + } + + public float horizontalOverlap(Rectangle other) { + return Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft())); + } + + public boolean horizontallyOverlaps(Rectangle other) { + return horizontalOverlap(other) > 0; + } + + public float verticalOverlapRatio(Rectangle other) { + float rv = 0, delta = Math.min(this.getBottom() - this.getTop(), other.getBottom() - other.getTop()); + + if (other.getTop() <= this.getTop() && this.getTop() <= other.getBottom() + && other.getBottom() <= this.getBottom()) { + rv = (other.getBottom() - this.getTop()) / delta; + } else if (this.getTop() <= other.getTop() && other.getTop() <= this.getBottom() + && this.getBottom() <= other.getBottom()) { + rv = (this.getBottom() - other.getTop()) / delta; + } else if (this.getTop() <= other.getTop() && other.getTop() <= other.getBottom() + && other.getBottom() <= this.getBottom()) { + rv = (other.getBottom() - other.getTop()) / delta; + } else if (other.getTop() <= this.getTop() && this.getTop() <= this.getBottom() + && this.getBottom() <= other.getBottom()) { + rv = (this.getBottom() - this.getTop()) / delta; + } + + return rv; + + } + + public float overlapRatio(Rectangle other) { + double intersectionWidth = Math.max(0, + Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft())); + double intersectionHeight = Math.max(0, + Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop())); + double intersectionArea = Math.max(0, intersectionWidth * intersectionHeight); + double unionArea = this.getArea() + other.getArea() - intersectionArea; + + return (float) (intersectionArea / unionArea); + } + + public Rectangle merge(Rectangle other) { + this.setRect(this.createUnion(other)); + return this; + } + + public float getTop() { + return (float) this.getMinY(); + } + + public void setTop(float top) { + float deltaHeight = top - this.y; + this.setRect(this.x, top, this.width, this.height - deltaHeight); + } + + public float getRight() { + return (float) this.getMaxX(); + } + + public void setRight(float right) { + this.setRect(this.x, this.y, right - this.x, this.height); + } + + public float getLeft() { + return (float) this.getMinX(); + } + + public void setLeft(float left) { + float deltaWidth = left - this.x; + this.setRect(left, this.y, this.width - deltaWidth, this.height); + } + + public float getBottom() { + return (float) this.getMaxY(); + } + + public void setBottom(float bottom) { + this.setRect(this.x, this.y, this.width, bottom - this.y); + } + + public Point2D[] getPoints() { + return new Point2D[] { new Point2D.Float(this.getLeft(), this.getTop()), + new Point2D.Float(this.getRight(), this.getTop()), new Point2D.Float(this.getRight(), this.getBottom()), + new Point2D.Float(this.getLeft(), this.getBottom()) }; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + String s = super.toString(); + sb.append(s.substring(0, s.length() - 1)); + sb.append(String.format(",bottom=%f,right=%f]", this.getBottom(), this.getRight())); + return sb.toString(); + } + + /** + * @param rectangles + * @return minimum bounding box that contains all the rectangles + */ + public static Rectangle boundingBoxOf(List rectangles) { + float minx = java.lang.Float.MAX_VALUE; + float miny = java.lang.Float.MAX_VALUE; + float maxx = java.lang.Float.MIN_VALUE; + float maxy = java.lang.Float.MIN_VALUE; + + for (Rectangle r : rectangles) { + minx = (float) Math.min(r.getMinX(), minx); + miny = (float) Math.min(r.getMinY(), miny); + maxx = (float) Math.max(r.getMaxX(), maxx); + maxy = (float) Math.max(r.getMaxY(), maxy); + } + return new Rectangle(miny, minx, maxx - minx, maxy - miny); + } } diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index 46e5fd46..be252794 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -52,7 +52,7 @@ public List contains(Rectangle r) { for (int i : proc.getIds()) { rv.add(rectangles.get(i)); } - Utils.sort(rv); + Utils.sort(rv, Rectangle.ILL_DEFINED_ORDER); return rv; } @@ -63,7 +63,7 @@ public List intersects(Rectangle r) { for (int i : proc.getIds()) { rv.add(rectangles.get(i)); } - Utils.sort(rv); + Utils.sort(rv, Rectangle.ILL_DEFINED_ORDER); return rv; } diff --git a/src/main/java/technology/tabula/Utils.java b/src/main/java/technology/tabula/Utils.java index 561cd00e..35c6cc4d 100644 --- a/src/main/java/technology/tabula/Utils.java +++ b/src/main/java/technology/tabula/Utils.java @@ -117,17 +117,19 @@ public static List> transpose(List> table) { return ret; } - /** - * Wrap Collections.sort so we can fallback to a non-stable quicksort - * if we're running on JDK7+ - */ - public static > void sort(List list) { - if (useQuickSort) { - QuickSort.sort(list); - } else { - Collections.sort(list); - } - } + /** + * Wrap Collections.sort so we can fallback to a non-stable quicksort if we're + * running on JDK7+ + */ + public static > void sort(List list) { + if (useQuickSort) QuickSort.sort(list); + else Collections.sort(list); + } + + public static void sort(List list, Comparator comparator) { + if (useQuickSort) QuickSort.sort(list, comparator); + else Collections.sort(list, comparator); + } private static boolean useCustomQuickSort() { // taken from PDFBOX: diff --git a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java index 06f966e1..243cc3bf 100644 --- a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java @@ -25,7 +25,7 @@ public List detect(Page page) { List tables = SpreadsheetExtractionAlgorithm.findSpreadsheetsFromCells(cells); // we want tables to be returned from top to bottom on the page - Collections.sort(tables); + Collections.sort(tables, Rectangle.ILL_DEFINED_ORDER); return tables; } diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index c00de95f..c377507c 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -134,7 +134,7 @@ else if (r.vertical()) { TableWithRulingLines t = new TableWithRulingLines(area, overlappingCells, horizontalOverlappingRulings, verticalOverlappingRulings, this); spreadsheets.add(t); } - Utils.sort(spreadsheets); + Utils.sort(spreadsheets, Rectangle.ILL_DEFINED_ORDER); return spreadsheets; } @@ -238,7 +238,7 @@ public static List findSpreadsheetsFromCells(List(new HashSet<>(cells)); - Utils.sort(cells); + Utils.sort(cells, Rectangle.ILL_DEFINED_ORDER); for (Rectangle cell: cells) { for(Point2D pt: cell.getPoints()) { diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index a9e06575..e3fa6470 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -333,12 +333,12 @@ public void testNaturalOrderOfRectanglesOneMoreTime() throws IOException { //List rectangles = Arrays.asList(RECTANGLES_TEST_NATURAL_ORDER); - Utils.sort(rectangles); + Utils.sort(rectangles, Rectangle.ILL_DEFINED_ORDER); for (int i = 0; i < (rectangles.size() - 1); i++) { Rectangle rectangle = rectangles.get(i); Rectangle nextRectangle = rectangles.get(i + 1); - + assertTrue(rectangle.compareTo(nextRectangle) < 0); } } diff --git a/src/test/java/technology/tabula/TestRectangle.java b/src/test/java/technology/tabula/TestRectangle.java index 72a9c0b9..7fa66f7a 100644 --- a/src/test/java/technology/tabula/TestRectangle.java +++ b/src/test/java/technology/tabula/TestRectangle.java @@ -97,7 +97,7 @@ public void testQuickSortRectangleList() { toSortList.add(first); toSortList.add(fourth); - Collections.sort(toSortList); + Collections.sort(toSortList, Rectangle.ILL_DEFINED_ORDER); assertEquals(expectedList, toSortList); } @@ -281,8 +281,8 @@ public void testWellDefinedComparison1() { Rectangle c = new Rectangle(0,2,2,2); List l1 = new ArrayList<>(Arrays.asList(b, a, c)); List l2 = new ArrayList<>(Arrays.asList(c, b, a)); - QuickSort.sort(l1); - QuickSort.sort(l2); + QuickSort.sort(l1, Rectangle.ILL_DEFINED_ORDER); + QuickSort.sort(l2, Rectangle.ILL_DEFINED_ORDER); assertEquals(l1.get(0), l2.get(0)); assertEquals(l1.get(1), l2.get(1)); assertEquals(l1.get(2), l2.get(2)); diff --git a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java index 51375cb9..0abd578b 100644 --- a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java +++ b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java @@ -129,9 +129,9 @@ public class TestSpreadsheetExtractor { @Test public void testLinesToCells() { List cells = SpreadsheetExtractionAlgorithm.findCells(Arrays.asList(HORIZONTAL_RULING_LINES), Arrays.asList(VERTICAL_RULING_LINES)); - Collections.sort(cells); + Collections.sort(cells, Rectangle.ILL_DEFINED_ORDER); List expected = Arrays.asList(EXPECTED_CELLS); - Collections.sort(expected); + Collections.sort(expected, Rectangle.ILL_DEFINED_ORDER); assertTrue(cells.equals(expected)); } @@ -174,9 +174,9 @@ public void testFindSpreadsheetsFromCells() throws IOException { List expected = Arrays.asList(EXPECTED_RECTANGLES); - Collections.sort(expected); + Collections.sort(expected, Rectangle.ILL_DEFINED_ORDER); List foundRectangles = SpreadsheetExtractionAlgorithm.findSpreadsheetsFromCells(cells); - Collections.sort(foundRectangles); + Collections.sort(foundRectangles, Rectangle.ILL_DEFINED_ORDER); assertTrue(foundRectangles.equals(expected)); } From dd25f7b11d38ee0680db3b114fdaae73b6b3da2a Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Sun, 3 Sep 2017 23:42:02 +0200 Subject: [PATCH 064/245] Refactoring --- src/main/java/technology/tabula/Table.java | 10 +- .../extractors/BasicExtractionAlgorithm.java | 2 +- .../java/technology/tabula/TableTest.java | 45 +++ .../technology/tabula/TestBasicExtractor.java | 276 ++++++++---------- .../technology/tabula/UtilsForTesting.java | 22 +- 5 files changed, 181 insertions(+), 174 deletions(-) create mode 100644 src/test/java/technology/tabula/TableTest.java diff --git a/src/main/java/technology/tabula/Table.java b/src/main/java/technology/tabula/Table.java index e0f27d11..8ffca145 100644 --- a/src/main/java/technology/tabula/Table.java +++ b/src/main/java/technology/tabula/Table.java @@ -9,7 +9,7 @@ @SuppressWarnings("serial") public class Table extends Rectangle { - public static final Table EMPTY = new Table(""); + public static final Table empty() { return new Table(""); } private Table(String extractionMethod) { this.extractionMethod = extractionMethod; @@ -34,8 +34,8 @@ public Table(ExtractionAlgorithm extractionAlgorithm) { public void add(RectangularTextContainer chunk, int row, int col) { this.merge(chunk); - rowCount = Math.max(rowCount, row); - colCount = Math.max(colCount, col); + rowCount = Math.max(rowCount, row + 1); + colCount = Math.max(colCount, col + 1); CellPosition cp = new CellPosition(row, col); @@ -55,10 +55,10 @@ public List> getRows() { private List> computeRows() { List> rows = new ArrayList<>(); - for (int i = 0; i <= rowCount; i++) { + for (int i = 0; i < rowCount; i++) { List lastRow = new ArrayList<>(); rows.add(lastRow); - for (int j = 0; j <= colCount; j++) { + for (int j = 0; j < colCount; j++) { RectangularTextContainer cell = cells.get(new CellPosition(i,j)); // JAVA_8 use getOrDefault() lastRow.add(cell != null ? cell : TextChunk.EMPTY); } diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index 31a5ca89..afaeb5c7 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -40,7 +40,7 @@ public List
extract(Page page) { List textElements = page.getText(); if (textElements.size() == 0) { - return Arrays.asList(new Table[] { Table.EMPTY }); + return Arrays.asList(new Table[] { Table.empty() }); } List textChunks = this.verticalRulings == null ? TextElement.mergeWords(page.getText()) : TextElement.mergeWords(page.getText(), this.verticalRulings); diff --git a/src/test/java/technology/tabula/TableTest.java b/src/test/java/technology/tabula/TableTest.java new file mode 100644 index 00000000..c574a553 --- /dev/null +++ b/src/test/java/technology/tabula/TableTest.java @@ -0,0 +1,45 @@ +package technology.tabula; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class TableTest { + + @Test public void testEmpty() { + Table empty = Table.empty(); + + assertEquals(TextChunk.EMPTY, empty.getCell(0, 0)); + assertEquals(TextChunk.EMPTY, empty.getCell(1, 1)); + + assertEquals(0, empty.getRowCount()); + assertEquals(0, empty.getColCount()); + + assertEquals("", empty.getExtractionMethod()); + + assertEquals(0, empty.getTop(), 0); + assertEquals(0, empty.getRight(), 0); + assertEquals(0, empty.getBottom(), 0); + assertEquals(0, empty.getLeft(), 0); + + assertEquals(0, empty.getArea(), 0); + } + + @Test public void testRowColCounts() { + Table table = Table.empty(); + + assertEquals(0, table.getRowCount()); + assertEquals(0, table.getColCount()); + + table.add(TextChunk.EMPTY, 0, 0); + + assertEquals(1, table.getRowCount()); + assertEquals(1, table.getColCount()); + + table.add(TextChunk.EMPTY, 9, 9); + + assertEquals(10, table.getRowCount()); + assertEquals(10, table.getColCount()); + } + +} diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index e3fa6470..a6803cdf 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -18,150 +18,117 @@ public class TestBasicExtractor { - private static final String[][] EXPECTED_CORRECT_COLUMNS = { - {"", "", "Involvement of pupils in", ""}, - {"", "Preperation and", "Production of", "Presentation an"}, - {"", "planing", "materials", "evaluation"}, - {"Knowledge and awareness of different cultures", "0,2885", - "0,3974", "0,3904"}, - {"Foreign language competence", "0,3057", "0,4184", "0,3899"}, - {"Social skills and abilities", "0,3416", "0,3369", "0,4303"}, - {"Acquaintance of special knowledge", "0,2569", "0,2909", - "0,3557"}, - {"Self competence", "0,3791", "0,3320", "0,4617"}}; - - private static final String[][] EXPECTED_COLUMN_RECOGNITION = { - {"ABDALA de MATARAZZO, Norma Amanda", - "Frente Cívico por Santiago", "Santiago del Estero", - "AFIRMATIVO"}, - {"ALBRIEU, Oscar Edmundo Nicolas", - "Frente para la Victoria - PJ", "Rio Negro", "AFIRMATIVO"}, - {"ALONSO, María Luz", "Frente para la Victoria - PJ", - "La Pampa", "AFIRMATIVO"}, - {"ARENA, Celia Isabel", "Frente para la Victoria - PJ", - "Santa Fe", "AFIRMATIVO"}, - {"ARREGUI, Andrés Roberto", "Frente para la Victoria - PJ", - "Buenos Aires", "AFIRMATIVO"}, - {"AVOSCAN, Herman Horacio", "Frente para la Victoria - PJ", - "Rio Negro", "AFIRMATIVO"}, - {"BALCEDO, María Ester", "Frente para la Victoria - PJ", - "Buenos Aires", "AFIRMATIVO"}, - {"BARRANDEGUY, Raúl Enrique", "Frente para la Victoria - PJ", - "Entre Ríos", "AFIRMATIVO"}, - {"BASTERRA, Luis Eugenio", "Frente para la Victoria - PJ", - "Formosa", "AFIRMATIVO"}, - {"BEDANO, Nora Esther", "Frente para la Victoria - PJ", - "Córdoba", "AFIRMATIVO"}, - {"BERNAL, María Eugenia", "Frente para la Victoria - PJ", - "Jujuy", "AFIRMATIVO"}, - {"BERTONE, Rosana Andrea", "Frente para la Victoria - PJ", - "Tierra del Fuego", "AFIRMATIVO"}, - {"BIANCHI, María del Carmen", "Frente para la Victoria - PJ", - "Cdad. Aut. Bs. As.", "AFIRMATIVO"}, - {"BIDEGAIN, Gloria Mercedes", "Frente para la Victoria - PJ", - "Buenos Aires", "AFIRMATIVO"}, - {"BRAWER, Mara", "Frente para la Victoria - PJ", - "Cdad. Aut. Bs. As.", "AFIRMATIVO"}, - {"BRILLO, José Ricardo", "Movimiento Popular Neuquino", - "Neuquén", "AFIRMATIVO"}, - {"BROMBERG, Isaac Benjamín", "Frente para la Victoria - PJ", - "Tucumán", "AFIRMATIVO"}, - {"BRUE, Daniel Agustín", "Frente Cívico por Santiago", - "Santiago del Estero", "AFIRMATIVO"}, - {"CALCAGNO, Eric", "Frente para la Victoria - PJ", - "Buenos Aires", "AFIRMATIVO"}, - {"CARLOTTO, Remo Gerardo", "Frente para la Victoria - PJ", - "Buenos Aires", "AFIRMATIVO"}, - {"CARMONA, Guillermo Ramón", "Frente para la Victoria - PJ", - "Mendoza", "AFIRMATIVO"}, - {"CATALAN MAGNI, Julio César", "Frente para la Victoria - PJ", - "Tierra del Fuego", "AFIRMATIVO"}, - {"CEJAS, Jorge Alberto", "Frente para la Victoria - PJ", - "Rio Negro", "AFIRMATIVO"}, - {"CHIENO, María Elena", "Frente para la Victoria - PJ", - "Corrientes", "AFIRMATIVO"}, - {"CIAMPINI, José Alberto", "Frente para la Victoria - PJ", - "Neuquén", "AFIRMATIVO"}, - {"CIGOGNA, Luis Francisco Jorge", - "Frente para la Victoria - PJ", "Buenos Aires", - "AFIRMATIVO"}, - {"CLERI, Marcos", "Frente para la Victoria - PJ", "Santa Fe", - "AFIRMATIVO"}, - {"COMELLI, Alicia Marcela", "Movimiento Popular Neuquino", - "Neuquén", "AFIRMATIVO"}, - {"CONTI, Diana Beatriz", "Frente para la Victoria - PJ", - "Buenos Aires", "AFIRMATIVO"}, - {"CORDOBA, Stella Maris", "Frente para la Victoria - PJ", - "Tucumán", "AFIRMATIVO"}, - {"CURRILEN, Oscar Rubén", "Frente para la Victoria - PJ", - "Chubut", "AFIRMATIVO"}}; - - private static final String[][] EXPECTED_COLUMN_EXTRACTION2 = { - {"", "Austria", "77", "1", "78"}, - {"", "Belgium", "159", "2", "161"}, - {"", "Bulgaria", "52", "0", "52"}, - {"", "Croatia", "144", "0", "144"}, - {"", "Cyprus", "43", "2", "45"}, - {"", "Czech Republic", "78", "0", "78"}, - {"", "Denmark", "151", "2", "153"}, - {"", "Estonia", "46", "0", "46"}, - {"", "Finland", "201", "1", "202"}, - {"", "France", "428", "7", "435"}, - {"", "Germany", "646", "21", "667"}, - {"", "Greece", "113", "2", "115"}, - {"", "Hungary", "187", "0", "187"}, - {"", "Iceland", "18", "0", "18"}, - {"", "Ireland", "213", "4", "217"}, - {"", "Israel", "25", "0", "25"}, - {"", "Italy", "627", "12", "639"}, - {"", "Latvia", "7", "0", "7"}, - {"", "Lithuania", "94", "1", "95"}, - {"", "Luxembourg", "22", "0", "22"}, - {"", "Malta", "18", "0", "18"}, - {"", "Netherlands", "104", "1", "105"}, - {"", "Norway", "195", "0", "195"}, - {"", "Poland", "120", "1", "121"}, - {"", "Portugal", "532", "3", "535"}, - {"", "Romania", "110", "0", "110"}, - {"", "Slovakia", "176", "0", "176"}, - {"", "Slovenia", "56", "0", "56"}, - {"", "Spain", "614", "3", "617"}, - {"", "Sweden", "122", "3", "125"}, - {"", "Switzerland", "64", "0", "64"}, - {"", "Turkey", "96", "0", "96"}, - {"", "United Kingdom", "572", "14", "586"} - }; - - private static final String[][] EXPECTED_TABLE_EXTRACTION = { - {"AANONSEN, DEBORAH, A", "", "STATEN ISLAND, NY", "MEALS", "$85.00"}, - {"TOTAL", "", "", "", "$85.00"}, - {"AARON, CAREN, T", "", "RICHMOND, VA", "EDUCATIONAL ITEMS", "$78.80"}, - {"AARON, CAREN, T", "", "RICHMOND, VA", "MEALS", "$392.45"}, - {"TOTAL", "", "", "", "$471.25"}, - {"AARON, JOHN", "", "CLARKSVILLE, TN", "MEALS", "$20.39"}, - {"TOTAL", "", "", "", "$20.39"}, - {"AARON, JOSHUA, N", "", "WEST GROVE, PA", "MEALS", "$310.33"}, - {"", "REGIONAL PULMONARY & SLEEP", "", "", ""}, - {"AARON, JOSHUA, N", "", "WEST GROVE, PA", "SPEAKING FEES", "$4,700.00"}, - {"", "MEDICINE", "", "", ""}, - {"TOTAL", "", "", "", "$5,010.33"}, - {"AARON, MAUREEN, M", "", "MARTINSVILLE, VA", "MEALS", "$193.67"}, - {"TOTAL", "", "", "", "$193.67"}, - {"AARON, MICHAEL, L", "", "WEST ISLIP, NY", "MEALS", "$19.50"}, - {"TOTAL", "", "", "", "$19.50"}, - {"AARON, MICHAEL, R", "", "BROOKLYN, NY", "MEALS", "$65.92"} - }; - - private static final String[][] EXPECTED_EMPTY_TABLE = { - {""} - }; + private static final String EU_002_PDF = "src/test/resources/technology/tabula/eu-002.pdf"; + private static final String[][] EU_002_EXPECTED = { + {"", "", "Involvement of pupils in", ""}, + {"", "Preperation and", "Production of", "Presentation an"}, + {"", "planing", "materials", "evaluation"}, + {"Knowledge and awareness of different cultures", "0,2885", "0,3974", "0,3904"}, + {"Foreign language competence", "0,3057", "0,4184", "0,3899"}, + {"Social skills and abilities", "0,3416", "0,3369", "0,4303"}, + {"Acquaintance of special knowledge", "0,2569", "0,2909", "0,3557"}, + {"Self competence", "0,3791", "0,3320", "0,4617"} + }; + + private static final String ARGENTINA_DIPUTADOS_VOTING_RECORD_PDF = "src/test/resources/technology/tabula/argentina_diputados_voting_record.pdf"; + private static final String[][] ARGENTINA_DIPUTADOS_VOTING_RECORD_EXPECTED = { + {"ABDALA de MATARAZZO, Norma Amanda", "Frente Cívico por Santiago", "Santiago del Estero", "AFIRMATIVO"}, + {"ALBRIEU, Oscar Edmundo Nicolas", "Frente para la Victoria - PJ", "Rio Negro", "AFIRMATIVO"}, + {"ALONSO, María Luz", "Frente para la Victoria - PJ", "La Pampa", "AFIRMATIVO"}, + {"ARENA, Celia Isabel", "Frente para la Victoria - PJ", "Santa Fe", "AFIRMATIVO"}, + {"ARREGUI, Andrés Roberto", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"AVOSCAN, Herman Horacio", "Frente para la Victoria - PJ", "Rio Negro", "AFIRMATIVO"}, + {"BALCEDO, María Ester", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"BARRANDEGUY, Raúl Enrique", "Frente para la Victoria - PJ", "Entre Ríos", "AFIRMATIVO"}, + {"BASTERRA, Luis Eugenio", "Frente para la Victoria - PJ", "Formosa", "AFIRMATIVO"}, + {"BEDANO, Nora Esther", "Frente para la Victoria - PJ", "Córdoba", "AFIRMATIVO"}, + {"BERNAL, María Eugenia", "Frente para la Victoria - PJ", "Jujuy", "AFIRMATIVO"}, + {"BERTONE, Rosana Andrea", "Frente para la Victoria - PJ", "Tierra del Fuego", "AFIRMATIVO"}, + {"BIANCHI, María del Carmen", "Frente para la Victoria - PJ", "Cdad. Aut. Bs. As.", "AFIRMATIVO"}, + {"BIDEGAIN, Gloria Mercedes", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"BRAWER, Mara", "Frente para la Victoria - PJ", "Cdad. Aut. Bs. As.", "AFIRMATIVO"}, + {"BRILLO, José Ricardo", "Movimiento Popular Neuquino", "Neuquén", "AFIRMATIVO"}, + {"BROMBERG, Isaac Benjamín", "Frente para la Victoria - PJ", "Tucumán", "AFIRMATIVO"}, + {"BRUE, Daniel Agustín", "Frente Cívico por Santiago", "Santiago del Estero", "AFIRMATIVO"}, + {"CALCAGNO, Eric", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"CARLOTTO, Remo Gerardo", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"CARMONA, Guillermo Ramón", "Frente para la Victoria - PJ", "Mendoza", "AFIRMATIVO"}, + {"CATALAN MAGNI, Julio César", "Frente para la Victoria - PJ", "Tierra del Fuego", "AFIRMATIVO"}, + {"CEJAS, Jorge Alberto", "Frente para la Victoria - PJ", "Rio Negro", "AFIRMATIVO"}, + {"CHIENO, María Elena", "Frente para la Victoria - PJ", "Corrientes", "AFIRMATIVO"}, + {"CIAMPINI, José Alberto", "Frente para la Victoria - PJ", "Neuquén", "AFIRMATIVO"}, + {"CIGOGNA, Luis Francisco Jorge", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"CLERI, Marcos", "Frente para la Victoria - PJ", "Santa Fe", "AFIRMATIVO"}, + {"COMELLI, Alicia Marcela", "Movimiento Popular Neuquino", "Neuquén", "AFIRMATIVO"}, + {"CONTI, Diana Beatriz", "Frente para la Victoria - PJ", "Buenos Aires", "AFIRMATIVO"}, + {"CORDOBA, Stella Maris", "Frente para la Victoria - PJ", "Tucumán", "AFIRMATIVO"}, + {"CURRILEN, Oscar Rubén", "Frente para la Victoria - PJ", "Chubut", "AFIRMATIVO"} + }; + + private static final String EU_017_PDF = "src/test/resources/technology/tabula/eu-017.pdf"; + private static final String[][] EU_017_EXPECTED = { + {"", "Austria", "77", "1", "78"}, + {"", "Belgium", "159", "2", "161"}, + {"", "Bulgaria", "52", "0", "52"}, + {"", "Croatia", "144", "0", "144"}, + {"", "Cyprus", "43", "2", "45"}, + {"", "Czech Republic", "78", "0", "78"}, + {"", "Denmark", "151", "2", "153"}, + {"", "Estonia", "46", "0", "46"}, + {"", "Finland", "201", "1", "202"}, + {"", "France", "428", "7", "435"}, + {"", "Germany", "646", "21", "667"}, + {"", "Greece", "113", "2", "115"}, + {"", "Hungary", "187", "0", "187"}, + {"", "Iceland", "18", "0", "18"}, + {"", "Ireland", "213", "4", "217"}, + {"", "Israel", "25", "0", "25"}, + {"", "Italy", "627", "12", "639"}, + {"", "Latvia", "7", "0", "7"}, + {"", "Lithuania", "94", "1", "95"}, + {"", "Luxembourg", "22", "0", "22"}, + {"", "Malta", "18", "0", "18"}, + {"", "Netherlands", "104", "1", "105"}, + {"", "Norway", "195", "0", "195"}, + {"", "Poland", "120", "1", "121"}, + {"", "Portugal", "532", "3", "535"}, + {"", "Romania", "110", "0", "110"}, + {"", "Slovakia", "176", "0", "176"}, + {"", "Slovenia", "56", "0", "56"}, + {"", "Spain", "614", "3", "617"}, + {"", "Sweden", "122", "3", "125"}, + {"", "Switzerland", "64", "0", "64"}, + {"", "Turkey", "96", "0", "96"}, + {"", "United Kingdom", "572", "14", "586"} + }; + + private static final String FRX_2012_DISCLOSURE_PDF = "src/test/resources/technology/tabula/frx_2012_disclosure.pdf"; + private static final String[][] FRX_2012_DISCLOSURE_EXPECTED = { + {"AANONSEN, DEBORAH, A", "", "STATEN ISLAND, NY", "MEALS", "$85.00"}, + {"TOTAL", "", "", "", "$85.00"}, + {"AARON, CAREN, T", "", "RICHMOND, VA", "EDUCATIONAL ITEMS", "$78.80"}, + {"AARON, CAREN, T", "", "RICHMOND, VA", "MEALS", "$392.45"}, + {"TOTAL", "", "", "", "$471.25"}, + {"AARON, JOHN", "", "CLARKSVILLE, TN", "MEALS", "$20.39"}, + {"TOTAL", "", "", "", "$20.39"}, + {"AARON, JOSHUA, N", "", "WEST GROVE, PA", "MEALS", "$310.33"}, + {"", "REGIONAL PULMONARY & SLEEP", "", "", ""}, + {"AARON, JOSHUA, N", "", "WEST GROVE, PA", "SPEAKING FEES", "$4,700.00"}, + {"", "MEDICINE", "", "", ""}, + {"TOTAL", "", "", "", "$5,010.33"}, + {"AARON, MAUREEN, M", "", "MARTINSVILLE, VA", "MEALS", "$193.67"}, + {"TOTAL", "", "", "", "$193.67"}, + {"AARON, MICHAEL, L", "", "WEST ISLIP, NY", "MEALS", "$19.50"}, + {"TOTAL", "", "", "", "$19.50"}, + {"AARON, MICHAEL, R", "", "BROOKLYN, NY", "MEALS", "$65.92"} + }; + + private static final String[][] EXPECTED_EMPTY_TABLE = { /* actually empty! */ }; @Test public void testRemoveSequentialSpaces() throws IOException { - Page page = UtilsForTesting.getAreaFromFirstPage( - "src/test/resources/technology/tabula/m27.pdf", 79.2f, - 28.28f, 103.04f, 732.6f); + Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/m27.pdf", 79.2f, 28.28f, 103.04f, 732.6f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); List firstRow = table.getRows().get(0); @@ -172,13 +139,10 @@ public void testRemoveSequentialSpaces() throws IOException { @Test public void testColumnRecognition() throws IOException { - Page page = UtilsForTesting - .getAreaFromFirstPage( - "src/test/resources/technology/tabula/argentina_diputados_voting_record.pdf", - 269.875f, 12.75f, 790.5f, 561f); + Page page = UtilsForTesting.getAreaFromFirstPage(ARGENTINA_DIPUTADOS_VOTING_RECORD_PDF, 269.875f, 12.75f, 790.5f, 561f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); - assertArrayEquals(EXPECTED_COLUMN_RECOGNITION, UtilsForTesting.tableToArrayOfRows(table)); + assertArrayEquals(ARGENTINA_DIPUTADOS_VOTING_RECORD_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); } @Test @@ -202,30 +166,26 @@ public void testVerticalRulingsPreventMergingOfColumns() throws IOException { @Test public void testExtractColumnsCorrectly() throws IOException { - Page page = UtilsForTesting.getAreaFromPage( - "src/test/resources/technology/tabula/eu-002.pdf", 1, - 115.0f, 70.0f, 233.0f, 510.0f); + Page page = UtilsForTesting.getAreaFromPage(EU_002_PDF, 1, 115.0f, 70.0f, 233.0f, 510.0f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); - assertArrayEquals(EXPECTED_CORRECT_COLUMNS, UtilsForTesting.tableToArrayOfRows(table)); + assertArrayEquals(EU_002_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); } @Test public void testExtractColumnsCorrectly2() throws IOException { - Page page = UtilsForTesting.getPage("src/test/resources/technology/tabula/eu-017.pdf", 3); + Page page = UtilsForTesting.getPage(EU_017_PDF, 3); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(page.getVerticalRulings()); Table table = bea.extract(page.getArea(299.625f, 148.44f, 711.875f, 452.32f)).get(0); - assertArrayEquals(EXPECTED_COLUMN_EXTRACTION2, UtilsForTesting.tableToArrayOfRows(table)); + assertArrayEquals(EU_017_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); } @Test public void testExtractColumnsCorrectly3() throws IOException { - Page page = UtilsForTesting.getAreaFromFirstPage("src/test/resources/technology/tabula/frx_2012_disclosure.pdf", - 106.01f, 48.09f, 227.31f, 551.89f); + Page page = UtilsForTesting.getAreaFromFirstPage(FRX_2012_DISCLOSURE_PDF, 106.01f, 48.09f, 227.31f, 551.89f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); - - assertArrayEquals(EXPECTED_TABLE_EXTRACTION, UtilsForTesting.tableToArrayOfRows(table)); + assertArrayEquals(FRX_2012_DISCLOSURE_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); } @Test @@ -359,8 +319,7 @@ public void testRealLifeRTL2() throws IOException { @Test public void testEmptyRegion() throws IOException { - Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/indictb1h_14.pdf", 1, - 0.0f, 0.0f, 80.82f, 100.9f); // an empty area + Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/indictb1h_14.pdf", 1, 0, 0, 80.82f, 100.9f); // an empty area BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(EXPECTED_EMPTY_TABLE, UtilsForTesting.tableToArrayOfRows(table)); @@ -370,8 +329,7 @@ public void testEmptyRegion() throws IOException { @Test public void testTableWithMultilineHeader() throws IOException { String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/us-020.csv"); - Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/us-020.pdf", 2, - 103.0f, 35.0f, 641.0f, 560.0f); + Page page = UtilsForTesting.getAreaFromPage("src/test/resources/technology/tabula/us-020.pdf", 2, 103.0f, 35.0f, 641.0f, 560.0f); BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); diff --git a/src/test/java/technology/tabula/UtilsForTesting.java b/src/test/java/technology/tabula/UtilsForTesting.java index 524b497e..3ee8efde 100644 --- a/src/test/java/technology/tabula/UtilsForTesting.java +++ b/src/test/java/technology/tabula/UtilsForTesting.java @@ -8,6 +8,7 @@ import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVPrinter; import org.apache.pdfbox.pdmodel.PDDocument; +import org.junit.Assert; public class UtilsForTesting { @@ -36,7 +37,7 @@ public static Page getPage(String path, int pageNumber) throws IOException { public static String[][] tableToArrayOfRows(Table table) { List> tableRows = table.getRows(); - int maxColCount = -Integer.MAX_VALUE; + int maxColCount = 0; for (int i = 0; i < tableRows.size(); i++) { List row = tableRows.get(i); @@ -44,6 +45,9 @@ public static String[][] tableToArrayOfRows(Table table) { maxColCount = row.size(); } } + + Assert.assertEquals(maxColCount, table.getColCount()); + String[][] rv = new String[tableRows.size()][maxColCount]; for (int i = 0; i < tableRows.size(); i++) { @@ -57,14 +61,14 @@ public static String[][] tableToArrayOfRows(Table table) { } public static String loadJson(String path) throws IOException { - - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8")); - StringBuilder stringBuilder = new StringBuilder(); - String line = null; - - while ((line = reader.readLine()) != null) { - stringBuilder.append(line); - } + + StringBuilder stringBuilder = new StringBuilder(); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8"))) { + String line = null; + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + } + } return stringBuilder.toString(); From 6e5f5c2262dc663d9121aa3d08bfe81b4fd6bafd Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Mon, 4 Sep 2017 00:08:24 +0200 Subject: [PATCH 065/245] fixed for jdk 7 --- src/main/java/technology/tabula/Table.java | 2 +- src/test/java/technology/tabula/TestBasicExtractor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/technology/tabula/Table.java b/src/main/java/technology/tabula/Table.java index 8ffca145..c031c9ed 100644 --- a/src/main/java/technology/tabula/Table.java +++ b/src/main/java/technology/tabula/Table.java @@ -83,7 +83,7 @@ class CellPosition implements Comparable { final int row, col; @Override public int hashCode() { - return Integer.hashCode(row) + 101 * Integer.hashCode(col); + return row + 101 * col; } @Override public boolean equals(Object obj) { diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index a6803cdf..5d5d985c 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -123,7 +123,7 @@ public class TestBasicExtractor { {"AARON, MICHAEL, R", "", "BROOKLYN, NY", "MEALS", "$65.92"} }; - private static final String[][] EXPECTED_EMPTY_TABLE = { /* actually empty! */ }; + private static final String[][] EXPECTED_EMPTY_TABLE = { /* actually empty! */ }; @Test From 1d0d79773773a00bee1bf7cb81c6d7d5a9776a9f Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Thu, 14 Sep 2017 18:47:02 +0200 Subject: [PATCH 066/245] removed deprecation from Page.getRotation() as it is used in the ruby webapp --- src/main/java/technology/tabula/Page.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 491eaf7b..25f1baef 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -121,8 +121,7 @@ public List getText(Rectangle area) { return this.getText(new Rectangle(top, left, right - left, bottom - top)); } - /** @deprecated with no replacement */ - @Deprecated public Integer getRotation() { + public Integer getRotation() { return rotation; } From 8dcd636b5399c54a69821b0460a17b4e3f03e907 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Thu, 2 Nov 2017 08:59:11 +0100 Subject: [PATCH 067/245] Fix AppVeyor winows build - maven 3.5.2 --- appveyor.yml | 18 ++++++++++-------- pom.xml | 10 ++++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f60e8fd5..d16a36ce 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,18 +2,20 @@ version: '{build}' install: - ps: | Add-Type -AssemblyName System.IO.Compression.FileSystem - if (!(Test-Path -Path "C:\maven" )) { + if (!(Test-Path -Path "C:\maven\apache-maven-3.5.2" )) { (new-object System.Net.WebClient).DownloadFile( - 'http://www.us.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip', + 'http://www-us.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.zip', 'C:\maven-bin.zip' ) [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") } - - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g + - cmd: SET PATH=C:\maven\apache-maven-3.5.2\bin;%JAVA_HOME%\bin;%PATH% + - cmd: SET MAVEN_OPTS=-Xmx2g + - cmd: SET JAVA_OPTS=-Xmx2g +build_script: + - mvn clean package -B -DskipTests -Dmaven.javadoc.skip=true test_script: - - mvn clean install --batch-mode + - mvn install -B -Dmaven.javadoc.skip=true -Dgpg.skip cache: - - C:\maven\ - - C:\Users\appveyor\.m2 + - C:\maven -> appveyor.yml + - C:\Users\appveyor\.m2 -> appveyor.yml diff --git a/pom.xml b/pom.xml index 63608059..a71f567c 100644 --- a/pom.xml +++ b/pom.xml @@ -154,15 +154,17 @@ org.apache.maven.plugins maven-surefire-plugin - - - -Xms1024m -Xmx2048m - + 2.20.1 + + + -Xms1024m -Xmx2048m + org.apache.maven.plugins maven-eclipse-plugin + 2.10 true true From 4e15a5034e27099d20b2d509d0e5b5a1cda2e557 Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Fri, 3 Nov 2017 12:12:45 -0300 Subject: [PATCH 068/245] PDFBox 2.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a71f567c..bb876ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.apache.pdfbox pdfbox - 2.0.7 + 2.0.8 From ec405abb882c55196ff3f59409c4f06986e375b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 17 Jan 2018 10:57:23 -0300 Subject: [PATCH 069/245] Include JDK9 in Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 46e41e94..cb01b361 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ script: mvn test -Dgpg.skip=true jdk: - openjdk7 - oraclejdk8 + - oraclejdk9 sudo: false From 3d98ddf19316ad418fc62df41d9f0406dc8bf120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 27 Feb 2018 11:55:51 -0300 Subject: [PATCH 070/245] Update copyright notice --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd9717c6..81392fca 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?bra (This is the new version of the extraction engine; the previous code can be found at [`tabula-extractor`](http://github.com/tabulapdf/tabula-extractor).) -© 2014-2016 Manuel Aristarán. Available under MIT License. See [`LICENSE`](LICENSE). +© 2014-2018 Manuel Aristarán. Available under MIT License. See [`LICENSE`](LICENSE). ## Download From 1c121b662b6bd3d65eaf5414d144d09837163da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Thu, 1 Mar 2018 15:32:32 -0300 Subject: [PATCH 071/245] fixes #206 --- .../tabula/ObjectExtractorStreamEngine.java | 7 +++++++ .../technology/tabula/TestObjectExtractor.java | 12 ++++++++++++ .../technology/tabula/npe_issue_206.pdf | Bin 0 -> 12736 bytes 3 files changed, 19 insertions(+) create mode 100644 src/test/resources/technology/tabula/npe_issue_206.pdf diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index 70181454..700d1fe7 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -195,6 +195,10 @@ private void strokeOrFillPath(boolean isFill) { case PathIterator.SEG_LINETO: end_pos = new Point2D.Float(c[0], c[1]); + if (start_pos == null || end_pos == null) { + break; + } + line = pc.compare(start_pos, end_pos) == -1 ? new Line2D.Float(start_pos, end_pos) : new Line2D.Float(end_pos, start_pos); @@ -216,6 +220,9 @@ private void strokeOrFillPath(boolean isFill) { // segment // back to the point corresponding to the most recent // SEG_MOVETO." + if (start_pos == null || end_pos == null) { + break; + } line = pc.compare(end_pos, last_move) == -1 ? new Line2D.Float(end_pos, last_move) : new Line2D.Float(last_move, end_pos); diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index d7ac5a69..fe458b87 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -126,6 +126,18 @@ public void testTextElementsContainedInPage() throws IOException { assertTrue(page.contains(te)); } } + + @Test public void testDoNotNPEInPointComparator() throws IOException { + PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/npe_issue_206.pdf")); + ObjectExtractor oe = new ObjectExtractor(pdf_document); + + try { + Page p = oe.extractPage(1); + assertNotNull(p); + } catch (NullPointerException e) { + fail("NPE in ObjectExtractor " + e.toString()); + } + } /* @Test diff --git a/src/test/resources/technology/tabula/npe_issue_206.pdf b/src/test/resources/technology/tabula/npe_issue_206.pdf new file mode 100644 index 0000000000000000000000000000000000000000..352e77ba72bd14925cdbb9aa2b06b09e4dc9f3cc GIT binary patch literal 12736 zcmb_j2|SeD_ea?#L{UhZY*8`$W-0s5*oBJ0U>Jj$u|_FbD-|hAiy}*eY$2qmC`pp- zEg~r?OZKS#&ok&%@B99?&z~O8^W1yxx%Zy)z2`aS+?%YKwyq*V2@8>(8C>jxAfRxl zkFzI4RTToW3ic&KVOk_6iR$AHf!UDh42lm83PUKNAuuzNJDCAR0^}BuJ$oQznk(20 zwW_%molIi-(4q3WbdopOgyco0LlFoixB}3a?&Iq30=&y>xX^u^Nld6Vg~6mysmmnL z{qnXHfMXzIzk&+X+sBpSMj^XG{TURRJCtHY4q`%)N(dz!)HxW6utM##0(e?cm{c-U zUY{I9atB6fgGEAtZrp*sy~*?)45$U!jZ7!gT*y!p63w4P1)3Ow@YAS(nCK|r7pcqCF0j^6=??*K?N{Fxr0Sj>SzxcGQ`L#@az9yA|7#uPGR zH`IXUq6AQ}qz8!mcW!V33W31bE36VasDxj2#!?P2KMF862Q;Xo0{}-Ke;N~tSk(}$ zS!t+6_wm*A34%JnmEchD0>%#f#SwtNKw~o!AUiiPV!vrM=Uo}vW^~ykv$uxJS2NZ>e11Qv` zP?><%V7gSG37|wDS2Ea)!3419%?}B>_|)Ex@rUk)f*!r^alvaXIC&UOT;pld+sq#q zi1on|6-<~Sl_d13e?H~}EF5G-?GN-XnURw3}((%`&rVI9p3zvs# z^Gn`$l_~hoXcd@ryFs3YYsL4~)HI&R;_IGFy!|nZpk$poKNG2J5CJ2<3>FVLd=}R= zHMmuIKc#gdN~Nvb?|XDf;CnxA|5s0w%HHQH?&@nTl{;h*U7H{~Mn6%~LPQiwam+q5 zZYIb_^?bA#Lp^%ga4~K!VHkUNF6lh3xcXh0_l~=7dWx~uTQ2l8+L#=ZEu33b-p ze6wV)T<4df{W)Vb=I(j#rah$&+z##^=Pthgi6e0TH(Ydh8r9@g@pb8P?46ndx4gO1 zWM}I}H%hO953=866Oyb_*|g4*d!#im0p+qul~iK?_?!`qMlO7+I-`_)2nN%oJMQ0{ zJZVqp%V~=&_ip#ZRvFg&Tc^s!i`!c3>gueQQue>}MuAvWOm?!dNmnUOIAcJxk!#uK+o@Hf)D)*MGwDeftueeKtM zj&n$wc<$>oIAAPYTAjMaZO@(F0=lwu7W1sih6_U_0fwIpUx#m1f3dEoX-xQ8ld0!7 zKZAss?j2{+ZZcX2QDyV;mr(vH^CFsvZloR~Qtv`;-e=9IY{9f=SXK5;S;%=m4|;|N z3=TP&KJipJV0YoU{5gGxmYj`;4x?N`+bs6%q-p7&BHq0zb^V2%45Q}cT9d)RuLw!m z%!Zo_+O+vies5BEhLY5%6(5V`a)a0!WOA9Q^MyIdvrXvIYgfO$lQHazEk1SLC*Y2Z zLV5QU!tU7A@dy3^yyM3Pv3KO`qNz1!hafkO_fIE!1PVmGo1}~>?ig>s6wIr+z$@>p z$n77r*8R5G{+#-Y4n?Su?y>fWQ7V_w(KX^&IM-~@V@_j7+3#ODL!QLWdq;ow*yi~C zo*De4P}jCsQfa8i`^%j~XuNphV8FW{n=C?}q&!p>hi;3N9b5BSzK2RTIC8pUZk;x@ z!smfx3LjeOT6ud}`d%}m{ciOcN)BU$5$x;Z+Y)5kdXuc*pSf|SE9(GqZ;`5C2CsmP z{YEjRU0+i9uE`NU)XnmVD@rH6I&(|vc4BAB1yilBs!8v=Q_+I2hh3y>8>u)OTDy+uds6(B0Qs1@JB#$d4 zwcrnq^CF+MJ8jCR$!{A1LvO2C4|SM0Ic|Nw=}uGV$39t_U`ZK|0F^oa#p6w>r^)4l z(Tmn%^$H1A%=H4uy5R0@1a4XN1=u8iiI99}@6Kes*I3=^V;y&5BADVvcDdVorrna> z>Kj2$X31l_=lpjFpV`@B_*OTQt6<`K#FopwU+O+L3TEuI9*2dN&M+Os7I@Z^g-K%p znMSRSb%W@SZZaj5H(6l9~=b7^X|9VgdKCvwVZzYOtgA2 z^y|adnqU7g`QEifpXndL>8#PX@l7C;lPFa67BVxNtvaFCiU`*> zx_9LUhE&MSi#*?eKs?7eb!A+8;ek`S(b~@Si#7CW`tx`%w z3jP9DoyykHySmASLLQ^yPFr_B@vJaRQz|Hs3VJ5@;zu)V%#)H`|G+iPHod-25f$Bx})p(%q9t|dkPG;N`59kn>^$zeW@a9a~rX;@s(Y@Xsdg}2;*h^j&8>u#n zuk0FiTnW$|13Tzx(lqFt_)pyw&cYO2uq>*5~`Y?wE+MO?MaaqpQ%i z&J8KFiedRduP&UWCL45j;N*w86NO#QJF@C2#M3uF-A3kJi%yxqaPoW3&hTpzPc5ve_EAk2~es-B{-=p5v?K9WrKC##B!B4Q) z6%U6W@cOpBE+Eik`rNHB-3dX}*WA;Gk0u+6ufK=7boBTX>WzWt2XV+QWrxHVO=p-k zdv;W&z{QWLH|)(s)pZ#i`Z2ufCu#UFV$iL|AmfO`^(l9<7B6pRj)d@hJn0Y<+{e%@ z*U{YoeL8EgSo8`mL%PEIaILx!pGI9PkErI_2%=@%(XHy_%%lhWib^@9Q8GyVIHIL! zws&f!wEdk1*)5gK&=%ucp@e6g?A|Vq4KGMF<;ryp^+? z*D@QG56ACc|ConIa-yswM4-mxz@){k67M_f+V-W$7>``)Qe;RRVeare9zuMvH9|1! zBge2@WvARH3(uH^NMZJ_W7F^_Jhf|j>bOpJPOGcL@AMNou;}hHO&k`3Z>(~*g5XRY zA>WC8em94W?eWL`*4&KkTbUj z%ZtY*j|ubJ#|0@AB}(rvs3;!wHPo?AWn1gQbL4$Pd@JXk;@i^;vX>EKFI@MY?7md5 zepz?6srS{Fn#Kbqxa`ljU&$PK{8sr;hzHre>5pq`H1$L9#mcH<>@TzHAl+?8>vmRV zQ@-pQZo^!NSa<#*YFf9hg8#!H0sYQirPCu>ITPI(h@!nVKapkM?xaw(aHHc;L)Hdjz^&g1GO5 zV9AAqj_WPK43wyg3VE^tLDVp=T%1XFblgV6`?l1XBVMB{4NT zSy@S&ZEq1IM>ppdmk-Fi(YWy`!}VU#n-6>JqLACS8%g>@_o{pE)SKyv=0(v82Nr^l z6CB4Tj7$qh)w=Gz#Bi@4`Z$rneP~yi<;ZMNDT;%btG-2Eh*vI(jlcd>MC9u`m%ceq zg?WwgZb84iTzP)DsyK8n6@FlN(}lRCV`PDMT3x4e;uH9#3ki7mL3*Ew5^ux&$+S-7 z5v3ZhmZ||{is0tLZSpRGt`;}5A3c9K_A*wWJu~;bb{3BXkzIZ48@Fxo7+0NmNz>@8 zt=~>jN0pH&aosS~aKcf03ocq%>J)u#@TBort98rvi8Or0{_j~WgcxdZ_q1~D@zNG9 zfrAmVh@hJm0&iXJ$-$7kqCB*+sN|I$PuO>S?s;8s zb9ANuQ>{HG^5#x#sc{et+-Afq&f+~SktW13qnz7ZT+$R0x6*fo-U z>ssIPRIM%9cfG4ue>O8>I0z*sj8Q-GN(-%B0-?BtUC`f<`~qiU6*PQxzVN}slwlWM zWlDHfdsk}j{`KMt_QQIQvNqq;9~nN|-Y@$7#MKD{p`_De9A0XC?6cKxG%`My#ui@I zx%PRE%`qw@Hc@=TB!+PJl-sW3a}bfJ+^2&#`IF`kbcEqvESO%)B+AVuI6i8L z*rRiOy-k%-Q5ewAMg%zVQz7T1Hh!-w8*AAeTgS*Ba-oO8 z@B7A_Y}{70i7P;mVP{(JdSakoE!Dm^&tcwk>Ibvzp|6C6bWVP>?Hbas=RH+z+b6rT z?+ize1_UP7n|WS>J3NV2O!%>Gcf}mc=3C5!nN2NiruIiLM^x>WZ|gZm%N_Z_oXb+6 zyOMnY1MZbDStp38XUPhr!Bmc(B?5|Ph2ubU45nXPEXho$0}M$1Kw)4$g_R$m`p_+X zNkE1KY@)@$0t5zHTACyVkb5C4Mdx61T_ECTkyu&bp$H&b0Hy?VQ9yEM>Cwsx2}P`A z3aqeD1eg^9vj$dZD1w!Z0AqCE-*VCj4E$Gyy_9oer34@_Z88H$!RTR>5C|NQLjf~K znn1n=2>2bqUctNskf>p@(p1J2nir5e0FyQj2sBEGKp;S|c%%{*kANcZ1SK2-cqgF2 z_XDf?28FWHH_^-lNRPmLe4%b6Dg#JuEDh$TB!S*ER;q|*D^HdtV7dgkiYF+l6`sr4 z3M7Vr12R8gvVsOCH-M=HP+Z6sdYTZJDHQc@6B!=87taS;S#@rTepVA0a`h>^O)Ml) z2_8PB1l_vUT-1$A^f6mKp9wW4M_pS;h+XGQdN_N=RsH-J=k4-2PV4mr&79$JIXSMn z9fqO7!DH{<%|5E>>v11r%yu8TQl`WvL)@kW<2=s+P1*5=I|Tp2Hd3$k);Bh;pm6pq zHn`nzZmq`XJ#`rvZgWUgBk$sgUOsmH#ai-*VPbZ~4`N%sRV^D^qhrGm)l}K2VP4Ag zv2bSGXOvXdLzy@+-PjbEp;-gnIo@IL`jxOv-R8}oTqPYE1}<85H&GF@F+qo-&PY2q z=rwSP?KjPe@j0;%Wsuw~GU4DyMMkFxu*J!gufyjD38lp(H>?+63Qf@2d^0Ox_@Q;1 ze2do(XjNurx=mL4O>k5x8J(tidOuA+L`Np#IgVc4o0!x%STd}n(3ER@5X*ML{rhe) zKkwmdQVyy14))@yVkw8sbAD9K;bccYOVvQ;UZG+-W}`nBE?RtKb83$BEE!qv(0rIp zxts$U_+x$A&~`Q%oiMMv6Aywt27+TZ^H_MFJcUA`PE|;pKU>S^4QJY?#M9`mfVD2H)=qzb44OA=vEIbl<{I#Cpzw zw9Q${xA3!9IKM3v_{PqiZ8^0d@qUA-u{-a)*a@!zFW%O0HW_x2#x)}8?98Lv;cIN_ zHsLvNMI3WSodg9sI5x#_H-)c9YAAK_LDYr1IA@L-nyvY$A??AwL!BGXuN3~|jdBI= zXgIgi+LICQow%ymCk5A%wj;HV4sN&BUxy5DhH|;CuhiIM1{D_2(ee{qzd^IIbyE({ z&d8lt?Q?{_Zc^qv5MH3Urd7>DIQ7`!$liJ$<72r+$b9}S^?Y5tGf@%!7+;BtT<`1V z$4vnzF5>jP&*PkP%AwqnN3YbE@TkY|@SAJ#32_Y^o7*m=zx%!(78^^2P(nCVftGJxcoL&1Xl|m zT;~%pTVFEKJ+~oLt#;j!HGAW)?9kuH258hFEHuUUb@}kW# zDUwXT?7j0{^5(M7l@Rh1nj2ubvcoc!Hb}kV{a-Q%`I{&T)#u93oe;M4jIc^-SI8yh z+EL<4b4#xupUUPSBV z)e!TIIXdk=Ip5mF?8Lgs#aD~%imi*?UG+S8OwxvQjIJfMnzlxHj9rk2`PtvMD|Rt> zl5kI!L64)y(@qKwH?oQeNdYc!^mQYn5*_T?eF$fSH*|Kgj^2E`zp{KU89R}|NFA}b44^i-;ylx|DC0tD;MUhJSbA+BY zK9YZyQ~x3IR+iuK3EJC(Z;5i7MQUX%GduI7OMCKvyc$;DaaeW@W zl<)MEd&rjJh$o}=X1hZb%k7vBp{1q8gAV2UOzkN4Iu6zj{HPqhBf5yUahRT-?vRXW z%19vgJeDJEBld2Wc#m8Uw%b&x)2_wt;N8$>)7SA7TQ8h5@%HKRy{>x)(ueApIgFrz zoc_iDs_#YLHin_E^3c@%?uL}HS3|1ro!=JszN_9f@Uh?iL(iDp+f4&D!!un6UaPg# zbca2xzwdJCQ82MI`}TXzHon#R`c=mLix+&6s>N)ir72#&ljm^seKKdKKv+p{qjtLM3^xZN?6$Nm7LD1PP_O z?j{|nd0rwNayQjB%8ETWsVsIXUf={R?t9&oO9#T;rP}$1i`zb>{ILA@RJ{PPLvb#T z6y6y(^gKBK(DY&VgU_*Pae*-{cpq9LP!?ZSpkk{S$Qb<)l099vC7mC!r3&XsZSKR@Ho3fb z{`C0M*t8>!sHR;{57o$0jcjY_-?J8P-IR1lTPFjV?uQZEp0Ms|ALKIgO{k zy?0*xUFx;e+31Ss(Tb!9_dx!*I`e5JC4MgcY|D7dQOjMX{(;>AWnn&3-_E}9%+70RysSVl!lxYx=-=N` z**%&2J{#6>Ky)Pj<6&RFmk<6>V^{ljp&E9e^3&mY=R(V|%3T4rrjBKmAs@xx+CTDt zGV(cWQ<(SOeT%IfKHYtX>p$wgHyKGgu;vMOi-0oU!HRbwBVW7=|L7dcuSUUzk<36m zJ!nvAVRW!2^AK#z{neEtMZ?>_lKQ1{_1>LMlI;AJGwU)E^R6+)yz_bO4h^E@$y*OE z|2X&kMfAjC_F(qAjW;%)N_0!i&VH3m+vD(!x)}U%a(?*OmFq_e4qsguxZ@~sWH`+Z zgZiHEgWlgcVEd&ozWU%y)uE0fGZSfpxJgE&&$~X!ut!0i3wu6&YX}|U{uCW|I%M0O zJ;6spD$Z0Fji<4#VVgZZx$rj;0n0o8>5GyWOf3%*unUXE0-iMB*0Vf$m9?eB3PTYe;x8ttO;z- zt_=B?5rabg%ZL$J!s;=zK>1Ij{BN-cY7~XRtY{C4#{$|N`T}vWf<+L+I2`^bib1@9bRgdq zECcndvK6}D@k~IYfAR+T0sRBm0!M+y0y6>E)z7i9@VJEZpXdfDKvaVlSpRnj2WkEt z#=*8I6d*V3(tTy#EW`sNLcjrn-+osuf@Se95B5JP14kaJ~hykiy4L=Yjph|&q7W7!M2Vl>l z1M0wK0X~D*3f&4US&&_>1EIG<2bP1gSennu9MJ#;IPO(<2-w^5Tv+p4nIm`yW%Bzx zS4Ou&2iCJjwj=`x$QupF5efDK+*kds!q?BzoUekx_`u~D#KwqmTk3<0m7LY1% zvBUuC415RgEd4DRpB01jk46-11M&q8C}0u+Y%S@01#RH{ry*QzK$lR>YVp4s&=p04 z$OlFM{9Rcu%Xb!n!DsMVJu~o`^+{Q(gRIc7J}Cena8}DamXHpV0sL7jdbJc;&%nGv zEdC7+meZ^MgoD+Gq?R(5zd91Ee5wn0ic1lR06y}TOtQBP6pvBDW5EO@;B?rMDefLj zz+AzB^e@R*f9aLAGFbJRtW#Wy7~rd~h(cn3#4d&aB@pn-W3>cMT`^repfFP(x;Kdm zf$jU11C`{?fD!=L6YNWu=MzZmYA{$sBftTZ4Az?hX9l5vaZQ(8R1KOt zaMVu`u-<+*lcB*j_)Fooew~%M?(00BxcDi1mRec3 z*Q=O)@a!cTT-~b)EA81%c?gjrjs; z{xj@fqWO!j3)sA0{IVt1ZR&fJnngI@4G3Sk=IGsXKWx;F85bWJRSiDwJUaQHOH87= ztuapdIC9qwZfMGEx22!=^cClcuHEH#@;CSek`i}b`T|MU8%p-B4U9k2tk^#y+dDs) zWcZ3xlr8Fv$HBjgBUb0hLG>&{0RdD22y6%Z zX*U0UNGtvRvRv>>egB6`1&hTjEfwG+#ah?c|7NWKF3f+sR{nXytk1{_$p7txfmOO} zAC|}PA5Iv9#RC(DP6OZ30!9D!aQ*0Kz6|HeLIk)RB4fP1|p1H^x2ApZxY1F`$khy5QX{!7HQbbuC# z2Uf?=?K2P%2rWRS|N20!N3XN16Uo`h)m4~xe8PW{(GhRBTc6R?Y(zBNt-uwVw|IuM zxV`0z)_J}Bk=tJio3HHHM{bh}y8G@n)kI*v>|n;cf$y=ay!^ z%}wTPX=eFm=j<=qTX6|b^ZD7ZRT{Am!6TcUBel~*L*!adUTYVQOt{u?uKiWRHEQG{ zIz3kXUUfr4^I~;_MC6&r$J$F92CX>Vb1>>8HDN~%c4-%tHHn&%UDBWEeYO+q&!6>< zKHYnm>b8IO#ie=o^IgQ#cSnz?bcwiJW@+7^LC|1M|XVEteDA#mtbb7Rs;z( Date: Mon, 12 Mar 2018 12:54:55 -0700 Subject: [PATCH 072/245] 1942-update-tabula-java-for-multi-column-pdf (PolicyReporter/requests#1942) - Allow multiple occurrences of -a parameter - Allow -a parameter to accept % values as well as absolute values - Add test cases - Add test files --- .../technology/tabula/CommandLineApp.java | 46 +++++++++++++----- src/main/java/technology/tabula/Page.java | 18 +++++++ src/main/java/technology/tabula/Pair.java | 19 ++++++++ .../technology/tabula/TestCommandLineApp.java | 40 +++++++++++++++ .../technology/tabula/MultiColumn.pdf | Bin 0 -> 8336 bytes .../technology/tabula/csv/MultiColumn.csv | 44 +++++++++++++++++ 6 files changed, 154 insertions(+), 13 deletions(-) create mode 100644 src/main/java/technology/tabula/Pair.java create mode 100644 src/test/resources/technology/tabula/MultiColumn.pdf create mode 100644 src/test/resources/technology/tabula/csv/MultiColumn.csv diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 66de8b05..c0d321f2 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -6,7 +6,10 @@ import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -34,7 +37,8 @@ public class CommandLineApp { private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; private Appendable defaultOutput; - private Rectangle pageArea; + + private List> pageAreas; private List pages; private OutputFormat outputFormat; private String password; @@ -42,7 +46,7 @@ public class CommandLineApp { public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseException { this.defaultOutput = defaultOutput; - this.pageArea = CommandLineApp.whichArea(line); + this.pageAreas = CommandLineApp.whichAreas(line); this.pages = CommandLineApp.whichPages(line); this.outputFormat = CommandLineApp.whichOutputFormat(line); this.tableExtractor = CommandLineApp.createExtractor(line); @@ -156,11 +160,13 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException while (pageIterator.hasNext()) { Page page = pageIterator.next(); - if (pageArea != null) { - page = page.getArea(pageArea); + if (pageAreas != null) { + for (Pair areaPair : pageAreas) { + tables.addAll(tableExtractor.extractTables(page.getArea(areaPair.getRight(), areaPair.getLeft()))); + } + } else { + tables.addAll(tableExtractor.extractTables(page)); } - - tables.addAll(tableExtractor.extractTables(page)); } writeTables(tables, outFile); } catch (IOException e) { @@ -200,16 +206,28 @@ private static OutputFormat whichOutputFormat(CommandLine line) throws ParseExce } } - private static Rectangle whichArea(CommandLine line) throws ParseException { + private static List> whichAreas(CommandLine line) throws ParseException { if (!line.hasOption('a')) { return null; } - - List f = parseFloatList(line.getOptionValue('a')); - if (f.size() != 4) { - throw new ParseException("area parameters must be top,left,bottom,right"); + + String[] optionValues = line.getOptionValues('a'); + + List> areaList = new ArrayList>(); + for (String optionValue: optionValues) { + int areaCalculationMode = Page.ABSOLUTE_AREA_CALCULATION_MODE; + int startIndex = 0; + if (optionValue.startsWith("%")) { + startIndex = 1; + areaCalculationMode = Page.RELATIVE_AREA_CALCULATION_MODE; + } + List f = parseFloatList(optionValue.substring(startIndex)); + if (f.size() != 4) { + throw new ParseException("area parameters must be top,left,bottom,right optionally preceded by %"); + } + areaList.add(new Pair(areaCalculationMode, new Rectangle(f.get(0), f.get(1), f.get(3) - f.get(1), f.get(2) - f.get(0)))); } - return new Rectangle(f.get(0), f.get(1), f.get(3) - f.get(1), f.get(2) - f.get(0)); + return areaList; } private static List whichPages(CommandLine line) throws ParseException { @@ -307,7 +325,9 @@ public static Options buildOptions() { .build()); o.addOption(Option.builder("a") .longOpt("area") - .desc("Portion of the page to analyze (top,left,bottom,right). Example: --area 269.875,12.75,790.5,561. Default is entire page") + .desc("-a/--area = Portion of the page to analyze. Accepts top,left,bottom,right . Example: --area 269.875,12.75,790.5,561. " + + "If all values are between 0-100 (inclusive) and preceded by '%', input will be taken as % of actual height or width of the page. " + + "Example: --area %0,0,100,50. To specify multiple areas, -a option should be repeated. Default is entire page") .hasArg() .argName("AREA") .build()); diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 25f1baef..959844ca 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -21,6 +21,9 @@ public class Page extends Rectangle { private RectangleSpatialIndex spatial_index; private PDPage pdPage; + public static final int RELATIVE_AREA_CALCULATION_MODE = 0; + public static final int ABSOLUTE_AREA_CALCULATION_MODE = 1; + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage) { super(top, left, width, height); this.rotation = rotation; @@ -48,6 +51,21 @@ public Page(float top, float left, float width, float height, int rotation, int } + public Page getArea(float top, float left, float bottom, float right, int mode) { + Rectangle area = new Rectangle(top, left, right - left, bottom - top); + return getArea(area, mode); + } + + public Page getArea(Rectangle area, int mode) { + Rectangle newArea = area; + if (mode == RELATIVE_AREA_CALCULATION_MODE) { + newArea = new Rectangle((float) (area.getTop() / 100 * getHeight()), + (float) (area.getLeft() / 100 * getWidth()), (float) (area.getWidth() / 100 * getWidth()), + (float) (area.getHeight() / 100 * getHeight())); + } + return getArea(newArea); + } + public Page getArea(Rectangle area) { List t = getText(area); float min_char_width = 7; diff --git a/src/main/java/technology/tabula/Pair.java b/src/main/java/technology/tabula/Pair.java new file mode 100644 index 00000000..d54cbbe5 --- /dev/null +++ b/src/main/java/technology/tabula/Pair.java @@ -0,0 +1,19 @@ +package technology.tabula; + +public class Pair { + private final L left; + private final R right; + + public Pair(L left, R right) { + this.left = left; + this.right = right; + } + + public L getLeft() { + return this.left; + } + + public R getRight() { + return this.right; + } +} diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index fd79e9c2..81b30d4b 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -143,6 +143,46 @@ public void testEncryptedWrongPassword() throws ParseException { }); } + @Test + public void testExtractWithMultiplePercentArea() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/MultiColumn.csv"); + assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/MultiColumn.pdf", + "-p", "1", "-a", + "%0,0,100,50", "-a", + "%0,50,100,100", "-f", + "CSV" + })); + } + + @Test + public void testExtractWithMultipleAbsoluteArea() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/MultiColumn.csv"); + + assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/MultiColumn.pdf", + "-p", "1", "-a", + "0,0,451,212", "-a", + "0,212,451,425", "-f", + "CSV" + })); + } + + @Test + public void testExtractWithPercentAndAbsoluteArea() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/MultiColumn.csv"); + + assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/MultiColumn.pdf", + "-p", "1", "-a", + "%0,0,100,50", "-a", + "0,212,451,425", "-f", + "CSV" + })); + } } diff --git a/src/test/resources/technology/tabula/MultiColumn.pdf b/src/test/resources/technology/tabula/MultiColumn.pdf new file mode 100644 index 0000000000000000000000000000000000000000..197df402af0f4c7a4a2b025385ffe09147de9dc2 GIT binary patch literal 8336 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 literal 0 HcmV?d00001 diff --git a/src/test/resources/technology/tabula/csv/MultiColumn.csv b/src/test/resources/technology/tabula/csv/MultiColumn.csv new file mode 100644 index 00000000..f4f2e726 --- /dev/null +++ b/src/test/resources/technology/tabula/csv/MultiColumn.csv @@ -0,0 +1,44 @@ +1,100,200 +2,101,201 +3,102,202 +4,103,203 +5,104,204 +6,105,205 +7,106,206 +8,107,207 +9,108,208 +10,109,209 +11,110,210 +12,111,211 +13,112,212 +14,113,213 +15,114,214 +16,115,215 +17,116,216 +18,117,217 +19,118,218 +20,119,219 +21,120,220 +22,121,221 +23,122,222 +24,123,223 +25,124,224 +26,125,225 +27,126,226 +28,127,227 +29,128,228 +30,129,229 +31,130,230 +32,131,231 +33,132,232 +34,133,233 +35,134,234 +36,135,235 +37,136,236 +38,137,237 +39,138,238 +40,139,239 +41,140,240 +42,141,241 +43,142,242 +44,143,243 \ No newline at end of file From d4adc8134a46e36b751a668dba53f171e06f1699 Mon Sep 17 00:00:00 2001 From: Asheesh Rana Date: Mon, 12 Mar 2018 13:40:16 -0700 Subject: [PATCH 073/245] Updated Readme --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 81392fca..1f1eca39 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,15 @@ usage: tabula [-a ] [-b ] [-c ] [-d] [-f Tabula helps you extract tables from PDFs - -a,--area Portion of the page to analyze - (top,left,bottom,right). Example: --area - 269.875,12.75,790.5,561. Default is entire - page + -a,--area Portion of the page to analyze. Accepts top, + left,bottom,right. + Example: --area 269.875,12.75,790.5,561. + If all values are between 0-100 (inclusive) + and preceded by '%', input will be taken as + % of actual height or width of the page. + Example: --area %0,0,100,50. + To specify multiple areas, -a option should + be repeated. Default is entire page -b,--batch Convert all .pdfs in the provided directory. -c,--columns X coordinates of column boundaries. Example --columns 10.1,20.2,30.3 From 460ae29325966c72ec77e86a79af3d42e3a01fe4 Mon Sep 17 00:00:00 2001 From: Asheesh Rana Date: Thu, 15 Mar 2018 08:31:29 -0700 Subject: [PATCH 074/245] -Moved area calculation in commandlineapp class - Moved the constants out of page class --- .../technology/tabula/CommandLineApp.java | 16 +++++++++++++--- src/main/java/technology/tabula/Page.java | 19 ------------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index c0d321f2..b7b9dfe9 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -35,6 +35,10 @@ public class CommandLineApp { private static String VERSION = "1.0.2"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2017 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; + + private static final int RELATIVE_AREA_CALCULATION_MODE = 0; + private static final int ABSOLUTE_AREA_CALCULATION_MODE = 1; + private Appendable defaultOutput; @@ -162,7 +166,13 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException if (pageAreas != null) { for (Pair areaPair : pageAreas) { - tables.addAll(tableExtractor.extractTables(page.getArea(areaPair.getRight(), areaPair.getLeft()))); + Rectangle area = areaPair.getRight(); + if (areaPair.getLeft() == RELATIVE_AREA_CALCULATION_MODE) { + area = new Rectangle((float) (area.getTop() / 100 * page.getHeight()), + (float) (area.getLeft() / 100 * page.getWidth()), (float) (area.getWidth() / 100 * page.getWidth()), + (float) (area.getHeight() / 100 * page.getHeight())); + } + tables.addAll(tableExtractor.extractTables(page.getArea(area))); } } else { tables.addAll(tableExtractor.extractTables(page)); @@ -215,11 +225,11 @@ private static List> whichAreas(CommandLine line) throw List> areaList = new ArrayList>(); for (String optionValue: optionValues) { - int areaCalculationMode = Page.ABSOLUTE_AREA_CALCULATION_MODE; + int areaCalculationMode = ABSOLUTE_AREA_CALCULATION_MODE; int startIndex = 0; if (optionValue.startsWith("%")) { startIndex = 1; - areaCalculationMode = Page.RELATIVE_AREA_CALCULATION_MODE; + areaCalculationMode = RELATIVE_AREA_CALCULATION_MODE; } List f = parseFloatList(optionValue.substring(startIndex)); if (f.size() != 4) { diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 959844ca..e8c1d636 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -21,9 +21,6 @@ public class Page extends Rectangle { private RectangleSpatialIndex spatial_index; private PDPage pdPage; - public static final int RELATIVE_AREA_CALCULATION_MODE = 0; - public static final int ABSOLUTE_AREA_CALCULATION_MODE = 1; - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage) { super(top, left, width, height); this.rotation = rotation; @@ -50,22 +47,6 @@ public Page(float top, float left, float width, float height, int rotation, int this.spatial_index = index; } - - public Page getArea(float top, float left, float bottom, float right, int mode) { - Rectangle area = new Rectangle(top, left, right - left, bottom - top); - return getArea(area, mode); - } - - public Page getArea(Rectangle area, int mode) { - Rectangle newArea = area; - if (mode == RELATIVE_AREA_CALCULATION_MODE) { - newArea = new Rectangle((float) (area.getTop() / 100 * getHeight()), - (float) (area.getLeft() / 100 * getWidth()), (float) (area.getWidth() / 100 * getWidth()), - (float) (area.getHeight() / 100 * getHeight())); - } - return getArea(newArea); - } - public Page getArea(Rectangle area) { List t = getText(area); float min_char_width = 7; From 30bca6da6bf00dd2b4a92f4f49c7fed067bbfe2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Thu, 15 Mar 2018 14:12:43 -0300 Subject: [PATCH 075/245] Add AppVeyor badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f1eca39..369444b4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) [![Join the chat at https://gitter.im/tabulapdf/tabula-java](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tabulapdf/tabula-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) [![Build status](https://ci.appveyor.com/api/projects/status/l5gym1mjhrd2v8yn?svg=true)](https://ci.appveyor.com/project/jazzido/tabula-java) [![Join the chat at https://gitter.im/tabulapdf/tabula-java](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tabulapdf/tabula-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) =========== `tabula-java` is a library for extracting tables from PDF files — it is the table extraction engine that powers [Tabula](http://tabula.technology/) ([repo](http://github.com/tabulapdf/tabula)). You can use `tabula-java` as a command-line tool to programmatically extract tables from PDFs. From 7ea070e55b70930dabf7dda354190066a1e09a8e Mon Sep 17 00:00:00 2001 From: Asheesh Rana Date: Fri, 16 Mar 2018 10:03:42 -0700 Subject: [PATCH 076/245] 1966-tabula-java-column-option-with-lattice (PolicyReporter/requests#1966) - Removed unused variable outFile in CommandLineApp.java - Removed Unused imports - Moved VerticalRulingPositions out of extractor - Added tests --- .../technology/tabula/CommandLineApp.java | 25 +++++++--------- .../technology/tabula/TestCommandLineApp.java | 27 ++++++++++++++++++ .../technology/tabula/AnimalSounds.pdf | Bin 0 -> 11998 bytes .../technology/tabula/AnimalSounds1.pdf | Bin 0 -> 13784 bytes .../technology/tabula/csv/AnimalSounds.csv | 8 ++++++ .../technology/tabula/json/AnimalSounds1.json | 1 + 6 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 src/test/resources/technology/tabula/AnimalSounds.pdf create mode 100644 src/test/resources/technology/tabula/AnimalSounds1.pdf create mode 100644 src/test/resources/technology/tabula/csv/AnimalSounds.csv create mode 100644 src/test/resources/technology/tabula/json/AnimalSounds1.json diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index b7b9dfe9..6d3c34a6 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -6,10 +6,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -47,6 +44,7 @@ public class CommandLineApp { private OutputFormat outputFormat; private String password; private TableExtractor tableExtractor; + private List verticalRulingPositions; public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseException { this.defaultOutput = defaultOutput; @@ -58,6 +56,10 @@ public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseEx if (line.hasOption('s')) { this.password = line.getOptionValue('s'); } + if (line.hasOption('c')) { + this.verticalRulingPositions = parseFloatList(line.getOptionValue('c')); + } + } public static void main(String[] args) { @@ -123,7 +125,6 @@ public boolean accept(File dir, String name) { } public void extractFileTables(CommandLine line, File pdfFile) throws ParseException { - Appendable outFile = this.defaultOutput; if (!line.hasOption('o')) { extractFile(pdfFile, this.defaultOutput); return; @@ -164,6 +165,12 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException while (pageIterator.hasNext()) { Page page = pageIterator.next(); + if (verticalRulingPositions != null) { + for (Float verticalRulingPosition: verticalRulingPositions) { + page.addRuling(new Ruling(0, verticalRulingPosition, 0.0f, (float) page.getHeight())); + } + } + if (pageAreas != null) { for (Pair areaPair : pageAreas) { Rectangle area = areaPair.getRight(); @@ -264,9 +271,6 @@ private static TableExtractor createExtractor(CommandLine line) throws ParseExce extractor.setMethod(CommandLineApp.whichExtractionMethod(line)); extractor.setUseLineReturns(line.hasOption('u')); - if (line.hasOption('c')) { - extractor.setVerticalRulingPositions(parseFloatList(line.getOptionValue('c'))); - } return extractor; } @@ -362,10 +366,6 @@ private static class TableExtractor { public TableExtractor() { } - public void setVerticalRulingPositions(List positions) { - this.verticalRulingPositions = positions; - } - public void setGuess(boolean guess) { this.guess = guess; } @@ -410,9 +410,6 @@ public List
extractTablesBasic(Page page) { return tables; } - if (verticalRulingPositions != null) { - return basicExtractor.extract(page, verticalRulingPositions); - } return basicExtractor.extract(page); } diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index 81b30d4b..f2eb2b2b 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -185,4 +185,31 @@ public void testExtractWithPercentAndAbsoluteArea() throws ParseException, IOExc })); } + @Test + public void testLatticeModeWithColumnOption() throws ParseException, IOException { + + String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/AnimalSounds.csv"); + + assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/AnimalSounds.pdf", + "-p", "1", "-c", + "59,218,331,551", "-l", + "-f", "CSV" + })); + } + + @Test + public void testLatticeModeWithColumnAndMultipleAreasOption() throws ParseException, IOException { + + String expectedJson = UtilsForTesting.loadJson("src/test/resources/technology/tabula/json/AnimalSounds1.json"); + String resultJson = this.csvFromCommandLineArgs(new String[]{ + "src/test/resources/technology/tabula/AnimalSounds1.pdf", + "-p", "1", "-c", "57,136,197,296,314,391,457,553", + "-a", "%0,0,100,50", "-a", "%0,50,100,100", + "-l", "-f", "JSON" + }); + System.out.println("Returned Json: \n" + resultJson); + assertEquals(expectedJson, resultJson); + } + } diff --git a/src/test/resources/technology/tabula/AnimalSounds.pdf b/src/test/resources/technology/tabula/AnimalSounds.pdf new file mode 100644 index 0000000000000000000000000000000000000000..ad6c78cfad8469b5282c482d0274d3628b67e89a GIT binary patch literal 11998 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 literal 0 HcmV?d00001 diff --git a/src/test/resources/technology/tabula/AnimalSounds1.pdf b/src/test/resources/technology/tabula/AnimalSounds1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8883d101899cb2e6690e3bc5e051b1e932bf79bd GIT binary patch literal 13784 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 Date: Fri, 16 Mar 2018 10:08:52 -0700 Subject: [PATCH 077/245] - Removed unused variable (functionality moved) from TableExtractorClass --- src/main/java/technology/tabula/CommandLineApp.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 6d3c34a6..e03cb705 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -360,7 +360,6 @@ private static class TableExtractor { private boolean useLineReturns = false; private BasicExtractionAlgorithm basicExtractor = new BasicExtractionAlgorithm(); private SpreadsheetExtractionAlgorithm spreadsheetExtractor = new SpreadsheetExtractionAlgorithm(); - private List verticalRulingPositions = null; private ExtractionMethod method = ExtractionMethod.BASIC; public TableExtractor() { From e37c6669d03ed32bab121ea0d8b33524cba5f6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Thu, 5 Apr 2018 14:12:57 -0300 Subject: [PATCH 078/245] use pdfbox 2.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb876ccb..586e94a0 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.apache.pdfbox pdfbox - 2.0.8 + 2.0.9 From 0705bc621cc943fff30bafb1ead29024af1814e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 13 May 2018 10:45:17 -0300 Subject: [PATCH 079/245] Replaces JSI in favor of JTS Topology Suite (#226) Closes #224 --- pom.xml | 6 +- .../tabula/RectangleSpatialIndex.java | 69 ++++--------------- .../csv/spreadsheet_no_bounding_frame.csv | 59 ++++++++-------- 3 files changed, 46 insertions(+), 88 deletions(-) diff --git a/pom.xml b/pom.xml index 586e94a0..7107ea53 100644 --- a/pom.xml +++ b/pom.xml @@ -225,9 +225,9 @@ - net.sf.jsi - jsi - 1.1.0-SNAPSHOT + org.locationtech.jts + jts-core + 1.15.0 diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index be252794..2c8533df 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -1,87 +1,48 @@ package technology.tabula; -import gnu.trove.procedure.TIntProcedure; - import java.util.ArrayList; import java.util.List; -import net.sf.jsi.SpatialIndex; -import net.sf.jsi.rtree.RTree; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.index.strtree.STRtree; class RectangleSpatialIndex { - class SaveToListProcedure implements TIntProcedure { - private List ids = new ArrayList<>(); - - @Override public boolean execute(int id) { - ids.add(id); - return true; - } - List getIds() { - return ids; - } - } + private final STRtree si = new STRtree(); + private final List rectangles = new ArrayList<>(); - private final SpatialIndex si; - private final List rectangles; - private Rectangle bounds = null; - - public RectangleSpatialIndex() { - si = new RTree(); - si.init(null); - rectangles = new ArrayList<>(); - } - public void add(T te) { rectangles.add(te); - if (bounds == null) { - bounds = new Rectangle(); - bounds.setRect(te); - } - else { - bounds.merge(te); - } - si.add(rectangleToSpatialIndexRectangle(te), rectangles.size() - 1); + si.insert(new Envelope(te.getLeft(), te.getRight(), te.getBottom(), te.getTop()), te); } public List contains(Rectangle r) { - SaveToListProcedure proc = new SaveToListProcedure(); - si.contains(rectangleToSpatialIndexRectangle(r), proc); - ArrayList rv = new ArrayList<>(); - for (int i : proc.getIds()) { - rv.add(rectangles.get(i)); + List intersection = si.query(new Envelope(r.getLeft(), r.getRight(), r.getTop(), r.getBottom())); + List rv = new ArrayList(); + + for (T ir: intersection) { + if (r.contains(ir)) { + rv.add(ir); + } } + Utils.sort(rv, Rectangle.ILL_DEFINED_ORDER); return rv; } public List intersects(Rectangle r) { - SaveToListProcedure proc = new SaveToListProcedure(); - si.intersects(rectangleToSpatialIndexRectangle(r), proc); - ArrayList rv = new ArrayList<>(); - for (int i : proc.getIds()) { - rv.add(rectangles.get(i)); - } - Utils.sort(rv, Rectangle.ILL_DEFINED_ORDER); + List rv = si.query(new Envelope(r.getLeft(), r.getRight(), r.getTop(), r.getBottom())); return rv; } - private net.sf.jsi.Rectangle rectangleToSpatialIndexRectangle(Rectangle r) { - return new net.sf.jsi.Rectangle((float) r.getX(), - (float) r.getY(), - (float) (r.getX() + r.getWidth()), - (float) (r.getY() + r.getHeight())); - } - - /** * Minimum bounding box of all the Rectangles contained on this RectangleSpatialIndex * * @return a Rectangle */ public Rectangle getBounds() { - return bounds; + return Rectangle.boundingBoxOf(rectangles); } } diff --git a/src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv b/src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv index b5e1fd0b..513e26e7 100644 --- a/src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv +++ b/src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv @@ -1,31 +1,28 @@ -"",HARVEST,VARIATION,,, -"","11/12 -(a)",12/13,Percentage,Absolute, -"",,"May/2013 -(b)","Jun/2013 -(c)",(c/a),(c-a) -COTTON,"1.393,4","886,7","894,9","(35,8)","( 498,5)" -TOTAL PEANUT,"93,9","100,6","100,2","6,7","6,3" -PEANUT 1ST CROP,"82,1","86,3","86,2","5,0","4,1" -PEANUT 2ND CROP,"11,8","14,3","14,0","18,6","2,2" -RICE,"2.426,7","2.389,7","2.396,0","(1,3)","( 30,7)" -TOTAL BEANS,"3.262,1","2.952,7","3.026,9","(7,2)","( 235,2)" -BEANS 1ST CROP,"1.241,4","1.122,6","1.122,9","(9,5)","( 118,5)" -BEANS 2ND CROP,"1.394,6","1.275,4","1.271,7","(8,8)","( 122,9)" -BEANS 3RD CROP,"626,1","554,7","632,3","1,0","6,3" -SUNFLOWER,"74,5","60,4","68,9","(7,5)","( 5,6)" -CASTOR BEAN,"128,2","87,5","87,4","(31,8)","( 40,8)" -TOTAL CORN,"15.178,1","15.686,2","15.817,4","4,2","639,3" -CORN 1ST CROP,"7.558,5","6.879,2","6.864,7","(9,2)","( 693,8)" -CORN 2ND CROP,"7.619,6","8.807,0","8.952,7","17,5","1.333,1" -SOYBEAN,"25.042,2","27.715,2","27.715,5","10,7","2.673,3" -SORGHUM,"786,9","836,4","836,4","6,3","49,5" -SUBTOTAL,"48.386,0","50.715,4","50.943,6","5,3","2.557,7" -OAT,"153,0","168,7","168,7","10,3","15,7" -CANOLA,"42,4","43,8","43,8","3,3","1,4" -RYE,"2,3","2,3","2,3",-,- -BARLEY,"88,4","102,8","102,8","16,3","14,4" -WHEAT,"2.166,2","1.895,4","1.895,4","(12,5)","( 270,8)" -TRITICALE,"46,9","48,0","48,0","2,3","1,1" -SUBTOTAL,"2.499,2","2.261,0","2.261,0","(9,5)","( 238,2)" -BRAZIL,"50.885,2","5 2.976,4","5 3.204,6","4,6","2.319,5" \ No newline at end of file +"",HARVEST,VARIATION,,, +"","11/12 (a)",12/13,Percentage,Absolute, +"","May/2013 (b)","Jun/2013 (c)",(c/a),(c-a), +COTTON,"1.393,4","886,7","894,9","(35,8)","( 498,5)" +TOTAL PEANUT,"93,9","100,6","100,2","6,7","6,3" +PEANUT 1ST CROP,"82,1","86,3","86,2","5,0","4,1" +PEANUT 2ND CROP,"11,8","14,3","14,0","18,6","2,2" +RICE,"2.426,7","2.389,7","2.396,0","(1,3)","( 30,7)" +TOTAL BEANS,"3.262,1","2.952,7","3.026,9","(7,2)","( 235,2)" +BEANS 1ST CROP,"1.241,4","1.122,6","1.122,9","(9,5)","( 118,5)" +BEANS 2ND CROP,"1.394,6","1.275,4","1.271,7","(8,8)","( 122,9)" +BEANS 3RD CROP,"626,1","554,7","632,3","1,0","6,3" +SUNFLOWER,"74,5","60,4","68,9","(7,5)","( 5,6)" +CASTOR BEAN,"128,2","87,5","87,4","(31,8)","( 40,8)" +TOTAL CORN,"15.178,1","15.686,2","15.817,4","4,2","639,3" +CORN 1ST CROP,"7.558,5","6.879,2","6.864,7","(9,2)","( 693,8)" +CORN 2ND CROP,"7.619,6","8.807,0","8.952,7","17,5","1.333,1" +SOYBEAN,"25.042,2","27.715,2","27.715,5","10,7","2.673,3" +SORGHUM,"786,9","836,4","836,4","6,3","49,5" +SUBTOTAL,"48.386,0","50.715,4","50.943,6","5,3","2.557,7" +OAT,"153,0","168,7","168,7","10,3","15,7" +CANOLA,"42,4","43,8","43,8","3,3","1,4" +RYE,"2,3","2,3","2,3",-,- +BARLEY,"88,4","102,8","102,8","16,3","14,4" +WHEAT,"2.166,2","1.895,4","1.895,4","(12,5)","( 270,8)" +TRITICALE,"46,9","48,0","48,0","2,3","1,1" +SUBTOTAL,"2.499,2","2.261,0","2.261,0","(9,5)","( 238,2)" +BRAZIL,"50.885,2","5 2.976,4","5 3.204,6","4,6","2.319,5" From 2bc505e22dfa39f9a8f5e32f020c27d40716cf81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 14 May 2018 12:03:34 -0300 Subject: [PATCH 080/245] some housekeeping --- src/main/java/technology/tabula/Line.java | 2 +- .../tabula/ObjectExtractorStreamEngine.java | 28 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/technology/tabula/Line.java b/src/main/java/technology/tabula/Line.java index 2dc8ce86..31d10529 100644 --- a/src/main/java/technology/tabula/Line.java +++ b/src/main/java/technology/tabula/Line.java @@ -52,7 +52,7 @@ public void addTextChunk(TextChunk textChunk) { public String toString() { StringBuilder sb = new StringBuilder(); String s = super.toString(); - sb.append(s.substring(0, s.length() - 1)); + sb.append(s, 0, s.length() - 1); sb.append(",chunks="); for (TextChunk te: this.textChunks) { sb.append("'" + te.getText() + "', "); diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index 700d1fe7..ff58dfc6 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -34,8 +34,6 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { private GeneralPath currentPath = new GeneralPath(); public List clippingPaths; - private Matrix translateMatrix; - protected ObjectExtractorStreamEngine(PDPage page) { super(page); @@ -62,7 +60,7 @@ protected ObjectExtractorStreamEngine(PDPage page) { } @Override - public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) throws IOException { + public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) { currentPath.moveTo((float) p0.getX(), (float) p0.getY()); currentPath.lineTo((float) p1.getX(), (float) p1.getY()); currentPath.lineTo((float) p2.getX(), (float) p2.getY()); @@ -72,30 +70,30 @@ public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) thro } @Override - public void clip(int windingRule) throws IOException { + public void clip(int windingRule) { // the clipping path will not be updated until the succeeding painting // operator is called clipWindingRule = windingRule; } @Override - public void closePath() throws IOException { + public void closePath() { currentPath.closePath(); } @Override - public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) throws IOException { + public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) { currentPath.curveTo(x1, y1, x2, y2, x3, y3); } @Override - public void drawImage(PDImage arg0) throws IOException { + public void drawImage(PDImage arg0) { // TODO Auto-generated method stub } @Override - public void endPath() throws IOException { + public void endPath() { if (clipWindingRule != -1) { currentPath.setWindingRule(clipWindingRule); getGraphicsState().intersectClippingPath(currentPath); @@ -105,38 +103,38 @@ public void endPath() throws IOException { } @Override - public void fillAndStrokePath(int arg0) throws IOException { + public void fillAndStrokePath(int arg0) { strokeOrFillPath(true); } @Override - public void fillPath(int arg0) throws IOException { + public void fillPath(int arg0) { strokeOrFillPath(true); } @Override - public Point2D getCurrentPoint() throws IOException { + public Point2D getCurrentPoint() { return currentPath.getCurrentPoint(); } @Override - public void lineTo(float x, float y) throws IOException { + public void lineTo(float x, float y) { currentPath.lineTo(x, y); } @Override - public void moveTo(float x, float y) throws IOException { + public void moveTo(float x, float y) { currentPath.moveTo(x, y); } @Override - public void shadingFill(COSName arg0) throws IOException { + public void shadingFill(COSName arg0) { // TODO Auto-generated method stub } @Override - public void strokePath() throws IOException { + public void strokePath() { strokeOrFillPath(false); } From 489105bf657ddcd82588e61f7c5e0bef615f65bb Mon Sep 17 00:00:00 2001 From: Manuel Aristaran Date: Tue, 22 May 2018 12:32:09 -0500 Subject: [PATCH 081/245] prepare release 1.0.2 --- README.md | 4 ++-- pom.xml | 12 ++---------- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 369444b4..b230c5ac 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Download a version of the tabula-java's jar, with all dependencies included, tha `tabula-java` provides a command line application: ``` -$ java -jar target/tabula-1.0.1-jar-with-dependencies.jar --help +$ java -jar target/tabula-1.0.2-jar-with-dependencies.jar --help usage: tabula [-a ] [-b ] [-c ] [-d] [-f ] [-g] [-h] [-i] [-l] [-n] [-o ] [-p ] [-r] [-s ] [-t] [-u] [-v] @@ -69,7 +69,7 @@ Tabula helps you extract tables from PDFs -v,--version Print version and exit. ``` -It also includes a debugging tool, run `java -cp ./target/tabula-1.0.1-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. +It also includes a debugging tool, run `java -cp ./target/tabula-1.0.2-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. You can also integrate `tabula-java` with any JVM language. For Java examples, see the [`tests`](src/test/java/technology/tabula/) folder. diff --git a/pom.xml b/pom.xml index 7107ea53..27e77f04 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.2-SNAPSHOT + 1.0.2 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java @@ -36,17 +36,9 @@ scm:git:git@github.com:tabulapdf/tabula-java.git scm:git:git@github.com:tabulapdf/tabula-java.git git@github.com:tabulapdf/tabula-java.git - tabula-1.0.0-SNAPSHOT + v1.0.2 - - - sonatype - Sonatype repository - https://oss.sonatype.org/content/repositories/snapshots/ - - - UTF-8 UTF-8 diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index b7b9dfe9..61de9f12 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -33,7 +33,7 @@ public class CommandLineApp { private static String VERSION = "1.0.2"; - private static String VERSION_STRING = String.format("tabula %s (c) 2012-2017 Manuel Aristarán", VERSION); + private static String VERSION_STRING = String.format("tabula %s (c) 2012-2018 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; private static final int RELATIVE_AREA_CALCULATION_MODE = 0; From 4f0e9f0af1a4079ae59b923873b8e798bf6bbe14 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Fri, 15 Jun 2018 16:07:02 +1200 Subject: [PATCH 082/245] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b230c5ac..c5bb42f4 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ You can help by: ### Backers -You can also support our continued work on `tabula-java` with a one-time or monthly donation [on OpenCollective](https://opencollective.com/tabulapdf#support). Organizations who use `tabula-java` can also [sponsor the project](https://opencollective.com/tabulapdf#support) for acknolwedgement on [our official site](http://tabula.technology/) and this README. +You can also support our continued work on `tabula-java` with a one-time or monthly donation [on OpenCollective](https://opencollective.com/tabulapdf#support). Organizations who use `tabula-java` can also [sponsor the project](https://opencollective.com/tabulapdf#support) for acknowledgement on [our official site](http://tabula.technology/) and this README. Special thanks to the following users and organizations for generously supporting Tabula with donations and grants: From 709f2cba16cf8d9dd07cb4401577af0f0ac7da50 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Sun, 17 Jun 2018 19:43:20 +1200 Subject: [PATCH 083/245] Prevent file creation in sources directory --- src/test/java/technology/tabula/TestCommandLineApp.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index 81b30d4b..4c04dccf 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -12,10 +12,15 @@ import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.ParseException; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class TestCommandLineApp { + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + private String csvFromCommandLineArgs(String[] args) throws ParseException { CommandLineParser parser = new DefaultParser(); CommandLine cmd = parser.parse(CommandLineApp.buildOptions(), args); @@ -72,7 +77,7 @@ public void testExtractSpreadsheetWithAreaAndNewFile() throws ParseException, IO "src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", "-p", "1", "-a", "150.56,58.9,654.7,536.12", "-f", - "CSV", "-o", "outputFile" + "CSV", "-o", folder.newFile().getAbsolutePath() }); //assertEquals(expectedCsv,); } From 8d32d33008e0efd9cc38e361ecc92822a956a025 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Fri, 15 Jun 2018 01:08:41 +1200 Subject: [PATCH 084/245] Update dependencies --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 27e77f04..93ea5b63 100644 --- a/pom.xml +++ b/pom.xml @@ -243,19 +243,19 @@ org.bouncycastle bcprov-jdk15on - 1.56 + 1.59 org.bouncycastle bcmail-jdk15on - 1.56 + 1.59 junit junit - 4.11 + 4.12 test @@ -268,19 +268,19 @@ org.apache.commons commons-csv - 1.4 + 1.5 com.google.code.gson gson - 2.8.0 + 2.8.5 com.github.jai-imageio jai-imageio-core - 1.3.1 + 1.4.0 From c8eed5f9beaffb14ea1c85f1229897b63324f8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 24 Jun 2018 12:10:16 -0300 Subject: [PATCH 085/245] Add assertion to incomplete test (see #234) --- .../java/technology/tabula/TestCommandLineApp.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index 4c04dccf..3e4dafa7 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -2,11 +2,9 @@ import static org.junit.Assert.*; +import java.io.File; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; +import java.nio.file.*; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -73,13 +71,15 @@ public void testExtractSpreadsheetWithAreaAndNewFile() throws ParseException, IO String expectedCsv = UtilsForTesting.loadCsv("src/test/resources/technology/tabula/csv/spreadsheet_no_bounding_frame.csv"); + File newFile = folder.newFile(); this.csvFromCommandLineArgs(new String[]{ "src/test/resources/technology/tabula/spreadsheet_no_bounding_frame.pdf", "-p", "1", "-a", "150.56,58.9,654.7,536.12", "-f", - "CSV", "-o", folder.newFile().getAbsolutePath() + "CSV", "-o", newFile.getAbsolutePath() }); - //assertEquals(expectedCsv,); + + assertArrayEquals(expectedCsv.getBytes(), Files.readAllBytes(Paths.get(newFile.getAbsolutePath()))); } From 246dabb9fc7ff9e044c47b0ee21a2fa8a19058ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 4 Jul 2018 09:50:51 -0300 Subject: [PATCH 086/245] upgrade pdfbox dependencies --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 93ea5b63..24203397 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ org.apache.pdfbox pdfbox - 2.0.9 + 2.0.11 @@ -290,9 +290,9 @@ - com.levigo.jbig2 - levigo-jbig2-imageio - 2.0 + org.apache.pdfbox + jbig2-imageio + 3.0.1 From ae46324b1753818270dd2e64663ebd8b3e8a8b42 Mon Sep 17 00:00:00 2001 From: Eric Schoen Date: Tue, 3 Jul 2018 17:22:09 -0500 Subject: [PATCH 087/245] Make RectangleSpatialIndex public --- pom.xml | 2 +- src/main/java/technology/tabula/RectangleSpatialIndex.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 24203397..e9ea20a5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.2 + 1.0.3 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index 2c8533df..a39114a2 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -6,7 +6,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.index.strtree.STRtree; -class RectangleSpatialIndex { +public class RectangleSpatialIndex { private final STRtree si = new STRtree(); From fde2527605acf6fb7f9923e97a17644dfe2fb96c Mon Sep 17 00:00:00 2001 From: coder111 Date: Tue, 21 Aug 2018 21:42:40 +0100 Subject: [PATCH 088/245] Add relative coordinate support to column option --- .../technology/tabula/CommandLineApp.java | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 61de9f12..5e1c1cf0 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -265,7 +265,12 @@ private static TableExtractor createExtractor(CommandLine line) throws ParseExce extractor.setUseLineReturns(line.hasOption('u')); if (line.hasOption('c')) { - extractor.setVerticalRulingPositions(parseFloatList(line.getOptionValue('c'))); + String optionString = line.getOptionValue('c'); + if (optionString.startsWith("%")) { + extractor.setVerticalRulingPositionsRelative(true); + optionString = optionString.substring(1); + } + extractor.setVerticalRulingPositions(parseFloatList(optionString)); } return extractor; } @@ -329,7 +334,9 @@ public static Options buildOptions() { .build()); o.addOption(Option.builder("c") .longOpt("columns") - .desc("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3") + .desc("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3. " + + "If all values are between 0-100 (inclusive) and preceded by '%', input will be taken as % of actual width of the page. " + + "Example: --columns %25,50,80.6") .hasArg() .argName("COLUMNS") .build()); @@ -356,6 +363,7 @@ private static class TableExtractor { private boolean useLineReturns = false; private BasicExtractionAlgorithm basicExtractor = new BasicExtractionAlgorithm(); private SpreadsheetExtractionAlgorithm spreadsheetExtractor = new SpreadsheetExtractionAlgorithm(); + private boolean verticalRulingPositionsRelative = false; private List verticalRulingPositions = null; private ExtractionMethod method = ExtractionMethod.BASIC; @@ -365,6 +373,9 @@ public TableExtractor() { public void setVerticalRulingPositions(List positions) { this.verticalRulingPositions = positions; } + public void setVerticalRulingPositionsRelative(boolean relative) { + this.verticalRulingPositionsRelative = relative; + } public void setGuess(boolean guess) { this.guess = guess; @@ -411,7 +422,19 @@ public List
extractTablesBasic(Page page) { } if (verticalRulingPositions != null) { - return basicExtractor.extract(page, verticalRulingPositions); + List absoluteRulingPositions; + + if (this.verticalRulingPositionsRelative) { + // convert relative to absolute + absoluteRulingPositions = new ArrayList<>(verticalRulingPositions.size()); + for (float relative: this.verticalRulingPositions) { + float absolute = (float)(relative / 100.0 * page.getWidth()); + absoluteRulingPositions.add(absolute); + } + } else { + absoluteRulingPositions = this.verticalRulingPositions; + } + return basicExtractor.extract(page, absoluteRulingPositions); } return basicExtractor.extract(page); } From 1e9a6129f61ba7031f49fe06276a0cc69ff135ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 11 Sep 2018 12:29:58 -0300 Subject: [PATCH 089/245] Fix AppVeyor winows build - maven 3.5.4 --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d16a36ce..b2c4a0ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,14 +2,14 @@ version: '{build}' install: - ps: | Add-Type -AssemblyName System.IO.Compression.FileSystem - if (!(Test-Path -Path "C:\maven\apache-maven-3.5.2" )) { + if (!(Test-Path -Path "C:\maven\apache-maven-3.5.4" )) { (new-object System.Net.WebClient).DownloadFile( - 'http://www-us.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.zip', + 'http://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip', 'C:\maven-bin.zip' ) [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") } - - cmd: SET PATH=C:\maven\apache-maven-3.5.2\bin;%JAVA_HOME%\bin;%PATH% + - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-Xmx2g - cmd: SET JAVA_OPTS=-Xmx2g build_script: From 6fd5d32bd61fe98beb8ecfe6cc25ec08aad92783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 30 Oct 2018 10:56:36 -0300 Subject: [PATCH 090/245] Update pdfbox to 2.0.12 (CVE-2018-11797) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93ea5b63..21e9677b 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ org.apache.pdfbox pdfbox - 2.0.9 + 2.0.12 From 545db99cb432306d5a06c56bfe68c3a3d6380052 Mon Sep 17 00:00:00 2001 From: laigor Date: Fri, 7 Dec 2018 19:24:12 +0300 Subject: [PATCH 091/245] Add right and bottom of area to JSON output --- src/main/java/technology/tabula/json/TableSerializer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/technology/tabula/json/TableSerializer.java b/src/main/java/technology/tabula/json/TableSerializer.java index 87d091d0..ba04a7cf 100644 --- a/src/main/java/technology/tabula/json/TableSerializer.java +++ b/src/main/java/technology/tabula/json/TableSerializer.java @@ -30,6 +30,8 @@ public JsonElement serialize(Table src, Type typeOfSrc, JsonSerializationContext result.addProperty("left", src.getLeft()); result.addProperty("width", src.getWidth()); result.addProperty("height", src.getHeight()); + result.addProperty("right", src.getRight()); + result.addProperty("bottom", src.getBottom()); JsonArray data; result.add("data", data = new JsonArray()); From 883284cf8755eb88ff77749ea96e31f5b741fe64 Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Sun, 25 Nov 2018 16:12:47 -0500 Subject: [PATCH 092/245] -g method translates to ExtractionMethod.DECIDE --- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 61de9f12..0de4e4a5 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -252,7 +252,7 @@ private static ExtractionMethod whichExtractionMethod(CommandLine line) { } // -n/--no-spreadsheet [deprecated; use -t] or -c/--columns or -g/--guess or -t/--stream - if (line.hasOption('n') || line.hasOption('c') || line.hasOption('g') || line.hasOption('t')) { + if (line.hasOption('n') || line.hasOption('c') || line.hasOption('t')) { return ExtractionMethod.BASIC; } return ExtractionMethod.DECIDE; From c400625316e941610e47cdb5076434c7522323cc Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Sun, 25 Nov 2018 16:13:31 -0500 Subject: [PATCH 093/245] correct table coordiinates in guess mode --- .../technology/tabula/extractors/BasicExtractionAlgorithm.java | 3 ++- .../tabula/json/argentina_diputados_voting_record.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index afaeb5c7..dcd01695 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -64,7 +64,8 @@ public int compare(Ruling arg0, Ruling arg1) { } Table table = new Table(this); - + table.setRect(page.getLeft(), page.getTop(), page.getWidth(), page.getHeight()); + for (int i = 0; i < lines.size(); i++) { Line line = lines.get(i); List elements = line.getTextElements(); diff --git a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json index 3a2eced9..cc7b1735 100644 --- a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json +++ b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json @@ -1 +1 @@ -{"extraction_method":"stream","top":0.0,"left":0.0,"width":549.0399780273438,"height":782.0400390625,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} \ No newline at end of file +{"extraction_method":"stream","top":269.875,"left":12.75,"width":548.25,"height":520.625,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} \ No newline at end of file From 209eea214e0a48f238a8d17b95d0d6e310c1233e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 11 Dec 2018 09:46:21 -0300 Subject: [PATCH 094/245] Update JSON test fixtures to include `right` and `bottom` keys (#265) --- .../tabula/json/argentina_diputados_voting_record.json | 2 +- src/test/resources/technology/tabula/json/schools.json | 3 +-- src/test/resources/technology/tabula/json/spanning_cells.json | 2 +- .../resources/technology/tabula/json/spanning_cells_basic.json | 2 +- src/test/resources/technology/tabula/json/twotables.json | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json index 3a2eced9..fb4400f8 100644 --- a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json +++ b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json @@ -1 +1 @@ -{"extraction_method":"stream","top":0.0,"left":0.0,"width":549.0399780273438,"height":782.0400390625,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} \ No newline at end of file +{"extraction_method":"stream","top":0.0,"left":0.0,"width":549.0399780273438,"height":782.0400390625,"right":549.04,"bottom":782.04004,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} diff --git a/src/test/resources/technology/tabula/json/schools.json b/src/test/resources/technology/tabula/json/schools.json index 1c9ed032..57544ff0 100644 --- a/src/test/resources/technology/tabula/json/schools.json +++ b/src/test/resources/technology/tabula/json/schools.json @@ -1,2 +1 @@ - -{"extraction_method":"lattice","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91128540039062,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.50002,"width":69.71998596191406,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91128540039062,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.50002,"width":69.71998596191406,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91128540039062,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.50002,"width":69.71998596191406,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91128540039062,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.50002,"width":69.71998596191406,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91128540039062,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.50002,"width":69.71998596191406,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91128540039062,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.50002,"width":69.71998596191406,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91128540039062,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.50002,"width":69.71998596191406,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cohen"},{"top":397.86,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":408.63998,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":408.63998,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Commers"},{"top":408.63998,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Beth"},{"top":408.63998,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2294 Commonwealth Ave"},{"top":408.63998,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St Paul"},{"top":408.63998,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":408.63998,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":408.63998,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":"Self Employed"},{"top":408.63998,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":"Homemaker"},{"top":408.63998,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"8/1/2012"},{"top":408.63998,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91128540039062,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.50002,"width":69.71998596191406,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91128540039062,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.50002,"width":69.71998596191406,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence‐teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91128540039062,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.50002,"width":69.71998596191406,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91128540039062,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.50002,"width":69.71998596191406,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} \ No newline at end of file +{"extraction_method":"lattice","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"right":762.30035,"bottom":538.26,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91128540039062,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.50002,"width":69.71998596191406,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91128540039062,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.50002,"width":69.71998596191406,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91128540039062,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.50002,"width":69.71998596191406,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91128540039062,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.50002,"width":69.71998596191406,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91128540039062,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.50002,"width":69.71998596191406,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91128540039062,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.50002,"width":69.71998596191406,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91128540039062,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.50002,"width":69.71998596191406,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cohen"},{"top":397.86,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":408.63998,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":408.63998,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Commers"},{"top":408.63998,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Beth"},{"top":408.63998,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2294 Commonwealth Ave"},{"top":408.63998,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St Paul"},{"top":408.63998,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":408.63998,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":408.63998,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":"Self Employed"},{"top":408.63998,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":"Homemaker"},{"top":408.63998,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"8/1/2012"},{"top":408.63998,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91128540039062,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.50002,"width":69.71998596191406,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91128540039062,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.50002,"width":69.71998596191406,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence‐teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91128540039062,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.50002,"width":69.71998596191406,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91128540039062,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.50002,"width":69.71998596191406,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} diff --git a/src/test/resources/technology/tabula/json/spanning_cells.json b/src/test/resources/technology/tabula/json/spanning_cells.json index 97f3d147..89bb9707 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells.json +++ b/src/test/resources/technology/tabula/json/spanning_cells.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938491821289062,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.78943,"width":121.92680358886719,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663360595703125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37115,"width":46.73052978515625,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.78943,"width":121.92680358886719,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663360595703125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37115,"width":46.73052978515625,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.78943,"width":121.92680358886719,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663360595703125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37115,"width":46.73052978515625,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785018920898438,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785018920898438,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785018920898438,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785018920898438,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785018920898438,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785018920898438,"text":"1,693"}],[{"top":236.53287,"left":119.78943,"width":355.312255859375,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.78943,"width":121.92680358886719,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663360595703125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37115,"width":46.73052978515625,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66316223144531,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.41415,"width":46.663726806640625,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"right":475.10168,"bottom":417.07092,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938491821289062,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.78943,"width":121.92680358886719,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663360595703125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37115,"width":46.73052978515625,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.78943,"width":121.92680358886719,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663360595703125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37115,"width":46.73052978515625,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.78943,"width":121.92680358886719,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663360595703125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37115,"width":46.73052978515625,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785018920898438,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785018920898438,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785018920898438,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785018920898438,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785018920898438,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785018920898438,"text":"1,693"}],[{"top":236.53287,"left":119.78943,"width":355.312255859375,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.78943,"width":121.92680358886719,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663360595703125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37115,"width":46.73052978515625,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"right":464.1174,"bottom":589.7847,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66316223144531,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.41415,"width":46.663726806640625,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] diff --git a/src/test/resources/technology/tabula/json/spanning_cells_basic.json b/src/test/resources/technology/tabula/json/spanning_cells_basic.json index da8c71e0..d0164280 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells_basic.json +++ b/src/test/resources/technology/tabula/json/spanning_cells_basic.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897811889648438,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.789444,"width":121.92678833007812,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663330078125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37112,"width":46.73773193359375,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.789444,"width":121.92678833007812,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663330078125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37112,"width":46.73773193359375,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.789444,"width":121.92678833007812,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663330078125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37112,"width":46.73773193359375,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785003662109375,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785003662109375,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785003662109375,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785003662109375,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785003662109375,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785003662109375,"text":"1,693"}],[{"top":236.53285,"left":119.789444,"width":355.31939697265625,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.789444,"width":121.92678833007812,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663330078125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37112,"width":46.73773193359375,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66316223144531,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.41415,"width":46.663726806640625,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"right":475.10883,"bottom":417.07086,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897811889648438,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.789444,"width":121.92678833007812,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663330078125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37112,"width":46.73773193359375,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.789444,"width":121.92678833007812,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663330078125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37112,"width":46.73773193359375,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.789444,"width":121.92678833007812,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663330078125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37112,"width":46.73773193359375,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785003662109375,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785003662109375,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785003662109375,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785003662109375,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785003662109375,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785003662109375,"text":"1,693"}],[{"top":236.53285,"left":119.789444,"width":355.31939697265625,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.789444,"width":121.92678833007812,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663330078125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37112,"width":46.73773193359375,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"right":464.1174,"bottom":589.802,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66316223144531,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.41415,"width":46.663726806640625,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] diff --git a/src/test/resources/technology/tabula/json/twotables.json b/src/test/resources/technology/tabula/json/twotables.json index 5c70c52e..f6bd4f36 100644 --- a/src/test/resources/technology/tabula/json/twotables.json +++ b/src/test/resources/technology/tabula/json/twotables.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":111.79087,"left":67.41156,"width":342.44476318359375,"height":174.0704345703125,"data":[[{"top":111.79087,"left":67.41156,"width":85.61141967773438,"height":28.536293029785156,"text":""},{"top":111.79087,"left":153.02298,"width":256.8333435058594,"height":14.267105102539062,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":126.057976,"left":153.02298,"width":51.367401123046875,"height":14.269187927246094,"text":"資本金"},{"top":126.057976,"left":204.39038,"width":51.36669921875,"height":14.269187927246094,"text":"資本剰余金"},{"top":126.057976,"left":255.75708,"width":51.3656005859375,"height":14.269187927246094,"text":"利益剰余金"},{"top":126.057976,"left":307.12268,"width":51.366668701171875,"height":14.269187927246094,"text":"自己株式"},{"top":126.057976,"left":358.48935,"width":51.366973876953125,"height":14.269187927246094,"text":"株主資本合計"}],[{"top":140.32716,"left":67.41156,"width":85.61141967773438,"height":14.265777587890625,"text":"当期首残高"},{"top":140.32716,"left":153.02298,"width":51.367401123046875,"height":14.265777587890625,"text":"5,664"},{"top":140.32716,"left":204.39038,"width":51.36669921875,"height":14.265777587890625,"text":"749"},{"top":140.32716,"left":255.75708,"width":51.3656005859375,"height":14.265777587890625,"text":"12,017"},{"top":140.32716,"left":307.12268,"width":51.366668701171875,"height":14.265777587890625,"text":"△747"},{"top":140.32716,"left":358.48935,"width":51.366973876953125,"height":14.265777587890625,"text":"17,683"}],[{"top":154.59294,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期変動額"},{"top":154.59294,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":""},{"top":154.59294,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":""}],[{"top":168.86205,"left":67.41156,"width":85.61141967773438,"height":14.268997192382812,"text":"剰余金の配当"},{"top":168.86205,"left":153.02298,"width":51.367401123046875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":204.39038,"width":51.36669921875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":255.75708,"width":51.3656005859375,"height":14.268997192382812,"text":"△525"},{"top":168.86205,"left":307.12268,"width":51.366668701171875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":358.48935,"width":51.366973876953125,"height":14.268997192382812,"text":"△525"}],[{"top":183.13104,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期純利益"},{"top":183.13104,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":"1,269"},{"top":183.13104,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":"1,269"}],[{"top":197.4002,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"自己株式の取得"},{"top":197.4002,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":""},{"top":197.4002,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":"△0"},{"top":197.4002,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△0"}],[{"top":211.66914,"left":67.41156,"width":85.61141967773438,"height":22.82952880859375,"text":"持分法の適用範囲\rの変動"},{"top":211.66914,"left":153.02298,"width":51.367401123046875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":204.39038,"width":51.36669921875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":255.75708,"width":51.3656005859375,"height":22.82952880859375,"text":"85"},{"top":211.66914,"left":307.12268,"width":51.366668701171875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":358.48935,"width":51.366973876953125,"height":22.82952880859375,"text":"85"}],[{"top":234.49867,"left":67.41156,"width":85.61141967773438,"height":22.829910278320312,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":234.49867,"left":153.02298,"width":51.367401123046875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":204.39038,"width":51.36669921875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":255.75708,"width":51.3656005859375,"height":22.829910278320312,"text":""},{"top":234.49867,"left":307.12268,"width":51.366668701171875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":358.48935,"width":51.366973876953125,"height":22.829910278320312,"text":""}],[{"top":257.32858,"left":67.41156,"width":85.61141967773438,"height":14.2686767578125,"text":"当期変動額合計"},{"top":257.32858,"left":153.02298,"width":51.367401123046875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":204.39038,"width":51.36669921875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":255.75708,"width":51.3656005859375,"height":14.2686767578125,"text":"829"},{"top":257.32858,"left":307.12268,"width":51.366668701171875,"height":14.2686767578125,"text":"△0"},{"top":257.32858,"left":358.48935,"width":51.366973876953125,"height":14.2686767578125,"text":"829"}],[{"top":271.59726,"left":67.41156,"width":85.61141967773438,"height":14.2640380859375,"text":"当期末残高"},{"top":271.59726,"left":153.02298,"width":51.367401123046875,"height":14.2640380859375,"text":"5,664"},{"top":271.59726,"left":204.39038,"width":51.36669921875,"height":14.2640380859375,"text":"749"},{"top":271.59726,"left":255.75708,"width":51.3656005859375,"height":14.2640380859375,"text":"12,846"},{"top":271.59726,"left":307.12268,"width":51.366668701171875,"height":14.2640380859375,"text":"△747"},{"top":271.59726,"left":358.48935,"width":51.366973876953125,"height":14.2640380859375,"text":"18,512"}]]},{"extraction_method":"lattice","top":312.25272,"left":67.41156,"width":445.17803955078125,"height":191.19696044921875,"data":[[{"top":312.25272,"left":67.41156,"width":85.61141967773438,"height":45.658233642578125,"text":""},{"top":312.25272,"left":153.02298,"width":256.8333435058594,"height":14.267730712890625,"text":"その他の包括利益累計額"},{"top":312.25272,"left":409.85632,"width":51.365631103515625,"height":45.658233642578125,"text":"少数株主持分"},{"top":312.25272,"left":461.22195,"width":51.367645263671875,"height":45.658233642578125,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":326.52045,"left":153.02298,"width":51.367401123046875,"height":31.3905029296875,"text":"その他有価証券\r評価差額金"},{"top":326.52045,"left":204.39038,"width":51.36669921875,"height":31.3905029296875,"text":"繰延ヘッジ\r損益"},{"top":326.52045,"left":255.75708,"width":51.3656005859375,"height":31.3905029296875,"text":"為替換算\r調整勘定"},{"top":326.52045,"left":307.12268,"width":51.366668701171875,"height":31.3905029296875,"text":"退職給付に係る\r調整累計額"},{"top":326.52045,"left":358.48935,"width":51.366973876953125,"height":31.3905029296875,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.91095,"left":67.41156,"width":85.61141967773438,"height":14.268768310546875,"text":"当期首残高"},{"top":357.91095,"left":153.02298,"width":51.367401123046875,"height":14.268768310546875,"text":"△669"},{"top":357.91095,"left":204.39038,"width":51.36669921875,"height":14.268768310546875,"text":"61"},{"top":357.91095,"left":255.75708,"width":51.3656005859375,"height":14.268768310546875,"text":"△109"},{"top":357.91095,"left":307.12268,"width":51.366668701171875,"height":14.268768310546875,"text":"―"},{"top":357.91095,"left":358.48935,"width":51.366973876953125,"height":14.268768310546875,"text":"△717"},{"top":357.91095,"left":409.85632,"width":51.365631103515625,"height":14.268768310546875,"text":"246"},{"top":357.91095,"left":461.22195,"width":51.367645263671875,"height":14.268768310546875,"text":"17,212"}],[{"top":372.17972,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期変動額"},{"top":372.17972,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":""},{"top":372.17972,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":""},{"top":372.17972,"left":409.85632,"width":51.365631103515625,"height":14.2691650390625,"text":""},{"top":372.17972,"left":461.22195,"width":51.367645263671875,"height":14.2691650390625,"text":""}],[{"top":386.44888,"left":67.41156,"width":85.61141967773438,"height":14.268646240234375,"text":"剰余金の配当"},{"top":386.44888,"left":153.02298,"width":51.367401123046875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":204.39038,"width":51.36669921875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":255.75708,"width":51.3656005859375,"height":14.268646240234375,"text":""},{"top":386.44888,"left":307.12268,"width":51.366668701171875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":358.48935,"width":51.366973876953125,"height":14.268646240234375,"text":""},{"top":386.44888,"left":409.85632,"width":51.365631103515625,"height":14.268646240234375,"text":""},{"top":386.44888,"left":461.22195,"width":51.367645263671875,"height":14.268646240234375,"text":"△525"}],[{"top":400.71753,"left":67.41156,"width":85.61141967773438,"height":14.26812744140625,"text":"当期純利益"},{"top":400.71753,"left":153.02298,"width":51.367401123046875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":204.39038,"width":51.36669921875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":255.75708,"width":51.3656005859375,"height":14.26812744140625,"text":""},{"top":400.71753,"left":307.12268,"width":51.366668701171875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":358.48935,"width":51.366973876953125,"height":14.26812744140625,"text":""},{"top":400.71753,"left":409.85632,"width":51.365631103515625,"height":14.26812744140625,"text":""},{"top":400.71753,"left":461.22195,"width":51.367645263671875,"height":14.26812744140625,"text":"1,269"}],[{"top":414.98566,"left":67.41156,"width":85.61141967773438,"height":14.26678466796875,"text":"自己株式の取得"},{"top":414.98566,"left":153.02298,"width":51.367401123046875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":204.39038,"width":51.36669921875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":255.75708,"width":51.3656005859375,"height":14.26678466796875,"text":""},{"top":414.98566,"left":307.12268,"width":51.366668701171875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":358.48935,"width":51.366973876953125,"height":14.26678466796875,"text":""},{"top":414.98566,"left":409.85632,"width":51.365631103515625,"height":14.26678466796875,"text":""},{"top":414.98566,"left":461.22195,"width":51.367645263671875,"height":14.26678466796875,"text":"△0"}],[{"top":429.25244,"left":67.41156,"width":85.61141967773438,"height":22.8292236328125,"text":"持分法の適用範囲\rの変動"},{"top":429.25244,"left":153.02298,"width":51.367401123046875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":204.39038,"width":51.36669921875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":255.75708,"width":51.3656005859375,"height":22.8292236328125,"text":""},{"top":429.25244,"left":307.12268,"width":51.366668701171875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":358.48935,"width":51.366973876953125,"height":22.8292236328125,"text":""},{"top":429.25244,"left":409.85632,"width":51.365631103515625,"height":22.8292236328125,"text":""},{"top":429.25244,"left":461.22195,"width":51.367645263671875,"height":22.8292236328125,"text":"85"}],[{"top":452.08167,"left":67.41156,"width":85.61141967773438,"height":22.830596923828125,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":452.08167,"left":153.02298,"width":51.367401123046875,"height":22.830596923828125,"text":"556"},{"top":452.08167,"left":204.39038,"width":51.36669921875,"height":22.830596923828125,"text":"80"},{"top":452.08167,"left":255.75708,"width":51.3656005859375,"height":22.830596923828125,"text":"5"},{"top":452.08167,"left":307.12268,"width":51.366668701171875,"height":22.830596923828125,"text":"―"},{"top":452.08167,"left":358.48935,"width":51.366973876953125,"height":22.830596923828125,"text":"642"},{"top":452.08167,"left":409.85632,"width":51.365631103515625,"height":22.830596923828125,"text":"△0"},{"top":452.08167,"left":461.22195,"width":51.367645263671875,"height":22.830596923828125,"text":"642"}],[{"top":474.91226,"left":67.41156,"width":85.61141967773438,"height":14.26776123046875,"text":"当期変動額合計"},{"top":474.91226,"left":153.02298,"width":51.367401123046875,"height":14.26776123046875,"text":"556"},{"top":474.91226,"left":204.39038,"width":51.36669921875,"height":14.26776123046875,"text":"80"},{"top":474.91226,"left":255.75708,"width":51.3656005859375,"height":14.26776123046875,"text":"5"},{"top":474.91226,"left":307.12268,"width":51.366668701171875,"height":14.26776123046875,"text":"―"},{"top":474.91226,"left":358.48935,"width":51.366973876953125,"height":14.26776123046875,"text":"642"},{"top":474.91226,"left":409.85632,"width":51.365631103515625,"height":14.26776123046875,"text":"△0"},{"top":474.91226,"left":461.22195,"width":51.367645263671875,"height":14.26776123046875,"text":"1,471"}],[{"top":489.18002,"left":67.41156,"width":85.61141967773438,"height":14.2696533203125,"text":"当期末残高"},{"top":489.18002,"left":153.02298,"width":51.367401123046875,"height":14.2696533203125,"text":"△113"},{"top":489.18002,"left":204.39038,"width":51.36669921875,"height":14.2696533203125,"text":"142"},{"top":489.18002,"left":255.75708,"width":51.3656005859375,"height":14.2696533203125,"text":"△104"},{"top":489.18002,"left":307.12268,"width":51.366668701171875,"height":14.2696533203125,"text":"―"},{"top":489.18002,"left":358.48935,"width":51.366973876953125,"height":14.2696533203125,"text":"△75"},{"top":489.18002,"left":409.85632,"width":51.365631103515625,"height":14.2696533203125,"text":"245"},{"top":489.18002,"left":461.22195,"width":51.367645263671875,"height":14.2696533203125,"text":"18,683"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":111.79087,"left":67.41156,"width":342.44476318359375,"height":174.0704345703125,"right":409.85632,"bottom":285.8613,"data":[[{"top":111.79087,"left":67.41156,"width":85.61141967773438,"height":28.536293029785156,"text":""},{"top":111.79087,"left":153.02298,"width":256.8333435058594,"height":14.267105102539062,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":126.057976,"left":153.02298,"width":51.367401123046875,"height":14.269187927246094,"text":"資本金"},{"top":126.057976,"left":204.39038,"width":51.36669921875,"height":14.269187927246094,"text":"資本剰余金"},{"top":126.057976,"left":255.75708,"width":51.3656005859375,"height":14.269187927246094,"text":"利益剰余金"},{"top":126.057976,"left":307.12268,"width":51.366668701171875,"height":14.269187927246094,"text":"自己株式"},{"top":126.057976,"left":358.48935,"width":51.366973876953125,"height":14.269187927246094,"text":"株主資本合計"}],[{"top":140.32716,"left":67.41156,"width":85.61141967773438,"height":14.265777587890625,"text":"当期首残高"},{"top":140.32716,"left":153.02298,"width":51.367401123046875,"height":14.265777587890625,"text":"5,664"},{"top":140.32716,"left":204.39038,"width":51.36669921875,"height":14.265777587890625,"text":"749"},{"top":140.32716,"left":255.75708,"width":51.3656005859375,"height":14.265777587890625,"text":"12,017"},{"top":140.32716,"left":307.12268,"width":51.366668701171875,"height":14.265777587890625,"text":"△747"},{"top":140.32716,"left":358.48935,"width":51.366973876953125,"height":14.265777587890625,"text":"17,683"}],[{"top":154.59294,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期変動額"},{"top":154.59294,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":""},{"top":154.59294,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":""}],[{"top":168.86205,"left":67.41156,"width":85.61141967773438,"height":14.268997192382812,"text":"剰余金の配当"},{"top":168.86205,"left":153.02298,"width":51.367401123046875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":204.39038,"width":51.36669921875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":255.75708,"width":51.3656005859375,"height":14.268997192382812,"text":"△525"},{"top":168.86205,"left":307.12268,"width":51.366668701171875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":358.48935,"width":51.366973876953125,"height":14.268997192382812,"text":"△525"}],[{"top":183.13104,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期純利益"},{"top":183.13104,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":"1,269"},{"top":183.13104,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":"1,269"}],[{"top":197.4002,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"自己株式の取得"},{"top":197.4002,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":""},{"top":197.4002,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":"△0"},{"top":197.4002,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△0"}],[{"top":211.66914,"left":67.41156,"width":85.61141967773438,"height":22.82952880859375,"text":"持分法の適用範囲\rの変動"},{"top":211.66914,"left":153.02298,"width":51.367401123046875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":204.39038,"width":51.36669921875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":255.75708,"width":51.3656005859375,"height":22.82952880859375,"text":"85"},{"top":211.66914,"left":307.12268,"width":51.366668701171875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":358.48935,"width":51.366973876953125,"height":22.82952880859375,"text":"85"}],[{"top":234.49867,"left":67.41156,"width":85.61141967773438,"height":22.829910278320312,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":234.49867,"left":153.02298,"width":51.367401123046875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":204.39038,"width":51.36669921875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":255.75708,"width":51.3656005859375,"height":22.829910278320312,"text":""},{"top":234.49867,"left":307.12268,"width":51.366668701171875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":358.48935,"width":51.366973876953125,"height":22.829910278320312,"text":""}],[{"top":257.32858,"left":67.41156,"width":85.61141967773438,"height":14.2686767578125,"text":"当期変動額合計"},{"top":257.32858,"left":153.02298,"width":51.367401123046875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":204.39038,"width":51.36669921875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":255.75708,"width":51.3656005859375,"height":14.2686767578125,"text":"829"},{"top":257.32858,"left":307.12268,"width":51.366668701171875,"height":14.2686767578125,"text":"△0"},{"top":257.32858,"left":358.48935,"width":51.366973876953125,"height":14.2686767578125,"text":"829"}],[{"top":271.59726,"left":67.41156,"width":85.61141967773438,"height":14.2640380859375,"text":"当期末残高"},{"top":271.59726,"left":153.02298,"width":51.367401123046875,"height":14.2640380859375,"text":"5,664"},{"top":271.59726,"left":204.39038,"width":51.36669921875,"height":14.2640380859375,"text":"749"},{"top":271.59726,"left":255.75708,"width":51.3656005859375,"height":14.2640380859375,"text":"12,846"},{"top":271.59726,"left":307.12268,"width":51.366668701171875,"height":14.2640380859375,"text":"△747"},{"top":271.59726,"left":358.48935,"width":51.366973876953125,"height":14.2640380859375,"text":"18,512"}]]},{"extraction_method":"lattice","top":312.25272,"left":67.41156,"width":445.17803955078125,"height":191.19696044921875,"right":512.5896,"bottom":503.44968,"data":[[{"top":312.25272,"left":67.41156,"width":85.61141967773438,"height":45.658233642578125,"text":""},{"top":312.25272,"left":153.02298,"width":256.8333435058594,"height":14.267730712890625,"text":"その他の包括利益累計額"},{"top":312.25272,"left":409.85632,"width":51.365631103515625,"height":45.658233642578125,"text":"少数株主持分"},{"top":312.25272,"left":461.22195,"width":51.367645263671875,"height":45.658233642578125,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":326.52045,"left":153.02298,"width":51.367401123046875,"height":31.3905029296875,"text":"その他有価証券\r評価差額金"},{"top":326.52045,"left":204.39038,"width":51.36669921875,"height":31.3905029296875,"text":"繰延ヘッジ\r損益"},{"top":326.52045,"left":255.75708,"width":51.3656005859375,"height":31.3905029296875,"text":"為替換算\r調整勘定"},{"top":326.52045,"left":307.12268,"width":51.366668701171875,"height":31.3905029296875,"text":"退職給付に係る\r調整累計額"},{"top":326.52045,"left":358.48935,"width":51.366973876953125,"height":31.3905029296875,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.91095,"left":67.41156,"width":85.61141967773438,"height":14.268768310546875,"text":"当期首残高"},{"top":357.91095,"left":153.02298,"width":51.367401123046875,"height":14.268768310546875,"text":"△669"},{"top":357.91095,"left":204.39038,"width":51.36669921875,"height":14.268768310546875,"text":"61"},{"top":357.91095,"left":255.75708,"width":51.3656005859375,"height":14.268768310546875,"text":"△109"},{"top":357.91095,"left":307.12268,"width":51.366668701171875,"height":14.268768310546875,"text":"―"},{"top":357.91095,"left":358.48935,"width":51.366973876953125,"height":14.268768310546875,"text":"△717"},{"top":357.91095,"left":409.85632,"width":51.365631103515625,"height":14.268768310546875,"text":"246"},{"top":357.91095,"left":461.22195,"width":51.367645263671875,"height":14.268768310546875,"text":"17,212"}],[{"top":372.17972,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期変動額"},{"top":372.17972,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":""},{"top":372.17972,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":""},{"top":372.17972,"left":409.85632,"width":51.365631103515625,"height":14.2691650390625,"text":""},{"top":372.17972,"left":461.22195,"width":51.367645263671875,"height":14.2691650390625,"text":""}],[{"top":386.44888,"left":67.41156,"width":85.61141967773438,"height":14.268646240234375,"text":"剰余金の配当"},{"top":386.44888,"left":153.02298,"width":51.367401123046875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":204.39038,"width":51.36669921875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":255.75708,"width":51.3656005859375,"height":14.268646240234375,"text":""},{"top":386.44888,"left":307.12268,"width":51.366668701171875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":358.48935,"width":51.366973876953125,"height":14.268646240234375,"text":""},{"top":386.44888,"left":409.85632,"width":51.365631103515625,"height":14.268646240234375,"text":""},{"top":386.44888,"left":461.22195,"width":51.367645263671875,"height":14.268646240234375,"text":"△525"}],[{"top":400.71753,"left":67.41156,"width":85.61141967773438,"height":14.26812744140625,"text":"当期純利益"},{"top":400.71753,"left":153.02298,"width":51.367401123046875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":204.39038,"width":51.36669921875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":255.75708,"width":51.3656005859375,"height":14.26812744140625,"text":""},{"top":400.71753,"left":307.12268,"width":51.366668701171875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":358.48935,"width":51.366973876953125,"height":14.26812744140625,"text":""},{"top":400.71753,"left":409.85632,"width":51.365631103515625,"height":14.26812744140625,"text":""},{"top":400.71753,"left":461.22195,"width":51.367645263671875,"height":14.26812744140625,"text":"1,269"}],[{"top":414.98566,"left":67.41156,"width":85.61141967773438,"height":14.26678466796875,"text":"自己株式の取得"},{"top":414.98566,"left":153.02298,"width":51.367401123046875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":204.39038,"width":51.36669921875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":255.75708,"width":51.3656005859375,"height":14.26678466796875,"text":""},{"top":414.98566,"left":307.12268,"width":51.366668701171875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":358.48935,"width":51.366973876953125,"height":14.26678466796875,"text":""},{"top":414.98566,"left":409.85632,"width":51.365631103515625,"height":14.26678466796875,"text":""},{"top":414.98566,"left":461.22195,"width":51.367645263671875,"height":14.26678466796875,"text":"△0"}],[{"top":429.25244,"left":67.41156,"width":85.61141967773438,"height":22.8292236328125,"text":"持分法の適用範囲\rの変動"},{"top":429.25244,"left":153.02298,"width":51.367401123046875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":204.39038,"width":51.36669921875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":255.75708,"width":51.3656005859375,"height":22.8292236328125,"text":""},{"top":429.25244,"left":307.12268,"width":51.366668701171875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":358.48935,"width":51.366973876953125,"height":22.8292236328125,"text":""},{"top":429.25244,"left":409.85632,"width":51.365631103515625,"height":22.8292236328125,"text":""},{"top":429.25244,"left":461.22195,"width":51.367645263671875,"height":22.8292236328125,"text":"85"}],[{"top":452.08167,"left":67.41156,"width":85.61141967773438,"height":22.830596923828125,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":452.08167,"left":153.02298,"width":51.367401123046875,"height":22.830596923828125,"text":"556"},{"top":452.08167,"left":204.39038,"width":51.36669921875,"height":22.830596923828125,"text":"80"},{"top":452.08167,"left":255.75708,"width":51.3656005859375,"height":22.830596923828125,"text":"5"},{"top":452.08167,"left":307.12268,"width":51.366668701171875,"height":22.830596923828125,"text":"―"},{"top":452.08167,"left":358.48935,"width":51.366973876953125,"height":22.830596923828125,"text":"642"},{"top":452.08167,"left":409.85632,"width":51.365631103515625,"height":22.830596923828125,"text":"△0"},{"top":452.08167,"left":461.22195,"width":51.367645263671875,"height":22.830596923828125,"text":"642"}],[{"top":474.91226,"left":67.41156,"width":85.61141967773438,"height":14.26776123046875,"text":"当期変動額合計"},{"top":474.91226,"left":153.02298,"width":51.367401123046875,"height":14.26776123046875,"text":"556"},{"top":474.91226,"left":204.39038,"width":51.36669921875,"height":14.26776123046875,"text":"80"},{"top":474.91226,"left":255.75708,"width":51.3656005859375,"height":14.26776123046875,"text":"5"},{"top":474.91226,"left":307.12268,"width":51.366668701171875,"height":14.26776123046875,"text":"―"},{"top":474.91226,"left":358.48935,"width":51.366973876953125,"height":14.26776123046875,"text":"642"},{"top":474.91226,"left":409.85632,"width":51.365631103515625,"height":14.26776123046875,"text":"△0"},{"top":474.91226,"left":461.22195,"width":51.367645263671875,"height":14.26776123046875,"text":"1,471"}],[{"top":489.18002,"left":67.41156,"width":85.61141967773438,"height":14.2696533203125,"text":"当期末残高"},{"top":489.18002,"left":153.02298,"width":51.367401123046875,"height":14.2696533203125,"text":"△113"},{"top":489.18002,"left":204.39038,"width":51.36669921875,"height":14.2696533203125,"text":"142"},{"top":489.18002,"left":255.75708,"width":51.3656005859375,"height":14.2696533203125,"text":"△104"},{"top":489.18002,"left":307.12268,"width":51.366668701171875,"height":14.2696533203125,"text":"―"},{"top":489.18002,"left":358.48935,"width":51.366973876953125,"height":14.2696533203125,"text":"△75"},{"top":489.18002,"left":409.85632,"width":51.365631103515625,"height":14.2696533203125,"text":"245"},{"top":489.18002,"left":461.22195,"width":51.367645263671875,"height":14.2696533203125,"text":"18,683"}]]}] From a86b72aa81c0bcb4b8b4402dc94ca1211f152930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 11 Dec 2018 10:03:32 -0300 Subject: [PATCH 095/245] fix test --- .../tabula/json/argentina_diputados_voting_record.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json index f8846c62..6b60f8a7 100644 --- a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json +++ b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json @@ -1,2 +1 @@ -{"extraction_method":"stream","top":0.0,"left":0.0,"width":549.0399780273438,"height":782.0400390625,"right":549.04,"bottom":782.04004,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} - +{"extraction_method":"stream","top":269.875,"left":12.75,"width":548.25,"height":520.625,"right":561.0,"bottom":790.5,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} From 7eda6d793aa696f7e509ffb07677f2bd3fa4cdda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 4 Jun 2019 12:21:57 -0300 Subject: [PATCH 096/245] Remove Gitter badge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …we're not really checking that channel anymore. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5bb42f4..a13ea913 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) [![Build status](https://ci.appveyor.com/api/projects/status/l5gym1mjhrd2v8yn?svg=true)](https://ci.appveyor.com/project/jazzido/tabula-java) [![Join the chat at https://gitter.im/tabulapdf/tabula-java](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tabulapdf/tabula-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) [![Build status](https://ci.appveyor.com/api/projects/status/l5gym1mjhrd2v8yn?svg=true)](https://ci.appveyor.com/project/jazzido/tabula-java) =========== `tabula-java` is a library for extracting tables from PDF files — it is the table extraction engine that powers [Tabula](http://tabula.technology/) ([repo](http://github.com/tabulapdf/tabula)). You can use `tabula-java` as a command-line tool to programmatically extract tables from PDFs. From fcb5e495443bfb782d90fd5f72503e7d1e3413fe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:21:23 +0000 Subject: [PATCH 097/245] Bump maven-compiler-plugin from 3.1 to 3.8.1 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.1 to 3.8.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.1...maven-compiler-plugin-3.8.1) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d79a18a5..fcdf17b0 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ maven-compiler-plugin - 3.1 + 3.8.1 1.7 1.7 From 41b4d725c44618c5568dfdf676012b54788f735c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:21:38 +0000 Subject: [PATCH 098/245] Bump commons-csv from 1.5 to 1.6 Bumps commons-csv from 1.5 to 1.6. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcdf17b0..bb8673cf 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ org.apache.commons commons-csv - 1.5 + 1.6 From f107ee81b80700f5561c3097bd97bc4a36318cb4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:22:18 +0000 Subject: [PATCH 099/245] Bump jbig2-imageio from 3.0.1 to 3.0.2 Bumps jbig2-imageio from 3.0.1 to 3.0.2. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb8673cf..a0488f19 100644 --- a/pom.xml +++ b/pom.xml @@ -292,7 +292,7 @@ org.apache.pdfbox jbig2-imageio - 3.0.1 + 3.0.2 From f790d9e5a9492b81a430125fb766769f17664192 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:22:44 +0000 Subject: [PATCH 100/245] Bump bcprov-jdk15on from 1.59 to 1.61 Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.59 to 1.61. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0488f19..a0113bc9 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ org.bouncycastle bcprov-jdk15on - 1.59 + 1.61 From 4302c8d3663954c035c4a46f12234a0f657235c3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 12:11:39 +0000 Subject: [PATCH 101/245] Bump slf4j-simple from 1.7.25 to 1.7.26 Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.25 to 1.7.26. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.25...v_1.7.26) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0113bc9..d7cbaff7 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ org.slf4j slf4j-simple - 1.7.25 + 1.7.26 From 1cda37c6aeb0ef1b7be4767e623c2ed496d15d22 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:23:29 +0000 Subject: [PATCH 102/245] Bump bcmail-jdk15on from 1.59 to 1.61 Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.59 to 1.61. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7cbaff7..48b253ea 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ org.bouncycastle bcmail-jdk15on - 1.59 + 1.61 From 88ca8c549060a25473b2d721627813f37e4e9e92 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:24:43 +0000 Subject: [PATCH 103/245] Bump slf4j-api from 1.7.25 to 1.7.26 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.25 to 1.7.26. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.25...v_1.7.26) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48b253ea..fe51d1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.26 From 31b4def9d37dde4cae08326c4c2cc45aa01a9382 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:23:59 +0000 Subject: [PATCH 104/245] Bump maven-surefire-plugin from 2.20.1 to 2.22.2 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.20.1 to 2.22.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.20.1...surefire-2.22.2) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe51d1e2..15ea0874 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.20.1 + 2.22.2 -Xms1024m -Xmx2048m From 9b99be1e2708f845e0f16439a78a3eb4c9d6f529 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:24:08 +0000 Subject: [PATCH 105/245] Bump maven-gpg-plugin from 1.5 to 1.6 Bumps maven-gpg-plugin from 1.5 to 1.6. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 15ea0874..c631aa9c 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts @@ -199,7 +199,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts From d7de3ada03e2ba18c5616f015a63b3dda017b081 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:24:56 +0000 Subject: [PATCH 106/245] Bump maven-source-plugin from 2.2.1 to 3.1.0 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 2.2.1 to 3.1.0. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-2.2.1...maven-source-plugin-3.1.0) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c631aa9c..336bc473 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.1.0 attach-sources @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.1.0 attach-sources From 93be9bea468beb7e9290e843e1e346b569987b03 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 11:45:18 +0000 Subject: [PATCH 107/245] Bump bcprov-jdk15on from 1.61 to 1.62 Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.61 to 1.62. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 336bc473..ab153b7b 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ org.bouncycastle bcprov-jdk15on - 1.61 + 1.62 From 45512978ed34f7c39cd0bb9560d67d15f31c03d8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Fri, 7 Jun 2019 11:45:39 +0000 Subject: [PATCH 108/245] Bump bcmail-jdk15on from 1.61 to 1.62 Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.61 to 1.62. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab153b7b..b8f1f810 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ org.bouncycastle bcmail-jdk15on - 1.61 + 1.62 From 975592853792e98e109cba110e0db29887fca522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 10 Jun 2019 13:51:07 -0300 Subject: [PATCH 109/245] Update supported JDKs in travis --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb01b361..1bd4cbdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,12 @@ language: java install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V script: mvn test -Dgpg.skip=true jdk: - - openjdk7 - oraclejdk8 - oraclejdk9 + - oraclejdk10 + - openjdk8 + - openjdk9 + - openjdk10 sudo: false From d7a3a7221c18c1a93ee00f104de32b7fafb7ecb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 10 Jun 2019 13:53:13 -0300 Subject: [PATCH 110/245] Remove deprecated oraclejdk10 from Travis config --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1bd4cbdc..7a69aedf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ script: mvn test -Dgpg.skip=true jdk: - oraclejdk8 - oraclejdk9 - - oraclejdk10 - openjdk8 - openjdk9 - openjdk10 From d562ca68acffc467bccff8f7984b48ff21a3a140 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 6 Jun 2019 12:02:15 +0000 Subject: [PATCH 111/245] Bump commons-csv from 1.6 to 1.7 Bumps commons-csv from 1.6 to 1.7. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8f1f810..aa6314ee 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ org.apache.commons commons-csv - 1.6 + 1.7 From ff9476f6af9cb976336caef250cd73774047a670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 24 Jun 2019 18:10:16 -0300 Subject: [PATCH 112/245] remove unused code --- .../tabula/ObjectExtractorStreamEngine.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index ff58dfc6..ae249a40 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -23,8 +23,6 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { - private static final String NBSP = "\u00A0"; - protected List rulings; private AffineTransform pageTransform; private boolean debugClippingPaths; @@ -32,7 +30,6 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { private Logger log; private int clipWindingRule = -1; private GeneralPath currentPath = new GeneralPath(); - public List clippingPaths; protected ObjectExtractorStreamEngine(PDPage page) { super(page); @@ -249,14 +246,6 @@ public Rectangle2D currentClippingPath() { return transformedClippingPath.getBounds2D(); } - public boolean isDebugClippingPaths() { - return debugClippingPaths; - } - - public void setDebugClippingPaths(boolean debugClippingPaths) { - this.debugClippingPaths = debugClippingPaths; - } - class PointComparator implements Comparator { @Override public int compare(Point2D o1, Point2D o2) { From 2b3cc7ddc244ba517b65a6ac9d18d6b7d7b02eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 24 Jun 2019 18:10:30 -0300 Subject: [PATCH 113/245] adjust tests --- ...andLineApp_testGuessOption_no_guessing.csv | 110 +++++++++--------- ...dLineApp_testGuessOption_with_guessing.csv | 80 ++++++------- .../argentina_diputados_voting_record.json | 2 +- 3 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_no_guessing.csv b/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_no_guessing.csv index cd546d5a..de63c5c0 100644 --- a/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_no_guessing.csv +++ b/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_no_guessing.csv @@ -1,65 +1,65 @@ -"E-PRTR pollutants and their thresholds" +E-PRTR pollutants and their thresholds "" -"A facility has to report data under E-PRTR if it fulfils the following criteria:" -"• the facility falls under at least one of the 65 E-PRTR economic activities. The" -"activities are also reported using a statistical classification of economic activities" -"(NACE rev 2)" -"• the facility has a capacity exceeding at least one of the E-PRTR capacity" -"thresholds" -"• the facility releases pollutants or transfers waste off-site which exceed specific" -"thresholds set out in Article 5 of the E-PRTR Regulation. These thresholds for" +A facility has to report data under E-PRTR if it fulfils the following criteria: +• the facility falls under at least one of the 65 E-PRTR economic activities. The +activities are also reported using a statistical classification of economic activities +(NACE rev 2) +• the facility has a capacity exceeding at least one of the E-PRTR capacity +thresholds +• the facility releases pollutants or transfers waste off-site which exceed specific +thresholds set out in Article 5 of the E-PRTR Regulation. These thresholds for "releases of pollutants are specified for each media - air, water and land - in Annex" -"II of the E-PRTR Regulation." +II of the E-PRTR Regulation. "" -"In the following tables you will find the 91 E-PRTR pollutants and their thresholds broken" -"down by the 7 groups used in all the searches of the E-PRTR website." +In the following tables you will find the 91 E-PRTR pollutants and their thresholds broken +down by the 7 groups used in all the searches of the E-PRTR website. "" "" -"Greenhouse gases" +Greenhouse gases "" -"THRESHOLD FOR RELEASES" -"to air to water to land" -"kg/year kg/year kg/year" -"Carbon dioxide (CO2) 100 million - -" -"Hydro-fluorocarbons (HFCs) 100 - -" -"Methane (CH4) 100 000 - -" -"Nitrous oxide (N2O) 10 000 - -" -"Perfluorocarbons (PFCs) 100 - -" -"Sulphur hexafluoride (SF6) 50 - -" +THRESHOLD FOR RELEASES +to air to water to land +kg/year kg/year kg/year +Carbon dioxide (CO2) 100 million - - +Hydro-fluorocarbons (HFCs) 100 - - +Methane (CH4) 100 000 - - +Nitrous oxide (N2O) 10 000 - - +Perfluorocarbons (PFCs) 100 - - +Sulphur hexafluoride (SF6) 50 - - "" -"Other gases" +Other gases "" -"THRESHOLD FOR RELEASES" -"to air to water to land" -"kg/year kg/year kg/year" -"Ammonia (NH3) 10 000 - -" -"Carbon monoxide (CO) 500 000 - -" -"Chlorine and inorganic compounds" -"(as HCl)" -"10 000 - -" -"Chlorofluorocarbons (CFCs) 1 - -" -"Flourine and inorganic compounds" -"(as HF)" -"5 000 - -" -"Halons 1 - -" -"Hydrochlorofluorocarbons (HCFCs) 1 - -" -"Hydrogen Cyanide (HCN) 200 - -" -"Nitrogen oxides (NOx/NO2) 100 000 - -" -"Non-methane volatile organic" -"compounds (NMVOC)" -"100 000 - -" -"Sulphur oxides (SOx/SO2) 150 000 - -" +THRESHOLD FOR RELEASES +to air to water to land +kg/year kg/year kg/year +Ammonia (NH3) 10 000 - - +Carbon monoxide (CO) 500 000 - - +Chlorine and inorganic compounds +10 000 - - +(as HCl) +Chlorofluorocarbons (CFCs) 1 - - +Flourine and inorganic compounds +5 000 - - +(as HF) +Halons 1 - - +Hydrochlorofluorocarbons (HCFCs) 1 - - +Hydrogen Cyanide (HCN) 200 - - +Nitrogen oxides (NOx/NO2) 100 000 - - +Non-methane volatile organic +100 000 - - +compounds (NMVOC) +Sulphur oxides (SOx/SO2) 150 000 - - "" -"Heavy metals" +Heavy metals "" -"THRESHOLD FOR RELEASES" -"to air to water to land" -"kg/year kg/year kg/year" -"Arsenic and compounds (as As) 20 5 5" -"Cadmium and compounds (as Cd) 10 5 5" -"Chromium and compounds (as Cr) 100 50 50" -"Copper and compounds (as Cu) 100 50 50" -"Lead and compounds (as Pb) 200 20 20" -"Mercury and compounds (as Hg) 10 1 1" -"Nickel and compounds (as Ni) 50 20 20" -"Zinc and compounds (as Zn) 200 100 100" +THRESHOLD FOR RELEASES +to air to water to land +kg/year kg/year kg/year +Arsenic and compounds (as As) 20 5 5 +Cadmium and compounds (as Cd) 10 5 5 +Chromium and compounds (as Cr) 100 50 50 +Copper and compounds (as Cu) 100 50 50 +Lead and compounds (as Pb) 200 20 20 +Mercury and compounds (as Hg) 10 1 1 +Nickel and compounds (as Ni) 50 20 20 +Zinc and compounds (as Zn) 200 100 100 diff --git a/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_with_guessing.csv b/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_with_guessing.csv index 40a51d00..e683abd3 100644 --- a/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_with_guessing.csv +++ b/src/test/resources/technology/tabula/csv/TestCommandLineApp_testGuessOption_with_guessing.csv @@ -1,40 +1,40 @@ -"",,"THRESHOLD FOR RELEASES", -"","to air","to water","to land" -"","kg/year","kg/year","kg/year" -"Carbon dioxide (CO2)","100 million","-","-" -"Hydro-fluorocarbons (HFCs)","100","-","-" -"Methane (CH4)","100 000","-","-" -"Nitrous oxide (N2O)","10 000","-","-" -"Perfluorocarbons (PFCs)","100","-","-" -"Sulphur hexafluoride (SF6)","50","-","-" -"","THRESHOLD FOR RELEASES" -"","to air to water to land" -"","kg/year kg/year kg/year" -"Ammonia (NH3)","10 000 - -" -"Carbon monoxide (CO)","500 000 - -" -"Chlorine and inorganic compounds", -"(as HCl)", -"","10 000 - -" -"Chlorofluorocarbons (CFCs)","1 - -" -"Flourine and inorganic compounds", -"(as HF)", -"","5 000 - -" -"Halons","1 - -" -"Hydrochlorofluorocarbons (HCFCs)","1 - -" -"Hydrogen Cyanide (HCN)","200 - -" -"Nitrogen oxides (NOx/NO2)","100 000 - -" -"Non-methane volatile organic", -"compounds (NMVOC)", -"","100 000 - -" -"Sulphur oxides (SOx/SO2)","150 000 - -" -"","THRESHOLD FOR RELEASES" -"","to air to water to land" -"","kg/year kg/year kg/year" -"Arsenic and compounds (as As)","20 5 5" -"Cadmium and compounds (as Cd)","10 5 5" -"Chromium and compounds (as Cr)","100 50 50" -"Copper and compounds (as Cu)","100 50 50" -"Lead and compounds (as Pb)","200 20 20" -"Mercury and compounds (as Hg)","10 1 1" -"Nickel and compounds (as Ni)","50 20 20" -"Zinc and compounds (as Zn)","200 100 100" +"",,THRESHOLD FOR RELEASES, +"",to air,to water,to land +"",kg/year,kg/year,kg/year +Carbon dioxide (CO2),100 million,-,- +Hydro-fluorocarbons (HFCs),100,-,- +Methane (CH4),100 000,-,- +Nitrous oxide (N2O),10 000,-,- +Perfluorocarbons (PFCs),100,-,- +Sulphur hexafluoride (SF6),50,-,- +"",THRESHOLD FOR RELEASES +"",to air to water to land +"",kg/year kg/year kg/year +Ammonia (NH3),10 000 - - +Carbon monoxide (CO),500 000 - - +Chlorine and inorganic compounds, +"",10 000 - - +(as HCl), +Chlorofluorocarbons (CFCs),1 - - +Flourine and inorganic compounds, +"",5 000 - - +(as HF), +Halons,1 - - +Hydrochlorofluorocarbons (HCFCs),1 - - +Hydrogen Cyanide (HCN),200 - - +Nitrogen oxides (NOx/NO2),100 000 - - +Non-methane volatile organic, +"",100 000 - - +compounds (NMVOC), +Sulphur oxides (SOx/SO2),150 000 - - +"",THRESHOLD FOR RELEASES +"",to air to water to land +"",kg/year kg/year kg/year +Arsenic and compounds (as As),20 5 5 +Cadmium and compounds (as Cd),10 5 5 +Chromium and compounds (as Cr),100 50 50 +Copper and compounds (as Cu),100 50 50 +Lead and compounds (as Pb),200 20 20 +Mercury and compounds (as Hg),10 1 1 +Nickel and compounds (as Ni),50 20 20 +Zinc and compounds (as Zn),200 100 100 diff --git a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json index 6b60f8a7..21ad2880 100644 --- a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json +++ b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json @@ -1 +1 @@ -{"extraction_method":"stream","top":269.875,"left":12.75,"width":548.25,"height":520.625,"right":561.0,"bottom":790.5,"data":[[{"top":279.87,"left":28.56,"width":175.21029663085938,"height":6.449999809265137,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":279.87,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":280.59,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":279.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":296.31,"left":28.56,"width":141.71029663085938,"height":6.449999809265137,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":296.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":297.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":296.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":312.87,"left":28.56,"width":83.75028228759766,"height":6.449999809265137,"text":"ALONSO, María Luz"},{"top":312.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":313.59,"left":397.56,"width":42.250274658203125,"height":6.449999809265137,"text":"La Pampa"},{"top":312.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":329.31,"left":28.56,"width":84.25028228759766,"height":6.449999809265137,"text":"ARENA, Celia Isabel"},{"top":329.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":330.15,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":329.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":345.87,"left":28.56,"width":110.29029846191406,"height":6.449999809265137,"text":"ARREGUI, Andrés Roberto"},{"top":345.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":346.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":345.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":362.31,"left":28.56,"width":115.69029235839844,"height":6.449999809265137,"text":"AVOSCAN, Herman Horacio"},{"top":362.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":363.15,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":362.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":378.87,"left":28.56,"width":95.6902847290039,"height":6.449999809265137,"text":"BALCEDO, María Ester"},{"top":378.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":379.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":378.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":395.31,"left":28.56,"width":127.69029235839844,"height":6.449999809265137,"text":"BARRANDEGUY, Raúl Enrique"},{"top":395.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":396.15,"left":397.56,"width":43.6702880859375,"height":6.449999809265137,"text":"Entre Ríos"},{"top":395.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":411.87,"left":28.56,"width":106.69029235839844,"height":6.449999809265137,"text":"BASTERRA, Luis Eugenio"},{"top":411.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":412.59,"left":397.56,"width":36.73028564453125,"height":6.449999809265137,"text":"Formosa"},{"top":411.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":428.31,"left":28.56,"width":92.21028137207031,"height":6.449999809265137,"text":"BEDANO, Nora Esther"},{"top":428.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":429.15,"left":397.56,"width":35.6602783203125,"height":6.449999809265137,"text":"Córdoba"},{"top":428.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":444.87,"left":28.56,"width":100.69029235839844,"height":6.449999809265137,"text":"BERNAL, María Eugenia"},{"top":444.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":445.59,"left":397.56,"width":22.200286865234375,"height":6.449999809265137,"text":"Jujuy"},{"top":444.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":461.31,"left":28.56,"width":112.21029663085938,"height":6.449999809265137,"text":"BERTONE, Rosana Andrea"},{"top":461.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":462.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":461.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":477.87,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"BIANCHI, María del Carmen"},{"top":477.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":478.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":477.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":494.31,"left":28.56,"width":115.19029235839844,"height":6.449999809265137,"text":"BIDEGAIN, Gloria Mercedes"},{"top":494.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":495.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":494.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":510.87,"left":28.56,"width":66.25028228759766,"height":6.449999809265137,"text":"BRAWER, Mara"},{"top":510.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":511.59,"left":397.56,"width":74.6702880859375,"height":6.449999809265137,"text":"Cdad. Aut. Bs. As."},{"top":510.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":527.31,"left":28.56,"width":90.73028564453125,"height":6.449999809265137,"text":"BRILLO, José Ricardo"},{"top":527.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":528.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":527.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":543.87,"left":28.56,"width":120.73028564453125,"height":6.449999809265137,"text":"BROMBERG, Isaac Benjamín"},{"top":543.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":544.59,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":543.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":560.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"BRUE, Daniel Agustín"},{"top":560.31,"left":213.72,"width":108.25027465820312,"height":6.449999809265137,"text":"Frente Cívico por Santiago"},{"top":561.15,"left":397.56,"width":79.69027709960938,"height":6.449999809265137,"text":"Santiago del Estero"},{"top":560.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":576.87,"left":28.56,"width":72.23028564453125,"height":6.449999809265137,"text":"CALCAGNO, Eric"},{"top":576.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":577.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":576.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":593.31,"left":28.56,"width":114.73028564453125,"height":6.449999809265137,"text":"CARLOTTO, Remo Gerardo"},{"top":593.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":594.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":593.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":609.87,"left":28.56,"width":122.1702880859375,"height":6.449999809265137,"text":"CARMONA, Guillermo Ramón"},{"top":609.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":610.59,"left":397.56,"width":38.1602783203125,"height":6.449999809265137,"text":"Mendoza"},{"top":609.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":626.31,"left":28.56,"width":124.73028564453125,"height":6.449999809265137,"text":"CATALAN MAGNI, Julio César"},{"top":626.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":627.15,"left":397.56,"width":67.21026611328125,"height":6.449999809265137,"text":"Tierra del Fuego"},{"top":626.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":642.87,"left":28.56,"width":88.6902847290039,"height":6.449999809265137,"text":"CEJAS, Jorge Alberto"},{"top":642.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":643.59,"left":397.56,"width":41.6602783203125,"height":6.449999809265137,"text":"Rio Negro"},{"top":642.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":659.31,"left":28.56,"width":89.7702865600586,"height":6.449999809265137,"text":"CHIENO, María Elena"},{"top":659.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":660.15,"left":397.56,"width":42.72027587890625,"height":6.449999809265137,"text":"Corrientes"},{"top":659.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":675.87,"left":28.56,"width":96.25028228759766,"height":6.449999809265137,"text":"CIAMPINI, José Alberto"},{"top":675.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":676.59,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":675.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":692.31,"left":28.56,"width":131.77029418945312,"height":6.449999809265137,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":692.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":693.15,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":692.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":708.87,"left":28.56,"width":62.15028381347656,"height":6.449999809265137,"text":"CLERI, Marcos"},{"top":708.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":709.59,"left":397.56,"width":37.690277099609375,"height":6.449999809265137,"text":"Santa Fe"},{"top":708.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":725.31,"left":28.56,"width":101.77029418945312,"height":6.449999809265137,"text":"COMELLI, Alicia Marcela"},{"top":725.31,"left":213.72,"width":121.81027221679688,"height":6.449999809265137,"text":"Movimiento Popular Neuquino"},{"top":726.15,"left":397.56,"width":37.700286865234375,"height":6.449999809265137,"text":"Neuquén"},{"top":725.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":741.87,"left":28.56,"width":88.1902847290039,"height":6.449999809265137,"text":"CONTI, Diana Beatriz"},{"top":741.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":742.59,"left":397.56,"width":54.71026611328125,"height":6.449999809265137,"text":"Buenos Aires"},{"top":741.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":758.31,"left":28.56,"width":98.75028228759766,"height":6.449999809265137,"text":"CORDOBA, Stella Maris"},{"top":758.31,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":759.15,"left":397.56,"width":38.6602783203125,"height":6.449999809265137,"text":"Tucumán"},{"top":758.31,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}],[{"top":774.87,"left":28.56,"width":105.25028991699219,"height":6.449999809265137,"text":"CURRILEN, Oscar Rubén"},{"top":774.87,"left":213.72,"width":108.23028564453125,"height":6.449999809265137,"text":"Frente para la Victoria - PJ"},{"top":775.59,"left":397.56,"width":30.2802734375,"height":6.449999809265137,"text":"Chubut"},{"top":774.87,"left":494.04,"width":54.999969482421875,"height":6.449999809265137,"text":"AFIRMATIVO"}]]} +{"extraction_method":"stream","top":269.875,"left":12.75,"width":548.25,"height":520.625,"right":561.0,"bottom":790.5,"data":[[{"top":281.82,"left":28.56,"width":175.21029663085938,"height":4.5,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":281.82,"left":213.72,"width":108.25027465820312,"height":4.5,"text":"Frente Cívico por Santiago"},{"top":282.54,"left":397.56,"width":79.69027709960938,"height":4.5,"text":"Santiago del Estero"},{"top":281.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":298.26,"left":28.56,"width":141.71029663085938,"height":4.5,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":298.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":299.1,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":298.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":314.82,"left":28.56,"width":83.75028228759766,"height":4.5,"text":"ALONSO, María Luz"},{"top":314.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":315.54,"left":397.56,"width":42.250274658203125,"height":4.5,"text":"La Pampa"},{"top":314.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":331.26,"left":28.56,"width":84.25028228759766,"height":4.5,"text":"ARENA, Celia Isabel"},{"top":331.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":332.1,"left":397.56,"width":37.690277099609375,"height":4.5,"text":"Santa Fe"},{"top":331.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":347.82,"left":28.56,"width":110.29029846191406,"height":4.5,"text":"ARREGUI, Andrés Roberto"},{"top":347.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":348.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":347.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":364.26,"left":28.56,"width":115.69029235839844,"height":4.5,"text":"AVOSCAN, Herman Horacio"},{"top":364.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":365.1,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":364.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":380.82,"left":28.56,"width":95.6902847290039,"height":4.5,"text":"BALCEDO, María Ester"},{"top":380.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":381.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":380.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":397.26,"left":28.56,"width":127.69029235839844,"height":4.5,"text":"BARRANDEGUY, Raúl Enrique"},{"top":397.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":398.1,"left":397.56,"width":43.6702880859375,"height":4.5,"text":"Entre Ríos"},{"top":397.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":413.82,"left":28.56,"width":106.69029235839844,"height":4.5,"text":"BASTERRA, Luis Eugenio"},{"top":413.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":414.54,"left":397.56,"width":36.73028564453125,"height":4.5,"text":"Formosa"},{"top":413.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":430.26,"left":28.56,"width":92.21028137207031,"height":4.5,"text":"BEDANO, Nora Esther"},{"top":430.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":431.1,"left":397.56,"width":35.6602783203125,"height":4.5,"text":"Córdoba"},{"top":430.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":446.82,"left":28.56,"width":100.69029235839844,"height":4.5,"text":"BERNAL, María Eugenia"},{"top":446.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":447.54,"left":397.56,"width":22.200286865234375,"height":4.5,"text":"Jujuy"},{"top":446.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":463.26,"left":28.56,"width":112.21029663085938,"height":4.5,"text":"BERTONE, Rosana Andrea"},{"top":463.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":464.1,"left":397.56,"width":67.21026611328125,"height":4.5,"text":"Tierra del Fuego"},{"top":463.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":479.82,"left":28.56,"width":114.73028564453125,"height":4.5,"text":"BIANCHI, María del Carmen"},{"top":479.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":480.54,"left":397.56,"width":74.6702880859375,"height":4.5,"text":"Cdad. Aut. Bs. As."},{"top":479.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":496.26,"left":28.56,"width":115.19029235839844,"height":4.5,"text":"BIDEGAIN, Gloria Mercedes"},{"top":496.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":497.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":496.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":512.82,"left":28.56,"width":66.25028228759766,"height":4.5,"text":"BRAWER, Mara"},{"top":512.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":513.54,"left":397.56,"width":74.6702880859375,"height":4.5,"text":"Cdad. Aut. Bs. As."},{"top":512.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":529.26,"left":28.56,"width":90.73028564453125,"height":4.5,"text":"BRILLO, José Ricardo"},{"top":529.26,"left":213.72,"width":121.81027221679688,"height":4.5,"text":"Movimiento Popular Neuquino"},{"top":530.1,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":529.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":545.82,"left":28.56,"width":120.73028564453125,"height":4.5,"text":"BROMBERG, Isaac Benjamín"},{"top":545.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":546.54,"left":397.56,"width":38.6602783203125,"height":4.5,"text":"Tucumán"},{"top":545.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":562.26,"left":28.56,"width":89.7702865600586,"height":4.5,"text":"BRUE, Daniel Agustín"},{"top":562.26,"left":213.72,"width":108.25027465820312,"height":4.5,"text":"Frente Cívico por Santiago"},{"top":563.1,"left":397.56,"width":79.69027709960938,"height":4.5,"text":"Santiago del Estero"},{"top":562.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":578.82,"left":28.56,"width":72.23028564453125,"height":4.5,"text":"CALCAGNO, Eric"},{"top":578.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":579.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":578.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":595.26,"left":28.56,"width":114.73028564453125,"height":4.5,"text":"CARLOTTO, Remo Gerardo"},{"top":595.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":596.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":595.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":611.82,"left":28.56,"width":122.1702880859375,"height":4.5,"text":"CARMONA, Guillermo Ramón"},{"top":611.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":612.54,"left":397.56,"width":38.1602783203125,"height":4.5,"text":"Mendoza"},{"top":611.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":628.26,"left":28.56,"width":124.73028564453125,"height":4.5,"text":"CATALAN MAGNI, Julio César"},{"top":628.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":629.1,"left":397.56,"width":67.21026611328125,"height":4.5,"text":"Tierra del Fuego"},{"top":628.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":644.82,"left":28.56,"width":88.6902847290039,"height":4.5,"text":"CEJAS, Jorge Alberto"},{"top":644.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":645.54,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":644.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":661.26,"left":28.56,"width":89.7702865600586,"height":4.5,"text":"CHIENO, María Elena"},{"top":661.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":662.1,"left":397.56,"width":42.72027587890625,"height":4.5,"text":"Corrientes"},{"top":661.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":677.82,"left":28.56,"width":96.25028228759766,"height":4.5,"text":"CIAMPINI, José Alberto"},{"top":677.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":678.54,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":677.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":694.26,"left":28.56,"width":131.77029418945312,"height":4.5,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":694.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":695.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":694.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":710.82,"left":28.56,"width":62.15028381347656,"height":4.5,"text":"CLERI, Marcos"},{"top":710.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":711.54,"left":397.56,"width":37.690277099609375,"height":4.5,"text":"Santa Fe"},{"top":710.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":727.26,"left":28.56,"width":101.77029418945312,"height":4.5,"text":"COMELLI, Alicia Marcela"},{"top":727.26,"left":213.72,"width":121.81027221679688,"height":4.5,"text":"Movimiento Popular Neuquino"},{"top":728.1,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":727.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":743.82,"left":28.56,"width":88.1902847290039,"height":4.5,"text":"CONTI, Diana Beatriz"},{"top":743.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":744.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":743.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":760.26,"left":28.56,"width":98.75028228759766,"height":4.5,"text":"CORDOBA, Stella Maris"},{"top":760.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":761.1,"left":397.56,"width":38.6602783203125,"height":4.5,"text":"Tucumán"},{"top":760.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":776.82,"left":28.56,"width":105.25028991699219,"height":4.5,"text":"CURRILEN, Oscar Rubén"},{"top":776.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":777.54,"left":397.56,"width":30.2802734375,"height":4.5,"text":"Chubut"},{"top":776.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}]]} \ No newline at end of file From 9cf6726b761040ff0e91f79c5e650e74e09194de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 24 Jun 2019 18:12:22 -0300 Subject: [PATCH 114/245] upgrade to PDFBox 2.0.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa6314ee..5b4b3f9f 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ org.apache.pdfbox pdfbox - 2.0.12 + 2.0.15 From c28fcec8d804d8cb7c1eecdadae1db27453cfc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 24 Jun 2019 19:23:27 -0300 Subject: [PATCH 115/245] prepare for next release --- pom.xml | 2 +- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5b4b3f9f..2c478bd8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.3 + 1.0.4-SNAPSHOT Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 0de4e4a5..e23d90cd 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -32,7 +32,7 @@ public class CommandLineApp { - private static String VERSION = "1.0.2"; + private static String VERSION = "1.0.4"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2018 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; From 78eff7eefb3de2e3a4e353378d3269009b9ba8e9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Tue, 4 Jun 2019 15:21:57 +0000 Subject: [PATCH 116/245] Bump jts-core from 1.15.0 to 1.16.1 Bumps jts-core from 1.15.0 to 1.16.1. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c478bd8..ca3f6471 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ org.locationtech.jts jts-core - 1.15.0 + 1.16.1 From acee4c387b3c731516d251d112fc0ebe47161408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 24 Jun 2019 19:38:34 -0300 Subject: [PATCH 117/245] target java 1.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca3f6471..b3685394 100644 --- a/pom.xml +++ b/pom.xml @@ -126,8 +126,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 From 21b124660a90127d2867a48db04d6412d9c4f438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 24 Jun 2019 19:42:15 -0300 Subject: [PATCH 118/245] add jdk11 to travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a69aedf..a17315e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,5 @@ jdk: - openjdk8 - openjdk9 - openjdk10 + - openjdk11 sudo: false - - - From c688dc7045ffedcf4827d8a3729332807d7c0f8e Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Sun, 28 Jul 2019 13:45:41 -0400 Subject: [PATCH 119/245] clarify -a command's coordinate order --- src/main/java/technology/tabula/CommandLineApp.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index e23d90cd..a4cace6f 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -335,7 +335,8 @@ public static Options buildOptions() { .build()); o.addOption(Option.builder("a") .longOpt("area") - .desc("-a/--area = Portion of the page to analyze. Accepts top,left,bottom,right . Example: --area 269.875,12.75,790.5,561. " + .desc("-a/--area = Portion of the page to analyze. Example: --area 269.875,12.75,790.5,561. " + + "Accepts top,left,bottom,right i.e. y1,x1,y2,x2 " + "If all values are between 0-100 (inclusive) and preceded by '%', input will be taken as % of actual height or width of the page. " + "Example: --area %0,0,100,50. To specify multiple areas, -a option should be repeated. Default is entire page") .hasArg() From 9960775528f6ff09dcb41830ea48eb89a73f3b49 Mon Sep 17 00:00:00 2001 From: "Jeremy B. Merrill" Date: Sun, 28 Jul 2019 13:46:50 -0400 Subject: [PATCH 120/245] copy over clarified -a flag's coordinate order --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a13ea913..6b8a52c1 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,9 @@ Tabula helps you extract tables from PDFs -a,--area Portion of the page to analyze. Accepts top, left,bottom,right. + Portion of the page to analyze. Example: --area 269.875,12.75,790.5,561. + Accepts top,left,bottom,right i.e. y1,x1,y2,x2 If all values are between 0-100 (inclusive) and preceded by '%', input will be taken as % of actual height or width of the page. From 8eb34f9ddc37b509e58b66c9da4a0d89a15ef0d9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 6 Jun 2019 12:01:53 +0000 Subject: [PATCH 121/245] Bump nexus-staging-maven-plugin from 1.6.3 to 1.6.8 Bumps nexus-staging-maven-plugin from 1.6.3 to 1.6.8. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3685394..43f4f4d7 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.3 + 1.6.8 true ossrh From f4595f1f9504be0ca6b962ee57f96eaffd589231 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2019 06:11:03 +0000 Subject: [PATCH 122/245] Bump maven-javadoc-plugin from 2.10.3 to 3.1.1 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 2.10.3 to 3.1.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-2.10.3...maven-javadoc-plugin-3.1.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 43f4f4d7..e5b9805d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 3.1.1 true @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.1.1 attach-javadocs @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.1.1 attach-javadocs From 462bdaa219d0688b9d0b500a97a9884e9511a724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 29 Oct 2019 11:33:20 -0300 Subject: [PATCH 123/245] remove OracleJDK from Travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a17315e7..7397abbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: java install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V script: mvn test -Dgpg.skip=true jdk: - - oraclejdk8 - - oraclejdk9 - openjdk8 - openjdk9 - openjdk10 From e00a74c73444ac3563dbfb09ffa4d3e0ddc1decf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 11:55:40 +0000 Subject: [PATCH 124/245] Bump slf4j-simple from 1.7.26 to 1.7.29 Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.26 to 1.7.29. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5b9805d..71143426 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ org.slf4j slf4j-simple - 1.7.26 + 1.7.29 From c94fe95a8d0b3f3a3ccc4ce57399089b4d453039 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2019 11:53:56 +0000 Subject: [PATCH 125/245] Bump slf4j-api from 1.7.26 to 1.7.29 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.26 to 1.7.29. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71143426..082d6df7 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,7 @@ org.slf4j slf4j-api - 1.7.26 + 1.7.29 From dc3bc6700452b5a6f79f60a0927ffa779ab76626 Mon Sep 17 00:00:00 2001 From: Harry Biddle Date: Thu, 20 Feb 2020 14:41:37 +0100 Subject: [PATCH 126/245] Extra information on coordinate system in command-line help text --- README.md | 26 +++++++++---------- .../technology/tabula/CommandLineApp.java | 17 ++++++------ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 6b8a52c1..76e25663 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,20 @@ usage: tabula [-a ] [-b ] [-c ] [-d] [-f Tabula helps you extract tables from PDFs - -a,--area Portion of the page to analyze. Accepts top, - left,bottom,right. - Portion of the page to analyze. - Example: --area 269.875,12.75,790.5,561. - Accepts top,left,bottom,right i.e. y1,x1,y2,x2 - If all values are between 0-100 (inclusive) - and preceded by '%', input will be taken as - % of actual height or width of the page. - Example: --area %0,0,100,50. - To specify multiple areas, -a option should - be repeated. Default is entire page + -a,--area Portion of the page to analyze. Example: --area + 269.875,12.75,790.5,561. Accepts + top,left,bottom,right i.e. y1,x1,y2,x2 where all + values are in points relative to the top left + corner. If all values are between 0-100 + (inclusive) and preceded by '%', input will be + taken as % of actual height or width of the page. + Example: --area %0,0,100,50. To specify multiple + areas, -a option should be repeated. Default is + entire page -b,--batch Convert all .pdfs in the provided directory. - -c,--columns X coordinates of column boundaries. Example - --columns 10.1,20.2,30.3 + -c,--columns X coordinates of column boundaries where values + are in points and relative to the left of the + page. Example --columns 10.1,20.2,30.3 -d,--debug Print detected table areas instead of processing. -f,--format Output format: (CSV,TSV,JSON). Default: CSV diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index a4cace6f..ec16db6f 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -35,13 +35,13 @@ public class CommandLineApp { private static String VERSION = "1.0.4"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2018 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; - + private static final int RELATIVE_AREA_CALCULATION_MODE = 0; private static final int ABSOLUTE_AREA_CALCULATION_MODE = 1; private Appendable defaultOutput; - + private List> pageAreas; private List pages; private OutputFormat outputFormat; @@ -167,10 +167,10 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException if (pageAreas != null) { for (Pair areaPair : pageAreas) { Rectangle area = areaPair.getRight(); - if (areaPair.getLeft() == RELATIVE_AREA_CALCULATION_MODE) { + if (areaPair.getLeft() == RELATIVE_AREA_CALCULATION_MODE) { area = new Rectangle((float) (area.getTop() / 100 * page.getHeight()), (float) (area.getLeft() / 100 * page.getWidth()), (float) (area.getWidth() / 100 * page.getWidth()), - (float) (area.getHeight() / 100 * page.getHeight())); + (float) (area.getHeight() / 100 * page.getHeight())); } tables.addAll(tableExtractor.extractTables(page.getArea(area))); } @@ -220,10 +220,10 @@ private static List> whichAreas(CommandLine line) throw if (!line.hasOption('a')) { return null; } - + String[] optionValues = line.getOptionValues('a'); - List> areaList = new ArrayList>(); + List> areaList = new ArrayList>(); for (String optionValue: optionValues) { int areaCalculationMode = ABSOLUTE_AREA_CALCULATION_MODE; int startIndex = 0; @@ -329,14 +329,15 @@ public static Options buildOptions() { .build()); o.addOption(Option.builder("c") .longOpt("columns") - .desc("X coordinates of column boundaries. Example --columns 10.1,20.2,30.3") + .desc("X coordinates of column boundaries where values are in points and relative to the left of the page. " + + "Example --columns 10.1,20.2,30.3") .hasArg() .argName("COLUMNS") .build()); o.addOption(Option.builder("a") .longOpt("area") .desc("-a/--area = Portion of the page to analyze. Example: --area 269.875,12.75,790.5,561. " - + "Accepts top,left,bottom,right i.e. y1,x1,y2,x2 " + + "Accepts top,left,bottom,right i.e. y1,x1,y2,x2 where all values are in points relative to the top left corner. " + "If all values are between 0-100 (inclusive) and preceded by '%', input will be taken as % of actual height or width of the page. " + "Example: --area %0,0,100,50. To specify multiple areas, -a option should be repeated. Default is entire page") .hasArg() From e8e0cfccc8ae97008d9e86c34ca11d32ad819caf Mon Sep 17 00:00:00 2001 From: Nat Date: Sat, 28 Dec 2019 23:04:30 -0600 Subject: [PATCH 127/245] Fix excessive memory usage issue with large (many pages) PDFs --- .../tabula/detectors/NurminenDetectionAlgorithm.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index 8f155ae3..fe30ae8d 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -117,6 +117,7 @@ public List detect(Page page) { PDDocument removeTextDocument = null; try { removeTextDocument = this.removeText(pdfPage); + pdfPage = removeTextDocument.getPage(0); image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); } catch (Exception e) { return new ArrayList<>(); @@ -856,16 +857,15 @@ private PDDocument removeText(PDPage page) throws IOException { } PDDocument document = new PDDocument(); - document.addPage(page); + PDPage newPage = document.importPage(page); + newPage.setResources(page.getResources()); PDStream newContents = new PDStream(document); OutputStream out = newContents.createOutputStream(COSName.FLATE_DECODE); ContentStreamWriter writer = new ContentStreamWriter(out); writer.writeTokens(newTokens); out.close(); - page.setContents(newContents); - + newPage.setContents(newContents); return document; - } } From 0d8228168b36b224020e546734b903670874d3b3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2020 05:44:27 +0000 Subject: [PATCH 128/245] Bump commons-csv from 1.7 to 1.8 Bumps commons-csv from 1.7 to 1.8. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 082d6df7..46a27c58 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ org.apache.commons commons-csv - 1.7 + 1.8 From 97b6f204110b5393ab40aa993b8bf393e0041a80 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 05:40:58 +0000 Subject: [PATCH 129/245] Bump slf4j-simple from 1.7.29 to 1.7.30 Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.29 to 1.7.30. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.29...v_1.7.30) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46a27c58..d155a797 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ org.slf4j slf4j-simple - 1.7.29 + 1.7.30 From 7ea31a051c9c5a2697668a26fb5fdb0c23c6b962 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 05:41:22 +0000 Subject: [PATCH 130/245] Bump slf4j-api from 1.7.29 to 1.7.30 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.29 to 1.7.30. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.29...v_1.7.30) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d155a797..b42765cf 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,7 @@ org.slf4j slf4j-api - 1.7.29 + 1.7.30 From 708d753c36529e15695080fc8cf0a865c694ac38 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 05:43:25 +0000 Subject: [PATCH 131/245] Bump jbig2-imageio from 3.0.2 to 3.0.3 Bumps jbig2-imageio from 3.0.2 to 3.0.3. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b42765cf..776b49d1 100644 --- a/pom.xml +++ b/pom.xml @@ -292,7 +292,7 @@ org.apache.pdfbox jbig2-imageio - 3.0.2 + 3.0.3 From 7742439e2f7c5a9e3bcf99b57e7998af9555b8b7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 06:12:36 +0000 Subject: [PATCH 132/245] Bump bcmail-jdk15on from 1.62 to 1.65 Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.62 to 1.65. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 776b49d1..876f45c2 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ org.bouncycastle bcmail-jdk15on - 1.62 + 1.65 From b341dfe8323abb9de6826bc0683e950af510e5a0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 06:12:15 +0000 Subject: [PATCH 133/245] Bump bcprov-jdk15on from 1.62 to 1.65 Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.62 to 1.65. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 876f45c2..4cbaa1d4 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ org.bouncycastle bcprov-jdk15on - 1.62 + 1.65 From e35816791c3a12175882acb4fb3e1add39614411 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 05:56:26 +0000 Subject: [PATCH 134/245] Bump maven-javadoc-plugin from 3.1.1 to 3.2.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.1.1...maven-javadoc-plugin-3.2.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4cbaa1d4..033cdeaa 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 true @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs From ce25679c0cbf20d790eaf908c8c0ef7332cc5ad6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2020 05:42:32 +0000 Subject: [PATCH 135/245] Bump junit from 4.12 to 4.13 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 033cdeaa..3d4bd826 100644 --- a/pom.xml +++ b/pom.xml @@ -255,7 +255,7 @@ junit junit - 4.12 + 4.13 test From 62780644614802e8185b36982b494a220798aef6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 05:51:03 +0000 Subject: [PATCH 136/245] Bump maven-source-plugin from 3.1.0 to 3.2.1 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.1.0 to 3.2.1. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.1.0...maven-source-plugin-3.2.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3d4bd826..6b0adb7c 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 attach-sources @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 attach-sources From eec86f517e9782c7534283cfde9cf0e4bad4bf1f Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Sat, 18 Apr 2020 17:56:40 +0200 Subject: [PATCH 137/245] format with Locale.US (#355) --- src/main/java/technology/tabula/QuickSort.java | 2 +- src/main/java/technology/tabula/Rectangle.java | 5 +++-- src/main/java/technology/tabula/Ruling.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/technology/tabula/QuickSort.java b/src/main/java/technology/tabula/QuickSort.java index 34757ca3..03388a15 100644 --- a/src/main/java/technology/tabula/QuickSort.java +++ b/src/main/java/technology/tabula/QuickSort.java @@ -25,7 +25,7 @@ /** * An implementation of Quicksort. * - * @see http://de.wikipedia.org/wiki/Quicksort + * @see wikipedia * * @author UWe Pachler */ diff --git a/src/main/java/technology/tabula/Rectangle.java b/src/main/java/technology/tabula/Rectangle.java index e4522a0a..b96fcd77 100644 --- a/src/main/java/technology/tabula/Rectangle.java +++ b/src/main/java/technology/tabula/Rectangle.java @@ -4,6 +4,7 @@ import java.awt.geom.Rectangle2D; import java.util.Comparator; import java.util.List; +import java.util.Locale; @SuppressWarnings("serial") public class Rectangle extends Rectangle2D.Float { @@ -11,7 +12,7 @@ public class Rectangle extends Rectangle2D.Float { /** * Ill-defined comparator, from when Rectangle was Comparable. * - * @see https://github.com/tabulapdf/tabula-java/issues/116 + * @see PR 116 * @deprecated with no replacement */ @Deprecated @@ -151,7 +152,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); String s = super.toString(); sb.append(s.substring(0, s.length() - 1)); - sb.append(String.format(",bottom=%f,right=%f]", this.getBottom(), this.getRight())); + sb.append(String.format(Locale.US, ",bottom=%f,right=%f]", this.getBottom(), this.getRight())); return sb.toString(); } diff --git a/src/main/java/technology/tabula/Ruling.java b/src/main/java/technology/tabula/Ruling.java index 2ad33aaa..cdab6c4f 100644 --- a/src/main/java/technology/tabula/Ruling.java +++ b/src/main/java/technology/tabula/Ruling.java @@ -8,6 +8,7 @@ import java.util.Comparator; import java.util.Formatter; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; @@ -291,7 +292,7 @@ public double getAngle() { public String toString() { StringBuilder sb = new StringBuilder(); Formatter formatter = new Formatter(sb); - String rv = formatter.format("%s[x1=%f y1=%f x2=%f y2=%f]", this.getClass().toString(), this.x1, this.y1, this.x2, this.y2).toString(); + String rv = formatter.format(Locale.US, "%s[x1=%f y1=%f x2=%f y2=%f]", this.getClass().toString(), this.x1, this.y1, this.x2, this.y2).toString(); formatter.close(); return rv; } From 227d92fddd5320e07cb11b0195acba0052b61dd8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 22:50:32 -0300 Subject: [PATCH 138/245] Bump jts-core from 1.16.1 to 1.17.0 (#363) Bumps jts-core from 1.16.1 to 1.17.0. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b0adb7c..123b69d2 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ org.locationtech.jts jts-core - 1.16.1 + 1.17.0 From 92c330e5f4855c18a4e84cc23f1041fb5369578a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 22:51:53 -0300 Subject: [PATCH 139/245] Bump bcprov-jdk15on from 1.65 to 1.66 (#364) Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.65 to 1.66. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 123b69d2..0f4787b4 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ org.bouncycastle bcprov-jdk15on - 1.65 + 1.66 From a6421332832835626c0cda16ecda72471812e0f2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 22:52:08 -0300 Subject: [PATCH 140/245] Bump bcmail-jdk15on from 1.65 to 1.66 (#365) Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.65 to 1.66. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f4787b4..366b6bce 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ org.bouncycastle bcmail-jdk15on - 1.65 + 1.66 From 5bb1a15bbdf9378c46cbcaa7843e857966708833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 10 Jul 2020 16:25:46 -0300 Subject: [PATCH 141/245] Upgrade PDFbox to 2.0.21 - Closes #325 --- pom.xml | 15 +- .../technology/tabula/ObjectExtractor.java | 2 +- src/main/java/technology/tabula/Page.java | 438 +++++++++--------- .../java/technology/tabula/TextStripper.java | 54 ++- src/main/java/technology/tabula/Utils.java | 5 + .../java/technology/tabula/debug/Debug.java | 2 +- .../detectors/NurminenDetectionAlgorithm.java | 4 +- .../tabula/TestProjectionProfile.java | 4 +- .../java/technology/tabula/TestUtils.java | 2 +- 9 files changed, 302 insertions(+), 224 deletions(-) diff --git a/pom.xml b/pom.xml index 366b6bce..e327d1af 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,19 @@ + + + snapshots + https://repository.apache.org/content/repositories/snapshots/ + + false + + + true + + + + scm:git:git@github.com:tabulapdf/tabula-java.git scm:git:git@github.com:tabulapdf/tabula-java.git @@ -237,7 +250,7 @@ org.apache.pdfbox pdfbox - 2.0.15 + 2.0.21-SNAPSHOT diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 87c2a2f9..3998ba6f 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -42,7 +42,7 @@ protected Page extractPage(Integer pageNumber) throws IOException { h = p.getCropBox().getHeight(); } - return new Page(0, 0, w, h, pageRotation, pageNumber, p, pdfTextStripper.textElements, + return new Page(0, 0, w, h, pageRotation, pageNumber, p, this.pdfDocument, pdfTextStripper.textElements, se.rulings, pdfTextStripper.minCharWidth, pdfTextStripper.minCharHeight, pdfTextStripper.spatialIndex); } diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index e8c1d636..3207bcb9 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -6,237 +6,243 @@ import java.util.Comparator; import java.util.List; +import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @SuppressWarnings("serial") // TODO: this class should probably be called "PageArea" or something like that public class Page extends Rectangle { - private Integer rotation; - private int pageNumber; - private List texts; - private List rulings, cleanRulings = null, verticalRulingLines = null, horizontalRulingLines = null; - private float minCharWidth; - private float minCharHeight; - private RectangleSpatialIndex spatial_index; - private PDPage pdPage; - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage) { - super(top, left, width, height); - this.rotation = rotation; - this.pageNumber = page_number; - this.pdPage = pdPage; - } - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, - List characters, List rulings) { - - this(top, left, width, height, rotation, page_number, pdPage); - this.texts = characters; - this.rulings = rulings; - } - - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, - List characters, List rulings, - float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { - - this(top, left, width, height, rotation, page_number, pdPage, characters, rulings); - this.minCharHeight = minCharHeight; - this.minCharWidth = minCharWidth; - this.spatial_index = index; - } + private Integer rotation; + private int pageNumber; + private List texts; + private List rulings, cleanRulings = null, verticalRulingLines = null, horizontalRulingLines = null; + private float minCharWidth; + private float minCharHeight; + private RectangleSpatialIndex spatial_index; + private PDPage pdPage; + private PDDocument pdDoc; + + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc) { + super(top, left, width, height); + this.rotation = rotation; + this.pageNumber = page_number; + this.pdPage = pdPage; + this.pdDoc = doc; + } + + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, + List characters, List rulings) { + + this(top, left, width, height, rotation, page_number, pdPage, doc); + this.texts = characters; + this.rulings = rulings; + } + + + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, + List characters, List rulings, + float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { + + this(top, left, width, height, rotation, page_number, pdPage, doc, characters, rulings); + this.minCharHeight = minCharHeight; + this.minCharWidth = minCharWidth; + this.spatial_index = index; + } + + public Page getArea(Rectangle area) { + List t = getText(area); + float min_char_width = 7; + float min_char_height = 7; + + if(t.size() > 0){ + min_char_width = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.width, te2.width); + }}).width; + min_char_height = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.height, te2.height); + }}).height; + } + Page rv = new Page( + area.getTop(), + area.getLeft(), + (float) area.getWidth(), + (float) area.getHeight(), + rotation, + pageNumber, + pdPage, + pdDoc, + t, + Ruling.cropRulingsToArea(getRulings(), area), + min_char_width, + min_char_height, + spatial_index); + + rv.addRuling(new Ruling( + new Point2D.Double(rv.getLeft(), + rv.getTop()), + new Point2D.Double(rv.getRight(), + rv.getTop()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getRight(), + rv.getTop()), + new Point2D.Double(rv.getRight(), + rv.getBottom()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getRight(), + rv.getBottom()), + new Point2D.Double(rv.getLeft(), + rv.getBottom()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getLeft(), + rv.getBottom()), + new Point2D.Double(rv.getLeft(), + rv.getTop()))); + + return rv; + } + + public Page getArea(float top, float left, float bottom, float right) { + Rectangle area = new Rectangle(top, left, right - left, bottom - top); + return this.getArea(area); + } + + public List getText() { + return texts; + } + + public List getText(Rectangle area) { + return this.spatial_index.contains(area); + } + + /** @deprecated use {@linkplain #getText(Rectangle)} instead */ + @Deprecated public List getText(float top, float left, float bottom, float right) { + return this.getText(new Rectangle(top, left, right - left, bottom - top)); + } + + public Integer getRotation() { + return rotation; + } + + public int getPageNumber() { + return pageNumber; + } + + /** @deprecated use {@linkplain #getText()} instead */ + @Deprecated public List getTexts() { + return texts; + } + + /** + * Returns the minimum bounding box that contains all the TextElements on this Page + */ + public Rectangle getTextBounds() { + List texts = this.getText(); + if (!texts.isEmpty()) { + return Utils.bounds(texts); + } + else { + return new Rectangle(); + } + + } + + public List getRulings() { + if (this.cleanRulings != null) { + return this.cleanRulings; + } + + if (this.rulings == null || this.rulings.isEmpty()) { + this.verticalRulingLines = new ArrayList<>(); + this.horizontalRulingLines = new ArrayList<>(); + return new ArrayList<>(); + } + + Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); + + List vrs = new ArrayList<>(); + for (Ruling vr: this.rulings) { + if (vr.vertical()) { + vrs.add(vr); + } + } + this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); + + List hrs = new ArrayList<>(); + for (Ruling hr: this.rulings) { + if (hr.horizontal()) { + hrs.add(hr); + } + } + this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); + + this.cleanRulings = new ArrayList<>(this.verticalRulingLines); + this.cleanRulings.addAll(this.horizontalRulingLines); + + return this.cleanRulings; + + } + + public List getVerticalRulings() { + if (this.verticalRulingLines != null) { + return this.verticalRulingLines; + } + this.getRulings(); + return this.verticalRulingLines; + } - public Page getArea(Rectangle area) { - List t = getText(area); - float min_char_width = 7; - float min_char_height = 7; - - if(t.size() > 0){ - min_char_width = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.width, te2.width); - }}).width; - min_char_height = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.height, te2.height); - }}).height; - } - Page rv = new Page( - area.getTop(), - area.getLeft(), - (float) area.getWidth(), - (float) area.getHeight(), - rotation, - pageNumber, - pdPage, - t, - Ruling.cropRulingsToArea(getRulings(), area), - min_char_width, - min_char_height, - spatial_index); - - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getTop()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getTop()))); - - return rv; - } - - public Page getArea(float top, float left, float bottom, float right) { - Rectangle area = new Rectangle(top, left, right - left, bottom - top); - return this.getArea(area); - } - - public List getText() { - return texts; - } - - public List getText(Rectangle area) { - return this.spatial_index.contains(area); - } - - /** @deprecated use {@linkplain #getText(Rectangle)} instead */ - @Deprecated public List getText(float top, float left, float bottom, float right) { - return this.getText(new Rectangle(top, left, right - left, bottom - top)); + public List getHorizontalRulings() { + if (this.horizontalRulingLines != null) { + return this.horizontalRulingLines; } + this.getRulings(); + return this.horizontalRulingLines; + } - public Integer getRotation() { - return rotation; + public void addRuling(Ruling r) { + if (r.oblique()) { + throw new UnsupportedOperationException("Can't add an oblique ruling"); } + this.rulings.add(r); + // clear caches + this.verticalRulingLines = null; + this.horizontalRulingLines = null; + this.cleanRulings = null; + } - public int getPageNumber() { - return pageNumber; - } + public List getUnprocessedRulings() { + return this.rulings; + } - /** @deprecated use {@linkplain #getText()} instead */ - @Deprecated public List getTexts() { - return texts; - } - - /** - * Returns the minimum bounding box that contains all the TextElements on this Page - */ - public Rectangle getTextBounds() { - List texts = this.getText(); - if (!texts.isEmpty()) { - return Utils.bounds(texts); - } - else { - return new Rectangle(); - } - - } + /** @deprecated with no replacement */ + @Deprecated public float getMinCharWidth() { + return minCharWidth; + } - public List getRulings() { - if (this.cleanRulings != null) { - return this.cleanRulings; - } - - if (this.rulings == null || this.rulings.isEmpty()) { - this.verticalRulingLines = new ArrayList<>(); - this.horizontalRulingLines = new ArrayList<>(); - return new ArrayList<>(); - } - - Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); - - List vrs = new ArrayList<>(); - for (Ruling vr: this.rulings) { - if (vr.vertical()) { - vrs.add(vr); - } - } - this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); - - List hrs = new ArrayList<>(); - for (Ruling hr: this.rulings) { - if (hr.horizontal()) { - hrs.add(hr); - } - } - this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); - - this.cleanRulings = new ArrayList<>(this.verticalRulingLines); - this.cleanRulings.addAll(this.horizontalRulingLines); - - return this.cleanRulings; - - } - - public List getVerticalRulings() { - if (this.verticalRulingLines != null) { - return this.verticalRulingLines; - } - this.getRulings(); - return this.verticalRulingLines; - } - - public List getHorizontalRulings() { - if (this.horizontalRulingLines != null) { - return this.horizontalRulingLines; - } - this.getRulings(); - return this.horizontalRulingLines; - } - - public void addRuling(Ruling r) { - if (r.oblique()) { - throw new UnsupportedOperationException("Can't add an oblique ruling"); - } - this.rulings.add(r); - // clear caches - this.verticalRulingLines = null; - this.horizontalRulingLines = null; - this.cleanRulings = null; - } - - public List getUnprocessedRulings() { - return this.rulings; - } + /** @deprecated with no replacement */ + @Deprecated public float getMinCharHeight() { + return minCharHeight; + } - /** @deprecated with no replacement */ - @Deprecated public float getMinCharWidth() { - return minCharWidth; - } + public PDPage getPDPage() { + return pdPage; + } - /** @deprecated with no replacement */ - @Deprecated public float getMinCharHeight() { - return minCharHeight; - } + public PDDocument getPDDoc() { + return pdDoc; + } - public PDPage getPDPage() { - return pdPage; - } + /** @deprecated with no replacement */ + @Deprecated public RectangleSpatialIndex getSpatialIndex() { + return this.spatial_index; + } - /** @deprecated with no replacement */ - @Deprecated public RectangleSpatialIndex getSpatialIndex() { - return this.spatial_index; - } - - /** @deprecated with no replacement */ - @Deprecated public boolean hasText() { - return this.texts.size() > 0; - } - - + /** @deprecated with no replacement */ + @Deprecated public boolean hasText() { + return this.texts.size() > 0; + } } diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index 3e1c82a1..219dfa42 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -1,6 +1,10 @@ package technology.tabula; +import org.apache.fontbox.util.BoundingBox; import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDFontDescriptor; +import org.apache.pdfbox.pdmodel.font.PDType3Font; import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.TextPosition; @@ -68,6 +72,54 @@ protected void writeString(String string, List textPositions) thro } } + @Override + protected float computeFontHeight(PDFont font) throws IOException + { + BoundingBox bbox = font.getBoundingBox(); + if (bbox.getLowerLeftY() < Short.MIN_VALUE) + { + // PDFBOX-2158 and PDFBOX-3130 + // files by Salmat eSolutions / ClibPDF Library + bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536)); + } + // 1/2 the bbox is used as the height todo: why? + float glyphHeight = bbox.getHeight() / 2; + + // sometimes the bbox has very high values, but CapHeight is OK + PDFontDescriptor fontDescriptor = font.getFontDescriptor(); + if (fontDescriptor != null) + { + float capHeight = fontDescriptor.getCapHeight(); + if (Float.compare(capHeight, 0) != 0 && + (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0)) + { + glyphHeight = capHeight; + } + // PDFBOX-3464, PDFBOX-448: + // sometimes even CapHeight has very high value, but Ascent and Descent are ok + float ascent = fontDescriptor.getAscent(); + float descent = fontDescriptor.getDescent(); + if (ascent > 0 && descent < 0 && + ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0)) + { + glyphHeight = (ascent - descent) / 2; + } + } + + // transformPoint from glyph space -> text space + float height; + if (font instanceof PDType3Font) + { + height = font.getFontMatrix().transformPoint(0, glyphHeight).y; + } + else + { + height = glyphHeight / 1000; + } + + return height; + } + private boolean isPrintable(String s) { Character c; Character.UnicodeBlock block; @@ -79,4 +131,4 @@ private boolean isPrintable(String s) { } return printable; } -} \ No newline at end of file +} diff --git a/src/main/java/technology/tabula/Utils.java b/src/main/java/technology/tabula/Utils.java index 35c6cc4d..00814429 100644 --- a/src/main/java/technology/tabula/Utils.java +++ b/src/main/java/technology/tabula/Utils.java @@ -280,4 +280,9 @@ public static BufferedImage pageConvertToImage(PDPage page, int dpi, ImageType i } } + public static BufferedImage pageConvertToImage(PDDocument doc, PDPage page, int dpi, ImageType imageType) throws IOException { + PDFRenderer renderer = new PDFRenderer(doc); + return renderer.renderImageWithDPI(doc.getPages().indexOf(page), dpi, imageType); + } + } diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index f9f923b5..91609045 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -227,7 +227,7 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re PDPage p = document.getPage(pageNumber); - BufferedImage image = Utils.pageConvertToImage(p, 72, ImageType.RGB); + BufferedImage image = Utils.pageConvertToImage(document, p, 72, ImageType.RGB); Graphics2D g = (Graphics2D) image.getGraphics(); diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index fe30ae8d..74898e3e 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -106,7 +106,7 @@ public List detect(Page page) { BufferedImage image; PDPage pdfPage = page.getPDPage(); try { - image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); + image = Utils.pageConvertToImage(page.getPDDoc(), pdfPage, 144, ImageType.GRAY); } catch (IOException e) { return new ArrayList<>(); } @@ -118,7 +118,7 @@ public List detect(Page page) { try { removeTextDocument = this.removeText(pdfPage); pdfPage = removeTextDocument.getPage(0); - image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); + image = Utils.pageConvertToImage(removeTextDocument, pdfPage, 144, ImageType.GRAY); } catch (Exception e) { return new ArrayList<>(); } finally { diff --git a/src/test/java/technology/tabula/TestProjectionProfile.java b/src/test/java/technology/tabula/TestProjectionProfile.java index 44d488eb..4a3462f9 100644 --- a/src/test/java/technology/tabula/TestProjectionProfile.java +++ b/src/test/java/technology/tabula/TestProjectionProfile.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; +import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.junit.Before; @@ -18,6 +19,7 @@ public class TestProjectionProfile { @Before public void setUpProjectionProfile() { PDPage pdPage = new PDPage(); + PDDocument pdDocument = new PDDocument(); TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); TextElement textElement2 = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); @@ -30,7 +32,7 @@ public void setUpProjectionProfile() { rulingList.add(ruling); - page = new Page(0, 0, 1, 1, 0, 1, pdPage, textList, rulingList); + page = new Page(0, 0, 1, 1, 0, 1, pdPage, pdDocument, textList, rulingList); List rectangles = new ArrayList<>(); rectangles.add(new Rectangle(0f, 0f, 500f, 5f)); diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index db634d89..e68411df 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -124,7 +124,7 @@ public void testQuickSortLongList() { public void testJPEG2000DoesNotRaise() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/jpeg2000.pdf")); PDPage page = pdf_document.getPage(0); - Utils.pageConvertToImage(page, 360, ImageType.RGB); + Utils.pageConvertToImage(pdf_document, page, 360, ImageType.RGB); } } From b2b8b69488fc9f4e502d40dda1f7c60f8b9c6fa7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 17:00:32 -0300 Subject: [PATCH 142/245] Bump gson from 2.8.5 to 2.8.6 (#322) Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.6. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.6) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 366b6bce..3c019b7d 100644 --- a/pom.xml +++ b/pom.xml @@ -274,7 +274,7 @@ com.google.code.gson gson - 2.8.5 + 2.8.6 From f2f64cfd2e1813b1d85e36192f775d1561c05e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 12 Jul 2020 13:54:00 -0300 Subject: [PATCH 143/245] getFontSize -> getFontSizeInPt (Closes #277) --- src/main/java/technology/tabula/TextStripper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index 3e1c82a1..2b150177 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -55,7 +55,7 @@ protected void writeString(String string, List textPositions) thro TextElement te = new TextElement(Utils.round(textPosition.getYDirAdj() - h, 2), Utils.round(textPosition.getXDirAdj(), 2), Utils.round(textPosition.getWidthDirAdj(), 2), - Utils.round(textPosition.getHeightDir(), 2), textPosition.getFont(), textPosition.getFontSize(), c, + Utils.round(textPosition.getHeightDir(), 2), textPosition.getFont(), textPosition.getFontSizeInPt(), c, // workaround a possible bug in PDFBox: // https://issues.apache.org/jira/browse/PDFBOX-1755 wos, textPosition.getDir()); From 34a829ff376572ca6953d53077126061808c600d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 12 Jul 2020 14:40:58 -0300 Subject: [PATCH 144/245] fix tests --- src/test/java/technology/tabula/TestCommandLineApp.java | 5 ++--- src/test/resources/technology/tabula/json/AnimalSounds1.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index 4a9a91bd..341c5d55 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -199,7 +199,7 @@ public void testLatticeModeWithColumnOption() throws ParseException, IOException "src/test/resources/technology/tabula/AnimalSounds.pdf", "-p", "1", "-c", "59,218,331,551", "-l", - "-f", "CSV" + "-r", "CSV" })); } @@ -211,9 +211,8 @@ public void testLatticeModeWithColumnAndMultipleAreasOption() throws ParseExcept "src/test/resources/technology/tabula/AnimalSounds1.pdf", "-p", "1", "-c", "57,136,197,296,314,391,457,553", "-a", "%0,0,100,50", "-a", "%0,50,100,100", - "-l", "-f", "JSON" + "-r", "-f", "JSON" }); - System.out.println("Returned Json: \n" + resultJson); assertEquals(expectedJson, resultJson); } diff --git a/src/test/resources/technology/tabula/json/AnimalSounds1.json b/src/test/resources/technology/tabula/json/AnimalSounds1.json index c9fd334a..c13c6759 100644 --- a/src/test/resources/technology/tabula/json/AnimalSounds1.json +++ b/src/test/resources/technology/tabula/json/AnimalSounds1.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":0.006499578,"left":56.8,"width":241.1999969482422,"height":315.36407470703125,"data":[[{"top":0.006499578,"left":56.8,"width":79.19999694824219,"height":95.31405639648438,"text":"Animal"},{"top":0.006499578,"left":136.0,"width":61.0,"height":95.31405639648438,"text":"Action"},{"top":0.006499578,"left":197.0,"width":101.0,"height":95.31405639648438,"text":"Result"}],[{"top":95.32056,"left":56.8,"width":79.19999694824219,"height":23.050010681152344,"text":"Cat"},{"top":95.32056,"left":136.0,"width":61.0,"height":23.050010681152344,"text":"Says"},{"top":95.32056,"left":197.0,"width":101.0,"height":23.050010681152344,"text":"Meow"}],[{"top":118.37057,"left":56.8,"width":79.19999694824219,"height":63.99999237060547,"text":"Parastratiosph\recomyiastratio\rsphecomyioid\res"},{"top":118.37057,"left":136.0,"width":61.0,"height":63.99999237060547,"text":"Says"},{"top":118.37057,"left":197.0,"width":101.0,"height":63.99999237060547,"text":"bzzzzzzz"}],[{"top":182.37056,"left":56.8,"width":79.19999694824219,"height":133.00001525878906,"text":"Fox"},{"top":182.37056,"left":136.0,"width":61.0,"height":133.00001525878906,"text":"Says"},{"top":182.37056,"left":197.0,"width":101.0,"height":133.00001525878906,"text":"Ring-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding"}]]},{"extraction_method":"lattice","top":0.006499578,"left":313.35715,"width":241.55941772460938,"height":259.2640380859375,"data":[[{"top":0.006499578,"left":313.35715,"width":77.64285278320312,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":391.0,"width":66.0,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":457.0,"width":97.91656494140625,"height":72.26405334472656,"text":""}],[{"top":72.27055,"left":313.35715,"width":77.64285278320312,"height":23.050003051757812,"text":"Animal"},{"top":72.27055,"left":391.0,"width":66.0,"height":23.050003051757812,"text":"Action"},{"top":72.27055,"left":457.0,"width":97.91656494140625,"height":23.050003051757812,"text":"Result"}],[{"top":95.32056,"left":313.35715,"width":77.64285278320312,"height":35.94999694824219,"text":"Dogs/wolves/\rMore dogs"},{"top":95.32056,"left":391.0,"width":66.0,"height":35.94999694824219,"text":"Says"},{"top":95.32056,"left":457.0,"width":97.91656494140625,"height":35.94999694824219,"text":"Bow-wow/\rruff-ruff"}],[{"top":131.27055,"left":313.35715,"width":77.64285278320312,"height":36.40000915527344,"text":"Donkey"},{"top":131.27055,"left":391.0,"width":66.0,"height":36.40000915527344,"text":"Says"},{"top":131.27055,"left":457.0,"width":97.91656494140625,"height":36.40000915527344,"text":"Hee-Haw Hee-\rHaw"}],[{"top":167.67056,"left":313.35715,"width":77.64285278320312,"height":91.5999755859375,"text":"Fox"},{"top":167.67056,"left":391.0,"width":66.0,"height":91.5999755859375,"text":"Says"},{"top":167.67056,"left":457.0,"width":97.91656494140625,"height":91.5999755859375,"text":"Wa-pa-pa-pa-\rpa-pa-pow\rWa-pa-pa-pa-\rpa-pow\rWa-pa-pa-pa-\rpa-pa-pow"}]]}] \ No newline at end of file +[{"extraction_method":"lattice","top":0.006499578,"left":56.8,"width":241.1999969482422,"height":315.36407470703125,"right":298.0,"bottom":315.37057,"data":[[{"top":0.006499578,"left":56.8,"width":79.19999694824219,"height":95.31405639648438,"text":"Animal"},{"top":0.006499578,"left":136.0,"width":61.0,"height":95.31405639648438,"text":"Action"},{"top":0.006499578,"left":197.0,"width":101.0,"height":95.31405639648438,"text":"Result"}],[{"top":95.32056,"left":56.8,"width":79.19999694824219,"height":23.050010681152344,"text":"Cat"},{"top":95.32056,"left":136.0,"width":61.0,"height":23.050010681152344,"text":"Says"},{"top":95.32056,"left":197.0,"width":101.0,"height":23.050010681152344,"text":"Meow"}],[{"top":118.37057,"left":56.8,"width":79.19999694824219,"height":63.99999237060547,"text":"Parastratiosph\recomyiastratio\rsphecomyioid\res"},{"top":118.37057,"left":136.0,"width":61.0,"height":63.99999237060547,"text":"Says"},{"top":118.37057,"left":197.0,"width":101.0,"height":63.99999237060547,"text":"bzzzzzzz"}],[{"top":182.37056,"left":56.8,"width":79.19999694824219,"height":133.00001525878906,"text":"Fox"},{"top":182.37056,"left":136.0,"width":61.0,"height":133.00001525878906,"text":"Says"},{"top":182.37056,"left":197.0,"width":101.0,"height":133.00001525878906,"text":"Ring-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding"}]]},{"extraction_method":"lattice","top":0.006499578,"left":313.35715,"width":241.55941772460938,"height":259.2640380859375,"right":554.91656,"bottom":259.27054,"data":[[{"top":0.006499578,"left":313.35715,"width":77.64285278320312,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":391.0,"width":66.0,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":457.0,"width":97.91656494140625,"height":72.26405334472656,"text":""}],[{"top":72.27055,"left":313.35715,"width":77.64285278320312,"height":23.050003051757812,"text":"Animal"},{"top":72.27055,"left":391.0,"width":66.0,"height":23.050003051757812,"text":"Action"},{"top":72.27055,"left":457.0,"width":97.91656494140625,"height":23.050003051757812,"text":"Result"}],[{"top":95.32056,"left":313.35715,"width":77.64285278320312,"height":35.94999694824219,"text":"Dogs/wolves/\rMore dogs"},{"top":95.32056,"left":391.0,"width":66.0,"height":35.94999694824219,"text":"Says"},{"top":95.32056,"left":457.0,"width":97.91656494140625,"height":35.94999694824219,"text":"Bow-wow/\rruff-ruff"}],[{"top":131.27055,"left":313.35715,"width":77.64285278320312,"height":36.40000915527344,"text":"Donkey"},{"top":131.27055,"left":391.0,"width":66.0,"height":36.40000915527344,"text":"Says"},{"top":131.27055,"left":457.0,"width":97.91656494140625,"height":36.40000915527344,"text":"Hee-Haw Hee-\rHaw"}],[{"top":167.67056,"left":313.35715,"width":77.64285278320312,"height":91.5999755859375,"text":"Fox"},{"top":167.67056,"left":391.0,"width":66.0,"height":91.5999755859375,"text":"Says"},{"top":167.67056,"left":457.0,"width":97.91656494140625,"height":91.5999755859375,"text":"Wa-pa-pa-pa-\rpa-pa-pow\rWa-pa-pa-pa-\rpa-pow\rWa-pa-pa-pa-\rpa-pa-pow"}]]}] From 82ad2ed7632ce72a55331d98dc766ee26f2fdbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 12 Jul 2020 14:46:56 -0300 Subject: [PATCH 145/245] fix test --- src/test/java/technology/tabula/TestCommandLineApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/technology/tabula/TestCommandLineApp.java b/src/test/java/technology/tabula/TestCommandLineApp.java index 341c5d55..5a4e3af5 100644 --- a/src/test/java/technology/tabula/TestCommandLineApp.java +++ b/src/test/java/technology/tabula/TestCommandLineApp.java @@ -198,8 +198,8 @@ public void testLatticeModeWithColumnOption() throws ParseException, IOException assertEquals(expectedCsv, this.csvFromCommandLineArgs(new String[]{ "src/test/resources/technology/tabula/AnimalSounds.pdf", "-p", "1", "-c", - "59,218,331,551", "-l", - "-r", "CSV" + "59,218,331,551", + "-r", "-f", "CSV" })); } From dbeff6e393f995281c3aa8f669ed71edf587b593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 29 Jul 2020 10:11:19 -0300 Subject: [PATCH 146/245] CommandLineApp: disable unused --debug flag --- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 6431dbb2..6e26e7cd 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -315,7 +315,7 @@ public static Options buildOptions() { o.addOption("t", "stream", false, "Force PDF to be extracted using stream-mode extraction (if there are no ruling lines separating each cell)"); o.addOption("i", "silent", false, "Suppress all stderr output."); o.addOption("u", "use-line-returns", false, "Use embedded line returns in cells. (Only in spreadsheet mode.)"); - o.addOption("d", "debug", false, "Print detected table areas instead of processing."); + // o.addOption("d", "debug", false, "Print detected table areas instead of processing."); o.addOption(Option.builder("b") .longOpt("batch") .desc("Convert all .pdfs in the provided directory.") From 5bfe84d409d661d9c4c9de04102829177207f9aa Mon Sep 17 00:00:00 2001 From: travisbeale Date: Fri, 14 Aug 2020 09:22:49 -0400 Subject: [PATCH 147/245] Added a heuristic to filter out tall-ish whitespace elements that can throw off text chunking --- src/main/java/technology/tabula/TextStripper.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index 2b150177..429ff304 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -10,11 +10,14 @@ public class TextStripper extends PDFTextStripper { private static final String NBSP = "\u00A0"; + private static final float AVG_HEIGHT_MULT_THRESHOLD = 6.0f; private PDDocument document; public ArrayList textElements; public RectangleSpatialIndex spatialIndex; public float minCharWidth = Float.MAX_VALUE; public float minCharHeight = Float.MAX_VALUE; + public float totalHeight = 0.0f; + public int countHeight = 0; public TextStripper(PDDocument document, int pageNumber) throws IOException { super(); @@ -62,7 +65,17 @@ protected void writeString(String string, List textPositions) thro this.minCharWidth = (float) Math.min(this.minCharWidth, te.getWidth()); this.minCharHeight = (float) Math.min(this.minCharHeight, te.getHeight()); - + + countHeight++; + totalHeight += te.getHeight(); + float avgHeight = totalHeight / countHeight; + + if (avgHeight > 0 + && te.getHeight() >= (avgHeight * AVG_HEIGHT_MULT_THRESHOLD) + && (te.getText() == null || te.getText().trim().equals(""))) { + continue; + } + this.spatialIndex.add(te); this.textElements.add(te); } From 85c27ab88285c903ee89db94725543fe314482f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 10 Jul 2020 16:25:46 -0300 Subject: [PATCH 148/245] Upgrade PDFbox to 2.0.21 - Closes #325 --- pom.xml | 15 +- .../technology/tabula/ObjectExtractor.java | 2 +- src/main/java/technology/tabula/Page.java | 438 +++++++++--------- .../java/technology/tabula/TextStripper.java | 54 ++- src/main/java/technology/tabula/Utils.java | 5 + .../java/technology/tabula/debug/Debug.java | 2 +- .../detectors/NurminenDetectionAlgorithm.java | 4 +- .../tabula/TestProjectionProfile.java | 4 +- .../java/technology/tabula/TestUtils.java | 2 +- 9 files changed, 302 insertions(+), 224 deletions(-) diff --git a/pom.xml b/pom.xml index 3c019b7d..52f29f50 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,19 @@ + + + snapshots + https://repository.apache.org/content/repositories/snapshots/ + + false + + + true + + + + scm:git:git@github.com:tabulapdf/tabula-java.git scm:git:git@github.com:tabulapdf/tabula-java.git @@ -237,7 +250,7 @@ org.apache.pdfbox pdfbox - 2.0.15 + 2.0.21-SNAPSHOT diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 87c2a2f9..3998ba6f 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -42,7 +42,7 @@ protected Page extractPage(Integer pageNumber) throws IOException { h = p.getCropBox().getHeight(); } - return new Page(0, 0, w, h, pageRotation, pageNumber, p, pdfTextStripper.textElements, + return new Page(0, 0, w, h, pageRotation, pageNumber, p, this.pdfDocument, pdfTextStripper.textElements, se.rulings, pdfTextStripper.minCharWidth, pdfTextStripper.minCharHeight, pdfTextStripper.spatialIndex); } diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index e8c1d636..3207bcb9 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -6,237 +6,243 @@ import java.util.Comparator; import java.util.List; +import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @SuppressWarnings("serial") // TODO: this class should probably be called "PageArea" or something like that public class Page extends Rectangle { - private Integer rotation; - private int pageNumber; - private List texts; - private List rulings, cleanRulings = null, verticalRulingLines = null, horizontalRulingLines = null; - private float minCharWidth; - private float minCharHeight; - private RectangleSpatialIndex spatial_index; - private PDPage pdPage; - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage) { - super(top, left, width, height); - this.rotation = rotation; - this.pageNumber = page_number; - this.pdPage = pdPage; - } - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, - List characters, List rulings) { - - this(top, left, width, height, rotation, page_number, pdPage); - this.texts = characters; - this.rulings = rulings; - } - - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, - List characters, List rulings, - float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { - - this(top, left, width, height, rotation, page_number, pdPage, characters, rulings); - this.minCharHeight = minCharHeight; - this.minCharWidth = minCharWidth; - this.spatial_index = index; - } + private Integer rotation; + private int pageNumber; + private List texts; + private List rulings, cleanRulings = null, verticalRulingLines = null, horizontalRulingLines = null; + private float minCharWidth; + private float minCharHeight; + private RectangleSpatialIndex spatial_index; + private PDPage pdPage; + private PDDocument pdDoc; + + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc) { + super(top, left, width, height); + this.rotation = rotation; + this.pageNumber = page_number; + this.pdPage = pdPage; + this.pdDoc = doc; + } + + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, + List characters, List rulings) { + + this(top, left, width, height, rotation, page_number, pdPage, doc); + this.texts = characters; + this.rulings = rulings; + } + + + public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, + List characters, List rulings, + float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { + + this(top, left, width, height, rotation, page_number, pdPage, doc, characters, rulings); + this.minCharHeight = minCharHeight; + this.minCharWidth = minCharWidth; + this.spatial_index = index; + } + + public Page getArea(Rectangle area) { + List t = getText(area); + float min_char_width = 7; + float min_char_height = 7; + + if(t.size() > 0){ + min_char_width = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.width, te2.width); + }}).width; + min_char_height = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.height, te2.height); + }}).height; + } + Page rv = new Page( + area.getTop(), + area.getLeft(), + (float) area.getWidth(), + (float) area.getHeight(), + rotation, + pageNumber, + pdPage, + pdDoc, + t, + Ruling.cropRulingsToArea(getRulings(), area), + min_char_width, + min_char_height, + spatial_index); + + rv.addRuling(new Ruling( + new Point2D.Double(rv.getLeft(), + rv.getTop()), + new Point2D.Double(rv.getRight(), + rv.getTop()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getRight(), + rv.getTop()), + new Point2D.Double(rv.getRight(), + rv.getBottom()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getRight(), + rv.getBottom()), + new Point2D.Double(rv.getLeft(), + rv.getBottom()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getLeft(), + rv.getBottom()), + new Point2D.Double(rv.getLeft(), + rv.getTop()))); + + return rv; + } + + public Page getArea(float top, float left, float bottom, float right) { + Rectangle area = new Rectangle(top, left, right - left, bottom - top); + return this.getArea(area); + } + + public List getText() { + return texts; + } + + public List getText(Rectangle area) { + return this.spatial_index.contains(area); + } + + /** @deprecated use {@linkplain #getText(Rectangle)} instead */ + @Deprecated public List getText(float top, float left, float bottom, float right) { + return this.getText(new Rectangle(top, left, right - left, bottom - top)); + } + + public Integer getRotation() { + return rotation; + } + + public int getPageNumber() { + return pageNumber; + } + + /** @deprecated use {@linkplain #getText()} instead */ + @Deprecated public List getTexts() { + return texts; + } + + /** + * Returns the minimum bounding box that contains all the TextElements on this Page + */ + public Rectangle getTextBounds() { + List texts = this.getText(); + if (!texts.isEmpty()) { + return Utils.bounds(texts); + } + else { + return new Rectangle(); + } + + } + + public List getRulings() { + if (this.cleanRulings != null) { + return this.cleanRulings; + } + + if (this.rulings == null || this.rulings.isEmpty()) { + this.verticalRulingLines = new ArrayList<>(); + this.horizontalRulingLines = new ArrayList<>(); + return new ArrayList<>(); + } + + Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); + + List vrs = new ArrayList<>(); + for (Ruling vr: this.rulings) { + if (vr.vertical()) { + vrs.add(vr); + } + } + this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); + + List hrs = new ArrayList<>(); + for (Ruling hr: this.rulings) { + if (hr.horizontal()) { + hrs.add(hr); + } + } + this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); + + this.cleanRulings = new ArrayList<>(this.verticalRulingLines); + this.cleanRulings.addAll(this.horizontalRulingLines); + + return this.cleanRulings; + + } + + public List getVerticalRulings() { + if (this.verticalRulingLines != null) { + return this.verticalRulingLines; + } + this.getRulings(); + return this.verticalRulingLines; + } - public Page getArea(Rectangle area) { - List t = getText(area); - float min_char_width = 7; - float min_char_height = 7; - - if(t.size() > 0){ - min_char_width = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.width, te2.width); - }}).width; - min_char_height = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.height, te2.height); - }}).height; - } - Page rv = new Page( - area.getTop(), - area.getLeft(), - (float) area.getWidth(), - (float) area.getHeight(), - rotation, - pageNumber, - pdPage, - t, - Ruling.cropRulingsToArea(getRulings(), area), - min_char_width, - min_char_height, - spatial_index); - - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getTop()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getTop()))); - - return rv; - } - - public Page getArea(float top, float left, float bottom, float right) { - Rectangle area = new Rectangle(top, left, right - left, bottom - top); - return this.getArea(area); - } - - public List getText() { - return texts; - } - - public List getText(Rectangle area) { - return this.spatial_index.contains(area); - } - - /** @deprecated use {@linkplain #getText(Rectangle)} instead */ - @Deprecated public List getText(float top, float left, float bottom, float right) { - return this.getText(new Rectangle(top, left, right - left, bottom - top)); + public List getHorizontalRulings() { + if (this.horizontalRulingLines != null) { + return this.horizontalRulingLines; } + this.getRulings(); + return this.horizontalRulingLines; + } - public Integer getRotation() { - return rotation; + public void addRuling(Ruling r) { + if (r.oblique()) { + throw new UnsupportedOperationException("Can't add an oblique ruling"); } + this.rulings.add(r); + // clear caches + this.verticalRulingLines = null; + this.horizontalRulingLines = null; + this.cleanRulings = null; + } - public int getPageNumber() { - return pageNumber; - } + public List getUnprocessedRulings() { + return this.rulings; + } - /** @deprecated use {@linkplain #getText()} instead */ - @Deprecated public List getTexts() { - return texts; - } - - /** - * Returns the minimum bounding box that contains all the TextElements on this Page - */ - public Rectangle getTextBounds() { - List texts = this.getText(); - if (!texts.isEmpty()) { - return Utils.bounds(texts); - } - else { - return new Rectangle(); - } - - } + /** @deprecated with no replacement */ + @Deprecated public float getMinCharWidth() { + return minCharWidth; + } - public List getRulings() { - if (this.cleanRulings != null) { - return this.cleanRulings; - } - - if (this.rulings == null || this.rulings.isEmpty()) { - this.verticalRulingLines = new ArrayList<>(); - this.horizontalRulingLines = new ArrayList<>(); - return new ArrayList<>(); - } - - Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); - - List vrs = new ArrayList<>(); - for (Ruling vr: this.rulings) { - if (vr.vertical()) { - vrs.add(vr); - } - } - this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); - - List hrs = new ArrayList<>(); - for (Ruling hr: this.rulings) { - if (hr.horizontal()) { - hrs.add(hr); - } - } - this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); - - this.cleanRulings = new ArrayList<>(this.verticalRulingLines); - this.cleanRulings.addAll(this.horizontalRulingLines); - - return this.cleanRulings; - - } - - public List getVerticalRulings() { - if (this.verticalRulingLines != null) { - return this.verticalRulingLines; - } - this.getRulings(); - return this.verticalRulingLines; - } - - public List getHorizontalRulings() { - if (this.horizontalRulingLines != null) { - return this.horizontalRulingLines; - } - this.getRulings(); - return this.horizontalRulingLines; - } - - public void addRuling(Ruling r) { - if (r.oblique()) { - throw new UnsupportedOperationException("Can't add an oblique ruling"); - } - this.rulings.add(r); - // clear caches - this.verticalRulingLines = null; - this.horizontalRulingLines = null; - this.cleanRulings = null; - } - - public List getUnprocessedRulings() { - return this.rulings; - } + /** @deprecated with no replacement */ + @Deprecated public float getMinCharHeight() { + return minCharHeight; + } - /** @deprecated with no replacement */ - @Deprecated public float getMinCharWidth() { - return minCharWidth; - } + public PDPage getPDPage() { + return pdPage; + } - /** @deprecated with no replacement */ - @Deprecated public float getMinCharHeight() { - return minCharHeight; - } + public PDDocument getPDDoc() { + return pdDoc; + } - public PDPage getPDPage() { - return pdPage; - } + /** @deprecated with no replacement */ + @Deprecated public RectangleSpatialIndex getSpatialIndex() { + return this.spatial_index; + } - /** @deprecated with no replacement */ - @Deprecated public RectangleSpatialIndex getSpatialIndex() { - return this.spatial_index; - } - - /** @deprecated with no replacement */ - @Deprecated public boolean hasText() { - return this.texts.size() > 0; - } - - + /** @deprecated with no replacement */ + @Deprecated public boolean hasText() { + return this.texts.size() > 0; + } } diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index 429ff304..e437146e 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -1,6 +1,10 @@ package technology.tabula; +import org.apache.fontbox.util.BoundingBox; import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDFontDescriptor; +import org.apache.pdfbox.pdmodel.font.PDType3Font; import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.TextPosition; @@ -81,6 +85,54 @@ protected void writeString(String string, List textPositions) thro } } + @Override + protected float computeFontHeight(PDFont font) throws IOException + { + BoundingBox bbox = font.getBoundingBox(); + if (bbox.getLowerLeftY() < Short.MIN_VALUE) + { + // PDFBOX-2158 and PDFBOX-3130 + // files by Salmat eSolutions / ClibPDF Library + bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536)); + } + // 1/2 the bbox is used as the height todo: why? + float glyphHeight = bbox.getHeight() / 2; + + // sometimes the bbox has very high values, but CapHeight is OK + PDFontDescriptor fontDescriptor = font.getFontDescriptor(); + if (fontDescriptor != null) + { + float capHeight = fontDescriptor.getCapHeight(); + if (Float.compare(capHeight, 0) != 0 && + (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0)) + { + glyphHeight = capHeight; + } + // PDFBOX-3464, PDFBOX-448: + // sometimes even CapHeight has very high value, but Ascent and Descent are ok + float ascent = fontDescriptor.getAscent(); + float descent = fontDescriptor.getDescent(); + if (ascent > 0 && descent < 0 && + ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0)) + { + glyphHeight = (ascent - descent) / 2; + } + } + + // transformPoint from glyph space -> text space + float height; + if (font instanceof PDType3Font) + { + height = font.getFontMatrix().transformPoint(0, glyphHeight).y; + } + else + { + height = glyphHeight / 1000; + } + + return height; + } + private boolean isPrintable(String s) { Character c; Character.UnicodeBlock block; @@ -92,4 +144,4 @@ private boolean isPrintable(String s) { } return printable; } -} \ No newline at end of file +} diff --git a/src/main/java/technology/tabula/Utils.java b/src/main/java/technology/tabula/Utils.java index 35c6cc4d..00814429 100644 --- a/src/main/java/technology/tabula/Utils.java +++ b/src/main/java/technology/tabula/Utils.java @@ -280,4 +280,9 @@ public static BufferedImage pageConvertToImage(PDPage page, int dpi, ImageType i } } + public static BufferedImage pageConvertToImage(PDDocument doc, PDPage page, int dpi, ImageType imageType) throws IOException { + PDFRenderer renderer = new PDFRenderer(doc); + return renderer.renderImageWithDPI(doc.getPages().indexOf(page), dpi, imageType); + } + } diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index f9f923b5..91609045 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -227,7 +227,7 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re PDPage p = document.getPage(pageNumber); - BufferedImage image = Utils.pageConvertToImage(p, 72, ImageType.RGB); + BufferedImage image = Utils.pageConvertToImage(document, p, 72, ImageType.RGB); Graphics2D g = (Graphics2D) image.getGraphics(); diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index fe30ae8d..74898e3e 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -106,7 +106,7 @@ public List detect(Page page) { BufferedImage image; PDPage pdfPage = page.getPDPage(); try { - image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); + image = Utils.pageConvertToImage(page.getPDDoc(), pdfPage, 144, ImageType.GRAY); } catch (IOException e) { return new ArrayList<>(); } @@ -118,7 +118,7 @@ public List detect(Page page) { try { removeTextDocument = this.removeText(pdfPage); pdfPage = removeTextDocument.getPage(0); - image = Utils.pageConvertToImage(pdfPage, 144, ImageType.GRAY); + image = Utils.pageConvertToImage(removeTextDocument, pdfPage, 144, ImageType.GRAY); } catch (Exception e) { return new ArrayList<>(); } finally { diff --git a/src/test/java/technology/tabula/TestProjectionProfile.java b/src/test/java/technology/tabula/TestProjectionProfile.java index 44d488eb..4a3462f9 100644 --- a/src/test/java/technology/tabula/TestProjectionProfile.java +++ b/src/test/java/technology/tabula/TestProjectionProfile.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; +import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.junit.Before; @@ -18,6 +19,7 @@ public class TestProjectionProfile { @Before public void setUpProjectionProfile() { PDPage pdPage = new PDPage(); + PDDocument pdDocument = new PDDocument(); TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); TextElement textElement2 = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); @@ -30,7 +32,7 @@ public void setUpProjectionProfile() { rulingList.add(ruling); - page = new Page(0, 0, 1, 1, 0, 1, pdPage, textList, rulingList); + page = new Page(0, 0, 1, 1, 0, 1, pdPage, pdDocument, textList, rulingList); List rectangles = new ArrayList<>(); rectangles.add(new Rectangle(0f, 0f, 500f, 5f)); diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index db634d89..e68411df 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -124,7 +124,7 @@ public void testQuickSortLongList() { public void testJPEG2000DoesNotRaise() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/jpeg2000.pdf")); PDPage page = pdf_document.getPage(0); - Utils.pageConvertToImage(page, 360, ImageType.RGB); + Utils.pageConvertToImage(pdf_document, page, 360, ImageType.RGB); } } From 3ece59c538b89b20325d216613d5283b965cc808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 21 Aug 2020 16:51:14 -0300 Subject: [PATCH 149/245] Update to PDFBox 2.0.21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52f29f50..de437a39 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ org.apache.pdfbox pdfbox - 2.0.21-SNAPSHOT + 2.0.21 From a4e0d6c41a06bc6c06ef766562f3eeef5a38c22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sat, 22 Aug 2020 20:34:34 -0300 Subject: [PATCH 150/245] prepare for 1.0.4 release --- README.md | 40 +++++++++---------- pom.xml | 2 +- .../technology/tabula/CommandLineApp.java | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 76e25663..2a08d3ac 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,7 @@ tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?bra `tabula-java` is a library for extracting tables from PDF files — it is the table extraction engine that powers [Tabula](http://tabula.technology/) ([repo](http://github.com/tabulapdf/tabula)). You can use `tabula-java` as a command-line tool to programmatically extract tables from PDFs. -(This is the new version of the extraction engine; the previous code can be found at [`tabula-extractor`](http://github.com/tabulapdf/tabula-extractor).) - -© 2014-2018 Manuel Aristarán. Available under MIT License. See [`LICENSE`](LICENSE). +© 2014-2020 Manuel Aristarán. Available under MIT License. See [`LICENSE`](LICENSE). ## Download @@ -17,28 +15,28 @@ Download a version of the tabula-java's jar, with all dependencies included, tha ``` $ java -jar target/tabula-1.0.2-jar-with-dependencies.jar --help -usage: tabula [-a ] [-b ] [-c ] [-d] [-f - ] [-g] [-h] [-i] [-l] [-n] [-o ] [-p ] [-r] - [-s ] [-t] [-u] [-v] +usage: tabula [-a ] [-b ] [-c ] [-f ] + [-g] [-h] [-i] [-l] [-n] [-o ] [-p ] [-r] [-s + ] [-t] [-u] [-v] Tabula helps you extract tables from PDFs - -a,--area Portion of the page to analyze. Example: --area - 269.875,12.75,790.5,561. Accepts - top,left,bottom,right i.e. y1,x1,y2,x2 where all - values are in points relative to the top left - corner. If all values are between 0-100 - (inclusive) and preceded by '%', input will be - taken as % of actual height or width of the page. - Example: --area %0,0,100,50. To specify multiple - areas, -a option should be repeated. Default is - entire page + -a,--area -a/--area = Portion of the page to analyze. + Example: --area 269.875,12.75,790.5,561. + Accepts top,left,bottom,right i.e. y1,x1,y2,x2 + where all values are in points relative to the + top left corner. If all values are between + 0-100 (inclusive) and preceded by '%', input + will be taken as % of actual height or width + of the page. Example: --area %0,0,100,50. To + specify multiple areas, -a option should be + repeated. Default is entire page -b,--batch Convert all .pdfs in the provided directory. - -c,--columns X coordinates of column boundaries where values - are in points and relative to the left of the - page. Example --columns 10.1,20.2,30.3 - -d,--debug Print detected table areas instead of - processing. + -c,--columns X coordinates of column boundaries. Example + --columns 10.1,20.2,30.3. If all values are + between 0-100 (inclusive) and preceded by '%', + input will be taken as % of actual width of + the page. Example: --columns %25,50,80.6 -f,--format Output format: (CSV,TSV,JSON). Default: CSV -g,--guess Guess the portion of the page to analyze per page. diff --git a/pom.xml b/pom.xml index de437a39..c4d97b4b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.4-SNAPSHOT + 1.0.4 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 6e26e7cd..e18f603a 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -30,7 +30,7 @@ public class CommandLineApp { private static String VERSION = "1.0.4"; - private static String VERSION_STRING = String.format("tabula %s (c) 2012-2018 Manuel Aristarán", VERSION); + private static String VERSION_STRING = String.format("tabula %s (c) 2012-2020 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; private static final int RELATIVE_AREA_CALCULATION_MODE = 0; From ebc83ac2bb1a1cbe54ab8081d70f3c9fe81886ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Thu, 3 Sep 2020 10:30:58 -0300 Subject: [PATCH 151/245] Prepare for next release --- pom.xml | 14 +++++++++++++- .../java/technology/tabula/CommandLineApp.java | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c4d97b4b..b88e7f71 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.4 + 1.0.5-SNAPSHOT Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java @@ -112,6 +112,9 @@ org.apache.maven.plugins maven-javadoc-plugin 3.2.0 + + 8 + attach-javadocs @@ -132,6 +135,12 @@ sign + + + --pinentry-mode + loopback + + @@ -187,6 +196,9 @@ org.apache.maven.plugins maven-javadoc-plugin 3.2.0 + + 8 + attach-javadocs diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index e18f603a..1957f6f0 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -29,7 +29,7 @@ public class CommandLineApp { - private static String VERSION = "1.0.4"; + private static String VERSION = "1.0.5"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2020 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; From 21a4932b892acc9762a8b6632d0a6c7e178d4d49 Mon Sep 17 00:00:00 2001 From: travisbeale Date: Tue, 22 Sep 2020 09:11:15 -0400 Subject: [PATCH 152/245] Refine heuristic to filter out tall-ish whitespace elements that can throw off text chunking by considering realistic font sizes --- .../java/technology/tabula/TextStripper.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index e437146e..329d45a2 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -13,8 +13,11 @@ import java.util.List; public class TextStripper extends PDFTextStripper { + private static final String NBSP = "\u00A0"; private static final float AVG_HEIGHT_MULT_THRESHOLD = 6.0f; + private static final float MAX_BLANK_FONT_SIZE = 40.0f; + private static final float MIN_BLANK_FONT_SIZE = 2.0f; private PDDocument document; public ArrayList textElements; public RectangleSpatialIndex spatialIndex; @@ -69,15 +72,24 @@ protected void writeString(String string, List textPositions) thro this.minCharWidth = (float) Math.min(this.minCharWidth, te.getWidth()); this.minCharHeight = (float) Math.min(this.minCharHeight, te.getHeight()); - + countHeight++; totalHeight += te.getHeight(); float avgHeight = totalHeight / countHeight; - if (avgHeight > 0 - && te.getHeight() >= (avgHeight * AVG_HEIGHT_MULT_THRESHOLD) - && (te.getText() == null || te.getText().trim().equals(""))) { - continue; + //We have an issue where tall blank cells throw off the row height calculation + //Introspect a blank cell a bit here to see if it should be thrown away + if ((te.getText() == null || te.getText().trim().equals(""))) { + //if the cell height is more than AVG_HEIGHT_MULT_THRESHOLDxaverage, throw it away + if (avgHeight > 0 + && te.getHeight() >= (avgHeight * AVG_HEIGHT_MULT_THRESHOLD)) { + continue; + } + + //if the font size is outside of reasonable ranges, throw it away + if (textPosition.getFontSizeInPt() > MAX_BLANK_FONT_SIZE || textPosition.getFontSizeInPt() < MIN_BLANK_FONT_SIZE) { + continue; + } } this.spatialIndex.add(te); From 00bee456790c16d9d972de1e5d513b58ced37a48 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 3 Oct 2020 13:08:56 +0200 Subject: [PATCH 153/245] Fixes #379 --- .../technology/tabula/CommandLineApp.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 1957f6f0..3081b9d4 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -44,7 +44,6 @@ public class CommandLineApp { private OutputFormat outputFormat; private String password; private TableExtractor tableExtractor; - private List verticalRulingPositions; public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseException { this.defaultOutput = defaultOutput; @@ -56,10 +55,6 @@ public CommandLineApp(Appendable defaultOutput, CommandLine line) throws ParseEx if (line.hasOption('s')) { this.password = line.getOptionValue('s'); } - if (line.hasOption('c')) { - this.verticalRulingPositions = parseFloatList(line.getOptionValue('c')); - } - } public static void main(String[] args) { @@ -165,12 +160,6 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException while (pageIterator.hasNext()) { Page page = pageIterator.next(); - if (verticalRulingPositions != null) { - for (Float verticalRulingPosition: verticalRulingPositions) { - page.addRuling(new Ruling(0, verticalRulingPosition, 0.0f, (float) page.getHeight())); - } - } - if (pageAreas != null) { for (Pair areaPair : pageAreas) { Rectangle area = areaPair.getRight(); @@ -290,7 +279,15 @@ public static List parseFloatList(String option) throws ParseException { List rv = new ArrayList<>(); try { for (int i = 0; i < f.length; i++) { - rv.add(Float.parseFloat(f[i])); + final String element = f[i]; + + if(element.startsWith("%")) { + + rv.add(Float.parseFloat(element)); + } else { + rv.add(Float.parseFloat(element)); + } + } return rv; } catch (NumberFormatException e) { From 2ab8579ef7dd5a7f9913f243b6e0e766f25f99bd Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 4 Oct 2020 00:36:11 +0200 Subject: [PATCH 154/245] Bugfix (#379) --- .../java/technology/tabula/CommandLineApp.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 3081b9d4..2efb278e 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -160,11 +160,17 @@ private void extractFile(File pdfFile, Appendable outFile) throws ParseException while (pageIterator.hasNext()) { Page page = pageIterator.next(); + if (tableExtractor.verticalRulingPositions != null) { + for (Float verticalRulingPosition : tableExtractor.verticalRulingPositions) { + page.addRuling(new Ruling(0, verticalRulingPosition, 0.0f, (float) page.getHeight())); + } + } + if (pageAreas != null) { for (Pair areaPair : pageAreas) { Rectangle area = areaPair.getRight(); if (areaPair.getLeft() == RELATIVE_AREA_CALCULATION_MODE) { - area = new Rectangle((float) (area.getTop() / 100 * page.getHeight()), + area = new Rectangle((float) (area.getTop() / 100 * page.getHeight()), (float) (area.getLeft() / 100 * page.getWidth()), (float) (area.getWidth() / 100 * page.getWidth()), (float) (area.getHeight() / 100 * page.getHeight())); } @@ -220,7 +226,7 @@ private static List> whichAreas(CommandLine line) throw String[] optionValues = line.getOptionValues('a'); List> areaList = new ArrayList>(); - for (String optionValue: optionValues) { + for (String optionValue : optionValues) { int areaCalculationMode = ABSOLUTE_AREA_CALCULATION_MODE; int startIndex = 0; if (optionValue.startsWith("%")) { @@ -281,7 +287,7 @@ public static List parseFloatList(String option) throws ParseException { for (int i = 0; i < f.length; i++) { final String element = f[i]; - if(element.startsWith("%")) { + if (element.startsWith("%")) { rv.add(Float.parseFloat(element)); } else { @@ -381,6 +387,7 @@ public TableExtractor() { public void setVerticalRulingPositions(List positions) { this.verticalRulingPositions = positions; } + public void setVerticalRulingPositionsRelative(boolean relative) { this.verticalRulingPositionsRelative = relative; } @@ -435,8 +442,8 @@ public List
extractTablesBasic(Page page) { if (this.verticalRulingPositionsRelative) { // convert relative to absolute absoluteRulingPositions = new ArrayList<>(verticalRulingPositions.size()); - for (float relative: this.verticalRulingPositions) { - float absolute = (float)(relative / 100.0 * page.getWidth()); + for (float relative : this.verticalRulingPositions) { + float absolute = (float) (relative / 100.0 * page.getWidth()); absoluteRulingPositions.add(absolute); } } else { From 6ea9d3ad3f410aaf5d5f099847483286a52b609b Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 7 Oct 2020 15:16:41 +0200 Subject: [PATCH 155/245] Removes unnecessary code (#379) --- src/main/java/technology/tabula/CommandLineApp.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 2efb278e..0228df4b 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -284,16 +284,8 @@ public static List parseFloatList(String option) throws ParseException { String[] f = option.split(","); List rv = new ArrayList<>(); try { - for (int i = 0; i < f.length; i++) { - final String element = f[i]; - - if (element.startsWith("%")) { - - rv.add(Float.parseFloat(element)); - } else { - rv.add(Float.parseFloat(element)); - } - + for (final String element : f) { + rv.add(Float.parseFloat(element)); } return rv; } catch (NumberFormatException e) { From 6fdf5545b0897f5847c27148189a0966d9fb7b4e Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 10:55:14 -0300 Subject: [PATCH 156/245] Refactoring JSON serializers. --- .../RectangularTextContainerSerializer.java | 30 +++++----- .../tabula/json/RulingSerializer.java | 20 ------- .../tabula/json/TableSerializer.java | 57 +++++++++---------- 3 files changed, 41 insertions(+), 66 deletions(-) delete mode 100644 src/main/java/technology/tabula/json/RulingSerializer.java diff --git a/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java b/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java index f6359b91..4a61aa31 100644 --- a/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java +++ b/src/main/java/technology/tabula/json/RectangularTextContainerSerializer.java @@ -11,21 +11,19 @@ public final class RectangularTextContainerSerializer implements JsonSerializer> { - public static final RectangularTextContainerSerializer INSTANCE = new RectangularTextContainerSerializer(); - - private RectangularTextContainerSerializer() { - // singleton - } - - @Override - public JsonElement serialize(RectangularTextContainer src, Type typeOfSrc, JsonSerializationContext context) { - JsonObject result = new JsonObject(); - result.addProperty("top", src.getTop()); - result.addProperty("left", src.getLeft()); - result.addProperty("width", src.getWidth()); - result.addProperty("height", src.getHeight()); - result.addProperty("text", src.getText()); - return result; - } + public static final RectangularTextContainerSerializer INSTANCE = new RectangularTextContainerSerializer(); + + private RectangularTextContainerSerializer() {} + + @Override + public JsonElement serialize(RectangularTextContainer textContainer, Type type, JsonSerializationContext context) { + JsonObject json = new JsonObject(); + json.addProperty("top", textContainer.getTop()); + json.addProperty("left", textContainer.getLeft()); + json.addProperty("width", textContainer.getWidth()); + json.addProperty("height", textContainer.getHeight()); + json.addProperty("text", textContainer.getText()); + return json; + } } \ No newline at end of file diff --git a/src/main/java/technology/tabula/json/RulingSerializer.java b/src/main/java/technology/tabula/json/RulingSerializer.java deleted file mode 100644 index 19fe8bcd..00000000 --- a/src/main/java/technology/tabula/json/RulingSerializer.java +++ /dev/null @@ -1,20 +0,0 @@ -package technology.tabula.json; - -import java.lang.reflect.Type; - -import com.google.gson.JsonElement; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; - -import technology.tabula.Ruling; - -@Deprecated -/** @deprecated This class is unused (Aug 2017) and will be removed at some later point */ -public class RulingSerializer implements JsonSerializer { - - @Override - public JsonElement serialize(Ruling src, Type typeOfSrc, JsonSerializationContext context) { - return null; - } - -} diff --git a/src/main/java/technology/tabula/json/TableSerializer.java b/src/main/java/technology/tabula/json/TableSerializer.java index ba04a7cf..2ba20bcd 100644 --- a/src/main/java/technology/tabula/json/TableSerializer.java +++ b/src/main/java/technology/tabula/json/TableSerializer.java @@ -14,35 +14,32 @@ public final class TableSerializer implements JsonSerializer
{ - public static final TableSerializer INSTANCE = new TableSerializer(); - - private TableSerializer() { - // singleton - } - - @Override - public JsonElement serialize(Table src, Type typeOfSrc, JsonSerializationContext context) { - - JsonObject result = new JsonObject(); - - result.addProperty("extraction_method", src.getExtractionMethod()); - result.addProperty("top", src.getTop()); - result.addProperty("left", src.getLeft()); - result.addProperty("width", src.getWidth()); - result.addProperty("height", src.getHeight()); - result.addProperty("right", src.getRight()); - result.addProperty("bottom", src.getBottom()); - - JsonArray data; - result.add("data", data = new JsonArray()); - - for (List srcRow : src.getRows()) { - JsonArray row = new JsonArray(); - for (RectangularTextContainer textChunk : srcRow) row.add(context.serialize(textChunk)); - data.add(row); - } - - return result; - } + public static final TableSerializer INSTANCE = new TableSerializer(); + + private TableSerializer() {} + + @Override + public JsonElement serialize(Table table, Type type, JsonSerializationContext context) { + JsonObject json = new JsonObject(); + JsonArray data = new JsonArray(); + + json.addProperty("extraction_method", table.getExtractionMethod()); + json.addProperty("top", table.getTop()); + json.addProperty("left", table.getLeft()); + json.addProperty("width", table.getWidth()); + json.addProperty("height", table.getHeight()); + json.addProperty("right", table.getRight()); + json.addProperty("bottom", table.getBottom()); + json.add("data", data); + + for (List tableRow : table.getRows()) { + JsonArray jsonRow = new JsonArray(); + for (RectangularTextContainer textChunk : tableRow) + jsonRow.add(context.serialize(textChunk)); + data.add(jsonRow); + } + + return json; + } } From a9932a82dea23fe257368219684ccbc7faa0b27f Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 11:13:43 -0300 Subject: [PATCH 157/245] Refactoring writers. --- .../technology/tabula/writers/CSVWriter.java | 54 +++++++------- .../technology/tabula/writers/JSONWriter.java | 72 +++++++++++-------- .../technology/tabula/writers/TSVWriter.java | 6 +- .../technology/tabula/writers/Writer.java | 3 + 4 files changed, 76 insertions(+), 59 deletions(-) diff --git a/src/main/java/technology/tabula/writers/CSVWriter.java b/src/main/java/technology/tabula/writers/CSVWriter.java index 2466cc6e..682397b8 100644 --- a/src/main/java/technology/tabula/writers/CSVWriter.java +++ b/src/main/java/technology/tabula/writers/CSVWriter.java @@ -13,33 +13,35 @@ public class CSVWriter implements Writer { - public CSVWriter() { - this(CSVFormat.EXCEL); - } - - protected CSVWriter(CSVFormat format) { - this.format = format; - } - private final CSVFormat format; - @Override - public void write(Appendable out, Table table) throws IOException { - write(out, Collections.singletonList(table)); - } - - @Override - public void write(Appendable out, List
tables) throws IOException { - try (CSVPrinter printer = new CSVPrinter(out, format)) { - for (Table table : tables) { - for (List row : table.getRows()) { - List cells = new ArrayList<>(row.size()); - for (RectangularTextContainer tc : row) cells.add(tc.getText()); - printer.printRecord(cells); - } - } - printer.flush(); - } - } + public CSVWriter() { + this(CSVFormat.EXCEL); + } + + protected CSVWriter(CSVFormat format) { + this.format = format; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + @Override + public void write(Appendable out, Table table) throws IOException { + write(out, Collections.singletonList(table)); + } + + @Override + public void write(Appendable out, List
tables) throws IOException { + try (CSVPrinter printer = new CSVPrinter(out, format)) { + for (Table table : tables) { + for (List row : table.getRows()) { + List cells = new ArrayList<>(row.size()); + for (RectangularTextContainer cell : row) + cells.add(cell.getText()); + printer.printRecord(cells); + } + } + printer.flush(); + } + } } diff --git a/src/main/java/technology/tabula/writers/JSONWriter.java b/src/main/java/technology/tabula/writers/JSONWriter.java index 59e9b274..bb566f2d 100644 --- a/src/main/java/technology/tabula/writers/JSONWriter.java +++ b/src/main/java/technology/tabula/writers/JSONWriter.java @@ -1,9 +1,5 @@ package technology.tabula.writers; -import java.io.IOException; -import java.lang.reflect.Modifier; -import java.util.List; - import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; @@ -17,33 +13,49 @@ import technology.tabula.json.RectangularTextContainerSerializer; import technology.tabula.json.TableSerializer; +import java.io.IOException; +import java.util.List; + +import static java.lang.reflect.Modifier.PUBLIC; + public class JSONWriter implements Writer { - private static final ExclusionStrategy ALLCLASSES_SKIPNONPUBLIC = new ExclusionStrategy() { - @Override public boolean shouldSkipClass(Class c) { return false; } - @Override public boolean shouldSkipField(FieldAttributes fa) { return !fa.hasModifier(Modifier.PUBLIC); } - }; - - @Override - public void write(Appendable out, Table table) throws IOException { - out.append(gson().toJson(table, Table.class)); - } - - @Override public void write(Appendable out, List
tables) throws IOException { - Gson gson = gson(); - JsonArray array = new JsonArray(); - for (Table table : tables) array.add(gson.toJsonTree(table, Table.class)); - out.append(gson.toJson(array)); - } - - private static Gson gson() { - return new GsonBuilder() - .addSerializationExclusionStrategy(ALLCLASSES_SKIPNONPUBLIC) - .registerTypeAdapter(Table.class, TableSerializer.INSTANCE) - .registerTypeAdapter(RectangularTextContainer.class, RectangularTextContainerSerializer.INSTANCE) - .registerTypeAdapter(Cell.class, RectangularTextContainerSerializer.INSTANCE) - .registerTypeAdapter(TextChunk.class, RectangularTextContainerSerializer.INSTANCE) - .create(); - } + private static final ExclusionStrategy ALL_CLASSES_SKIPPING_NON_PUBLIC_FIELDS = new ExclusionStrategy() { + @Override + public boolean shouldSkipClass(Class c) { + return false; + } + + @Override + public boolean shouldSkipField(FieldAttributes fieldAttributes) { + return !fieldAttributes.hasModifier(PUBLIC); + } + }; + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + @Override + public void write(Appendable out, Table table) throws IOException { + out.append(gson().toJson(table, Table.class)); + } + + @Override + public void write(Appendable out, List
tables) throws IOException { + Gson gson = gson(); + JsonArray jsonElements = new JsonArray(); + for (Table table : tables) + jsonElements.add(gson.toJsonTree(table, Table.class)); + out.append(gson.toJson(jsonElements)); + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + private static Gson gson() { + return new GsonBuilder() + .addSerializationExclusionStrategy(ALL_CLASSES_SKIPPING_NON_PUBLIC_FIELDS) + .registerTypeAdapter(Table.class, TableSerializer.INSTANCE) + .registerTypeAdapter(RectangularTextContainer.class, RectangularTextContainerSerializer.INSTANCE) + .registerTypeAdapter(Cell.class, RectangularTextContainerSerializer.INSTANCE) + .registerTypeAdapter(TextChunk.class, RectangularTextContainerSerializer.INSTANCE) + .create(); + } } diff --git a/src/main/java/technology/tabula/writers/TSVWriter.java b/src/main/java/technology/tabula/writers/TSVWriter.java index c3ddb737..115d0347 100644 --- a/src/main/java/technology/tabula/writers/TSVWriter.java +++ b/src/main/java/technology/tabula/writers/TSVWriter.java @@ -4,8 +4,8 @@ public class TSVWriter extends CSVWriter { - public TSVWriter() { - super(CSVFormat.TDF); - } + public TSVWriter() { + super(CSVFormat.TDF); + } } diff --git a/src/main/java/technology/tabula/writers/Writer.java b/src/main/java/technology/tabula/writers/Writer.java index 78f4faa4..99b708c6 100644 --- a/src/main/java/technology/tabula/writers/Writer.java +++ b/src/main/java/technology/tabula/writers/Writer.java @@ -6,6 +6,9 @@ import technology.tabula.Table; public interface Writer { + void write(Appendable out, Table table) throws IOException; + void write(Appendable out, List
tables) throws IOException; + } From 008c395b9af49655e829eff58851c9c08fc2bf7c Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 12:26:13 -0300 Subject: [PATCH 158/245] Refactoring classes related to a pdf page. --- .../technology/tabula/ObjectExtractor.java | 49 +++++++++---------- src/main/java/technology/tabula/Page.java | 7 +++ .../java/technology/tabula/PageIterator.java | 22 ++++----- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 3998ba6f..97960243 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -13,55 +13,50 @@ public ObjectExtractor(PDDocument pdfDocument) { this.pdfDocument = pdfDocument; } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // protected Page extractPage(Integer pageNumber) throws IOException { - - if (pageNumber > this.pdfDocument.getNumberOfPages() || pageNumber < 1) { - throw new java.lang.IndexOutOfBoundsException( - "Page number does not exist"); + if (pageNumber > pdfDocument.getNumberOfPages() || pageNumber < 1) { + throw new java.lang.IndexOutOfBoundsException("Page number does not exist."); } + PDPage page = pdfDocument.getPage(pageNumber - 1); - PDPage p = this.pdfDocument.getPage(pageNumber - 1); - - ObjectExtractorStreamEngine se = new ObjectExtractorStreamEngine(p); - se.processPage(p); - - - TextStripper pdfTextStripper = new TextStripper(this.pdfDocument, pageNumber); + ObjectExtractorStreamEngine streamEngine = new ObjectExtractorStreamEngine(page); + streamEngine.processPage(page); - pdfTextStripper.process(); + TextStripper textStripper = new TextStripper(pdfDocument, pageNumber); + textStripper.process(); - Utils.sort(pdfTextStripper.textElements, Rectangle.ILL_DEFINED_ORDER); + Utils.sort(textStripper.textElements, Rectangle.ILL_DEFINED_ORDER); - float w, h; - int pageRotation = p.getRotation(); - if (Math.abs(pageRotation) == 90 || Math.abs(pageRotation) == 270) { - w = p.getCropBox().getHeight(); - h = p.getCropBox().getWidth(); + float width, height; + int rotation = page.getRotation(); + if (Math.abs(rotation) == 90 || Math.abs(rotation) == 270) { + width = page.getCropBox().getHeight(); + height = page.getCropBox().getWidth(); } else { - w = p.getCropBox().getWidth(); - h = p.getCropBox().getHeight(); + width = page.getCropBox().getWidth(); + height = page.getCropBox().getHeight(); } - return new Page(0, 0, w, h, pageRotation, pageNumber, p, this.pdfDocument, pdfTextStripper.textElements, - se.rulings, pdfTextStripper.minCharWidth, pdfTextStripper.minCharHeight, pdfTextStripper.spatialIndex); + return new Page(0, 0, width, height, rotation, pageNumber, page, pdfDocument, streamEngine, textStripper); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public PageIterator extract(Iterable pages) { return new PageIterator(this, pages); } public PageIterator extract() { - return extract(Utils.range(1, this.pdfDocument.getNumberOfPages() + 1)); + return extract(Utils.range(1, pdfDocument.getNumberOfPages() + 1)); } public Page extract(int pageNumber) { return extract(Utils.range(pageNumber, pageNumber + 1)).next(); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public void close() throws IOException { - this.pdfDocument.close(); + pdfDocument.close(); } - - - + } diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 3207bcb9..ef04c29f 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -39,6 +39,13 @@ public Page(float top, float left, float width, float height, int rotation, int this.rulings = rulings; } + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, + ObjectExtractorStreamEngine streamEngine, TextStripper textStripper) { + this(top, left, width, height, rotation, number, pdPage, doc, textStripper.textElements, streamEngine.rulings); + this.minCharWidth = textStripper.minCharWidth; + this.minCharHeight = textStripper.minCharHeight; + this.spatial_index = textStripper.spatialIndex; + } public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, List characters, List rulings, diff --git a/src/main/java/technology/tabula/PageIterator.java b/src/main/java/technology/tabula/PageIterator.java index 5fec2a77..052ed54a 100644 --- a/src/main/java/technology/tabula/PageIterator.java +++ b/src/main/java/technology/tabula/PageIterator.java @@ -5,39 +5,39 @@ public class PageIterator implements Iterator { - private ObjectExtractor oe; + private ObjectExtractor objectExtractor; private Iterator pageIndexIterator; - - public PageIterator(ObjectExtractor oe, Iterable pages) { + + public PageIterator(ObjectExtractor objectExtractor, Iterable pages) { super(); - this.oe = oe; + this.objectExtractor = objectExtractor; this.pageIndexIterator = pages.iterator(); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // @Override public boolean hasNext() { - return this.pageIndexIterator.hasNext(); + return pageIndexIterator.hasNext(); } @Override public Page next() { - Page page = null; + Page nextPage = null; if (!this.hasNext()) { throw new IllegalStateException(); } try { - page = oe.extractPage(this.pageIndexIterator.next()); + nextPage = objectExtractor.extractPage(pageIndexIterator.next()); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } - return page; + return nextPage; } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // @Override public void remove() { throw new UnsupportedOperationException(); - } -} \ No newline at end of file +} From c0592627efc4f608343b5c3f4800cb3f7e2e3900 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 13:36:41 -0300 Subject: [PATCH 159/245] Grouping methods by context. --- src/main/java/technology/tabula/Page.java | 484 ++++++++++++---------- 1 file changed, 256 insertions(+), 228 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index ef04c29f..cb03dc98 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -13,243 +13,271 @@ // TODO: this class should probably be called "PageArea" or something like that public class Page extends Rectangle { - private Integer rotation; - private int pageNumber; - private List texts; - private List rulings, cleanRulings = null, verticalRulingLines = null, horizontalRulingLines = null; - private float minCharWidth; - private float minCharHeight; - private RectangleSpatialIndex spatial_index; - private PDPage pdPage; - private PDDocument pdDoc; - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc) { - super(top, left, width, height); - this.rotation = rotation; - this.pageNumber = page_number; - this.pdPage = pdPage; - this.pdDoc = doc; - } - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, - List characters, List rulings) { - - this(top, left, width, height, rotation, page_number, pdPage, doc); - this.texts = characters; - this.rulings = rulings; - } - - public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, - ObjectExtractorStreamEngine streamEngine, TextStripper textStripper) { - this(top, left, width, height, rotation, number, pdPage, doc, textStripper.textElements, streamEngine.rulings); - this.minCharWidth = textStripper.minCharWidth; - this.minCharHeight = textStripper.minCharHeight; - this.spatial_index = textStripper.spatialIndex; - } - - public Page(float top, float left, float width, float height, int rotation, int page_number, PDPage pdPage, PDDocument doc, - List characters, List rulings, - float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { - - this(top, left, width, height, rotation, page_number, pdPage, doc, characters, rulings); - this.minCharHeight = minCharHeight; - this.minCharWidth = minCharWidth; - this.spatial_index = index; - } - - public Page getArea(Rectangle area) { - List t = getText(area); - float min_char_width = 7; - float min_char_height = 7; - - if(t.size() > 0){ - min_char_width = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.width, te2.width); - }}).width; - min_char_height = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.height, te2.height); - }}).height; - } - Page rv = new Page( - area.getTop(), - area.getLeft(), - (float) area.getWidth(), - (float) area.getHeight(), - rotation, - pageNumber, - pdPage, - pdDoc, - t, - Ruling.cropRulingsToArea(getRulings(), area), - min_char_width, - min_char_height, - spatial_index); - - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getTop()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getTop()))); - - return rv; - } - - public Page getArea(float top, float left, float bottom, float right) { - Rectangle area = new Rectangle(top, left, right - left, bottom - top); - return this.getArea(area); - } - - public List getText() { - return texts; - } - - public List getText(Rectangle area) { - return this.spatial_index.contains(area); - } - - /** @deprecated use {@linkplain #getText(Rectangle)} instead */ - @Deprecated public List getText(float top, float left, float bottom, float right) { - return this.getText(new Rectangle(top, left, right - left, bottom - top)); - } - - public Integer getRotation() { - return rotation; - } - - public int getPageNumber() { - return pageNumber; - } - - /** @deprecated use {@linkplain #getText()} instead */ - @Deprecated public List getTexts() { - return texts; - } - - /** - * Returns the minimum bounding box that contains all the TextElements on this Page - */ - public Rectangle getTextBounds() { - List texts = this.getText(); - if (!texts.isEmpty()) { - return Utils.bounds(texts); - } - else { - return new Rectangle(); - } - - } - - public List getRulings() { - if (this.cleanRulings != null) { - return this.cleanRulings; - } - - if (this.rulings == null || this.rulings.isEmpty()) { - this.verticalRulingLines = new ArrayList<>(); - this.horizontalRulingLines = new ArrayList<>(); - return new ArrayList<>(); - } - - Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); - - List vrs = new ArrayList<>(); - for (Ruling vr: this.rulings) { - if (vr.vertical()) { - vrs.add(vr); - } - } - this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); - - List hrs = new ArrayList<>(); - for (Ruling hr: this.rulings) { - if (hr.horizontal()) { - hrs.add(hr); - } - } - this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); - - this.cleanRulings = new ArrayList<>(this.verticalRulingLines); - this.cleanRulings.addAll(this.horizontalRulingLines); - - return this.cleanRulings; - - } - - public List getVerticalRulings() { - if (this.verticalRulingLines != null) { - return this.verticalRulingLines; - } - this.getRulings(); - return this.verticalRulingLines; - } + private int number; + private Integer rotation; + private float minCharWidth; + private float minCharHeight; - public List getHorizontalRulings() { - if (this.horizontalRulingLines != null) { - return this.horizontalRulingLines; + private List textElements; + + private List rulings, + cleanRulings = null, + verticalRulingLines = null, + horizontalRulingLines = null; + + private PDPage pdPage; + private PDDocument pdDoc; + + private RectangleSpatialIndex spatialIndex; + + public Page(float top, float left, float width, float height, int rotation, int pageNumber, PDPage pdPage, PDDocument doc) { + super(top, left, width, height); + this.rotation = rotation; + this.number = pageNumber; + this.pdPage = pdPage; + this.pdDoc = doc; + } + + public Page(float top, float left, float width, float height, int rotation, int pageNumber, PDPage pdPage, PDDocument doc, + List characters, List rulings) { + this(top, left, width, height, rotation, pageNumber, pdPage, doc); + this.textElements = characters; + this.rulings = rulings; + } + + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, + ObjectExtractorStreamEngine streamEngine, TextStripper textStripper) { + this(top, left, width, height, rotation, number, pdPage, doc, textStripper.textElements, streamEngine.rulings); + this.minCharWidth = textStripper.minCharWidth; + this.minCharHeight = textStripper.minCharHeight; + this.spatialIndex = textStripper.spatialIndex; + } + + public Page(float top, float left, float width, float height, int rotation, int pageNumber, PDPage pdPage, PDDocument doc, + List characters, List rulings, + float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { + this(top, left, width, height, rotation, pageNumber, pdPage, doc, characters, rulings); + this.minCharHeight = minCharHeight; + this.minCharWidth = minCharWidth; + this.spatialIndex = index; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + public Page getArea(Rectangle area) { + List t = getText(area); + float min_char_width = 7; + float min_char_height = 7; + + if (t.size() > 0) { + min_char_width = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.width, te2.width); + } + }).width; + min_char_height = Collections.min(t, new Comparator() { + @Override + public int compare(TextElement te1, TextElement te2) { + return java.lang.Float.compare(te1.height, te2.height); + } + }).height; + } + Page rv = new Page( + area.getTop(), + area.getLeft(), + (float) area.getWidth(), + (float) area.getHeight(), + rotation, number, + pdPage, + pdDoc, + t, + Ruling.cropRulingsToArea(getRulings(), area), + min_char_width, + min_char_height, + spatialIndex); + + rv.addRuling(new Ruling( + new Point2D.Double(rv.getLeft(), + rv.getTop()), + new Point2D.Double(rv.getRight(), + rv.getTop()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getRight(), + rv.getTop()), + new Point2D.Double(rv.getRight(), + rv.getBottom()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getRight(), + rv.getBottom()), + new Point2D.Double(rv.getLeft(), + rv.getBottom()))); + rv.addRuling(new Ruling( + new Point2D.Double(rv.getLeft(), + rv.getBottom()), + new Point2D.Double(rv.getLeft(), + rv.getTop()))); + + return rv; + } + + public Page getArea(float top, float left, float bottom, float right) { + Rectangle area = new Rectangle(top, left, right - left, bottom - top); + return getArea(area); + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + public Integer getRotation() { + return rotation; + } + + public int getPageNumber() { + return number; + } + + /** + * @deprecated with no replacement + */ + @Deprecated + public float getMinCharWidth() { + return minCharWidth; + } + + /** + * @deprecated with no replacement + */ + @Deprecated + public float getMinCharHeight() { + return minCharHeight; } - this.getRulings(); - return this.horizontalRulingLines; - } - public void addRuling(Ruling r) { - if (r.oblique()) { - throw new UnsupportedOperationException("Can't add an oblique ruling"); + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + public List getText() { + return textElements; } - this.rulings.add(r); - // clear caches - this.verticalRulingLines = null; - this.horizontalRulingLines = null; - this.cleanRulings = null; - } - public List getUnprocessedRulings() { - return this.rulings; - } + public List getText(Rectangle area) { + return spatialIndex.contains(area); + } - /** @deprecated with no replacement */ - @Deprecated public float getMinCharWidth() { - return minCharWidth; - } + /** + * @deprecated use {@linkplain #getText(Rectangle)} instead + */ + @Deprecated + public List getText(float top, float left, float bottom, float right) { + return getText(new Rectangle(top, left, right - left, bottom - top)); + } - /** @deprecated with no replacement */ - @Deprecated public float getMinCharHeight() { - return minCharHeight; - } + /** + * @deprecated use {@linkplain #getText()} instead + */ + @Deprecated + public List getTexts() { + return textElements; + } - public PDPage getPDPage() { - return pdPage; - } + /** + * Returns the minimum bounding box that contains all the TextElements on this Page + */ + public Rectangle getTextBounds() { + List texts = this.getText(); + if (!texts.isEmpty()) { + return Utils.bounds(texts); + } else { + return new Rectangle(); + } + } - public PDDocument getPDDoc() { - return pdDoc; - } + /** + * @deprecated with no replacement + */ + @Deprecated + public boolean hasText() { + return textElements.size() > 0; + } - /** @deprecated with no replacement */ - @Deprecated public RectangleSpatialIndex getSpatialIndex() { - return this.spatial_index; - } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + public List getRulings() { + if (this.cleanRulings != null) { + return this.cleanRulings; + } + + if (this.rulings == null || this.rulings.isEmpty()) { + this.verticalRulingLines = new ArrayList<>(); + this.horizontalRulingLines = new ArrayList<>(); + return new ArrayList<>(); + } + + Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); + + List vrs = new ArrayList<>(); + for (Ruling vr : this.rulings) { + if (vr.vertical()) { + vrs.add(vr); + } + } + this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); + + List hrs = new ArrayList<>(); + for (Ruling hr : this.rulings) { + if (hr.horizontal()) { + hrs.add(hr); + } + } + this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); + + this.cleanRulings = new ArrayList<>(this.verticalRulingLines); + this.cleanRulings.addAll(this.horizontalRulingLines); + + return this.cleanRulings; + } + + public List getVerticalRulings() { + if (this.verticalRulingLines != null) { + return this.verticalRulingLines; + } + this.getRulings(); + return this.verticalRulingLines; + } + + public List getHorizontalRulings() { + if (this.horizontalRulingLines != null) { + return this.horizontalRulingLines; + } + this.getRulings(); + return this.horizontalRulingLines; + } + + public void addRuling(Ruling r) { + if (r.oblique()) { + throw new UnsupportedOperationException("Can't add an oblique ruling"); + } + this.rulings.add(r); + // clear caches + this.verticalRulingLines = null; + this.horizontalRulingLines = null; + this.cleanRulings = null; + } + + public List getUnprocessedRulings() { + return rulings; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + public PDPage getPDPage() { + return pdPage; + } + + public PDDocument getPDDoc() { + return pdDoc; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + /** + * @deprecated with no replacement + */ + @Deprecated + public RectangleSpatialIndex getSpatialIndex() { + return spatialIndex; + } - /** @deprecated with no replacement */ - @Deprecated public boolean hasText() { - return this.texts.size() > 0; - } } From 62e6b5fc81d7c6536b886cc4406aafd709a57d95 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 14:21:12 -0300 Subject: [PATCH 160/245] Refactoring methods related to 'rulings' attributes. --- src/main/java/technology/tabula/Page.java | 84 +++++++++++++---------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index cb03dc98..ce3841c8 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -20,6 +20,7 @@ public class Page extends Rectangle { private List textElements; + // TODO: Create a class for 'List ' that encapsulates all of these lists and their behaviors? private List rulings, cleanRulings = null, verticalRulingLines = null, @@ -197,65 +198,74 @@ public boolean hasText() { // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public List getRulings() { - if (this.cleanRulings != null) { - return this.cleanRulings; + if (cleanRulings != null) { + return cleanRulings; } - if (this.rulings == null || this.rulings.isEmpty()) { - this.verticalRulingLines = new ArrayList<>(); - this.horizontalRulingLines = new ArrayList<>(); + if (rulings == null || rulings.isEmpty()) { + verticalRulingLines = new ArrayList<>(); + horizontalRulingLines = new ArrayList<>(); return new ArrayList<>(); } - Utils.snapPoints(this.rulings, this.minCharWidth, this.minCharHeight); + // TODO: Move as a static method to the Ruling class? + Utils.snapPoints(rulings, minCharWidth, minCharHeight); - List vrs = new ArrayList<>(); - for (Ruling vr : this.rulings) { - if (vr.vertical()) { - vrs.add(vr); + verticalRulingLines = getCollapsedVerticalRulings(); + horizontalRulingLines = getCollapsedHorizontalRulings(); + + cleanRulings = new ArrayList<>(verticalRulingLines); + cleanRulings.addAll(horizontalRulingLines); + + return cleanRulings; + } + + // TODO: Create a class for 'List ' and encapsulate these behaviors within it? + private List getCollapsedVerticalRulings() { + List verticalRulings = new ArrayList<>(); + for (Ruling ruling : rulings) { + if (ruling.vertical()) { + verticalRulings.add(ruling); } } - this.verticalRulingLines = Ruling.collapseOrientedRulings(vrs); + return Ruling.collapseOrientedRulings(verticalRulings); + } - List hrs = new ArrayList<>(); - for (Ruling hr : this.rulings) { - if (hr.horizontal()) { - hrs.add(hr); + private List getCollapsedHorizontalRulings() { + List horizontalRulings = new ArrayList<>(); + for (Ruling ruling : rulings) { + if (ruling.horizontal()) { + horizontalRulings.add(ruling); } } - this.horizontalRulingLines = Ruling.collapseOrientedRulings(hrs); - - this.cleanRulings = new ArrayList<>(this.verticalRulingLines); - this.cleanRulings.addAll(this.horizontalRulingLines); - - return this.cleanRulings; + return Ruling.collapseOrientedRulings(horizontalRulings); } public List getVerticalRulings() { - if (this.verticalRulingLines != null) { - return this.verticalRulingLines; + if (verticalRulingLines != null) { + return verticalRulingLines; } - this.getRulings(); - return this.verticalRulingLines; + getRulings(); + return verticalRulingLines; } public List getHorizontalRulings() { - if (this.horizontalRulingLines != null) { - return this.horizontalRulingLines; + if (horizontalRulingLines != null) { + return horizontalRulingLines; } - this.getRulings(); - return this.horizontalRulingLines; + getRulings(); + return horizontalRulingLines; } - public void addRuling(Ruling r) { - if (r.oblique()) { - throw new UnsupportedOperationException("Can't add an oblique ruling"); + public void addRuling(Ruling ruling) { + if (ruling.oblique()) { + throw new UnsupportedOperationException("Can't add an oblique ruling."); } - this.rulings.add(r); - // clear caches - this.verticalRulingLines = null; - this.horizontalRulingLines = null; - this.cleanRulings = null; + rulings.add(ruling); + // Clear caches: + verticalRulingLines = null; + horizontalRulingLines = null; + cleanRulings = null; } public List getUnprocessedRulings() { From c3c3b9d5832e58d8706e91fa702812874eab7df6 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 15:37:27 -0300 Subject: [PATCH 161/245] Refactoring getArea() method. --- src/main/java/technology/tabula/Page.java | 109 ++++++++++------------ 1 file changed, 50 insertions(+), 59 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index ce3841c8..87d7c01d 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -9,6 +9,9 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; +import static java.lang.Float.compare; +import static java.util.Collections.min; + @SuppressWarnings("serial") // TODO: this class should probably be called "PageArea" or something like that public class Page extends Rectangle { @@ -31,17 +34,20 @@ public class Page extends Rectangle { private RectangleSpatialIndex spatialIndex; - public Page(float top, float left, float width, float height, int rotation, int pageNumber, PDPage pdPage, PDDocument doc) { + private static final float DEFAULT_MIN_CHAR_LENGTH = 7; + + // TODO: Use a creational design patterns here? + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc) { super(top, left, width, height); this.rotation = rotation; - this.number = pageNumber; + this.number = number; this.pdPage = pdPage; this.pdDoc = doc; } - public Page(float top, float left, float width, float height, int rotation, int pageNumber, PDPage pdPage, PDDocument doc, + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, List characters, List rulings) { - this(top, left, width, height, rotation, pageNumber, pdPage, doc); + this(top, left, width, height, rotation, number, pdPage, doc); this.textElements = characters; this.rulings = rulings; } @@ -54,10 +60,10 @@ public Page(float top, float left, float width, float height, int rotation, int this.spatialIndex = textStripper.spatialIndex; } - public Page(float top, float left, float width, float height, int rotation, int pageNumber, PDPage pdPage, PDDocument doc, + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, List characters, List rulings, float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { - this(top, left, width, height, rotation, pageNumber, pdPage, doc, characters, rulings); + this(top, left, width, height, rotation, number, pdPage, doc, characters, rulings); this.minCharHeight = minCharHeight; this.minCharWidth = minCharWidth; this.spatialIndex = index; @@ -65,60 +71,44 @@ public Page(float top, float left, float width, float height, int rotation, int // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public Page getArea(Rectangle area) { - List t = getText(area); - float min_char_width = 7; - float min_char_height = 7; - - if (t.size() > 0) { - min_char_width = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.width, te2.width); - } - }).width; - min_char_height = Collections.min(t, new Comparator() { - @Override - public int compare(TextElement te1, TextElement te2) { - return java.lang.Float.compare(te1.height, te2.height); - } - }).height; - } - Page rv = new Page( - area.getTop(), - area.getLeft(), - (float) area.getWidth(), - (float) area.getHeight(), - rotation, number, - pdPage, - pdDoc, - t, + List areaTextElements = getText(area); + + float minimumCharWidth = getMinimumCharWidthFrom(areaTextElements); + float minimumCharHeight = getMinimumCharHeightFrom(areaTextElements); + + Page page = new Page(area.getTop(), area.getLeft(), (float) area.getWidth(), (float) area.getHeight(), + rotation, number, pdPage, pdDoc, areaTextElements, Ruling.cropRulingsToArea(getRulings(), area), - min_char_width, - min_char_height, - spatialIndex); - - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getTop()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getTop()), - new Point2D.Double(rv.getRight(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getRight(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getBottom()))); - rv.addRuling(new Ruling( - new Point2D.Double(rv.getLeft(), - rv.getBottom()), - new Point2D.Double(rv.getLeft(), - rv.getTop()))); - - return rv; + minimumCharWidth, minimumCharHeight, spatialIndex); + + addBorderRulingsTo(page); + + return page; + } + + private float getMinimumCharWidthFrom(List areaTextElements) { + if (!areaTextElements.isEmpty()) { + return min(areaTextElements, (te1, te2) -> compare(te1.width, te2.width)).width; + } + return DEFAULT_MIN_CHAR_LENGTH; + } + + private float getMinimumCharHeightFrom(List areaTextElements) { + if (!areaTextElements.isEmpty()) { + return min(areaTextElements, (te1, te2) -> compare(te1.height, te2.height)).height; + } + return DEFAULT_MIN_CHAR_LENGTH; + } + + private void addBorderRulingsTo(Page page) { + Point2D.Double leftTop = new Point2D.Double(page.getLeft(), page.getTop()), + rightTop = new Point2D.Double(page.getRight(), page.getTop()), + rightBottom = new Point2D.Double(page.getRight(), page.getBottom()), + leftBottom = new Point2D.Double(page.getLeft(), page.getBottom()); + page.addRuling(new Ruling(leftTop, rightTop)); + page.addRuling(new Ruling(rightTop, rightBottom)); + page.addRuling(new Ruling(rightBottom, leftBottom)); + page.addRuling(new Ruling(leftBottom, leftTop)); } public Page getArea(float top, float left, float bottom, float right) { @@ -282,6 +272,7 @@ public PDDocument getPDDoc() { } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + /** * @deprecated with no replacement */ From 8a78148d9a3abc752f681837ca135d5f1424b37d Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 21:07:18 -0300 Subject: [PATCH 162/245] Refactoring constructor. --- .../tabula/ObjectExtractorStreamEngine.java | 90 +++++++++---------- 1 file changed, 40 insertions(+), 50 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index ae249a40..d3f79458 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -7,7 +7,6 @@ import java.awt.geom.PathIterator; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; -import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -17,7 +16,6 @@ import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDRectangle; import org.apache.pdfbox.pdmodel.graphics.image.PDImage; -import org.apache.pdfbox.util.Matrix; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,72 +23,66 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { protected List rulings; private AffineTransform pageTransform; - private boolean debugClippingPaths; private boolean extractRulingLines = true; - private Logger log; + private Logger logger; private int clipWindingRule = -1; private GeneralPath currentPath = new GeneralPath(); protected ObjectExtractorStreamEngine(PDPage page) { super(page); + logger = LoggerFactory.getLogger(ObjectExtractorStreamEngine.class); + rulings = new ArrayList<>(); - this.log = LoggerFactory.getLogger(ObjectExtractorStreamEngine.class); + // Calculate page transform: + pageTransform = new AffineTransform(); + PDRectangle pageCropBox = getPage().getCropBox(); + int rotationAngleInDegrees = getPage().getRotation(); - this.rulings = new ArrayList<>(); - this.pageTransform = null; - - // calculate page transform - PDRectangle cb = this.getPage().getCropBox(); - int rotation = this.getPage().getRotation(); - - this.pageTransform = new AffineTransform(); - - if (Math.abs(rotation) == 90 || Math.abs(rotation) == 270) { - this.pageTransform = AffineTransform.getRotateInstance(rotation * (Math.PI / 180.0), 0, 0); - this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); + if (Math.abs(rotationAngleInDegrees) == 90 || Math.abs(rotationAngleInDegrees) == 270) { + double rotationAngleInRadians = rotationAngleInDegrees * (Math.PI / 180.0); + pageTransform = AffineTransform.getRotateInstance(rotationAngleInRadians, 0, 0); } else { - this.pageTransform.concatenate(AffineTransform.getTranslateInstance(0, cb.getHeight())); - this.pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); + double deltaX = 0; + double deltaY = pageCropBox.getHeight(); + pageTransform.concatenate(AffineTransform.getTranslateInstance(deltaX, deltaY)); } - this.pageTransform.translate(-cb.getLowerLeftX(), -cb.getLowerLeftY()); + pageTransform.concatenate(AffineTransform.getScaleInstance(1, -1)); + pageTransform.translate(-pageCropBox.getLowerLeftX(), -pageCropBox.getLowerLeftY()); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // @Override - public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) { + public void appendRectangle(Point2D p0, Point2D p1, Point2D p2, Point2D p3) { currentPath.moveTo((float) p0.getX(), (float) p0.getY()); currentPath.lineTo((float) p1.getX(), (float) p1.getY()); currentPath.lineTo((float) p2.getX(), (float) p2.getY()); currentPath.lineTo((float) p3.getX(), (float) p3.getY()); - currentPath.closePath(); } @Override - public void clip(int windingRule) { - // the clipping path will not be updated until the succeeding painting - // operator is called + public void clip(int windingRule) { + // The clipping path will not be updated until the succeeding painting + // operator is called. clipWindingRule = windingRule; } @Override - public void closePath() { + public void closePath() { currentPath.closePath(); } @Override - public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) { + public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) { currentPath.curveTo(x1, y1, x2, y2, x3, y3); } @Override - public void drawImage(PDImage arg0) { - // TODO Auto-generated method stub - - } + public void drawImage(PDImage arg0) {} @Override - public void endPath() { + public void endPath() { if (clipWindingRule != -1) { currentPath.setWindingRule(clipWindingRule); getGraphicsState().intersectClippingPath(currentPath); @@ -105,7 +97,7 @@ public void fillAndStrokePath(int arg0) { } @Override - public void fillPath(int arg0) { + public void fillPath(int arg0) { strokeOrFillPath(true); } @@ -125,10 +117,7 @@ public void moveTo(float x, float y) { } @Override - public void shadingFill(COSName arg0) { - // TODO Auto-generated method stub - - } + public void shadingFill(COSName arg0) {} @Override public void strokePath() { @@ -236,33 +225,34 @@ private void strokeOrFillPath(boolean isFill) { } public AffineTransform getPageTransform() { - return this.pageTransform; + return pageTransform; } public Rectangle2D currentClippingPath() { - Shape clippingPath = this.getGraphicsState().getCurrentClippingPath(); - Shape transformedClippingPath = this.getPageTransform().createTransformedShape(clippingPath); - + Shape currentClippingPath = getGraphicsState().getCurrentClippingPath(); + Shape transformedClippingPath = getPageTransform().createTransformedShape(currentClippingPath); return transformedClippingPath.getBounds2D(); } + // TODO: repeated in SpreadsheetExtractionAlgorithm. class PointComparator implements Comparator { @Override - public int compare(Point2D o1, Point2D o2) { - float o1X = Utils.round(o1.getX(), 2); - float o1Y = Utils.round(o1.getY(), 2); - float o2X = Utils.round(o2.getX(), 2); - float o2Y = Utils.round(o2.getY(), 2); + public int compare(Point2D p1, Point2D p2) { + float p1X = Utils.round(p1.getX(), 2); + float p1Y = Utils.round(p1.getY(), 2); + float p2X = Utils.round(p2.getX(), 2); + float p2Y = Utils.round(p2.getY(), 2); - if (o1Y > o2Y) + if (p1Y > p2Y) return 1; - if (o1Y < o2Y) + if (p1Y < p2Y) return -1; - if (o1X > o2X) + if (p1X > p2X) return 1; - if (o1X < o2X) + if (p1X < p2X) return -1; return 0; } } + } From f7e19764b4035e3f7db5ddb4f2155cfbd0cda0b8 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Wed, 18 Nov 2020 21:36:25 -0300 Subject: [PATCH 163/245] Filter path by segment type. --- .../tabula/ObjectExtractorStreamEngine.java | 72 ++++++++++--------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index d3f79458..e1c28c68 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -19,6 +19,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.awt.geom.PathIterator.*; + class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { protected List rulings; @@ -119,64 +121,47 @@ public void moveTo(float x, float y) { @Override public void shadingFill(COSName arg0) {} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // @Override public void strokePath() { strokeOrFillPath(false); } private void strokeOrFillPath(boolean isFill) { - GeneralPath path = this.currentPath; - - if (!this.extractRulingLines) { - this.currentPath.reset(); + if (!extractRulingLines) { + currentPath.reset(); return; } - PathIterator pi = path.getPathIterator(this.getPageTransform()); - float[] c = new float[6]; - int currentSegment; - - // skip paths whose first operation is not a MOVETO - // or contains operations other than LINETO, MOVETO or CLOSE - if ((pi.currentSegment(c) != PathIterator.SEG_MOVETO)) { - path.reset(); - return; - } - pi.next(); - while (!pi.isDone()) { - currentSegment = pi.currentSegment(c); - if (currentSegment != PathIterator.SEG_LINETO && currentSegment != PathIterator.SEG_CLOSE - && currentSegment != PathIterator.SEG_MOVETO) { - path.reset(); - return; - } - pi.next(); - } + boolean didNotPassedTheFilter = filterPathBySegmentType(); + if (didNotPassedTheFilter) return; // TODO: how to implement color filter? // skip the first path operation and save it as the starting position float[] first = new float[6]; - pi = path.getPathIterator(this.getPageTransform()); - pi.currentSegment(first); + PathIterator pathIterator = currentPath.getPathIterator(this.getPageTransform()); + float[] c = new float[6]; + int currentSegment; + pathIterator.currentSegment(first); // last move Point2D.Float start_pos = new Point2D.Float(Utils.round(first[0], 2), Utils.round(first[1], 2)); Point2D.Float last_move = start_pos; Point2D.Float end_pos = null; Line2D.Float line; PointComparator pc = new PointComparator(); - while (!pi.isDone()) { - pi.next(); + while (!pathIterator.isDone()) { + pathIterator.next(); // This can be the last segment, when pi.isDone, but we need to // process it // otherwise us-017.pdf fails the last value. try { - currentSegment = pi.currentSegment(c); + currentSegment = pathIterator.currentSegment(c); } catch (IndexOutOfBoundsException ex) { continue; } switch (currentSegment) { - case PathIterator.SEG_LINETO: + case SEG_LINETO: end_pos = new Point2D.Float(c[0], c[1]); if (start_pos == null || end_pos == null) { @@ -194,11 +179,11 @@ private void strokeOrFillPath(boolean isFill) { } } break; - case PathIterator.SEG_MOVETO: + case SEG_MOVETO: last_move = new Point2D.Float(c[0], c[1]); end_pos = last_move; break; - case PathIterator.SEG_CLOSE: + case SEG_CLOSE: // according to PathIterator docs: // "the preceding subpath should be closed by appending a line // segment @@ -221,9 +206,30 @@ private void strokeOrFillPath(boolean isFill) { } start_pos = end_pos; } - path.reset(); + currentPath.reset(); } + private boolean filterPathBySegmentType() { + PathIterator pathIterator = currentPath.getPathIterator(pageTransform); + float[] coordinates = new float[6]; + int currentSegmentType = pathIterator.currentSegment(coordinates); + if (currentSegmentType != SEG_MOVETO) { + currentPath.reset(); + return true; + } + pathIterator.next(); + while (!pathIterator.isDone()) { + currentSegmentType = pathIterator.currentSegment(coordinates); + if (currentSegmentType != SEG_LINETO && currentSegmentType != SEG_CLOSE && currentSegmentType != SEG_MOVETO) { + currentPath.reset(); + return true; + } + pathIterator.next(); + } + return false; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public AffineTransform getPageTransform() { return pageTransform; } From 6e81297b4723da35303a30deef297a4ce4bb09d3 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Thu, 19 Nov 2020 15:20:31 -0300 Subject: [PATCH 164/245] Refactoring by methods extraction. --- .../tabula/ObjectExtractorStreamEngine.java | 99 ++++++++++--------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java index e1c28c68..9907eca1 100644 --- a/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java +++ b/src/main/java/technology/tabula/ObjectExtractorStreamEngine.java @@ -30,6 +30,8 @@ class ObjectExtractorStreamEngine extends PDFGraphicsStreamEngine { private int clipWindingRule = -1; private GeneralPath currentPath = new GeneralPath(); + private static final float RULING_MINIMUM_LENGTH = 0.01f; + protected ObjectExtractorStreamEngine(PDPage page) { super(page); logger = LoggerFactory.getLogger(ObjectExtractorStreamEngine.class); @@ -138,73 +140,53 @@ private void strokeOrFillPath(boolean isFill) { // TODO: how to implement color filter? - // skip the first path operation and save it as the starting position - float[] first = new float[6]; - PathIterator pathIterator = currentPath.getPathIterator(this.getPageTransform()); - float[] c = new float[6]; + // Skip the first path operation and save it as the starting point. + PathIterator pathIterator = currentPath.getPathIterator(getPageTransform()); + + float[] coordinates = new float[6]; int currentSegment; - pathIterator.currentSegment(first); - // last move - Point2D.Float start_pos = new Point2D.Float(Utils.round(first[0], 2), Utils.round(first[1], 2)); - Point2D.Float last_move = start_pos; - Point2D.Float end_pos = null; + + Point2D.Float startPoint = getStartPoint(pathIterator); + Point2D.Float last_move = startPoint; + Point2D.Float endPoint = null; Line2D.Float line; - PointComparator pc = new PointComparator(); + PointComparator pointComparator = new PointComparator(); + while (!pathIterator.isDone()) { pathIterator.next(); - // This can be the last segment, when pi.isDone, but we need to - // process it - // otherwise us-017.pdf fails the last value. + // This can be the last segment, when pathIterator.isDone, but we need to + // process it otherwise us-017.pdf fails the last value. try { - currentSegment = pathIterator.currentSegment(c); + currentSegment = pathIterator.currentSegment(coordinates); } catch (IndexOutOfBoundsException ex) { continue; } switch (currentSegment) { case SEG_LINETO: - end_pos = new Point2D.Float(c[0], c[1]); - - if (start_pos == null || end_pos == null) { + endPoint = new Point2D.Float(coordinates[0], coordinates[1]); + if (startPoint == null || endPoint == null) { break; } - - line = pc.compare(start_pos, end_pos) == -1 ? new Line2D.Float(start_pos, end_pos) - : new Line2D.Float(end_pos, start_pos); - - if (line.intersects(this.currentClippingPath())) { - Ruling r = new Ruling(line.getP1(), line.getP2()).intersect(this.currentClippingPath()); - - if (r.length() > 0.01) { - this.rulings.add(r); - } - } + line = getLineBetween(startPoint, endPoint, pointComparator); + verifyLineIntersectsClipping(line); break; case SEG_MOVETO: - last_move = new Point2D.Float(c[0], c[1]); - end_pos = last_move; + last_move = new Point2D.Float(coordinates[0], coordinates[1]); + endPoint = last_move; break; case SEG_CLOSE: - // according to PathIterator docs: - // "the preceding subpath should be closed by appending a line - // segment - // back to the point corresponding to the most recent + // According to PathIterator docs: + // "The preceding sub-path should be closed by appending a line + // segment back to the point corresponding to the most recent // SEG_MOVETO." - if (start_pos == null || end_pos == null) { + if (startPoint == null || endPoint == null) { break; } - line = pc.compare(end_pos, last_move) == -1 ? new Line2D.Float(end_pos, last_move) - : new Line2D.Float(last_move, end_pos); - - if (line.intersects(this.currentClippingPath())) { - Ruling r = new Ruling(line.getP1(), line.getP2()).intersect(this.currentClippingPath()); - - if (r.length() > 0.01) { - this.rulings.add(r); - } - } + line = getLineBetween(endPoint, last_move, pointComparator); + verifyLineIntersectsClipping(line); break; } - start_pos = end_pos; + startPoint = endPoint; } currentPath.reset(); } @@ -229,6 +211,31 @@ private boolean filterPathBySegmentType() { return false; } + private Point2D.Float getStartPoint(PathIterator pathIterator) { + float[] startPointCoordinates = new float[6]; + pathIterator.currentSegment(startPointCoordinates); + float x = Utils.round(startPointCoordinates[0], 2); + float y = Utils.round(startPointCoordinates[1], 2); + return new Point2D.Float(x, y); + } + + private Line2D.Float getLineBetween(Point2D.Float pointA, Point2D.Float pointB, PointComparator pointComparator) { + if (pointComparator.compare(pointA, pointB) == -1) { + return new Line2D.Float(pointA, pointB); + } + return new Line2D.Float(pointB, pointA); + } + + private void verifyLineIntersectsClipping(Line2D.Float line) { + Rectangle2D currentClippingPath = currentClippingPath(); + if (line.intersects(currentClippingPath)) { + Ruling ruling = new Ruling(line.getP1(), line.getP2()).intersect(currentClippingPath); + if (ruling.length() > RULING_MINIMUM_LENGTH) { + rulings.add(ruling); + } + } + } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public AffineTransform getPageTransform() { return pageTransform; From 4519596d5234d076784db86705039f7cb24be9a4 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Thu, 19 Nov 2020 16:52:17 -0300 Subject: [PATCH 165/245] Adding some tests before refactor. --- .../tabula/CohenSutherlandClipping.java | 67 ++++++------ .../tabula/TestCohenSutherland.java | 101 ++++++++++++++++++ 2 files changed, 132 insertions(+), 36 deletions(-) create mode 100644 src/test/java/technology/tabula/TestCohenSutherland.java diff --git a/src/main/java/technology/tabula/CohenSutherlandClipping.java b/src/main/java/technology/tabula/CohenSutherlandClipping.java index 5e170ad8..ce6e2a40 100644 --- a/src/main/java/technology/tabula/CohenSutherlandClipping.java +++ b/src/main/java/technology/tabula/CohenSutherlandClipping.java @@ -18,18 +18,23 @@ * Implements the well known Cohen Sutherland line * clipping algorithm (line against clip rectangle). */ -public final class CohenSutherlandClipping -{ +public final class CohenSutherlandClipping { + private double xMin; private double yMin; private double xMax; private double yMax; + private static final int INSIDE = 0; + private static final int LEFT = 1; + private static final int RIGHT = 2; + private static final int BOTTOM = 4; + private static final int TOP = 8; + /** * Creates a Cohen Sutherland clipper with clip rect (0, 0, 0, 0). */ - public CohenSutherlandClipping() { - } + public CohenSutherlandClipping() {} /** * Creates a Cohen Sutherland clipper with the given clip rectangle. @@ -50,20 +55,12 @@ public void setClip(Rectangle2D clip) { yMax = yMin + clip.getHeight(); } - private static final int INSIDE = 0; - private static final int LEFT = 1; - private static final int RIGHT = 2; - private static final int BOTTOM = 4; - private static final int TOP = 8; - private final int regionCode(double x, double y) { - int code = x < xMin - ? LEFT - : x > xMax - ? RIGHT - : INSIDE; - if (y < yMin) code |= BOTTOM; - else if (y > yMax) code |= TOP; + int code = (x < xMin) ? LEFT : (x > xMax) ? RIGHT : INSIDE; + if (y < yMin) + code |= BOTTOM; + else if (y > yMax) + code |= TOP; return code; } @@ -84,56 +81,54 @@ public boolean clip(Line2D.Float line) { double qx = 0d; double qy = 0d; - boolean vertical = p1x == p2x; + boolean lineIsVertical = (p1x == p2x); - double slope = vertical - ? 0d - : (p2y-p1y)/(p2x-p1x); + double lineSlope = lineIsVertical ? 0d : (p2y-p1y)/(p2x-p1x); - int c1 = regionCode(p1x, p1y); - int c2 = regionCode(p2x, p2y); + int p1Region = regionCode(p1x, p1y); + int p2Region = regionCode(p2x, p2y); - while (c1 != INSIDE || c2 != INSIDE) { + while (p1Region != INSIDE || p2Region != INSIDE) { - if ((c1 & c2) != INSIDE) + if ((p1Region & p2Region) != INSIDE) return false; - int c = c1 == INSIDE ? c2 : c1; + int c = (p1Region == INSIDE) ? p2Region : p1Region; if ((c & LEFT) != INSIDE) { qx = xMin; - qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*slope + p1y; + qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*lineSlope + p1y; } else if ((c & RIGHT) != INSIDE) { qx = xMax; - qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*slope + p1y; + qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*lineSlope + p1y; } else if ((c & BOTTOM) != INSIDE) { qy = yMin; - qx = vertical + qx = lineIsVertical ? p1x - : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/slope + p1x; + : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/lineSlope + p1x; } else if ((c & TOP) != INSIDE) { qy = yMax; - qx = vertical + qx = lineIsVertical ? p1x - : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/slope + p1x; + : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/lineSlope + p1x; } - if (c == c1) { + if (c == p1Region) { p1x = qx; p1y = qy; - c1 = regionCode(p1x, p1y); + p1Region = regionCode(p1x, p1y); } else { p2x = qx; p2y = qy; - c2 = regionCode(p2x, p2y); + p2Region = regionCode(p2x, p2y); } } line.setLine(p1x, p1y, p2x, p2y); return true; } + } -// end of file \ No newline at end of file diff --git a/src/test/java/technology/tabula/TestCohenSutherland.java b/src/test/java/technology/tabula/TestCohenSutherland.java new file mode 100644 index 00000000..b2738d2b --- /dev/null +++ b/src/test/java/technology/tabula/TestCohenSutherland.java @@ -0,0 +1,101 @@ +package technology.tabula; + +import org.junit.Before; +import org.junit.Test; + +import java.awt.geom.Line2D; +import java.awt.geom.Rectangle2D; + +import static org.junit.Assert.*; + +public class TestCohenSutherland { + + private Rectangle2D clipWindow; + private CohenSutherlandClipping algorithm; + private static final double DELTA = 0.001; + + @Before + public void set() { + clipWindow = new Rectangle(10, 10, 50, 50); + algorithm = new CohenSutherlandClipping(clipWindow); + } + + // TODO: How to parameterize the tests? + + @Test + public void theLineIsCompletelyInside() { + Line2D.Float line = new Line2D.Float(20, 20, 30, 30); + assertTrue(algorithm.clip(line)); + assertEquals(20, line.x1, DELTA); + assertEquals(20, line.y1, DELTA); + assertEquals(30, line.x2, DELTA); + assertEquals(30, line.y2, DELTA); + } + + @Test + public void theLineIsCompletelyOnTheLeft() { + float x1 = 3, y1 = 13, x2 = 6, y2 = 16; + Line2D.Float line = new Line2D.Float(x1, y1, x2, y2); + assertFalse(algorithm.clip(line)); + assertEquals(x1, line.x1, DELTA); + assertEquals(y1, line.y1, DELTA); + assertEquals(x2, line.x2, DELTA); + assertEquals(y2, line.y2, DELTA); + } + + @Test + public void theLineIsCompletelyOnTheUp() { + float x1 = 15, y1 = 5, x2 = 25, y2 = 2; + Line2D.Float line = new Line2D.Float(x1, y1, x2, y2); + assertFalse(algorithm.clip(line)); + assertEquals(x1, line.x1, DELTA); + assertEquals(y1, line.y1, DELTA); + assertEquals(x2, line.x2, DELTA); + assertEquals(y2, line.y2, DELTA); + } + + @Test + public void theLineIsCompletelyOnTheRight() { + float x1 = 65, y1 = 15, x2 = 70, y2 = 20; + Line2D.Float line = new Line2D.Float(x1, y1, x2, y2); + assertFalse(algorithm.clip(line)); + assertEquals(x1, line.x1, DELTA); + assertEquals(y1, line.y1, DELTA); + assertEquals(x2, line.x2, DELTA); + assertEquals(y2, line.y2, DELTA); + } + + @Test + public void theLineIsCompletelyOnTheBottom() { + float x1 = 15, y1 = 65, x2 = 25, y2 = 70; + Line2D.Float line = new Line2D.Float(x1, y1, x2, y2); + assertFalse(algorithm.clip(line)); + assertEquals(x1, line.x1, DELTA); + assertEquals(y1, line.y1, DELTA); + assertEquals(x2, line.x2, DELTA); + assertEquals(y2, line.y2, DELTA); + } + + @Test + public void lineCrossesTopLeftCorner() { + float x1 = 5, y1 = 25, x2 = 25, y2 = 5; + Line2D.Float line = new Line2D.Float(x1, y1, x2, y2); + assertTrue(algorithm.clip(line)); + assertEquals(10, line.x1, DELTA); + assertEquals(20, line.y1, DELTA); + assertEquals(20, line.x2, DELTA); + assertEquals(10, line.y2, DELTA); + } + + @Test + public void lineCrossesPartiallyTopLeftCorner() { + float x1 = 15, y1 = 15, x2 = 25, y2 = 5; + Line2D.Float line = new Line2D.Float(x1, y1, x2, y2); + assertTrue(algorithm.clip(line)); + assertEquals(x1, line.x1, DELTA); + assertEquals(y1, line.y1, DELTA); + assertEquals(20, line.x2, DELTA); + assertEquals(10, line.y2, DELTA); + } + +} From b8d44f6dec19b0bb45501e804bfc7a0240149a65 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Fri, 20 Nov 2020 22:49:29 -0300 Subject: [PATCH 166/245] Renaming variables. --- .../tabula/CohenSutherlandClipping.java | 77 +++++++++---------- .../tabula/TestCohenSutherland.java | 3 +- 2 files changed, 37 insertions(+), 43 deletions(-) diff --git a/src/main/java/technology/tabula/CohenSutherlandClipping.java b/src/main/java/technology/tabula/CohenSutherlandClipping.java index ce6e2a40..9a95ad52 100644 --- a/src/main/java/technology/tabula/CohenSutherlandClipping.java +++ b/src/main/java/technology/tabula/CohenSutherlandClipping.java @@ -67,67 +67,60 @@ else if (y > yMax) /** * Clips a given line against the clip rectangle. * The modification (if needed) is done in place. - * @param line the line to clip + * @param line the line to clip. * @return true if line is clipped, false if line is * totally outside the clip rect. */ public boolean clip(Line2D.Float line) { + double point1X = line.getX1(), point1Y = line.getY1(); + double point2X = line.getX2(), point2Y = line.getY2(); + double outsidePointX = 0d, outsidePointY = 0d; - double p1x = line.getX1(); - double p1y = line.getY1(); - double p2x = line.getX2(); - double p2y = line.getY2(); + boolean lineIsVertical = (point1X == point2X); + double lineSlope = lineIsVertical ? 0d : (point2Y-point1Y)/(point2X-point1X); - double qx = 0d; - double qy = 0d; + int point1Region = regionCode(point1X, point1Y); + int point2Region = regionCode(point2X, point2Y); - boolean lineIsVertical = (p1x == p2x); - - double lineSlope = lineIsVertical ? 0d : (p2y-p1y)/(p2x-p1x); - - int p1Region = regionCode(p1x, p1y); - int p2Region = regionCode(p2x, p2y); - - while (p1Region != INSIDE || p2Region != INSIDE) { - - if ((p1Region & p2Region) != INSIDE) + while (point1Region != INSIDE || point2Region != INSIDE) { + if ((point1Region & point2Region) != INSIDE) return false; - int c = (p1Region == INSIDE) ? p2Region : p1Region; + int outsidePointRegion = (point1Region == INSIDE) ? point2Region : point1Region; - if ((c & LEFT) != INSIDE) { - qx = xMin; - qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*lineSlope + p1y; + if ((outsidePointRegion & LEFT) != INSIDE) { + outsidePointX = xMin; + outsidePointY = (Utils.feq(outsidePointX, point1X) ? 0 : outsidePointX-point1X)*lineSlope + point1Y; } - else if ((c & RIGHT) != INSIDE) { - qx = xMax; - qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*lineSlope + p1y; + else if ((outsidePointRegion & RIGHT) != INSIDE) { + outsidePointX = xMax; + outsidePointY = (Utils.feq(outsidePointX, point1X) ? 0 : outsidePointX-point1X)*lineSlope + point1Y; } - else if ((c & BOTTOM) != INSIDE) { - qy = yMin; - qx = lineIsVertical - ? p1x - : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/lineSlope + p1x; + else if ((outsidePointRegion & BOTTOM) != INSIDE) { + outsidePointY = yMin; + outsidePointX = lineIsVertical + ? point1X + : (Utils.feq(outsidePointY, point1Y) ? 0 : outsidePointY-point1Y)/lineSlope + point1X; } - else if ((c & TOP) != INSIDE) { - qy = yMax; - qx = lineIsVertical - ? p1x - : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/lineSlope + p1x; + else if ((outsidePointRegion & TOP) != INSIDE) { + outsidePointY = yMax; + outsidePointX = lineIsVertical + ? point1X + : (Utils.feq(outsidePointY, point1Y) ? 0 : outsidePointY-point1Y)/lineSlope + point1X; } - if (c == p1Region) { - p1x = qx; - p1y = qy; - p1Region = regionCode(p1x, p1y); + if (outsidePointRegion == point1Region) { + point1X = outsidePointX; + point1Y = outsidePointY; + point1Region = regionCode(point1X, point1Y); } else { - p2x = qx; - p2y = qy; - p2Region = regionCode(p2x, p2y); + point2X = outsidePointX; + point2Y = outsidePointY; + point2Region = regionCode(point2X, point2Y); } } - line.setLine(p1x, p1y, p2x, p2y); + line.setLine(point1X, point1Y, point2X, point2Y); return true; } diff --git a/src/test/java/technology/tabula/TestCohenSutherland.java b/src/test/java/technology/tabula/TestCohenSutherland.java index b2738d2b..2d747608 100644 --- a/src/test/java/technology/tabula/TestCohenSutherland.java +++ b/src/test/java/technology/tabula/TestCohenSutherland.java @@ -20,8 +20,8 @@ public void set() { algorithm = new CohenSutherlandClipping(clipWindow); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // // TODO: How to parameterize the tests? - @Test public void theLineIsCompletelyInside() { Line2D.Float line = new Line2D.Float(20, 20, 30, 30); @@ -76,6 +76,7 @@ public void theLineIsCompletelyOnTheBottom() { assertEquals(y2, line.y2, DELTA); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // @Test public void lineCrossesTopLeftCorner() { float x1 = 5, y1 = 25, x2 = 25, y2 = 5; From d498a5ec7fc6de7fc3de938c2699d979a4c7a15c Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Sat, 21 Nov 2020 08:34:32 -0300 Subject: [PATCH 167/245] Moving logic. --- .../technology/tabula/CohenSutherlandClipping.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/technology/tabula/CohenSutherlandClipping.java b/src/main/java/technology/tabula/CohenSutherlandClipping.java index 9a95ad52..fcf9a394 100644 --- a/src/main/java/technology/tabula/CohenSutherlandClipping.java +++ b/src/main/java/technology/tabula/CohenSutherlandClipping.java @@ -31,6 +31,8 @@ public final class CohenSutherlandClipping { private static final int BOTTOM = 4; private static final int TOP = 8; + private final static float MINIMUM_DELTA = 0.01f; + /** * Creates a Cohen Sutherland clipper with clip rect (0, 0, 0, 0). */ @@ -90,23 +92,23 @@ public boolean clip(Line2D.Float line) { if ((outsidePointRegion & LEFT) != INSIDE) { outsidePointX = xMin; - outsidePointY = (Utils.feq(outsidePointX, point1X) ? 0 : outsidePointX-point1X)*lineSlope + point1Y; + outsidePointY = delta(outsidePointX, point1X)*lineSlope + point1Y; } else if ((outsidePointRegion & RIGHT) != INSIDE) { outsidePointX = xMax; - outsidePointY = (Utils.feq(outsidePointX, point1X) ? 0 : outsidePointX-point1X)*lineSlope + point1Y; + outsidePointY = delta(outsidePointX, point1X)*lineSlope + point1Y; } else if ((outsidePointRegion & BOTTOM) != INSIDE) { outsidePointY = yMin; outsidePointX = lineIsVertical ? point1X - : (Utils.feq(outsidePointY, point1Y) ? 0 : outsidePointY-point1Y)/lineSlope + point1X; + : delta(outsidePointY, point1Y)/lineSlope + point1X; } else if ((outsidePointRegion & TOP) != INSIDE) { outsidePointY = yMax; outsidePointX = lineIsVertical ? point1X - : (Utils.feq(outsidePointY, point1Y) ? 0 : outsidePointY-point1Y)/lineSlope + point1X; + : delta(outsidePointY, point1Y)/lineSlope + point1X; } if (outsidePointRegion == point1Region) { @@ -124,4 +126,8 @@ else if ((outsidePointRegion & TOP) != INSIDE) { return true; } + private static double delta(double value1, double value2) { + return (Math.abs(value1 - value2) < MINIMUM_DELTA) ? 0 : (value1 - value2); + } + } From 1deb2c9273e78de3261cb972fadd0b5270c7d57e Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Sat, 21 Nov 2020 10:13:08 -0300 Subject: [PATCH 168/245] Encapsulating point attributes. --- .../tabula/CohenSutherlandClipping.java | 124 ++++++++++-------- 1 file changed, 66 insertions(+), 58 deletions(-) diff --git a/src/main/java/technology/tabula/CohenSutherlandClipping.java b/src/main/java/technology/tabula/CohenSutherlandClipping.java index fcf9a394..5094d26e 100644 --- a/src/main/java/technology/tabula/CohenSutherlandClipping.java +++ b/src/main/java/technology/tabula/CohenSutherlandClipping.java @@ -34,100 +34,108 @@ public final class CohenSutherlandClipping { private final static float MINIMUM_DELTA = 0.01f; /** - * Creates a Cohen Sutherland clipper with clip rect (0, 0, 0, 0). + * Creates a Cohen Sutherland clipper with clip window (0, 0, 0, 0). */ public CohenSutherlandClipping() {} /** - * Creates a Cohen Sutherland clipper with the given clip rectangle. - * @param clip the clip rectangle to use + * Creates a Cohen Sutherland clipper with the given clip window. + * @param clipWindow the clip window to use. */ - public CohenSutherlandClipping(Rectangle2D clip) { - setClip(clip); + public CohenSutherlandClipping(Rectangle2D clipWindow) { + setClip(clipWindow); } /** * Sets the clip rectangle. - * @param clip the clip rectangle + * @param clipWindow the clip window. */ - public void setClip(Rectangle2D clip) { - xMin = clip.getX(); - xMax = xMin + clip.getWidth(); - yMin = clip.getY(); - yMax = yMin + clip.getHeight(); - } - - private final int regionCode(double x, double y) { - int code = (x < xMin) ? LEFT : (x > xMax) ? RIGHT : INSIDE; - if (y < yMin) - code |= BOTTOM; - else if (y > yMax) - code |= TOP; - return code; + public void setClip(Rectangle2D clipWindow) { + xMin = clipWindow.getX(); + xMax = xMin + clipWindow.getWidth(); + yMin = clipWindow.getY(); + yMax = yMin + clipWindow.getHeight(); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // /** - * Clips a given line against the clip rectangle. + * Clips a given line against the clip window. * The modification (if needed) is done in place. * @param line the line to clip. * @return true if line is clipped, false if line is - * totally outside the clip rect. + * totally outside the clip window. */ public boolean clip(Line2D.Float line) { - double point1X = line.getX1(), point1Y = line.getY1(); - double point2X = line.getX2(), point2Y = line.getY2(); - double outsidePointX = 0d, outsidePointY = 0d; - - boolean lineIsVertical = (point1X == point2X); - double lineSlope = lineIsVertical ? 0d : (point2Y-point1Y)/(point2X-point1X); + Point point1 = new Point(line.getX1(), line.getY1()); + Point point2 = new Point(line.getX2(), line.getY2()); + Point outsidePoint = new Point(0d, 0d); - int point1Region = regionCode(point1X, point1Y); - int point2Region = regionCode(point2X, point2Y); + boolean lineIsVertical = (point1.x == point2.x); + double lineSlope = lineIsVertical ? 0d : (point2.y-point1.y)/(point2.x-point1.x); - while (point1Region != INSIDE || point2Region != INSIDE) { - if ((point1Region & point2Region) != INSIDE) - return false; + while (point1.region != INSIDE || point2.region != INSIDE) { + if ((point1.region & point2.region) != INSIDE) return false; - int outsidePointRegion = (point1Region == INSIDE) ? point2Region : point1Region; + outsidePoint.region = (point1.region == INSIDE) ? point2.region : point1.region; - if ((outsidePointRegion & LEFT) != INSIDE) { - outsidePointX = xMin; - outsidePointY = delta(outsidePointX, point1X)*lineSlope + point1Y; + if ((outsidePoint.region & LEFT) != INSIDE) { + outsidePoint.x = xMin; + outsidePoint.y = delta(outsidePoint.x, point1.x)*lineSlope + point1.y; } - else if ((outsidePointRegion & RIGHT) != INSIDE) { - outsidePointX = xMax; - outsidePointY = delta(outsidePointX, point1X)*lineSlope + point1Y; + else if ((outsidePoint.region & RIGHT) != INSIDE) { + outsidePoint.x = xMax; + outsidePoint.y = delta(outsidePoint.x, point1.x)*lineSlope + point1.y; } - else if ((outsidePointRegion & BOTTOM) != INSIDE) { - outsidePointY = yMin; - outsidePointX = lineIsVertical - ? point1X - : delta(outsidePointY, point1Y)/lineSlope + point1X; + else if ((outsidePoint.region & BOTTOM) != INSIDE) { + outsidePoint.y = yMin; + outsidePoint.x = lineIsVertical + ? point1.x + : delta(outsidePoint.y, point1.y)/lineSlope + point1.x; } - else if ((outsidePointRegion & TOP) != INSIDE) { - outsidePointY = yMax; - outsidePointX = lineIsVertical - ? point1X - : delta(outsidePointY, point1Y)/lineSlope + point1X; + else if ((outsidePoint.region & TOP) != INSIDE) { + outsidePoint.y = yMax; + outsidePoint.x = lineIsVertical + ? point1.x + : delta(outsidePoint.y, point1.y)/lineSlope + point1.x; } - if (outsidePointRegion == point1Region) { - point1X = outsidePointX; - point1Y = outsidePointY; - point1Region = regionCode(point1X, point1Y); + if (outsidePoint.isInTheSameRegionAs(point1)) { + point1.setPositionAndRegion(outsidePoint.x, outsidePoint.y); } else { - point2X = outsidePointX; - point2Y = outsidePointY; - point2Region = regionCode(point2X, point2Y); + point2.setPositionAndRegion(outsidePoint.x, outsidePoint.y); } } - line.setLine(point1X, point1Y, point2X, point2Y); + line.setLine(point1.x, point1.y, point2.x, point2.y); return true; } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // private static double delta(double value1, double value2) { return (Math.abs(value1 - value2) < MINIMUM_DELTA) ? 0 : (value1 - value2); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // + class Point { + double x, y; + int region; + + Point(double x, double y) { + setPositionAndRegion(x, y); + } + + void setPositionAndRegion(double x, double y) { + this.x = x; this.y = y; + region = (x < xMin) ? LEFT : (x > xMax) ? RIGHT : INSIDE; + if (y < yMin) + region |= BOTTOM; + else if (y > yMax) + region |= TOP; + } + + boolean isInTheSameRegionAs(Point otherPoint) { + return this.region == otherPoint.region; + } + } + } From 9c219de5e1d3d300da917f7bb3201acf1be16035 Mon Sep 17 00:00:00 2001 From: Zaqueu Cavalcante Date: Sat, 21 Nov 2020 11:39:38 -0300 Subject: [PATCH 169/245] Correcting conceptual mistake. --- .../technology/tabula/CohenSutherlandClipping.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/technology/tabula/CohenSutherlandClipping.java b/src/main/java/technology/tabula/CohenSutherlandClipping.java index 5094d26e..db9153e9 100644 --- a/src/main/java/technology/tabula/CohenSutherlandClipping.java +++ b/src/main/java/technology/tabula/CohenSutherlandClipping.java @@ -74,25 +74,25 @@ public boolean clip(Line2D.Float line) { double lineSlope = lineIsVertical ? 0d : (point2.y-point1.y)/(point2.x-point1.x); while (point1.region != INSIDE || point2.region != INSIDE) { - if ((point1.region & point2.region) != INSIDE) return false; + if ((point1.region & point2.region) != 0) return false; outsidePoint.region = (point1.region == INSIDE) ? point2.region : point1.region; - if ((outsidePoint.region & LEFT) != INSIDE) { + if ((outsidePoint.region & LEFT) != 0) { outsidePoint.x = xMin; outsidePoint.y = delta(outsidePoint.x, point1.x)*lineSlope + point1.y; } - else if ((outsidePoint.region & RIGHT) != INSIDE) { + else if ((outsidePoint.region & RIGHT) != 0) { outsidePoint.x = xMax; outsidePoint.y = delta(outsidePoint.x, point1.x)*lineSlope + point1.y; } - else if ((outsidePoint.region & BOTTOM) != INSIDE) { + else if ((outsidePoint.region & BOTTOM) != 0) { outsidePoint.y = yMin; outsidePoint.x = lineIsVertical ? point1.x : delta(outsidePoint.y, point1.y)/lineSlope + point1.x; } - else if ((outsidePoint.region & TOP) != INSIDE) { + else if ((outsidePoint.region & TOP) != 0) { outsidePoint.y = yMax; outsidePoint.x = lineIsVertical ? point1.x From e8f9c15803d61d853412021677b3e387ecc03084 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 24 Dec 2020 05:23:57 +0000 Subject: [PATCH 170/245] Bump jts-core from 1.17.0 to 1.18.0 Bumps jts-core from 1.17.0 to 1.18.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b88e7f71..05fec848 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ org.locationtech.jts jts-core - 1.17.0 + 1.18.0 From 47f784f7f180ceeea1f600cf62fdc3a239be43de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 05:35:30 +0000 Subject: [PATCH 171/245] Bump junit from 4.13 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05fec848..8fd99723 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,7 @@ junit junit - 4.13 + 4.13.1 test From f8cac70da7678534bb8843992a563223c5380f2d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 05:25:18 +0000 Subject: [PATCH 172/245] Bump jai-imageio-jpeg2000 from 1.3.0 to 1.4.0 Bumps [jai-imageio-jpeg2000](https://github.com/jai-imageio/jai-imageio-jpeg2000) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/jai-imageio/jai-imageio-jpeg2000/releases) - [Commits](https://github.com/jai-imageio/jai-imageio-jpeg2000/compare/jai-imageio-jpeg2000-1.3.0...jai-imageio-jpeg2000-1.4.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fd99723..c9108802 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ com.github.jai-imageio jai-imageio-jpeg2000 - 1.3.0 + 1.4.0 From 7f3f039d49d3ce97ee996d6e3a35fb8ee8d3492f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 27 Dec 2020 14:31:06 -0300 Subject: [PATCH 173/245] pdfbox 2.0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9108802..2e209198 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.21 + 2.0.22 From 8c4a0027c521b40681f9c193e43b97ee2d12f507 Mon Sep 17 00:00:00 2001 From: Andreas Tscheinig Date: Fri, 15 Jan 2021 19:32:23 +0100 Subject: [PATCH 174/245] Refactor data-clumps in Page class --- .../technology/tabula/ObjectExtractor.java | 13 +- src/main/java/technology/tabula/Page.java | 135 ++++++++++++++---- src/main/java/technology/tabula/PageDims.java | 35 +++++ .../tabula/TestProjectionProfile.java | 11 +- 4 files changed, 164 insertions(+), 30 deletions(-) create mode 100644 src/main/java/technology/tabula/PageDims.java diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 97960243..907312a9 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -38,7 +38,18 @@ protected Page extractPage(Integer pageNumber) throws IOException { height = page.getCropBox().getHeight(); } - return new Page(0, 0, width, height, rotation, pageNumber, page, pdfDocument, streamEngine, textStripper); + return Page.Builder.newInstance() + .withPageDims(PageDims.of(0, 0, width, height)) + .withRotation(rotation) + .withNumber(pageNumber) + .withPdPage(page) + .withPdDocument(pdfDocument) + .withRulings(streamEngine.rulings) + .withTextElements(textStripper.textElements) + .withMinCharWidth(textStripper.minCharWidth) + .withMinCharHeight(textStripper.minCharHeight) + .withIndex(textStripper.spatialIndex) + .build(); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 87d7c01d..20c148d9 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -36,36 +36,27 @@ public class Page extends Rectangle { private static final float DEFAULT_MIN_CHAR_LENGTH = 7; - // TODO: Use a creational design patterns here? - public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc) { - super(top, left, width, height); + private Page( + PageDims pageDims, + int rotation, + int number, + PDPage pdPage, + PDDocument doc, + List characters, + List rulings, + float minCharWidth, + float minCharHeight, + RectangleSpatialIndex index + ) { + super(pageDims.getTop(), pageDims.getLeft(), pageDims.getWidth(), pageDims.getHeight()); this.rotation = rotation; this.number = number; this.pdPage = pdPage; this.pdDoc = doc; - } - - public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, - List characters, List rulings) { - this(top, left, width, height, rotation, number, pdPage, doc); this.textElements = characters; this.rulings = rulings; - } - - public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, - ObjectExtractorStreamEngine streamEngine, TextStripper textStripper) { - this(top, left, width, height, rotation, number, pdPage, doc, textStripper.textElements, streamEngine.rulings); - this.minCharWidth = textStripper.minCharWidth; - this.minCharHeight = textStripper.minCharHeight; - this.spatialIndex = textStripper.spatialIndex; - } - - public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, - List characters, List rulings, - float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { - this(top, left, width, height, rotation, number, pdPage, doc, characters, rulings); - this.minCharHeight = minCharHeight; this.minCharWidth = minCharWidth; + this.minCharHeight = minCharHeight; this.spatialIndex = index; } @@ -76,10 +67,18 @@ public Page getArea(Rectangle area) { float minimumCharWidth = getMinimumCharWidthFrom(areaTextElements); float minimumCharHeight = getMinimumCharHeightFrom(areaTextElements); - Page page = new Page(area.getTop(), area.getLeft(), (float) area.getWidth(), (float) area.getHeight(), - rotation, number, pdPage, pdDoc, areaTextElements, - Ruling.cropRulingsToArea(getRulings(), area), - minimumCharWidth, minimumCharHeight, spatialIndex); + final Page page = Page.Builder.newInstance() + .withPageDims(PageDims.of(area.getTop(), area.getLeft(), (float) area.getWidth(), (float) area.getHeight())) + .withRotation(rotation) + .withNumber(number) + .withPdPage(pdPage) + .withPdDocument(pdDoc) + .withTextElements(areaTextElements) + .withRulings(Ruling.cropRulingsToArea(getRulings(), area)) + .withMinCharWidth(minimumCharWidth) + .withMinCharHeight(minimumCharHeight) + .withIndex(spatialIndex) + .build(); addBorderRulingsTo(page); @@ -281,4 +280,86 @@ public RectangleSpatialIndex getSpatialIndex() { return spatialIndex; } + public static class Builder { + private PageDims pageDims; + private int rotation; + private int number; + private PDPage pdPage; + private PDDocument pdDocument; + private List textElements; + private List rulings; + private float minCharWidth; + private float minCharHeight; + private RectangleSpatialIndex index; + + private Builder() {} + + public static Builder newInstance() { + return new Builder(); + } + + public Builder withPageDims(PageDims pageDims) { + this.pageDims = pageDims; + + return this; + } + + public Builder withRotation(int rotation) { + this.rotation = rotation; + + return this; + } + + public Builder withNumber(int number) { + this.number = number; + + return this; + } + + public Builder withPdPage(PDPage pdPage) { + this.pdPage = pdPage; + + return this; + } + + public Builder withPdDocument(PDDocument pdDocument) { + this.pdDocument = pdDocument; + + return this; + } + + public Builder withTextElements(List textElements) { + this.textElements = textElements; + + return this; + } + + public Builder withRulings(List rulings) { + this.rulings = rulings; + + return this; + } + + public Builder withMinCharWidth(float minCharWidth) { + this.minCharWidth = minCharWidth; + + return this; + } + + public Builder withMinCharHeight(float minCharHeight) { + this.minCharHeight = minCharHeight; + + return this; + } + + public Builder withIndex(RectangleSpatialIndex index) { + this.index = index; + + return this; + } + + public Page build() { + return new Page(pageDims, rotation, number, pdPage, pdDocument, textElements, rulings, minCharWidth, minCharHeight, index); + } + } } diff --git a/src/main/java/technology/tabula/PageDims.java b/src/main/java/technology/tabula/PageDims.java new file mode 100644 index 00000000..1598d125 --- /dev/null +++ b/src/main/java/technology/tabula/PageDims.java @@ -0,0 +1,35 @@ +package technology.tabula; + +public class PageDims { + private final float top; + private final float left; + private final float width; + private final float height; + + private PageDims(final float top, final float left, final float width, final float height) { + this.top = top; + this.left = left; + this.width = width; + this.height = height; + } + + public static PageDims of(final float top, final float left, final float width, final float height) { + return new PageDims(top, left, width, height); + } + + public float getTop() { + return top; + } + + public float getLeft() { + return left; + } + + public float getWidth() { + return width; + } + + public float getHeight() { + return height; + } +} diff --git a/src/test/java/technology/tabula/TestProjectionProfile.java b/src/test/java/technology/tabula/TestProjectionProfile.java index 4a3462f9..e7af882f 100644 --- a/src/test/java/technology/tabula/TestProjectionProfile.java +++ b/src/test/java/technology/tabula/TestProjectionProfile.java @@ -31,9 +31,16 @@ public void setUpProjectionProfile() { List rulingList = new ArrayList<>(); rulingList.add(ruling); + page = Page.Builder.newInstance() + .withPageDims(PageDims.of(0, 0, 1, 1)) + .withRotation(0) + .withNumber(1) + .withPdPage(pdPage) + .withPdDocument(pdDocument) + .withTextElements(textList) + .withRulings(rulingList) + .build(); - page = new Page(0, 0, 1, 1, 0, 1, pdPage, pdDocument, textList, rulingList); - List rectangles = new ArrayList<>(); rectangles.add(new Rectangle(0f, 0f, 500f, 5f)); From 4fd6cafeea2abc572cbd5d704ea8ad9fdd4b7896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 20 Jan 2021 09:27:56 -0300 Subject: [PATCH 175/245] Keep public constructors of Page class. Also, mark them as deprecated --- src/main/java/technology/tabula/Page.java | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 20c148d9..8b23066a 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -60,6 +60,57 @@ private Page( this.spatialIndex = index; } + /** + * + * @deprecated use {@link Builder} instead + */ + @Deprecated + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc) { + super(top, left, width, height); + this.rotation = rotation; + this.number = number; + this.pdPage = pdPage; + this.pdDoc = doc; + } + + /** + * + * @deprecated use {@link Builder} instead + */ + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, + List characters, List rulings) { + this(top, left, width, height, rotation, number, pdPage, doc); + this.textElements = characters; + this.rulings = rulings; + } + + /** + * + * @deprecated use {@link Builder} instead + */ + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, + ObjectExtractorStreamEngine streamEngine, TextStripper textStripper) { + this(top, left, width, height, rotation, number, pdPage, doc, textStripper.textElements, streamEngine.rulings); + this.minCharWidth = textStripper.minCharWidth; + this.minCharHeight = textStripper.minCharHeight; + this.spatialIndex = textStripper.spatialIndex; + } + + + + /** + * + * @deprecated use {@link Builder} instead + */ + public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, + List characters, List rulings, + float minCharWidth, float minCharHeight, RectangleSpatialIndex index) { + this(top, left, width, height, rotation, number, pdPage, doc, characters, rulings); + this.minCharHeight = minCharHeight; + this.minCharWidth = minCharWidth; + this.spatialIndex = index; + } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // public Page getArea(Rectangle area) { List areaTextElements = getText(area); From 6286f85fddc36d6bac5ec181b1120c19c7410331 Mon Sep 17 00:00:00 2001 From: Christoph Wedenig Date: Fri, 15 Jan 2021 20:58:09 +0100 Subject: [PATCH 176/245] Extracted duplicate code into methods * Enhanced readability with computeIfAbsent --- .../detectors/NurminenDetectionAlgorithm.java | 181 +++++++----------- 1 file changed, 72 insertions(+), 109 deletions(-) diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index 74898e3e..fb43622a 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -6,15 +6,7 @@ import java.awt.image.Raster; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; import org.apache.pdfbox.contentstream.operator.Operator; import org.apache.pdfbox.cos.COSName; @@ -526,132 +518,103 @@ private TextEdges getTextEdges(List lines) { Map> currMidEdges = new HashMap<>(); Map> currRightEdges = new HashMap<>(); + + int numOfLines = lines.size(); for (Line textRow : lines) { for (TextChunk text : textRow.getTextElements()) { - Integer left = new Integer((int) Math.floor(text.getLeft())); - Integer right = new Integer((int) Math.floor(text.getRight())); - Integer mid = new Integer(left + ((right - left) / 2)); + Integer left = (int) Math.floor(text.getLeft()); + Integer right = (int) Math.floor(text.getRight()); + Integer mid = left + ((right - left) / 2); // first put this chunk into any edge buckets it belongs to - List leftEdge = currLeftEdges.get(left); - if (leftEdge == null) { - leftEdge = new ArrayList<>(); - currLeftEdges.put(left, leftEdge); - } + List leftEdge = currLeftEdges.computeIfAbsent(left, k -> new ArrayList<>()); leftEdge.add(text); - List midEdge = currMidEdges.get(mid); - if (midEdge == null) { - midEdge = new ArrayList<>(); - currMidEdges.put(mid, midEdge); - } + List midEdge = currMidEdges.computeIfAbsent(mid, k -> new ArrayList<>()); midEdge.add(text); - List rightEdge = currRightEdges.get(right); - if (rightEdge == null) { - rightEdge = new ArrayList<>(); - currRightEdges.put(right, rightEdge); - } + List rightEdge = currRightEdges.computeIfAbsent(right, k -> new ArrayList<>()); rightEdge.add(text); // now see if this text chunk blows up any other edges - for (Iterator>> iterator = currLeftEdges.entrySet().iterator(); iterator.hasNext(); ) { - Map.Entry> entry = iterator.next(); - Integer key = entry.getKey(); - if (key > left && key < right) { - iterator.remove(); - List edgeChunks = entry.getValue(); - if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { - TextChunk first = edgeChunks.get(0); - TextChunk last = edgeChunks.get(edgeChunks.size() - 1); - - TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); - edge.intersectingTextRowCount = Math.min(edgeChunks.size(), lines.size()); - - leftTextEdges.add(edge); - } - } - } - - for (Iterator>> iterator = currMidEdges.entrySet().iterator(); iterator.hasNext(); ) { - Map.Entry> entry = iterator.next(); - Integer key = entry.getKey(); - if (key > left && key < right && Math.abs(key - mid) > 2) { - iterator.remove(); - List edgeChunks = entry.getValue(); - if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { - TextChunk first = edgeChunks.get(0); - TextChunk last = edgeChunks.get(edgeChunks.size() - 1); - - TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); - edge.intersectingTextRowCount = Math.min(edgeChunks.size(), lines.size()); - - midTextEdges.add(edge); - } - } - } - - for (Iterator>> iterator = currRightEdges.entrySet().iterator(); iterator.hasNext(); ) { - Map.Entry> entry = iterator.next(); - Integer key = entry.getKey(); - if (key > left && key < right) { - iterator.remove(); - List edgeChunks = entry.getValue(); - if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { - TextChunk first = edgeChunks.get(0); - TextChunk last = edgeChunks.get(edgeChunks.size() - 1); + leftTextEdges.addAll( + calculateExtendedEdges(numOfLines, currLeftEdges, left, right) + ); - TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); - edge.intersectingTextRowCount = Math.min(edgeChunks.size(), lines.size()); + midTextEdges.addAll( + calculateExtendedEdges(numOfLines, currMidEdges, left, right, mid, 2) + ); - rightTextEdges.add(edge); - } - } - } + rightTextEdges.addAll( + calculateExtendedEdges(numOfLines, currRightEdges, left, right) + ); } } // add the leftovers - for (Integer key : currLeftEdges.keySet()) { - List edgeChunks = currLeftEdges.get(key); - if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { - TextChunk first = edgeChunks.get(0); - TextChunk last = edgeChunks.get(edgeChunks.size() - 1); + leftTextEdges.addAll( + calculateLeftoverEdges(numOfLines, currLeftEdges) + ); - TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); - edge.intersectingTextRowCount = Math.min(edgeChunks.size(), lines.size()); + midTextEdges.addAll( + calculateLeftoverEdges(numOfLines, currMidEdges) + ); - leftTextEdges.add(edge); - } - } + rightTextEdges.addAll( + calculateLeftoverEdges(numOfLines, currRightEdges) + ); - for (Integer key : currMidEdges.keySet()) { - List edgeChunks = currMidEdges.get(key); - if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { - TextChunk first = edgeChunks.get(0); - TextChunk last = edgeChunks.get(edgeChunks.size() - 1); + return new TextEdges(leftTextEdges, midTextEdges, rightTextEdges); + } - TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); - edge.intersectingTextRowCount = Math.min(edgeChunks.size(), lines.size()); + private Set calculateLeftoverEdges(int numOfLines, Map> currDirectedEdges) { + Set leftoverEdges = new HashSet<>(); + for (Integer key : currDirectedEdges.keySet()) { + List edgeChunks = currDirectedEdges.get(key); + if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { + TextEdge edge = getEdgeFromChunks(numOfLines, key, edgeChunks); - midTextEdges.add(edge); + leftoverEdges.add(edge); } } + return leftoverEdges; + } - for (Integer key : currRightEdges.keySet()) { - List edgeChunks = currRightEdges.get(key); - if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { - TextChunk first = edgeChunks.get(0); - TextChunk last = edgeChunks.get(edgeChunks.size() - 1); + private TextEdge getEdgeFromChunks(int numOfLines, Integer key, List edgeChunks) { + TextChunk first = edgeChunks.get(0); + TextChunk last = edgeChunks.get(edgeChunks.size() - 1); - TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); - edge.intersectingTextRowCount = Math.min(edgeChunks.size(), lines.size()); + TextEdge edge = new TextEdge(key, first.getTop(), key, last.getBottom()); + edge.intersectingTextRowCount = Math.min(edgeChunks.size(), numOfLines); + return edge; + } - rightTextEdges.add(edge); + + private Collection calculateExtendedEdges(Integer numOfLines, Map> currDirectedEdges, Integer left, Integer right) { + return calculateExtendedEdges(numOfLines, currDirectedEdges, left, right, null, null); + } + + private Collection calculateExtendedEdges(Integer numOfLines, Map> currDirectedEdges, Integer left, Integer right, Integer mid, Integer minDistToMid) { + Set extendedEdges = new HashSet<>(); + Iterator>> edgeIterator = currDirectedEdges.entrySet().iterator(); + while (edgeIterator.hasNext()) { + Map.Entry> entry = edgeIterator.next(); + Integer key = entry.getKey(); + + // if mid and minDistToMid are set, we calculate if the distance to mid is actually above, + // otherwise we ignore it + boolean hasMinDistToMid = mid == null || minDistToMid == null || Math.abs(key - mid) > minDistToMid; + + if (key > left && key < right && hasMinDistToMid) { + edgeIterator.remove(); + List edgeChunks = entry.getValue(); + if (edgeChunks.size() >= REQUIRED_TEXT_LINES_FOR_EDGE) { + TextEdge edge = getEdgeFromChunks(numOfLines, key, edgeChunks); + extendedEdges.add(edge); + } } } - - return new TextEdges(leftTextEdges, midTextEdges, rightTextEdges); + return extendedEdges; } private List getTableAreasFromCells(List cells) { @@ -665,9 +628,9 @@ private List getTableAreasFromCells(List cells) Point2D[] groupCellCorners = groupCell.getPoints(); Point2D[] candidateCorners = cell.getPoints(); - for (int i = 0; i < candidateCorners.length; i++) { - for (int j = 0; j < groupCellCorners.length; j++) { - if (candidateCorners[i].distance(groupCellCorners[j]) < CELL_CORNER_DISTANCE_MAXIMUM) { + for (Point2D candidateCorner : candidateCorners) { + for (Point2D groupCellCorner : groupCellCorners) { + if (candidateCorner.distance(groupCellCorner) < CELL_CORNER_DISTANCE_MAXIMUM) { cellGroup.add(cell); addedToGroup = true; break cellCheck; From 11928877d03545264ff4411111a577199e3fba2c Mon Sep 17 00:00:00 2001 From: Andreas Tscheinig Date: Fri, 15 Jan 2021 21:08:04 +0100 Subject: [PATCH 177/245] Resolve dependency inversion code smell --- src/main/java/technology/tabula/Cell.java | 15 +---------- src/main/java/technology/tabula/HasText.java | 1 + .../tabula/RectangularTextContainer.java | 25 +++++++++++++++---- .../java/technology/tabula/TextChunk.java | 15 ++++------- .../java/technology/tabula/TextElement.java | 8 +++++- 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/main/java/technology/tabula/Cell.java b/src/main/java/technology/tabula/Cell.java index 79c64fbc..3b42b4ca 100644 --- a/src/main/java/technology/tabula/Cell.java +++ b/src/main/java/technology/tabula/Cell.java @@ -1,9 +1,7 @@ package technology.tabula; import java.awt.geom.Point2D; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; @SuppressWarnings("serial") public class Cell extends RectangularTextContainer { @@ -12,19 +10,16 @@ public Cell(float top, float left, float width, float height) { super(top, left, width, height); this.setPlaceholder(false); this.setSpanning(false); - this.setTextElements(new ArrayList()); } public Cell(Point2D topLeft, Point2D bottomRight) { super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight.getY() - topLeft.getY())); this.setPlaceholder(false); this.setSpanning(false); - this.setTextElements(new ArrayList()); } private boolean spanning; private boolean placeholder; - private List textElements; @Override public String getText(boolean useLineReturns) { @@ -44,6 +39,7 @@ public String getText(boolean useLineReturns) { return sb.toString().trim(); } + @Override public String getText() { return getText(true); } @@ -63,13 +59,4 @@ public boolean isPlaceholder() { public void setPlaceholder(boolean placeholder) { this.placeholder = placeholder; } - - public List getTextElements() { - return textElements; - } - - public void setTextElements(List textElements) { - this.textElements = textElements; - } - } diff --git a/src/main/java/technology/tabula/HasText.java b/src/main/java/technology/tabula/HasText.java index 99455afb..1a9bda99 100644 --- a/src/main/java/technology/tabula/HasText.java +++ b/src/main/java/technology/tabula/HasText.java @@ -3,5 +3,6 @@ public interface HasText { String getText(); + String getText(boolean useLineReturns); } diff --git a/src/main/java/technology/tabula/RectangularTextContainer.java b/src/main/java/technology/tabula/RectangularTextContainer.java index 5f4d3716..934b5f13 100644 --- a/src/main/java/technology/tabula/RectangularTextContainer.java +++ b/src/main/java/technology/tabula/RectangularTextContainer.java @@ -1,11 +1,14 @@ package technology.tabula; +import java.util.ArrayList; import java.util.List; @SuppressWarnings("serial") -public abstract class RectangularTextContainer extends Rectangle { +public class RectangularTextContainer extends Rectangle implements HasText { - public RectangularTextContainer(float top, float left, float width, float height) { + protected List textElements = new ArrayList<>(); + + protected RectangularTextContainer(float top, float left, float width, float height) { super(top, left, width, height); } @@ -19,11 +22,23 @@ public RectangularTextContainer merge(RectangularTextContainer other) { return this; } - public abstract String getText(); + public List getTextElements() { + return textElements; + } + + public void setTextElements(List textElements) { + this.textElements = textElements; + } - public abstract String getText(boolean useLineReturns); + @Override + public String getText() { + throw new UnsupportedOperationException(); + } - public abstract List getTextElements(); + @Override + public String getText(boolean useLineReturns) { + throw new UnsupportedOperationException(); + } @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/technology/tabula/TextChunk.java b/src/main/java/technology/tabula/TextChunk.java index d387a5de..6e7722a3 100644 --- a/src/main/java/technology/tabula/TextChunk.java +++ b/src/main/java/technology/tabula/TextChunk.java @@ -8,9 +8,9 @@ import java.text.Normalizer; @SuppressWarnings("serial") -public class TextChunk extends RectangularTextContainer implements HasText { +public class TextChunk extends RectangularTextContainer { public static final TextChunk EMPTY = new TextChunk(0, 0, 0, 0); - List textElements = new ArrayList<>(); +// List textElements = new ArrayList<>(); public TextChunk(float top, float left, float width, float height) { super(top, left, width, height); @@ -165,11 +165,8 @@ public void add(List elements) { } } - @Override public List getTextElements() { - return textElements; - } - - @Override public String getText() { + @Override + public String getText() { if (this.textElements.size() == 0) { return ""; } @@ -183,11 +180,9 @@ public void add(List elements) { @Override public String getText(boolean useLineReturns) { - // TODO Auto-generated method stub - return null; + return getText(); } - /** * Returns true if text contained in this TextChunk is the same repeated character */ diff --git a/src/main/java/technology/tabula/TextElement.java b/src/main/java/technology/tabula/TextElement.java index f54c4e2f..a0f24fa0 100644 --- a/src/main/java/technology/tabula/TextElement.java +++ b/src/main/java/technology/tabula/TextElement.java @@ -30,7 +30,13 @@ public TextElement(float y, float x, float width, float height, this.dir = dir; } - @Override public String getText() { + @Override + public String getText() { + return text; + } + + @Override + public String getText(boolean useLineReturns) { return text; } From 3452fe14c2c333985a74544667b06fe069bd5321 Mon Sep 17 00:00:00 2001 From: Andreas Tscheinig Date: Fri, 15 Jan 2021 21:46:25 +0100 Subject: [PATCH 178/245] Resolve data-class code smell --- .../technology/tabula/ObjectExtractor.java | 10 +++---- .../java/technology/tabula/TextStripper.java | 30 ++++++++++++++----- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index 907312a9..c4348cd3 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -26,7 +26,7 @@ protected Page extractPage(Integer pageNumber) throws IOException { TextStripper textStripper = new TextStripper(pdfDocument, pageNumber); textStripper.process(); - Utils.sort(textStripper.textElements, Rectangle.ILL_DEFINED_ORDER); + Utils.sort(textStripper.getTextElements(), Rectangle.ILL_DEFINED_ORDER); float width, height; int rotation = page.getRotation(); @@ -45,10 +45,10 @@ protected Page extractPage(Integer pageNumber) throws IOException { .withPdPage(page) .withPdDocument(pdfDocument) .withRulings(streamEngine.rulings) - .withTextElements(textStripper.textElements) - .withMinCharWidth(textStripper.minCharWidth) - .withMinCharHeight(textStripper.minCharHeight) - .withIndex(textStripper.spatialIndex) + .withTextElements(textStripper.getTextElements()) + .withMinCharWidth(textStripper.getMinCharWidth()) + .withMinCharHeight(textStripper.getMinCharHeight()) + .withIndex(textStripper.getSpatialIndex()) .build(); } diff --git a/src/main/java/technology/tabula/TextStripper.java b/src/main/java/technology/tabula/TextStripper.java index 329d45a2..557fa439 100644 --- a/src/main/java/technology/tabula/TextStripper.java +++ b/src/main/java/technology/tabula/TextStripper.java @@ -18,13 +18,13 @@ public class TextStripper extends PDFTextStripper { private static final float AVG_HEIGHT_MULT_THRESHOLD = 6.0f; private static final float MAX_BLANK_FONT_SIZE = 40.0f; private static final float MIN_BLANK_FONT_SIZE = 2.0f; - private PDDocument document; - public ArrayList textElements; - public RectangleSpatialIndex spatialIndex; - public float minCharWidth = Float.MAX_VALUE; - public float minCharHeight = Float.MAX_VALUE; - public float totalHeight = 0.0f; - public int countHeight = 0; + private final PDDocument document; + private final ArrayList textElements; + private final RectangleSpatialIndex spatialIndex; + private float minCharWidth = Float.MAX_VALUE; + private float minCharHeight = Float.MAX_VALUE; + private float totalHeight = 0.0f; + private int countHeight = 0; public TextStripper(PDDocument document, int pageNumber) throws IOException { super(); @@ -156,4 +156,20 @@ private boolean isPrintable(String s) { } return printable; } + + public List getTextElements() { + return this.textElements; + } + + public RectangleSpatialIndex getSpatialIndex() { + return spatialIndex; + } + + public float getMinCharWidth() { + return minCharWidth; + } + + public float getMinCharHeight() { + return minCharHeight; + } } From 6923895ef37c0f03c7cd44ee755e875b078e82d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 20 Jan 2021 09:40:51 -0300 Subject: [PATCH 179/245] adapt to refactor --- src/main/java/technology/tabula/Page.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/technology/tabula/Page.java b/src/main/java/technology/tabula/Page.java index 8b23066a..ed74d14a 100644 --- a/src/main/java/technology/tabula/Page.java +++ b/src/main/java/technology/tabula/Page.java @@ -90,10 +90,10 @@ public Page(float top, float left, float width, float height, int rotation, int */ public Page(float top, float left, float width, float height, int rotation, int number, PDPage pdPage, PDDocument doc, ObjectExtractorStreamEngine streamEngine, TextStripper textStripper) { - this(top, left, width, height, rotation, number, pdPage, doc, textStripper.textElements, streamEngine.rulings); - this.minCharWidth = textStripper.minCharWidth; - this.minCharHeight = textStripper.minCharHeight; - this.spatialIndex = textStripper.spatialIndex; + this(top, left, width, height, rotation, number, pdPage, doc, textStripper.getTextElements(), streamEngine.rulings); + this.minCharWidth = textStripper.getMinCharWidth(); + this.minCharHeight = textStripper.getMinCharHeight(); + this.spatialIndex = textStripper.getSpatialIndex(); } From df3653b1122f7feb0dfa919746be46253e25490f Mon Sep 17 00:00:00 2001 From: Christoph Wedenig Date: Fri, 15 Jan 2021 23:22:18 +0100 Subject: [PATCH 180/245] Extracted rounded comparator --- .../SpreadsheetExtractionAlgorithm.java | 65 +++++-------------- 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index c377507c..0acf2092 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -27,57 +27,28 @@ public class SpreadsheetExtractionAlgorithm implements ExtractionAlgorithm { private static final float MAGIC_HEURISTIC_NUMBER = 0.65f; - private static final Comparator POINT_COMPARATOR = new Comparator() { - @Override - public int compare(Point2D arg0, Point2D arg1) { - int rv = 0; - float arg0X = Utils.round(arg0.getX(), 2); - float arg0Y = Utils.round(arg0.getY(), 2); - float arg1X = Utils.round(arg1.getX(), 2); - float arg1Y = Utils.round(arg1.getY(), 2); - - - if (arg0Y > arg1Y) { - rv = 1; - } - else if (arg0Y < arg1Y) { - rv = -1; - } - else if (arg0X > arg1X) { - rv = 1; - } - else if (arg0X < arg1X) { - rv = -1; - } - return rv; + private static final Comparator Y_FIRST_POINT_COMPARATOR = (point1, point2) -> { + int compareY = compareRounded(point1.getY(), point2.getY()); + if (compareY == 0) { + return compareRounded(point1.getX(), point2.getX()); } + return compareY; }; - private static final Comparator X_FIRST_POINT_COMPARATOR = new Comparator() { - @Override - public int compare(Point2D arg0, Point2D arg1) { - int rv = 0; - float arg0X = Utils.round(arg0.getX(), 2); - float arg0Y = Utils.round(arg0.getY(), 2); - float arg1X = Utils.round(arg1.getX(), 2); - float arg1Y = Utils.round(arg1.getY(), 2); - - if (arg0X > arg1X) { - rv = 1; - } - else if (arg0X < arg1X) { - rv = -1; - } - else if (arg0Y > arg1Y) { - rv = 1; - } - else if (arg0Y < arg1Y) { - rv = -1; - } - return rv; + private static final Comparator X_FIRST_POINT_COMPARATOR = (point1, point2) -> { + int compareX = compareRounded(point1.getX(), point2.getX()); + if (compareX == 0) { + return compareRounded(point1.getY(), point2.getY()); } + return compareX; }; + private static int compareRounded(double d1, double d2) { + float d1Rounded = Utils.round(d1, 2); + float d2Rounded = Utils.round(d2, 2); + + return Float.compare(d1Rounded, d2Rounded); + } @Override public List
extract(Page page) { @@ -175,7 +146,7 @@ public static List findCells(List horizontalRulingLines, List cellsFound = new ArrayList<>(); Map intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines); List intersectionPointsList = new ArrayList<>(intersectionPoints.keySet()); - Collections.sort(intersectionPointsList, POINT_COMPARATOR); + intersectionPointsList.sort(Y_FIRST_POINT_COMPARATOR); boolean doBreak = false; for (int i = 0; i < intersectionPointsList.size(); i++) { @@ -256,7 +227,7 @@ public static List findSpreadsheetsFromCells(List pointsSortY = new ArrayList<>(pointSet); - Collections.sort(pointsSortY, POINT_COMPARATOR); + Collections.sort(pointsSortY, Y_FIRST_POINT_COMPARATOR); while (i < pointSet.size()) { float currY = (float) pointsSortY.get(i).getY(); From cbb6d73a9eed856cdf1ec29d3658e07177382404 Mon Sep 17 00:00:00 2001 From: Christoph Wedenig Date: Fri, 15 Jan 2021 23:38:39 +0100 Subject: [PATCH 181/245] Cleaned up SpreadsheetExtractionAlgorithm --- .../SpreadsheetExtractionAlgorithm.java | 65 +++++++------------ 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 0acf2092..44998cfb 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -1,23 +1,9 @@ package technology.tabula.extractors; -import java.awt.geom.Point2D; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import technology.tabula.*; -import technology.tabula.Cell; -import technology.tabula.Page; -import technology.tabula.Rectangle; -import technology.tabula.Ruling; -import technology.tabula.Table; -import technology.tabula.TableWithRulingLines; -import technology.tabula.TextElement; -import technology.tabula.Utils; +import java.awt.geom.Point2D; +import java.util.*; /** * @author manuel @@ -60,8 +46,8 @@ public List
extract(Page page) { */ public List
extract(Page page, List rulings) { // split rulings into horizontal and vertical - List horizontalR = new ArrayList<>(), - verticalR = new ArrayList<>(); + List horizontalR = new ArrayList<>(); + List verticalR = new ArrayList<>(); for (Ruling r: rulings) { if (r.horizontal()) { @@ -113,7 +99,7 @@ public boolean isTabular(Page page) { // if there's no text at all on the page, it's not a table // (we won't be able to do anything with it though) - if(page.getText().isEmpty()){ + if (page.getText().isEmpty()){ return false; } @@ -122,7 +108,7 @@ public boolean isTabular(Page page) { Page minimalRegion = page.getArea(Utils.bounds(page.getText())); List tables = new SpreadsheetExtractionAlgorithm().extract(minimalRegion); - if (tables.size() == 0) { + if (tables.isEmpty()) { return false; } Table table = tables.get(0); @@ -130,16 +116,17 @@ public boolean isTabular(Page page) { int colsDefinedByLines = table.getColCount(); tables = new BasicExtractionAlgorithm().extract(minimalRegion); - if (tables.size() == 0) { - // TODO WHAT DO WE DO HERE? + if (tables.isEmpty()) { + return false; } table = tables.get(0); int rowsDefinedWithoutLines = table.getRowCount(); int colsDefinedWithoutLines = table.getColCount(); - float ratio = (((float) colsDefinedByLines / colsDefinedWithoutLines) + ((float) rowsDefinedByLines / rowsDefinedWithoutLines)) / 2.0f; + float ratio = (((float) colsDefinedByLines / colsDefinedWithoutLines) + + ((float) rowsDefinedByLines / rowsDefinedWithoutLines)) / 2.0f; - return ratio > MAGIC_HEURISTIC_NUMBER && ratio < (1/MAGIC_HEURISTIC_NUMBER); + return ratio > MAGIC_HEURISTIC_NUMBER && ratio < (1 / MAGIC_HEURISTIC_NUMBER); } public static List findCells(List horizontalRulingLines, List verticalRulingLines) { @@ -147,16 +134,12 @@ public static List findCells(List horizontalRulingLines, List intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines); List intersectionPointsList = new ArrayList<>(intersectionPoints.keySet()); intersectionPointsList.sort(Y_FIRST_POINT_COMPARATOR); - boolean doBreak = false; for (int i = 0; i < intersectionPointsList.size(); i++) { Point2D topLeft = intersectionPointsList.get(i); Ruling[] hv = intersectionPoints.get(topLeft); - doBreak = false; - - // CrossingPointsDirectlyBelow( topLeft ); + List xPoints = new ArrayList<>(); - // CrossingPointsDirectlyToTheRight( topLeft ); List yPoints = new ArrayList<>(); for (Point2D p: intersectionPointsList.subList(i, intersectionPointsList.size())) { @@ -169,7 +152,6 @@ public static List findCells(List horizontalRulingLines, List findCells(List horizontalRulingLines, List findSpreadsheetsFromCells(List pointsSortX = new ArrayList<>(pointSet); - Collections.sort(pointsSortX, X_FIRST_POINT_COMPARATOR); + pointsSortX.sort(X_FIRST_POINT_COMPARATOR); // Y first sort List pointsSortY = new ArrayList<>(pointSet); - Collections.sort(pointsSortY, Y_FIRST_POINT_COMPARATOR); + pointsSortY.sort(Y_FIRST_POINT_COMPARATOR); while (i < pointSet.size()) { float currY = (float) pointsSortY.get(i).getY(); @@ -263,16 +244,15 @@ public static List findSpreadsheetsFromCells(List Date: Sun, 7 Mar 2021 15:45:56 -0300 Subject: [PATCH 182/245] ObjectExtractor: implement java.io.Closeable (fixes #408) --- src/main/java/technology/tabula/ObjectExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/ObjectExtractor.java b/src/main/java/technology/tabula/ObjectExtractor.java index c4348cd3..9f3f6a03 100644 --- a/src/main/java/technology/tabula/ObjectExtractor.java +++ b/src/main/java/technology/tabula/ObjectExtractor.java @@ -5,7 +5,7 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; -public class ObjectExtractor { +public class ObjectExtractor implements java.io.Closeable { private final PDDocument pdfDocument; From 6ba8ad8978c0dac9c7774c4953adee174d2edd17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 7 Mar 2021 16:25:48 -0300 Subject: [PATCH 183/245] Fix unclosed document warnings --- .../technology/tabula/TestBasicExtractor.java | 11 ++ .../tabula/TestObjectExtractor.java | 102 ++++++++---------- 2 files changed, 58 insertions(+), 55 deletions(-) diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index 5d5d985c..d120546f 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -135,6 +135,7 @@ public void testRemoveSequentialSpaces() throws IOException { assertTrue(firstRow.get(1).getText().equals("ALLEGIANT AIR")); assertTrue(firstRow.get(2).getText().equals("ALLEGIANT AIR LLC")); + page.getPDDoc().close(); } @Test @@ -143,6 +144,7 @@ public void testColumnRecognition() throws IOException { BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(ARGENTINA_DIPUTADOS_VOTING_RECORD_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); + page.getPDDoc().close(); } @Test @@ -162,6 +164,7 @@ public void testVerticalRulingsPreventMergingOfColumns() throws IOException { assertTrue(sixthRow.get(0).getText().equals("VALSANGIACOMO BLANC")); assertTrue(sixthRow.get(1).getText().equals("OFERNANDO JORGE")); + page.getPDDoc().close(); } @Test @@ -170,6 +173,7 @@ public void testExtractColumnsCorrectly() throws IOException { BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(EU_002_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); + page.getPDDoc().close(); } @Test @@ -178,6 +182,7 @@ public void testExtractColumnsCorrectly2() throws IOException { BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(page.getVerticalRulings()); Table table = bea.extract(page.getArea(299.625f, 148.44f, 711.875f, 452.32f)).get(0); assertArrayEquals(EU_017_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); + page.getPDDoc().close(); } @Test @@ -186,6 +191,7 @@ public void testExtractColumnsCorrectly3() throws IOException { BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(FRX_2012_DISCLOSURE_EXPECTED, UtilsForTesting.tableToArrayOfRows(table)); + page.getPDDoc().close(); } @Test @@ -199,6 +205,7 @@ public void testCheckSqueezeDoesntBreak() throws IOException { List lastRow = rows.get(rows.size() - 1); assertTrue(firstRow.get(0).getText().equals("Violent crime . . . . . . . . . . . . . . . . . .")); assertTrue(lastRow.get(lastRow.size() - 1).getText().equals("(X)")); + page.getPDDoc().close(); } @Test @@ -274,6 +281,8 @@ public void testNaturalOrderOfRectangles() throws IOException { assertEquals("DOD, and NIH", cells.get(38).getText()); assertEquals("and networks", cells.get(39).getText()); + page.getPDDoc().close(); + } @Test @@ -314,6 +323,7 @@ public void testRealLifeRTL2() throws IOException { StringBuilder sb = new StringBuilder(); (new CSVWriter()).write(sb, table); assertEquals(expectedCsv, sb.toString()); + page.getPDDoc().close(); } @@ -323,6 +333,7 @@ public void testEmptyRegion() throws IOException { BasicExtractionAlgorithm bea = new BasicExtractionAlgorithm(); Table table = bea.extract(page).get(0); assertArrayEquals(EXPECTED_EMPTY_TABLE, UtilsForTesting.tableToArrayOfRows(table)); + page.getPDDoc().close(); } diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index fe458b87..9db7ad18 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -22,74 +22,80 @@ public void testWrongPasswordRaisesException() throws IOException { @Test(expected = IOException.class) public void testEmptyOnEncryptedFileRaisesException() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - oe.extract().next(); + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + oe.extract().next(); + } } @Test public void testCanReadPDFWithOwnerEncryption() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - PageIterator pi = oe.extract(); - int i = 0; - while (pi.hasNext()) { + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + PageIterator pi = oe.extract(); + int i = 0; + while (pi.hasNext()) { i++; pi.next(); + } + assertEquals(2, i); } - assertEquals(2, i); } @Test public void testGoodPassword() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf"), "userpassword"); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - List pages = new ArrayList<>(); - PageIterator pi = oe.extract(); - while (pi.hasNext()) { + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + List pages = new ArrayList<>(); + PageIterator pi = oe.extract(); + while (pi.hasNext()) { pages.add(pi.next()); + } + assertEquals(1, pages.size()); } - assertEquals(1, pages.size()); } @Test public void testTextExtractionDoesNotRaise() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/rotated_page.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - PageIterator pi = oe.extract(); - - assertTrue(pi.hasNext()); - assertNotNull(pi.next()); - assertFalse(pi.hasNext()); + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + PageIterator pi = oe.extract(); + assertTrue(pi.hasNext()); + assertNotNull(pi.next()); + assertFalse(pi.hasNext()); + } } @Test public void testShouldDetectRulings() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/should_detect_rulings.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - PageIterator pi = oe.extract(); + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + PageIterator pi = oe.extract(); - Page page = pi.next(); - List rulings = page.getRulings(); + Page page = pi.next(); + List rulings = page.getRulings(); - for (Ruling r: rulings) { + for (Ruling r: rulings) { assertTrue(page.contains(r.getBounds())); + } } } @Test public void testDontThrowNPEInShfill() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/labor.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - PageIterator pi = oe.extract(); - assertTrue(pi.hasNext()); - try { + + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + PageIterator pi = oe.extract(); + assertTrue(pi.hasNext()); + try { Page p = pi.next(); assertNotNull(p); - } catch (NullPointerException e) { + } catch (NullPointerException e) { fail("NPE in ObjectExtractor " + e.toString()); + } } } @@ -98,10 +104,11 @@ public void testExtractOnePage() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); assertEquals(2, pdf_document.getNumberOfPages()); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - Page page = oe.extract(2); + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + Page page = oe.extract(2); - assertNotNull(page); + assertNotNull(page); + } } @@ -110,48 +117,33 @@ public void testExtractWrongPageNumber() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); assertEquals(2, pdf_document.getNumberOfPages()); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - oe.extract(3); - + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + oe.extract(3); + } } @Test public void testTextElementsContainedInPage() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/cs-en-us-pbms.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - Page page = oe.extractPage(1); + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { + Page page = oe.extractPage(1); - for (TextElement te: page.getText()) { + for (TextElement te: page.getText()) { assertTrue(page.contains(te)); + } } + } @Test public void testDoNotNPEInPointComparator() throws IOException { PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/npe_issue_206.pdf")); - ObjectExtractor oe = new ObjectExtractor(pdf_document); - try { + try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { Page p = oe.extractPage(1); assertNotNull(p); } catch (NullPointerException e) { fail("NPE in ObjectExtractor " + e.toString()); } } - - /* - @Test - public void testExtractWithoutExtractingRulings() throws IOException { - PDDocument pdf_document = PDDocument.load("src/test/resources/technology/tabula/should_detect_rulings.pdf"); - ObjectExtractor oe = new ObjectExtractor(pdf_document, null, false, false); - PageIterator pi = oe.extract(); - - assertTrue(pi.hasNext()); - Page page = pi.next(); - assertNotNull(page); - assertEquals(0, page.getRulings().size()); - assertFalse(pi.hasNext()); - } - */ - } From 96ac1829c09aa2df7434d0ed96a3f5424bef6c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Sun, 7 Mar 2021 16:35:55 -0300 Subject: [PATCH 184/245] fix more warnings in tests --- .../tabula/TestSpreadsheetExtractor.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java index 0abd578b..f8bd4074 100644 --- a/src/test/java/technology/tabula/TestSpreadsheetExtractor.java +++ b/src/test/java/technology/tabula/TestSpreadsheetExtractor.java @@ -189,6 +189,7 @@ public void testSpreadsheetExtraction() throws IOException { 269.875f, 12.75f, 790.5f, 561f); SpreadsheetExtractionAlgorithm.findCells(page.getHorizontalRulings(), page.getVerticalRulings()); + page.getPDDoc().close(); } @Test @@ -204,7 +205,7 @@ public void testSpanningCells() throws IOException { StringBuilder sb = new StringBuilder(); (new JSONWriter()).write(sb, tables); assertEquals(expectedJson, sb.toString()); - + page.getPDDoc().close(); } @Test @@ -220,7 +221,7 @@ public void testSpanningCellsToCsv() throws IOException { StringBuilder sb = new StringBuilder(); (new CSVWriter()).write(sb, tables); assertEquals(expectedCsv, sb.toString()); - + page.getPDDoc().close(); } @Test @@ -229,6 +230,7 @@ public void testIncompleteGrid() throws IOException { SpreadsheetExtractionAlgorithm se = new SpreadsheetExtractionAlgorithm(); List tables = se.extract(page); assertEquals(2, tables.size()); + page.getPDDoc().close(); } @Test @@ -244,6 +246,7 @@ public void testNaturalOrderOfRectanglesDoesNotBreakContract() throws IOExceptio String expected = "Project,Agency,Institution\r\nNanotechnology and its publics,NSF,Pennsylvania State University\r\n\"Public information and deliberation in nanoscience and\rnanotechnology policy (SGER)\",Interagency,\"North Carolina State\rUniversity\"\r\n\"Social and ethical research and education in agrifood\rnanotechnology (NIRT)\",NSF,Michigan State University\r\n\"From laboratory to society: developing an informed\rapproach to nanoscale science and engineering (NIRT)\",NSF,University of South Carolina\r\nDatabase and innovation timeline for nanotechnology,NSF,UCLA\r\nSocial and ethical dimensions of nanotechnology,NSF,University of Virginia\r\n\"Undergraduate exploration of nanoscience,\rapplications and societal implications (NUE)\",NSF,\"Michigan Technological\rUniversity\"\r\n\"Ethics and belief inside the development of\rnanotechnology (CAREER)\",NSF,University of Virginia\r\n\"All centers, NNIN and NCN have a societal\rimplications components\",\"NSF, DOE,\rDOD, and NIH\",\"All nanotechnology centers\rand networks\"\r\n"; assertEquals(expected, result); + page.getPDDoc().close(); } @Test @@ -255,8 +258,7 @@ public void testMergeLinesCloseToEachOther() throws IOException { assertEquals(expectedRulings[i], rulings.get(i).getLeft(), 0.1); } assertEquals(6, rulings.size()); - - + page.getPDDoc().close(); } @Test @@ -274,6 +276,7 @@ public void testSpreadsheetWithNoBoundingFrameShouldBeSpreadsheet() throws IOExc (new CSVWriter()).write(sb, tables.get(0)); assertEquals(expectedCsv, sb.toString()); + page.getPDDoc().close(); } @@ -333,7 +336,7 @@ public void testExtractSpreadsheetWithinAnArea() throws IOException { for (int i = 0; i < parsedResult.size(); i++) { assertEquals(parsedResult.get(i).size(), parsedExpected.get(i).size()); } - + page.getPDDoc().close(); } @Test @@ -354,6 +357,7 @@ public void testDontRaiseSortException() throws IOException { page.getText(); SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); bea.extract(page).get(0); + page.getPDDoc().close(); } @Test @@ -365,6 +369,7 @@ public void testShouldDetectASingleSpreadsheet() throws IOException { SpreadsheetExtractionAlgorithm bea = new SpreadsheetExtractionAlgorithm(); List
tables = bea.extract(page); assertEquals(1, tables.size()); + page.getPDDoc().close(); } @Test @@ -395,6 +400,7 @@ public void testExtractTableWithExternallyDefinedRulings() throws IOException { assertEquals("3,700.00", table.getRows().get(7).get(1).getText()); assertEquals("Daily or Miscellaneous\r(each day of the payroll period)", table.getRows().get(8).get(0).getText()); assertEquals("14.23", table.getRows().get(8).get(1).getText()); + page.getPDDoc().close(); } @@ -410,6 +416,7 @@ public void testAnotherExtractTableWithExternallyDefinedRulings() throws IOExcep assertEquals("Total Supply", table.getRows().get(4).get(0).getText()); assertEquals("6.6", table.getRows().get(6).get(2).getText()); + page.getPDDoc().close(); } @Test @@ -422,6 +429,7 @@ public void testSpreadsheetsSortedByTopAndRight() throws IOException { for (int i = 1; i < tables.size(); i++) { assert (tables.get(i - 1).getTop() <= tables.get(i).getTop()); } + page.getPDDoc().close(); } @Test @@ -434,6 +442,7 @@ public void testDontStackOverflowQuicksort() throws IOException { for (int i = 1; i < tables.size(); i++) { assert (tables.get(i - 1).getTop() <= tables.get(i).getTop()); } + page.getPDDoc().close(); } @Test @@ -464,6 +473,7 @@ public void testRTL() throws IOException { // which is not currently possible because of the two problems listed above // assertEquals("مرحباً", table.getRows().get(0).get(0).getText()); // really ought to be ً, but this is forgiveable for now + page.getPDDoc().close(); } @@ -497,6 +507,7 @@ public void testRealLifeRTL() throws IOException { // these (commented-out) tests reflect the theoretical correct answer, // which is not currently possible because of the two problems listed above // assertEquals("مرحباً", table.getRows().get(0).get(0).getText()); // really ought to be ً, but this is forgiveable for now + page.getPDDoc().close(); } @@ -509,6 +520,7 @@ public void testExtractColumnsCorrectly3() throws IOException { Table table = sea.extract(page).get(0); assertEquals("REGIONAL PULMONARY & SLEEP\rMEDICINE", table.getRows().get(8).get(1).getText()); + page.getPDDoc().close(); } @@ -529,6 +541,7 @@ public void testSpreadsheetExtractionIssue656() throws IOException { (new CSVWriter()).write(sb, table); String result = sb.toString(); assertEquals(expectedCsv, result); + page.getPDDoc().close(); } } From 7fca22e0810ef1643f6a5a18437a71fecf1af6a4 Mon Sep 17 00:00:00 2001 From: Max Rydahl Andersen Date: Sun, 14 Mar 2021 01:20:18 +0100 Subject: [PATCH 185/245] add jbang catalog --- jbang-catalog.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 jbang-catalog.json diff --git a/jbang-catalog.json b/jbang-catalog.json new file mode 100644 index 00000000..b7f71347 --- /dev/null +++ b/jbang-catalog.json @@ -0,0 +1,8 @@ +{ + "catalogs": {}, + "aliases": { + "tabula": { + "script-ref": "https://github.com/tabulapdf/tabula-java/releases/download/v1.0.4/tabula-1.0.4-jar-with-dependencies.jar" + } + } +} \ No newline at end of file From 4e23be7e8449223b8ef3b660cb7aca864ee732f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Fri, 19 Mar 2021 13:21:28 -0300 Subject: [PATCH 186/245] pdfbox 2.0.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e209198..17c49742 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.22 + 2.0.23 From c355a342672117c791b3409cadf95ead54418fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Mon, 22 Mar 2021 08:02:58 -0300 Subject: [PATCH 187/245] fix logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a08d3ac..885d3eb8 100644 --- a/README.md +++ b/README.md @@ -112,5 +112,5 @@ Special thanks to the following users and organizations for generously supportin -The John S. and James L. Knight Foundation +The John S. and James L. Knight Foundation The Shuttleworth Foundation From 14b3d261bf7e5d3bc452b78f2f6539b6c894fcef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Thu, 8 Apr 2021 10:29:35 -0300 Subject: [PATCH 188/245] Light cleanup --- src/main/java/technology/tabula/Cell.java | 2 +- .../technology/tabula/RectangleSpatialIndex.java | 3 +-- src/main/java/technology/tabula/Ruling.java | 8 -------- src/main/java/technology/tabula/TextChunk.java | 16 ++++++---------- .../extractors/BasicExtractionAlgorithm.java | 2 +- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/technology/tabula/Cell.java b/src/main/java/technology/tabula/Cell.java index 3b42b4ca..d02c8c50 100644 --- a/src/main/java/technology/tabula/Cell.java +++ b/src/main/java/technology/tabula/Cell.java @@ -27,7 +27,7 @@ public String getText(boolean useLineReturns) { return ""; } StringBuilder sb = new StringBuilder(); - Collections.sort(this.textElements, Rectangle.ILL_DEFINED_ORDER); + this.textElements.sort(Rectangle.ILL_DEFINED_ORDER); double curTop = this.textElements.get(0).getTop(); for (TextChunk tc : this.textElements) { if (useLineReturns && tc.getTop() > curTop) { diff --git a/src/main/java/technology/tabula/RectangleSpatialIndex.java b/src/main/java/technology/tabula/RectangleSpatialIndex.java index a39114a2..0e942545 100644 --- a/src/main/java/technology/tabula/RectangleSpatialIndex.java +++ b/src/main/java/technology/tabula/RectangleSpatialIndex.java @@ -32,8 +32,7 @@ public List contains(Rectangle r) { } public List intersects(Rectangle r) { - List rv = si.query(new Envelope(r.getLeft(), r.getRight(), r.getTop(), r.getBottom())); - return rv; + return si.query(new Envelope(r.getLeft(), r.getRight(), r.getTop(), r.getBottom())); } /** diff --git a/src/main/java/technology/tabula/Ruling.java b/src/main/java/technology/tabula/Ruling.java index cdab6c4f..213ce87f 100644 --- a/src/main/java/technology/tabula/Ruling.java +++ b/src/main/java/technology/tabula/Ruling.java @@ -40,9 +40,6 @@ public void normalize() { else if (Utils.within(angle, 90, 1) || Utils.within(angle, 270, 1)) { // almost vertical this.setLine(this.x1, this.y1, this.x1, this.y2); } -// else { -// System.out.println("oblique: " + this + " ("+ this.getAngle() + ")"); -// } } public boolean vertical() { @@ -231,11 +228,6 @@ public boolean equals(Object other) { return this.getP1().equals(o.getP1()) && this.getP2().equals(o.getP2()); } - @Override - public int hashCode() { - return super.hashCode(); - } - public float getTop() { return this.y1; } diff --git a/src/main/java/technology/tabula/TextChunk.java b/src/main/java/technology/tabula/TextChunk.java index 6e7722a3..9f5adbd5 100644 --- a/src/main/java/technology/tabula/TextChunk.java +++ b/src/main/java/technology/tabula/TextChunk.java @@ -209,11 +209,10 @@ public TextChunk[] splitAt(int i) { throw new IllegalArgumentException(); } - TextChunk[] rv = new TextChunk[]{ - new TextChunk(this.getTextElements().subList(0, i)), - new TextChunk(this.getTextElements().subList(i, this.getTextElements().size())) - }; - return rv; + return new TextChunk[]{ + new TextChunk(this.getTextElements().subList(0, i)), + new TextChunk(this.getTextElements().subList(i, this.getTextElements().size())) + }; } /** @@ -293,11 +292,8 @@ public boolean equals(Object obj) { return false; TextChunk other = (TextChunk) obj; if (textElements == null) { - if (other.textElements != null) - return false; - } else if (!textElements.equals(other.textElements)) - return false; - return true; + return other.textElements == null; + } else return textElements.equals(other.textElements); } public static boolean allSameChar(List textChunks) { diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index dcd01695..246c5342 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -74,7 +74,7 @@ public int compare(Ruling arg0, Ruling arg1) { @Override public int compare(TextChunk o1, TextChunk o2) { - return new java.lang.Float(o1.getLeft()).compareTo(o2.getLeft()); + return Float.compare(o1.getLeft(), o2.getLeft()); } }); From ae9d2ebf53dcdb5b6f436a66db739343e2dc0f7c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 05:29:02 +0000 Subject: [PATCH 189/245] Bump junit from 4.13.1 to 4.13.2 Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17c49742..5c979351 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,7 @@ junit junit - 4.13.1 + 4.13.2 test From c89831109f6892c62d9597ba593161b4cf2b0c1f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:11:21 +0000 Subject: [PATCH 190/245] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..a217b347 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 From eac87d0b25dfd6d176b3e3e9c18782a66f74a99f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:57:52 +0000 Subject: [PATCH 191/245] Bump jts-core from 1.18.0 to 1.18.1 Bumps jts-core from 1.18.0 to 1.18.1. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c979351..80fd3c04 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ org.locationtech.jts jts-core - 1.18.0 + 1.18.1 From 39253c5963b5506f1a302dc53d7976997765527a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:57:43 +0000 Subject: [PATCH 192/245] Bump bcprov-jdk15on from 1.66 to 1.68 Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.66 to 1.68. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80fd3c04..3500e21a 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ org.bouncycastle bcprov-jdk15on - 1.66 + 1.68 From 92a69b444ed18a6493b583998bdbd1f205042d8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:57:49 +0000 Subject: [PATCH 193/245] Bump bcmail-jdk15on from 1.66 to 1.68 Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.66 to 1.68. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3500e21a..fa52a851 100644 --- a/pom.xml +++ b/pom.xml @@ -274,7 +274,7 @@ org.bouncycastle bcmail-jdk15on - 1.66 + 1.68 From b0b0860ee46bcf150cd02a86480392d9882ee2d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 05:38:59 +0000 Subject: [PATCH 194/245] Bump gson from 2.8.6 to 2.8.7 Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.7. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.7) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa52a851..b139db15 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ com.google.code.gson gson - 2.8.6 + 2.8.7 From 6b7ec97688071c728801a1857517d52826831794 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 06:43:12 +0000 Subject: [PATCH 195/245] Bump pdfbox from 2.0.23 to 2.0.24 Bumps pdfbox from 2.0.23 to 2.0.24. --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b139db15..cceb918a 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.23 + 2.0.24 From ae281f671c1872f8ede2eaed14b5d0fb717085a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 21:03:52 +0000 Subject: [PATCH 196/245] Bump commons-csv from 1.8 to 1.9.0 Bumps commons-csv from 1.8 to 1.9.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-csv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cceb918a..01722eab 100644 --- a/pom.xml +++ b/pom.xml @@ -293,7 +293,7 @@ org.apache.commons commons-csv - 1.8 + 1.9.0 From 80042f581b99bd42b1d9fde8d1b5f37a3daa5404 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 05:20:07 +0000 Subject: [PATCH 197/245] Bump bcprov-jdk15on from 1.68 to 1.69 Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.68 to 1.69. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcprov-jdk15on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01722eab..5ba35709 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ org.bouncycastle bcprov-jdk15on - 1.68 + 1.69 From ce74f121a35d80c7df36a55c926ecc847a733021 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 05:20:19 +0000 Subject: [PATCH 198/245] Bump bcmail-jdk15on from 1.68 to 1.69 Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.68 to 1.69. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcmail-jdk15on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ba35709..3b53575e 100644 --- a/pom.xml +++ b/pom.xml @@ -274,7 +274,7 @@ org.bouncycastle bcmail-jdk15on - 1.68 + 1.69 From 1e0d7512c318bfc3f3ba05b71643b59235b2d9b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:03:26 +0000 Subject: [PATCH 199/245] Bump slf4j-api from 1.7.30 to 1.7.32 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b53575e..3333a420 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ org.slf4j slf4j-api - 1.7.30 + 1.7.32 From a3bba8b0bbaa67217dda2ec1368ea6358f5b0601 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:03:28 +0000 Subject: [PATCH 200/245] Bump slf4j-simple from 1.7.30 to 1.7.32 Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.32. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3333a420..05865e9a 100644 --- a/pom.xml +++ b/pom.xml @@ -256,7 +256,7 @@ org.slf4j slf4j-simple - 1.7.30 + 1.7.32 From 20e3c2e2052ad806905d24c3f15976dcea46f143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 17 Aug 2021 09:39:03 -0300 Subject: [PATCH 201/245] prepare release 1.0.5 --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 885d3eb8..b5651af6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Download a version of the tabula-java's jar, with all dependencies included, tha `tabula-java` provides a command line application: ``` -$ java -jar target/tabula-1.0.2-jar-with-dependencies.jar --help +$ java -jar target/tabula-1.0.5-jar-with-dependencies.jar --help usage: tabula [-a ] [-b ] [-c ] [-f ] [-g] [-h] [-i] [-l] [-n] [-o ] [-p ] [-r] [-s ] [-t] [-u] [-v] @@ -69,7 +69,7 @@ Tabula helps you extract tables from PDFs -v,--version Print version and exit. ``` -It also includes a debugging tool, run `java -cp ./target/tabula-1.0.2-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. +It also includes a debugging tool, run `java -cp ./target/tabula-1.0.5-jar-with-dependencies.jar technology.tabula.debug.Debug -h` for the available options. You can also integrate `tabula-java` with any JVM language. For Java examples, see the [`tests`](src/test/java/technology/tabula/) folder. diff --git a/pom.xml b/pom.xml index 05865e9a..7cc0473a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.5-SNAPSHOT + 1.0.5 Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java From adb7738c87f0019cf95519ff37b58e4d4992c51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 17 Aug 2021 11:49:50 -0300 Subject: [PATCH 202/245] prepare for next release --- pom.xml | 2 +- src/main/java/technology/tabula/CommandLineApp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7cc0473a..23aa7700 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 technology.tabula tabula - 1.0.5 + 1.0.6-SNAPSHOT Tabula Extract tables from PDF files http://github.com/tabulapdf/tabula-java diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 0228df4b..4a771fb2 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -29,7 +29,7 @@ public class CommandLineApp { - private static String VERSION = "1.0.5"; + private static String VERSION = "1.0.6-SNAPSHOT"; private static String VERSION_STRING = String.format("tabula %s (c) 2012-2020 Manuel Aristarán", VERSION); private static String BANNER = "\nTabula helps you extract tables from PDFs\n\n"; From 01c25598e050cbc1145c7fb3ce67b7d47a225dcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 21:41:36 +0000 Subject: [PATCH 203/245] Bump pdfbox from 2.0.24 to 2.0.25 Bumps pdfbox from 2.0.24 to 2.0.25. --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23aa7700..6c66027c 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.24 + 2.0.25 From a5f59ed10699120fa827203c1f5fbeac6519f846 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Thu, 23 Dec 2021 08:41:08 +0100 Subject: [PATCH 204/245] update pdfbox to latest version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23aa7700..6c66027c 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.24 + 2.0.25 From fa9363b322970a1665bfd16ba113f4a6f71ab431 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 21:43:51 +0000 Subject: [PATCH 205/245] Bump slf4j-api from 1.7.32 to 1.7.35 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.32 to 1.7.35. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.35) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c66027c..e2947ada 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ org.slf4j slf4j-api - 1.7.32 + 1.7.35 From d175879527e3c47980f631ac1797231562d01059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 25 Jan 2022 18:59:56 -0300 Subject: [PATCH 206/245] goodbye travis, hello github actions --- .github/workflows/tests.yml | 17 +++++++++++++++++ .travis.yml | 9 --------- 2 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..9fe8e8f8 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build with Maven + run: mvn --batch-mode test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7397abbf..00000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: java -install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V -script: mvn test -Dgpg.skip=true -jdk: - - openjdk8 - - openjdk9 - - openjdk10 - - openjdk11 -sudo: false From 1739fbf9915820109d4937963949b6f39b5f4ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 25 Jan 2022 19:03:21 -0300 Subject: [PATCH 207/245] goodbye appveyor --- appveyor.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index b2c4a0ae..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '{build}' -install: - - ps: | - Add-Type -AssemblyName System.IO.Compression.FileSystem - if (!(Test-Path -Path "C:\maven\apache-maven-3.5.4" )) { - (new-object System.Net.WebClient).DownloadFile( - 'http://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip', - 'C:\maven-bin.zip' - ) - [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") - } - - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;%PATH% - - cmd: SET MAVEN_OPTS=-Xmx2g - - cmd: SET JAVA_OPTS=-Xmx2g -build_script: - - mvn clean package -B -DskipTests -Dmaven.javadoc.skip=true -test_script: - - mvn install -B -Dmaven.javadoc.skip=true -Dgpg.skip -cache: - - C:\maven -> appveyor.yml - - C:\Users\appveyor\.m2 -> appveyor.yml From 5f43a939ddec5f6b5adddf3a4d84def6eef9dfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 25 Jan 2022 19:03:47 -0300 Subject: [PATCH 208/245] Remove Appveyor badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27cbc770..8d3c8210 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) [![Build status](https://ci.appveyor.com/api/projects/status/l5gym1mjhrd2v8yn?svg=true)](https://ci.appveyor.com/project/jazzido/tabula-java) +tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?branch=master)](https://travis-ci.org/tabulapdf/tabula-java) =========== `tabula-java` is a library for extracting tables from PDF files — it is the table extraction engine that powers [Tabula](http://tabula.technology/) ([repo](http://github.com/tabulapdf/tabula)). You can use `tabula-java` as a command-line tool to programmatically extract tables from PDFs. From ef23f62ad5bd3afb669d54950ffbb983346cc248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 25 Jan 2022 19:06:02 -0300 Subject: [PATCH 209/245] cache maven deps --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9fe8e8f8..cf36b0ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,5 +13,6 @@ jobs: with: java-version: '11' distribution: 'adopt' + cache: maven - name: Build with Maven run: mvn --batch-mode test From c6de348f4c5241d832b37130bcc4ee858ffd3e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 25 Jan 2022 19:06:26 -0300 Subject: [PATCH 210/245] windows test runner --- .github/workflows/tests-windows.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/tests-windows.yml diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml new file mode 100644 index 00000000..4ff7f542 --- /dev/null +++ b/.github/workflows/tests-windows.yml @@ -0,0 +1,18 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: maven + - name: Build with Maven + run: mvn --batch-mode test From 19ddc51b888c8f43a81c7862e2e126c377ec4f8d Mon Sep 17 00:00:00 2001 From: Martin Swanson Date: Mon, 7 Mar 2022 18:38:20 +0000 Subject: [PATCH 211/245] add page number to JSON output --- src/main/java/technology/tabula/Table.java | 3 +++ src/main/java/technology/tabula/TableWithRulingLines.java | 3 ++- .../technology/tabula/extractors/BasicExtractionAlgorithm.java | 1 + .../tabula/extractors/SpreadsheetExtractionAlgorithm.java | 2 +- src/main/java/technology/tabula/json/TableSerializer.java | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/technology/tabula/Table.java b/src/main/java/technology/tabula/Table.java index c031c9ed..1e73bedf 100644 --- a/src/main/java/technology/tabula/Table.java +++ b/src/main/java/technology/tabula/Table.java @@ -23,11 +23,14 @@ public Table(ExtractionAlgorithm extractionAlgorithm) { private int rowCount = 0; private int colCount = 0; + private int pageNumber = 0; /* visible for testing */ final TreeMap cells = new TreeMap<>(); public int getRowCount() { return rowCount; } public int getColCount() { return colCount; } + public int getPageNumber() { return pageNumber; } + public void setPageNumber(int pageNumber) { this.pageNumber = pageNumber; } public String getExtractionMethod() { return extractionMethod; } diff --git a/src/main/java/technology/tabula/TableWithRulingLines.java b/src/main/java/technology/tabula/TableWithRulingLines.java index c119f191..cde0ce72 100644 --- a/src/main/java/technology/tabula/TableWithRulingLines.java +++ b/src/main/java/technology/tabula/TableWithRulingLines.java @@ -14,12 +14,13 @@ public class TableWithRulingLines extends Table { List verticalRulings, horizontalRulings; RectangleSpatialIndex si = new RectangleSpatialIndex<>(); - public TableWithRulingLines(Rectangle area, List cells, List horizontalRulings, List verticalRulings, ExtractionAlgorithm extractionAlgorithm) { + public TableWithRulingLines(Rectangle area, List cells, List horizontalRulings, List verticalRulings, ExtractionAlgorithm extractionAlgorithm, int pageNumber) { super(extractionAlgorithm); this.setRect(area); this.verticalRulings = verticalRulings; this.horizontalRulings = horizontalRulings; this.addCells(cells); + this.setPageNumber(pageNumber); } private void addCells(List cells) { diff --git a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java index 246c5342..ed2e78e3 100644 --- a/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/BasicExtractionAlgorithm.java @@ -65,6 +65,7 @@ public int compare(Ruling arg0, Ruling arg1) { Table table = new Table(this); table.setRect(page.getLeft(), page.getTop(), page.getWidth(), page.getHeight()); + table.setPageNumber(page.getPageNumber()); for (int i = 0; i < lines.size(); i++) { Line line = lines.get(i); diff --git a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java index 44998cfb..5b4af3d5 100644 --- a/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java +++ b/src/main/java/technology/tabula/extractors/SpreadsheetExtractionAlgorithm.java @@ -88,7 +88,7 @@ else if (r.vertical()) { } } - TableWithRulingLines t = new TableWithRulingLines(area, overlappingCells, horizontalOverlappingRulings, verticalOverlappingRulings, this); + TableWithRulingLines t = new TableWithRulingLines(area, overlappingCells, horizontalOverlappingRulings, verticalOverlappingRulings, this, page.getPageNumber()); spreadsheets.add(t); } Utils.sort(spreadsheets, Rectangle.ILL_DEFINED_ORDER); diff --git a/src/main/java/technology/tabula/json/TableSerializer.java b/src/main/java/technology/tabula/json/TableSerializer.java index 2ba20bcd..0caaf0e5 100644 --- a/src/main/java/technology/tabula/json/TableSerializer.java +++ b/src/main/java/technology/tabula/json/TableSerializer.java @@ -24,6 +24,7 @@ public JsonElement serialize(Table table, Type type, JsonSerializationContext co JsonArray data = new JsonArray(); json.addProperty("extraction_method", table.getExtractionMethod()); + json.addProperty("page_number", table.getPageNumber()); json.addProperty("top", table.getTop()); json.addProperty("left", table.getLeft()); json.addProperty("width", table.getWidth()); From 56cd71313f288b55d1a50ee222e821e2497df1a6 Mon Sep 17 00:00:00 2001 From: Martin Swanson Date: Mon, 7 Mar 2022 19:48:46 +0000 Subject: [PATCH 212/245] tests passing --- src/test/resources/technology/tabula/json/AnimalSounds1.json | 2 +- .../tabula/json/argentina_diputados_voting_record.json | 2 +- src/test/resources/technology/tabula/json/schools.json | 2 +- src/test/resources/technology/tabula/json/spanning_cells.json | 2 +- .../resources/technology/tabula/json/spanning_cells_basic.json | 2 +- src/test/resources/technology/tabula/json/twotables.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/resources/technology/tabula/json/AnimalSounds1.json b/src/test/resources/technology/tabula/json/AnimalSounds1.json index c13c6759..8511b786 100644 --- a/src/test/resources/technology/tabula/json/AnimalSounds1.json +++ b/src/test/resources/technology/tabula/json/AnimalSounds1.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":0.006499578,"left":56.8,"width":241.1999969482422,"height":315.36407470703125,"right":298.0,"bottom":315.37057,"data":[[{"top":0.006499578,"left":56.8,"width":79.19999694824219,"height":95.31405639648438,"text":"Animal"},{"top":0.006499578,"left":136.0,"width":61.0,"height":95.31405639648438,"text":"Action"},{"top":0.006499578,"left":197.0,"width":101.0,"height":95.31405639648438,"text":"Result"}],[{"top":95.32056,"left":56.8,"width":79.19999694824219,"height":23.050010681152344,"text":"Cat"},{"top":95.32056,"left":136.0,"width":61.0,"height":23.050010681152344,"text":"Says"},{"top":95.32056,"left":197.0,"width":101.0,"height":23.050010681152344,"text":"Meow"}],[{"top":118.37057,"left":56.8,"width":79.19999694824219,"height":63.99999237060547,"text":"Parastratiosph\recomyiastratio\rsphecomyioid\res"},{"top":118.37057,"left":136.0,"width":61.0,"height":63.99999237060547,"text":"Says"},{"top":118.37057,"left":197.0,"width":101.0,"height":63.99999237060547,"text":"bzzzzzzz"}],[{"top":182.37056,"left":56.8,"width":79.19999694824219,"height":133.00001525878906,"text":"Fox"},{"top":182.37056,"left":136.0,"width":61.0,"height":133.00001525878906,"text":"Says"},{"top":182.37056,"left":197.0,"width":101.0,"height":133.00001525878906,"text":"Ring-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding"}]]},{"extraction_method":"lattice","top":0.006499578,"left":313.35715,"width":241.55941772460938,"height":259.2640380859375,"right":554.91656,"bottom":259.27054,"data":[[{"top":0.006499578,"left":313.35715,"width":77.64285278320312,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":391.0,"width":66.0,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":457.0,"width":97.91656494140625,"height":72.26405334472656,"text":""}],[{"top":72.27055,"left":313.35715,"width":77.64285278320312,"height":23.050003051757812,"text":"Animal"},{"top":72.27055,"left":391.0,"width":66.0,"height":23.050003051757812,"text":"Action"},{"top":72.27055,"left":457.0,"width":97.91656494140625,"height":23.050003051757812,"text":"Result"}],[{"top":95.32056,"left":313.35715,"width":77.64285278320312,"height":35.94999694824219,"text":"Dogs/wolves/\rMore dogs"},{"top":95.32056,"left":391.0,"width":66.0,"height":35.94999694824219,"text":"Says"},{"top":95.32056,"left":457.0,"width":97.91656494140625,"height":35.94999694824219,"text":"Bow-wow/\rruff-ruff"}],[{"top":131.27055,"left":313.35715,"width":77.64285278320312,"height":36.40000915527344,"text":"Donkey"},{"top":131.27055,"left":391.0,"width":66.0,"height":36.40000915527344,"text":"Says"},{"top":131.27055,"left":457.0,"width":97.91656494140625,"height":36.40000915527344,"text":"Hee-Haw Hee-\rHaw"}],[{"top":167.67056,"left":313.35715,"width":77.64285278320312,"height":91.5999755859375,"text":"Fox"},{"top":167.67056,"left":391.0,"width":66.0,"height":91.5999755859375,"text":"Says"},{"top":167.67056,"left":457.0,"width":97.91656494140625,"height":91.5999755859375,"text":"Wa-pa-pa-pa-\rpa-pa-pow\rWa-pa-pa-pa-\rpa-pow\rWa-pa-pa-pa-\rpa-pa-pow"}]]}] +[{"extraction_method":"lattice","page_number":1,"top":0.006499578,"left":56.8,"width":241.1999969482422,"height":315.36407470703125,"right":298.0,"bottom":315.37057,"data":[[{"top":0.006499578,"left":56.8,"width":79.19999694824219,"height":95.31405639648438,"text":"Animal"},{"top":0.006499578,"left":136.0,"width":61.0,"height":95.31405639648438,"text":"Action"},{"top":0.006499578,"left":197.0,"width":101.0,"height":95.31405639648438,"text":"Result"}],[{"top":95.32056,"left":56.8,"width":79.19999694824219,"height":23.050010681152344,"text":"Cat"},{"top":95.32056,"left":136.0,"width":61.0,"height":23.050010681152344,"text":"Says"},{"top":95.32056,"left":197.0,"width":101.0,"height":23.050010681152344,"text":"Meow"}],[{"top":118.37057,"left":56.8,"width":79.19999694824219,"height":63.99999237060547,"text":"Parastratiosph\recomyiastratio\rsphecomyioid\res"},{"top":118.37057,"left":136.0,"width":61.0,"height":63.99999237060547,"text":"Says"},{"top":118.37057,"left":197.0,"width":101.0,"height":63.99999237060547,"text":"bzzzzzzz"}],[{"top":182.37056,"left":56.8,"width":79.19999694824219,"height":133.00001525878906,"text":"Fox"},{"top":182.37056,"left":136.0,"width":61.0,"height":133.00001525878906,"text":"Says"},{"top":182.37056,"left":197.0,"width":101.0,"height":133.00001525878906,"text":"Ring-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding\rGering-\rdingdingdingd\ringeringeding"}]]},{"extraction_method":"lattice","page_number":1,"top":0.006499578,"left":313.35715,"width":241.55941772460938,"height":259.2640380859375,"right":554.91656,"bottom":259.27054,"data":[[{"top":0.006499578,"left":313.35715,"width":77.64285278320312,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":391.0,"width":66.0,"height":72.26405334472656,"text":""},{"top":0.006499578,"left":457.0,"width":97.91656494140625,"height":72.26405334472656,"text":""}],[{"top":72.27055,"left":313.35715,"width":77.64285278320312,"height":23.050003051757812,"text":"Animal"},{"top":72.27055,"left":391.0,"width":66.0,"height":23.050003051757812,"text":"Action"},{"top":72.27055,"left":457.0,"width":97.91656494140625,"height":23.050003051757812,"text":"Result"}],[{"top":95.32056,"left":313.35715,"width":77.64285278320312,"height":35.94999694824219,"text":"Dogs/wolves/\rMore dogs"},{"top":95.32056,"left":391.0,"width":66.0,"height":35.94999694824219,"text":"Says"},{"top":95.32056,"left":457.0,"width":97.91656494140625,"height":35.94999694824219,"text":"Bow-wow/\rruff-ruff"}],[{"top":131.27055,"left":313.35715,"width":77.64285278320312,"height":36.40000915527344,"text":"Donkey"},{"top":131.27055,"left":391.0,"width":66.0,"height":36.40000915527344,"text":"Says"},{"top":131.27055,"left":457.0,"width":97.91656494140625,"height":36.40000915527344,"text":"Hee-Haw Hee-\rHaw"}],[{"top":167.67056,"left":313.35715,"width":77.64285278320312,"height":91.5999755859375,"text":"Fox"},{"top":167.67056,"left":391.0,"width":66.0,"height":91.5999755859375,"text":"Says"},{"top":167.67056,"left":457.0,"width":97.91656494140625,"height":91.5999755859375,"text":"Wa-pa-pa-pa-\rpa-pa-pow\rWa-pa-pa-pa-\rpa-pow\rWa-pa-pa-pa-\rpa-pa-pow"}]]}] diff --git a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json index 21ad2880..fb2d478e 100644 --- a/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json +++ b/src/test/resources/technology/tabula/json/argentina_diputados_voting_record.json @@ -1 +1 @@ -{"extraction_method":"stream","top":269.875,"left":12.75,"width":548.25,"height":520.625,"right":561.0,"bottom":790.5,"data":[[{"top":281.82,"left":28.56,"width":175.21029663085938,"height":4.5,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":281.82,"left":213.72,"width":108.25027465820312,"height":4.5,"text":"Frente Cívico por Santiago"},{"top":282.54,"left":397.56,"width":79.69027709960938,"height":4.5,"text":"Santiago del Estero"},{"top":281.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":298.26,"left":28.56,"width":141.71029663085938,"height":4.5,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":298.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":299.1,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":298.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":314.82,"left":28.56,"width":83.75028228759766,"height":4.5,"text":"ALONSO, María Luz"},{"top":314.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":315.54,"left":397.56,"width":42.250274658203125,"height":4.5,"text":"La Pampa"},{"top":314.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":331.26,"left":28.56,"width":84.25028228759766,"height":4.5,"text":"ARENA, Celia Isabel"},{"top":331.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":332.1,"left":397.56,"width":37.690277099609375,"height":4.5,"text":"Santa Fe"},{"top":331.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":347.82,"left":28.56,"width":110.29029846191406,"height":4.5,"text":"ARREGUI, Andrés Roberto"},{"top":347.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":348.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":347.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":364.26,"left":28.56,"width":115.69029235839844,"height":4.5,"text":"AVOSCAN, Herman Horacio"},{"top":364.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":365.1,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":364.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":380.82,"left":28.56,"width":95.6902847290039,"height":4.5,"text":"BALCEDO, María Ester"},{"top":380.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":381.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":380.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":397.26,"left":28.56,"width":127.69029235839844,"height":4.5,"text":"BARRANDEGUY, Raúl Enrique"},{"top":397.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":398.1,"left":397.56,"width":43.6702880859375,"height":4.5,"text":"Entre Ríos"},{"top":397.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":413.82,"left":28.56,"width":106.69029235839844,"height":4.5,"text":"BASTERRA, Luis Eugenio"},{"top":413.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":414.54,"left":397.56,"width":36.73028564453125,"height":4.5,"text":"Formosa"},{"top":413.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":430.26,"left":28.56,"width":92.21028137207031,"height":4.5,"text":"BEDANO, Nora Esther"},{"top":430.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":431.1,"left":397.56,"width":35.6602783203125,"height":4.5,"text":"Córdoba"},{"top":430.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":446.82,"left":28.56,"width":100.69029235839844,"height":4.5,"text":"BERNAL, María Eugenia"},{"top":446.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":447.54,"left":397.56,"width":22.200286865234375,"height":4.5,"text":"Jujuy"},{"top":446.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":463.26,"left":28.56,"width":112.21029663085938,"height":4.5,"text":"BERTONE, Rosana Andrea"},{"top":463.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":464.1,"left":397.56,"width":67.21026611328125,"height":4.5,"text":"Tierra del Fuego"},{"top":463.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":479.82,"left":28.56,"width":114.73028564453125,"height":4.5,"text":"BIANCHI, María del Carmen"},{"top":479.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":480.54,"left":397.56,"width":74.6702880859375,"height":4.5,"text":"Cdad. Aut. Bs. As."},{"top":479.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":496.26,"left":28.56,"width":115.19029235839844,"height":4.5,"text":"BIDEGAIN, Gloria Mercedes"},{"top":496.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":497.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":496.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":512.82,"left":28.56,"width":66.25028228759766,"height":4.5,"text":"BRAWER, Mara"},{"top":512.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":513.54,"left":397.56,"width":74.6702880859375,"height":4.5,"text":"Cdad. Aut. Bs. As."},{"top":512.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":529.26,"left":28.56,"width":90.73028564453125,"height":4.5,"text":"BRILLO, José Ricardo"},{"top":529.26,"left":213.72,"width":121.81027221679688,"height":4.5,"text":"Movimiento Popular Neuquino"},{"top":530.1,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":529.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":545.82,"left":28.56,"width":120.73028564453125,"height":4.5,"text":"BROMBERG, Isaac Benjamín"},{"top":545.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":546.54,"left":397.56,"width":38.6602783203125,"height":4.5,"text":"Tucumán"},{"top":545.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":562.26,"left":28.56,"width":89.7702865600586,"height":4.5,"text":"BRUE, Daniel Agustín"},{"top":562.26,"left":213.72,"width":108.25027465820312,"height":4.5,"text":"Frente Cívico por Santiago"},{"top":563.1,"left":397.56,"width":79.69027709960938,"height":4.5,"text":"Santiago del Estero"},{"top":562.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":578.82,"left":28.56,"width":72.23028564453125,"height":4.5,"text":"CALCAGNO, Eric"},{"top":578.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":579.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":578.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":595.26,"left":28.56,"width":114.73028564453125,"height":4.5,"text":"CARLOTTO, Remo Gerardo"},{"top":595.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":596.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":595.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":611.82,"left":28.56,"width":122.1702880859375,"height":4.5,"text":"CARMONA, Guillermo Ramón"},{"top":611.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":612.54,"left":397.56,"width":38.1602783203125,"height":4.5,"text":"Mendoza"},{"top":611.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":628.26,"left":28.56,"width":124.73028564453125,"height":4.5,"text":"CATALAN MAGNI, Julio César"},{"top":628.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":629.1,"left":397.56,"width":67.21026611328125,"height":4.5,"text":"Tierra del Fuego"},{"top":628.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":644.82,"left":28.56,"width":88.6902847290039,"height":4.5,"text":"CEJAS, Jorge Alberto"},{"top":644.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":645.54,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":644.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":661.26,"left":28.56,"width":89.7702865600586,"height":4.5,"text":"CHIENO, María Elena"},{"top":661.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":662.1,"left":397.56,"width":42.72027587890625,"height":4.5,"text":"Corrientes"},{"top":661.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":677.82,"left":28.56,"width":96.25028228759766,"height":4.5,"text":"CIAMPINI, José Alberto"},{"top":677.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":678.54,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":677.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":694.26,"left":28.56,"width":131.77029418945312,"height":4.5,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":694.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":695.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":694.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":710.82,"left":28.56,"width":62.15028381347656,"height":4.5,"text":"CLERI, Marcos"},{"top":710.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":711.54,"left":397.56,"width":37.690277099609375,"height":4.5,"text":"Santa Fe"},{"top":710.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":727.26,"left":28.56,"width":101.77029418945312,"height":4.5,"text":"COMELLI, Alicia Marcela"},{"top":727.26,"left":213.72,"width":121.81027221679688,"height":4.5,"text":"Movimiento Popular Neuquino"},{"top":728.1,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":727.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":743.82,"left":28.56,"width":88.1902847290039,"height":4.5,"text":"CONTI, Diana Beatriz"},{"top":743.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":744.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":743.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":760.26,"left":28.56,"width":98.75028228759766,"height":4.5,"text":"CORDOBA, Stella Maris"},{"top":760.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":761.1,"left":397.56,"width":38.6602783203125,"height":4.5,"text":"Tucumán"},{"top":760.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":776.82,"left":28.56,"width":105.25028991699219,"height":4.5,"text":"CURRILEN, Oscar Rubén"},{"top":776.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":777.54,"left":397.56,"width":30.2802734375,"height":4.5,"text":"Chubut"},{"top":776.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}]]} \ No newline at end of file +{"extraction_method":"stream","page_number":1,"top":269.875,"left":12.75,"width":548.25,"height":520.625,"right":561.0,"bottom":790.5,"data":[[{"top":281.82,"left":28.56,"width":175.21029663085938,"height":4.5,"text":"ABDALA de MATARAZZO, Norma Amanda"},{"top":281.82,"left":213.72,"width":108.25027465820312,"height":4.5,"text":"Frente Cívico por Santiago"},{"top":282.54,"left":397.56,"width":79.69027709960938,"height":4.5,"text":"Santiago del Estero"},{"top":281.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":298.26,"left":28.56,"width":141.71029663085938,"height":4.5,"text":"ALBRIEU, Oscar Edmundo Nicolas"},{"top":298.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":299.1,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":298.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":314.82,"left":28.56,"width":83.75028228759766,"height":4.5,"text":"ALONSO, María Luz"},{"top":314.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":315.54,"left":397.56,"width":42.250274658203125,"height":4.5,"text":"La Pampa"},{"top":314.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":331.26,"left":28.56,"width":84.25028228759766,"height":4.5,"text":"ARENA, Celia Isabel"},{"top":331.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":332.1,"left":397.56,"width":37.690277099609375,"height":4.5,"text":"Santa Fe"},{"top":331.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":347.82,"left":28.56,"width":110.29029846191406,"height":4.5,"text":"ARREGUI, Andrés Roberto"},{"top":347.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":348.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":347.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":364.26,"left":28.56,"width":115.69029235839844,"height":4.5,"text":"AVOSCAN, Herman Horacio"},{"top":364.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":365.1,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":364.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":380.82,"left":28.56,"width":95.6902847290039,"height":4.5,"text":"BALCEDO, María Ester"},{"top":380.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":381.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":380.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":397.26,"left":28.56,"width":127.69029235839844,"height":4.5,"text":"BARRANDEGUY, Raúl Enrique"},{"top":397.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":398.1,"left":397.56,"width":43.6702880859375,"height":4.5,"text":"Entre Ríos"},{"top":397.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":413.82,"left":28.56,"width":106.69029235839844,"height":4.5,"text":"BASTERRA, Luis Eugenio"},{"top":413.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":414.54,"left":397.56,"width":36.73028564453125,"height":4.5,"text":"Formosa"},{"top":413.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":430.26,"left":28.56,"width":92.21028137207031,"height":4.5,"text":"BEDANO, Nora Esther"},{"top":430.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":431.1,"left":397.56,"width":35.6602783203125,"height":4.5,"text":"Córdoba"},{"top":430.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":446.82,"left":28.56,"width":100.69029235839844,"height":4.5,"text":"BERNAL, María Eugenia"},{"top":446.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":447.54,"left":397.56,"width":22.200286865234375,"height":4.5,"text":"Jujuy"},{"top":446.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":463.26,"left":28.56,"width":112.21029663085938,"height":4.5,"text":"BERTONE, Rosana Andrea"},{"top":463.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":464.1,"left":397.56,"width":67.21026611328125,"height":4.5,"text":"Tierra del Fuego"},{"top":463.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":479.82,"left":28.56,"width":114.73028564453125,"height":4.5,"text":"BIANCHI, María del Carmen"},{"top":479.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":480.54,"left":397.56,"width":74.6702880859375,"height":4.5,"text":"Cdad. Aut. Bs. As."},{"top":479.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":496.26,"left":28.56,"width":115.19029235839844,"height":4.5,"text":"BIDEGAIN, Gloria Mercedes"},{"top":496.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":497.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":496.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":512.82,"left":28.56,"width":66.25028228759766,"height":4.5,"text":"BRAWER, Mara"},{"top":512.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":513.54,"left":397.56,"width":74.6702880859375,"height":4.5,"text":"Cdad. Aut. Bs. As."},{"top":512.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":529.26,"left":28.56,"width":90.73028564453125,"height":4.5,"text":"BRILLO, José Ricardo"},{"top":529.26,"left":213.72,"width":121.81027221679688,"height":4.5,"text":"Movimiento Popular Neuquino"},{"top":530.1,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":529.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":545.82,"left":28.56,"width":120.73028564453125,"height":4.5,"text":"BROMBERG, Isaac Benjamín"},{"top":545.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":546.54,"left":397.56,"width":38.6602783203125,"height":4.5,"text":"Tucumán"},{"top":545.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":562.26,"left":28.56,"width":89.7702865600586,"height":4.5,"text":"BRUE, Daniel Agustín"},{"top":562.26,"left":213.72,"width":108.25027465820312,"height":4.5,"text":"Frente Cívico por Santiago"},{"top":563.1,"left":397.56,"width":79.69027709960938,"height":4.5,"text":"Santiago del Estero"},{"top":562.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":578.82,"left":28.56,"width":72.23028564453125,"height":4.5,"text":"CALCAGNO, Eric"},{"top":578.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":579.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":578.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":595.26,"left":28.56,"width":114.73028564453125,"height":4.5,"text":"CARLOTTO, Remo Gerardo"},{"top":595.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":596.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":595.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":611.82,"left":28.56,"width":122.1702880859375,"height":4.5,"text":"CARMONA, Guillermo Ramón"},{"top":611.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":612.54,"left":397.56,"width":38.1602783203125,"height":4.5,"text":"Mendoza"},{"top":611.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":628.26,"left":28.56,"width":124.73028564453125,"height":4.5,"text":"CATALAN MAGNI, Julio César"},{"top":628.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":629.1,"left":397.56,"width":67.21026611328125,"height":4.5,"text":"Tierra del Fuego"},{"top":628.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":644.82,"left":28.56,"width":88.6902847290039,"height":4.5,"text":"CEJAS, Jorge Alberto"},{"top":644.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":645.54,"left":397.56,"width":41.6602783203125,"height":4.5,"text":"Rio Negro"},{"top":644.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":661.26,"left":28.56,"width":89.7702865600586,"height":4.5,"text":"CHIENO, María Elena"},{"top":661.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":662.1,"left":397.56,"width":42.72027587890625,"height":4.5,"text":"Corrientes"},{"top":661.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":677.82,"left":28.56,"width":96.25028228759766,"height":4.5,"text":"CIAMPINI, José Alberto"},{"top":677.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":678.54,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":677.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":694.26,"left":28.56,"width":131.77029418945312,"height":4.5,"text":"CIGOGNA, Luis Francisco Jorge"},{"top":694.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":695.1,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":694.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":710.82,"left":28.56,"width":62.15028381347656,"height":4.5,"text":"CLERI, Marcos"},{"top":710.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":711.54,"left":397.56,"width":37.690277099609375,"height":4.5,"text":"Santa Fe"},{"top":710.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":727.26,"left":28.56,"width":101.77029418945312,"height":4.5,"text":"COMELLI, Alicia Marcela"},{"top":727.26,"left":213.72,"width":121.81027221679688,"height":4.5,"text":"Movimiento Popular Neuquino"},{"top":728.1,"left":397.56,"width":37.700286865234375,"height":4.5,"text":"Neuquén"},{"top":727.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":743.82,"left":28.56,"width":88.1902847290039,"height":4.5,"text":"CONTI, Diana Beatriz"},{"top":743.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":744.54,"left":397.56,"width":54.71026611328125,"height":4.5,"text":"Buenos Aires"},{"top":743.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":760.26,"left":28.56,"width":98.75028228759766,"height":4.5,"text":"CORDOBA, Stella Maris"},{"top":760.26,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":761.1,"left":397.56,"width":38.6602783203125,"height":4.5,"text":"Tucumán"},{"top":760.26,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}],[{"top":776.82,"left":28.56,"width":105.25028991699219,"height":4.5,"text":"CURRILEN, Oscar Rubén"},{"top":776.82,"left":213.72,"width":108.23028564453125,"height":4.5,"text":"Frente para la Victoria - PJ"},{"top":777.54,"left":397.56,"width":30.2802734375,"height":4.5,"text":"Chubut"},{"top":776.82,"left":494.04,"width":54.999969482421875,"height":4.5,"text":"AFIRMATIVO"}]]} \ No newline at end of file diff --git a/src/test/resources/technology/tabula/json/schools.json b/src/test/resources/technology/tabula/json/schools.json index 57544ff0..d251bb20 100644 --- a/src/test/resources/technology/tabula/json/schools.json +++ b/src/test/resources/technology/tabula/json/schools.json @@ -1 +1 @@ -{"extraction_method":"lattice","top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"right":762.30035,"bottom":538.26,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91128540039062,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.50002,"width":69.71998596191406,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91128540039062,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.50002,"width":69.71998596191406,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91128540039062,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.50002,"width":69.71998596191406,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91128540039062,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.50002,"width":69.71998596191406,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91128540039062,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.50002,"width":69.71998596191406,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91128540039062,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.50002,"width":69.71998596191406,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91128540039062,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.50002,"width":69.71998596191406,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cohen"},{"top":397.86,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":408.63998,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":408.63998,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Commers"},{"top":408.63998,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Beth"},{"top":408.63998,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2294 Commonwealth Ave"},{"top":408.63998,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St Paul"},{"top":408.63998,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":408.63998,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":408.63998,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":"Self Employed"},{"top":408.63998,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":"Homemaker"},{"top":408.63998,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"8/1/2012"},{"top":408.63998,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91128540039062,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.50002,"width":69.71998596191406,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91128540039062,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.50002,"width":69.71998596191406,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence‐teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91128540039062,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.50002,"width":69.71998596191406,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91128540039062,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.50002,"width":69.71998596191406,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} +{"extraction_method":"lattice","page_number":1,"top":54.315777,"left":16.97,"width":745.3303833007812,"height":483.9442443847656,"right":762.30035,"bottom":538.26,"data":[[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":54.315777,"left":18.588728,"width":153.91128540039062,"height":8.744216918945312,"text":"Last Name"},{"top":54.315777,"left":172.50002,"width":69.71998596191406,"height":8.744216918945312,"text":"First Name"},{"top":54.315777,"left":242.22,"width":104.760009765625,"height":8.744216918945312,"text":"Address"},{"top":54.315777,"left":346.98,"width":70.80001831054688,"height":8.744216918945312,"text":"City"},{"top":54.315777,"left":417.78003,"width":20.87994384765625,"height":8.744216918945312,"text":"State"},{"top":54.315777,"left":438.65997,"width":49.91998291015625,"height":8.744216918945312,"text":"Zip"},{"top":54.315777,"left":488.57996,"width":78.47998046875,"height":8.744216918945312,"text":"Occupation"},{"top":54.315777,"left":567.05994,"width":106.4400634765625,"height":8.744216918945312,"text":"Employer"},{"top":54.315777,"left":673.5,"width":45.52001953125,"height":8.744216918945312,"text":"Date"},{"top":54.315777,"left":719.02,"width":43.28033447265625,"height":8.744216918945312,"text":"Amount"}],[{"top":63.059994,"left":16.97,"width":1.6187286376953125,"height":10.799991607666016,"text":""},{"top":63.059994,"left":18.588728,"width":153.91128540039062,"height":10.799991607666016,"text":"Lidstad"},{"top":63.059994,"left":172.50002,"width":69.71998596191406,"height":10.799991607666016,"text":"Dick \u0026 Peg"},{"top":63.059994,"left":242.22,"width":104.760009765625,"height":10.799991607666016,"text":"62 Mississippi River Blvd N"},{"top":63.059994,"left":346.98,"width":70.80001831054688,"height":10.799991607666016,"text":"Saint Paul"},{"top":63.059994,"left":417.78003,"width":20.87994384765625,"height":10.799991607666016,"text":"MN"},{"top":63.059994,"left":438.65997,"width":49.91998291015625,"height":10.799991607666016,"text":"55104"},{"top":63.059994,"left":488.57996,"width":78.47998046875,"height":10.799991607666016,"text":"retired"},{"top":63.059994,"left":567.05994,"width":106.4400634765625,"height":10.799991607666016,"text":""},{"top":63.059994,"left":673.5,"width":45.52001953125,"height":10.799991607666016,"text":"10/12/2012"},{"top":63.059994,"left":719.02,"width":43.28033447265625,"height":10.799991607666016,"text":"60.00"}],[{"top":73.859985,"left":16.97,"width":1.6187286376953125,"height":10.800025939941406,"text":""},{"top":73.859985,"left":18.588728,"width":153.91128540039062,"height":10.800025939941406,"text":"Strom"},{"top":73.859985,"left":172.50002,"width":69.71998596191406,"height":10.800025939941406,"text":"Pam"},{"top":73.859985,"left":242.22,"width":104.760009765625,"height":10.800025939941406,"text":"1229 Hague Ave"},{"top":73.859985,"left":346.98,"width":70.80001831054688,"height":10.800025939941406,"text":"St. Paul"},{"top":73.859985,"left":417.78003,"width":20.87994384765625,"height":10.800025939941406,"text":"MN"},{"top":73.859985,"left":438.65997,"width":49.91998291015625,"height":10.800025939941406,"text":"55104"},{"top":73.859985,"left":488.57996,"width":78.47998046875,"height":10.800025939941406,"text":""},{"top":73.859985,"left":567.05994,"width":106.4400634765625,"height":10.800025939941406,"text":""},{"top":73.859985,"left":673.5,"width":45.52001953125,"height":10.800025939941406,"text":"9/12/2012"},{"top":73.859985,"left":719.02,"width":43.28033447265625,"height":10.800025939941406,"text":"60.00"}],[{"top":84.66001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":84.66001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Seeba"},{"top":84.66001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Louise \u0026 Paul"},{"top":84.66001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"1399 Sheldon St"},{"top":84.66001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":84.66001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":84.66001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55108"},{"top":84.66001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"BOE"},{"top":84.66001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"City of Saint Paul"},{"top":84.66001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/12/2012"},{"top":84.66001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":95.46001,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":95.46001,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Schumacher / Bales"},{"top":95.46001,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Douglas L. / Patricia"},{"top":95.46001,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"948 County Rd. D W"},{"top":95.46001,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"Saint Paul"},{"top":95.46001,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":95.46001,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55126"},{"top":95.46001,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":""},{"top":95.46001,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":""},{"top":95.46001,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"10/13/2012"},{"top":95.46001,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"60.00"}],[{"top":106.26,"left":16.97,"width":1.6187286376953125,"height":10.799995422363281,"text":""},{"top":106.26,"left":18.588728,"width":153.91128540039062,"height":10.799995422363281,"text":"Abrams"},{"top":106.26,"left":172.50002,"width":69.71998596191406,"height":10.799995422363281,"text":"Marjorie"},{"top":106.26,"left":242.22,"width":104.760009765625,"height":10.799995422363281,"text":"238 8th St east"},{"top":106.26,"left":346.98,"width":70.80001831054688,"height":10.799995422363281,"text":"St Paul"},{"top":106.26,"left":417.78003,"width":20.87994384765625,"height":10.799995422363281,"text":"MN"},{"top":106.26,"left":438.65997,"width":49.91998291015625,"height":10.799995422363281,"text":"55101"},{"top":106.26,"left":488.57996,"width":78.47998046875,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":567.05994,"width":106.4400634765625,"height":10.799995422363281,"text":"Retired"},{"top":106.26,"left":673.5,"width":45.52001953125,"height":10.799995422363281,"text":"8/8/2012"},{"top":106.26,"left":719.02,"width":43.28033447265625,"height":10.799995422363281,"text":"75.00"}],[{"top":117.06,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":117.06,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Crouse / Schroeder"},{"top":117.06,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Abigail / Jonathan"},{"top":117.06,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1545 Branston St."},{"top":117.06,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":117.06,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":117.06,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55108"},{"top":117.06,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":""},{"top":117.06,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":117.06,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":117.06,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"75.00"}],[{"top":127.859985,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":127.859985,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"O\u0027Connell"},{"top":127.859985,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Jean"},{"top":127.859985,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"888 Ivy Ave W."},{"top":127.859985,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Saint Paul"},{"top":127.859985,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":127.859985,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55117"},{"top":127.859985,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":""},{"top":127.859985,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":127.859985,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/30/2012"},{"top":127.859985,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":138.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":138.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Reese"},{"top":138.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheri A"},{"top":138.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"981 Davern St."},{"top":138.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":138.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":138.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55116"},{"top":138.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Public Relations"},{"top":138.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Far North Spirits"},{"top":138.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/3/2012"},{"top":138.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"75.00"}],[{"top":149.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":149.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Serrano"},{"top":149.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Luz Maria"},{"top":149.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"5559 Park Place Drive"},{"top":149.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Shoreview"},{"top":149.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":149.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55126"},{"top":149.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"retired"},{"top":149.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":149.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":149.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"75.00"}],[{"top":160.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":160.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Alsiddiqui"},{"top":160.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Jaber"},{"top":160.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"13056 Euclid Ave"},{"top":160.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Apple Valley"},{"top":160.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":160.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55124"},{"top":160.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"SPPS budget analyst"},{"top":160.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":160.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":160.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":171.06,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":171.06,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Andrastek"},{"top":171.06,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"John"},{"top":171.06,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"774 Ashland Ave"},{"top":171.06,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"St Paul"},{"top":171.06,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":171.06,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55104"},{"top":171.06,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"asst principal"},{"top":171.06,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":"SPPS"},{"top":171.06,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"8/22/2012"},{"top":171.06,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":181.86,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":181.86,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Anfang"},{"top":181.86,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Heather L. \u0026 Matt"},{"top":181.86,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1635 Bayard Ave"},{"top":181.86,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":181.86,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":181.86,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55116"},{"top":181.86,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"Ex Director"},{"top":181.86,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"BOMA"},{"top":181.86,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/6/2012"},{"top":181.86,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":192.65999,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":192.65999,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Aronson"},{"top":192.65999,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Roger J."},{"top":192.65999,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4852 Emerson Ave. S."},{"top":192.65999,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Minneapolis"},{"top":192.65999,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":192.65999,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55419"},{"top":192.65999,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Attorney at Law"},{"top":192.65999,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":""},{"top":192.65999,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/20/2012"},{"top":192.65999,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":203.46,"left":16.97,"width":1.6187286376953125,"height":10.800003051757812,"text":""},{"top":203.46,"left":18.588728,"width":153.91128540039062,"height":10.800003051757812,"text":"Aronson"},{"top":203.46,"left":172.50002,"width":69.71998596191406,"height":10.800003051757812,"text":"Roger J."},{"top":203.46,"left":242.22,"width":104.760009765625,"height":10.800003051757812,"text":"4852 Emerson Ave. S."},{"top":203.46,"left":346.98,"width":70.80001831054688,"height":10.800003051757812,"text":"Minneapolis"},{"top":203.46,"left":417.78003,"width":20.87994384765625,"height":10.800003051757812,"text":"MN"},{"top":203.46,"left":438.65997,"width":49.91998291015625,"height":10.800003051757812,"text":"55419"},{"top":203.46,"left":488.57996,"width":78.47998046875,"height":10.800003051757812,"text":"Attorney at Law"},{"top":203.46,"left":567.05994,"width":106.4400634765625,"height":10.800003051757812,"text":""},{"top":203.46,"left":673.5,"width":45.52001953125,"height":10.800003051757812,"text":"9/20/2012"},{"top":203.46,"left":719.02,"width":43.28033447265625,"height":10.800003051757812,"text":"100.00"}],[{"top":214.26001,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":214.26001,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Banks"},{"top":214.26001,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"Michael or Patricia"},{"top":214.26001,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1664 Van Buren Ave."},{"top":214.26001,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":214.26001,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":214.26001,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":214.26001,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"retired social worker"},{"top":214.26001,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":""},{"top":214.26001,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"9/20/2012"},{"top":214.26001,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":225.06,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":225.06,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Bennett"},{"top":225.06,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"David"},{"top":225.06,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"25 Birchwood Rd."},{"top":225.06,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Mahtomedi"},{"top":225.06,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":225.06,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":225.06,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"retired"},{"top":225.06,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"9/3/2012"},{"top":225.06,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":235.86002,"left":16.97,"width":1.6187286376953125,"height":10.799972534179688,"text":""},{"top":235.86002,"left":18.588728,"width":153.91128540039062,"height":10.799972534179688,"text":"Berry"},{"top":235.86002,"left":172.50002,"width":69.71998596191406,"height":10.799972534179688,"text":"Margaret"},{"top":235.86002,"left":242.22,"width":104.760009765625,"height":10.799972534179688,"text":"1267 Pike Lake Dr"},{"top":235.86002,"left":346.98,"width":70.80001831054688,"height":10.799972534179688,"text":"New Brighton"},{"top":235.86002,"left":417.78003,"width":20.87994384765625,"height":10.799972534179688,"text":"MN"},{"top":235.86002,"left":438.65997,"width":49.91998291015625,"height":10.799972534179688,"text":"55112"},{"top":235.86002,"left":488.57996,"width":78.47998046875,"height":10.799972534179688,"text":"Asst Principal"},{"top":235.86002,"left":567.05994,"width":106.4400634765625,"height":10.799972534179688,"text":"Saint Paul Public Schools"},{"top":235.86002,"left":673.5,"width":45.52001953125,"height":10.799972534179688,"text":"8/8/2012"},{"top":235.86002,"left":719.02,"width":43.28033447265625,"height":10.799972534179688,"text":"100.00"}],[{"top":246.65999,"left":16.97,"width":1.6187286376953125,"height":10.800033569335938,"text":""},{"top":246.65999,"left":18.588728,"width":153.91128540039062,"height":10.800033569335938,"text":"Boyle"},{"top":246.65999,"left":172.50002,"width":69.71998596191406,"height":10.800033569335938,"text":"Matthew C. \u0026 Eliza"},{"top":246.65999,"left":242.22,"width":104.760009765625,"height":10.800033569335938,"text":"2165 Princeton Ave"},{"top":246.65999,"left":346.98,"width":70.80001831054688,"height":10.800033569335938,"text":"Saint Paul"},{"top":246.65999,"left":417.78003,"width":20.87994384765625,"height":10.800033569335938,"text":"MN"},{"top":246.65999,"left":438.65997,"width":49.91998291015625,"height":10.800033569335938,"text":"55105"},{"top":246.65999,"left":488.57996,"width":78.47998046875,"height":10.800033569335938,"text":""},{"top":246.65999,"left":567.05994,"width":106.4400634765625,"height":10.800033569335938,"text":""},{"top":246.65999,"left":673.5,"width":45.52001953125,"height":10.800033569335938,"text":"10/6/2012"},{"top":246.65999,"left":719.02,"width":43.28033447265625,"height":10.800033569335938,"text":"100.00"}],[{"top":257.46002,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":257.46002,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":257.46002,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John"},{"top":257.46002,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles"},{"top":257.46002,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"St. Paul"},{"top":257.46002,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":257.46002,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":257.46002,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BOE"},{"top":257.46002,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"retired"},{"top":257.46002,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"8/26/2012"},{"top":257.46002,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":268.26,"left":16.97,"width":1.6187286376953125,"height":10.79998779296875,"text":""},{"top":268.26,"left":18.588728,"width":153.91128540039062,"height":10.79998779296875,"text":"Brodrick"},{"top":268.26,"left":172.50002,"width":69.71998596191406,"height":10.79998779296875,"text":"John F."},{"top":268.26,"left":242.22,"width":104.760009765625,"height":10.79998779296875,"text":"1007 Charles Ave"},{"top":268.26,"left":346.98,"width":70.80001831054688,"height":10.79998779296875,"text":"Saint Paul"},{"top":268.26,"left":417.78003,"width":20.87994384765625,"height":10.79998779296875,"text":"MN"},{"top":268.26,"left":438.65997,"width":49.91998291015625,"height":10.79998779296875,"text":"55104"},{"top":268.26,"left":488.57996,"width":78.47998046875,"height":10.79998779296875,"text":"BoE"},{"top":268.26,"left":567.05994,"width":106.4400634765625,"height":10.79998779296875,"text":"SPPS"},{"top":268.26,"left":673.5,"width":45.52001953125,"height":10.79998779296875,"text":"10/4/2012"},{"top":268.26,"left":719.02,"width":43.28033447265625,"height":10.79998779296875,"text":"100.00"}],[{"top":279.06,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":279.06,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Brown"},{"top":279.06,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Mike"},{"top":279.06,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1440 Goodrich Ave"},{"top":279.06,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":279.06,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":279.06,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":279.06,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":279.06,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":279.06,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"9/23/2012"},{"top":279.06,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":289.84,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":289.84,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Cacy"},{"top":289.84,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Jill"},{"top":289.84,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"1409 Smith Ave So"},{"top":289.84,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"West St. Paul"},{"top":289.84,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":289.84,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55118"},{"top":289.84,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Administrator"},{"top":289.84,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"SPPS"},{"top":289.84,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"9/12/2012"},{"top":289.84,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":300.65997,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":300.65997,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cardwell"},{"top":300.65997,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Eileen"},{"top":300.65997,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4172 Bridgewater Ct"},{"top":300.65997,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Vadnais Height"},{"top":300.65997,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":300.65997,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55127"},{"top":300.65997,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Retired"},{"top":300.65997,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/3/2012"},{"top":300.65997,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":311.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":311.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carlstrom"},{"top":311.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Cheryl"},{"top":311.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"4244 Oakmede Ln"},{"top":311.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"St Paul"},{"top":311.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":311.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55110"},{"top":311.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Satff"},{"top":311.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":311.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/8/2012"},{"top":311.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":322.26,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":322.26,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Carter"},{"top":322.26,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Melvin W. \u0026 Willet"},{"top":322.26,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"405 Western Ave N"},{"top":322.26,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":322.26,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":322.26,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55103"},{"top":322.26,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Cty Commissioner"},{"top":322.26,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Ramsey Cty"},{"top":322.26,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/8/2012"},{"top":322.26,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":333.06003,"left":16.97,"width":1.6187286376953125,"height":10.8199462890625,"text":""},{"top":333.06003,"left":18.588728,"width":153.91128540039062,"height":10.8199462890625,"text":"Caruso"},{"top":333.06003,"left":172.50002,"width":69.71998596191406,"height":10.8199462890625,"text":"Sarah"},{"top":333.06003,"left":242.22,"width":104.760009765625,"height":10.8199462890625,"text":"2615 Newton Ave S"},{"top":333.06003,"left":346.98,"width":70.80001831054688,"height":10.8199462890625,"text":"Minneapolis"},{"top":333.06003,"left":417.78003,"width":20.87994384765625,"height":10.8199462890625,"text":"MN"},{"top":333.06003,"left":438.65997,"width":49.91998291015625,"height":10.8199462890625,"text":"55405"},{"top":333.06003,"left":488.57996,"width":78.47998046875,"height":10.8199462890625,"text":"CEO"},{"top":333.06003,"left":567.05994,"width":106.4400634765625,"height":10.8199462890625,"text":"United Way"},{"top":333.06003,"left":673.5,"width":45.52001953125,"height":10.8199462890625,"text":"9/12/2012"},{"top":333.06003,"left":719.02,"width":43.28033447265625,"height":10.8199462890625,"text":"100.00"}],[{"top":343.87997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":343.87997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Casey /Trewartha"},{"top":343.87997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Kerry F. / Kelly A."},{"top":343.87997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"2266 Goodrich Ave"},{"top":343.87997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":343.87997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":343.87997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":343.87997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":343.87997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":343.87997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/4/2012"},{"top":343.87997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":354.65997,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":354.65997,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cassidy"},{"top":354.65997,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Paul D."},{"top":354.65997,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1990 Dayton Ave"},{"top":354.65997,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":354.65997,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":354.65997,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55104"},{"top":354.65997,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":""},{"top":354.65997,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":354.65997,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/6/2012"},{"top":354.65997,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":365.43997,"left":16.97,"width":1.6187286376953125,"height":10.820037841796875,"text":""},{"top":365.43997,"left":18.588728,"width":153.91128540039062,"height":10.820037841796875,"text":"Causey"},{"top":365.43997,"left":172.50002,"width":69.71998596191406,"height":10.820037841796875,"text":"Christopher"},{"top":365.43997,"left":242.22,"width":104.760009765625,"height":10.820037841796875,"text":"2181 Doswell Avenue"},{"top":365.43997,"left":346.98,"width":70.80001831054688,"height":10.820037841796875,"text":"Saint Paul"},{"top":365.43997,"left":417.78003,"width":20.87994384765625,"height":10.820037841796875,"text":"MN"},{"top":365.43997,"left":438.65997,"width":49.91998291015625,"height":10.820037841796875,"text":"55108"},{"top":365.43997,"left":488.57996,"width":78.47998046875,"height":10.820037841796875,"text":"finance"},{"top":365.43997,"left":567.05994,"width":106.4400634765625,"height":10.820037841796875,"text":""},{"top":365.43997,"left":673.5,"width":45.52001953125,"height":10.820037841796875,"text":"9/3/2012"},{"top":365.43997,"left":719.02,"width":43.28033447265625,"height":10.820037841796875,"text":"100.00"}],[{"top":376.26,"left":16.97,"width":1.6187286376953125,"height":10.819976806640625,"text":""},{"top":376.26,"left":18.588728,"width":153.91128540039062,"height":10.819976806640625,"text":"Christiansen"},{"top":376.26,"left":172.50002,"width":69.71998596191406,"height":10.819976806640625,"text":"Lena"},{"top":376.26,"left":242.22,"width":104.760009765625,"height":10.819976806640625,"text":"2453 Como Ave"},{"top":376.26,"left":346.98,"width":70.80001831054688,"height":10.819976806640625,"text":"St Paul"},{"top":376.26,"left":417.78003,"width":20.87994384765625,"height":10.819976806640625,"text":"MN"},{"top":376.26,"left":438.65997,"width":49.91998291015625,"height":10.819976806640625,"text":"55108"},{"top":376.26,"left":488.57996,"width":78.47998046875,"height":10.819976806640625,"text":"Principal"},{"top":376.26,"left":567.05994,"width":106.4400634765625,"height":10.819976806640625,"text":"Saint Paul Public Schools"},{"top":376.26,"left":673.5,"width":45.52001953125,"height":10.819976806640625,"text":"8/8/2012"},{"top":376.26,"left":719.02,"width":43.28033447265625,"height":10.819976806640625,"text":"100.00"}],[{"top":387.08,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":387.08,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Clapp"},{"top":387.08,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Agustus (Bill)"},{"top":387.08,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"757 Osceola Ave #1"},{"top":387.08,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":387.08,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":387.08,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55105"},{"top":387.08,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"retired"},{"top":387.08,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":""},{"top":387.08,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/2/2012"},{"top":387.08,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":397.86,"left":16.97,"width":1.6187286376953125,"height":10.779998779296875,"text":""},{"top":397.86,"left":18.588728,"width":153.91128540039062,"height":10.779998779296875,"text":"Cohen"},{"top":397.86,"left":172.50002,"width":69.71998596191406,"height":10.779998779296875,"text":"Brad A."},{"top":397.86,"left":242.22,"width":104.760009765625,"height":10.779998779296875,"text":"1460 Raymond Ave"},{"top":397.86,"left":346.98,"width":70.80001831054688,"height":10.779998779296875,"text":"Saint Paul"},{"top":397.86,"left":417.78003,"width":20.87994384765625,"height":10.779998779296875,"text":"MN"},{"top":397.86,"left":438.65997,"width":49.91998291015625,"height":10.779998779296875,"text":"55108"},{"top":397.86,"left":488.57996,"width":78.47998046875,"height":10.779998779296875,"text":"academic technology"},{"top":397.86,"left":567.05994,"width":106.4400634765625,"height":10.779998779296875,"text":"UMN"},{"top":397.86,"left":673.5,"width":45.52001953125,"height":10.779998779296875,"text":"10/17/2012"},{"top":397.86,"left":719.02,"width":43.28033447265625,"height":10.779998779296875,"text":"100.00"}],[{"top":408.63998,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":408.63998,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Commers"},{"top":408.63998,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Beth"},{"top":408.63998,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2294 Commonwealth Ave"},{"top":408.63998,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St Paul"},{"top":408.63998,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":408.63998,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":408.63998,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":"Self Employed"},{"top":408.63998,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":"Homemaker"},{"top":408.63998,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"8/1/2012"},{"top":408.63998,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":419.46,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":419.46,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Couture"},{"top":419.46,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Steven"},{"top":419.46,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"7950 Victoria Way"},{"top":419.46,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Louise Park"},{"top":419.46,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":419.46,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55426"},{"top":419.46,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Principal"},{"top":419.46,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"Saint Paul Public Schools"},{"top":419.46,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"8/10/2012"},{"top":419.46,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":430.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":430.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Crawford"},{"top":430.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Lydia P."},{"top":430.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"1140 Edgcumbe Rd"},{"top":430.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":430.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":430.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":430.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":430.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":430.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"9/15/2012"},{"top":430.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":441.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":441.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Cudahy / Ricker"},{"top":441.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Robert \u0026 Mary C"},{"top":441.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"616 Cherokee Ave."},{"top":441.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":441.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":441.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55107"},{"top":441.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"Teacher/Union Presid"},{"top":441.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"SPPS/SPFT"},{"top":441.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"9/18/2012"},{"top":441.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":451.85995,"left":16.97,"width":1.6187286376953125,"height":10.800018310546875,"text":""},{"top":451.85995,"left":18.588728,"width":153.91128540039062,"height":10.800018310546875,"text":"Cudahy / Ricker"},{"top":451.85995,"left":172.50002,"width":69.71998596191406,"height":10.800018310546875,"text":"Robert \u0026 Mary C"},{"top":451.85995,"left":242.22,"width":104.760009765625,"height":10.800018310546875,"text":"616 Cherokee Ave."},{"top":451.85995,"left":346.98,"width":70.80001831054688,"height":10.800018310546875,"text":"Saint Paul"},{"top":451.85995,"left":417.78003,"width":20.87994384765625,"height":10.800018310546875,"text":"MN"},{"top":451.85995,"left":438.65997,"width":49.91998291015625,"height":10.800018310546875,"text":"55107"},{"top":451.85995,"left":488.57996,"width":78.47998046875,"height":10.800018310546875,"text":"Teacher/Union Presid"},{"top":451.85995,"left":567.05994,"width":106.4400634765625,"height":10.800018310546875,"text":"SPPS/SPFT"},{"top":451.85995,"left":673.5,"width":45.52001953125,"height":10.800018310546875,"text":"10/6/2012"},{"top":451.85995,"left":719.02,"width":43.28033447265625,"height":10.800018310546875,"text":"100.00"}],[{"top":462.65997,"left":16.97,"width":1.6187286376953125,"height":10.82000732421875,"text":""},{"top":462.65997,"left":18.588728,"width":153.91128540039062,"height":10.82000732421875,"text":"Currie"},{"top":462.65997,"left":172.50002,"width":69.71998596191406,"height":10.82000732421875,"text":"Elisabeth"},{"top":462.65997,"left":242.22,"width":104.760009765625,"height":10.82000732421875,"text":"2274 Hillside Ave"},{"top":462.65997,"left":346.98,"width":70.80001831054688,"height":10.82000732421875,"text":"St. Paul"},{"top":462.65997,"left":417.78003,"width":20.87994384765625,"height":10.82000732421875,"text":"MN"},{"top":462.65997,"left":438.65997,"width":49.91998291015625,"height":10.82000732421875,"text":"55108"},{"top":462.65997,"left":488.57996,"width":78.47998046875,"height":10.82000732421875,"text":""},{"top":462.65997,"left":567.05994,"width":106.4400634765625,"height":10.82000732421875,"text":""},{"top":462.65997,"left":673.5,"width":45.52001953125,"height":10.82000732421875,"text":"9/12/2012"},{"top":462.65997,"left":719.02,"width":43.28033447265625,"height":10.82000732421875,"text":"100.00"}],[{"top":473.47998,"left":16.97,"width":1.6187286376953125,"height":10.780029296875,"text":""},{"top":473.47998,"left":18.588728,"width":153.91128540039062,"height":10.780029296875,"text":"Doane"},{"top":473.47998,"left":172.50002,"width":69.71998596191406,"height":10.780029296875,"text":"Paul V \u0026 Helen R"},{"top":473.47998,"left":242.22,"width":104.760009765625,"height":10.780029296875,"text":"444 Portland Ave"},{"top":473.47998,"left":346.98,"width":70.80001831054688,"height":10.780029296875,"text":"Sant Paul"},{"top":473.47998,"left":417.78003,"width":20.87994384765625,"height":10.780029296875,"text":"MN"},{"top":473.47998,"left":438.65997,"width":49.91998291015625,"height":10.780029296875,"text":"55102"},{"top":473.47998,"left":488.57996,"width":78.47998046875,"height":10.780029296875,"text":"Ex director"},{"top":473.47998,"left":567.05994,"width":106.4400634765625,"height":10.780029296875,"text":"St Paul Teachers\u0027 Retirement A"},{"top":473.47998,"left":673.5,"width":45.52001953125,"height":10.780029296875,"text":"10/3/2012"},{"top":473.47998,"left":719.02,"width":43.28033447265625,"height":10.780029296875,"text":"100.00"}],[{"top":484.26,"left":16.97,"width":1.6187286376953125,"height":10.800048828125,"text":""},{"top":484.26,"left":18.588728,"width":153.91128540039062,"height":10.800048828125,"text":"Dougherty"},{"top":484.26,"left":172.50002,"width":69.71998596191406,"height":10.800048828125,"text":"Richards S \u0026 Patrici"},{"top":484.26,"left":242.22,"width":104.760009765625,"height":10.800048828125,"text":"812 Goodrich Ave"},{"top":484.26,"left":346.98,"width":70.80001831054688,"height":10.800048828125,"text":"Saint Paul"},{"top":484.26,"left":417.78003,"width":20.87994384765625,"height":10.800048828125,"text":"MN"},{"top":484.26,"left":438.65997,"width":49.91998291015625,"height":10.800048828125,"text":"55105"},{"top":484.26,"left":488.57996,"width":78.47998046875,"height":10.800048828125,"text":""},{"top":484.26,"left":567.05994,"width":106.4400634765625,"height":10.800048828125,"text":""},{"top":484.26,"left":673.5,"width":45.52001953125,"height":10.800048828125,"text":"10/4/2012"},{"top":484.26,"left":719.02,"width":43.28033447265625,"height":10.800048828125,"text":"100.00"}],[{"top":495.06006,"left":16.97,"width":1.6187286376953125,"height":10.799896240234375,"text":""},{"top":495.06006,"left":18.588728,"width":153.91128540039062,"height":10.799896240234375,"text":"Driscoll"},{"top":495.06006,"left":172.50002,"width":69.71998596191406,"height":10.799896240234375,"text":"Joe \u0026 Jill"},{"top":495.06006,"left":242.22,"width":104.760009765625,"height":10.799896240234375,"text":"2383 Bourne Ave"},{"top":495.06006,"left":346.98,"width":70.80001831054688,"height":10.799896240234375,"text":"Saint Paul"},{"top":495.06006,"left":417.78003,"width":20.87994384765625,"height":10.799896240234375,"text":"MN"},{"top":495.06006,"left":438.65997,"width":49.91998291015625,"height":10.799896240234375,"text":"55108"},{"top":495.06006,"left":488.57996,"width":78.47998046875,"height":10.799896240234375,"text":"HR Manager"},{"top":495.06006,"left":567.05994,"width":106.4400634765625,"height":10.799896240234375,"text":"LexisNexis"},{"top":495.06006,"left":673.5,"width":45.52001953125,"height":10.799896240234375,"text":"10/18/2012"},{"top":495.06006,"left":719.02,"width":43.28033447265625,"height":10.799896240234375,"text":"100.00"}],[{"top":505.85995,"left":16.97,"width":1.6187286376953125,"height":10.780059814453125,"text":""},{"top":505.85995,"left":18.588728,"width":153.91128540039062,"height":10.780059814453125,"text":"Dubaille / Haugee"},{"top":505.85995,"left":172.50002,"width":69.71998596191406,"height":10.780059814453125,"text":"Florence M. /Eric"},{"top":505.85995,"left":242.22,"width":104.760009765625,"height":10.780059814453125,"text":"1009 Edmund Ave"},{"top":505.85995,"left":346.98,"width":70.80001831054688,"height":10.780059814453125,"text":"Saint Paul"},{"top":505.85995,"left":417.78003,"width":20.87994384765625,"height":10.780059814453125,"text":"MN"},{"top":505.85995,"left":438.65997,"width":49.91998291015625,"height":10.780059814453125,"text":"55104"},{"top":505.85995,"left":488.57996,"width":78.47998046875,"height":10.780059814453125,"text":"Florence‐teacher"},{"top":505.85995,"left":567.05994,"width":106.4400634765625,"height":10.780059814453125,"text":"SPPS"},{"top":505.85995,"left":673.5,"width":45.52001953125,"height":10.780059814453125,"text":"10/3/2012"},{"top":505.85995,"left":719.02,"width":43.28033447265625,"height":10.780059814453125,"text":"100.00"}],[{"top":516.64,"left":16.97,"width":1.6187286376953125,"height":10.83990478515625,"text":""},{"top":516.64,"left":18.588728,"width":153.91128540039062,"height":10.83990478515625,"text":"Eaton"},{"top":516.64,"left":172.50002,"width":69.71998596191406,"height":10.83990478515625,"text":"Jim"},{"top":516.64,"left":242.22,"width":104.760009765625,"height":10.83990478515625,"text":"2133 Berkeley Ave"},{"top":516.64,"left":346.98,"width":70.80001831054688,"height":10.83990478515625,"text":"St Paul"},{"top":516.64,"left":417.78003,"width":20.87994384765625,"height":10.83990478515625,"text":"MN"},{"top":516.64,"left":438.65997,"width":49.91998291015625,"height":10.83990478515625,"text":"55105"},{"top":516.64,"left":488.57996,"width":78.47998046875,"height":10.83990478515625,"text":"Principal"},{"top":516.64,"left":567.05994,"width":106.4400634765625,"height":10.83990478515625,"text":"Saint Paul Public Schools"},{"top":516.64,"left":673.5,"width":45.52001953125,"height":10.83990478515625,"text":"8/23/2012"},{"top":516.64,"left":719.02,"width":43.28033447265625,"height":10.83990478515625,"text":"100.00"}],[{"top":527.4799,"left":16.97,"width":1.6187286376953125,"height":10.78009033203125,"text":""},{"top":527.4799,"left":18.588728,"width":153.91128540039062,"height":10.78009033203125,"text":"Eaves /Alger"},{"top":527.4799,"left":172.50002,"width":69.71998596191406,"height":10.78009033203125,"text":"Patricia / Stuart"},{"top":527.4799,"left":242.22,"width":104.760009765625,"height":10.78009033203125,"text":"1143 Portladn Ave."},{"top":527.4799,"left":346.98,"width":70.80001831054688,"height":10.78009033203125,"text":"Saint Paul"},{"top":527.4799,"left":417.78003,"width":20.87994384765625,"height":10.78009033203125,"text":"MN"},{"top":527.4799,"left":438.65997,"width":49.91998291015625,"height":10.78009033203125,"text":"55104"},{"top":527.4799,"left":488.57996,"width":78.47998046875,"height":10.78009033203125,"text":""},{"top":527.4799,"left":567.05994,"width":106.4400634765625,"height":10.78009033203125,"text":""},{"top":527.4799,"left":673.5,"width":45.52001953125,"height":10.78009033203125,"text":"10/3/2012"},{"top":527.4799,"left":719.02,"width":43.28033447265625,"height":10.78009033203125,"text":"100.00"}]]} diff --git a/src/test/resources/technology/tabula/json/spanning_cells.json b/src/test/resources/technology/tabula/json/spanning_cells.json index 89bb9707..7f68ee99 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells.json +++ b/src/test/resources/technology/tabula/json/spanning_cells.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"right":475.10168,"bottom":417.07092,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938491821289062,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.78943,"width":121.92680358886719,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663360595703125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37115,"width":46.73052978515625,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.78943,"width":121.92680358886719,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663360595703125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37115,"width":46.73052978515625,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.78943,"width":121.92680358886719,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663360595703125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37115,"width":46.73052978515625,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785018920898438,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785018920898438,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785018920898438,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785018920898438,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785018920898438,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785018920898438,"text":"1,693"}],[{"top":236.53287,"left":119.78943,"width":355.312255859375,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.78943,"width":121.92680358886719,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663360595703125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37115,"width":46.73052978515625,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"right":464.1174,"bottom":589.7847,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66316223144531,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.41415,"width":46.663726806640625,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] +[{"extraction_method":"lattice","page_number":1,"top":146.51932,"left":119.78943,"width":355.312255859375,"height":270.5516052246094,"right":475.10168,"bottom":417.07092,"data":[[{"top":146.51932,"left":119.78943,"width":355.312255859375,"height":12.938491821289062,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.78943,"width":121.92680358886719,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663360595703125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37115,"width":46.73052978515625,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.78943,"width":121.92680358886719,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663360595703125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37115,"width":46.73052978515625,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.78943,"width":121.92680358886719,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663360595703125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37115,"width":46.73052978515625,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.78943,"width":121.92680358886719,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663360595703125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37115,"width":46.73052978515625,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.78943,"width":121.92680358886719,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663360595703125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37115,"width":46.73052978515625,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.78943,"width":121.92680358886719,"height":12.785018920898438,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785018920898438,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785018920898438,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785018920898438,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663360595703125,"height":12.785018920898438,"text":"1,677"},{"top":223.74785,"left":428.37115,"width":46.73052978515625,"height":12.785018920898438,"text":"1,693"}],[{"top":236.53287,"left":119.78943,"width":355.312255859375,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.6354,"left":119.78943,"width":121.92680358886719,"height":12.72686767578125,"text":"Volume servers in:"},{"top":249.6354,"left":241.71623,"width":46.66426086425781,"height":12.72686767578125,"text":"2007"},{"top":249.6354,"left":288.3805,"width":46.663482666015625,"height":12.72686767578125,"text":"2008"},{"top":249.6354,"left":335.04398,"width":46.663818359375,"height":12.72686767578125,"text":"2009"},{"top":249.6354,"left":381.7078,"width":46.663360595703125,"height":12.72686767578125,"text":"2010"},{"top":249.6354,"left":428.37115,"width":46.73052978515625,"height":12.72686767578125,"text":"2011"}],[{"top":262.36227,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.78943,"width":121.92680358886719,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663360595703125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37115,"width":46.73052978515625,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.78943,"width":121.92680358886719,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663360595703125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37115,"width":46.73052978515625,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.78943,"width":121.92680358886719,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663360595703125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37115,"width":46.73052978515625,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.78943,"width":121.92680358886719,"height":12.7855224609375,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.7855224609375,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.7855224609375,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.7855224609375,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663360595703125,"height":12.7855224609375,"text":"1,334"},{"top":313.92487,"left":428.37115,"width":46.73052978515625,"height":12.7855224609375,"text":"1,371"}],[{"top":326.7104,"left":119.78943,"width":355.312255859375,"height":13.0440673828125,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75446,"left":119.78943,"width":121.92680358886719,"height":12.784912109375,"text":"Volume servers in:"},{"top":339.75446,"left":241.71623,"width":46.66426086425781,"height":12.784912109375,"text":"2007"},{"top":339.75446,"left":288.3805,"width":46.663482666015625,"height":12.784912109375,"text":"2008"},{"top":339.75446,"left":335.04398,"width":46.663818359375,"height":12.784912109375,"text":"2009"},{"top":339.75446,"left":381.7078,"width":46.663360595703125,"height":12.784912109375,"text":"2010"},{"top":339.75446,"left":428.37115,"width":46.73052978515625,"height":12.784912109375,"text":"2011"}],[{"top":352.53937,"left":119.78943,"width":121.92680358886719,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663360595703125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37115,"width":46.73052978515625,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.78943,"width":121.92680358886719,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663360595703125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37115,"width":46.73052978515625,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.78943,"width":121.92680358886719,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663360595703125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37115,"width":46.73052978515625,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.78943,"width":121.92680358886719,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663360595703125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37115,"width":46.73052978515625,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.78943,"width":121.92680358886719,"height":12.968353271484375,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968353271484375,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968353271484375,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968353271484375,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663360595703125,"height":12.968353271484375,"text":"1,424"},{"top":404.10257,"left":428.37115,"width":46.73052978515625,"height":12.968353271484375,"text":"1,485"}]]},{"extraction_method":"lattice","page_number":1,"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.52508544921875,"right":464.1174,"bottom":589.7847,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.880615234375,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.14026,"left":130.8136,"width":99.93739318847656,"height":12.78485107421875,"text":"Server class"},{"top":551.14026,"left":230.75099,"width":46.66316223144531,"height":12.78485107421875,"text":"2007"},{"top":551.14026,"left":277.41415,"width":46.663726806640625,"height":12.78485107421875,"text":"2008"},{"top":551.14026,"left":324.07788,"width":46.663970947265625,"height":12.78485107421875,"text":"2009"},{"top":551.14026,"left":370.74185,"width":46.663177490234375,"height":12.78485107421875,"text":"2010"},{"top":551.14026,"left":417.40503,"width":46.712371826171875,"height":12.78485107421875,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.9691162109375,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.9691162109375,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.9691162109375,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.9691162109375,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.9691162109375,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.9691162109375,"text":"98,864"}]]}] diff --git a/src/test/resources/technology/tabula/json/spanning_cells_basic.json b/src/test/resources/technology/tabula/json/spanning_cells_basic.json index d0164280..6efaef5b 100644 --- a/src/test/resources/technology/tabula/json/spanning_cells_basic.json +++ b/src/test/resources/technology/tabula/json/spanning_cells_basic.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"right":475.10883,"bottom":417.07086,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897811889648438,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.789444,"width":121.92678833007812,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663330078125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37112,"width":46.73773193359375,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.789444,"width":121.92678833007812,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663330078125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37112,"width":46.73773193359375,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.789444,"width":121.92678833007812,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663330078125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37112,"width":46.73773193359375,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785003662109375,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785003662109375,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785003662109375,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785003662109375,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785003662109375,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785003662109375,"text":"1,693"}],[{"top":236.53285,"left":119.789444,"width":355.31939697265625,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.789444,"width":121.92678833007812,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663330078125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37112,"width":46.73773193359375,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"right":464.1174,"bottom":589.802,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66316223144531,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.41415,"width":46.663726806640625,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] +[{"extraction_method":"lattice","page_number":1,"top":150.56,"left":119.789444,"width":355.31939697265625,"height":266.5108642578125,"right":475.10883,"bottom":417.07086,"data":[[{"top":150.56,"left":119.789444,"width":355.31939697265625,"height":8.897811889648438,"text":"Improved operation scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":159.45781,"left":119.789444,"width":121.92678833007812,"height":12.785446166992188,"text":"Volume servers in:"},{"top":159.45781,"left":241.71623,"width":46.66426086425781,"height":12.785446166992188,"text":"2007"},{"top":159.45781,"left":288.3805,"width":46.663482666015625,"height":12.785446166992188,"text":"2008"},{"top":159.45781,"left":335.04398,"width":46.663818359375,"height":12.785446166992188,"text":"2009"},{"top":159.45781,"left":381.7078,"width":46.663330078125,"height":12.785446166992188,"text":"2010"},{"top":159.45781,"left":428.37112,"width":46.73773193359375,"height":12.785446166992188,"text":"2011"}],[{"top":172.24326,"left":119.789444,"width":121.92678833007812,"height":12.832427978515625,"text":"Server closets"},{"top":172.24326,"left":241.71623,"width":46.66426086425781,"height":12.832427978515625,"text":"1,505"},{"top":172.24326,"left":288.3805,"width":46.663482666015625,"height":12.832427978515625,"text":"1,580"},{"top":172.24326,"left":335.04398,"width":46.663818359375,"height":12.832427978515625,"text":"1,643"},{"top":172.24326,"left":381.7078,"width":46.663330078125,"height":12.832427978515625,"text":"1,673"},{"top":172.24326,"left":428.37112,"width":46.73773193359375,"height":12.832427978515625,"text":"1,689"}],[{"top":185.07568,"left":119.789444,"width":121.92678833007812,"height":12.891036987304688,"text":"Server rooms"},{"top":185.07568,"left":241.71623,"width":46.66426086425781,"height":12.891036987304688,"text":"1,512"},{"top":185.07568,"left":288.3805,"width":46.663482666015625,"height":12.891036987304688,"text":"1,586"},{"top":185.07568,"left":335.04398,"width":46.663818359375,"height":12.891036987304688,"text":"1,646"},{"top":185.07568,"left":381.7078,"width":46.663330078125,"height":12.891036987304688,"text":"1,677"},{"top":185.07568,"left":428.37112,"width":46.73773193359375,"height":12.891036987304688,"text":"1,693"}],[{"top":197.96672,"left":119.789444,"width":121.92678833007812,"height":12.890411376953125,"text":"Localized data centers"},{"top":197.96672,"left":241.71623,"width":46.66426086425781,"height":12.890411376953125,"text":"1,512"},{"top":197.96672,"left":288.3805,"width":46.663482666015625,"height":12.890411376953125,"text":"1,586"},{"top":197.96672,"left":335.04398,"width":46.663818359375,"height":12.890411376953125,"text":"1,646"},{"top":197.96672,"left":381.7078,"width":46.663330078125,"height":12.890411376953125,"text":"1,677"},{"top":197.96672,"left":428.37112,"width":46.73773193359375,"height":12.890411376953125,"text":"1,693"}],[{"top":210.85713,"left":119.789444,"width":121.92678833007812,"height":12.890716552734375,"text":"Mid-tier data centers"},{"top":210.85713,"left":241.71623,"width":46.66426086425781,"height":12.890716552734375,"text":"1,512"},{"top":210.85713,"left":288.3805,"width":46.663482666015625,"height":12.890716552734375,"text":"1,586"},{"top":210.85713,"left":335.04398,"width":46.663818359375,"height":12.890716552734375,"text":"1,646"},{"top":210.85713,"left":381.7078,"width":46.663330078125,"height":12.890716552734375,"text":"1,677"},{"top":210.85713,"left":428.37112,"width":46.73773193359375,"height":12.890716552734375,"text":"1,693"}],[{"top":223.74785,"left":119.789444,"width":121.92678833007812,"height":12.785003662109375,"text":"Enterprise-class data centers"},{"top":223.74785,"left":241.71623,"width":46.66426086425781,"height":12.785003662109375,"text":"1,512"},{"top":223.74785,"left":288.3805,"width":46.663482666015625,"height":12.785003662109375,"text":"1,586"},{"top":223.74785,"left":335.04398,"width":46.663818359375,"height":12.785003662109375,"text":"1,646"},{"top":223.74785,"left":381.7078,"width":46.663330078125,"height":12.785003662109375,"text":"1,677"},{"top":223.74785,"left":428.37112,"width":46.73773193359375,"height":12.785003662109375,"text":"1,693"}],[{"top":236.53285,"left":119.789444,"width":355.31939697265625,"height":13.1025390625,"text":"Best practice scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":249.63539,"left":119.789444,"width":121.92678833007812,"height":12.726882934570312,"text":"Volume servers in:"},{"top":249.63539,"left":241.71623,"width":46.66426086425781,"height":12.726882934570312,"text":"2007"},{"top":249.63539,"left":288.3805,"width":46.663482666015625,"height":12.726882934570312,"text":"2008"},{"top":249.63539,"left":335.04398,"width":46.663818359375,"height":12.726882934570312,"text":"2009"},{"top":249.63539,"left":381.7078,"width":46.663330078125,"height":12.726882934570312,"text":"2010"},{"top":249.63539,"left":428.37112,"width":46.73773193359375,"height":12.726882934570312,"text":"2011"}],[{"top":262.36227,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Server closets"},{"top":262.36227,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,456"},{"top":262.36227,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,439"},{"top":262.36227,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,386"},{"top":262.36227,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,296"},{"top":262.36227,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,326"}],[{"top":275.25275,"left":119.789444,"width":121.92678833007812,"height":12.8914794921875,"text":"Server rooms"},{"top":275.25275,"left":241.71623,"width":46.66426086425781,"height":12.8914794921875,"text":"1,465"},{"top":275.25275,"left":288.3805,"width":46.663482666015625,"height":12.8914794921875,"text":"1,472"},{"top":275.25275,"left":335.04398,"width":46.663818359375,"height":12.8914794921875,"text":"1,427"},{"top":275.25275,"left":381.7078,"width":46.663330078125,"height":12.8914794921875,"text":"1,334"},{"top":275.25275,"left":428.37112,"width":46.73773193359375,"height":12.8914794921875,"text":"1,371"}],[{"top":288.14423,"left":119.789444,"width":121.92678833007812,"height":12.890167236328125,"text":"Localized data centers"},{"top":288.14423,"left":241.71623,"width":46.66426086425781,"height":12.890167236328125,"text":"1,465"},{"top":288.14423,"left":288.3805,"width":46.663482666015625,"height":12.890167236328125,"text":"1,471"},{"top":288.14423,"left":335.04398,"width":46.663818359375,"height":12.890167236328125,"text":"1,426"},{"top":288.14423,"left":381.7078,"width":46.663330078125,"height":12.890167236328125,"text":"1,334"},{"top":288.14423,"left":428.37112,"width":46.73773193359375,"height":12.890167236328125,"text":"1,371"}],[{"top":301.0344,"left":119.789444,"width":121.92678833007812,"height":12.890472412109375,"text":"Mid-tier data centers"},{"top":301.0344,"left":241.71623,"width":46.66426086425781,"height":12.890472412109375,"text":"1,465"},{"top":301.0344,"left":288.3805,"width":46.663482666015625,"height":12.890472412109375,"text":"1,471"},{"top":301.0344,"left":335.04398,"width":46.663818359375,"height":12.890472412109375,"text":"1,426"},{"top":301.0344,"left":381.7078,"width":46.663330078125,"height":12.890472412109375,"text":"1,334"},{"top":301.0344,"left":428.37112,"width":46.73773193359375,"height":12.890472412109375,"text":"1,371"}],[{"top":313.92487,"left":119.789444,"width":121.92678833007812,"height":12.785552978515625,"text":"Enterprise-class data centers"},{"top":313.92487,"left":241.71623,"width":46.66426086425781,"height":12.785552978515625,"text":"1,465"},{"top":313.92487,"left":288.3805,"width":46.663482666015625,"height":12.785552978515625,"text":"1,471"},{"top":313.92487,"left":335.04398,"width":46.663818359375,"height":12.785552978515625,"text":"1,426"},{"top":313.92487,"left":381.7078,"width":46.663330078125,"height":12.785552978515625,"text":"1,334"},{"top":313.92487,"left":428.37112,"width":46.73773193359375,"height":12.785552978515625,"text":"1,371"}],[{"top":326.71042,"left":119.789444,"width":355.31939697265625,"height":13.04400634765625,"text":"State-of-the-art scenario"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":339.75443,"left":119.789444,"width":121.92678833007812,"height":12.784942626953125,"text":"Volume servers in:"},{"top":339.75443,"left":241.71623,"width":46.66426086425781,"height":12.784942626953125,"text":"2007"},{"top":339.75443,"left":288.3805,"width":46.663482666015625,"height":12.784942626953125,"text":"2008"},{"top":339.75443,"left":335.04398,"width":46.663818359375,"height":12.784942626953125,"text":"2009"},{"top":339.75443,"left":381.7078,"width":46.663330078125,"height":12.784942626953125,"text":"2010"},{"top":339.75443,"left":428.37112,"width":46.73773193359375,"height":12.784942626953125,"text":"2011"}],[{"top":352.53937,"left":119.789444,"width":121.92678833007812,"height":12.89111328125,"text":"Server closets"},{"top":352.53937,"left":241.71623,"width":46.66426086425781,"height":12.89111328125,"text":"1,485"},{"top":352.53937,"left":288.3805,"width":46.663482666015625,"height":12.89111328125,"text":"1,471"},{"top":352.53937,"left":335.04398,"width":46.663818359375,"height":12.89111328125,"text":"1,424"},{"top":352.53937,"left":381.7078,"width":46.663330078125,"height":12.89111328125,"text":"1,315"},{"top":352.53937,"left":428.37112,"width":46.73773193359375,"height":12.89111328125,"text":"1,349"}],[{"top":365.43048,"left":119.789444,"width":121.92678833007812,"height":12.8902587890625,"text":"Server rooms"},{"top":365.43048,"left":241.71623,"width":46.66426086425781,"height":12.8902587890625,"text":"1,495"},{"top":365.43048,"left":288.3805,"width":46.663482666015625,"height":12.8902587890625,"text":"1,573"},{"top":365.43048,"left":335.04398,"width":46.663818359375,"height":12.8902587890625,"text":"1,586"},{"top":365.43048,"left":381.7078,"width":46.663330078125,"height":12.8902587890625,"text":"1,424"},{"top":365.43048,"left":428.37112,"width":46.73773193359375,"height":12.8902587890625,"text":"1,485"}],[{"top":378.32074,"left":119.789444,"width":121.92678833007812,"height":12.891143798828125,"text":"Localized data centers"},{"top":378.32074,"left":241.71623,"width":46.66426086425781,"height":12.891143798828125,"text":"1,495"},{"top":378.32074,"left":288.3805,"width":46.663482666015625,"height":12.891143798828125,"text":"1,572"},{"top":378.32074,"left":335.04398,"width":46.663818359375,"height":12.891143798828125,"text":"1,585"},{"top":378.32074,"left":381.7078,"width":46.663330078125,"height":12.891143798828125,"text":"1,424"},{"top":378.32074,"left":428.37112,"width":46.73773193359375,"height":12.891143798828125,"text":"1,485"}],[{"top":391.21188,"left":119.789444,"width":121.92678833007812,"height":12.89068603515625,"text":"Mid-tier data centers"},{"top":391.21188,"left":241.71623,"width":46.66426086425781,"height":12.89068603515625,"text":"1,495"},{"top":391.21188,"left":288.3805,"width":46.663482666015625,"height":12.89068603515625,"text":"1,572"},{"top":391.21188,"left":335.04398,"width":46.663818359375,"height":12.89068603515625,"text":"1,585"},{"top":391.21188,"left":381.7078,"width":46.663330078125,"height":12.89068603515625,"text":"1,424"},{"top":391.21188,"left":428.37112,"width":46.73773193359375,"height":12.89068603515625,"text":"1,485"}],[{"top":404.10257,"left":119.789444,"width":121.92678833007812,"height":12.968292236328125,"text":"Enterprise-class data centers"},{"top":404.10257,"left":241.71623,"width":46.66426086425781,"height":12.968292236328125,"text":"1,495"},{"top":404.10257,"left":288.3805,"width":46.663482666015625,"height":12.968292236328125,"text":"1,572"},{"top":404.10257,"left":335.04398,"width":46.663818359375,"height":12.968292236328125,"text":"1,585"},{"top":404.10257,"left":381.7078,"width":46.663330078125,"height":12.968292236328125,"text":"1,424"},{"top":404.10257,"left":428.37112,"width":46.73773193359375,"height":12.968292236328125,"text":"1,485"}]]},{"extraction_method":"lattice","page_number":1,"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":51.5423583984375,"right":464.1174,"bottom":589.802,"data":[[{"top":538.25964,"left":130.8136,"width":333.3038024902344,"height":12.88055419921875,"text":"All alternative scenarios"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":551.1402,"left":130.8136,"width":99.93739318847656,"height":12.784912109375,"text":"Server class"},{"top":551.1402,"left":230.75099,"width":46.66316223144531,"height":12.784912109375,"text":"2007"},{"top":551.1402,"left":277.41415,"width":46.663726806640625,"height":12.784912109375,"text":"2008"},{"top":551.1402,"left":324.07788,"width":46.663970947265625,"height":12.784912109375,"text":"2009"},{"top":551.1402,"left":370.74185,"width":46.663177490234375,"height":12.784912109375,"text":"2010"},{"top":551.1402,"left":417.40503,"width":46.712371826171875,"height":12.784912109375,"text":"2011"}],[{"top":563.9251,"left":130.8136,"width":99.93739318847656,"height":12.8905029296875,"text":"Mid-range"},{"top":563.9251,"left":230.75099,"width":46.66316223144531,"height":12.8905029296875,"text":"4,921"},{"top":563.9251,"left":277.41415,"width":46.663726806640625,"height":12.8905029296875,"text":"5,467"},{"top":563.9251,"left":324.07788,"width":46.663970947265625,"height":12.8905029296875,"text":"6,152"},{"top":563.9251,"left":370.74185,"width":46.663177490234375,"height":12.8905029296875,"text":"6,649"},{"top":563.9251,"left":417.40503,"width":46.712371826171875,"height":12.8905029296875,"text":"7,185"}],[{"top":576.8156,"left":130.8136,"width":99.93739318847656,"height":12.98638916015625,"text":"High-end"},{"top":576.8156,"left":230.75099,"width":46.66316223144531,"height":12.98638916015625,"text":"76,295"},{"top":576.8156,"left":277.41415,"width":46.663726806640625,"height":12.98638916015625,"text":"81,624"},{"top":576.8156,"left":324.07788,"width":46.663970947265625,"height":12.98638916015625,"text":"86,849"},{"top":576.8156,"left":370.74185,"width":46.663177490234375,"height":12.98638916015625,"text":"92,662"},{"top":576.8156,"left":417.40503,"width":46.712371826171875,"height":12.98638916015625,"text":"98,864"}]]}] diff --git a/src/test/resources/technology/tabula/json/twotables.json b/src/test/resources/technology/tabula/json/twotables.json index f6bd4f36..35a4c50f 100644 --- a/src/test/resources/technology/tabula/json/twotables.json +++ b/src/test/resources/technology/tabula/json/twotables.json @@ -1 +1 @@ -[{"extraction_method":"lattice","top":111.79087,"left":67.41156,"width":342.44476318359375,"height":174.0704345703125,"right":409.85632,"bottom":285.8613,"data":[[{"top":111.79087,"left":67.41156,"width":85.61141967773438,"height":28.536293029785156,"text":""},{"top":111.79087,"left":153.02298,"width":256.8333435058594,"height":14.267105102539062,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":126.057976,"left":153.02298,"width":51.367401123046875,"height":14.269187927246094,"text":"資本金"},{"top":126.057976,"left":204.39038,"width":51.36669921875,"height":14.269187927246094,"text":"資本剰余金"},{"top":126.057976,"left":255.75708,"width":51.3656005859375,"height":14.269187927246094,"text":"利益剰余金"},{"top":126.057976,"left":307.12268,"width":51.366668701171875,"height":14.269187927246094,"text":"自己株式"},{"top":126.057976,"left":358.48935,"width":51.366973876953125,"height":14.269187927246094,"text":"株主資本合計"}],[{"top":140.32716,"left":67.41156,"width":85.61141967773438,"height":14.265777587890625,"text":"当期首残高"},{"top":140.32716,"left":153.02298,"width":51.367401123046875,"height":14.265777587890625,"text":"5,664"},{"top":140.32716,"left":204.39038,"width":51.36669921875,"height":14.265777587890625,"text":"749"},{"top":140.32716,"left":255.75708,"width":51.3656005859375,"height":14.265777587890625,"text":"12,017"},{"top":140.32716,"left":307.12268,"width":51.366668701171875,"height":14.265777587890625,"text":"△747"},{"top":140.32716,"left":358.48935,"width":51.366973876953125,"height":14.265777587890625,"text":"17,683"}],[{"top":154.59294,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期変動額"},{"top":154.59294,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":""},{"top":154.59294,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":""}],[{"top":168.86205,"left":67.41156,"width":85.61141967773438,"height":14.268997192382812,"text":"剰余金の配当"},{"top":168.86205,"left":153.02298,"width":51.367401123046875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":204.39038,"width":51.36669921875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":255.75708,"width":51.3656005859375,"height":14.268997192382812,"text":"△525"},{"top":168.86205,"left":307.12268,"width":51.366668701171875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":358.48935,"width":51.366973876953125,"height":14.268997192382812,"text":"△525"}],[{"top":183.13104,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期純利益"},{"top":183.13104,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":"1,269"},{"top":183.13104,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":"1,269"}],[{"top":197.4002,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"自己株式の取得"},{"top":197.4002,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":""},{"top":197.4002,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":"△0"},{"top":197.4002,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△0"}],[{"top":211.66914,"left":67.41156,"width":85.61141967773438,"height":22.82952880859375,"text":"持分法の適用範囲\rの変動"},{"top":211.66914,"left":153.02298,"width":51.367401123046875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":204.39038,"width":51.36669921875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":255.75708,"width":51.3656005859375,"height":22.82952880859375,"text":"85"},{"top":211.66914,"left":307.12268,"width":51.366668701171875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":358.48935,"width":51.366973876953125,"height":22.82952880859375,"text":"85"}],[{"top":234.49867,"left":67.41156,"width":85.61141967773438,"height":22.829910278320312,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":234.49867,"left":153.02298,"width":51.367401123046875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":204.39038,"width":51.36669921875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":255.75708,"width":51.3656005859375,"height":22.829910278320312,"text":""},{"top":234.49867,"left":307.12268,"width":51.366668701171875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":358.48935,"width":51.366973876953125,"height":22.829910278320312,"text":""}],[{"top":257.32858,"left":67.41156,"width":85.61141967773438,"height":14.2686767578125,"text":"当期変動額合計"},{"top":257.32858,"left":153.02298,"width":51.367401123046875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":204.39038,"width":51.36669921875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":255.75708,"width":51.3656005859375,"height":14.2686767578125,"text":"829"},{"top":257.32858,"left":307.12268,"width":51.366668701171875,"height":14.2686767578125,"text":"△0"},{"top":257.32858,"left":358.48935,"width":51.366973876953125,"height":14.2686767578125,"text":"829"}],[{"top":271.59726,"left":67.41156,"width":85.61141967773438,"height":14.2640380859375,"text":"当期末残高"},{"top":271.59726,"left":153.02298,"width":51.367401123046875,"height":14.2640380859375,"text":"5,664"},{"top":271.59726,"left":204.39038,"width":51.36669921875,"height":14.2640380859375,"text":"749"},{"top":271.59726,"left":255.75708,"width":51.3656005859375,"height":14.2640380859375,"text":"12,846"},{"top":271.59726,"left":307.12268,"width":51.366668701171875,"height":14.2640380859375,"text":"△747"},{"top":271.59726,"left":358.48935,"width":51.366973876953125,"height":14.2640380859375,"text":"18,512"}]]},{"extraction_method":"lattice","top":312.25272,"left":67.41156,"width":445.17803955078125,"height":191.19696044921875,"right":512.5896,"bottom":503.44968,"data":[[{"top":312.25272,"left":67.41156,"width":85.61141967773438,"height":45.658233642578125,"text":""},{"top":312.25272,"left":153.02298,"width":256.8333435058594,"height":14.267730712890625,"text":"その他の包括利益累計額"},{"top":312.25272,"left":409.85632,"width":51.365631103515625,"height":45.658233642578125,"text":"少数株主持分"},{"top":312.25272,"left":461.22195,"width":51.367645263671875,"height":45.658233642578125,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":326.52045,"left":153.02298,"width":51.367401123046875,"height":31.3905029296875,"text":"その他有価証券\r評価差額金"},{"top":326.52045,"left":204.39038,"width":51.36669921875,"height":31.3905029296875,"text":"繰延ヘッジ\r損益"},{"top":326.52045,"left":255.75708,"width":51.3656005859375,"height":31.3905029296875,"text":"為替換算\r調整勘定"},{"top":326.52045,"left":307.12268,"width":51.366668701171875,"height":31.3905029296875,"text":"退職給付に係る\r調整累計額"},{"top":326.52045,"left":358.48935,"width":51.366973876953125,"height":31.3905029296875,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.91095,"left":67.41156,"width":85.61141967773438,"height":14.268768310546875,"text":"当期首残高"},{"top":357.91095,"left":153.02298,"width":51.367401123046875,"height":14.268768310546875,"text":"△669"},{"top":357.91095,"left":204.39038,"width":51.36669921875,"height":14.268768310546875,"text":"61"},{"top":357.91095,"left":255.75708,"width":51.3656005859375,"height":14.268768310546875,"text":"△109"},{"top":357.91095,"left":307.12268,"width":51.366668701171875,"height":14.268768310546875,"text":"―"},{"top":357.91095,"left":358.48935,"width":51.366973876953125,"height":14.268768310546875,"text":"△717"},{"top":357.91095,"left":409.85632,"width":51.365631103515625,"height":14.268768310546875,"text":"246"},{"top":357.91095,"left":461.22195,"width":51.367645263671875,"height":14.268768310546875,"text":"17,212"}],[{"top":372.17972,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期変動額"},{"top":372.17972,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":""},{"top":372.17972,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":""},{"top":372.17972,"left":409.85632,"width":51.365631103515625,"height":14.2691650390625,"text":""},{"top":372.17972,"left":461.22195,"width":51.367645263671875,"height":14.2691650390625,"text":""}],[{"top":386.44888,"left":67.41156,"width":85.61141967773438,"height":14.268646240234375,"text":"剰余金の配当"},{"top":386.44888,"left":153.02298,"width":51.367401123046875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":204.39038,"width":51.36669921875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":255.75708,"width":51.3656005859375,"height":14.268646240234375,"text":""},{"top":386.44888,"left":307.12268,"width":51.366668701171875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":358.48935,"width":51.366973876953125,"height":14.268646240234375,"text":""},{"top":386.44888,"left":409.85632,"width":51.365631103515625,"height":14.268646240234375,"text":""},{"top":386.44888,"left":461.22195,"width":51.367645263671875,"height":14.268646240234375,"text":"△525"}],[{"top":400.71753,"left":67.41156,"width":85.61141967773438,"height":14.26812744140625,"text":"当期純利益"},{"top":400.71753,"left":153.02298,"width":51.367401123046875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":204.39038,"width":51.36669921875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":255.75708,"width":51.3656005859375,"height":14.26812744140625,"text":""},{"top":400.71753,"left":307.12268,"width":51.366668701171875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":358.48935,"width":51.366973876953125,"height":14.26812744140625,"text":""},{"top":400.71753,"left":409.85632,"width":51.365631103515625,"height":14.26812744140625,"text":""},{"top":400.71753,"left":461.22195,"width":51.367645263671875,"height":14.26812744140625,"text":"1,269"}],[{"top":414.98566,"left":67.41156,"width":85.61141967773438,"height":14.26678466796875,"text":"自己株式の取得"},{"top":414.98566,"left":153.02298,"width":51.367401123046875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":204.39038,"width":51.36669921875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":255.75708,"width":51.3656005859375,"height":14.26678466796875,"text":""},{"top":414.98566,"left":307.12268,"width":51.366668701171875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":358.48935,"width":51.366973876953125,"height":14.26678466796875,"text":""},{"top":414.98566,"left":409.85632,"width":51.365631103515625,"height":14.26678466796875,"text":""},{"top":414.98566,"left":461.22195,"width":51.367645263671875,"height":14.26678466796875,"text":"△0"}],[{"top":429.25244,"left":67.41156,"width":85.61141967773438,"height":22.8292236328125,"text":"持分法の適用範囲\rの変動"},{"top":429.25244,"left":153.02298,"width":51.367401123046875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":204.39038,"width":51.36669921875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":255.75708,"width":51.3656005859375,"height":22.8292236328125,"text":""},{"top":429.25244,"left":307.12268,"width":51.366668701171875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":358.48935,"width":51.366973876953125,"height":22.8292236328125,"text":""},{"top":429.25244,"left":409.85632,"width":51.365631103515625,"height":22.8292236328125,"text":""},{"top":429.25244,"left":461.22195,"width":51.367645263671875,"height":22.8292236328125,"text":"85"}],[{"top":452.08167,"left":67.41156,"width":85.61141967773438,"height":22.830596923828125,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":452.08167,"left":153.02298,"width":51.367401123046875,"height":22.830596923828125,"text":"556"},{"top":452.08167,"left":204.39038,"width":51.36669921875,"height":22.830596923828125,"text":"80"},{"top":452.08167,"left":255.75708,"width":51.3656005859375,"height":22.830596923828125,"text":"5"},{"top":452.08167,"left":307.12268,"width":51.366668701171875,"height":22.830596923828125,"text":"―"},{"top":452.08167,"left":358.48935,"width":51.366973876953125,"height":22.830596923828125,"text":"642"},{"top":452.08167,"left":409.85632,"width":51.365631103515625,"height":22.830596923828125,"text":"△0"},{"top":452.08167,"left":461.22195,"width":51.367645263671875,"height":22.830596923828125,"text":"642"}],[{"top":474.91226,"left":67.41156,"width":85.61141967773438,"height":14.26776123046875,"text":"当期変動額合計"},{"top":474.91226,"left":153.02298,"width":51.367401123046875,"height":14.26776123046875,"text":"556"},{"top":474.91226,"left":204.39038,"width":51.36669921875,"height":14.26776123046875,"text":"80"},{"top":474.91226,"left":255.75708,"width":51.3656005859375,"height":14.26776123046875,"text":"5"},{"top":474.91226,"left":307.12268,"width":51.366668701171875,"height":14.26776123046875,"text":"―"},{"top":474.91226,"left":358.48935,"width":51.366973876953125,"height":14.26776123046875,"text":"642"},{"top":474.91226,"left":409.85632,"width":51.365631103515625,"height":14.26776123046875,"text":"△0"},{"top":474.91226,"left":461.22195,"width":51.367645263671875,"height":14.26776123046875,"text":"1,471"}],[{"top":489.18002,"left":67.41156,"width":85.61141967773438,"height":14.2696533203125,"text":"当期末残高"},{"top":489.18002,"left":153.02298,"width":51.367401123046875,"height":14.2696533203125,"text":"△113"},{"top":489.18002,"left":204.39038,"width":51.36669921875,"height":14.2696533203125,"text":"142"},{"top":489.18002,"left":255.75708,"width":51.3656005859375,"height":14.2696533203125,"text":"△104"},{"top":489.18002,"left":307.12268,"width":51.366668701171875,"height":14.2696533203125,"text":"―"},{"top":489.18002,"left":358.48935,"width":51.366973876953125,"height":14.2696533203125,"text":"△75"},{"top":489.18002,"left":409.85632,"width":51.365631103515625,"height":14.2696533203125,"text":"245"},{"top":489.18002,"left":461.22195,"width":51.367645263671875,"height":14.2696533203125,"text":"18,683"}]]}] +[{"extraction_method":"lattice","page_number":1,"top":111.79087,"left":67.41156,"width":342.44476318359375,"height":174.0704345703125,"right":409.85632,"bottom":285.8613,"data":[[{"top":111.79087,"left":67.41156,"width":85.61141967773438,"height":28.536293029785156,"text":""},{"top":111.79087,"left":153.02298,"width":256.8333435058594,"height":14.267105102539062,"text":"株主資本"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":126.057976,"left":153.02298,"width":51.367401123046875,"height":14.269187927246094,"text":"資本金"},{"top":126.057976,"left":204.39038,"width":51.36669921875,"height":14.269187927246094,"text":"資本剰余金"},{"top":126.057976,"left":255.75708,"width":51.3656005859375,"height":14.269187927246094,"text":"利益剰余金"},{"top":126.057976,"left":307.12268,"width":51.366668701171875,"height":14.269187927246094,"text":"自己株式"},{"top":126.057976,"left":358.48935,"width":51.366973876953125,"height":14.269187927246094,"text":"株主資本合計"}],[{"top":140.32716,"left":67.41156,"width":85.61141967773438,"height":14.265777587890625,"text":"当期首残高"},{"top":140.32716,"left":153.02298,"width":51.367401123046875,"height":14.265777587890625,"text":"5,664"},{"top":140.32716,"left":204.39038,"width":51.36669921875,"height":14.265777587890625,"text":"749"},{"top":140.32716,"left":255.75708,"width":51.3656005859375,"height":14.265777587890625,"text":"12,017"},{"top":140.32716,"left":307.12268,"width":51.366668701171875,"height":14.265777587890625,"text":"△747"},{"top":140.32716,"left":358.48935,"width":51.366973876953125,"height":14.265777587890625,"text":"17,683"}],[{"top":154.59294,"left":67.41156,"width":85.61141967773438,"height":14.26910400390625,"text":"当期変動額"},{"top":154.59294,"left":153.02298,"width":51.367401123046875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":204.39038,"width":51.36669921875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":255.75708,"width":51.3656005859375,"height":14.26910400390625,"text":""},{"top":154.59294,"left":307.12268,"width":51.366668701171875,"height":14.26910400390625,"text":""},{"top":154.59294,"left":358.48935,"width":51.366973876953125,"height":14.26910400390625,"text":""}],[{"top":168.86205,"left":67.41156,"width":85.61141967773438,"height":14.268997192382812,"text":"剰余金の配当"},{"top":168.86205,"left":153.02298,"width":51.367401123046875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":204.39038,"width":51.36669921875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":255.75708,"width":51.3656005859375,"height":14.268997192382812,"text":"△525"},{"top":168.86205,"left":307.12268,"width":51.366668701171875,"height":14.268997192382812,"text":""},{"top":168.86205,"left":358.48935,"width":51.366973876953125,"height":14.268997192382812,"text":"△525"}],[{"top":183.13104,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期純利益"},{"top":183.13104,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":"1,269"},{"top":183.13104,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":183.13104,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":"1,269"}],[{"top":197.4002,"left":67.41156,"width":85.61141967773438,"height":14.268936157226562,"text":"自己株式の取得"},{"top":197.4002,"left":153.02298,"width":51.367401123046875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":204.39038,"width":51.36669921875,"height":14.268936157226562,"text":""},{"top":197.4002,"left":255.75708,"width":51.3656005859375,"height":14.268936157226562,"text":""},{"top":197.4002,"left":307.12268,"width":51.366668701171875,"height":14.268936157226562,"text":"△0"},{"top":197.4002,"left":358.48935,"width":51.366973876953125,"height":14.268936157226562,"text":"△0"}],[{"top":211.66914,"left":67.41156,"width":85.61141967773438,"height":22.82952880859375,"text":"持分法の適用範囲\rの変動"},{"top":211.66914,"left":153.02298,"width":51.367401123046875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":204.39038,"width":51.36669921875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":255.75708,"width":51.3656005859375,"height":22.82952880859375,"text":"85"},{"top":211.66914,"left":307.12268,"width":51.366668701171875,"height":22.82952880859375,"text":""},{"top":211.66914,"left":358.48935,"width":51.366973876953125,"height":22.82952880859375,"text":"85"}],[{"top":234.49867,"left":67.41156,"width":85.61141967773438,"height":22.829910278320312,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":234.49867,"left":153.02298,"width":51.367401123046875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":204.39038,"width":51.36669921875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":255.75708,"width":51.3656005859375,"height":22.829910278320312,"text":""},{"top":234.49867,"left":307.12268,"width":51.366668701171875,"height":22.829910278320312,"text":""},{"top":234.49867,"left":358.48935,"width":51.366973876953125,"height":22.829910278320312,"text":""}],[{"top":257.32858,"left":67.41156,"width":85.61141967773438,"height":14.2686767578125,"text":"当期変動額合計"},{"top":257.32858,"left":153.02298,"width":51.367401123046875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":204.39038,"width":51.36669921875,"height":14.2686767578125,"text":"―"},{"top":257.32858,"left":255.75708,"width":51.3656005859375,"height":14.2686767578125,"text":"829"},{"top":257.32858,"left":307.12268,"width":51.366668701171875,"height":14.2686767578125,"text":"△0"},{"top":257.32858,"left":358.48935,"width":51.366973876953125,"height":14.2686767578125,"text":"829"}],[{"top":271.59726,"left":67.41156,"width":85.61141967773438,"height":14.2640380859375,"text":"当期末残高"},{"top":271.59726,"left":153.02298,"width":51.367401123046875,"height":14.2640380859375,"text":"5,664"},{"top":271.59726,"left":204.39038,"width":51.36669921875,"height":14.2640380859375,"text":"749"},{"top":271.59726,"left":255.75708,"width":51.3656005859375,"height":14.2640380859375,"text":"12,846"},{"top":271.59726,"left":307.12268,"width":51.366668701171875,"height":14.2640380859375,"text":"△747"},{"top":271.59726,"left":358.48935,"width":51.366973876953125,"height":14.2640380859375,"text":"18,512"}]]},{"extraction_method":"lattice","page_number":1,"top":312.25272,"left":67.41156,"width":445.17803955078125,"height":191.19696044921875,"right":512.5896,"bottom":503.44968,"data":[[{"top":312.25272,"left":67.41156,"width":85.61141967773438,"height":45.658233642578125,"text":""},{"top":312.25272,"left":153.02298,"width":256.8333435058594,"height":14.267730712890625,"text":"その他の包括利益累計額"},{"top":312.25272,"left":409.85632,"width":51.365631103515625,"height":45.658233642578125,"text":"少数株主持分"},{"top":312.25272,"left":461.22195,"width":51.367645263671875,"height":45.658233642578125,"text":"純資産合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":326.52045,"left":153.02298,"width":51.367401123046875,"height":31.3905029296875,"text":"その他有価証券\r評価差額金"},{"top":326.52045,"left":204.39038,"width":51.36669921875,"height":31.3905029296875,"text":"繰延ヘッジ\r損益"},{"top":326.52045,"left":255.75708,"width":51.3656005859375,"height":31.3905029296875,"text":"為替換算\r調整勘定"},{"top":326.52045,"left":307.12268,"width":51.366668701171875,"height":31.3905029296875,"text":"退職給付に係る\r調整累計額"},{"top":326.52045,"left":358.48935,"width":51.366973876953125,"height":31.3905029296875,"text":"その他の\r包括利益\r累計額合計"},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""},{"top":0.0,"left":0.0,"width":0.0,"height":0.0,"text":""}],[{"top":357.91095,"left":67.41156,"width":85.61141967773438,"height":14.268768310546875,"text":"当期首残高"},{"top":357.91095,"left":153.02298,"width":51.367401123046875,"height":14.268768310546875,"text":"△669"},{"top":357.91095,"left":204.39038,"width":51.36669921875,"height":14.268768310546875,"text":"61"},{"top":357.91095,"left":255.75708,"width":51.3656005859375,"height":14.268768310546875,"text":"△109"},{"top":357.91095,"left":307.12268,"width":51.366668701171875,"height":14.268768310546875,"text":"―"},{"top":357.91095,"left":358.48935,"width":51.366973876953125,"height":14.268768310546875,"text":"△717"},{"top":357.91095,"left":409.85632,"width":51.365631103515625,"height":14.268768310546875,"text":"246"},{"top":357.91095,"left":461.22195,"width":51.367645263671875,"height":14.268768310546875,"text":"17,212"}],[{"top":372.17972,"left":67.41156,"width":85.61141967773438,"height":14.2691650390625,"text":"当期変動額"},{"top":372.17972,"left":153.02298,"width":51.367401123046875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":204.39038,"width":51.36669921875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":255.75708,"width":51.3656005859375,"height":14.2691650390625,"text":""},{"top":372.17972,"left":307.12268,"width":51.366668701171875,"height":14.2691650390625,"text":""},{"top":372.17972,"left":358.48935,"width":51.366973876953125,"height":14.2691650390625,"text":""},{"top":372.17972,"left":409.85632,"width":51.365631103515625,"height":14.2691650390625,"text":""},{"top":372.17972,"left":461.22195,"width":51.367645263671875,"height":14.2691650390625,"text":""}],[{"top":386.44888,"left":67.41156,"width":85.61141967773438,"height":14.268646240234375,"text":"剰余金の配当"},{"top":386.44888,"left":153.02298,"width":51.367401123046875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":204.39038,"width":51.36669921875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":255.75708,"width":51.3656005859375,"height":14.268646240234375,"text":""},{"top":386.44888,"left":307.12268,"width":51.366668701171875,"height":14.268646240234375,"text":""},{"top":386.44888,"left":358.48935,"width":51.366973876953125,"height":14.268646240234375,"text":""},{"top":386.44888,"left":409.85632,"width":51.365631103515625,"height":14.268646240234375,"text":""},{"top":386.44888,"left":461.22195,"width":51.367645263671875,"height":14.268646240234375,"text":"△525"}],[{"top":400.71753,"left":67.41156,"width":85.61141967773438,"height":14.26812744140625,"text":"当期純利益"},{"top":400.71753,"left":153.02298,"width":51.367401123046875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":204.39038,"width":51.36669921875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":255.75708,"width":51.3656005859375,"height":14.26812744140625,"text":""},{"top":400.71753,"left":307.12268,"width":51.366668701171875,"height":14.26812744140625,"text":""},{"top":400.71753,"left":358.48935,"width":51.366973876953125,"height":14.26812744140625,"text":""},{"top":400.71753,"left":409.85632,"width":51.365631103515625,"height":14.26812744140625,"text":""},{"top":400.71753,"left":461.22195,"width":51.367645263671875,"height":14.26812744140625,"text":"1,269"}],[{"top":414.98566,"left":67.41156,"width":85.61141967773438,"height":14.26678466796875,"text":"自己株式の取得"},{"top":414.98566,"left":153.02298,"width":51.367401123046875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":204.39038,"width":51.36669921875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":255.75708,"width":51.3656005859375,"height":14.26678466796875,"text":""},{"top":414.98566,"left":307.12268,"width":51.366668701171875,"height":14.26678466796875,"text":""},{"top":414.98566,"left":358.48935,"width":51.366973876953125,"height":14.26678466796875,"text":""},{"top":414.98566,"left":409.85632,"width":51.365631103515625,"height":14.26678466796875,"text":""},{"top":414.98566,"left":461.22195,"width":51.367645263671875,"height":14.26678466796875,"text":"△0"}],[{"top":429.25244,"left":67.41156,"width":85.61141967773438,"height":22.8292236328125,"text":"持分法の適用範囲\rの変動"},{"top":429.25244,"left":153.02298,"width":51.367401123046875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":204.39038,"width":51.36669921875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":255.75708,"width":51.3656005859375,"height":22.8292236328125,"text":""},{"top":429.25244,"left":307.12268,"width":51.366668701171875,"height":22.8292236328125,"text":""},{"top":429.25244,"left":358.48935,"width":51.366973876953125,"height":22.8292236328125,"text":""},{"top":429.25244,"left":409.85632,"width":51.365631103515625,"height":22.8292236328125,"text":""},{"top":429.25244,"left":461.22195,"width":51.367645263671875,"height":22.8292236328125,"text":"85"}],[{"top":452.08167,"left":67.41156,"width":85.61141967773438,"height":22.830596923828125,"text":"株主資本以外の項目\rの当期変動額(純額)"},{"top":452.08167,"left":153.02298,"width":51.367401123046875,"height":22.830596923828125,"text":"556"},{"top":452.08167,"left":204.39038,"width":51.36669921875,"height":22.830596923828125,"text":"80"},{"top":452.08167,"left":255.75708,"width":51.3656005859375,"height":22.830596923828125,"text":"5"},{"top":452.08167,"left":307.12268,"width":51.366668701171875,"height":22.830596923828125,"text":"―"},{"top":452.08167,"left":358.48935,"width":51.366973876953125,"height":22.830596923828125,"text":"642"},{"top":452.08167,"left":409.85632,"width":51.365631103515625,"height":22.830596923828125,"text":"△0"},{"top":452.08167,"left":461.22195,"width":51.367645263671875,"height":22.830596923828125,"text":"642"}],[{"top":474.91226,"left":67.41156,"width":85.61141967773438,"height":14.26776123046875,"text":"当期変動額合計"},{"top":474.91226,"left":153.02298,"width":51.367401123046875,"height":14.26776123046875,"text":"556"},{"top":474.91226,"left":204.39038,"width":51.36669921875,"height":14.26776123046875,"text":"80"},{"top":474.91226,"left":255.75708,"width":51.3656005859375,"height":14.26776123046875,"text":"5"},{"top":474.91226,"left":307.12268,"width":51.366668701171875,"height":14.26776123046875,"text":"―"},{"top":474.91226,"left":358.48935,"width":51.366973876953125,"height":14.26776123046875,"text":"642"},{"top":474.91226,"left":409.85632,"width":51.365631103515625,"height":14.26776123046875,"text":"△0"},{"top":474.91226,"left":461.22195,"width":51.367645263671875,"height":14.26776123046875,"text":"1,471"}],[{"top":489.18002,"left":67.41156,"width":85.61141967773438,"height":14.2696533203125,"text":"当期末残高"},{"top":489.18002,"left":153.02298,"width":51.367401123046875,"height":14.2696533203125,"text":"△113"},{"top":489.18002,"left":204.39038,"width":51.36669921875,"height":14.2696533203125,"text":"142"},{"top":489.18002,"left":255.75708,"width":51.3656005859375,"height":14.2696533203125,"text":"△104"},{"top":489.18002,"left":307.12268,"width":51.366668701171875,"height":14.2696533203125,"text":"―"},{"top":489.18002,"left":358.48935,"width":51.366973876953125,"height":14.2696533203125,"text":"△75"},{"top":489.18002,"left":409.85632,"width":51.365631103515625,"height":14.2696533203125,"text":"245"},{"top":489.18002,"left":461.22195,"width":51.367645263671875,"height":14.2696533203125,"text":"18,683"}]]}] From c65783d4f089b6f94f06579f8f36d51c3d4195c5 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Fri, 22 Apr 2022 11:11:01 +0200 Subject: [PATCH 213/245] update pdfbox, bc, big2 and plugins --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e2947ada..ec8e4f88 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 true @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 8 @@ -195,7 +195,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 8 @@ -262,19 +262,19 @@ org.apache.pdfbox pdfbox - 2.0.25 + 2.0.26 org.bouncycastle bcprov-jdk15on - 1.69 + 1.70 org.bouncycastle bcmail-jdk15on - 1.69 + 1.70 @@ -317,7 +317,7 @@ org.apache.pdfbox jbig2-imageio - 3.0.3 + 3.0.4 From ab93da966b42b3384ba69556b491e82a0580bcda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 04:29:52 +0000 Subject: [PATCH 214/245] Bump gson from 2.8.7 to 2.9.0 Bumps [gson](https://github.com/google/gson) from 2.8.7 to 2.9.0. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.7...gson-parent-2.9.0) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec8e4f88..fb1f7e08 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ com.google.code.gson gson - 2.8.7 + 2.9.0 From 50ff2df2e62644260d519e2d875a4db7d87d6746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Tue, 9 Aug 2022 23:36:48 -0300 Subject: [PATCH 215/245] Run tests on pull request --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cf36b0ce..b8aa9c14 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,6 +1,6 @@ name: Java CI -on: [push] +on: [push, pull_request] jobs: build: From 84aef7f0c84f4ec0fdb5adee789c93c4a216073c Mon Sep 17 00:00:00 2001 From: Martin Skopp Date: Wed, 7 Dec 2022 15:11:10 +0100 Subject: [PATCH 216/245] Add a simple API usage example applying SpreadsheetExtractionAlgorithm --- README.md | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d3c8210..c3a5f92f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ tabula-java [![Build Status](https://travis-ci.org/tabulapdf/tabula-java.svg?bra Download a version of the tabula-java's jar, with all dependencies included, that works on Mac, Windows and Linux from our [releases page](../../releases). -## Usage Examples +## Commandline Usage Examples `tabula-java` provides a command line application: @@ -81,6 +81,44 @@ JVM start-up time is a lot of the cost of the `tabula` command, so if you're try - writing your own program in any JVM language (Java, JRuby, Scala) that imports tabula-java. - waiting for us to implement an API/server-style system (it's on the [roadmap](https://github.com/tabulapdf/tabula-api)) +## API Usage Examples + +A simple Java code example which extracts all rows and cells from all tables of all pages of a PDF document: + + InputStream in = this.getClass().getResourceAsStream("my.pdf"); + try (PDDocument document = PDDocument.load(in)) { + SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); + PageIterator pi = new ObjectExtractor(document).extract(); + while (pi.hasNext()) { + // iterate over the pages of the document + Page page = pi.next(); + List
table = sea.extract(page); + // iterate over the tables of the page + for(Table tables: table) { + List> rows = tables.getRows(); + // iterate over the rows of the table + for (List cells : rows) { + // print all column-cells of the row plus linefeed + for (RectangularTextContainer content : cells) { + // Note: Cell.getText() uses \r to concat text chunks + String text = content.getText().replace("\r", " "); + System.out.print(text + "|"); + } + System.out.println(); + } + } + } + } + +For more detail information check the Javadoc. +The Javadoc API documentation can be generated (see also '_Building from Source_' section) via + +``` +mvn javadoc:javadoc +``` + +which generates the HTML files to directory ```target/site/apidocs/``` + ## Building from Source Clone this repo and run: From 3c2af18f7c3daedafb6a4d33ab5f818cdc468d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Aristar=C3=A1n?= Date: Wed, 7 Dec 2022 12:04:34 -0300 Subject: [PATCH 217/245] Fix Markdown formatting for code example --- README.md | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index c3a5f92f..db7b0023 100644 --- a/README.md +++ b/README.md @@ -85,30 +85,33 @@ JVM start-up time is a lot of the cost of the `tabula` command, so if you're try A simple Java code example which extracts all rows and cells from all tables of all pages of a PDF document: - InputStream in = this.getClass().getResourceAsStream("my.pdf"); - try (PDDocument document = PDDocument.load(in)) { - SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - PageIterator pi = new ObjectExtractor(document).extract(); - while (pi.hasNext()) { - // iterate over the pages of the document - Page page = pi.next(); - List
table = sea.extract(page); - // iterate over the tables of the page - for(Table tables: table) { - List> rows = tables.getRows(); - // iterate over the rows of the table - for (List cells : rows) { - // print all column-cells of the row plus linefeed - for (RectangularTextContainer content : cells) { - // Note: Cell.getText() uses \r to concat text chunks - String text = content.getText().replace("\r", " "); - System.out.print(text + "|"); - } - System.out.println(); - } +```java +InputStream in = this.getClass().getResourceAsStream("my.pdf"); +try (PDDocument document = PDDocument.load(in)) { + SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); + PageIterator pi = new ObjectExtractor(document).extract(); + while (pi.hasNext()) { + // iterate over the pages of the document + Page page = pi.next(); + List
table = sea.extract(page); + // iterate over the tables of the page + for(Table tables: table) { + List> rows = tables.getRows(); + // iterate over the rows of the table + for (List cells : rows) { + // print all column-cells of the row plus linefeed + for (RectangularTextContainer content : cells) { + // Note: Cell.getText() uses \r to concat text chunks + String text = content.getText().replace("\r", " "); + System.out.print(text + "|"); } + System.out.println(); } } + } +} +``` + For more detail information check the Javadoc. The Javadoc API documentation can be generated (see also '_Building from Source_' section) via From b0fde49e6aa06593d16c8aa0b8da0e3172db1ec2 Mon Sep 17 00:00:00 2001 From: Aki Ariga Date: Mon, 20 Feb 2023 18:17:19 -0800 Subject: [PATCH 218/245] Enforce checkout with LF Windows CI fails when parsing CSV with line breaks within a cell. This is due to the difference of line endings between CRLF vs LF, and test CSV parser implementation. To mitigate this issue, tweak Windows CI to enforce git checkout with LF. --- .github/workflows/tests-windows.yml | 11 ++++++++--- .github/workflows/tests.yml | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml index 4ff7f542..5cc1031a 100644 --- a/.github/workflows/tests-windows.yml +++ b/.github/workflows/tests-windows.yml @@ -1,4 +1,4 @@ -name: Java CI +name: Java CI (Windows) on: [push] @@ -7,9 +7,14 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + # https://github.com/actions/checkout/issues/135#issuecomment-602171132 + - name: Set git to use LF + run: | + git config --global core.autocrlf false + git config --global core.eol lf + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b8aa9c14..da2d019b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' From 8bfa3ad23af34f757f72fe46584a34abfc022ed3 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Fri, 14 Apr 2023 17:46:46 +0200 Subject: [PATCH 219/245] update pdfbox to 2.0.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb1f7e08..27a03e73 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.26 + 2.0.28 From bc60be27d663f40e132a21407ec81790a8aee361 Mon Sep 17 00:00:00 2001 From: young Date: Wed, 6 Mar 2024 14:53:55 +0800 Subject: [PATCH 220/245] update pdfbox to 3.0.1 --- pom.xml | 2 +- .../technology/tabula/CommandLineApp.java | 3 +- .../java/technology/tabula/debug/Debug.java | 5 +- .../detectors/NurminenDetectionAlgorithm.java | 6 +- src/test/java/technology/tabula/TestCell.java | 3 +- src/test/java/technology/tabula/TestLine.java | 11 +- .../tabula/TestObjectExtractor.java | 21 +- .../tabula/TestProjectionProfile.java | 8 +- .../technology/tabula/TestTableDetection.java | 3 +- .../technology/tabula/TestTextElement.java | 393 +++++++++--------- .../java/technology/tabula/TestUtils.java | 3 +- .../technology/tabula/UtilsForTesting.java | 7 +- 12 files changed, 238 insertions(+), 227 deletions(-) diff --git a/pom.xml b/pom.xml index 27a03e73..6c71b426 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ org.apache.pdfbox pdfbox - 2.0.28 + 3.0.1 diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 3a6773a9..1b422303 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -15,6 +15,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.DefaultParser; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import technology.tabula.detectors.DetectionAlgorithm; @@ -158,7 +159,7 @@ public void extractFileInto(File pdfFile, File outputFile) throws ParseException private void extractFile(File pdfFile, Appendable outFile) throws ParseException { PDDocument pdfDocument = null; try { - pdfDocument = this.password == null ? PDDocument.load(pdfFile) : PDDocument.load(pdfFile, this.password); + pdfDocument = this.password == null ? Loader.loadPDF(pdfFile) : Loader.loadPDF(pdfFile,password); PageIterator pageIterator = getPageIterator(pdfDocument); List
tables = new ArrayList<>(); diff --git a/src/main/java/technology/tabula/debug/Debug.java b/src/main/java/technology/tabula/debug/Debug.java index 91609045..d6d257ce 100644 --- a/src/main/java/technology/tabula/debug/Debug.java +++ b/src/main/java/technology/tabula/debug/Debug.java @@ -16,6 +16,7 @@ import java.util.List; import org.apache.commons.cli.*; +import org.apache.pdfbox.Loader; import technology.tabula.Cell; import technology.tabula.CommandLineApp; import technology.tabula.Line; @@ -215,7 +216,7 @@ public static void renderPage(String pdfPath, String outPath, int pageNumber, Re boolean drawColumns, boolean drawCharacters, boolean drawArea, boolean drawCells, boolean drawUnprocessedRulings, boolean drawProjectionProfile, boolean drawClippingPaths, boolean drawDetectedTables) throws IOException { - PDDocument document = PDDocument.load(new File(pdfPath)); + PDDocument document = Loader.loadPDF(new File(pdfPath)); ObjectExtractor oe = new ObjectExtractor(document); @@ -349,7 +350,7 @@ public static void main(String[] args) throws IOException { if (pages == null) { // user specified all pages - PDDocument document = PDDocument.load(pdfFile); + PDDocument document = Loader.loadPDF(pdfFile); int numPages = document.getNumberOfPages(); pages = new ArrayList<>(numPages); diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index fb43622a..9a377854 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -805,12 +805,12 @@ private PDDocument removeText(PDPage page) throws IOException { PDFStreamParser parser = new PDFStreamParser(page); parser.parse(); - List tokens = parser.getTokens(); List newTokens = new ArrayList<>(); - for (Object token : tokens) { + while (page.hasContents()) { + Object token = parser.parseNextToken(); if (token instanceof Operator) { Operator op = (Operator) token; - if (op.getName().equals("TJ") || op.getName().equals("Tj")) { + if ("TJ".equals(op.getName()) || "Tj".equals(op.getName())) { //remove the one argument to this operator newTokens.remove(newTokens.size() - 1); continue; diff --git a/src/test/java/technology/tabula/TestCell.java b/src/test/java/technology/tabula/TestCell.java index de1b8cb8..2795565c 100644 --- a/src/test/java/technology/tabula/TestCell.java +++ b/src/test/java/technology/tabula/TestCell.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import org.apache.pdfbox.pdmodel.font.PDType1Font; +import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import org.junit.Test; public class TestCell { @@ -31,7 +32,7 @@ public void testGetTextElements() { Cell cell = new Cell(0, 0, 0, 0); assertTrue(cell.getTextElements().isEmpty()); - TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); + TextElement tElement = new TextElement(0, 0, 0, 0, new PDType1Font(Standard14Fonts.FontName.HELVETICA_BOLD), 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); List tList = new ArrayList<>(); tList.add(tChunk); diff --git a/src/test/java/technology/tabula/TestLine.java b/src/test/java/technology/tabula/TestLine.java index 90df0e31..f7a6a88d 100644 --- a/src/test/java/technology/tabula/TestLine.java +++ b/src/test/java/technology/tabula/TestLine.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.pdfbox.pdmodel.font.PDType1Font; +import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import org.junit.Test; public class TestLine { @@ -14,7 +15,7 @@ public class TestLine { public void testSetTextElements() { Line line = new Line(); - TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); + TextElement tElement = new TextElement(0, 0, 0, 0, new PDType1Font(Standard14Fonts.FontName.HELVETICA_BOLD), 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); List tList = new ArrayList<>(); tList.add(tChunk); @@ -28,7 +29,7 @@ public void testSetTextElements() { public void testAddTextChunkIntTextChunk() { Line line = new Line(); - TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); + TextElement tElement = new TextElement(0, 0, 0, 0, new PDType1Font(Standard14Fonts.FontName.HELVETICA_BOLD), 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); line.addTextChunk(3, tChunk); @@ -39,7 +40,7 @@ public void testAddTextChunkIntTextChunk() { public void testLessThanAddTextChunkIntTextChunk() { Line line = new Line(); - TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); + TextElement tElement = new TextElement(0, 0, 0, 0, new PDType1Font(Standard14Fonts.FontName.HELVETICA_BOLD), 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); line.addTextChunk(0, tChunk); line.addTextChunk(0, tChunk); @@ -51,7 +52,7 @@ public void testLessThanAddTextChunkIntTextChunk() { public void testErrorAddTextChunkIntTextChunk() { Line line = new Line(); - TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); + TextElement tElement = new TextElement(0, 0, 0, 0,new PDType1Font(Standard14Fonts.FontName.HELVETICA_BOLD), 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); line.addTextChunk(-1, tChunk); } @@ -60,7 +61,7 @@ public void testErrorAddTextChunkIntTextChunk() { public void testToString() { Line line = new Line(); - TextElement tElement = new TextElement(0, 0, 0, 0, PDType1Font.HELVETICA_BOLD, 10, "test", 5); + TextElement tElement = new TextElement(0, 0, 0, 0, new PDType1Font(Standard14Fonts.FontName.HELVETICA_BOLD), 10, "test", 5); TextChunk tChunk = new TextChunk(tElement); line.addTextChunk(0, tChunk); line.addTextChunk(0, tChunk); diff --git a/src/test/java/technology/tabula/TestObjectExtractor.java b/src/test/java/technology/tabula/TestObjectExtractor.java index 9db7ad18..69864c61 100644 --- a/src/test/java/technology/tabula/TestObjectExtractor.java +++ b/src/test/java/technology/tabula/TestObjectExtractor.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.junit.Test; @@ -21,7 +22,7 @@ public void testWrongPasswordRaisesException() throws IOException { @Test(expected = IOException.class) public void testEmptyOnEncryptedFileRaisesException() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/encrypted.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { oe.extract().next(); } @@ -29,7 +30,7 @@ public void testEmptyOnEncryptedFileRaisesException() throws IOException { @Test public void testCanReadPDFWithOwnerEncryption() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { PageIterator pi = oe.extract(); int i = 0; @@ -44,7 +45,7 @@ public void testCanReadPDFWithOwnerEncryption() throws IOException { @Test public void testGoodPassword() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/encrypted.pdf"), "userpassword"); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/encrypted.pdf"), "userpassword"); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { List pages = new ArrayList<>(); PageIterator pi = oe.extract(); @@ -58,7 +59,7 @@ public void testGoodPassword() throws IOException { @Test public void testTextExtractionDoesNotRaise() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/rotated_page.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/rotated_page.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { PageIterator pi = oe.extract(); @@ -70,7 +71,7 @@ public void testTextExtractionDoesNotRaise() throws IOException { @Test public void testShouldDetectRulings() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/should_detect_rulings.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/should_detect_rulings.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { PageIterator pi = oe.extract(); @@ -85,7 +86,7 @@ public void testShouldDetectRulings() throws IOException { @Test public void testDontThrowNPEInShfill() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/labor.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/labor.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { PageIterator pi = oe.extract(); @@ -101,7 +102,7 @@ public void testDontThrowNPEInShfill() throws IOException { @Test public void testExtractOnePage() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); assertEquals(2, pdf_document.getNumberOfPages()); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { @@ -114,7 +115,7 @@ public void testExtractOnePage() throws IOException { @Test(expected = IndexOutOfBoundsException.class) public void testExtractWrongPageNumber() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/S2MNCEbirdisland.pdf")); assertEquals(2, pdf_document.getNumberOfPages()); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { @@ -124,7 +125,7 @@ public void testExtractWrongPageNumber() throws IOException { @Test public void testTextElementsContainedInPage() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/cs-en-us-pbms.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/cs-en-us-pbms.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { Page page = oe.extractPage(1); @@ -137,7 +138,7 @@ public void testTextElementsContainedInPage() throws IOException { } @Test public void testDoNotNPEInPointComparator() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/npe_issue_206.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/npe_issue_206.pdf")); try (ObjectExtractor oe = new ObjectExtractor(pdf_document)) { Page p = oe.extractPage(1); diff --git a/src/test/java/technology/tabula/TestProjectionProfile.java b/src/test/java/technology/tabula/TestProjectionProfile.java index e7af882f..e6d93b39 100644 --- a/src/test/java/technology/tabula/TestProjectionProfile.java +++ b/src/test/java/technology/tabula/TestProjectionProfile.java @@ -8,6 +8,7 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.font.PDType1Font; +import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import org.junit.Before; import org.junit.Test; @@ -20,9 +21,10 @@ public class TestProjectionProfile { public void setUpProjectionProfile() { PDPage pdPage = new PDPage(); PDDocument pdDocument = new PDDocument(); - - TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); - TextElement textElement2 = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "test", 1f); + + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + TextElement textElement = new TextElement(5f, 15f, 10f, 20f, font, 1f, "test", 1f); + TextElement textElement2 = new TextElement(5f, 15f, 10f, 20f, font, 1f, "test", 1f); List textList = new ArrayList<>(); textList.add(textElement); textList.add(textElement2); diff --git a/src/test/java/technology/tabula/TestTableDetection.java b/src/test/java/technology/tabula/TestTableDetection.java index 6e58f6a4..80d21350 100644 --- a/src/test/java/technology/tabula/TestTableDetection.java +++ b/src/test/java/technology/tabula/TestTableDetection.java @@ -11,6 +11,7 @@ import static org.junit.Assert.*; import com.google.gson.Gson; +import org.apache.pdfbox.Loader; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -162,7 +163,7 @@ public void testDetectionOfTables() throws Exception { NodeList tables = regionDocument.getElementsByTagName("table"); // tabula extractors - PDDocument pdfDocument = PDDocument.load(this.pdf); + PDDocument pdfDocument = Loader.loadPDF(this.pdf); ObjectExtractor extractor = new ObjectExtractor(pdfDocument); // parse expected tables from the ground truth dataset diff --git a/src/test/java/technology/tabula/TestTextElement.java b/src/test/java/technology/tabula/TestTextElement.java index feaaa5e6..3db1ca31 100644 --- a/src/test/java/technology/tabula/TestTextElement.java +++ b/src/test/java/technology/tabula/TestTextElement.java @@ -3,205 +3,208 @@ import java.util.ArrayList; import java.util.List; +import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.pdmodel.font.PDType1Font; +import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import org.junit.Assert; import org.junit.Test; public class TestTextElement { - - - @Test - public void createTextElement() { - - TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f); - - Assert.assertNotNull(textElement); - Assert.assertEquals("A", textElement.getText()); - Assert.assertEquals(1f, textElement.getFontSize(), 0); - Assert.assertEquals(15f, textElement.getLeft(), 0); - Assert.assertEquals(5f, textElement.getTop(), 0); - Assert.assertEquals(10f, textElement.getWidth(), 0); - Assert.assertEquals(20f, textElement.getHeight(), 0); - Assert.assertEquals(PDType1Font.HELVETICA, textElement.getFont()); - Assert.assertEquals(1f, textElement.getWidthOfSpace(), 0); - Assert.assertEquals(0f, textElement.getDirection(), 0); - - - } - - @Test - public void createTextElementWithDirection() { - - TextElement textElement = new TextElement(5f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f); - - Assert.assertNotNull(textElement); - Assert.assertEquals("A", textElement.getText()); - Assert.assertEquals(1f, textElement.getFontSize(), 0); - Assert.assertEquals(15f, textElement.getLeft(), 0); - Assert.assertEquals(5f, textElement.getTop(), 0); - Assert.assertEquals(10f, textElement.getWidth(), 0); - Assert.assertEquals(20f, textElement.getHeight(), 0); - Assert.assertEquals(PDType1Font.HELVETICA, textElement.getFont()); - Assert.assertEquals(1f, textElement.getWidthOfSpace(), 0); - Assert.assertEquals(6f, textElement.getDirection(), 0); - - - } - - @Test - public void mergeFourElementsIntoFourWords() { - - List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(20f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); - elements.add(new TextElement(40f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); - elements.add(new TextElement(60f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - - List words = TextElement.mergeWords(elements); - - List expectedWords = new ArrayList<>(); - expectedWords.add(new TextChunk(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f))); - expectedWords.add(new TextChunk(new TextElement(20f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f))); - expectedWords.add(new TextChunk(new TextElement(40f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f))); - expectedWords.add(new TextChunk(new TextElement(60f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f))); - - Assert.assertEquals(expectedWords, words); - - } - - @Test - public void mergeFourElementsIntoOneWord() { - - List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); - elements.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); - elements.add(new TextElement(0f, 45f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - - List words = TextElement.mergeWords(elements); - - List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - textChunk.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); - textChunk.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); - textChunk.add(new TextElement(0f, 45f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - expectedWords.add(textChunk); - - Assert.assertEquals(expectedWords, words); - - } - - @Test - public void mergeElementsShouldBeIdempotent() { - /* - * a bug in TextElement.merge_words would delete the first TextElement in the array - * it was called with. Discussion here: https://github.com/tabulapdf/tabula-java/issues/78 - */ - - List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); - elements.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); - elements.add(new TextElement(0f, 45f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - - List words = TextElement.mergeWords(elements); - List words2 = TextElement.mergeWords(elements); - Assert.assertEquals(words, words2); - } - - @Test - public void mergeElementsWithSkippingRules() { - - List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 17f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); - elements.add(new TextElement(0.001f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, " ", 1f, 6f)); - elements.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); - elements.add(new TextElement(0f, 45f, 10f, 20f, PDType1Font.TIMES_ROMAN, 10f, "D", 1f, 6f)); - - List words = TextElement.mergeWords(elements); - - List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - textChunk.add(new TextElement(0f, 25f, 10f, 20f, PDType1Font.HELVETICA, 1f, "B", 1f, 6f)); - textChunk.add(new TextElement(0f, 35f, 10f, 20f, PDType1Font.HELVETICA, 1f, "C", 1f, 6f)); - textChunk.add(new TextElement(0f, 45f, 10f, 20f, PDType1Font.TIMES_ROMAN, 10f, "D", 1f, 6f)); - expectedWords.add(textChunk); - - Assert.assertEquals(expectedWords, words); - - } - - @Test - public void mergeTenElementsIntoTwoWords() { - - List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); - elements.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - elements.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); - elements.add(new TextElement(0f, 30f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 60f, 10f, 20f, PDType1Font.HELVETICA, 1f, "M", 1f, 6f)); - elements.add(new TextElement(0f, 70f, 10f, 20f, PDType1Font.HELVETICA, 1f, "U", 1f, 6f)); - elements.add(new TextElement(0f, 80f, 10f, 20f, PDType1Font.HELVETICA, 1f, "N", 1f, 6f)); - elements.add(new TextElement(0f, 90f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - elements.add(new TextElement(0f, 100f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - - List words = TextElement.mergeWords(elements); - - List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); - textChunk.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - textChunk.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); - textChunk.add(new TextElement(0f, 30f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - textChunk.add(new TextElement(0f, 30f, 10.5f, 20f, PDType1Font.HELVETICA, 1f, " ", 1f)); //Check why width=10.5? - expectedWords.add(textChunk); - TextChunk textChunk2 = new TextChunk(new TextElement(0f, 60f, 10f, 20f, PDType1Font.HELVETICA, 1f, "M", 1f, 6f)); - textChunk2.add(new TextElement(0f, 70f, 10f, 20f, PDType1Font.HELVETICA, 1f, "U", 1f, 6f)); - textChunk2.add(new TextElement(0f, 80f, 10f, 20f, PDType1Font.HELVETICA, 1f, "N", 1f, 6f)); - textChunk2.add(new TextElement(0f, 90f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - textChunk2.add(new TextElement(0f, 100f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - expectedWords.add(textChunk2); - - Assert.assertEquals(2, words.size()); - Assert.assertEquals(expectedWords, words); - - } - - @Test - public void mergeTenElementsIntoTwoLines() { - - List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); - elements.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - elements.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); - elements.add(new TextElement(0f, 30f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - elements.add(new TextElement(20f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "M", 1f, 6f)); - elements.add(new TextElement(20f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "U", 1f, 6f)); - elements.add(new TextElement(20f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "N", 1f, 6f)); - elements.add(new TextElement(20f, 30f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - elements.add(new TextElement(20f, 40f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - - List words = TextElement.mergeWords(elements); - - List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "H", 1f, 6f)); - textChunk.add(new TextElement(0f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - textChunk.add(new TextElement(0f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "L", 1f, 6f)); - textChunk.add(new TextElement(0f, 30f, 10f, 20f, PDType1Font.HELVETICA, 1f, "A", 1f, 6f)); - expectedWords.add(textChunk); - TextChunk textChunk2 = new TextChunk(new TextElement(20f, 0f, 10f, 20f, PDType1Font.HELVETICA, 1f, "M", 1f, 6f)); - textChunk2.add(new TextElement(20f, 10f, 10f, 20f, PDType1Font.HELVETICA, 1f, "U", 1f, 6f)); - textChunk2.add(new TextElement(20f, 20f, 10f, 20f, PDType1Font.HELVETICA, 1f, "N", 1f, 6f)); - textChunk2.add(new TextElement(20f, 30f, 10f, 20f, PDType1Font.HELVETICA, 1f, "D", 1f, 6f)); - textChunk2.add(new TextElement(20f, 40f, 10f, 20f, PDType1Font.HELVETICA, 1f, "O", 1f, 6f)); - expectedWords.add(textChunk2); - - Assert.assertEquals(2, words.size()); - Assert.assertEquals(expectedWords, words); - - } - - + + + @Test + public void createTextElement() { + + TextElement textElement = new TextElement(5f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f); + + Assert.assertNotNull(textElement); + Assert.assertEquals("A", textElement.getText()); + Assert.assertEquals(1f, textElement.getFontSize(), 0); + Assert.assertEquals(15f, textElement.getLeft(), 0); + Assert.assertEquals(5f, textElement.getTop(), 0); + Assert.assertEquals(10f, textElement.getWidth(), 0); + Assert.assertEquals(20f, textElement.getHeight(), 0); + Assert.assertEquals(new PDType1Font(Standard14Fonts.FontName.HELVETICA), textElement.getFont()); + Assert.assertEquals(1f, textElement.getWidthOfSpace(), 0); + Assert.assertEquals(0f, textElement.getDirection(), 0); + + + } + + @Test + public void createTextElementWithDirection() { + + TextElement textElement = new TextElement(5f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f); + + Assert.assertNotNull(textElement); + Assert.assertEquals("A", textElement.getText()); + Assert.assertEquals(1f, textElement.getFontSize(), 0); + Assert.assertEquals(15f, textElement.getLeft(), 0); + Assert.assertEquals(5f, textElement.getTop(), 0); + Assert.assertEquals(10f, textElement.getWidth(), 0); + Assert.assertEquals(20f, textElement.getHeight(), 0); + Assert.assertEquals(new PDType1Font(Standard14Fonts.FontName.HELVETICA), textElement.getFont()); + Assert.assertEquals(1f, textElement.getWidthOfSpace(), 0); + Assert.assertEquals(6f, textElement.getDirection(), 0); + + + } + + @Test + public void mergeFourElementsIntoFourWords() { + + List elements = new ArrayList<>(); + elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + elements.add(new TextElement(20f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); + elements.add(new TextElement(40f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + elements.add(new TextElement(60f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + + List words = TextElement.mergeWords(elements); + + List expectedWords = new ArrayList<>(); + expectedWords.add(new TextChunk(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(20f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(40f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(60f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f))); + + Assert.assertEquals(expectedWords, words); + + } + + @Test + public void mergeFourElementsIntoOneWord() { + + List elements = new ArrayList<>(); + elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); + elements.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + elements.add(new TextElement(0f, 45f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + + List words = TextElement.mergeWords(elements); + + List expectedWords = new ArrayList<>(); + TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + textChunk.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); + textChunk.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + textChunk.add(new TextElement(0f, 45f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + expectedWords.add(textChunk); + + Assert.assertEquals(expectedWords, words); + + } + + @Test + public void mergeElementsShouldBeIdempotent() { + /* + * a bug in TextElement.merge_words would delete the first TextElement in the array + * it was called with. Discussion here: https://github.com/tabulapdf/tabula-java/issues/78 + */ + + List elements = new ArrayList<>(); + elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); + elements.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + elements.add(new TextElement(0f, 45f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + + List words = TextElement.mergeWords(elements); + List words2 = TextElement.mergeWords(elements); + Assert.assertEquals(words, words2); + } + + @Test + public void mergeElementsWithSkippingRules() { + + List elements = new ArrayList<>(); + elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 17f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); + elements.add(new TextElement(0.001f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, " ", 1f, 6f)); + elements.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + PDFont TIMES_ROMAN = new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN); + elements.add(new TextElement(0f, 45f, 10f, 20f, TIMES_ROMAN, 10f, "D", 1f, 6f)); + + List words = TextElement.mergeWords(elements); + + List expectedWords = new ArrayList<>(); + TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + textChunk.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); + textChunk.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + textChunk.add(new TextElement(0f, 45f, 10f, 20f, TIMES_ROMAN, 10f, "D", 1f, 6f)); + expectedWords.add(textChunk); + + Assert.assertEquals(expectedWords, words); + + } + + @Test + public void mergeTenElementsIntoTwoWords() { + + List elements = new ArrayList<>(); + elements.add(new TextElement(0f, 0f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "H", 1f, 6f)); + elements.add(new TextElement(0f, 10f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); + elements.add(new TextElement(0f, 20f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "L", 1f, 6f)); + elements.add(new TextElement(0f, 30f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 60f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "M", 1f, 6f)); + elements.add(new TextElement(0f, 70f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "U", 1f, 6f)); + elements.add(new TextElement(0f, 80f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "N", 1f, 6f)); + elements.add(new TextElement(0f, 90f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + elements.add(new TextElement(0f, 100f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); + + List words = TextElement.mergeWords(elements); + + List expectedWords = new ArrayList<>(); + TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "H", 1f, 6f)); + textChunk.add(new TextElement(0f, 10f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); + textChunk.add(new TextElement(0f, 20f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "L", 1f, 6f)); + textChunk.add(new TextElement(0f, 30f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); + textChunk.add(new TextElement(0f, 30f, 10.5f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, " ", 1f)); //Check why width=10.5? + expectedWords.add(textChunk); + TextChunk textChunk2 = new TextChunk(new TextElement(0f, 60f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "M", 1f, 6f)); + textChunk2.add(new TextElement(0f, 70f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "U", 1f, 6f)); + textChunk2.add(new TextElement(0f, 80f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "N", 1f, 6f)); + textChunk2.add(new TextElement(0f, 90f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + textChunk2.add(new TextElement(0f, 100f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); + expectedWords.add(textChunk2); + + Assert.assertEquals(2, words.size()); + Assert.assertEquals(expectedWords, words); + + } + + @Test + public void mergeTenElementsIntoTwoLines() { + + List elements = new ArrayList<>(); + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + elements.add(new TextElement(0f, 0f, 10f, 20f, font, 1f, "H", 1f, 6f)); + elements.add(new TextElement(0f, 10f, 10f, 20f, font, 1f, "O", 1f, 6f)); + elements.add(new TextElement(0f, 20f, 10f, 20f, font, 1f, "L", 1f, 6f)); + elements.add(new TextElement(0f, 30f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(20f, 0f, 10f, 20f, font, 1f, "M", 1f, 6f)); + elements.add(new TextElement(20f, 10f, 10f, 20f, font, 1f, "U", 1f, 6f)); + elements.add(new TextElement(20f, 20f, 10f, 20f, font, 1f, "N", 1f, 6f)); + elements.add(new TextElement(20f, 30f, 10f, 20f, font, 1f, "D", 1f, 6f)); + elements.add(new TextElement(20f, 40f, 10f, 20f, font, 1f, "O", 1f, 6f)); + + List words = TextElement.mergeWords(elements); + + List expectedWords = new ArrayList<>(); + TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, font, 1f, "H", 1f, 6f)); + textChunk.add(new TextElement(0f, 10f, 10f, 20f, font, 1f, "O", 1f, 6f)); + textChunk.add(new TextElement(0f, 20f, 10f, 20f, font, 1f, "L", 1f, 6f)); + textChunk.add(new TextElement(0f, 30f, 10f, 20f, font, 1f, "A", 1f, 6f)); + expectedWords.add(textChunk); + TextChunk textChunk2 = new TextChunk(new TextElement(20f, 0f, 10f, 20f, font, 1f, "M", 1f, 6f)); + textChunk2.add(new TextElement(20f, 10f, 10f, 20f, font, 1f, "U", 1f, 6f)); + textChunk2.add(new TextElement(20f, 20f, 10f, 20f, font, 1f, "N", 1f, 6f)); + textChunk2.add(new TextElement(20f, 30f, 10f, 20f, font, 1f, "D", 1f, 6f)); + textChunk2.add(new TextElement(20f, 40f, 10f, 20f, font, 1f, "O", 1f, 6f)); + expectedWords.add(textChunk2); + + Assert.assertEquals(2, words.size()); + Assert.assertEquals(expectedWords, words); + + } + } diff --git a/src/test/java/technology/tabula/TestUtils.java b/src/test/java/technology/tabula/TestUtils.java index e68411df..cb85cb7b 100644 --- a/src/test/java/technology/tabula/TestUtils.java +++ b/src/test/java/technology/tabula/TestUtils.java @@ -12,6 +12,7 @@ import java.util.Collections; import java.util.List; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.rendering.ImageType; import org.apache.commons.cli.ParseException; import org.apache.pdfbox.pdmodel.PDDocument; @@ -122,7 +123,7 @@ public void testQuickSortLongList() { @Test public void testJPEG2000DoesNotRaise() throws IOException { - PDDocument pdf_document = PDDocument.load(new File("src/test/resources/technology/tabula/jpeg2000.pdf")); + PDDocument pdf_document = Loader.loadPDF(new File("src/test/resources/technology/tabula/jpeg2000.pdf")); PDPage page = pdf_document.getPage(0); Utils.pageConvertToImage(pdf_document, page, 360, ImageType.RGB); } diff --git a/src/test/java/technology/tabula/UtilsForTesting.java b/src/test/java/technology/tabula/UtilsForTesting.java index 3ee8efde..8d3c91cf 100644 --- a/src/test/java/technology/tabula/UtilsForTesting.java +++ b/src/test/java/technology/tabula/UtilsForTesting.java @@ -7,6 +7,7 @@ import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVPrinter; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.junit.Assert; @@ -23,11 +24,9 @@ public static Page getAreaFromPage(String path, int page, float top, float left, public static Page getPage(String path, int pageNumber) throws IOException { ObjectExtractor oe = null; try { - PDDocument document = PDDocument - .load(new File(path)); + PDDocument document = Loader.loadPDF(new File(path)); oe = new ObjectExtractor(document); - Page page = oe.extract(pageNumber); - return page; + return oe.extract(pageNumber); } finally { if (oe != null) oe.close(); From d0241fb5ff9182d7980c3ccd572cc8bb2dba9357 Mon Sep 17 00:00:00 2001 From: young Date: Wed, 6 Mar 2024 14:59:35 +0800 Subject: [PATCH 221/245] remove useless variable --- .../tabula/detectors/SpreadsheetDetectionAlgorithm.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java index 243cc3bf..43136ba5 100644 --- a/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/SpreadsheetDetectionAlgorithm.java @@ -20,8 +20,6 @@ public class SpreadsheetDetectionAlgorithm implements DetectionAlgorithm { public List detect(Page page) { List cells = SpreadsheetExtractionAlgorithm.findCells(page.getHorizontalRulings(), page.getVerticalRulings()); - SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm(); - List tables = SpreadsheetExtractionAlgorithm.findSpreadsheetsFromCells(cells); // we want tables to be returned from top to bottom on the page From 63de16a4e102b44ea370919625221561dc783e75 Mon Sep 17 00:00:00 2001 From: young Date: Thu, 11 Apr 2024 14:09:16 +0800 Subject: [PATCH 222/245] exclude junit-jupiter from pdfbox --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 6c71b426..f60528d0 100644 --- a/pom.xml +++ b/pom.xml @@ -263,6 +263,12 @@ org.apache.pdfbox pdfbox 3.0.1 + + + org.junit.jupiter + junit-jupiter + + From e0ee0728ca398023ab67f59626a55525de0355b0 Mon Sep 17 00:00:00 2001 From: young Date: Thu, 11 Apr 2024 14:31:10 +0800 Subject: [PATCH 223/245] update pdfbox to 3.0.2 --- pom.xml | 341 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 168 insertions(+), 173 deletions(-) diff --git a/pom.xml b/pom.xml index f60528d0..52943fbf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 technology.tabula tabula @@ -33,16 +34,16 @@ - - snapshots - https://repository.apache.org/content/repositories/snapshots/ - - false - - - true - - + + snapshots + https://repository.apache.org/content/repositories/snapshots/ + + false + + + true + + @@ -109,20 +110,20 @@ - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.1 - - 8 - - - - attach-javadocs - - jar - - - + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.1 + + 8 + + + + attach-javadocs + + jar + + + org.apache.maven.plugins @@ -159,172 +160,166 @@ technology.tabula.CommandLineApp - - - jar-with-dependencies - + + + jar-with-dependencies + - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - -Xms1024m -Xmx2048m - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 - - true - true - - - - - - - - release - - + org.apache.maven.plugins - maven-javadoc-plugin - 3.3.1 + maven-surefire-plugin + 2.22.2 - 8 + + -Xms1024m -Xmx2048m - - - attach-javadocs - - jar - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.10 + + true + true + + + + + + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.1 + + 8 + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + - - - org.locationtech.jts - jts-core - 1.18.1 - + + + org.locationtech.jts + jts-core + 1.18.1 + - - org.slf4j - slf4j-api - 1.7.35 - + + org.slf4j + slf4j-api + 1.7.35 + - - org.slf4j - slf4j-simple - 1.7.32 - + + org.slf4j + slf4j-simple + 1.7.32 + - - org.apache.pdfbox - pdfbox - 3.0.1 - - - org.junit.jupiter - junit-jupiter - - - + + org.apache.pdfbox + pdfbox + 3.0.2 + - - org.bouncycastle - bcprov-jdk15on - 1.70 - + + org.bouncycastle + bcprov-jdk15on + 1.70 + - - org.bouncycastle - bcmail-jdk15on - 1.70 - + + org.bouncycastle + bcmail-jdk15on + 1.70 + - - junit - junit - 4.13.2 - test - + + junit + junit + 4.13.2 + test + - - commons-cli - commons-cli - 1.4 - + + commons-cli + commons-cli + 1.4 + - - org.apache.commons - commons-csv - 1.9.0 - + + org.apache.commons + commons-csv + 1.9.0 + - - com.google.code.gson - gson - 2.9.0 - + + com.google.code.gson + gson + 2.9.0 + - - com.github.jai-imageio - jai-imageio-core - 1.4.0 - + + com.github.jai-imageio + jai-imageio-core + 1.4.0 + - - com.github.jai-imageio - jai-imageio-jpeg2000 - 1.4.0 - + + com.github.jai-imageio + jai-imageio-jpeg2000 + 1.4.0 + - - org.apache.pdfbox - jbig2-imageio - 3.0.4 - - + + org.apache.pdfbox + jbig2-imageio + 3.0.4 + + From 20b1053a24402a1e3a587ee90211661027d66484 Mon Sep 17 00:00:00 2001 From: young Date: Mon, 29 Apr 2024 17:40:46 +0800 Subject: [PATCH 224/245] fix: oom for removeText --- .../detectors/NurminenDetectionAlgorithm.java | 86 ++++++++++++------- .../technology/tabula/TestTableDetection.java | 53 ++++++------ 2 files changed, 79 insertions(+), 60 deletions(-) diff --git a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java index 9a377854..86639f66 100644 --- a/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java +++ b/src/main/java/technology/tabula/detectors/NurminenDetectionAlgorithm.java @@ -1,14 +1,8 @@ package technology.tabula.detectors; -import java.awt.geom.Line2D; -import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; -import java.awt.image.Raster; -import java.io.IOException; -import java.io.OutputStream; -import java.util.*; - +import org.apache.pdfbox.contentstream.PDContentStream; import org.apache.pdfbox.contentstream.operator.Operator; +import org.apache.pdfbox.contentstream.operator.OperatorName; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdfparser.PDFStreamParser; import org.apache.pdfbox.pdfwriter.ContentStreamWriter; @@ -16,16 +10,17 @@ import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDStream; import org.apache.pdfbox.rendering.ImageType; - -import technology.tabula.Line; -import technology.tabula.Page; -import technology.tabula.Rectangle; -import technology.tabula.Ruling; -import technology.tabula.TextChunk; -import technology.tabula.TextElement; -import technology.tabula.Utils; +import technology.tabula.*; import technology.tabula.extractors.SpreadsheetExtractionAlgorithm; +import java.awt.geom.Line2D; +import java.awt.geom.Point2D; +import java.awt.image.BufferedImage; +import java.awt.image.Raster; +import java.io.IOException; +import java.io.OutputStream; +import java.util.*; + /** * Created by matt on 2015-12-17. *

@@ -799,25 +794,10 @@ private List getVerticalRulings(BufferedImage image) { return verticalRulings; } - - // taken from http://www.docjar.com/html/api/org/apache/pdfbox/examples/util/RemoveAllText.java.html private PDDocument removeText(PDPage page) throws IOException { PDFStreamParser parser = new PDFStreamParser(page); parser.parse(); - List newTokens = new ArrayList<>(); - while (page.hasContents()) { - Object token = parser.parseNextToken(); - if (token instanceof Operator) { - Operator op = (Operator) token; - if ("TJ".equals(op.getName()) || "Tj".equals(op.getName())) { - //remove the one argument to this operator - newTokens.remove(newTokens.size() - 1); - continue; - } - } - newTokens.add(token); - } PDDocument document = new PDDocument(); PDPage newPage = document.importPage(page); @@ -826,9 +806,51 @@ private PDDocument removeText(PDPage page) throws IOException { PDStream newContents = new PDStream(document); OutputStream out = newContents.createOutputStream(COSName.FLATE_DECODE); ContentStreamWriter writer = new ContentStreamWriter(out); - writer.writeTokens(newTokens); + List tokensWithoutText = createTokensWithoutText(page); + writer.writeTokens(tokensWithoutText); out.close(); newPage.setContents(newContents); return document; } + + + /** + * @param contentStream contentStream + * @return newTokens + * @throws IOException When parseNextToken on Error + * @see ... + */ + private static List createTokensWithoutText(PDContentStream contentStream) throws IOException { + PDFStreamParser parser = new PDFStreamParser(contentStream); + Object token = parser.parseNextToken(); + List newTokens = new ArrayList<>(); + while (token != null) { + if (token instanceof Operator) { + Operator op = (Operator) token; + String opName = op.getName(); + if (OperatorName.SHOW_TEXT_ADJUSTED.equals(opName) + || OperatorName.SHOW_TEXT.equals(opName) + || OperatorName.SHOW_TEXT_LINE.equals(opName)) { + // remove the argument to this operator + newTokens.remove(newTokens.size() - 1); + + token = parser.parseNextToken(); + continue; + } else if (OperatorName.SHOW_TEXT_LINE_AND_SPACE.equals(opName)) { + // remove the 3 arguments to this operator + newTokens.remove(newTokens.size() - 1); + newTokens.remove(newTokens.size() - 1); + newTokens.remove(newTokens.size() - 1); + + token = parser.parseNextToken(); + continue; + } + } + newTokens.add(token); + token = parser.parseNextToken(); + } + return newTokens; + } + + } diff --git a/src/test/java/technology/tabula/TestTableDetection.java b/src/test/java/technology/tabula/TestTableDetection.java index 80d21350..c13ff201 100644 --- a/src/test/java/technology/tabula/TestTableDetection.java +++ b/src/test/java/technology/tabula/TestTableDetection.java @@ -1,29 +1,29 @@ package technology.tabula; -import java.io.File; -import java.io.FileWriter; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static org.junit.Assert.*; - import com.google.gson.Gson; import org.apache.pdfbox.Loader; +import org.apache.pdfbox.pdmodel.PDDocument; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.w3c.dom.*; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import technology.tabula.detectors.NurminenDetectionAlgorithm; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.apache.pdfbox.pdmodel.PDDocument; -import technology.tabula.detectors.NurminenDetectionAlgorithm; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Created by matt on 2015-12-14. @@ -111,15 +111,10 @@ public static Collection data() { String directoryName = "src/test/resources/technology/tabula/icdar2013-dataset/competition-dataset-" + regionCode + "/"; File dir = new File(directoryName); - File[] pdfs = dir.listFiles(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.toLowerCase().endsWith(".pdf"); - } - }); + File[] pdfs = dir.listFiles((dir1, name) -> name.toLowerCase().endsWith(".pdf")); for (File pdf : pdfs) { - data.add(new Object[] {pdf}); + data.add(new Object[]{pdf}); } } @@ -163,6 +158,8 @@ public void testDetectionOfTables() throws Exception { NodeList tables = regionDocument.getElementsByTagName("table"); // tabula extractors + + PDDocument pdfDocument = Loader.loadPDF(this.pdf); ObjectExtractor extractor = new ObjectExtractor(pdfDocument); @@ -171,7 +168,7 @@ public void testDetectionOfTables() throws Exception { int numExpectedTables = 0; - for (int i=0; i tablesOnPage = detectionAlgorithm.detect(page); - if (tablesOnPage.size() > 0) { - detectedTables.put(new Integer(page.getPageNumber()), tablesOnPage); + if (!tablesOnPage.isEmpty()) { + detectedTables.put(page.getPageNumber(), tablesOnPage); } } @@ -267,7 +264,7 @@ public void testDetectionOfTables() throws Exception { System.out.println(totalErroneouslyDetectedTables + " tables incorrectly detected"); - if(this.status.isFirstRun()) { + if (this.status.isFirstRun()) { // make the baseline this.status.expectedFailure = failed; this.status.numCorrectlyDetectedTables = this.numCorrectlyDetectedTables; @@ -293,14 +290,14 @@ private List comparePages(Integer page, List detected, List detectedIterator = detected.iterator(); detectedIterator.hasNext();) { + for (Iterator detectedIterator = detected.iterator(); detectedIterator.hasNext(); ) { Rectangle detectedTable = detectedIterator.next(); - for (int i=0; i Date: Mon, 29 Apr 2024 17:51:40 +0800 Subject: [PATCH 225/245] fix: unit test --- .../technology/tabula/TestTextElement.java | 109 +++++++++--------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/src/test/java/technology/tabula/TestTextElement.java b/src/test/java/technology/tabula/TestTextElement.java index 3db1ca31..ee0fbf3d 100644 --- a/src/test/java/technology/tabula/TestTextElement.java +++ b/src/test/java/technology/tabula/TestTextElement.java @@ -1,14 +1,14 @@ package technology.tabula; -import java.util.ArrayList; -import java.util.List; - import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + public class TestTextElement { @@ -24,7 +24,7 @@ public void createTextElement() { Assert.assertEquals(5f, textElement.getTop(), 0); Assert.assertEquals(10f, textElement.getWidth(), 0); Assert.assertEquals(20f, textElement.getHeight(), 0); - Assert.assertEquals(new PDType1Font(Standard14Fonts.FontName.HELVETICA), textElement.getFont()); + Assert.assertEquals(Standard14Fonts.FontName.HELVETICA.getName(), textElement.getFont().getName()); Assert.assertEquals(1f, textElement.getWidthOfSpace(), 0); Assert.assertEquals(0f, textElement.getDirection(), 0); @@ -43,7 +43,7 @@ public void createTextElementWithDirection() { Assert.assertEquals(5f, textElement.getTop(), 0); Assert.assertEquals(10f, textElement.getWidth(), 0); Assert.assertEquals(20f, textElement.getHeight(), 0); - Assert.assertEquals(new PDType1Font(Standard14Fonts.FontName.HELVETICA), textElement.getFont()); + Assert.assertEquals(Standard14Fonts.FontName.HELVETICA.getName(), textElement.getFont().getName()); Assert.assertEquals(1f, textElement.getWidthOfSpace(), 0); Assert.assertEquals(6f, textElement.getDirection(), 0); @@ -54,18 +54,19 @@ public void createTextElementWithDirection() { public void mergeFourElementsIntoFourWords() { List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - elements.add(new TextElement(20f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); - elements.add(new TextElement(40f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); - elements.add(new TextElement(60f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + elements.add(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(20f, 15f, 10f, 20f, font, 1f, "B", 1f, 6f)); + elements.add(new TextElement(40f, 15f, 10f, 20f, font, 1f, "C", 1f, 6f)); + elements.add(new TextElement(60f, 15f, 10f, 20f, font, 1f, "D", 1f, 6f)); List words = TextElement.mergeWords(elements); List expectedWords = new ArrayList<>(); - expectedWords.add(new TextChunk(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f))); - expectedWords.add(new TextChunk(new TextElement(20f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f))); - expectedWords.add(new TextChunk(new TextElement(40f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f))); - expectedWords.add(new TextChunk(new TextElement(60f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(20f, 15f, 10f, 20f, font, 1f, "B", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(40f, 15f, 10f, 20f, font, 1f, "C", 1f, 6f))); + expectedWords.add(new TextChunk(new TextElement(60f, 15f, 10f, 20f, font, 1f, "D", 1f, 6f))); Assert.assertEquals(expectedWords, words); @@ -75,18 +76,19 @@ public void mergeFourElementsIntoFourWords() { public void mergeFourElementsIntoOneWord() { List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); - elements.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); - elements.add(new TextElement(0f, 45f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + elements.add(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 25f, 10f, 20f, font, 1f, "B", 1f, 6f)); + elements.add(new TextElement(0f, 35f, 10f, 20f, font, 1f, "C", 1f, 6f)); + elements.add(new TextElement(0f, 45f, 10f, 20f, font, 1f, "D", 1f, 6f)); List words = TextElement.mergeWords(elements); List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - textChunk.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); - textChunk.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); - textChunk.add(new TextElement(0f, 45f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f)); + textChunk.add(new TextElement(0f, 25f, 10f, 20f, font, 1f, "B", 1f, 6f)); + textChunk.add(new TextElement(0f, 35f, 10f, 20f, font, 1f, "C", 1f, 6f)); + textChunk.add(new TextElement(0f, 45f, 10f, 20f, font, 1f, "D", 1f, 6f)); expectedWords.add(textChunk); Assert.assertEquals(expectedWords, words); @@ -101,10 +103,11 @@ public void mergeElementsShouldBeIdempotent() { */ List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); - elements.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); - elements.add(new TextElement(0f, 45f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + elements.add(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 25f, 10f, 20f, font, 1f, "B", 1f, 6f)); + elements.add(new TextElement(0f, 35f, 10f, 20f, font, 1f, "C", 1f, 6f)); + elements.add(new TextElement(0f, 45f, 10f, 20f, font, 1f, "D", 1f, 6f)); List words = TextElement.mergeWords(elements); List words2 = TextElement.mergeWords(elements); @@ -115,20 +118,21 @@ public void mergeElementsShouldBeIdempotent() { public void mergeElementsWithSkippingRules() { List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 17f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); - elements.add(new TextElement(0.001f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, " ", 1f, 6f)); - elements.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + elements.add(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 17f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 25f, 10f, 20f, font, 1f, "B", 1f, 6f)); + elements.add(new TextElement(0.001f, 25f, 10f, 20f, font, 1f, " ", 1f, 6f)); + elements.add(new TextElement(0f, 35f, 10f, 20f, font, 1f, "C", 1f, 6f)); PDFont TIMES_ROMAN = new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN); elements.add(new TextElement(0f, 45f, 10f, 20f, TIMES_ROMAN, 10f, "D", 1f, 6f)); List words = TextElement.mergeWords(elements); List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - textChunk.add(new TextElement(0f, 25f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "B", 1f, 6f)); - textChunk.add(new TextElement(0f, 35f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "C", 1f, 6f)); + TextChunk textChunk = new TextChunk(new TextElement(0f, 15f, 10f, 20f, font, 1f, "A", 1f, 6f)); + textChunk.add(new TextElement(0f, 25f, 10f, 20f, font, 1f, "B", 1f, 6f)); + textChunk.add(new TextElement(0f, 35f, 10f, 20f, font, 1f, "C", 1f, 6f)); textChunk.add(new TextElement(0f, 45f, 10f, 20f, TIMES_ROMAN, 10f, "D", 1f, 6f)); expectedWords.add(textChunk); @@ -140,30 +144,31 @@ public void mergeElementsWithSkippingRules() { public void mergeTenElementsIntoTwoWords() { List elements = new ArrayList<>(); - elements.add(new TextElement(0f, 0f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "H", 1f, 6f)); - elements.add(new TextElement(0f, 10f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); - elements.add(new TextElement(0f, 20f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "L", 1f, 6f)); - elements.add(new TextElement(0f, 30f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - elements.add(new TextElement(0f, 60f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "M", 1f, 6f)); - elements.add(new TextElement(0f, 70f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "U", 1f, 6f)); - elements.add(new TextElement(0f, 80f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "N", 1f, 6f)); - elements.add(new TextElement(0f, 90f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); - elements.add(new TextElement(0f, 100f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + elements.add(new TextElement(0f, 0f, 10f, 20f, font, 1f, "H", 1f, 6f)); + elements.add(new TextElement(0f, 10f, 10f, 20f, font, 1f, "O", 1f, 6f)); + elements.add(new TextElement(0f, 20f, 10f, 20f, font, 1f, "L", 1f, 6f)); + elements.add(new TextElement(0f, 30f, 10f, 20f, font, 1f, "A", 1f, 6f)); + elements.add(new TextElement(0f, 60f, 10f, 20f, font, 1f, "M", 1f, 6f)); + elements.add(new TextElement(0f, 70f, 10f, 20f, font, 1f, "U", 1f, 6f)); + elements.add(new TextElement(0f, 80f, 10f, 20f, font, 1f, "N", 1f, 6f)); + elements.add(new TextElement(0f, 90f, 10f, 20f, font, 1f, "D", 1f, 6f)); + elements.add(new TextElement(0f, 100f, 10f, 20f, font, 1f, "O", 1f, 6f)); List words = TextElement.mergeWords(elements); List expectedWords = new ArrayList<>(); - TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "H", 1f, 6f)); - textChunk.add(new TextElement(0f, 10f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); - textChunk.add(new TextElement(0f, 20f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "L", 1f, 6f)); - textChunk.add(new TextElement(0f, 30f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "A", 1f, 6f)); - textChunk.add(new TextElement(0f, 30f, 10.5f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, " ", 1f)); //Check why width=10.5? + TextChunk textChunk = new TextChunk(new TextElement(0f, 0f, 10f, 20f, font, 1f, "H", 1f, 6f)); + textChunk.add(new TextElement(0f, 10f, 10f, 20f, font, 1f, "O", 1f, 6f)); + textChunk.add(new TextElement(0f, 20f, 10f, 20f, font, 1f, "L", 1f, 6f)); + textChunk.add(new TextElement(0f, 30f, 10f, 20f, font, 1f, "A", 1f, 6f)); + textChunk.add(new TextElement(0f, 30f, 10.5f, 20f, font, 1f, " ", 1f)); //Check why width=10.5? expectedWords.add(textChunk); - TextChunk textChunk2 = new TextChunk(new TextElement(0f, 60f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "M", 1f, 6f)); - textChunk2.add(new TextElement(0f, 70f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "U", 1f, 6f)); - textChunk2.add(new TextElement(0f, 80f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "N", 1f, 6f)); - textChunk2.add(new TextElement(0f, 90f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "D", 1f, 6f)); - textChunk2.add(new TextElement(0f, 100f, 10f, 20f, new PDType1Font(Standard14Fonts.FontName.HELVETICA), 1f, "O", 1f, 6f)); + TextChunk textChunk2 = new TextChunk(new TextElement(0f, 60f, 10f, 20f, font, 1f, "M", 1f, 6f)); + textChunk2.add(new TextElement(0f, 70f, 10f, 20f, font, 1f, "U", 1f, 6f)); + textChunk2.add(new TextElement(0f, 80f, 10f, 20f, font, 1f, "N", 1f, 6f)); + textChunk2.add(new TextElement(0f, 90f, 10f, 20f, font, 1f, "D", 1f, 6f)); + textChunk2.add(new TextElement(0f, 100f, 10f, 20f, font, 1f, "O", 1f, 6f)); expectedWords.add(textChunk2); Assert.assertEquals(2, words.size()); From 6d59cddd5e4523d74aa03739be5992d35372fdd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 21:12:28 +0000 Subject: [PATCH 226/245] Bump maven-compiler-plugin from 3.8.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52943fbf..b3344e12 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 From 2bdeb954675cb2ad05431210d3f06db74a490fe9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:29:09 +0000 Subject: [PATCH 227/245] Bump org.apache.maven.plugins:maven-gpg-plugin from 1.6 to 3.2.4 Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 1.6 to 3.2.4. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-1.6...maven-gpg-plugin-3.2.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b3344e12..7f30e7a4 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.4 sign-artifacts @@ -225,7 +225,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.4 sign-artifacts From c831cf6ac36c5315b96ff6a49212bb67908ce48e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:28:58 +0000 Subject: [PATCH 228/245] Bump commons-cli:commons-cli from 1.4 to 1.8.0 Bumps commons-cli:commons-cli from 1.4 to 1.8.0. --- updated-dependencies: - dependency-name: commons-cli:commons-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f30e7a4..eb362e89 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ commons-cli commons-cli - 1.4 + 1.8.0 From 9dc64f867a01e69e6e929feaa5a909c02b9bd3e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:28:56 +0000 Subject: [PATCH 229/245] Bump org.slf4j:slf4j-api from 1.7.35 to 2.0.13 Bumps org.slf4j:slf4j-api from 1.7.35 to 2.0.13. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb362e89..adf29ce5 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,7 @@ org.slf4j slf4j-api - 1.7.35 + 2.0.13 From 3f7445380ec4f48dfc545dd6d33e89d4c501af55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:28:55 +0000 Subject: [PATCH 230/245] Bump org.slf4j:slf4j-simple from 1.7.32 to 2.0.13 Bumps org.slf4j:slf4j-simple from 1.7.32 to 2.0.13. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adf29ce5..8e0736c4 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ org.slf4j slf4j-simple - 1.7.32 + 2.0.13 From 2ef079f2a14dc6d66c68c5ce8d03853eea7436f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 21:32:54 +0000 Subject: [PATCH 231/245] Bump jts-core from 1.18.1 to 1.19.0 Bumps jts-core from 1.18.1 to 1.19.0. --- updated-dependencies: - dependency-name: org.locationtech.jts:jts-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e0736c4..19bf0133 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.locationtech.jts jts-core - 1.18.1 + 1.19.0 From c1e4e326eddc1a2dfe59febf24a569d11bde5cfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 21:59:29 +0000 Subject: [PATCH 232/245] Bump maven-javadoc-plugin from 3.3.1 to 3.5.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 19bf0133..749fa0b7 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.5.0 true @@ -110,20 +110,20 @@ - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.1 - - 8 - - - - attach-javadocs - - jar - - - + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + 8 + + + + attach-javadocs + + jar + + + org.apache.maven.plugins From 5761334b86f58723e761b4941f2950d7b6e53d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:29:03 +0000 Subject: [PATCH 233/245] Bump org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.8 to 1.7.0 Bumps org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.8 to 1.7.0. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 749fa0b7..6a66162f 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.7.0 true ossrh From ab7c4bd54bd20ca03c2bfad400c5cc6c26e34d59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:28:53 +0000 Subject: [PATCH 234/245] Bump org.apache.maven.plugins:maven-source-plugin from 3.2.1 to 3.3.1 Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.1. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6a66162f..77cda400 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources @@ -212,7 +212,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources From ebe8e30dedfd6f7553046bbe6bbd3640b121d3dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:36:59 +0000 Subject: [PATCH 235/245] Bump org.apache.commons:commons-csv from 1.9.0 to 1.11.0 Bumps [org.apache.commons:commons-csv](https://github.com/apache/commons-csv) from 1.9.0 to 1.11.0. - [Changelog](https://github.com/apache/commons-csv/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-csv/compare/rel/commons-csv-1.9.0...rel/commons-csv-1.11.0) --- updated-dependencies: - dependency-name: org.apache.commons:commons-csv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77cda400..a45e6089 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ org.apache.commons commons-csv - 1.9.0 + 1.11.0 From db3f6dfd74801c824efd2a25dc26b4a3cb8d7922 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:36:45 +0000 Subject: [PATCH 236/245] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.13.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a45e6089..b73d8b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ maven-compiler-plugin - 3.11.0 + 3.13.0 1.8 1.8 From fd3a32c579f672ba17c5f1231985e980c4e3ec4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:36:48 +0000 Subject: [PATCH 237/245] Bump com.google.code.gson:gson from 2.9.0 to 2.11.0 Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.9.0 to 2.11.0. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.9.0...gson-parent-2.11.0) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b73d8b1e..394ea68f 100644 --- a/pom.xml +++ b/pom.xml @@ -300,7 +300,7 @@ com.google.code.gson gson - 2.9.0 + 2.11.0 From 097559d0a185ca1dda25d7b7ff103e884848c70c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:36:52 +0000 Subject: [PATCH 238/245] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.3.1 to 3.7.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.7.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 394ea68f..a4871012 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.7.0 true @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.7.0 8 @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.7.0 8 From bde6d765cfab25d53ff885de33a4556fc41bb9d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:36:55 +0000 Subject: [PATCH 239/245] Bump org.apache.maven.plugins:maven-surefire-plugin from 2.22.2 to 3.3.1 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.2...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4871012..8fd27509 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.3.1 -Xms1024m -Xmx2048m From 0c73e698b979a74cac0e917718b2c5dfd098dacc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:03:37 +0000 Subject: [PATCH 240/245] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.7.0 to 3.8.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.7.0...maven-javadoc-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8fd27509..d0b40101 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 true @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 8 @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 8 From 818c9a2f5a5ea8dc72d3efa775f192381e84b8c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 21:53:01 +0000 Subject: [PATCH 241/245] Bump org.apache.pdfbox:pdfbox from 3.0.2 to 3.0.3 Bumps org.apache.pdfbox:pdfbox from 3.0.2 to 3.0.3. --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0b40101..a963e35a 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ org.apache.pdfbox pdfbox - 3.0.2 + 3.0.3 From 5d91f1d733c4895d31854a641c152220f8c5f341 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 21:39:59 +0000 Subject: [PATCH 242/245] Bump org.locationtech.jts:jts-core from 1.19.0 to 1.20.0 Bumps org.locationtech.jts:jts-core from 1.19.0 to 1.20.0. --- updated-dependencies: - dependency-name: org.locationtech.jts:jts-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a963e35a..49057e90 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.locationtech.jts jts-core - 1.19.0 + 1.20.0 From 971ae765e84f09ed83f5808b66f764590146e923 Mon Sep 17 00:00:00 2001 From: Kyle Lacy Date: Thu, 20 Feb 2025 15:29:09 -0800 Subject: [PATCH 243/245] Upgrade BouncyCastle dependencies --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 49057e90..8b7b3b2d 100644 --- a/pom.xml +++ b/pom.xml @@ -268,14 +268,14 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.80 org.bouncycastle - bcmail-jdk15on - 1.70 + bcmail-jdk18on + 1.80 From 88154e2c15967cc4c2a2606a8da25d47b9b916c3 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Wed, 19 Mar 2025 15:36:11 +0100 Subject: [PATCH 244/245] Update PDFBox --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b7b3b2d..211d0d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ org.apache.pdfbox pdfbox - 3.0.3 + 3.0.4 From 2cdf3b4fd3f7e921dca8cc6814cdd9316be40f0f Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Wed, 19 Mar 2025 15:38:16 +0100 Subject: [PATCH 245/245] Adjust test Test needs to be adjusted because PDFBox supports the /ActualText feature of PDFBox. --- src/test/java/technology/tabula/TestBasicExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/technology/tabula/TestBasicExtractor.java b/src/test/java/technology/tabula/TestBasicExtractor.java index d120546f..b56fd6ea 100644 --- a/src/test/java/technology/tabula/TestBasicExtractor.java +++ b/src/test/java/technology/tabula/TestBasicExtractor.java @@ -203,7 +203,7 @@ public void testCheckSqueezeDoesntBreak() throws IOException { List> rows = table.getRows(); List firstRow = rows.get(0); List lastRow = rows.get(rows.size() - 1); - assertTrue(firstRow.get(0).getText().equals("Violent crime . . . . . . . . . . . . . . . . . .")); + assertTrue(firstRow.get(0).getText().equals("Violent crime. . . . . . . . . . . . . . . . . .")); assertTrue(lastRow.get(lastRow.size() - 1).getText().equals("(X)")); page.getPDDoc().close(); }

1ndT_VM9{TZs`Oz>llNw!z(P9v^gktSy+ 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