You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/09/06 13:47:08 UTC
[25/50] lucene-solr:jira/solr-11285: LUCENE-7947: Add GeoPointShape
interface etc. Committed on behalf of Ignacio Vera.
LUCENE-7947: Add GeoPointShape interface etc. Committed on behalf of Ignacio Vera.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/98b9c580
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/98b9c580
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/98b9c580
Branch: refs/heads/jira/solr-11285
Commit: 98b9c5802e12fe844afd11312a0866a09c0776df
Parents: 54d760f
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Aug 31 08:47:00 2017 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Aug 31 08:47:00 2017 -0400
----------------------------------------------------------------------
.../spatial3d/geom/GeoDegeneratePoint.java | 2 +-
.../lucene/spatial3d/geom/GeoPointShape.java | 25 +++++++++++++
.../spatial3d/geom/GeoPointShapeFactory.java | 38 ++++++++++++++++++++
3 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98b9c580/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePoint.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePoint.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePoint.java
index b6c54fa..572d00a 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePoint.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePoint.java
@@ -25,7 +25,7 @@ import java.io.IOException;
*
* @lucene.internal
*/
-class GeoDegeneratePoint extends GeoPoint implements GeoBBox, GeoCircle {
+class GeoDegeneratePoint extends GeoPoint implements GeoPointShape {
/** Current planet model, since we don't extend BasePlanetObject */
protected final PlanetModel planetModel;
/** Edge point is an area containing just this */
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98b9c580/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShape.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShape.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShape.java
new file mode 100644
index 0000000..f0bb721
--- /dev/null
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShape.java
@@ -0,0 +1,25 @@
+/*
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.apache.lucene.spatial3d.geom;
+
+/**
+ * Interface describing a GeoPointShape shape.It may represents a degenerated
+ * bounding box or a degenerated circle, hence it extends such interfaces.
+ */
+public interface GeoPointShape extends GeoCircle, GeoBBox {
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98b9c580/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShapeFactory.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShapeFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShapeFactory.java
new file mode 100644
index 0000000..4de0d05
--- /dev/null
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPointShapeFactory.java
@@ -0,0 +1,38 @@
+/*
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.apache.lucene.spatial3d.geom;
+
+/**
+ * Class which constructs a GeoPointShape.
+ */
+public class GeoPointShapeFactory {
+
+ private GeoPointShapeFactory() {
+ }
+
+ /**
+ * Create a GeoPointShape with the provided information.
+ * @param planetModel the planet model
+ * @param lat the latitude
+ * @param lon the longitude
+ * @return a GeoPointShape corresponding to what was specified.
+ */
+ public static GeoPointShape makeGeoPointShape(final PlanetModel planetModel, final double lat, final double lon) {
+ return new GeoDegeneratePoint(planetModel, lat, lon);
+ }
+}