yangyj 1 рік тому
батько
коміт
c51e87b8f8

+ 5 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/ITurnPointCalculator.java

@@ -390,6 +390,11 @@ public interface ITurnPointCalculator {
                         tp.setQ(info.getSightHeight() - tp.getSc0L());
                     }
                     closeZd.add(zd.clone());
+                    /*设置当前里程*/
+                    if(info.isDistance()) {
+                        /*没转一次点相当于往前推进两百米*/
+                        info.setMilestone(info.getMilestone()+200);
+                    }
                     list.add(zd);
                 }
                 if(list.size()>0){

+ 9 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/TurnPoint.java

@@ -243,7 +243,15 @@ public class TurnPoint {
         if(negative){
             d=  Math.abs(d);
         }
-        return d >= levelInfo.getMin() && d <= levelInfo.getStep()&&levelInfo.getSightHeight()-getQ0L()==getSc0L();
+        if(d >= levelInfo.getMin() && d <= levelInfo.getStep()){
+            if(levelInfo.getSightHeight()-getQ0L()!=getSc0L()){
+                /*微调修复前视*/
+                setQ(levelInfo.getSightHeight()-getSc0L());
+            }
+            return true;
+        }
+        return false;
+
     }
     /**判断转点前后视是否在范围*/
     public boolean isWithinRangeValueZd(String any){