Kontinuation commented on code in PR #2027: URL: https://github.com/apache/sedona/pull/2027#discussion_r2192487392
########## common/src/main/java/org/apache/sedona/common/S2Geography/ShapeIndexGeography.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.sedona.common.S2Geography; + +import com.esotericsoftware.kryo.io.Input; +import com.esotericsoftware.kryo.io.Output; +import com.esotericsoftware.kryo.io.UnsafeInput; +import com.esotericsoftware.kryo.io.UnsafeOutput; +import com.google.common.geometry.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +public class ShapeIndexGeography extends S2Geography { + public S2ShapeIndex shapeIndex; + + /** Build an empty ShapeIndexGeography. */ + public ShapeIndexGeography() { + super(GeographyKind.SHAPE_INDEX); + this.shapeIndex = new S2ShapeIndex(); + } + + /** Build and immediately add one Geography. */ + public ShapeIndexGeography(S2Geography geog) { + super(GeographyKind.SHAPE_INDEX); + this.shapeIndex = new S2ShapeIndex(); + addIndex(geog); + } + + /** Create a ShapeIndexGeography with a custom max-edges-per-cell. */ + public ShapeIndexGeography(int maxEdgesPerCell) { + super(GeographyKind.SHAPE_INDEX); + S2ShapeIndex.Options options = new S2ShapeIndex.Options(); + options.setMaxEdgesPerCell(maxEdgesPerCell); + this.shapeIndex = new S2ShapeIndex(options); + } + + @Override + public int dimension() { + return -1; + } + + @Override + public int numShapes() { + return shapeIndex.getShapes().size(); + } + + @Override + public S2Shape shape(int id) { + S2Shape raw = shapeIndex.getShapes().get(id); + return raw; + } + + @Override + public S2Region region() { + return new S2ShapeIndexRegion(shapeIndex); + } + /** + * Index every S2Shape from the given Geography. + * + * @return the last shapeId assigned. + */ + public int addIndex(S2Geography geog) { + int lastId = -1; + for (int i = 0, n = geog.numShapes(); i < n; i++) { + shapeIndex.add(geog.shape(i)); + // since add() appends to the end, its index is size-1 + lastId = shapeIndex.getShapes().size(); + } + // C++ return ID as size of set: + // int MutableS2ShapeIndex::Add(unique_ptr<S2Shape> shape) { + // // Additions are processed lazily by ApplyUpdates(). Note that in order to + // // avoid unexpected client behavior, this method continues to add shapes + // // even once the specified S2MemoryTracker limit has been exceeded. + // const int id = shapes_.size(); + // shape->id_ = id; + // mem_tracker_.AddSpace(&shapes_, 1); + // shapes_.push_back(std::move(shape)); + // MarkIndexStale(); + // return id; + return lastId; + } Review Comment: I don't find the result of `ShapeIndexGeography::Add` being used anywhere in C++ code. We can change the return type to void. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
