Commit 80d2a209 authored by duminil's avatar duminil
Browse files

Outputing polygon coordinates if outside of JavaFX

parent 2978d76c
...@@ -46,7 +46,6 @@ var intersections_layer = new ol.layer.Vector({ ...@@ -46,7 +46,6 @@ var intersections_layer = new ol.layer.Vector({
}) })
}); });
var vectorSource = new ol.source.Vector({ var vectorSource = new ol.source.Vector({
features : [] features : []
}); });
...@@ -120,8 +119,7 @@ kml_layer.addEventListener("change", function(event) { ...@@ -120,8 +119,7 @@ kml_layer.addEventListener("change", function(event) {
map.getView().fitExtent(kml_source.getExtent(), (map.getSize())); map.getView().fitExtent(kml_source.getExtent(), (map.getSize()));
}); });
function updateGMLPolygons(){ function updateGMLPolygons() {
var fromJavaFX = (typeof fxapp !== 'undefined');
kml_source.forEachFeature(function(feature) { kml_source.forEachFeature(function(feature) {
feature["geoJSON"] = geoJSONformat.writeFeatureObject(feature); feature["geoJSON"] = geoJSONformat.writeFeatureObject(feature);
feature["area"] = feature.getGeometry().getArea(); feature["area"] = feature.getGeometry().getArea();
...@@ -185,7 +183,10 @@ draw = new ol.interaction.Draw({ ...@@ -185,7 +183,10 @@ draw = new ol.interaction.Draw({
map.addInteraction(draw); map.addInteraction(draw);
var sketch; var sketch;
var fromJavaFX;
draw.on('drawstart', function(evt) { draw.on('drawstart', function(evt) {
fromJavaFX = (typeof fxapp !== 'undefined');
sketch = evt.feature; sketch = evt.feature;
reset_btn.disabled = false; reset_btn.disabled = false;
updateGMLPolygons(); updateGMLPolygons();
...@@ -248,7 +249,7 @@ function downloadRegionFromCityGML(i) { ...@@ -248,7 +249,7 @@ function downloadRegionFromCityGML(i) {
var end = new Date().getTime(); var end = new Date().getTime();
var time = end - start; var time = end - start;
console.log('DL Execution time: ' + time); console.log('DL Execution time: ' + time);
// $('#dataPanel').append("Imported buildings : " + buildings_count); // $('#dataPanel').append("Imported buildings : " + buildings_count);
$("html").removeClass("wait"); $("html").removeClass("wait");
}, 100); }, 100);
} }
...@@ -270,10 +271,13 @@ function displayInfo() { ...@@ -270,10 +271,13 @@ function displayInfo() {
var gsk3_coord = ol.proj.transform(coords[i], ol.proj.get('EPSG:4326'), ol.proj.get('EPSG:31467')) 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/>"; gsk3_coords += "(" + gsk3_coord[0] + "," + gsk3_coord[1] + ")<br/>";
} }
// $('#dataPanel').append("WGS84 Coordinates<br/>"); if (!fromJavaFX) {
// $('#dataPanel').append(wgs84_coords + "<br/>\n"); $('#dataPanel').append("WGS84 Coordinates<br/>");
// $('#dataPanel').append("GSK3 Coordinates<br/>"); $('#dataPanel').append(wgs84_coords + "<br/>\n");
// $('#dataPanel').append(gsk3_coords + "<br/>\n"); $('#dataPanel').append("GSK3 Coordinates<br/>");
$('#dataPanel').append(gsk3_coords + "<br/>\n");
}
;
$('#dataPanel').append("Area" + "<br/>\n"); $('#dataPanel').append("Area" + "<br/>\n");
$('#dataPanel').append((Math.round(area / 1000) / 10).toString() + " ha<br/><br/>\n"); $('#dataPanel').append((Math.round(area / 1000) / 10).toString() + " ha<br/><br/>\n");
findIntersections(); findIntersections();
......
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