Merge branch 'db' of https://git.dergeorg.at/dergeorg/tourplaner into db

.idea/libraries/com_google_code_gson_gson_2_8_6.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="com.google.code.gson:gson:2.8.6" type="repository">
-    <properties maven-id="com.google.code.gson:gson:2.8.6" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/iText_4_2_0_com_itextpdf.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="iText-4.2.0-com.itextpdf">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/iText-4.2.0-com.itextpdf.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

Tourplaner.iml

@@ -10,9 +10,7 @@
     <orderEntry type="library" name="lib" level="project" />
     <orderEntry type="library" name="org.ini4j:ini4j:0.5.4" level="project" />
     <orderEntry type="library" name="log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="org.apache.pdfbox:pdfbox:1.8.9" level="project" />
     <orderEntry type="library" name="org.postgresql:postgresql:42.2.19" level="project" />
-    <orderEntry type="library" name="iText-4.2.0-com.itextpdf" level="project" />
-    <orderEntry type="library" name="org.json:json:20180130" level="project" />
-    <orderEntry type="library" name="com.google.code.gson:gson:2.8.6" level="project" />
   </component>
 </module>

conf.ini.sample

@@ -20,10 +20,3 @@ path = ./reports/
 gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
 doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
 javadoc = https://git.dergeorg.at/dergeorg/tourplaner
-
-[map]
-key =
-size = 1500,400
-sizePdf = 600,400
-path = D:\\TourplanerImages\\
-file_pre = file:///

langde.ini

@@ -40,23 +40,3 @@ hightmeter = Höhenmeter
 hightmetermsg = Höhenmeter des Abschnitts
 bemerkung = Bemerkung
 bemerkungheader = Bitte geben Sie die Bemerkungen zu diesem Log eintrag ein, kann auch leer bleiben.
-tourreportvon = Tour Report von ->
-tourplanervon = Tourplaner by DerGeorg
-reportkeywords = Tourplaner, Tour, Report
-tourplaner = Tourplaner"
-tour = Tour
-reportvon = Report erstellt von:
-reportstart = Startpunkt der Tour:
-reportziel = Zielpunkt der Tour:
-reportdauercal = Berechnete Dauer der Tour:
-reportstreckecal = Berechnete Strecke der Tour:
-logs = Logs
-countlog = Anzahl der Logeinträge:
-logvom = Log vom:
-logdauer = Dauer:
-logpause = Davon Pause:
-loggegangen = Davon gegangen:
-logavg = Berechnete Durchschnittliche Geschwindigkeit:
-logstrecke = Entfernung:
-loghight = Höhenmeter:
-logbemerkung = Bemerkung:

src/tourplaner/business/DirectionMap.java

