[Git][java-team/spatial4j-0.4][master] 4 commits: Declare compliance with Debian Policy 4.6.0.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Fri Nov 12 21:45:25 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / spatial4j-0.4
Commits:
7c9a9267 by Markus Koschany at 2021-11-12T22:36:34+01:00
Declare compliance with Debian Policy 4.6.0.
- - - - -
1d934a7f by Markus Koschany at 2021-11-12T22:37:37+01:00
Remove get-orig-source target.
- - - - -
835ef28a by Markus Koschany at 2021-11-12T22:40:10+01:00
Fix FTBFS with jts 18.1.
Closes: #997782
- - - - -
3d72275a by Markus Koschany at 2021-11-12T22:41:10+01:00
Update changelog
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/patches/carrotsearch_junit.patch
- debian/patches/jts-1.15.patch
- + debian/patches/jts-18.1.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+spatial4j-0.4 (0.4.1-7) unstable; urgency=medium
+
+ * Team upload.
+ * Declare compliance with Debian Policy 4.6.0.
+ * Remove get-orig-source target.
+ * Fix FTBFS with jts 18.1. (Closes: #997782)
+
+ -- Markus Koschany <apo at debian.org> Fri, 12 Nov 2021 22:40:54 +0100
+
spatial4j-0.4 (0.4.1-6) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13),
libmaven-install-plugin-java,
libslf4j-java,
maven-debian-helper (>= 1.6.5)
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Vcs-Git: https://salsa.debian.org/java-team/spatial4j-0.4.git
Vcs-Browser: https://salsa.debian.org/java-team/spatial4j-0.4
Homepage: https://github.com/locationtech/spatial4j
=====================================
debian/patches/carrotsearch_junit.patch
=====================================
@@ -1,12 +1,31 @@
-Description: Fix FTBFS caused by update of carrotsearch-randomizedtesting
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 12 Nov 2021 22:37:58 +0100
+Subject: Fix FTBFS caused by update of carrotsearch-randomizedtesting
upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b791585fcd95907f944d87fb6
-
---
+ src/test/java/com/spatial4j/core/distance/TestDistances.java | 2 ++
+ src/test/java/com/spatial4j/core/io/BinaryCodecTest.java | 2 ++
+ src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java | 4 ++++
+ src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java | 4 ++++
+ src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java | 3 +++
+ src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java | 2 ++
+ src/test/java/com/spatial4j/core/io/WktShapeParserTest.java | 4 ++++
+ src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java | 2 ++
+ src/test/java/com/spatial4j/core/shape/BufferedLineTest.java | 5 ++++-
+ src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java | 5 +++++
+ src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java | 3 +++
+ .../java/com/spatial4j/core/shape/RectIntersectionTestHelper.java | 4 +++-
+ src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java | 2 ++
+ src/test/java/com/spatial4j/core/shape/TestShapes2D.java | 3 +++
+ src/test/java/com/spatial4j/core/shape/TestShapesGeo.java | 3 +++
+ 15 files changed, 46 insertions(+), 2 deletions(-)
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/distance/TestDistances.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/distance/TestDistances.java
-@@ -27,6 +27,8 @@ import com.spatial4j.core.shape.impl.Poi
+diff --git a/src/test/java/com/spatial4j/core/distance/TestDistances.java b/src/test/java/com/spatial4j/core/distance/TestDistances.java
+index 09c08af..ee6ac4b 100644
+--- a/src/test/java/com/spatial4j/core/distance/TestDistances.java
++++ b/src/test/java/com/spatial4j/core/distance/TestDistances.java
+@@ -27,6 +27,8 @@ import com.spatial4j.core.shape.impl.PointImpl;
import org.junit.Before;
import org.junit.Test;
@@ -15,8 +34,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.distance.DistanceUtils.DEG_TO_KM;
import static com.spatial4j.core.distance.DistanceUtils.KM_TO_DEG;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
+diff --git a/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java b/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
+index 23d9a52..c98ba19 100644
+--- a/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
++++ b/src/test/java/com/spatial4j/core/io/BinaryCodecTest.java
@@ -31,6 +31,8 @@ import java.io.IOException;
import java.text.ParseException;
import java.util.Arrays;
@@ -26,8 +47,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
public class BinaryCodecTest extends RandomizedTest {
final SpatialContext ctx;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
+diff --git a/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java b/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
+index 4e624f3..0f3b2fe 100644
+--- a/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsWKTReaderShapeParserTest.java
@@ -29,6 +29,10 @@ import org.junit.Test;
import java.io.IOException;
@@ -39,8 +62,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
public class JtsWKTReaderShapeParserTest extends RandomizedTest {
final SpatialContext ctx;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+diff --git a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+index 10fa16a..72d2f4c 100644
+--- a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
@@ -32,6 +32,10 @@ import java.text.ParseException;
import java.util.Arrays;
import java.util.Collections;
@@ -52,8 +77,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
public class JtsWktShapeParserTest extends WktShapeParserTest {
//By extending WktShapeParserTest we inherit its test too
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
+diff --git a/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java b/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
+index c76a162..c08988c 100644
+--- a/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
++++ b/src/test/java/com/spatial4j/core/io/ShapeReadWriterTest.java
@@ -27,6 +27,9 @@ import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
@@ -64,8 +91,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
@SuppressWarnings("unchecked")
public class ShapeReadWriterTest extends RandomizedTest {
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
+diff --git a/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java b/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
+index 0f01efb..33ade35 100644
+--- a/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/WktCustomShapeParserTest.java
@@ -25,6 +25,8 @@ import org.junit.Test;
import java.text.ParseException;
@@ -75,8 +104,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
public class WktCustomShapeParserTest extends WktShapeParserTest {
static class CustomShape extends PointImpl {
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
+diff --git a/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java b/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
+index 40e3aaf..456cf43 100644
+--- a/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/WktShapeParserTest.java
@@ -28,6 +28,10 @@ import java.text.ParseException;
import java.util.Arrays;
import java.util.Collections;
@@ -88,9 +119,11 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
public class WktShapeParserTest extends RandomizedTest {
final SpatialContext ctx;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
-@@ -26,6 +26,8 @@ import com.spatial4j.core.shape.impl.Rec
+diff --git a/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java b/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
+index 12d448d..3d81036 100755
+--- a/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
++++ b/src/test/java/com/spatial4j/core/shape/AbstractTestShapes.java
+@@ -26,6 +26,8 @@ import com.spatial4j.core.shape.impl.RectangleImpl;
import org.junit.Rule;
import org.junit.Test;
@@ -99,8 +132,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
+diff --git a/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java b/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
+index 68c0f68..e99c6e6 100644
+--- a/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
++++ b/src/test/java/com/spatial4j/core/shape/BufferedLineTest.java
@@ -32,6 +32,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
@@ -111,15 +146,17 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
public class BufferedLineTest extends RandomizedTest {
private final SpatialContext ctx = new SpatialContextFactory()
-@@ -181,4 +184,4 @@ public class BufferedLineTest extends Ra
+@@ -181,4 +184,4 @@ public class BufferedLineTest extends RandomizedTest {
}
}
-}
\ No newline at end of file
+}
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+diff --git a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+index bf15ca6..7aebb39 100755
+--- a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
++++ b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
@@ -37,6 +37,11 @@ import java.io.InputStreamReader;
import java.text.ParseException;
import java.util.Random;
@@ -132,9 +169,11 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
-@@ -22,6 +22,9 @@ import com.spatial4j.core.context.Spatia
+diff --git a/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java b/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
+index 360e948..bc34033 100644
+--- a/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
++++ b/src/test/java/com/spatial4j/core/shape/RandomizedShapeTest.java
+@@ -22,6 +22,9 @@ import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUtils;
import com.spatial4j.core.shape.impl.Range;
@@ -144,9 +183,11 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.WITHIN;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
-@@ -22,6 +22,8 @@ import com.spatial4j.core.context.Spatia
+diff --git a/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java b/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
+index 8bdd616..227a561 100644
+--- a/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
++++ b/src/test/java/com/spatial4j/core/shape/RectIntersectionTestHelper.java
+@@ -22,6 +22,8 @@ import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.impl.InfBufLine;
import com.spatial4j.core.shape.impl.PointImpl;
@@ -155,15 +196,17 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
-@@ -173,4 +175,4 @@ public abstract class RectIntersectionTe
+@@ -173,4 +175,4 @@ public abstract class RectIntersectionTestHelper<S extends Shape> extends Random
return ctx.makeRectangle(minX, maxX, minY, maxY);
}
-}
\ No newline at end of file
+}
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
+diff --git a/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java b/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
+index 24ded8f..9a15538 100644
+--- a/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
++++ b/src/test/java/com/spatial4j/core/shape/ShapeCollectionTest.java
@@ -29,6 +29,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -173,8 +216,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
/** @author David Smiley - dsmiley at mitre.org */
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
+diff --git a/src/test/java/com/spatial4j/core/shape/TestShapes2D.java b/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
+index eeac0b8..31966c6 100644
+--- a/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
++++ b/src/test/java/com/spatial4j/core/shape/TestShapes2D.java
@@ -33,6 +33,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -185,8 +230,10 @@ upstream link: https://github.com/locationtech/spatial4j/commit/135c3b87cb32994b
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.DISJOINT;
import static com.spatial4j.core.shape.SpatialRelation.INTERSECTS;
---- spatial4j-0.4-0.4.1.orig/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
-+++ spatial4j-0.4-0.4.1/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
+diff --git a/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java b/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
+index b2d133d..0d8d04a 100644
+--- a/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
++++ b/src/test/java/com/spatial4j/core/shape/TestShapesGeo.java
@@ -29,6 +29,9 @@ import org.junit.Test;
import java.util.Arrays;
=====================================
debian/patches/jts-1.15.patch
=====================================
@@ -1,6 +1,24 @@
-Description: Update for JTS 1.15.
-Author: Bas Couwenberg <sebastic at debian.org>
+From: Bas Couwenberg <sebastic at debian.org>
+Date: Fri, 12 Nov 2021 22:37:58 +0100
+Subject: Update for JTS 1.15.
+---
+ pom.xml | 6 ++--
+ .../core/context/jts/JtsSpatialContext.java | 6 ++--
+ .../core/context/jts/JtsSpatialContextFactory.java | 12 +++----
+ .../com/spatial4j/core/io/jts/JtsBinaryCodec.java | 16 ++++-----
+ .../core/io/jts/JtsWKTReaderShapeParser.java | 18 +++++-----
+ .../spatial4j/core/io/jts/JtsWktShapeParser.java | 20 +++++------
+ .../com/spatial4j/core/shape/jts/JtsGeometry.java | 40 +++++++++++-----------
+ .../com/spatial4j/core/shape/jts/JtsPoint.java | 10 +++---
+ .../com/spatial4j/core/io/JtsBinaryCodecTest.java | 8 ++---
+ .../spatial4j/core/io/JtsWktShapeParserTest.java | 4 +--
+ .../java/com/spatial4j/core/io/PolygonBuilder.java | 10 +++---
+ .../com/spatial4j/core/shape/JtsGeometryTest.java | 8 ++---
+ 12 files changed, 79 insertions(+), 79 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index e45e6d5..e269378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,10 +103,10 @@
@@ -17,9 +35,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
<optional>true</optional>
<exclusions>
<exclusion>
+diff --git a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
+index 08dba9a..6289dbb 100755
--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
+++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
-@@ -25,8 +25,8 @@ import com.spatial4j.core.shape.Rectangl
+@@ -25,8 +25,8 @@ import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.jts.JtsGeometry;
import com.spatial4j.core.shape.jts.JtsPoint;
@@ -30,7 +50,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
import java.util.ArrayList;
import java.util.Collection;
-@@ -190,7 +190,7 @@ public class JtsSpatialContext extends S
+@@ -190,7 +190,7 @@ public class JtsSpatialContext extends SpatialContext {
/**
* INTERNAL
@@ -39,6 +59,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
*
* @param geom Non-null
* @param dateline180Check if both this is true and {@link #isGeo()}, then JtsGeometry will check
+diff --git a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
+index 1c35d9b..95f1ad2 100644
--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
+++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
@@ -20,10 +20,10 @@ package com.spatial4j.core.context.jts;
@@ -68,9 +90,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
* </DL>
*/
public class JtsSpatialContextFactory extends SpatialContextFactory {
+diff --git a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+index 6d4ee6f..7050c12 100644
--- a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+++ b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
-@@ -22,14 +22,14 @@ import com.spatial4j.core.context.jts.Jt
+@@ -22,14 +22,14 @@ import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
import com.spatial4j.core.exception.InvalidShapeException;
import com.spatial4j.core.io.BinaryCodec;
import com.spatial4j.core.shape.Shape;
@@ -93,9 +117,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
import java.io.DataInput;
import java.io.DataOutput;
+diff --git a/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java b/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
+index e5cf1dc..efc15d8 100644
--- a/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
+++ b/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
-@@ -23,19 +23,19 @@ import com.spatial4j.core.distance.Dista
+@@ -23,19 +23,19 @@ import com.spatial4j.core.distance.DistanceUtils;
import com.spatial4j.core.exception.InvalidShapeException;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.jts.JtsPoint;
@@ -121,7 +147,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
* not {@link com.spatial4j.core.shape.ShapeCollection}</li>
* <li>'Z' coordinates are saved into the geometry</li>
* </ul>
-@@ -55,7 +55,7 @@ public class JtsWKTReaderShapeParser ext
+@@ -55,7 +55,7 @@ public class JtsWKTReaderShapeParser extends JtsWktShapeParser {
}
/**
@@ -130,7 +156,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
* @param str
* @param reader <pre>new WKTReader(ctx.getGeometryFactory()))</pre>
* @return Non-Null
-@@ -67,8 +67,8 @@ public class JtsWKTReaderShapeParser ext
+@@ -67,8 +67,8 @@ public class JtsWKTReaderShapeParser extends JtsWktShapeParser {
//Normalizes & verifies coordinates
checkCoordinates(geom);
@@ -141,6 +167,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
if (ctx.useJtsPoint())
return new JtsPoint(ptGeom, ctx);
else
+diff --git a/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java b/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
+index 991350d..e07e2c3 100644
--- a/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
+++ b/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
@@ -24,13 +24,13 @@ import com.spatial4j.core.shape.Point;
@@ -164,7 +192,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
import java.text.ParseException;
import java.util.ArrayList;
-@@ -226,7 +226,7 @@ public class JtsWktShapeParser extends W
+@@ -226,7 +226,7 @@ public class JtsWktShapeParser extends WktShapeParser {
}
/**
@@ -173,7 +201,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
* It's akin to {@link #point(com.spatial4j.core.io.WktShapeParser.State)} but for
* a JTS Coordinate. Only the first 2 numbers are parsed; any remaining are ignored.
*/
-@@ -298,7 +298,7 @@ public class JtsWktShapeParser extends W
+@@ -298,7 +298,7 @@ public class JtsWktShapeParser extends WktShapeParser {
/** Geometries will not be validated (because it's kinda expensive to calculate). You may or may
* not ultimately get an error at some point; results are undefined. However, note that
* coordinates will still be validated for falling within the world boundaries.
@@ -182,7 +210,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
none,
/** Geometries will be explicitly validated on creation, possibly resulting in an exception:
-@@ -307,7 +307,7 @@ public class JtsWktShapeParser extends W
+@@ -307,7 +307,7 @@ public class JtsWktShapeParser extends WktShapeParser {
/** Invalid Geometries are repaired by taking the convex hull. The result will very likely be a
* larger shape that matches false-positives, but no false-negatives.
@@ -191,9 +219,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
repairConvexHull,
/** Invalid polygons are repaired using the {@code buffer(0)} technique. From the <a
+diff --git a/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java b/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
+index 6125937..1727694 100755
--- a/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
+++ b/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
-@@ -29,23 +29,23 @@ import com.spatial4j.core.shape.impl.Buf
+@@ -29,23 +29,23 @@ import com.spatial4j.core.shape.impl.BufferedLineString;
import com.spatial4j.core.shape.impl.PointImpl;
import com.spatial4j.core.shape.impl.Range;
import com.spatial4j.core.shape.impl.RectangleImpl;
@@ -234,7 +264,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
import java.util.ArrayList;
import java.util.List;
-@@ -129,7 +129,7 @@ public class JtsGeometry implements Shap
+@@ -129,7 +129,7 @@ public class JtsGeometry implements Shape {
/**
* Adds an index to this class internally to compute spatial relations faster. In JTS this
@@ -243,7 +273,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
* isn't done by default because it takes some time to do the optimization, and it uses more
* memory. Calling this method isn't thread-safe so be careful when this is done. If it was
* already indexed then nothing happens.
-@@ -276,7 +276,7 @@ public class JtsGeometry implements Shap
+@@ -276,7 +276,7 @@ public class JtsGeometry implements Shape {
protected SpatialRelation relate(Geometry oGeom) {
//see http://docs.geotools.org/latest/userguide/library/jts/dim9.html#preparedgeometry
@@ -252,7 +282,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
if (preparedGeometry != null)
return preparedGeometry.disjoint(oGeom) ? SpatialRelation.DISJOINT : SpatialRelation.CONTAINS;
return geom.disjoint(oGeom) ? SpatialRelation.DISJOINT : SpatialRelation.CONTAINS;
-@@ -331,7 +331,7 @@ public class JtsGeometry implements Shap
+@@ -331,7 +331,7 @@ public class JtsGeometry implements Shape {
* If <code>geom</code> spans the dateline, then this modifies it to be a
* valid JTS geometry that extends to the right of the standard -180 to +180
* width such that some points are greater than +180 but some remain less.
@@ -261,9 +291,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
* if needed.
*
* @return The number of times the geometry spans the dateline. >= 0
+diff --git a/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java b/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
+index 4c2bd7e..c8a6a5a 100644
--- a/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
+++ b/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
-@@ -25,23 +25,23 @@ import com.spatial4j.core.shape.Rectangl
+@@ -25,23 +25,23 @@ import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.impl.PointImpl;
@@ -292,9 +324,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
return pointGeom;
}
+diff --git a/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java b/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
+index d7d0c45..1d72a31 100644
--- a/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
+++ b/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
-@@ -21,10 +21,10 @@ import com.carrotsearch.randomizedtestin
+@@ -21,10 +21,10 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.spatial4j.core.context.jts.JtsSpatialContext;
import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
import com.spatial4j.core.shape.Shape;
@@ -309,9 +343,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
import org.junit.Test;
import java.util.Arrays;
+diff --git a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+index e8d0435..10fa16a 100644
--- a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+++ b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
-@@ -24,8 +24,8 @@ import com.spatial4j.core.shape.Rectangl
+@@ -24,8 +24,8 @@ import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.jts.JtsGeometry;
@@ -322,6 +358,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
import org.junit.Test;
import java.text.ParseException;
+diff --git a/src/test/java/com/spatial4j/core/io/PolygonBuilder.java b/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
+index 7fa85cd..ade4df0 100644
--- a/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
+++ b/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
@@ -20,9 +20,9 @@ package com.spatial4j.core.io;
@@ -355,9 +393,11 @@ Author: Bas Couwenberg <sebastic at debian.org>
*/
public class PolygonHoleBuilder {
+diff --git a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+index 725e6bf..bf15ca6 100755
--- a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+++ b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
-@@ -24,10 +24,10 @@ import com.spatial4j.core.context.jts.Jt
+@@ -24,10 +24,10 @@ import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
import com.spatial4j.core.io.jts.JtsWktShapeParser;
import com.spatial4j.core.shape.impl.PointImpl;
import com.spatial4j.core.shape.jts.JtsGeometry;
=====================================
debian/patches/jts-18.1.patch
=====================================
@@ -0,0 +1,31 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 12 Nov 2021 22:39:56 +0100
+Subject: jts-18.1
+
+---
+ src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+index 7050c12..d418259 100644
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+@@ -94,15 +94,17 @@ public class JtsBinaryCodec extends BinaryCodec {
+ InStream inStream = new InStream() {//a strange JTS abstraction
+ boolean first = true;
+ @Override
+- public void read(byte[] buf) throws IOException {
++ public int read(byte[] buf) throws IOException {
+ if (first) {//we don't write JTS's leading BOM so synthesize reading it
+ if (buf.length != 1)
+ throw new IllegalStateException("Expected initial read of one byte, not: " + buf.length);
+ buf[0] = WKBConstants.wkbXDR;//0
+ first = false;
++ return 1;
+ } else {
+ //TODO for performance, specialize for common array lengths: 1, 4, 8
+ dataInput.readFully(buf);
++ return buf.length;
+ }
+ }
+ };
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
jts-1.15.patch
carrotsearch_junit.patch
+jts-18.1.patch
=====================================
debian/rules
=====================================
@@ -3,5 +3,3 @@
%:
dh $@ --buildsystem=maven
-get-orig-source:
- uscan --download-current-version --force-download --rename
View it on GitLab: https://salsa.debian.org/java-team/spatial4j-0.4/-/compare/bc7ab12a833c00d812a6efef6d4cf0864ce18b56...3d72275ad01e4507f77c423e5e802e78b5b6bedd
--
View it on GitLab: https://salsa.debian.org/java-team/spatial4j-0.4/-/compare/bc7ab12a833c00d812a6efef6d4cf0864ce18b56...3d72275ad01e4507f77c423e5e802e78b5b6bedd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20211112/0f5ea4a3/attachment.htm>
More information about the pkg-java-commits
mailing list