Address commit feedback & remove $$JR tag.

15 files changed, 19 insertions, 21 deletions

diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp
index a029cf41e8..3411278a61 100644
--- a/src/mbgl/geometry/feature_index.cpp
+++ b/src/mbgl/geometry/feature_index.cpp
@@ -149,7 +149,7 @@ void FeatureIndex::addFeature(
             assert(geometryTileFeature);
         }
 
-        GeometryCollection geometries = geometryTileFeature->getGeometries();
+        const GeometryCollection& geometries = geometryTileFeature->getGeometries();
                 
         bool needsCrossTileIndex = renderLayer->baseImpl->getTypeInfo()->crossTileIndex == style::LayerTypeInfo::CrossTileIndex::Required;
         if (!needsCrossTileIndex &&
@@ -161,7 +161,7 @@ void FeatureIndex::addFeature(
             continue;
         }
 
-        result[layerID].push_back(convertFeature(*geometryTileFeature, geometries, tileID));
+        result[layerID].emplace_back(convertFeature(*geometryTileFeature, geometries, tileID));
     }
 }
 
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index ca44ae87c8..fdc88bc667 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -139,7 +139,7 @@ GeometryCoordinates projectQueryGeometry(const GeometryCoordinates& queryGeometr
 bool RenderCircleLayer::queryIntersectsFeature(
         const GeometryCoordinates& queryGeometry,
         const GeometryTileFeature& feature,
-        const GeometryCollection&, //$$JR
+        const GeometryCollection&, 
         const float zoom,
         const TransformState& transformState,
         const float pixelsToTileUnits,
diff --git a/src/mbgl/renderer/layers/render_circle_layer.hpp b/src/mbgl/renderer/layers/render_circle_layer.hpp
index e6176fda35..40ef9d2ab6 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.hpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.hpp
@@ -21,7 +21,7 @@ private:
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
             const GeometryTileFeature&,
-            const GeometryCollection&, //$$JR
+            const GeometryCollection&, 
             const float,
             const TransformState&,
             const float,
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
index 0bd3f3f8e4..8b67170868 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
@@ -222,7 +222,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters) {
 bool RenderFillExtrusionLayer::queryIntersectsFeature(
         const GeometryCoordinates& queryGeometry,
         const GeometryTileFeature& feature,
-        const GeometryCollection&,//$$JR
+        const GeometryCollection&,
         const float,
         const TransformState& transformState,
         const float pixelsToTileUnits,
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
index 0487405829..07e0c54d62 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
@@ -23,7 +23,7 @@ private:
     bool queryIntersectsFeature(
         const GeometryCoordinates&,
         const GeometryTileFeature&,
-        const GeometryCollection&,//$$JR
+        const GeometryCollection&,
         const float,
         const TransformState&,
         const float,
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp
index 173bd1e1ee..020fafa87c 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -252,7 +252,7 @@ void RenderFillLayer::render(PaintParameters& parameters) {
 bool RenderFillLayer::queryIntersectsFeature(
         const GeometryCoordinates& queryGeometry,
         const GeometryTileFeature& feature,
-        const GeometryCollection&,//$$JR
+        const GeometryCollection&,
         const float,
         const TransformState& transformState,
         const float pixelsToTileUnits,
diff --git a/src/mbgl/renderer/layers/render_fill_layer.hpp b/src/mbgl/renderer/layers/render_fill_layer.hpp
index c9f5ff0624..122f405613 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.hpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.hpp
@@ -24,7 +24,7 @@ private:
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
             const GeometryTileFeature&,
-            const GeometryCollection&,//$$JR
+            const GeometryCollection&,
             const float,
             const TransformState&,
             const float,
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
index 3a8415fede..3ba7d66bad 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
@@ -217,7 +217,7 @@ void RenderHeatmapLayer::updateColorRamp() {
 bool RenderHeatmapLayer::queryIntersectsFeature(
         const GeometryCoordinates& queryGeometry,
         const GeometryTileFeature& feature,
-        const GeometryCollection&,//$$JR
+        const GeometryCollection&,
         const float zoom,
         const TransformState&,
         const float pixelsToTileUnits,
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
index 4c3127c072..cfe89221d9 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.hpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
@@ -25,7 +25,7 @@ private:
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
             const GeometryTileFeature&,
-            const GeometryCollection&,//$$JR
+            const GeometryCollection&,
             const float,
             const TransformState&,
             const float,
diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp
index 803a2bedc5..5504e82044 100644
--- a/src/mbgl/renderer/layers/render_line_layer.cpp
+++ b/src/mbgl/renderer/layers/render_line_layer.cpp
@@ -214,11 +214,11 @@ void RenderLineLayer::render(PaintParameters& parameters) {
     }
 }
 
-GeometryCollection* offsetLine(const GeometryCollection& rings, const double offset) {
+std::unique_ptr<GeometryCollection> offsetLine(const GeometryCollection& rings, const double offset) {
 
     if (offset == 0) return NULL;
 
-    GeometryCollection *newRings = new GeometryCollection();
+    std::unique_ptr<GeometryCollection> newRings = std::make_unique<GeometryCollection>();
 
     Point<double> zero(0, 0);
     for (const auto& ring : rings) {
@@ -249,7 +249,7 @@ GeometryCollection* offsetLine(const GeometryCollection& rings, const double off
 bool RenderLineLayer::queryIntersectsFeature(
         const GeometryCoordinates& queryGeometry,
         const GeometryTileFeature& feature,
-        const GeometryCollection& geometries,//$$JR
+        const GeometryCollection& geometries,
         const float zoom,
         const TransformState& transformState,
         const float pixelsToTileUnits,
@@ -268,7 +268,6 @@ bool RenderLineLayer::queryIntersectsFeature(
                           .evaluate(feature, zoom, style::LineOffset::defaultValue()) * pixelsToTileUnits;
 
     // Apply offset to geometry
-//    auto offsetGeometry = offsetLine(feature.getGeometries(), offset);
     auto offsetGeometry = offsetLine(geometries, offset);
 
     // Test intersection
@@ -278,10 +277,9 @@ bool RenderLineLayer::queryIntersectsFeature(
     if (offsetGeometry) {
         intersects = util::polygonIntersectsBufferedMultiLine(
             translatedQueryGeometry.value_or(queryGeometry),
-            *offsetGeometry,//.value_or(geometries),//feature.getGeometries()),
+            *offsetGeometry,
             halfWidth);
     }
-    delete offsetGeometry;
     return intersects;
 }
 
diff --git a/src/mbgl/renderer/layers/render_line_layer.hpp b/src/mbgl/renderer/layers/render_line_layer.hpp
index 0b7ecdd2fe..faa2425a0b 100644
--- a/src/mbgl/renderer/layers/render_line_layer.hpp
+++ b/src/mbgl/renderer/layers/render_line_layer.hpp
@@ -27,7 +27,7 @@ private:
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
             const GeometryTileFeature&,
-            const GeometryCollection&,//$$JR
+            const GeometryCollection&,
             const float,
             const TransformState&,
             const float,
diff --git a/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp
index d13b9c03f8..40faaf537b 100644
--- a/src/mbgl/renderer/render_layer.hpp
+++ b/src/mbgl/renderer/render_layer.hpp
@@ -91,7 +91,7 @@ public:
     virtual bool queryIntersectsFeature(
             const GeometryCoordinates&,
             const GeometryTileFeature&,
-            const GeometryCollection&,//$$JR
+            const GeometryCollection&,
             const float,
             const TransformState&,
             const float,
diff --git a/src/mbgl/tile/custom_geometry_tile.cpp b/src/mbgl/tile/custom_geometry_tile.cpp
index d64148101a..ae3f037d5a 100644
--- a/src/mbgl/tile/custom_geometry_tile.cpp
+++ b/src/mbgl/tile/custom_geometry_tile.cpp
@@ -83,7 +83,7 @@ void CustomGeometryTile::querySourceFeatures(
                 continue;
             }
 
-            result.push_back(convertFeature(*feature, feature->getGeometries(), id.canonical));
+            result.emplace_back(convertFeature(*feature, feature->getGeometries(), id.canonical));
         }
     }
 }
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index 8990ff55f3..07d26c9e21 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -33,7 +33,7 @@ void GeoJSONTile::querySourceFeatures(
                     continue;
                 }
 
-                result.push_back(convertFeature(*feature, feature->getGeometries(), id.canonical));
+                result.emplace_back(convertFeature(*feature, feature->getGeometries(), id.canonical));
             }
         }
     }
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index f29daa0c70..868bb91788 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -360,7 +360,7 @@ void GeometryTile::querySourceFeatures(
                     continue;
                 }
 
-                result.push_back(convertFeature(*feature, feature->getGeometries(), id.canonical));
+                result.emplace_back(convertFeature(*feature, feature->getGeometries(), id.canonical));
             }
         }
     }