@@ -1,89 +0,0 @@
-package tourplaner.business;
-
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Zuständig für das besorgen der Map für die UI und PDF-Reports und für die Berechneten infos der Tour (Dauer, Strecke)
- */
-public class DirectionMap {
-    private double dauer, strecke;
-    private String start, end, tourname, file, filepdf;
-    private Image map, mappdf;
-
-    /**
-     * Holt die Map als image und alle Daten zur berechneten Route
-     *
-     * @param start Startpunkt
-     * @param ende Endpunkt
-     * @param tourname Name der Aktuellen Tour
-     * @throws IOException Fehler beim Image der Map
-     */
-    public DirectionMap (String start, String ende, String tourname) throws IOException {
-        this.map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
-        this.mappdf = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
-        this.start = start;
-        this.end = ende;
-        this.tourname = tourname;
-        this.file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + ".jpg";
-        this.filepdf = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + "_pdf.jpg";
-        FileHelper.saveImage(this.map, "jpg", new File(this.file));
-        FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf));
-        getDirections(start, ende);
-        FileHelper.openDefault(file);
-    }
-
-    /**
-     * Get berechnete Dauer in Minuten
-     * @return Berechnete Dauer der Tour
-     */
-    public double getDauer() {
-        return dauer;
-    }
-
-    /**
-     * Get berechnete Strecke
-     * @return Berechnete Strecke der Tour
-     */
-    public double getStrecke() {
-        return strecke;
-    }
-
-    /**
-     * Downloadet die Map von Mapquest
-     * @param start Startpunkt
-     * @param ende Endpunkt
-     * @return Image von der Map
-     * @throws IOException Fehler beim Get der Map
-     */
-    private Image getMap(String start, String ende, String size) throws IOException {
-        return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?start="+start+"&end="+ende+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
-    }
-
-    /**
-     * Besorgt die Infos der Tour von Mapquest Directions
-     * @param start Start der Tour
-     * @param ende Ende der Tour
-     * @throws IOException Fehler beim besorgen der infos über die Tour
-     */
-    private void getDirections(String start, String ende) throws IOException {
-        String json = HttpHelper.httpGetJsonString("https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
-        this.strecke = JsonHelper.getDoubleFromJson(json, "distance");
-        this.dauer = formatetTimeToMinutes(JsonHelper.getStingFromJson(json, "formattedTime"));
-    }
-
-    /**
-     * Formatet time HH:MM:SS in Minuten umwandeln
-     * @param formatetTime Formatet time HH:MM:SS
-     * @return Zeit in Minuten
-     */
-    private double formatetTimeToMinutes(String formatetTime){
-        double minutes = 0;
-        String[] result = formatetTime.split(":");
-        minutes += Double.parseDouble(result[0]) * 60;
-        minutes += Double.parseDouble(result[1]);
-        minutes += Double.parseDouble(result[2]) / 60;
-        return minutes;
-    }
-}

src/tourplaner/business/Exporter.java

@@ -1,25 +0,0 @@
-package tourplaner.business;
-
-import tourplaner.object.Data;
-
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class Exporter {
-
-    private Data data;
-    private String path;
-
-    public Exporter(Data data, String path) {
-        this.data = data;
-        this.path = path;
-    }
-
-    public void doExport() throws IOException {
-        JsonHelper.getJsonFromObj(data, new FileWriter(path));
-    }
-
-    public void doImport(){
-
-    }
-}

src/tourplaner/business/FileHelper.java

@@ -1,62 +0,0 @@
-package tourplaner.business;
-
-import javax.imageio.ImageIO;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-public class FileHelper {
-
-    /**
-     * Öffnet ein File mit dem Standart Program
-     * @param f File Path als string
-     */
-    public static void openDefault(String f){
-        // A reference to a text file
-        File file = new File(f);
-
-        try {
-            Desktop desktop = Desktop.getDesktop();
-
-            // Open a file using the default program for the file type. In the example
-            // we will launch a default registered program to open a text file. For
-            // example on Windows operating system this call might launch a notepad.exe
-            // to open the file.
-            desktop.open(file);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Speichert ein Image
-     * @param img Das zu speichernde Bild
-     * @param type Dateityp z.b. jpg
-     * @param file Wo die datei zu speichern ist
-     * @throws IOException
-     */
-    public static void saveImage(Image img, String type, File file) throws IOException {
-        ImageIO.write(ImgHelper.toBufferedImage(img), type, file);
-    }
-
-    /**
-     * Holt ein image von einem File
-     * @param file File mit dem image
-     * @return Das buffered image
-     * @throws IOException Fehler beim öffnen des bildes
-     */
-    public static BufferedImage getImage(File file) throws IOException {
-        return ImageIO.read(file);
-    }
-
-    /**
-     * Löscht ein File
-     * @param file File das zu löschen ist
-      * @return false bei error
-     */
-    public static boolean delFile(File file){
-        return file.delete();
-    }
-}

src/tourplaner/business/HttpHelper.java

@@ -1,53 +0,0 @@
-package tourplaner.business;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * Http Hilfsfunktionen
- */
-public class HttpHelper {
-
-    /**
-     * Holt ein Image von gegebener URL
-     * @param url Url als Sting
-     * @return Image von der Url
-     * @throws IOException Fehler beim Bild holen
-     */
-    public static Image httpGetImage(String url) throws IOException {
-        URL urls = new URL(url);
-        return ImageIO.read(urls);
-    }
-
-    /**
-     * Http GET Json string vom Url string
-     * @param url Url als String
-     * @return Json als String
-     * @throws IOException Fehler beim Json holen
-     */
-    public static String httpGetJsonString(String url) throws IOException {
-        HttpURLConnection con = null;
-        try {
-            var myurl = new URL(url);
-            con = (HttpURLConnection) myurl.openConnection();
-            con.setRequestMethod("GET");
-            StringBuilder content;
-            try (BufferedReader in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()))) {
-                String line;
-                content = new StringBuilder();
-                while ((line = in.readLine()) != null) {
-                    content.append(line);
-                    content.append(System.lineSeparator());
-                }
-            }
-            return content.toString();
-        } finally {
-            assert con != null;
-            con.disconnect();
-        }
-    }
-}

