Updated name of the freehand route methods in ORSGraphHopper

GIScience · Feb 25, 2019 · 3e90ed5 · 3e90ed5 · MichaelsJP · Feb 25, 2019
1 parent 6247c21
commit 3e90ed5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/openrouteservice/src/main/java/heigit/ors/routing/RoutingProfile.java b/openrouteservice/src/main/java/heigit/ors/routing/RoutingProfile.java
@@ -762,7 +762,7 @@ else if (bearings[1] == null)
                 req.getHints().put("astarbi.approximation", _astarApproximation);
 
             if (directedSegment) {
-                resp = mGraphHopper.constructAirLineRoute(req);
+                resp = mGraphHopper.constructFreeHandRoute(req);
             } else {
                 mGraphHopper.setSimplifyResponse(geometrySimplify);
                 resp = mGraphHopper.route(req);

diff --git a/openrouteservice/src/main/java/heigit/ors/routing/graphhopper/extensions/ORSGraphHopper.java b/openrouteservice/src/main/java/heigit/ors/routing/graphhopper/extensions/ORSGraphHopper.java
@@ -246,16 +246,16 @@ protected void cleanUp() {
     }
 
 
-    public GHResponse constructAirLineRoute(GHRequest request) {
-        LineString directRouteGeometry = constructAirLineRouteGeometry(request);
-        PathWrapper directRoutePathWrapper = constructAirLineRoutePathWrapper(directRouteGeometry);
+    public GHResponse constructFreeHandRoute(GHRequest request) {
+        LineString directRouteGeometry = constructFreeHandRouteGeometry(request);
+        PathWrapper directRoutePathWrapper = constructFreeHandRoutePathWrapper(directRouteGeometry);
         GHResponse directRouteResponse = new GHResponse();
         directRouteResponse.add(directRoutePathWrapper);
         directRouteResponse.getHints().put("skipped_segment", "true");
         return directRouteResponse;
     }
 
-    private PathWrapper constructAirLineRoutePathWrapper(LineString lineString) {
+    private PathWrapper constructFreeHandRoutePathWrapper(LineString lineString) {
         PathWrapper pathWrapper = new PathWrapper();
         PointList pointList = new PointList();
         PointList startPointList = new PointList();
@@ -291,7 +291,7 @@ private PathWrapper constructAirLineRoutePathWrapper(LineString lineString) {
         return pathWrapper;
     }
 
-    private LineString constructAirLineRouteGeometry(GHRequest request){
+    private LineString constructFreeHandRouteGeometry(GHRequest request){
         Coordinate start = new Coordinate();
         Coordinate end = new Coordinate();
         start.x = request.getPoints().get(0).getLat();

diff --git a/...teservice/src/test/java/heigit/ors/routing/graphhopper/extensions/ORSGraphHopperTest.java b/...teservice/src/test/java/heigit/ors/routing/graphhopper/extensions/ORSGraphHopperTest.java
@@ -15,7 +15,7 @@ public class ORSGraphHopperTest {
     @Test
     public void directRouteTest() {
         GHRequest ghRequest = new GHRequest(49.41281601436809, 8.686215877532959, 49.410163456220076, 8.687160015106201);
-        GHResponse ghResponse = new ORSGraphHopper().constructAirLineRoute(ghRequest);
+        GHResponse ghResponse = new ORSGraphHopper().constructFreeHandRoute(ghRequest);
 
         Assert.assertTrue(ghResponse.getHints().has("skipped_segment"));
         Assert.assertTrue(ghResponse.getHints().getBool("skipped_segment", false));