-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #53 from sheinbergon/simplify-25.0
Simplify 25.0
- Loading branch information
Showing
6 changed files
with
149 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
src/main/java/org/sheinbergon/dremio/udf/gis/STSimplifyPreserveTopology.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.sheinbergon.dremio.udf.gis; | ||
|
|
||
| import com.dremio.exec.expr.SimpleFunction; | ||
| import com.dremio.exec.expr.annotations.FunctionTemplate; | ||
| import com.dremio.exec.expr.annotations.Output; | ||
| import com.dremio.exec.expr.annotations.Param; | ||
|
|
||
| import javax.inject.Inject; | ||
|
|
||
| @FunctionTemplate( | ||
| name = "ST_SimplifyPreserveTopology", | ||
| scope = FunctionTemplate.FunctionScope.SIMPLE, | ||
| nulls = FunctionTemplate.NullHandling.INTERNAL, | ||
| costCategory = FunctionTemplate.FunctionCostCategory.COMPLEX) | ||
| public class STSimplifyPreserveTopology implements SimpleFunction { | ||
|
|
||
| @Param | ||
| org.apache.arrow.vector.holders.NullableVarBinaryHolder binaryInput; | ||
|
|
||
| @Param | ||
| org.apache.arrow.vector.holders.Float8Holder toleranceInput; | ||
|
|
||
| @Output | ||
| org.apache.arrow.vector.holders.NullableVarBinaryHolder binaryOutput; | ||
|
|
||
| @Inject | ||
| org.apache.arrow.memory.ArrowBuf buffer; | ||
|
|
||
| public void setup() { | ||
| } | ||
|
|
||
| public void eval() { | ||
| if (org.sheinbergon.dremio.udf.gis.util.GeometryHelpers.isHolderSet(binaryInput)) { | ||
| double tolerance = toleranceInput.value; | ||
| org.locationtech.jts.geom.Geometry geom = org.sheinbergon.dremio.udf.gis.util.GeometryHelpers.toGeometry(binaryInput); | ||
| org.locationtech.jts.simplify.TopologyPreservingSimplifier simplifier = new org.locationtech.jts.simplify.TopologyPreservingSimplifier(geom); | ||
| simplifier.setDistanceTolerance(tolerance); | ||
| org.locationtech.jts.geom.Geometry result = simplifier.getResultGeometry(); | ||
| byte[] bytes = org.sheinbergon.dremio.udf.gis.util.GeometryHelpers.toEWKB(result); | ||
| buffer = buffer.reallocIfNeeded(bytes.length); | ||
| org.sheinbergon.dremio.udf.gis.util.GeometryHelpers.populate(bytes, buffer, binaryOutput); | ||
| } else { | ||
| org.sheinbergon.dremio.udf.gis.util.GeometryHelpers.markHolderNotSet(binaryOutput); | ||
| } | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
src/test/kotlin/org/sheinbergon/dremio/udf/gis/STSimplifyPreserveTopologyTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package org.sheinbergon.dremio.udf.gis | ||
|
|
||
| import org.apache.arrow.vector.holders.Float8Holder | ||
| import org.apache.arrow.vector.holders.NullableVarBinaryHolder | ||
| import org.sheinbergon.dremio.udf.gis.spec.GeometryProcessingFunSpec | ||
| import org.sheinbergon.dremio.udf.gis.util.allocateBuffer | ||
| import org.sheinbergon.dremio.udf.gis.util.reset | ||
|
|
||
| internal class STSimplifyPreserveTopologyTests : GeometryProcessingFunSpec<STSimplifyPreserveTopology>() { | ||
|
|
||
| init { | ||
|
|
||
| beforeEach { | ||
| function.toleranceInput.reset() | ||
| } | ||
|
|
||
| testGeometryProcessing( | ||
| name = "Calling ST_SimplifyPreserveTopology on a MULTILINESTRING with a tolerance of 40.0", | ||
| wkt = """ | ||
| MULTILINESTRING ( | ||
| (20 180, 20 150, 50 150, 50 100, 110 150, 150 140, 170 120), | ||
| (20 10, 80 30, 90 120), | ||
| (90 120, 130 130), | ||
| (130 130, 130 70, 160 40, 180 60, 180 90, 140 80), | ||
| (50 40, 70 40, 80 70, 70 60, 60 60, 50 50, 50 40) | ||
| )""".trimIndent(), | ||
| expected = """ | ||
| MULTILINESTRING( | ||
| (20 180,50 100,110 150,170 120), | ||
| (20 10,90 120), | ||
| (90 120,130 130), | ||
| (130 130,130 70,160 40,180 90,140 80), | ||
| (50 40,70 40,80 70,60 60,50 40) | ||
| )""".trimIndent() | ||
| ) { function.toleranceInput.value = 40.0 } | ||
|
|
||
| testNullGeometryProcessing( | ||
| "Calling ST_SimplifyPreserveTopology on a NULL input" | ||
| ) | ||
| } | ||
|
|
||
| override val function = STSimplifyPreserveTopology().apply { | ||
| binaryInput = NullableVarBinaryHolder() | ||
| toleranceInput = Float8Holder() | ||
| binaryOutput = NullableVarBinaryHolder() | ||
| buffer = allocateBuffer() | ||
| } | ||
|
|
||
| override val STSimplifyPreserveTopology.wkbInput: NullableVarBinaryHolder get() = function.binaryInput | ||
| override val STSimplifyPreserveTopology.wkbOutput: NullableVarBinaryHolder get() = function.binaryOutput | ||
| } |