Fix: Determining target class for deserialization

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/DatabaseHandler.java

@@ -28,6 +28,10 @@ public class DatabaseHandler {
     private static final String DB_NAME = "cd_db";
 
 
+    private DatabaseHandler() {
+    }
+
+
     /**
      * Sets up a new, empty embedded database. Will override an existing embedded database.
      */
@@ -39,6 +43,7 @@ public class DatabaseHandler {
         } catch (Exception e) {
             logger.fatal("FATAL ERROR: Creation of embedded database failed!");
             logger.fatal(e.getMessage());
+            // TODO: implement popup and shutdown
         }
 
 
@@ -70,12 +75,12 @@ public class DatabaseHandler {
         try (Connection con = new ConnectionWrapper(H2GISDBFactory.openSpatialDataBase(DB_NAME))) {
             try (PreparedStatement ps = con.prepareStatement("MERGE INTO features VALUES (?, ?, ?, ?)")) {
                 ps.setString(1, co.getGmlId().toString());
-                String bbox = BoundingBox.of(co.getHighestLodGeometry().getPolygons()).toWktShadow();
+                String bbox = BoundingBox.of(co.getHighestLodGeometry().getPolygons()).to2DWkt();
                 ps.setString(2, bbox);
                 if (logger.isDebugEnabled()) {
                     logger.debug("Attempting to serialize city object {} ", co);
                 }
-                ps.setString(4, co.getClass().getSimpleName());
+                ps.setString(4, co.getClass().getName());
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 try (ObjectOutputStream out = new ObjectOutputStream(bos)) {
                     out.writeObject(co);
@@ -201,6 +206,7 @@ public class DatabaseHandler {
 
     private static CityObject deserializeCityObject(ObjectInputStream ois, String className) throws IOException, ClassNotFoundException {
         Class<?> type = Class.forName(className);
-        return (CityObject) type.cast(ois.readObject());
+        CityObject castCo = (CityObject) type.cast(ois.readObject());
+        return castCo.getTopLevelCityObject();
     }
 }