added .init to repo

Author: NoteFox

Server/OHDMConverter.jar

@@ -0,0 +1,18 @@
+#! /bin/bash
+if [ "$#" -ne 2 ]; then
+    echo -e "Illegal number of parameters! should be \n$0 src.osm dst.map"
+    echo -e "but was $*"
+    exit 1
+fi
+SOURCE=$1
+DEST=$2
+if [ ! -f "$SOURCE" ]; then
+    echo "$SOURCE does not exist"
+    exit 2
+fi
+if [ -f "$DEST" ]; then
+    echo "$DEST already exists. not overwriting it"
+    exit 3
+fi
+
+/opt/osmosis/bin/osmosis --rx file=$SOURCE --mw file=$DEST

Server/convert-osm2map.sh

@@ -0,0 +1,8 @@
+servername:141.45.146.200
+portnumber:5432
+username:ohdm
+pwd:SoSe+2020
+dbname:postgis_db
+schema:rendering
+maxThreads:5
+renderoutput:generic

Server/demo.jar

@@ -0,0 +1,20 @@
+// '[init]' says this is an init file, 
+// just so it doesn't read an random file out of nothing
+// 
+// Standart config
+// 'variable' 'name' = 'value'
+// '//' Comment
+
+[init]
+doesFTPServiceLog = true
+doesWebServiceLog = true
+
+logDefaultDir = ./log
+mapsDefaultDir = ./maps
+ftpDefaultDir = ./ftp
+
+webPort = 5001
+ftpPort = 5000
+
+standardUserName = ohdmOffViewer
+standardUserPassword = H!3r0glyph Sat3llite Era$er

db_render.txt

@@ -15,7 +15,7 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
-        <java.version>14</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>

init.txt

@@ -1,5 +1,3 @@
-package FTPClient;
-
 import org.apache.commons.net.ftp.FTPFile;
 
 import java.io.IOException;
@@ -29,11 +27,21 @@ public interface FTPInterface {
     boolean isConnected();
 
     /**
-     * gives back the File list, given in current working dir
-     * @return FTPFiles in current dir
-     * @throws IOException couldn't read from current dir
+     * gives back the File list, given in given path
+     * @param path path where it lists everything
+     * @return FTPFiles in path
+     * @throws IOException couldn't read from path
+     */
+    FTPFile[] getFileList(String path) throws IOException;
+
+
+    /**
+     * gives bcak the Dir list, in given path
+     * @param path path where it lists everything
+     * @return Dirs in path
+     * @throws IOException couldn't read from path
      */
-    FTPFile[] getFileList() throws IOException;
+    FTPFile[] getDirList(String path) throws IOException;
 
     /**
      * call to download a File from current dir

out/META-INF/MANIFEST.MF

@@ -1,21 +1,20 @@
-package FTPClient;
-
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
 
 import java.io.*;
 import java.net.SocketException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 
-public class FtpClientImpl extends Thread implements FTPInterface{
+public class FtpClient extends Thread implements FTPInterface{
 
-    public FtpClientImpl(OutputStream os) {
+    public FtpClient(OutputStream os) {
         logStream = new PrintStream(os);
     }
 
-    public FtpClientImpl() {
+    public FtpClient() {
         LOGGING_OVER_FILE = false;
     }
 
@@ -27,42 +26,42 @@ public FtpClientImpl() {
 
     @Override
     public int connect(String server, int port, String user, String pass) {
-            if( client == null ) {
-                log("Getting passive FTP client");
-                client = new FTPClient();
-
-                try {
-
-                    client.connect(server, port);
-                    // After connection attempt, you should check the reply code to verify
-                    // success.
-                    int reply = client.getReplyCode();
-
-                    if(!FTPReply.isPositiveCompletion(reply)) {
-                        client.disconnect();
-                        log(" ERROR : FTP server refused connection.");
-                        return 1;
-                    }
-
-                    //after connecting to the server set the local passive mode
-                    client.enterLocalPassiveMode();
-
-                    //send username and password to login to the server
-                    if( !client.login(user, pass) ) {
-                        log(" ERROR - Could not login to FTP Server");
-                        return 2;
-                    }
-                } catch (SocketException e) {
-                    String message = "Socket exception thrown, Server not found";
-                    log("ERROR :" + message+"\n" + e);
-                    return 3;
-                } catch (IOException e) {
-                    String message = "IO Exception";
-                    log("ERROR :" + message+"\n" + e);
-                    return 4;
+        if( client == null ) {
+            log("Getting passive FTP client");
+            client = new FTPClient();
+
+            try {
+
+                client.connect(server, port);
+                // After connection attempt, you should check the reply code to verify
+                // success.
+                int reply = client.getReplyCode();
+
+                if(!FTPReply.isPositiveCompletion(reply)) {
+                    client.disconnect();
+                    log(" ERROR : FTP server refused connection.");
+                    return 1;
                 }
+
+                //after connecting to the server set the local passive mode
+                client.enterLocalPassiveMode();
+
+                //send username and password to login to the server
+                if( !client.login(user, pass) ) {
+                    log(" ERROR - Could not login to FTP Server");
+                    return 2;
+                }
+            } catch (SocketException e) {
+                String message = "Socket exception thrown, Server not found";
+                log("ERROR :" + message+"\n" + e);
+                return 3;
+            } catch (IOException e) {
+                String message = "IO Exception";
+                log("ERROR :" + message+"\n" + e);
+                return 4;
             }
-            return 0;
+        }
+        return 0;
     }
 
     @Override
@@ -71,15 +70,39 @@ public boolean isConnected() {
     }
 
     @Override
-    public FTPFile[] getFileList() throws IOException {
+    public FTPFile[] getDirList(String path) throws IOException {
+        if(client == null) {
+            System.out.println("INFO : First initialize the FTPClient by calling 'initFTPPassiveClient()'");
+            return null;
+        }
+
+        log("DEBUG : Getting file listing for current director");
+        FTPFile[] files = client.listFiles(path);
+        ArrayList<FTPFile> dirList = new ArrayList<>();
+        for (FTPFile f :
+                files) {
+            if (f.isDirectory())
+                dirList.add(f);
+        }
+        return dirList.toArray(new FTPFile[dirList.size()]);
+    }
+
+    @Override
+    public FTPFile[] getFileList(String path) throws IOException {
         if(client == null) {
             System.out.println("INFO : First initialize the FTPClient by calling 'initFTPPassiveClient()'");
             return null;
         }
 
         log("DEBUG : Getting file listing for current director");
-        FTPFile[] files = client.listFiles("");
-        return files;
+        FTPFile[] files = client.listFiles(path);
+        ArrayList<FTPFile> actualFiles = new ArrayList<>();
+        for (FTPFile f :
+                files) {
+            if (!f.isDirectory())
+                actualFiles.add(f);
+        }
+        return actualFiles.toArray(new FTPFile[actualFiles.size()]);
     }
 
     @Override