Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Geo: Adds support for GeoJSON GeometryCollection
Closes #2796
- Loading branch information
Showing
6 changed files
with
303 additions
and
5 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
114 changes: 114 additions & 0 deletions
114
src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.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,114 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.common.geo.builders; | ||
|
|
||
| import com.spatial4j.core.shape.Shape; | ||
| import com.spatial4j.core.shape.ShapeCollection; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class GeometryCollectionBuilder extends ShapeBuilder { | ||
|
|
||
| public static final GeoShapeType TYPE = GeoShapeType.GEOMETRYCOLLECTION; | ||
|
|
||
| protected final ArrayList<ShapeBuilder> shapes = new ArrayList<>(); | ||
|
|
||
| public GeometryCollectionBuilder shape(ShapeBuilder shape) { | ||
| this.shapes.add(shape); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder point(PointBuilder point) { | ||
| this.shapes.add(point); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder multiPoint(MultiPointBuilder multiPoint) { | ||
| this.shapes.add(multiPoint); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder line(BaseLineStringBuilder<?> line) { | ||
| this.shapes.add(line); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder multiLine(MultiLineStringBuilder multiLine) { | ||
| this.shapes.add(multiLine); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder polygon(BasePolygonBuilder<?> polygon) { | ||
| this.shapes.add(polygon); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder multiPolygon(MultiPolygonBuilder multiPolygon) { | ||
| this.shapes.add(multiPolygon); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder envelope(EnvelopeBuilder envelope) { | ||
| this.shapes.add(envelope); | ||
| return this; | ||
| } | ||
|
|
||
| public GeometryCollectionBuilder circle(CircleBuilder circle) { | ||
| this.shapes.add(circle); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| builder.startObject(); | ||
| builder.field(FIELD_TYPE, TYPE.shapename); | ||
| builder.startArray(FIELD_GEOMETRIES); | ||
| for (ShapeBuilder shape : shapes) { | ||
| shape.toXContent(builder, params); | ||
| } | ||
| builder.endArray(); | ||
| return builder.endObject(); | ||
| } | ||
|
|
||
| @Override | ||
| public GeoShapeType type() { | ||
| return TYPE; | ||
| } | ||
|
|
||
| @Override | ||
| public Shape build() { | ||
|
|
||
| List<Shape> shapes = new ArrayList<>(this.shapes.size()); | ||
|
|
||
| for (ShapeBuilder shape : this.shapes) { | ||
| shapes.add(shape.build()); | ||
| } | ||
|
|
||
| if (shapes.size() == 1) | ||
| return shapes.get(0); | ||
| else | ||
| return new ShapeCollection<>(shapes, SPATIAL_CONTEXT); | ||
| //note: ShapeCollection is probably faster than a Multi* geom. | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.