From 53158b6ef5036ac802f9161a8045e2807c9eb0f7 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 04 2014 13:25:01 +0000 Subject: Commit missing patch --- diff --git a/0001-update-to-spatial4j-0.4.patch b/0001-update-to-spatial4j-0.4.patch new file mode 100644 index 0000000..019203d --- /dev/null +++ b/0001-update-to-spatial4j-0.4.patch @@ -0,0 +1,44 @@ +From 981ceb96bd347218289cee47419f054d38369711 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 29 Jan 2014 11:05:33 +0100 +Subject: [PATCH] update-to-spatial4j-0.4 + +Signed-off-by: Michael Simacek +--- + .../src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java b/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java +index 2783af3..009278f 100644 +--- a/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java ++++ b/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java +@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.query; + + import com.spatial4j.core.context.SpatialContext; + import com.spatial4j.core.exception.InvalidShapeException; +-import com.spatial4j.core.io.ShapeReadWriter; ++import com.spatial4j.core.io.LegacyShapeReadWriterFormat; + import com.spatial4j.core.shape.Shape; + + import java.util.HashMap; +@@ -31,7 +31,7 @@ import java.util.StringTokenizer; + * Parses a string that usually looks like "OPERATION(SHAPE)" into a {@link SpatialArgs} + * object. The set of operations supported are defined in {@link SpatialOperation}, such + * as "Intersects" being a common one. The shape portion is defined by {@link +- * ShapeReadWriter#readShape(String)}. There are some optional name-value pair parameters ++ * LegacyShapeReadWriterFormat#readShape(String)}. There are some optional name-value pair parameters + * that follow the closing parenthesis. Example: + *
+  *   Intersects(-10,20,-8,22) distErrPct=0.025
+@@ -69,7 +69,7 @@ public class SpatialArgsParser {
+    * @param ctx The spatial context. Mandatory.
+    * @return Not null.
+    * @throws IllegalArgumentException If there is a problem parsing the string.
+-   * @throws InvalidShapeException  Thrown from {@link ShapeReadWriter#readShape(String)}
++   * @throws InvalidShapeException  Thrown from {@link LegacyShapeReadWriterFormat#readShape(String)}
+    */
+   public SpatialArgs parse(String v, SpatialContext ctx) throws IllegalArgumentException, InvalidShapeException {
+     int idx = v.indexOf('(');
+-- 
+1.8.5.3
+