Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
giscience
big-data
ohsome
helpers
oshdb extract generator
Commits
702a778b
Verified
Commit
702a778b
authored
Dec 14, 2020
by
Martin Raifer
Browse files
drop useless parentheses
parent
aebb4908
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/heigit/ohsome/clustertools/CreateH2Extract.java
View file @
702a778b
...
...
@@ -120,7 +120,7 @@ public class CreateH2Extract {
"insert into metadata (key,value) values (?,?)"
)
)
{
if
(!
cmdArgs
.
skipExtractRegionCheck
)
{
Geometry
extractRegion
=
(
new
GeoJSONReader
()
)
.
read
(
keytables
.
metadata
(
"extract.region"
));
Geometry
extractRegion
=
new
GeoJSONReader
().
read
(
keytables
.
metadata
(
"extract.region"
));
if
(!
extractRegion
.
contains
(
OSHDBGeometryBuilder
.
getGeometry
(
bbox
)))
{
System
.
err
.
println
(
"error: bbox not fully contained in input region"
);
System
.
exit
(
2
);
...
...
@@ -141,7 +141,7 @@ public class CreateH2Extract {
Set
<
OSHDBTag
>
tags
=
new
HashSet
<>();
Set
<
OSHDBRole
>
roles
=
new
HashSet
<>();
TagTranslator
tt
=
new
TagTranslator
(
keytables
.
getConnection
());
FilterExpression
filter
=
(
new
FilterParser
(
tt
)
)
.
parse
(
cmdArgs
.
filter
!=
null
FilterExpression
filter
=
new
FilterParser
(
tt
).
parse
(
cmdArgs
.
filter
!=
null
?
cmdArgs
.
filter
:
"type:node or type:way or type:relation"
);
ScanQuery
<
Long
,
GridOSHEntity
>
scanQuery
=
new
ScanQuery
<>((
key
,
cell
)
->
{
...
...
@@ -297,7 +297,7 @@ public class CreateH2Extract {
String
metadataValue
=
metadata
.
getString
(
2
);
insertMetadata
.
setString
(
1
,
metadataKey
);
if
(
metadataKey
.
equalsIgnoreCase
(
"extract.region"
))
{
metadataValue
=
(
new
GeoJSONWriter
()
)
metadataValue
=
new
GeoJSONWriter
()
.
write
(
OSHDBGeometryBuilder
.
getGeometry
(
bbox
)).
toString
();
}
if
(
metadataKey
.
startsWith
(
"data."
))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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