diff --git a/website/script/simstadt_openlayers.js b/website/script/simstadt_openlayers.js index 0dfd64eb01c6951d71929be9d26357518b0455d4..6d8c67d70bc0e75eacd8c7447ff00dbed1be5ed2 100644 --- a/website/script/simstadt_openlayers.js +++ b/website/script/simstadt_openlayers.js @@ -57,6 +57,9 @@ vectorSource.addMarker = function(x, y, name) { })); } +//vectorSource.addMarker(3536859.19, 5438902.94, "BRUSE"); +//vectorSource.addMarker(3533399.8907172694, 5439126.050470325, "MyPoly"); + var createTextStyle = function(feature, resolution) { var align = "Normal"; var baseline = "Middle"; @@ -249,8 +252,10 @@ function downloadRegionFromCityGML(i) { var end = new Date().getTime(); var time = end - start; console.log('DL Execution time: ' + time); - // $('#dataPanel').append("Imported buildings : " + buildings_count); - $("html").removeClass("wait"); + setTimeout(function() { + $("html").removeClass("wait"); + $("#dataPanel").append("Done<br/>\n"); + }, 100); }, 100); } @@ -262,16 +267,18 @@ function displayInfo() { var coordinates = geom.getLinearRing(0).getCoordinates(); var area = Math.abs(wgs84Sphere.geodesicArea(coordinates)); var coords = geom.getLinearRing(0).getCoordinates(); - var gsk3_coords = ""; - var wgs84_coords = ""; - var n = coords.length - 1; - for (var i = 0; i < n; i++) { - var wgs84_coord = coords[i]; - wgs84_coords += "(" + wgs84_coord[1] + "," + wgs84_coord[0] + ")<br/>"; - var gsk3_coord = ol.proj.transform(coords[i], ol.proj.get('EPSG:4326'), ol.proj.get('EPSG:31467')) - gsk3_coords += "(" + gsk3_coord[0] + "," + gsk3_coord[1] + ")<br/>"; - } if (!fromJavaFX) { + var gsk3_coords = ""; + var wgs84_coords = ""; + var n = coords.length; + for (var i = 0; i < n; i++) { + var wgs84_coord = coords[i]; +// wgs84_coords += "regionPolygon.add(new Coord(" + wgs84_coord[1] + "," + wgs84_coord[0] + "));<br/>"; + wgs84_coords += "(" + wgs84_coord[1] + "," + wgs84_coord[0] + ")<br/>"; + + var gsk3_coord = ol.proj.transform(coords[i], ol.proj.get('EPSG:4326'), ol.proj.get('EPSG:31467')) + gsk3_coords += "(" + gsk3_coord[0] + "," + gsk3_coord[1] + ")<br/>"; + } $('#dataPanel').append("WGS84 Coordinates<br/>"); $('#dataPanel').append(wgs84_coords + "<br/>\n"); $('#dataPanel').append("GSK3 Coordinates<br/>");