Skip to content

Commit f8e6be8

Browse files
committed
move TurfSimplify#simplify to TurfTransformation and deprecate PolylineUtils#simplify
1 parent 1e8c70c commit f8e6be8

11 files changed

Lines changed: 341 additions & 153 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
Mapbox welcomes participation and contributions from everyone.
44

55
### main
6+
- Replaced `TurfSimplify#simplify` with `TurfTransformation#simplify`. [#1496](https://github.com/mapbox/mapbox-java/pull/1496)
7+
- Deprecated `PolylineUtils#simplify` in favour of `TurfTransformation#simplify`. [#1496](https://github.com/mapbox/mapbox-java/pull/1496)
68

79
### v6.8.0-beta.4 - September 5, 2022
810
- Added `TurfSimplify#simplify` method to simplify `LineString` using Ramer-Douglas-Peucker algorithm. [#1486](https://github.com/mapbox/mapbox-java/pull/1486)

docs/turf-port.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Below's an on going list of the Turf functions which currently exist inside the
4848
- [ ] turf-dissolve
4949
- [ ] turf-intersect
5050
- [ ] turf-line-offset
51-
- [ ] turf-simplify
51+
- [x] turf-simplify
5252
- [ ] turf-tesselate
5353
- [ ] turf-transform-rotate
5454
- [ ] turf-transform-translate

samples/src/main/java/com/mapbox/samples/BasicTurfSimplify.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.mapbox.geojson.LineString;
99
import com.mapbox.geojson.Point;
1010
import com.mapbox.sample.BuildConfig;
11-
import com.mapbox.turf.TurfSimplify;
11+
import com.mapbox.turf.TurfTransformation;
1212
import retrofit2.Response;
1313

1414
import java.io.IOException;
@@ -20,7 +20,7 @@ public class BasicTurfSimplify {
2020
public static void main(String[] args) throws IOException {
2121
LineString complexLineString = generateLineString();
2222
LineString simplifiedLineString = LineString.fromLngLats(
23-
TurfSimplify.simplify(complexLineString.coordinates(), 0.001, true),
23+
TurfTransformation.simplify(complexLineString.coordinates(), 0.001, true),
2424
complexLineString.bbox()
2525
);
2626
System.out.println("[Turf] complex: " + complexLineString.coordinates());

services-geojson/src/main/java/com/mapbox/geojson/utils/PolylineUtils.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ private static void encode(long variable, StringBuilder result) {
133133
* @return an array of simplified points
134134
* @see <a href="http://mourner.github.io/simplify-js/">JavaScript implementation</a>
135135
* @since 1.2.0
136+
* @deprecated Use TurfTransformation#simplify.
136137
*/
138+
@Deprecated
137139
@NonNull
138140
public static List<Point> simplify(@NonNull List<Point> points) {
139141
return simplify(points, SIMPLIFY_DEFAULT_TOLERANCE, SIMPLIFY_DEFAULT_HIGHEST_QUALITY);
@@ -149,7 +151,9 @@ public static List<Point> simplify(@NonNull List<Point> points) {
149151
* @return an array of simplified points
150152
* @see <a href="http://mourner.github.io/simplify-js/">JavaScript implementation</a>
151153
* @since 1.2.0
154+
* @deprecated Use TurfTransformation#simplify.
152155
*/
156+
@Deprecated
153157
@NonNull
154158
public static List<Point> simplify(@NonNull List<Point> points, double tolerance) {
155159
return simplify(points, tolerance, SIMPLIFY_DEFAULT_HIGHEST_QUALITY);
@@ -165,7 +169,9 @@ public static List<Point> simplify(@NonNull List<Point> points, double tolerance
165169
* @return an array of simplified points
166170
* @see <a href="http://mourner.github.io/simplify-js/">JavaScript implementation</a>
167171
* @since 1.2.0
172+
* @deprecated Use TurfTransformation#simplify.
168173
*/
174+
@Deprecated
169175
@NonNull
170176
public static List<Point> simplify(@NonNull List<Point> points, boolean highestQuality) {
171177
return simplify(points, SIMPLIFY_DEFAULT_TOLERANCE, highestQuality);
@@ -183,7 +189,9 @@ public static List<Point> simplify(@NonNull List<Point> points, boolean highestQ
183189
* @return an array of simplified points
184190
* @see <a href="http://mourner.github.io/simplify-js/">JavaScript implementation</a>
185191
* @since 1.2.0
192+
* @deprecated Use TurfTransformation#simplify.
186193
*/
194+
@Deprecated
187195
@NonNull
188196
public static List<Point> simplify(@NonNull List<Point> points, double tolerance,
189197
boolean highestQuality) {

services-geojson/src/test/java/com/mapbox/geojson/utils/PolylineUtilsTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ public void encode_neverReturnsNull() throws Exception {
123123
}
124124

125125
@Test
126+
@Deprecated
126127
public void simplify_neverReturnsNullButRatherAnEmptyList() throws Exception {
127128
List<Point> simplifiedPath = simplify(new ArrayList<Point>(), PRECISION_6);
128129
assertNotNull(simplifiedPath);
129130
}
130131

131132
@Test
133+
@Deprecated
132134
public void simplify_returnSameListWhenListSizeIsLessThanOrEqualToTwo(){
133135
final List<Point> path = new ArrayList<>();
134136
path.add(Point.fromLngLat(0, 0));
@@ -138,6 +140,7 @@ public void simplify_returnSameListWhenListSizeIsLessThanOrEqualToTwo(){
138140
}
139141

140142
@Test
143+
@Deprecated
141144
public void simplify_withHighestQuality() throws IOException{
142145
List<Point> path = createPointListFromResourceFile(SIMPLIFICATION_INPUT);
143146
List<Point> simplifiedPath = simplify(path, PRECISION_5, true);

services-turf/src/main/java/com/mapbox/turf/TurfSimplify.java

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)