Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eric Duminil
RegionChooser
Commits
6c9fede7
Commit
6c9fede7
authored
2 years ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
Removing debug code.
parent
e6e7fe28
master
develop
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
+2
-4
.../java/eu/simstadt/regionchooser/RegionChooserBrowser.java
src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
+5
-10
...stadt/regionchooser/website/script/simstadt_openlayers.js
with
7 additions
and
14 deletions
+7
-14
src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
+
2
-
4
View file @
6c9fede7
...
...
@@ -72,14 +72,12 @@ public Void call() throws IOException {
public
void
downloadRegionFromCityGML
(
String
wktPolygon
,
String
project
,
String
csvCitygmls
,
String
srsName
)
throws
IOException
,
ParseException
,
XPathParseException
,
NavException
{
System
.
out
.
println
(
"BEEN HERE?"
);
Path
[]
paths
=
Stream
.
of
(
csvCitygmls
.
split
(
";"
)).
map
(
s
->
citygmlPath
(
project
,
s
)).
toArray
(
Path
[]::
new
);
StringBuilder
sb
=
RegionExtractor
.
selectRegionDirectlyFromCityGML
(
wktPolygon
,
srsName
,
paths
);
File
buildingIdsFile
=
selectSaveFileWithDialog
(
project
,
csvCitygmls
.
replace
(
";"
,
"_"
),
"selected_region"
);
File
buildingIdsFile
=
selectSaveFileWithDialog
(
project
,
csvCitygmls
.
replace
(
";"
,
"_"
).
replace
(
".gml"
,
""
),
"selected_region"
);
if
(
buildingIdsFile
!=
null
)
{
try
(
BufferedWriter
writer
=
Files
.
newBufferedWriter
(
buildingIdsFile
.
toPath
()))
{
char
[]
chars
=
new
char
[
BUFFER
];
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
+
5
-
10
View file @
6c9fede7
...
...
@@ -174,8 +174,6 @@ var regionChooser = (function(){
// TODO: Add checkbox + label +
// TODO: Add submit.
// TODO: If possible, highlight the corresponding polygon when hovering above a name.
console
.
log
(
"
Feature name :
"
+
feature
[
"
name
"
]);
console
.
log
(
"
Feature ID :
"
+
feature
.
getId
());
if
(
fromJavaFX
)
{
link
+=
'
<input type="checkbox" id="citygml_
'
+
feature
.
getId
()
+
'
" class="select_citygml"><label for="citygml_
'
+
feature
.
getId
()
+
'
">
'
+
feature
[
'
name
'
]
+
'
</label>
'
;
}
else
{
...
...
@@ -247,12 +245,10 @@ var regionChooser = (function(){
$
(
"
html
"
).
addClass
(
"
wait
"
);
console
.
log
(
"
Selected region is written in
"
+
srsName
+
"
coordinate system.
"
);
try
{
console
.
log
(
"
Before JAVA
"
);
fxapp
.
downloadRegionFromCityGML
(
sketchAsWKT
(
srsName
),
project
,
citygmlNames
.
join
(
"
;
"
),
srsName
);
console
.
log
(
"
After JAVA
"
);
dataPanel
.
append
(
"
<h2 class='ok'>Done!</h2><br/>
\n
"
);
}
catch
(
e
)
{
console
.
log
(
"
ERROR
"
+
e
);
console
.
log
(
"
ERROR
:
"
+
e
);
dataPanel
.
append
(
"
<h2 class='error'>Some problem occured!</h2><br/>
\n
"
);
}
var
end
=
new
Date
().
getTime
();
...
...
@@ -288,6 +284,9 @@ var regionChooser = (function(){
dataPanel
.
append
(
wgs84_coords
+
"
<br/>
\n
"
);
}
dataPanel
.
append
(
"
<h3 class='clean'>Area :
"
+
(
area
/
10000
).
toFixed
(
1
)
+
"
ha
\n
"
);
//TODO: Add selectAll
//TODO: Add selectNone
//TODO: Hide button if empty
dataPanel
.
append
(
'
<button type="button" onclick="regionChooser.clickety_click()" id="download" style="visibility:hidden">Download Region</button>
'
);
dataPanel
.
append
(
'
<br/>
\n
'
);
findIntersections
();
...
...
@@ -372,15 +371,11 @@ var regionChooser = (function(){
}
publicScope
.
clickety_click
=
function
()
{
console
.
log
(
"
You clicked pretty well
"
);
var
checkedBoxes
=
Array
.
from
(
document
.
querySelectorAll
(
"
input.select_citygml
"
)).
filter
(
c
=>
c
.
checked
);
if
(
checkedBoxes
.
length
===
0
){
console
.
log
(
"
You should select at least one citygml, though.
"
);
}
else
{
checkedBoxes
.
forEach
(
c
=>
{
console
.
log
(
"
Nice! You checked Citygml
"
+
c
.
id
)
});
publicScope
.
downloadRegionFromCityGML
(
checkedBoxes
.
map
(
c
=>
c
.
id
));
publicScope
.
downloadRegionFromCityGML
(
checkedBoxes
.
map
(
c
=>
c
.
id
));
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets