From e908233098758464ad9b1163bca33ec422e7b691 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Thu, 8 Mar 2018 10:10:24 +0100
Subject: [PATCH] RegionChooser: Wait until window is ready.

---
 .../simstadt/regionchooser/RegionChooserBrowser.java |  5 +----
 .../website/script/simstadt_openlayers.js            | 12 ++++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/eu/simstadt/regionchooser/RegionChooserBrowser.java b/src/eu/simstadt/regionchooser/RegionChooserBrowser.java
index b18e067..fc5df7c 100644
--- a/src/eu/simstadt/regionchooser/RegionChooserBrowser.java
+++ b/src/eu/simstadt/regionchooser/RegionChooserBrowser.java
@@ -194,10 +194,7 @@ public RegionChooserBrowser() {
 					if (newState == State.SUCCEEDED) {
 						JSObject win = (JSObject) webEngine.executeScript("window");
 						win.setMember("fxapp", fxapp);
-						webEngine.executeScript("console.log = function(message)\n" +
-								"{\n" +
-								"    fxapp.log(message);\n" +
-								"};");
+						win.call("ready");
 						try {
 							fxapp.importNovaFactoryBoundingBoxes();
 						} catch (Exception ex) {
diff --git a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
index ac79669..af1c0fb 100644
--- a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
+++ b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
@@ -159,10 +159,9 @@ var draw = new ol.interaction.Draw({
 map.addInteraction(draw);
 
 var sketch;
-var fromJavaFX;
+var fromJavaFX = false; //Can be overwritten later if launched from JavaFX
 
 draw.on('drawstart', function(evt) {
-	fromJavaFX = (typeof fxapp !== 'undefined');
 	sketch = evt.feature;
 	reset_btn.disabled = false;
 	updateGMLPolygons();
@@ -333,4 +332,13 @@ function focusOnMap() {
 	// $('#map').scrollIntoView();
 }
 
+// Executed by JavaFX when whole page is loaded.
+window.ready = function() {
+	fromJavaFX = true;
+	console.log = function(message){
+		fxapp.log(message);
+	}
+	console.log("READY!");
+}
+
 focusOnMap();
\ No newline at end of file
-- 
GitLab