Skip to content

DS-1854: copy non-empty target, clip geom when clip=true #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qGYdXbY2 merged 1 commit into from
Jan 14, 2026
Merged

DS-1854: copy non-empty target, clip geom when clip=true #1727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions xyz-jobs/xyz-job-steps/src/main/java/com/here/xyz/jobs/steps/impl/transport/CopySpace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,11 +517,11 @@ private SQLQuery buildGeoFragment() {

if (geometry != null && clipOnFilterGeometry) {
if( radius > 0 )
return new SQLQuery("ST_Intersection(ST_MakeValid(geo), ST_Buffer(ST_GeomFromText(#{wktGeometryImlCopy})::geography, #{radiusImlCopy})::geometry) as geo")
return new SQLQuery("ST_Intersection(ST_MakeValid(geo), ST_Buffer(ST_GeomFromText(#{wktGeometryImlCopy})::geography, #{radiusImlCopy})::geometry)")
.withNamedParameter("wktGeometryImlCopy", WKTHelper.geometryToWKB(geometry))
.withNamedParameter("radiusImlCopy", radius);
else
return new SQLQuery("ST_Intersection(ST_MakeValid(geo), st_setsrid( ST_GeomFromText( #{wktGeometryImlCopy} ),4326 )) as geo")
return new SQLQuery("ST_Intersection(ST_MakeValid(geo), st_setsrid( ST_GeomFromText( #{wktGeometryImlCopy} ),4326 ))")
.withNamedParameter("wktGeometryImlCopy", WKTHelper.geometryToWKB(geometry));
}
else
Expand Down Expand Up @@ -558,13 +558,14 @@ private SQLQuery buildCopyContentQuery(int threadCount, int threadId, boolean ha

if(! useTableCopy() ) // if searchable col exists always populate to caller
return queryBuilder //TODO: rm workaround --> REGEXP_REPLACE(ST_AsGeojson(ST_Force3D(geo), 8), 'nan', '0', 'gi') AS geo
.withSelectClauseOverride(new SQLQuery("id, jsondata, operation, author, REGEXP_REPLACE(ST_AsGeojson(ST_Force3D(geo), 8), 'nan', '0', 'gi') AS geo ${{SearchableCol}}")
.withSelectClauseOverride(new SQLQuery("id, jsondata, operation, author, REGEXP_REPLACE(ST_AsGeojson(ST_Force3D( ${{PlainGeom}} ), 8), 'nan', '0', 'gi') AS geo ${{SearchableCol}}")
.withQueryFragment("PlainGeom",buildGeoFragment())
.withQueryFragment("SearchableCol", hasSourceSearchableColumn ? ",searchable" : "")
)
.buildQuery(input); //TODO: with author, operation provided in selection the parsing of those values in buildCopySpaceQuery would be obsolete
else
return queryBuilder
.withSelectClauseOverride(new SQLQuery("id, jsondata, operation, author, ${{PlainGeom}} ${{SearchableCol}}")
.withSelectClauseOverride(new SQLQuery("id, jsondata, operation, author, ${{PlainGeom}} as geo ${{SearchableCol}}")
.withQueryFragment("PlainGeom",buildGeoFragment())
.withQueryFragment("SearchableCol", hasSourceSearchableColumn ? ",searchable" : "")
)
Expand Down