diff --git a/.classpath b/.classpath
index c67afcdd977a5a6998c8c54cf045fcea928a9c97..60fb4885c145f9a2a6e4f264f3521f24d774abd7 100644
--- a/.classpath
+++ b/.classpath
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="lib/GMapsFX-1.1.1.jar" sourcepath="C:/Users/Kai Brassel/Desktop/rterp-GMapsFX-71adc3c/GMapsFX/src/main/java">
- <attributes>
- <attribute name="javadoc_location" value="http://rterp.github.io/GMapsFX/apidocs/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="lib/Proj4J.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/SimStadtRepository"/>
- <classpathentry kind="lib" path="lib/jts-1.13.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/SimStadtFrontend"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/SimStadtRepository"/>
+ <classpathentry kind="lib" path="lib/jts-1.13.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/SimStadtFrontend"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lib/GMapsFX-1.1.1.jar b/lib/GMapsFX-1.1.1.jar
deleted file mode 100644
index 0699d93545d3a9f2fac648ddb6cf247f66ae998d..0000000000000000000000000000000000000000
Binary files a/lib/GMapsFX-1.1.1.jar and /dev/null differ
diff --git a/lib/Proj4J.jar b/lib/Proj4J.jar
deleted file mode 100644
index 37b031dba73fd182f8f42b9c25067d4b5652bc1c..0000000000000000000000000000000000000000
Binary files a/lib/Proj4J.jar and /dev/null differ
diff --git a/src/eu/simstadt/regionchooser/RegionChooser.fxml b/src/eu/simstadt/regionchooser/RegionChooser.fxml
deleted file mode 100644
index 086b4ddafa3cd8f1f41a6d04456aee55d42752f5..0000000000000000000000000000000000000000
--- a/src/eu/simstadt/regionchooser/RegionChooser.fxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-<?import com.lynden.gmapsfx.GoogleMapView?>
-
-
-
-
-
-<BorderPane fx:controller="eu.simstadt.regionchooser.RegionChooserController" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <center>
- <GoogleMapView onMouseClicked="#clicked" fx:id="mapView" prefHeight="750.0" prefWidth="750.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
- </center>
- <bottom>
- <HBox BorderPane.alignment="CENTER">
- <children>
- <Button mnemonicParsing="false" onAction="#generateExportJob" text="Generate Export Job" />
- <TextArea fx:id="outputTA" wrapText="true" />
- </children>
- </HBox>
- </bottom>
-</BorderPane>
diff --git a/src/eu/simstadt/regionchooser/RegionChooserController.java b/src/eu/simstadt/regionchooser/RegionChooserController.java
deleted file mode 100644
index 1b3941a9daef430ad7b114d7874173f4477b44d3..0000000000000000000000000000000000000000
--- a/src/eu/simstadt/regionchooser/RegionChooserController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package eu.simstadt.regionchooser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javafx.concurrent.Service;
-import javafx.concurrent.Task;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextArea;
-
-import com.lynden.gmapsfx.GoogleMapView;
-import com.lynden.gmapsfx.MapComponentInitializedListener;
-import com.lynden.gmapsfx.javascript.JavascriptObject;
-import com.lynden.gmapsfx.javascript.object.GoogleMap;
-import com.lynden.gmapsfx.javascript.object.InfoWindow;
-import com.lynden.gmapsfx.javascript.object.InfoWindowOptions;
-import com.lynden.gmapsfx.javascript.object.LatLong;
-import com.lynden.gmapsfx.javascript.object.MapOptions;
-import com.lynden.gmapsfx.javascript.object.MapTypeIdEnum;
-import com.lynden.gmapsfx.javascript.object.Marker;
-import com.lynden.gmapsfx.javascript.object.MarkerOptions;
-
-import eu.simstadt.nf4j.JobDescriptor;
-import eu.simstadt.nf4j.async.Coord;
-import eu.simstadt.nf4j.async.ExportJobDescription;
-import eu.simstadt.nf4j.async.JobFileBuilderImpl;
-import eu.simstadt.nf4j.async.Layer;
-
-
-public class RegionChooserController implements MapComponentInitializedListener
-{
- ArrayList<Coord> regionPolygon = new ArrayList<>();
-
- @FXML
- private TextArea outputTA;
-
- @FXML
- private GoogleMapView mapView;
-
- private GoogleMap map;
-
- @FXML
- public void initialize() {
- mapView.addMapInializedListener(this);
- }
-
- @Override
- public void mapInitialized() {
- LatLong bochumLoc = new LatLong(48.879696, 9.215463);
- LatLong hamburgLoc = new LatLong(48.878230, 9.215714);
- LatLong stuttgartLoc = new LatLong(48.878323, 9.216613);
- LatLong dresdenLoc = new LatLong(48.879402, 9.216532);
-
- //Set the initial properties of the map.
- MapOptions mapOptions = new MapOptions();
-
- mapOptions.center(new LatLong(51.3, 11.0))
- .mapType(MapTypeIdEnum.ROADMAP)
- .overviewMapControl(true)
- .panControl(false)
- .rotateControl(false)
- .scaleControl(false)
- .streetViewControl(false)
- .zoomControl(true)
- .zoom(7);
-
- map = mapView.createMap(mapOptions);
-
- //Add markers to the map
- MarkerOptions markerOptions1 = new MarkerOptions();
- markerOptions1.position(bochumLoc);
-
- MarkerOptions markerOptions2 = new MarkerOptions();
- markerOptions2.position(hamburgLoc);
-
- MarkerOptions markerOptions3 = new MarkerOptions();
- markerOptions3.position(stuttgartLoc);
-
- MarkerOptions markerOptions4 = new MarkerOptions();
- markerOptions4.position(dresdenLoc);
-
- Marker bochumMarker = new Marker(markerOptions1);
- Marker hamburgMarker = new Marker(markerOptions2);
- Marker stuttgartMarker = new Marker(markerOptions3);
- Marker dresdenMarker = new Marker(markerOptions4);
-
- map.addMarker(bochumMarker);
- map.addMarker(hamburgMarker);
- map.addMarker(stuttgartMarker);
- map.addMarker(dresdenMarker);
-
- InfoWindowOptions infoWindowOptions = new InfoWindowOptions();
- infoWindowOptions.content("<h2>Bochum</h2>Tief im Westen");
-
- InfoWindow bochumInfoWindow = new InfoWindow(infoWindowOptions);
- bochumInfoWindow.open(map, bochumMarker);
-
- regionPolygon.add(new Coord(bochumLoc.getLatitude(), bochumLoc.getLongitude()));
- regionPolygon.add(new Coord(hamburgLoc.getLatitude(), hamburgLoc.getLongitude()));
- regionPolygon.add(new Coord(stuttgartLoc.getLatitude(), stuttgartLoc.getLongitude()));
- regionPolygon.add(new Coord(dresdenLoc.getLatitude(), dresdenLoc.getLongitude()));
- }
-
- // Build the nF export job description from a region polygon
- @FXML
- void generateExportJob(ActionEvent event) {
- Service<String> exportRunner = new Service<String>() {
- @Override
- protected Task<String> createTask() {
- return new Task<String>() {
- @Override
- protected String call() throws Exception {
- Layer layer = new Layer();
- layer.setName("GML");
- layer.setProduct("LBTEST");
- layer.setStyle("#000000");
- ExportJobDescription jobDescriptor = ExportJobDescription.getDefaultDescriptor();
- jobDescriptor.addLayer(layer);
- jobDescriptor.setRegionPolygon(regionPolygon);
- JobFileBuilderImpl jobBuilder = new JobFileBuilderImpl();
- return jobBuilder.buildExportJobFile(jobDescriptor).getAbsolutePath();
- }
- };
- }
- };
- exportRunner.setOnSucceeded(state -> {
- outputTA.setText(exportRunner.getValue());
- });
- exportRunner.start();
- }
-
- @FXML
- void clicked() {
- // Test, if this LatLong will be returned by getCenter(). Seams to work.
- System.out.println("Center: " + map.getCenter());
-
- // Adding a fifth marker to the map seams to work without any problems.
- LatLong loc = new LatLong(48.880003, 9.216849);
- MarkerOptions markerOptions = new MarkerOptions();
- markerOptions.position(loc);
- Marker marker = new Marker(markerOptions);
- map.addMarker(marker);
-
- // Now I want to obtain the current coordinates from the map at the mouse position in order
- // to instantiate and set a new marker.
- //
- // This statement fails. Why?
- mapView.getMap().getLatLong();
- }
-}
\ No newline at end of file
diff --git a/src/eu/simstadt/regionchooser/RegionChooserFX.java b/src/eu/simstadt/regionchooser/RegionChooserFX.java
index 9eb6e1a930ce385f196c381d2bae55ee7a2508c2..ff3f05e63c87e9108de0527c519467a309628401 100644
--- a/src/eu/simstadt/regionchooser/RegionChooserFX.java
+++ b/src/eu/simstadt/regionchooser/RegionChooserFX.java
@@ -7,7 +7,6 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.Optional;
import java.util.prefs.Preferences;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,7 +30,6 @@
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.io.ParseException;
import com.vividsolutions.jts.io.WKTReader;
-import eu.simstadt.admin.RepositoryNode;
import eu.simstadt.desktop.SimStadtApp;
import eu.simstadt.nf4j.ExportJobFromJavaFXRegionChooser;
diff --git a/src/eu/simstadt/regionchooser/RegionChooserMain.java b/src/eu/simstadt/regionchooser/RegionChooserMain.java
deleted file mode 100644
index 524e7e0253d15ebdf684dbeff54974b8da67e45b..0000000000000000000000000000000000000000
--- a/src/eu/simstadt/regionchooser/RegionChooserMain.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.simstadt.regionchooser;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.scene.layout.BorderPane;
-import javafx.stage.Stage;
-
-
-public class RegionChooserMain extends Application
-{
- @Override
- public void start(Stage primaryStage) {
- try {
- BorderPane root = (BorderPane) FXMLLoader.load(getClass().getResource("RegionChooser.fxml"));
- Scene scene = new Scene(root, 750, 750);
- scene.getStylesheets().add(getClass().getResource("application.css").toExternalForm());
- primaryStage.setScene(scene);
- primaryStage.show();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public static void main(String[] args) {
- launch(args);
- }
-}
diff --git a/src/eu/simstadt/regionchooser/application.css b/src/eu/simstadt/regionchooser/application.css
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000