Import new google3 version.

* Generalize and modernize S2ClosestEdgeQuery implementation.
* Add Span to interfaces.
* Use pointer args for query classes when a pointer is stored.
* Add NOTICE file.
* Move LICENSE-2.0.txt to LICENSE.
* Add license header to python file.

Author: jmr

CMakeLists.txt

@@ -109,7 +109,6 @@ install(FILES src/s2/base/casts.h
               src/s2/base/mutex.h
               src/s2/base/port.h
               src/s2/base/spinlock.h
-              src/s2/base/stringprintf.h
         DESTINATION include/s2/base)
 install(FILES src/s2/third_party/absl/algorithm/algorithm.h
         DESTINATION include/s2/third_party/absl/algorithm)
@@ -135,6 +134,8 @@ install(FILES src/s2/third_party/absl/strings/string_view.h
         DESTINATION include/s2/third_party/absl/strings)
 install(FILES src/s2/third_party/absl/strings/internal/fastmem.h
         DESTINATION include/s2/third_party/absl/strings/internal)
+install(FILES src/s2/third_party/absl/types/span.h
+        DESTINATION include/s2/third_party/absl/types)
 install(FILES src/s2/util/bits/bits.h
         DESTINATION include/s2/util/bits)
 install(FILES src/s2/util/btree/btree.h

LICENSE-2.0.txt LICENSE

@@ -0,0 +1,5 @@
+S2 Geometry Library
+Copyright 2017 Google Inc.  All Rights Reserved.
+
+This product includes software developed at
+Google (https://www.google.com/).

NOTICE

@@ -1,4 +1,18 @@
+#
 # Copyright 2006 Google Inc. All Rights Reserved.
+#
+# Licensed 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.
+#
 
 
 

src/s2/pywraps2_test.py

@@ -22,7 +22,7 @@
 //
 // For each input edge, we then determine the sequence of Voronoi regions
 // crossed by that edge, and snap the edge to the corresponding sequence of
-// sites.  (In other words, each input each is replaced by an edge chain.)
+// sites.  (In other words, each input edge is replaced by an edge chain.)
 //
 // The sites are chosen by starting with the set of input vertices, optionally
 // snapping them to discrete point set (such as S2CellId centers or lat/lng E7
@@ -55,8 +55,10 @@
 // Voronoi sites:
 //
 //  - Vertices from all layers contribute to the initial selection of sites.
+//
 //  - Edges in any layer that pass too close to a site can cause new sites to
 //    be added (which affects snapping in all layers).
+//
 //  - Simplification can be thought of as removing sites.  A site can be
 //    removed only if the snapped edges stay within the error bounds of the
 //    corresponding input edges in all layers.
@@ -633,9 +635,9 @@ void S2Builder::AddForcedSites(S2PointIndex<SiteId>* site_index) {
 void S2Builder::ChooseInitialSites(
     S2PointIndex<SiteId>* site_index,
     S2PointIndex<InputVertexId>* rejected_vertex_index) {
-  S2ClosestPointQuery<SiteId> site_query(*site_index);
+  S2ClosestPointQuery<SiteId> site_query(site_index);
   site_query.set_max_distance(snap_radius_);
-  S2ClosestPointQuery<InputVertexId> vertex_query(*rejected_vertex_index);
+  S2ClosestPointQuery<InputVertexId> vertex_query(rejected_vertex_index);
   vertex_query.set_max_distance(min_site_separation_);
 
   // For each input vertex, check whether all existing sites are further away
@@ -720,9 +722,9 @@ void S2Builder::CollectSiteEdges(
     S2PointIndex<SiteId> const& site_index,
     S2PointIndex<InputVertexId> const& rejected_vertex_index) {
   edge_sites_.resize(input_edges_.size());
-  S2ClosestPointQuery<SiteId> site_query(site_index);
+  S2ClosestPointQuery<SiteId> site_query(&site_index);
   site_query.set_max_distance(edge_site_query_radius_);
-  S2ClosestPointQuery<InputVertexId> vertex_query(rejected_vertex_index);
+  S2ClosestPointQuery<InputVertexId> vertex_query(&rejected_vertex_index);
   vertex_query.set_max_distance(min_edge_site_separation_);
   for (InputEdgeId e = 0; e < input_edges_.size(); ++e) {
     InputEdge const& edge = input_edges_[e];
@@ -876,11 +878,12 @@ void S2Builder::AddExtraSite(S2Point const& new_site,
                              vector<InputEdgeId>* snap_queue) {
   SiteId new_site_id = sites_.size();
   sites_.push_back(new_site);
-  S2ClosestEdgeQuery query(input_edge_index);
-  query.set_max_distance(edge_site_query_radius_);
-  query.FindClosestEdges(new_site);
-  for (int k = 0; k < query.num_edges(); ++k) {
-    InputEdgeId e = query.edge_id(k);
+  S2ClosestEdgeQuery::Options options;
+  options.set_max_distance(edge_site_query_radius_);
+  S2ClosestEdgeQuery query(&input_edge_index, options);
+  S2ClosestEdgeQuery::PointTarget target(new_site);
+  for (auto const& result : query.FindClosestEdges(target)) {
+    InputEdgeId e = result.edge_id;
     auto* site_ids = &edge_sites_[e];
     site_ids->push_back(new_site_id);
     SortSitesByDistance(input_vertices_[input_edges_[e].first], site_ids);
@@ -970,14 +973,13 @@ void S2Builder::SnapEdge(InputEdgeId e, vector<SiteId>* chain) const {
     return;
   }
 
+  S2Point const& x = input_vertices_[edge.first];
+  S2Point const& y = input_vertices_[edge.second];
+
   // Optimization: if there is only one nearby site, return.
   // Optimization: if there are exactly two nearby sites, and one is close
   // enough to each vertex, then return.
 
-  // Compute the edge normal.
-  S2Point const& x = input_vertices_[edge.first];
-  S2Point const& y = input_vertices_[edge.second];
-
   // Now iterate through the sites.  We keep track of the sequence of sites
   // that are visited.
   auto const& candidates = edge_sites_[e];
@@ -1052,9 +1054,7 @@ void S2Builder::SnapEdge(InputEdgeId e, vector<SiteId>* chain) const {
   }
   if (s2builder_verbose) {
     std::cout << "(" << edge.first << "," << edge.second << "): ";
-    for (SiteId id : *chain) {
-      std::cout << id << " ";
-    }
+    for (SiteId id : *chain) std::cout << id << " ";
     std::cout << std::endl;
   }
 }

src/s2/s2builder.cc

@@ -29,7 +29,6 @@
 #include "s2/s2builderutil_snap_functions.h"
 #include "s2/s2debug.h"
 #include "s2/s2textformat.h"
-#include "s2/util/gtl/stl_util.h"
 
 using absl::MakeUnique;
 using s2builderutil::IndexedS2PointVectorLayer;

src/s2/s2builderutil_layers_test.cc

@@ -565,7 +565,7 @@ static S1ChordAngle GetDistanceToEdgeBruteForce(
   S2Loop loop(cell);
   S2ShapeIndex index;
   index.Add(absl::MakeUnique<S2Loop::Shape>(&loop));
-  S2CrossingEdgeQuery query(index);
+  S2CrossingEdgeQuery query(&index);
   vector<int> edges;
   if (query.GetCrossings(a, b, index.shape(0), s2shapeutil::CrossingType::ALL,
                          &edges)) {