remove getters/setters from newly-configurable streetlayer variables

Author: mattwigway

src/main/java/com/conveyal/r5/streets/LinkedPointSet.java

@@ -323,7 +323,7 @@ private void linkPointsToStreets (boolean all) {
                 double pointLatFixed = floatingDegreesToFixed(pointSet.getLat(p));
                 double pointLonFixed = floatingDegreesToFixed(pointSet.getLon(p));
                 Envelope pointEnvelopeFixed = new Envelope(pointLonFixed, pointLonFixed, pointLatFixed, pointLatFixed);
-                double radiusMeters = streetLayer.getPointsetLinkRadiusMeters();
+                double radiusMeters = streetLayer.pointsetLinkRadiusMeters;
                 if (edges[p] != -1) {
                     radiusMeters = this.distancesToEdge_mm[p] / 1000.0;
                 }
@@ -335,7 +335,7 @@ private void linkPointsToStreets (boolean all) {
             if (relinkThisPoint) {
                 // Use radius from StreetLayer such that maximum origin and destination walk distances are symmetric.
                 Split split = streetLayer.findSplit(pointSet.getLat(p), pointSet.getLon(p),
-                        streetLayer.getPointsetLinkRadiusMeters(), streetMode);
+                        streetLayer.pointsetLinkRadiusMeters, streetMode);
                 if (split == null) {
                     edges[p] = -1;
                 } else {

src/main/java/com/conveyal/r5/streets/StreetLayer.java

@@ -95,33 +95,21 @@ public class StreetLayer implements Serializable, Cloneable {
      * to mind), or islands that are isolated by infrastructure (for example, airport terminals reachable
      * only by transit or driving, for instance BWI or SFO).
      */
-    private int minSubgraphSize = 40;
-
-    public int getMinSubgraphSize() {
-        return minSubgraphSize;
-    }
+    public int minSubgraphSize = 40;
 
     /**
      * The radius of a circle in meters within which to search for nearby streets when linking stops/park and rides.
      * 
      * The default, 1.6km, is really far to walk off a street. But some places have offices in the middle of big parking lots.
      */
-    private double stopLinkRadiusMeters = 1600;
-
-    public double getStopLinkRadiusMeters() {
-        return stopLinkRadiusMeters;
-    }
+    public double stopLinkRadiusMeters = 1600;
 
     /**
      * The radius of a circle in meters within which to search for nearby streets when linking pointsets/origins/destinations.
      * 
      * The default, 1.6km is really far to walk off a street. But some places have offices in the middle of big parking lots.
      */
-    private double pointsetLinkRadiusMeters = 1600;
-    
-    public double getPointsetLinkRadiusMeters() {
-        return pointsetLinkRadiusMeters;
-    }
+    public double pointsetLinkRadiusMeters = 1600;
 
     /**
      * Searching for streets takes a fair amount of computation, and the number of streets examined grows roughly as

src/main/java/com/conveyal/r5/streets/StreetRouter.java

@@ -323,7 +323,7 @@ public StreetRouter (StreetLayer streetLayer) {
      * @return true if an edge was found near the specified coordinate
      */
     public boolean setOrigin (double lat, double lon) {
-        Split split = streetLayer.findSplit(lat, lon, streetLayer.getPointsetLinkRadiusMeters(), streetMode);
+        Split split = streetLayer.findSplit(lat, lon, streetLayer.pointsetLinkRadiusMeters, streetMode);
         if (split == null) {
             LOG.info("No street was found near the specified origin point of {}, {}.", lat, lon);
             return false;
@@ -433,7 +433,7 @@ public void setOrigin(TIntObjectMap<State> previousStates, int switchTime, int s
      * @return true if edge was found near wanted coordinate
      */
     public boolean setDestination (double lat, double lon) {
-        this.destinationSplit = streetLayer.findSplit(lat, lon, streetLayer.getPointsetLinkRadiusMeters(), streetMode);
+        this.destinationSplit = streetLayer.findSplit(lat, lon, streetLayer.pointsetLinkRadiusMeters, streetMode);
         return this.destinationSplit != null;
     }
 
@@ -830,7 +830,7 @@ public Split getDestinationSplit() {
      * @return
      */
     public State getState(double lat, double lon) {
-        Split split = streetLayer.findSplit(lat, lon, streetLayer.getPointsetLinkRadiusMeters(), streetMode);
+        Split split = streetLayer.findSplit(lat, lon, streetLayer.pointsetLinkRadiusMeters, streetMode);
         if (split == null) {
             LOG.info("No street was found near the specified origin point of {}, {}.", lat, lon);
             return null;

src/test/java/com/conveyal/r5/streets/StreetLayerTest.java

@@ -450,9 +450,9 @@ public void testConfigurableSplitDistancesAndIslandRemoval() {
             sl.buildEdgeLists();
             sl.indexStreets();
 
-            assertEquals(sl.getStopLinkRadiusMeters(), 50d * multiplier);
-            assertEquals(sl.getPointsetLinkRadiusMeters(), 100d * multiplier);
-            assertEquals(sl.getMinSubgraphSize(), 5 * multiplier);
+            assertEquals(sl.stopLinkRadiusMeters, 50d * multiplier);
+            assertEquals(sl.pointsetLinkRadiusMeters, 100d * multiplier);
+            assertEquals(sl.minSubgraphSize, 5 * multiplier);
 
             // This is an island with size 6: https://www.openstreetmap.org/way/140476882#map=19/39.409392/-76.642615&layers=D
             // Because it is at the edge of the PBF, West Joppa Road is not in the PBF, so Riderwood Stn and