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
e5a0ca3a
Commit
e5a0ca3a
authored
1 year ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
Format
parent
ad59df2b
master
No related merge requests found
Pipeline
#8980
passed with stage
in 32 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
+5
-6
.../java/eu/simstadt/regionchooser/RegionChooserBrowser.java
src/main/java/eu/simstadt/regionchooser/RegionExtractor.java
+0
-1
src/main/java/eu/simstadt/regionchooser/RegionExtractor.java
with
5 additions
and
7 deletions
+5
-7
src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
+
5
-
6
View file @
e5a0ca3a
...
...
@@ -43,7 +43,7 @@ public class RegionChooserBrowser extends Region
public
JavaScriptFXBridge
()
{
Preferences
userPrefs
=
Preferences
.
userRoot
().
node
(
"/eu/simstadt/desktop"
);
String
repoString
=
userPrefs
.
get
(
PREF_RECENT_REPOSITORY
,
null
);
repo
=
repoString
==
null
?
null
:
Paths
.
get
(
repoString
);
repo
=
repoString
==
null
?
null
:
Paths
.
get
(
repoString
);
}
/**
...
...
@@ -158,16 +158,15 @@ public void warning(String text) {
}
/*
* NOTE: Users sometime select some_region.proj/ as a repository.
* SimStadt won't show any project in this "repository", but RegionChooser shouldn't complain and
* still be able to extract regions.
* NOTE: Users sometime select some_region.proj/ as a repository. SimStadt won't show any project in this
* "repository", but RegionChooser shouldn't complain and still be able to extract regions.
*/
private
boolean
isRepoAProject
(){
private
boolean
isRepoAProject
()
{
return
repo
.
toString
().
endsWith
(
".proj"
);
}
private
Path
citygmlPath
(
String
project
,
String
citygml
)
{
if
(
isRepoAProject
()){
if
(
isRepoAProject
())
{
return
repo
.
resolve
(
citygml
);
}
else
{
return
repo
.
resolve
(
project
+
".proj"
).
resolve
(
citygml
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/eu/simstadt/regionchooser/RegionExtractor.java
+
0
-
1
View file @
e5a0ca3a
...
...
@@ -99,7 +99,6 @@ static int selectRegionDirectlyFromCityGML(String wktPolygon, String srsName, Wr
if
(
otherObjectsCount
>
0
)
{
LOGGER
.
info
(
"Other objects found in selected region : "
+
otherObjectsCount
);
}
//NOTE: This could be a problem if header starts with <core:CityModel> and footer ends with </CityModel>
sb
.
append
(
citygml
.
getFooter
());
return
foundBuildingsCount
;
}
...
...
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