src/tourplaner/business/ImgHelper.java

@@ -1,35 +0,0 @@
-package tourplaner.business;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-/**
- * Image Hilfsfunktionen
- */
-public class ImgHelper {
-
-    /**
-     * Converts a given Image into a BufferedImage
-     *
-     * @param img The Image to be converted
-     * @return The converted BufferedImage
-     */
-    public static BufferedImage toBufferedImage(Image img)
-    {
-        if (img instanceof BufferedImage)
-        {
-            return (BufferedImage) img;
-        }
-
-        // Create a buffered image with transparency
-        BufferedImage bimage = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_ARGB);
-
-        // Draw the image on to the buffered image
-        Graphics2D bGr = bimage.createGraphics();
-        bGr.drawImage(img, 0, 0, null);
-        bGr.dispose();
-
-        // Return the buffered image
-        return bimage;
-    }
-}

src/tourplaner/business/JsonHelper.java

@@ -1,59 +0,0 @@
-package tourplaner.business;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
-import java.io.FileWriter;
-
-/**
- * Hilfsklasse für Json (Gson)
- */
-public class JsonHelper {
-
-    /**
-     * String aus json extrahieren
-     * @param json Json als String
-     * @param gets Eintrag im Json unter "route"
-     * @return Gesammelter String
-     */
-    public static String getStingFromJson(String json, String gets){
-        return getJObj(json).get("route").getAsJsonObject().get(gets).getAsString();
-    }
-
-    /**
-     * Double aus json extrahieren
-     * @param json Json als String
-     * @param gets Eintrag im Json unter "route"
-     * @return Gesammelter Double Wert
-     */
-    public static double getDoubleFromJson(String json, String gets){
-        return getJObj(json).get("route").getAsJsonObject().get(gets).getAsDouble();
-    }
-
-    /**
-     * Erzeugt ein Json aus einem Object
-     * @param obj Das Objekt
-     * @return Json des Objektes
-     */
-    public static String getJsonFromObj(Object obj){
-        return new Gson().toJson(obj);
-    }
-
-    /**
-     * Erzeugt ein Json aus einem Object
-     * @param obj Das Objekt
-     * @param writer File in das geschrieben werden soll
-     */
-    public static void getJsonFromObj(Object obj , FileWriter writer){
-        new Gson().toJson(obj, writer);
-    }
-
-    /**
-     * Json String to JsonObject
-     * @param json Json string
-     * @return Neues JsonObject aus String
-     */
-    private static JsonObject getJObj(String json){
-       return new Gson().fromJson(json, JsonObject.class);
-    }
-}

src/tourplaner/business/LogHelper.java

@@ -33,14 +33,6 @@ public class LogHelper{
         getLog(name).error(msg);
     }
 
-    /**
-     * Log info in file und Console
-     * @param e Exception
-     */
-    public static void error(Exception e){
-        getLog(e.getClass().getName()).error(e.getMessage());
-    }
-
     /**
      * Log info in file und Console
      * @param msg Nachricht in dem Log

src/tourplaner/business/Reporter.java

@@ -1,189 +1,34 @@
 package tourplaner.business;
 
-import com.itextpdf.text.*;
-import com.itextpdf.text.Font;
-import com.itextpdf.text.Image;
-import tourplaner.object.Log;
-import tourplaner.object.Tour;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
 
-import com.itextpdf.text.pdf.PdfPCell;
-import com.itextpdf.text.pdf.PdfPTable;
-import com.itextpdf.text.pdf.PdfWriter;
-
-import java.awt.*;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
 
-/**
- * PDF Report generierung mit iText
- *
- * Erstellt Reports über einzelne Touren und fasst alle Touren zusammen
- *
- * iText 4 ist gratis verfügbar, siehe:
- * https://github.com/ymasory/iText-4.2.0
- */
 public class Reporter {
 
-    private static Font catFont = new Font(Font.TIMES_ROMAN, 18,
-            Font.BOLD);
-    private static Font redFont = new Font(Font.TIMES_ROMAN, 12,
-            Font.NORMAL, Color.RED);
-    private static Font subFont = new Font(Font.TIMES_ROMAN, 16,
-            Font.BOLD);
-    private static Font smallBold = new Font(Font.TIMES_ROMAN, 12,
-            Font.BOLD);
+    public static void createTourReport(String tourname) throws IOException, COSVisitorException {
+        PDDocument document = new PDDocument();
+        PDPage page = new PDPage();
+        document.addPage(page);
 
-    /**
-     * Erstellt einen Tour Report
-     * @param tourname Name der Tour die Gereportet werden soll
-     */
-    public static void createTourReport(String tourname)   {
-        Tour tour = TourPlaner.getTour(tourname);
-        tour.setLog(TourPlaner.getLogs(tourname));
-        String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + tourname+".pdf";
-        try {
-            Document document = new Document();
-            PdfWriter.getInstance(document, new FileOutputStream(file));
-            document.open();
-            addMetaData(document, tour);
-//            addTitlePage(document, tour);
-            addContent(document, tour);
+        PDFont font = PDType1Font.HELVETICA;
+        PDPageContentStream contentStream = new PDPageContentStream(document, page);
+        contentStream.beginText();
+        contentStream.setFont(font, 12);
+        contentStream.moveTextPositionByAmount(100,700);
+        contentStream.drawString(tourname);
+//        contentStream.drawString();
+        contentStream.endText();
+
+        contentStream.close();
+
+        document.save(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "test.pdf");
         document.close();
-        } catch (DocumentException | FileNotFoundException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
-        }
-        FileHelper.openDefault(file);
     }
 
-    // iText allows to add metadata to the PDF which can be viewed in your Adobe
-    // Reader
-    // under File -> Properties
-    private static void addMetaData(Document document, Tour tour) {
-        document.addTitle(ConfigHelper.getLangIniString("tourreportvon") + tour.getName());
-        document.addSubject(ConfigHelper.getLangIniString("tourplanervon"));
-        document.addKeywords(ConfigHelper.getLangIniString("reportkeywords"));
-        document.addAuthor(ConfigHelper.getLangIniString("tourplaner"));
-        document.addCreator(ConfigHelper.getLangIniString("tourplaner"));
-    }
-
-    /**
-     * Erstellt den inhalt des Reports
-     * @param document Aktuelles Dokument
-     * @param tour Aktuelle Tour
-     * @throws DocumentException Fehler beim hinzufügen des Inhaltes
-     */
-    private static void addContent(Document document, Tour tour) throws DocumentException {
-        Anchor anchor = new Anchor(ConfigHelper.getLangIniString("tourreportvon") + tour.getName(), catFont);
-        anchor.setName(ConfigHelper.getLangIniString("tourreportvon") + tour.getName());
-
-        // Second parameter is the number of the chapter
-        Chapter catPart = new Chapter(new Paragraph(anchor), 1);
-
-        Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("tour"), subFont);
-        Section subCatPart = catPart.addSection(subPara);
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + System.getProperty("user.name") + ", " + new Date()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportstart") + tour.getStart()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportziel") + tour.getZiel()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportdauercal") + tour.getDauer()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportstreckecal") + tour.getStrecke()));
-        Paragraph emptyLine = new Paragraph();
-        addEmptyLine(emptyLine, 5);
-        subCatPart.add(emptyLine);
-        // now add all this to the document
-        document.add(catPart);
-
-        Image image1 = null;
-        try {
-            image1 = Image.getInstance(TourPlaner.getImagePdfPath(tour.getName()));
-            image1.setAlignment(Element.ALIGN_CENTER);
-            image1.scaleAbsolute(600, 400);
-
-            document.add(image1);
-        } catch (IOException e) {
-            LogHelper.error(e);
-        }
-        ArrayList<Log> logs = tour.getLogs();
-        // Second parameter is the number of the chapter
-        anchor = new Anchor(ConfigHelper.getLangIniString("logs"), catFont);
-        anchor.setName(ConfigHelper.getLangIniString("logs"));
-        catPart = new Chapter(new Paragraph(anchor), 2);
-        catPart.add(new Paragraph(ConfigHelper.getLangIniString("countlog") + logs.size()));
-
-        for (Log log: logs) {
-            subPara = new Paragraph(ConfigHelper.getLangIniString("logvom") + log.getDatum() , subFont);
-            subCatPart = catPart.addSection(subPara);
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logdauer") + log.getDauer()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logpause") + log.getPause()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("loggegangen") + log.getGegangen()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logavg")+ log.getAvgspeed()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logstrecke") + log.getStrecke()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("loghight") + log.getHightmeter()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logbemerkung") + log.getBemerkung()));
-        }
-        // now add all this to the document
-        document.add(catPart);
-    }
-
-    /**
-     * Fügt eine leere zeile an den Paragraph an
-     * @param paragraph Hier wird hinzugefügt
-     * @param number Um wie viele Leere Zeilen hinzugefügt werden soll
-     */
-    private static void addEmptyLine(Paragraph paragraph, int number) {
-        for (int i = 0; i < number; i++) {
-            paragraph.add(new Paragraph(" "));
-        }
-    }
-//    private static void createTable(Section subCatPart)
-//            throws BadElementException {
-//        PdfPTable table = new PdfPTable(5);
-//
-//        // t.setBorderColor(BaseColor.GRAY);
-//        // t.setPadding(4);
-//        // t.setSpacing(4);
-//        // t.setBorderWidth(1);
-//
-//        PdfPCell c1 = new PdfPCell(new Phrase("NR"));
-//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
-//        table.addCell(c1);
-//
-//        c1 = new PdfPCell(new Phrase("Datum"));
-//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
-//        table.addCell(c1);
-//
-//        c1 = new PdfPCell(new Phrase("Entfernung"));
-//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
-//        table.addCell(c1);
-//
-//        c1 = new PdfPCell(new Phrase("Höhenmeter"));
-//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
-//        table.addCell(c1);
-//
-//        c1 = new PdfPCell(new Phrase("AVG Geschwindigkeit"));
-//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
-//        table.addCell(c1);
-//
-//
-//        table.setHeaderRows(1);
-//
-//        table.addCell("1.0");
-//        table.addCell("1.1");
-//        table.addCell("1.2");
-//        table.addCell("1.3");
-//        table.addCell("1.4");
-//        table.addCell("1.5");
-//
-//        table.addCell("2.0");
-//        table.addCell("2.1");
-//        table.addCell("2.2");
-//        table.addCell("2.3");
-//        table.addCell("2.4");
-//        table.addCell("2.5");
-//
-//        subCatPart.add(table);
-//
-//    }
 }

