diff --git a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js index dd2452727f8e2a33749e18ef7a8d65e11ce622a0..fa891445f90a5d99d155f4e28c059a9bc85524a3 100644 --- a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js +++ b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js @@ -8,23 +8,26 @@ proj4.defs("EPSG:2263", "+proj=lcc +lat_1=41.03333333333333 +lat_2=40.6666666666 //NOTE: Corrected version from https://oegeo.wordpress.com/2008/05/20/note-to-self-the-one-and-only-rd-projection-string/ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.999908 +x_0=155000 +y_0=463000 +ellps=bessel +units=m +towgs84=565.2369,50.0087,465.658,-0.406857330322398,0.350732676542563,-1.8703473836068,4.0812 +no_defs <>"); // -var regionChooser = (function(){ +//var regionChooser = (function(){ var publicScope = {}; var reset_btn = $('#reset')[0]; var dataPanel = $('#dataPanel'); var wgs84Sphere = new ol.Sphere(6378137); - var osm_layer = new ol.layer.Tile({ source: new ol.source.OSM() }); - var kml_source = new ol.source.KML({ - projection : ol.proj.get('EPSG:3857'), - url : 'data/citygml_hulls.kml', - extractAttributes : false, - extractStyles : false - }); + function read_kml(url){ + return new ol.source.KML({ + projection : ol.proj.get('EPSG:3857'), + url : url, + extractAttributes : false, + extractStyles : false + }); + } + + var kml_source = read_kml('data/citygml_hulls.kml'); function polygon_style(color, alpha) { return new ol.style.Style({ @@ -293,7 +296,10 @@ var regionChooser = (function(){ }); $('#refresh_hulls').click(function() { - fxapp.refreshHulls(); + url = fxapp.refreshHulls(); + console.log('Loading ' + url); + kml_source = read_kml(url); + kml_layer.setSource(kml_source); }); novafactory_layer.downloadFinished = function() { @@ -352,5 +358,6 @@ var regionChooser = (function(){ } focusOnMap(); - return publicScope; -})(); \ No newline at end of file + var regionChooser = publicScope; +// return publicScope; +//})(); \ No newline at end of file