diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java index 0013d0cb..6f0f9177 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java @@ -44,11 +44,14 @@ public class GNSSCalcFilterService { Integer xyfilterCycle = groupCalc.getFilter_hour(); Integer zfilterCycle = groupCalc.getZfilter_hour(); if(null == zfilterCycle) zfilterCycle = xyfilterCycle; - VaryFilterCycle varyCycle = autoCycleDevices.get(deviceId); - if(varyCycle!=null){ - xyfilterCycle = varyCycle.filterCycleHour; - zfilterCycle = varyCycle.filterCycleHour; + if(groupCalc.getAuto_filter()) { + VaryFilterCycle varyCycle = autoCycleDevices.get(deviceId); + if (varyCycle != null) { + xyfilterCycle = varyCycle.filterCycleHour; + zfilterCycle = varyCycle.filterCycleHour; + } } + else autoCycleDevices.remove(deviceId); // 平滑处理 calcFilterLocation(newRecord, referPos, xyfilterCycle, zfilterCycle, groupCalc.getFilter_min_hour(),