src/tourplaner/business/TourPlaner.java

@@ -1,12 +1,12 @@
 package tourplaner.business;
 
 import org.apache.log4j.Logger;
+import org.apache.pdfbox.exceptions.COSVisitorException;
 import tourplaner.data.DbConnect;
+import tourplaner.data.PostgresHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
 
-import java.awt.*;
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -37,58 +37,36 @@ public class TourPlaner{
      * @param tour Neuer Tourname
      * @return false bei error
      */
-    public static boolean editTour(String oldname, Tour tour) throws IOException {
-        FileHelper.delFile(new File(getImagePath(oldname)));
-        FileHelper.delFile(new File(getImagePdfPath(oldname)));
-        DirectionMap directionMap = new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
-        tour.setDauer(directionMap.getDauer()+"");
-        tour.setStrecke(directionMap.getStrecke());
+    public static boolean editTour(String oldname, Tour tour){
         return new DbConnect().editTour(oldname, tour);
     }
 
     public static boolean delTour(String tourname){
-        FileHelper.delFile(new File(getImagePath(tourname)));
-        FileHelper.delFile(new File(getImagePdfPath(tourname)));
         return new DbConnect().delTour(tourname);
     }
+
     /**
      * Fügt eine Tour hinzu
      * @param newTour Neue Tour
      * @return false bei error
      */
-    public static boolean addTour(Tour newTour) throws IOException {
-        DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
-        newTour.setDauer(directionMap.getDauer()+"");
-        newTour.setStrecke(directionMap.getStrecke());
+    public static boolean addTour(Tour newTour){
         return new DbConnect().addTour(newTour);
     }
 
-    public static Image getImage(String tourname) throws IOException {
-        return FileHelper.getImage(new File(getImagePath(tourname)));
-    }
-
-    public static String getImagePath(String tourname){
-        return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
-    }
-    public static String getImagePdfPath(String tourname){
-        return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg";
-    }
-
-    public static void openImage(String tourname){
-        FileHelper.openDefault(getImagePath(tourname));
-    }
-
 
     public static ArrayList<Log> getLogs(String tourname){
         return new DbConnect().getLogs(tourname);
     }
 
     public static void doReport(String tourname){
+        try {
             Reporter.createTourReport(tourname);
+        } catch (IOException e) {
+            LogHelper.error(e.getMessage(), e.getClass().getName());
+        } catch (COSVisitorException e) {
+            LogHelper.error(e.getMessage(), e.getClass().getName());
         }
-
-    public static Tour getTour(String tourname){
-        return new DbConnect().getTour(tourname);
     }
 
     public static boolean addLog(String tourname, Log log){

src/tourplaner/data/DbConnect.java

@@ -180,41 +180,4 @@ public class DbConnect {
         }
     }
 
-    /**
-     * Holt eine Tour aus der Datenbank
-     * @param tn Tourname
-     * @return Null bei fehler, sonst eine List aus den IDs
-     */
-    public Tour getTour(String tn){
-        this.c = PostgresHelper.con();
-        String tourname, mapjson, start, ziel;
-        double dauer, strecke;
-
-        Tour touren = null;
-        try {
-            stmt = this.c.createStatement();
-            ResultSet rs = stmt.executeQuery("select * from tour where tourname = '"+tn+"';");
-            while (rs.next()) {
-                tourname = rs.getString("tourname");
-                mapjson = rs.getString("mapjson");
-                start = rs.getString("start");
-                ziel = rs.getString("ziel");
-                dauer = rs.getDouble("dauer");
-                strecke = rs.getDouble("strecke");
-                if (!tourname.isEmpty()) {
-                    touren = new Tour(tourname, dauer + "", mapjson, strecke, start, ziel);
-                }else {
-                    return null;
-                }
-            }
-            rs.close();
-            stmt.close();
-            this.c.close();
-            return touren;
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            return null;
-        }
-    }
-
 }

src/tourplaner/object/Data.java

@@ -1,21 +0,0 @@
-package tourplaner.object;
-
-import java.util.ArrayList;
-
-public class Data {
-    private ArrayList<Log> logs;
-    private ArrayList<Tour> touren;
-
-    public Data(ArrayList<Log> logs, ArrayList<Tour> touren){
-        this.logs = logs;
-        this.touren = touren;
-    }
-
-    public ArrayList<Log> getLogs() {
-        return logs;
-    }
-
-    public ArrayList<Tour> getTouren() {
-        return touren;
-    }
-}

src/tourplaner/object/Tour.java

@@ -31,10 +31,6 @@ public class Tour {
         this.log = tour.getLogs();
     }
 
-    public void setLog(ArrayList<Log> log) {
-        this.log = log;
-    }
-
     /**
      * Holt einen einzigen Log Eintrag anhand der Id
      * @param id Id des Eintrags der zu besorgen ist

src/tourplaner/tourplaner.fxml

@@ -34,7 +34,6 @@
 
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.paint.*?>
 <?import javafx.scene.text.*?>
@@ -114,10 +113,9 @@
                               <TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
                                  <tabs>
                                     <Tab fx:id="kartenTab" text="Karte">
-                                         <AnchorPane>
-                                             <ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                         </AnchorPane>
-                                     </Tab>
+                                       <content>
+                                          <AnchorPane />
+                                       </content></Tab>
                                     <Tab fx:id="beschreibungTab" text="Beschreibung">
                                        <content>
                                           <AnchorPane>

src/tourplaner/ui/TourplanerController.java

@@ -8,7 +8,6 @@ import javafx.scene.control.*;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
@@ -38,7 +37,6 @@ public class TourplanerController implements Initializable {
     public TableView<Tour> beschreibungTableView;
     public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
     public TextField titleTextView, sucheInput;
-    public ImageView mapImageView;
     //Log -> rechts unten
     public TableView<Log> logTableView;
     public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
@@ -51,11 +49,7 @@ public class TourplanerController implements Initializable {
 
     @FXML
     private void editTourBtn(){
-        try {
         this.viewModel.editTour();
-        } catch (IOException e) {
-            LogHelper.error(e);
-        }
         syncTour(this.viewModel.getSelectedTour().getName());
     }
 
@@ -94,7 +88,6 @@ public class TourplanerController implements Initializable {
     private void syncTour(String selectedItem){
         beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
         beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
-        mapImageView.setImage(this.viewModel.getImage(selectedItem));
     }
 
     private void syncTourNamen(){
@@ -136,7 +129,6 @@ public class TourplanerController implements Initializable {
         logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
         logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
 
-        mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
     }
 
     /**
@@ -155,7 +147,6 @@ public class TourplanerController implements Initializable {
     @FXML
     private void addTour(){
         this.viewModel.addTour();
-        this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
     }
 
     /**
@@ -168,7 +159,6 @@ public class TourplanerController implements Initializable {
         this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
         this.viewModel.delTour();
         logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
-        mapImageView.setImage(null);
     }
 
     /**

src/tourplaner/viewmodels/ViewModel.java

@@ -2,8 +2,10 @@ package tourplaner.viewmodels;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.image.Image;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import tourplaner.business.Reporter;
 import tourplaner.business.TourPlaner;
+import tourplaner.data.DbConnect;
 import tourplaner.ui.AlertHelper;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
@@ -32,15 +34,11 @@ public class ViewModel {
 
 
 
-    public Image getImage(String tourname){
-        return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname));
-    }
-
     /**
      * Bearbeitet eine bereits bestehende Tour
      * prüft ob eine tour ausgewählt ist
      */
-    public void editTour() throws IOException {
+    public void editTour(){
         if (this.selectedTour == null){
             AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                     ConfigHelper.getLangIniString("keinetourselected"),
@@ -160,12 +158,7 @@ public class ViewModel {
             Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
             tourData.add(newTour);
             tourNamen.add(this.neueTourName);
-            this.selectedTour = newTour;
-            try {
             TourPlaner.addTour(newTour);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
         }
         this.neueTourStart = null;
         this.neueTourZiel = null;
@@ -481,6 +474,7 @@ public class ViewModel {
 
     public ObservableList<Tour> getTourData() {
         tourData.removeAll();
+//        ObservableList<Tour> data = ;
         tourData.addAll(TourPlaner.getAllTours());
         return tourData;
     }