RegionChooser: fxapp as private attribute.

src/eu/simstadt/regionchooser/RegionChooserBrowser.java

@@ -193,7 +193,7 @@ public RegionChooserBrowser() {
 				(ObservableValue<? extends State> ov, State oldState, State newState) -> {
 					if (newState == State.SUCCEEDED) {
 						JSObject regionChooserJS = (JSObject) webEngine.executeScript("regionChooser");
-						regionChooserJS.setMember("fxapp", fxapp);
+						regionChooserJS.call("setFxApp", fxapp);
 						regionChooserJS.call("ready");
 						try {
 							fxapp.importNovaFactoryBoundingBoxes();

src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js

@@ -104,7 +104,7 @@ var regionChooser = (function(){
 			feature["source"] = "CityGML";
 			var citygmlHere;
 			if (fromJavaFX) {
-				citygmlHere = publicScope.fxapp.checkIfCityGMLSAreAvailable(project, name);
+				citygmlHere = fxapp.checkIfCityGMLSAreAvailable(project, name);
 			}
 			feature["available"] = citygmlHere;
 		});
@@ -228,7 +228,7 @@ var regionChooser = (function(){
 			if (proj4.defs(srsName)){
 				$("html").addClass("wait");
 				console.log("Selected region is written in " + srsName + " coordinate system.");
-				publicScope.fxapp.downloadRegionFromCityGML(sketchAsWKT(srsName), feature.get("project"), feature.get("name"), srsName);
+				fxapp.downloadRegionFromCityGML(sketchAsWKT(srsName), feature.get("project"), feature.get("name"), srsName);
 				var end = new Date().getTime();
 				var time = end - start;
 				console.log('DL Execution time: ' + time);
@@ -306,7 +306,7 @@ var regionChooser = (function(){
 	};
 
 	novafactory_layer.selectSaveFile = function(zipFilename) {
-		publicScope.fxapp.extractZIPtoGML(zipFilename);
+		fxapp.extractZIPtoGML(zipFilename);
 	};
 
 	publicScope.downloadRegionFromNovaFACTORY = function(i) {
@@ -314,7 +314,7 @@ var regionChooser = (function(){
 		var feature = novafactory_vectors.getFeatures()[i];
 		// Waiting 100ms in order to let the cursor change
 		setTimeout(function() {
-			publicScope.fxapp.downloadRegion(sketchAsWKT(), feature.get('name'), novafactory_layer);
+			fxapp.downloadRegion(sketchAsWKT(), feature.get('name'), novafactory_layer);
 		}, 100);
 	}
 
@@ -326,19 +326,23 @@ var regionChooser = (function(){
 			featureProjection : ol.proj.get('EPSG:3857')
 		});
 	}
-
+	
 	function focusOnMap() {
 		$('#map').focus();
 		// $('#map').scrollIntoView();
 	}
-
-	publicScope.fxapp = undefined;
 	
+	var fxapp = undefined;
+	
+	publicScope.setFxApp = function(app){
+		fxapp = app;
+	}
+
 	// Executed by JavaFX when whole page is loaded.
 	publicScope.ready = function() {
 		fromJavaFX = true;
 		console.log = function(message){
-			publicScope.fxapp.log(message);
+			fxapp.log(message);
 		}
 		console.log("READY!");
 	}