Commit 6159ad59 authored by Eric Duminil's avatar Eric Duminil
Browse files

RegionChooser: fromJavaFX extracted from User Agent.

parent c308b061
...@@ -10,6 +10,7 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 ...@@ -10,6 +10,7 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388
//var regionChooser = (function(){ //var regionChooser = (function(){
var publicScope = {}; var publicScope = {};
var fromJavaFX = navigator.userAgent.indexOf('JavaFX') !== -1;
var refresh_btn = $('#refresh_hulls')[0]; var refresh_btn = $('#refresh_hulls')[0];
var reset_btn = $('#reset')[0]; var reset_btn = $('#reset')[0];
var dataPanel = $('#dataPanel'); var dataPanel = $('#dataPanel');
...@@ -29,7 +30,7 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 ...@@ -29,7 +30,7 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388
}); });
} }
var kml_source = read_kml('data/citygml_hulls.kml'); var kml_source = read_kml(fromJavaFX ? undefined : 'data/citygml_hulls.kml');
function polygon_style(color, alpha) { function polygon_style(color, alpha) {
return new ol.style.Style({ return new ol.style.Style({
...@@ -175,7 +176,6 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 ...@@ -175,7 +176,6 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388
map.addInteraction(draw); map.addInteraction(draw);
var sketch; var sketch;
var fromJavaFX = false; //Can be overwritten later if launched from JavaFX
draw.on('drawstart', function(evt) { draw.on('drawstart', function(evt) {
sketch = evt.feature; sketch = evt.feature;
...@@ -364,11 +364,14 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 ...@@ -364,11 +364,14 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388
// Executed by JavaFX when whole page is loaded. // Executed by JavaFX when whole page is loaded.
publicScope.ready = function() { publicScope.ready = function() {
fromJavaFX = true;
console.log = function(message){ console.log = function(message){
fxapp.log(message); fxapp.log(message);
} }
refresh_btn.disabled = false; refresh_btn.disabled = false;
console.log(kml_source.getFeatures());
kml_source.clear();
fxapp.refreshHulls();
updateGMLPolygons();
console.log("READY!"); console.log("READY!");
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment