fix crash after rework apporach on tile connect neighbour

mg4gh · Apr 12, 2024 · d2ff0f5 · d2ff0f5
1 parent 29c73c0
commit d2ff0f5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/mgmap/src/main/java/mg/mgmap/activity/mgmap/features/grad/FSGraphDetails.java b/mgmap/src/main/java/mg/mgmap/activity/mgmap/features/grad/FSGraphDetails.java
@@ -140,7 +140,7 @@ private BBox getGraphDetails(PointModel pmTap, MultiPointModelImpl multiPointMod
                 GNeighbour neighbour = node.getNeighbour();
                 while ((neighbour = gGraphTile.getNextNeighbour(node, neighbour)) != null) {
                     GNode neighbourNode = neighbour.getNeighbourNode();
-                    if (PointModelUtil.compareTo(node, neighbourNode) < 0){ // neighbour relations exist in both direction - here we can reduce to one
+                    if (GNode.sameTile(node,neighbourNode) && (PointModelUtil.compareTo(node, neighbourNode) < 0)){ // neighbour relations exist in both direction - here we can reduce to one
                         BBox bBoxPart = new BBox().extend(node).extend(neighbourNode);
 
                         boolean bIntersects = bBoxTap.intersects(bBoxPart);
@@ -167,15 +167,17 @@ private BBox getGraphDetails(PointModel pmTap, MultiPointModelImpl multiPointMod
 
             GNode lastNode = null;
             for (GNode node : nodes){
-                multiPointModel.addPoint(node);
-                if (lastNode != null){
-                    final GNode last = lastNode;
-                    double distance = PointModelUtil.distance(last,node);
-                    double verticalDistance = PointModelUtil.verticalDistance(last, node);
-                    mgLog.d(()-> String.format(Locale.ENGLISH, "   segment dist=%.2f vertDist=%.2f ascend=%.1f cost=%.2f revCost=%.2f",distance,verticalDistance,verticalDistance*100/distance,last.getNeighbour(node).getCost(),node.getNeighbour(last).getCost()));
+                if (GNode.sameTile(bestNode,node)){
+                    multiPointModel.addPoint(node);
+                    if (lastNode != null){
+                        final GNode last = lastNode;
+                        double distance = PointModelUtil.distance(last,node);
+                        double verticalDistance = PointModelUtil.verticalDistance(last, node);
+                        mgLog.d(()-> String.format(Locale.ENGLISH, "   segment dist=%.2f vertDist=%.2f ascend=%.1f cost=%.2f revCost=%.2f",distance,verticalDistance,verticalDistance*100/distance,last.getNeighbour(node).getCost(),node.getNeighbour(last).getCost()));
+                    }
+                    mgLog.d(()-> "Point "+ node + getRefDetails(node.getNodeRef()) + getRefDetails(node.getNodeRef(true)));
+                    lastNode = node;
                 }
-                mgLog.d(()-> "Point "+ node + getRefDetails(node.getNodeRef()) + getRefDetails(node.getNodeRef(true)));
-                lastNode = node;
             }
         }
         return (bestTile==null)?null:bestTile.getTileBBox();

diff --git a/mgmap/src/main/java/mg/mgmap/activity/mgmap/features/routing/RoutingEngine.java b/mgmap/src/main/java/mg/mgmap/activity/mgmap/features/routing/RoutingEngine.java
@@ -350,13 +350,21 @@ MultiPointModelImpl calcRouting(RoutePointModel source, RoutePointModel target,
             }
             gFactory.serviceCache();
             if (sourceApproachModel != null){
-                sourceApproachModel.getNode1().removeNeighbourNode(0);
-                sourceApproachModel.getNode2().removeNeighbourNode(0);
+                if (sourceApproachModel.getNode1() != null){
+                    sourceApproachModel.getNode1().removeNeighbourNode(0);
+                }
+                if (sourceApproachModel.getNode2() != null){
+                    sourceApproachModel.getNode2().removeNeighbourNode(0);
+                }
                 gStart.getNeighbour().setNextNeighbour(null);
             }
             if (targetApproachModel != null){
-                targetApproachModel.getNode1().removeNeighbourNode(0);
-                targetApproachModel.getNode2().removeNeighbourNode(0);
+                if (targetApproachModel.getNode1() != null){
+                    targetApproachModel.getNode1().removeNeighbourNode(0);
+                }
+                if (targetApproachModel.getNode2() != null){
+                    targetApproachModel.getNode2().removeNeighbourNode(0);
+                }
                 gEnd.getNeighbour().setNextNeighbour(null);
             }
         }
@@ -439,7 +447,7 @@ TreeSet<ApproachModel> calcApproaches(PointModel pointModel, int closeThreshold)
                 GNeighbour neighbour = node.getNeighbour();
                 while ((neighbour = gGraphTile.getNextNeighbour(node, neighbour)) != null) {
                     GNode neighbourNode = neighbour.getNeighbourNode();
-                    if (PointModelUtil.compareTo(node, neighbourNode) < 0){ // neighbour relations exist in both direction - here we can reduce to one
+                    if (GNode.sameTile(node, neighbourNode) && (PointModelUtil.compareTo(node, neighbourNode) < 0)){ // neighbour relations exist in both direction - here we can reduce to one
                         BBox bBoxPart = new BBox().extend(node).extend(neighbourNode);
                         boolean bIntersects = mtlpBBox.intersects(bBoxPart);
                         if (bIntersects){ // ok, is candidate for close

diff --git a/mgmap/src/main/java/mg/mgmap/generic/graph/GNode.java b/mgmap/src/main/java/mg/mgmap/generic/graph/GNode.java
@@ -152,4 +152,8 @@ public void removeNeighbourNode(int tileIdx){
     public GGraphTile getTile(GGraphTileFactory gFactory){
         return gFactory.getGGraphTile(tileIdx>>16, tileIdx&0xFFFF);
     }
+
+    public static boolean sameTile(GNode node1, GNode node2){
+        return node1.tileIdx == node2.tileIdx;
+    }
 }