diff --git a/src/eu/simstadt/nf4j/ExportJobFromJavaFXRegionChooser.java b/src/eu/simstadt/nf4j/ExportJobFromJavaFXRegionChooser.java
index 26b2f03da3d1f5c6e0ca9782a109cd35d8c00e04..614d356e1ab784579b9b927adf51da5bb650645a 100644
--- a/src/eu/simstadt/nf4j/ExportJobFromJavaFXRegionChooser.java
+++ b/src/eu/simstadt/nf4j/ExportJobFromJavaFXRegionChooser.java
@@ -70,7 +70,7 @@ public void processJob(Geometry poly, String productName, JSObject novaFactoryOp
@Override
public void jobStatusChanged(JobStatusEvent event) {
JobStatus status = (JobStatus) event.getSource();
- System.out.println(status);
+ // System.out.println(status);
if (status == JobStatus.LOCAL) {
novaFactoryOpenLayer.call("updateStatus", "REQUEST HAS BEEN PREPARED");
} else if (status == JobStatus.SENT) {
diff --git a/src/eu/simstadt/regionchooser/RegionChooserFX.java b/src/eu/simstadt/regionchooser/RegionChooserFX.java
index 1210534bdd83a801291888eb49d33882e848fcf2..e63647fbb6d51bda4b95faee0c724a7304586cc2 100644
--- a/src/eu/simstadt/regionchooser/RegionChooserFX.java
+++ b/src/eu/simstadt/regionchooser/RegionChooserFX.java
@@ -97,13 +97,16 @@ protected Integer call() throws Exception {
public void extractZIPtoGML(String zipFilename) throws IOException {
ZipFile zipFile = new ZipFile(zipFilename);
Enumeration entries = zipFile.entries();
+ String userName = System.getProperty("user.name");
while (entries.hasMoreElements()) {
ZipEntry ze = entries.nextElement();
- if (ze.getName().toLowerCase().contains("gml")) {
- File extractedCityGML = selectSaveFileWithDialog(null, ze.getName(), "");
+ String zeName = ze.getName();
+ if (zeName.toLowerCase().contains("gml")) {
+ File extractedCityGML = selectSaveFileWithDialog(null,
+ zeName.replace("_GML.", ".").replace(userName, "novaFACTORY"), "");
if (extractedCityGML != null) {
InputStream cityGMLInputStream = zipFile.getInputStream(ze);
- System.out.println("Extract zipFile " + zipFilename + " to " + extractedCityGML);
+ // System.out.println("Extract zipFile " + zipFilename + " to " + extractedCityGML);
FileOutputStream fos = new FileOutputStream(extractedCityGML);
byte[] bytes = new byte[1024];
int length;
diff --git a/website/index.html b/website/index.html
index 09c3e7fe0ec8b218399d2ee395d913c630250577..f6a866e92d0efe8b70ecab9b49e39e459a7cd13c 100644
--- a/website/index.html
+++ b/website/index.html
@@ -1,13 +1,13 @@
-
-
- Simstadt Region Chooser
-
-
-
-
-
+
+
+ Simstadt Region Chooser
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
diff --git a/website/script/simstadt_openlayers.js b/website/script/simstadt_openlayers.js
index 889836335ac3581afd5710c39a82f04e53d36a6e..88ec099bb97cb0fc345003672ee0ab49257f568d 100644
--- a/website/script/simstadt_openlayers.js
+++ b/website/script/simstadt_openlayers.js
@@ -1,6 +1,5 @@
//TODO: Add zoom to extent as control
//TODO: Try to leave everything in 4326
-//TODO: Add some tiles for offline mode
var reset_btn = $('#reset')[0];
var dataPanel = $('#dataPanel');
diff --git a/website/style/style.css b/website/style/style.css
index 112fb24905de4ff7f8269ba863d596a3bd79df19..eb29fbc9e614fe6cf26702751c6d2ff676b8eed8 100644
--- a/website/style/style.css
+++ b/website/style/style.css
@@ -19,8 +19,9 @@ div#header{
div#map{
width:70%;
- height:70%;
+ height:80%;
float:left;
+ outline: 0;
}
div#side{
width:30%;
@@ -29,9 +30,14 @@ div#side{
div#dataPanel{
width:90%;
- height:50%;
+ height:80%;
overflow:auto;
border:2px solid #DDDDDD;
+ font-family: Consolas,monaco,monospace;
+ font-size: 12px;
+ box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -webkit-box-sizing:border-box;
}
div#side input{
width:90%;