From 404971dc53b94d08fac0de8c022f0d444a694577 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 26 Sep 2023 19:29:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.1.0]=20[common]=20[=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=BB=88=E7=82=B9=E5=9D=90=E6=A0=87=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/debug/DebugDataDispatch.kt | 24 + .../TrajectoryAndDistanceManager.kt | 6 +- .../utils/CoordinateCalculateRouteUtil.kt | 6 +- .../mogo/och/common/module/ExampleUnitTest.kt | 618 ++++++++++++++++++ 4 files changed, 648 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index 9060d89523..a0949fb076 100644 --- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.debug.location.MogoLocationExit +import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg @@ -35,11 +36,13 @@ object DebugDataDispatch { const val locationMock = "location" const val carDoorMock = "carDoor" const val carNeedTurnAround = "trunAroud" + const val trajectoryStation = "trajectoryStation" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "sy73_log.json" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "carDoor" --ei doorPostion 1 --ei doorStatus 1 // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "trunAroud" --es code "IMAP_TRA_LOADED" +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "trajectoryStation" --ef startLon 116.74053643938474 --ef startLat 40.200487993233246 --ef endLon 116.73876977409685 --ef endLat 40.20179054129441 --el lineID 8 val ROOT_PATH = @@ -83,10 +86,31 @@ object DebugDataDispatch { newBuilder.level = "" CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build()) } + trajectoryStation -> { + val startLon = intent.getFloatExtra("startLon", -1.0f) + val startLat = intent.getFloatExtra("startLat", -1.0f) + val endLon = intent.getFloatExtra("endLon", -1.0f) + val endLat = intent.getFloatExtra("endLat", -1.0f) + val lineID = intent.getLongExtra("lineID", -1) + setStation(startLon.toDouble(),startLat.toDouble(),endLon.toDouble(),endLat.toDouble(),lineID) + } else -> {} } } + fun setStation(startLon:Double,startLat:Double,endLon:Double,endLat:Double,lineID:Long){ + if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){ + TrajectoryAndDistanceManager.setStationPoint(null,null,-1) + } + val startLocation = MogoLocation() + startLocation.longitude = startLon + startLocation.latitude = startLat + val endLocation = MogoLocation() + endLocation.longitude = endLon + endLocation.latitude = endLat + TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineID) + } + fun getLocaitonByLog(path:String) { ThreadUtils.getIoPool().execute { try { diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index 0b03eaafec..15a4cd4d71 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -270,7 +270,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ ) { //要前往的站在轨迹中对应的点的信息 val startStationInfo = CoordinateCalculateRouteUtil.getNearestPointInfo( - preCarLocationIndexInTrajectory, mRoutePoints!!.size,mRoutePoints!!, startStationInfo.stationPoint!!,1 + preCarLocationIndexInTrajectory, mRoutePoints!!.size,mRoutePoints!!, startStationInfo.stationPoint!!,1, useHeading = false ) this.startStationInfo.isNext = startStationInfo.second this.startStationInfo.index = startStationInfo.first @@ -288,7 +288,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ ) { //要前往的站在轨迹中对应的点 val endStationInfo = CoordinateCalculateRouteUtil.getNearestPointInfo( - preCarLocationIndexInTrajectory,mRoutePoints!!.size, mRoutePoints!!, endStationInfo.stationPoint!!,3 + preCarLocationIndexInTrajectory,mRoutePoints!!.size, mRoutePoints!!, endStationInfo.stationPoint!!,3, useHeading = false ) this.endStationInfo.isNext = endStationInfo.second this.endStationInfo.index = endStationInfo.first @@ -324,7 +324,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ preCarLocationIndexInTrajectory,endStationInfo.index!!+1, mRoutePoints!!, location,2 ) } - val calculateData = "距离结束站点最近的点:${carLocationInfo.first} 点在站的后面:${carLocationInfo.second} 距离点的距离：${carLocationInfo.third}" + val calculateData = "距离轨迹点最近的点:${carLocationInfo.first} 点在站的后面:${carLocationInfo.second} 距离点的距离：${carLocationInfo.third}" writeLog(calculateData, locationInfo) if(carLocationInfo.second==null||carLocationInfo.third>1_000){ preCarLocationIndexInTrajectory = 0 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt index 10bbe0ded4..36018e3b40 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt @@ -737,7 +737,7 @@ object CoordinateCalculateRouteUtil { } // 最近点中包含上次计算的点和上次计算的最近的一个点 - if(distanceMap.containsValue(preIndex)&&distanceMap.containsValue(preIndex+1)){ + if(distanceMap.containsValue(preIndex)&&distanceMap.containsValue(preIndex+1)&&type==1){ var preIndexDistance:DistanceDegree?=null var preIndexNextDistance:DistanceDegree?=null distanceMap.iterator().forEach { en -> @@ -771,7 +771,7 @@ object CoordinateCalculateRouteUtil { distanceMap.clear() Logger.d(SceneConstant.M_OCHCOMMON + "calculateRouteSumLength", "计算时间:${startTime-System.currentTimeMillis()}") - return Triple(currentIndex,preIndexNextDistance?.isNext,preIndexNextDistance!!.distance) + return Triple(currentIndex,preIndexNextDistance?.isNext,preIndexNextDistance!!.distance) } } } @@ -823,7 +823,7 @@ object CoordinateCalculateRouteUtil { val key = en.key val value = en.value // 排除没有第一个值0是 - if(value==preIndex+1&&preIndex!=0){ + if(value==preIndex+1&&preIndex!=0&&type==1){ currentIndex = value val iterator1 = distanceMap.iterator() while (iterator1.hasNext()) { diff --git a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index b10afe9aa9..b7c293b91d 100644 --- a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -1,5 +1,6 @@ package com.mogo.och.common.module +import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.zhidao.thirdlogin.utils.Aes import org.junit.Assert.* import org.junit.Test @@ -20,4 +21,621 @@ class ExampleUnitTest { val encrypt: String = Aes.encrypt(json, KEY, IVS, "UTF-8") println(encrypt) } + + @Test + fun resetData(){ + val mutableListOf = mutableListOf() + mutableListOf.add(Data(26.81618164239085,112.58250175297606,55.55709771386404 ,0.046407543)) + mutableListOf.add(Data(26.81618164239085,112.58250175297606,55.55709771386404 ,0.046407543)) + mutableListOf.add(Data(26.81618164239085,112.58250175297606,55.55709771386404 ,0.046407543)) + mutableListOf.add(Data(26.816181808122355,112.58250217912767,55.5367232595699 ,0.024934836)) + mutableListOf.add(Data(26.81618188427374,112.58250252407656,55.47659710430628 ,-0.0031026027)) + mutableListOf.add(Data(26.816182627199186,112.58250389674681,55.30434314853312 ,0.56499475)) + mutableListOf.add(Data(26.81619347196081,112.5825216510838,54.429112463003946 ,3.3143053)) + mutableListOf.add(Data(26.816212952303637,112.58255186583256,53.611788121258144 ,4.1918964)) + mutableListOf.add(Data(26.816239753303016,112.5825918107494,52.81322630916236 ,6.0459743)) + mutableListOf.add(Data(26.81627681379391,112.58264625538742,52.33910872792592 ,7.5077167)) + mutableListOf.add(Data(26.81632000870642,112.58270715442146,51.45473583419266 ,8.213942)) + mutableListOf.add(Data(26.816367868569504,112.58277449458916,51.894186790296715 ,9.117803)) + mutableListOf.add(Data(26.816419772705085,112.58284877034309,52.35565486119026 ,9.915305)) + mutableListOf.add(Data(26.816475594914255,112.58292938397568,52.452862113457854 ,10.67503)) + mutableListOf.add(Data(26.816535811576774,112.58301559606879,52.43356682905261 ,11.37326)) + mutableListOf.add(Data(26.816598457679355,112.5831078725796,53.85711144077209 ,11.978908)) + mutableListOf.add(Data(26.816662027735013,112.58320692287296,55.32445805563884 ,12.534072)) + mutableListOf.add(Data(26.816726886660476,112.58331188364737,55.79882835387457 ,13.077099)) + mutableListOf.add(Data(26.816726886660476,112.58331188364737,55.79882835387457 ,13.077099)) + mutableListOf.add(Data(26.816793247443773,112.58341938436075,55.82383367642598 ,13.111888)) + mutableListOf.add(Data(26.816793247443773,112.58341938436075,55.82383367642598 ,13.111888)) + mutableListOf.add(Data(26.816860045545038,112.5835283980739,55.95009655342284 ,13.205783)) + mutableListOf.add(Data(26.816860045545038,112.5835283980739,55.95009655342284 ,13.205783)) + mutableListOf.add(Data(26.816925196446753,112.58363575353036,56.266921708263055 ,12.377544)) + mutableListOf.add(Data(26.816925196446753,112.58363575353036,56.266921708263055 ,12.377544)) + mutableListOf.add(Data(26.8169850300721,112.58373523649801,56.48836327134404 ,11.37828)) + mutableListOf.add(Data(26.8169850300721,112.58373523649801,56.48836327134404 ,11.37828)) + mutableListOf.add(Data(26.817037934280332,112.58382376359087,56.24827187673429 ,9.676991)) + mutableListOf.add(Data(26.817037934280332,112.58382376359087,56.24827187673429 ,9.676991)) + mutableListOf.add(Data(26.817083166151374,112.5838975695181,55.88718368097784 ,7.9715595)) + mutableListOf.add(Data(26.817083166151374,112.5838975695181,55.88718368097784 ,7.9715595)) + mutableListOf.add(Data(26.817119554569622,112.58395525826116,54.790292866314246 ,5.8003225)) + mutableListOf.add(Data(26.817119554569622,112.58395525826116,54.790292866314246 ,5.8003225)) + mutableListOf.add(Data(26.817140378417207,112.58398757091575,54.00168947002834 ,2.0236187)) + mutableListOf.add(Data(26.817140378417207,112.58398757091575,54.00168947002834 ,2.0236187)) + mutableListOf.add(Data(26.817143666977085,112.58399300744259,53.873008706065264 ,0.072262354)) + mutableListOf.add(Data(26.817143666977085,112.58399300744259,53.873008706065264 ,0.072262354)) + mutableListOf.add(Data(26.81714331006102,112.58399316177113,53.87228129091869 ,0.0019371088)) + mutableListOf.add(Data(26.81714331006102,112.58399316177113,53.87228129091869 ,0.0019371088)) + mutableListOf.add(Data(26.81714313768666,112.58399312891899,53.870710347409556 ,-0.0011951944)) + mutableListOf.add(Data(26.81714313768666,112.58399312891899,53.870710347409556 ,-0.0011951944)) + mutableListOf.add(Data(26.81714315453284,112.58399311449793,53.86844272460513 ,-0.0039134827)) + mutableListOf.add(Data(26.81714315453284,112.58399311449793,53.86844272460513 ,-0.0039134827)) + mutableListOf.add(Data(26.817143235978477,112.5839931065896,53.868674951036894 ,0.009990219)) + mutableListOf.add(Data(26.817143235978477,112.5839931065896,53.868674951036894 ,0.009990219)) + mutableListOf.add(Data(26.8171432379633,112.58399311184859,53.86787240380943 ,0.0057474226)) + mutableListOf.add(Data(26.8171432379633,112.58399311184859,53.86787240380943 ,0.0057474226)) + mutableListOf.add(Data(26.817143234431487,112.58399311556684,53.868285630254206 ,0.0053468696)) + mutableListOf.add(Data(26.817143234431487,112.58399311556684,53.868285630254206 ,0.0053468696)) + mutableListOf.add(Data(26.81714323875891,112.5839931259286,53.867687988701846 ,0.008409082)) + mutableListOf.add(Data(26.81714323875891,112.5839931259286,53.867687988701846 ,0.008409082)) + mutableListOf.add(Data(26.817143254507762,112.58399313934659,53.86896181898203 ,0.008529294)) + mutableListOf.add(Data(26.817143254507762,112.58399313934659,53.86896181898203 ,0.008529294)) + mutableListOf.add(Data(26.817143260063123,112.58399314333123,53.865194969654794 ,0.0053140023)) + mutableListOf.add(Data(26.817143260063123,112.58399314333123,53.865194969654794 ,0.0053140023)) + mutableListOf.add(Data(26.81714326019063,112.58399314732564,53.868613479334385 ,0.0040332223)) + mutableListOf.add(Data(26.81714326019063,112.58399314732564,53.868613479334385 ,0.0040332223)) + mutableListOf.add(Data(26.81714326984717,112.5839931502497,53.869293083156776 ,0.0050935512)) + mutableListOf.add(Data(26.81714326984717,112.5839931502497,53.869293083156776 ,0.0050935512)) + mutableListOf.add(Data(26.817143276924913,112.5839931598786,53.87102112101678 ,0.0051586633)) + mutableListOf.add(Data(26.817143276924913,112.5839931598786,53.87102112101678 ,0.0051586633)) + mutableListOf.add(Data(26.817143271976438,112.58399317037059,53.86838808309176 ,0.006491186)) + mutableListOf.add(Data(26.817143271976438,112.58399317037059,53.86838808309176 ,0.006491186)) + mutableListOf.add(Data(26.817143265170607,112.5839931554377,53.86955946053439 ,-0.0019018989)) + mutableListOf.add(Data(26.817143265170607,112.5839931554377,53.86955946053439 ,-0.0019018989)) + mutableListOf.add(Data(26.817143273658317,112.58399316718146,53.86821049817331 ,0.0031056462)) + mutableListOf.add(Data(26.817143273658317,112.58399316718146,53.86821049817331 ,0.0031056462)) + mutableListOf.add(Data(26.81714327261351,112.58399317389184,53.867244026405785 ,0.0022922105)) + mutableListOf.add(Data(26.81714327261351,112.58399317389184,53.867244026405785 ,0.0022922105)) + mutableListOf.add(Data(26.81714328168219,112.58399317547813,53.869750705831166 ,0.0033199964)) + mutableListOf.add(Data(26.81714328168219,112.58399317547813,53.869750705831166 ,0.0033199964)) + mutableListOf.add(Data(26.81714329830482,112.58399317974332,53.868497366118504 ,0.0036278928)) + mutableListOf.add(Data(26.81714329830482,112.58399317974332,53.868497366118504 ,0.0036278928)) + mutableListOf.add(Data(26.81714329823904,112.58399318687029,53.869549215250686 ,9.618327E-4)) + mutableListOf.add(Data(26.81714329823904,112.58399318687029,53.869549215250686 ,9.618327E-4)) + mutableListOf.add(Data(26.81714329683728,112.58399318631112,53.87207297014896 ,-3.115031E-4)) + mutableListOf.add(Data(26.81714329683728,112.58399318631112,53.87207297014896 ,-3.115031E-4)) + mutableListOf.add(Data(26.817143299098106,112.5839931844786,53.86809438495743 ,5.291645E-4)) + mutableListOf.add(Data(26.817143299098106,112.5839931844786,53.86809438495743 ,5.291645E-4)) + mutableListOf.add(Data(26.817143308731524,112.58399319567121,53.86893449822537 ,0.002943732)) + mutableListOf.add(Data(26.817143308731524,112.58399319567121,53.86893449822537 ,0.002943732)) + mutableListOf.add(Data(26.81714331310618,112.58399323023308,53.86786898871486 ,0.016370257)) + mutableListOf.add(Data(26.81714331310618,112.58399323023308,53.86786898871486 ,0.016370257)) + mutableListOf.add(Data(26.817143303931818,112.58399320624724,53.86840174347009 ,-0.0065030125)) + mutableListOf.add(Data(26.817143303931818,112.58399320624724,53.86840174347009 ,-0.0065030125)) + mutableListOf.add(Data(26.81714328119793,112.58399322107572,53.86862030952352 ,-0.0044723027)) + mutableListOf.add(Data(26.81714328119793,112.58399322107572,53.86862030952352 ,-0.0044723027)) + mutableListOf.add(Data(26.81714326726879,112.58399321507112,53.87232910224287 ,-0.0035493786)) + mutableListOf.add(Data(26.81714326726879,112.58399321507112,53.87232910224287 ,-0.0035493786)) + mutableListOf.add(Data(26.81714326952943,112.58399321006907,53.872151517324426 ,7.5540715E-4)) + mutableListOf.add(Data(26.81714326952943,112.58399321006907,53.872151517324426 ,7.5540715E-4)) + mutableListOf.add(Data(26.817143279681396,112.58399321381509,53.872574989052964 ,0.001874776)) + mutableListOf.add(Data(26.817143279681396,112.58399321381509,53.872574989052964 ,0.001874776)) + mutableListOf.add(Data(26.817143286214396,112.58399322256894,53.86990780018209 ,0.0010117635)) + mutableListOf.add(Data(26.817143286214396,112.58399322256894,53.86990780018209 ,0.0010117635)) + mutableListOf.add(Data(26.817143290166985,112.58399321948606,53.866837630150144 ,-7.378759E-4)) + mutableListOf.add(Data(26.817143290166985,112.58399321948606,53.866837630150144 ,-7.378759E-4)) + mutableListOf.add(Data(26.817143296223914,112.58399321538221,53.871697309744604 ,-7.305082E-4)) + mutableListOf.add(Data(26.817143296223914,112.58399321538221,53.871697309744604 ,-7.305082E-4)) + mutableListOf.add(Data(26.817143305406848,112.58399321633149,53.86946042279146 ,-3.4410154E-4)) + mutableListOf.add(Data(26.817143305406848,112.58399321633149,53.86946042279146 ,-3.4410154E-4)) + mutableListOf.add(Data(26.817143309674115,112.58399323304309,53.86847346045636 ,0.015301721)) + mutableListOf.add(Data(26.817143309674115,112.58399323304309,53.86847346045636 ,0.015301721)) + mutableListOf.add(Data(26.817143300633735,112.5839932094286,53.869060856725014 ,-0.0041958815)) + mutableListOf.add(Data(26.817143300633735,112.5839932094286,53.869060856725014 ,-0.0041958815)) + mutableListOf.add(Data(26.81714329175772,112.58399321172573,53.868623724618146 ,-0.0041520167)) + mutableListOf.add(Data(26.81714329175772,112.58399321172573,53.868623724618146 ,-0.0041520167)) + mutableListOf.add(Data(26.81714327175831,112.58399320571804,53.867769950971876 ,-0.003427676)) + mutableListOf.add(Data(26.81714327175831,112.58399320571804,53.867769950971876 ,-0.003427676)) + mutableListOf.add(Data(26.81714327419855,112.58399319974227,53.86951164921021 ,1.3224973E-4)) + mutableListOf.add(Data(26.81714327419855,112.58399319974227,53.86951164921021 ,1.3224973E-4)) + mutableListOf.add(Data(26.817143286280604,112.58399319410101,53.86864421518561 ,0.0014093047)) + mutableListOf.add(Data(26.817143286280604,112.58399319410101,53.86864421518561 ,0.0014093047)) + mutableListOf.add(Data(26.817143301517042,112.58399319617503,53.869972686979224 ,0.0021324877)) + mutableListOf.add(Data(26.817143301517042,112.58399319617503,53.869972686979224 ,0.0021324877)) + mutableListOf.add(Data(26.81714329786978,112.58399320422272,53.87138653613738 ,5.9873355E-4)) + mutableListOf.add(Data(26.81714329786978,112.58399320422272,53.87138653613738 ,5.9873355E-4)) + mutableListOf.add(Data(26.817143290263108,112.58399320768578,53.868603234050624 ,-9.5163955E-4)) + mutableListOf.add(Data(26.817143290263108,112.58399320768578,53.868603234050624 ,-9.5163955E-4)) + mutableListOf.add(Data(26.81714330007566,112.58399319077888,53.8673567245271 ,-0.0016809735)) + mutableListOf.add(Data(26.81714330007566,112.58399319077888,53.8673567245271 ,-0.0016809735)) + mutableListOf.add(Data(26.81714331779051,112.58399320175057,53.86782459248525 ,0.013873377)) + mutableListOf.add(Data(26.81714331779051,112.58399320175057,53.86782459248525 ,0.013873377)) + mutableListOf.add(Data(26.81714331797703,112.58399319152798,53.86942285675099 ,-2.5552226E-4)) + mutableListOf.add(Data(26.81714331797703,112.58399319152798,53.86942285675099 ,-2.5552226E-4)) + mutableListOf.add(Data(26.817143301371033,112.58399320407928,53.87041323418066 ,-0.0022770471)) + mutableListOf.add(Data(26.817143301371033,112.58399320407928,53.87041323418066 ,-0.0022770471)) + mutableListOf.add(Data(26.817143286827157,112.58399319804838,53.869573120912776 ,-0.0025196006)) + mutableListOf.add(Data(26.817143286827157,112.58399319804838,53.869573120912776 ,-0.0025196006)) + mutableListOf.add(Data(26.81714328572524,112.58399318869752,53.87063521532872 ,-0.0016185519)) + mutableListOf.add(Data(26.81714328572524,112.58399318869752,53.87063521532872 ,-0.0016185519)) + mutableListOf.add(Data(26.817143275344343,112.58399317613704,53.87387955518443 ,-0.0021576409)) + mutableListOf.add(Data(26.817143275344343,112.58399317613704,53.87387955518443 ,-0.0021576409)) + mutableListOf.add(Data(26.817143275161378,112.58399317311375,53.86929991334597 ,0.001371147)) + mutableListOf.add(Data(26.817143275161378,112.58399317311375,53.86929991334597 ,0.001371147)) + mutableListOf.add(Data(26.817143281394475,112.58399317503098,53.86759919624262 ,0.003383463)) + mutableListOf.add(Data(26.817143281394475,112.58399317503098,53.86759919624262 ,0.003383463)) + mutableListOf.add(Data(26.81714327190517,112.58399318157332,53.86734306414877 ,8.065918E-4)) + mutableListOf.add(Data(26.81714327190517,112.58399318157332,53.86734306414877 ,8.065918E-4)) + mutableListOf.add(Data(26.817143260932923,112.58399316911094,53.86561844138333 ,-0.0014197703)) + mutableListOf.add(Data(26.817143260932923,112.58399316911094,53.86561844138333 ,-0.0014197703)) + mutableListOf.add(Data(26.817143261387983,112.58399316238105,53.868347101956715 ,0.0043071667)) + mutableListOf.add(Data(26.817143261387983,112.58399316238105,53.868347101956715 ,0.0043071667)) + mutableListOf.add(Data(26.817143256717934,112.58399314806874,53.870990385165555 ,-0.0019511797)) + mutableListOf.add(Data(26.817143256717934,112.58399314806874,53.870990385165555 ,-0.0019511797)) + mutableListOf.add(Data(26.81714325591799,112.58399315517725,53.86898572464412 ,0.0018099692)) + mutableListOf.add(Data(26.81714325591799,112.58399315517725,53.86898572464412 ,0.0018099692)) + mutableListOf.add(Data(26.817143252240935,112.58399316638,53.86619559236817 ,0.021292992)) + mutableListOf.add(Data(26.817143252240935,112.58399316638,53.86619559236817 ,0.021292992)) + mutableListOf.add(Data(26.81714402042069,112.583994386207,53.845687949385194 ,0.3348555)) + mutableListOf.add(Data(26.81714402042069,112.583994386207,53.845687949385194 ,0.3348555)) + mutableListOf.add(Data(26.817147405726278,112.58399956299603,53.73888769642832 ,0.9280623)) + mutableListOf.add(Data(26.817147405726278,112.58399956299603,53.73888769642832 ,0.9280623)) + mutableListOf.add(Data(26.817153799651898,112.58400914360494,53.58582657222291 ,1.4668413)) + mutableListOf.add(Data(26.817153799651898,112.58400914360494,53.58582657222291 ,1.4668413)) + mutableListOf.add(Data(26.81716245692801,112.58402187641425,52.39904705298733 ,1.690717)) + mutableListOf.add(Data(26.81716245692801,112.58402187641425,52.39904705298733 ,1.690717)) + mutableListOf.add(Data(26.817175410421267,112.58403959295411,49.84256188816494 ,3.0424085)) + mutableListOf.add(Data(26.817175410421267,112.58403959295411,49.84256188816494 ,3.0424085)) + mutableListOf.add(Data(26.817198616464147,112.58406783866415,45.33429552649801 ,4.4409986)) + mutableListOf.add(Data(26.817198616464147,112.58406783866415,45.33429552649801 ,4.4409986)) + mutableListOf.add(Data(26.81723059837678,112.58410013682379,39.67851981822855 ,5.031896)) + mutableListOf.add(Data(26.81723059837678,112.58410013682379,39.67851981822855 ,5.031896)) + mutableListOf.add(Data(26.81726793050972,112.58413123275119,33.760215543925824 ,5.287935)) + mutableListOf.add(Data(26.81726793050972,112.58413123275119,33.760215543925824 ,5.287935)) + mutableListOf.add(Data(26.817309703482323,112.58415777616139,26.470805435256466 ,5.290117)) + mutableListOf.add(Data(26.817309703482323,112.58415777616139,26.470805435256466 ,5.290117)) + mutableListOf.add(Data(26.8173539472737,112.5841781084828,19.413027531909677 ,5.2572174)) + mutableListOf.add(Data(26.8173539472737,112.5841781084828,19.413027531909677 ,5.2572174)) + mutableListOf.add(Data(26.81739827838705,112.58419180114795,10.869089257627422 ,5.054635)) + mutableListOf.add(Data(26.81739827838705,112.58419180114795,10.869089257627422 ,5.054635)) + mutableListOf.add(Data(26.817444316263447,112.58419779782906,1.290097286332184 ,5.1018424)) + mutableListOf.add(Data(26.817444316263447,112.58419779782906,1.290097286332184 ,5.1018424)) + mutableListOf.add(Data(26.81748941065244,112.5841957020102,351.87250951531354 ,4.951452)) + mutableListOf.add(Data(26.81748941065244,112.5841957020102,351.87250951531354 ,4.951452)) + mutableListOf.add(Data(26.817532025152016,112.58418464321606,343.08161892140026 ,4.856119)) + mutableListOf.add(Data(26.817532025152016,112.58418464321606,343.08161892140026 ,4.856119)) + mutableListOf.add(Data(26.817574411658125,112.58416696887566,337.3830350025077 ,5.0693793)) + mutableListOf.add(Data(26.817574411658125,112.58416696887566,337.3830350025077 ,5.0693793)) + mutableListOf.add(Data(26.817616516674775,112.58414506934275,332.70868576098275 ,5.4740086)) + mutableListOf.add(Data(26.817616516674775,112.58414506934275,332.70868576098275 ,5.4740086)) + mutableListOf.add(Data(26.81766656685223,112.58411337464841,328.82325068935097 ,7.248267)) + mutableListOf.add(Data(26.81766656685223,112.58411337464841,328.82325068935097 ,7.248267)) + mutableListOf.add(Data(26.81772616620445,112.58407132315536,327.0345880702647 ,8.242281)) + mutableListOf.add(Data(26.81772616620445,112.58407132315536,327.0345880702647 ,8.242281)) + mutableListOf.add(Data(26.81779051965125,112.58402390325215,326.6785986107236 ,8.845384)) + mutableListOf.add(Data(26.81779051965125,112.58402390325215,326.6785986107236 ,8.845384)) + mutableListOf.add(Data(26.817859422781524,112.58397291899796,326.7608614090873 ,9.471843)) + mutableListOf.add(Data(26.817859422781524,112.58397291899796,326.7608614090873 ,9.471843)) + mutableListOf.add(Data(26.81793317211832,112.58391890295081,326.7297430672287 ,10.078002)) + mutableListOf.add(Data(26.81793317211832,112.58391890295081,326.7297430672287 ,10.078002)) + mutableListOf.add(Data(26.818011331250453,112.5838615761508,326.8077438275502 ,10.587693)) + mutableListOf.add(Data(26.818011331250453,112.5838615761508,326.8077438275502 ,10.587693)) + mutableListOf.add(Data(26.818093147121697,112.58380194228982,327.1836637790894 ,10.954674)) + mutableListOf.add(Data(26.818093147121697,112.58380194228982,327.1836637790894 ,10.954674)) + mutableListOf.add(Data(26.818176204557567,112.58374205539742,327.38030492529407 ,10.941433)) + mutableListOf.add(Data(26.818176204557567,112.58374205539742,327.38030492529407 ,10.941433)) + mutableListOf.add(Data(26.81825883397749,112.58368252714435,327.3766985854123 ,10.857093)) + mutableListOf.add(Data(26.81825883397749,112.58368252714435,327.3766985854123 ,10.857093)) + mutableListOf.add(Data(26.81834151434389,112.58362366928625,327.43886696723774 ,10.841235)) + mutableListOf.add(Data(26.81834151434389,112.58362366928625,327.43886696723774 ,10.841235)) + mutableListOf.add(Data(26.81842401797818,112.58356478174697,327.7210084214726 ,10.823341)) + mutableListOf.add(Data(26.81842401797818,112.58356478174697,327.7210084214726 ,10.823341)) + mutableListOf.add(Data(26.81850681918393,112.58350666007705,328.004174404083 ,10.829654)) + mutableListOf.add(Data(26.81850681918393,112.58350666007705,328.004174404083 ,10.829654)) + mutableListOf.add(Data(26.8185898344893,112.58344838988543,327.71930087418013 ,10.8667)) + mutableListOf.add(Data(26.8185898344893,112.58344838988543,327.71930087418013 ,10.8667)) + mutableListOf.add(Data(26.818672593565683,112.58339009877655,328.01237063108704 ,10.824985)) + mutableListOf.add(Data(26.818672593565683,112.58339009877655,328.01237063108704 ,10.824985)) + mutableListOf.add(Data(26.818754990090127,112.58333306728635,328.4332332273649 ,10.844356)) + mutableListOf.add(Data(26.818754990090127,112.58333306728635,328.4332332273649 ,10.844356)) + mutableListOf.add(Data(26.818839320542985,112.5832751250177,328.3993418287033 ,10.843772)) + mutableListOf.add(Data(26.818839320542985,112.5832751250177,328.3993418287033 ,10.843772)) + mutableListOf.add(Data(26.818922809041855,112.58321765401757,328.4574394177834 ,10.858223)) + mutableListOf.add(Data(26.818922809041855,112.58321765401757,328.4574394177834 ,10.858223)) + mutableListOf.add(Data(26.819006465861534,112.5831607927747,328.98921062580393 ,10.842939)) + mutableListOf.add(Data(26.819006465861534,112.5831607927747,328.98921062580393 ,10.842939)) + mutableListOf.add(Data(26.81909075060507,112.5831046560205,329.1766036958724 ,10.863632)) + mutableListOf.add(Data(26.81909075060507,112.5831046560205,329.1766036958724 ,10.863632)) + mutableListOf.add(Data(26.819174866875375,112.58304877028208,328.96620654867934 ,10.821545)) + mutableListOf.add(Data(26.819174866875375,112.58304877028208,328.96620654867934 ,10.821545)) + mutableListOf.add(Data(26.819258542148233,112.58299212297055,328.94003326377987 ,10.827973)) + mutableListOf.add(Data(26.819258542148233,112.58299212297055,328.94003326377987 ,10.827973)) + mutableListOf.add(Data(26.81934275109521,112.5829359856361,329.7044680356877 ,10.862666)) + mutableListOf.add(Data(26.81934275109521,112.5829359856361,329.7044680356877 ,10.862666)) + mutableListOf.add(Data(26.819427513346156,112.58288107998513,329.94292359999116 ,10.841335)) + mutableListOf.add(Data(26.819427513346156,112.58288107998513,329.94292359999116 ,10.841335)) + mutableListOf.add(Data(26.819512958196423,112.58282775043037,332.0790516025343 ,10.830255)) + mutableListOf.add(Data(26.819512958196423,112.58282775043037,332.0790516025343 ,10.830255)) + mutableListOf.add(Data(26.819600500579643,112.58277846653539,333.6954431903745 ,10.856668)) + mutableListOf.add(Data(26.819600500579643,112.58277846653539,333.6954431903745 ,10.856668)) + mutableListOf.add(Data(26.819688638518134,112.5827299064952,333.5301526124602 ,10.898559)) + mutableListOf.add(Data(26.819688638518134,112.5827299064952,333.5301526124602 ,10.898559)) + mutableListOf.add(Data(26.81977658685566,112.58268010365491,332.9125532473293 ,10.915252)) + mutableListOf.add(Data(26.81977658685566,112.58268010365491,332.9125532473293 ,10.915252)) + mutableListOf.add(Data(26.819864103260052,112.58263021476887,333.12991718747577 ,10.862293)) + mutableListOf.add(Data(26.819864103260052,112.58263021476887,333.12991718747577 ,10.862293)) + mutableListOf.add(Data(26.819952185172603,112.58258048416751,332.5388326167029 ,10.938454)) + mutableListOf.add(Data(26.819952185172603,112.58258048416751,332.5388326167029 ,10.938454)) + mutableListOf.add(Data(26.82003906202077,112.58252887677297,331.2750700353321 ,10.86753)) + mutableListOf.add(Data(26.82003906202077,112.58252887677297,331.2750700353321 ,10.86753)) + mutableListOf.add(Data(26.82012530838014,112.58247555120677,331.0627194540364 ,10.9164505)) + mutableListOf.add(Data(26.82012530838014,112.58247555120677,331.0627194540364 ,10.9164505)) + mutableListOf.add(Data(26.82021139090915,112.58242212128593,331.2748378089003 ,10.884517)) + mutableListOf.add(Data(26.82021139090915,112.58242212128593,331.2748378089003 ,10.884517)) + mutableListOf.add(Data(26.820298208800885,112.58236931876395,331.2973910935397 ,10.954199)) + mutableListOf.add(Data(26.820298208800885,112.58236931876395,331.2973910935397 ,10.954199)) + mutableListOf.add(Data(26.820384970888565,112.58231658502292,331.0287870742398 ,10.913742)) + mutableListOf.add(Data(26.820384970888565,112.58231658502292,331.0287870742398 ,10.913742)) + mutableListOf.add(Data(26.820471244437208,112.58226359177391,331.06717273737524 ,10.912278)) + mutableListOf.add(Data(26.820471244437208,112.58226359177391,331.06717273737524 ,10.912278)) + mutableListOf.add(Data(26.820558007789558,112.58221052491533,331.5169816753556 ,10.94842)) + mutableListOf.add(Data(26.820558007789558,112.58221052491533,331.5169816753556 ,10.94842)) + mutableListOf.add(Data(26.820645407773025,112.58215812417345,331.71754335014384 ,10.979202)) + mutableListOf.add(Data(26.820645407773025,112.58215812417345,331.71754335014384 ,10.979202)) + mutableListOf.add(Data(26.820732568459803,112.58210589578515,331.6438729297561 ,10.946945)) + mutableListOf.add(Data(26.820732568459803,112.58210589578515,331.6438729297561 ,10.946945)) + mutableListOf.add(Data(26.820819910169977,112.58205326357,331.767485693355 ,10.988325)) + mutableListOf.add(Data(26.820819910169977,112.58205326357,331.767485693355 ,10.988325)) + mutableListOf.add(Data(26.82090739738908,112.58200156651718,332.347204829349 ,10.947101)) + mutableListOf.add(Data(26.82090739738908,112.58200156651718,332.347204829349 ,10.947101)) + mutableListOf.add(Data(26.820995056276622,112.58195061688777,332.4727163855371 ,10.950606)) + mutableListOf.add(Data(26.820995056276622,112.58195061688777,332.4727163855371 ,10.950606)) + mutableListOf.add(Data(26.821083357477672,112.58189977279349,333.5770486913015 ,11.0240345)) + mutableListOf.add(Data(26.821083357477672,112.58189977279349,333.5770486913015 ,11.0240345)) + mutableListOf.add(Data(26.821172475162726,112.58185287422074,336.05104566151766 ,11.047021)) + mutableListOf.add(Data(26.821172475162726,112.58185287422074,336.05104566151766 ,11.047021)) + mutableListOf.add(Data(26.821264484994177,112.58180877707832,336.721654124797 ,10.947278)) + mutableListOf.add(Data(26.821264484994177,112.58180877707832,336.721654124797 ,10.947278)) + mutableListOf.add(Data(26.821355586119605,112.5817640770223,336.0527258880535 ,11.0230665)) + mutableListOf.add(Data(26.821355586119605,112.5817640770223,336.0527258880535 ,11.0230665)) + mutableListOf.add(Data(26.821446396198834,112.58171813418576,335.6811840877723 ,11.044201)) + mutableListOf.add(Data(26.821446396198834,112.58171813418576,335.6811840877723 ,11.044201)) + mutableListOf.add(Data(26.821537394395577,112.58167296050368,336.12904642183923 ,11.024753)) + mutableListOf.add(Data(26.821537394395577,112.58167296050368,336.12904642183923 ,11.024753)) + mutableListOf.add(Data(26.82162819539147,112.58162746655287,335.0245706821023 ,11.01271)) + mutableListOf.add(Data(26.82162819539147,112.58162746655287,335.0245706821023 ,11.01271)) + mutableListOf.add(Data(26.821718933471065,112.58157993539679,334.1465498642972 ,11.123078)) + mutableListOf.add(Data(26.821718933471065,112.58157993539679,334.1465498642972 ,11.123078)) + mutableListOf.add(Data(26.821809477042866,112.58153187161871,333.93389875467795 ,11.069262)) + mutableListOf.add(Data(26.821809477042866,112.58153187161871,333.93389875467795 ,11.069262)) + mutableListOf.add(Data(26.82189924216394,112.5814829554966,333.64357473381745 ,11.037714)) + mutableListOf.add(Data(26.82189924216394,112.5814829554966,333.64357473381745 ,11.037714)) + mutableListOf.add(Data(26.82198886489619,112.58143265217548,333.8418414650445 ,11.124701)) + mutableListOf.add(Data(26.82198886489619,112.58143265217548,333.8418414650445 ,11.124701)) + mutableListOf.add(Data(26.82207943977267,112.58138371825058,334.74234726559735 ,11.168612)) + mutableListOf.add(Data(26.82207943977267,112.58138371825058,334.74234726559735 ,11.168612)) + mutableListOf.add(Data(26.82217079652045,112.58133629724179,334.6802745064203 ,11.136633)) + mutableListOf.add(Data(26.82217079652045,112.58133629724179,334.6802745064203 ,11.136633)) + mutableListOf.add(Data(26.82226125835418,112.58128793467625,334.04232117756277 ,11.089879)) + mutableListOf.add(Data(26.82226125835418,112.58128793467625,334.04232117756277 ,11.089879)) + mutableListOf.add(Data(26.822351660082763,112.5812387113965,334.4818438506531 ,11.136156)) + mutableListOf.add(Data(26.822351660082763,112.5812387113965,334.4818438506531 ,11.136156)) + mutableListOf.add(Data(26.822442570811926,112.581190668316,335.08963506413585 ,11.129769)) + mutableListOf.add(Data(26.822442570811926,112.581190668316,335.08963506413585 ,11.129769)) + mutableListOf.add(Data(26.822533871293896,112.58114380339613,335.2726704735138 ,11.116067)) + mutableListOf.add(Data(26.822533871293896,112.58114380339613,335.2726704735138 ,11.116067)) + mutableListOf.add(Data(26.822625356286988,112.5810963629318,334.7990514960868 ,11.171506)) + mutableListOf.add(Data(26.822625356286988,112.5810963629318,334.7990514960868 ,11.171506)) + mutableListOf.add(Data(26.822717040623075,112.58104834264921,335.2455546225089 ,11.233819)) + mutableListOf.add(Data(26.822717040623075,112.58104834264921,335.2455546225089 ,11.233819)) + mutableListOf.add(Data(26.822809222350063,112.58100143507674,335.7449848848094 ,11.209728)) + mutableListOf.add(Data(26.822809222350063,112.58100143507674,335.7449848848094 ,11.209728)) + mutableListOf.add(Data(26.822901437574036,112.5809551957787,335.54689573850067 ,11.171629)) + mutableListOf.add(Data(26.822901437574036,112.5809551957787,335.54689573850067 ,11.171629)) + mutableListOf.add(Data(26.822993570002573,112.58090876870207,335.8036083984556 ,11.158639)) + mutableListOf.add(Data(26.822993570002573,112.58090876870207,335.8036083984556 ,11.158639)) + mutableListOf.add(Data(26.823085804697456,112.5808628704648,336.06588083239495 ,11.160056)) + mutableListOf.add(Data(26.823085804697456,112.5808628704648,336.06588083239495 ,11.160056)) + mutableListOf.add(Data(26.8231782941641,112.5808170301043,336.1425838567742 ,11.196213)) + mutableListOf.add(Data(26.8231782941641,112.5808170301043,336.1425838567742 ,11.196213)) + mutableListOf.add(Data(26.82327070139615,112.58077156018408,336.3930127426927 ,11.158848)) + mutableListOf.add(Data(26.82327070139615,112.58077156018408,336.3930127426927 ,11.158848)) + mutableListOf.add(Data(26.82336315989599,112.58072645624978,336.4708632388525 ,11.134174)) + mutableListOf.add(Data(26.82336315989599,112.58072645624978,336.4708632388525 ,11.134174)) + mutableListOf.add(Data(26.82345461520168,112.58068198624507,336.6187095136266 ,10.997278)) + mutableListOf.add(Data(26.82345461520168,112.58068198624507,336.6187095136266 ,10.997278)) + mutableListOf.add(Data(26.82354701100081,112.58063771053577,337.4698740276152 ,11.121712)) + mutableListOf.add(Data(26.82354701100081,112.58063771053577,337.4698740276152 ,11.121712)) + mutableListOf.add(Data(26.823638365508067,112.58059644124914,338.7054689088489 ,10.727212)) + mutableListOf.add(Data(26.823638365508067,112.58059644124914,338.7054689088489 ,10.727212)) + mutableListOf.add(Data(26.823727664550493,112.58055870143195,339.8902335222793 ,10.347593)) + mutableListOf.add(Data(26.823727664550493,112.58055870143195,339.8902335222793 ,10.347593)) + mutableListOf.add(Data(26.823812318470793,112.58052555925428,340.5650493820874 ,9.4535055)) + mutableListOf.add(Data(26.823812318470793,112.58052555925428,340.5650493820874 ,9.4535055)) + mutableListOf.add(Data(26.823887553495833,112.58049561807807,339.6516276938141 ,8.247951)) + mutableListOf.add(Data(26.823887553495833,112.58049561807807,339.6516276938141 ,8.247951)) + mutableListOf.add(Data(26.82395168024204,112.58046870159896,340.5628364007963 ,6.9784737)) + mutableListOf.add(Data(26.82395168024204,112.58046870159896,340.5628364007963 ,6.9784737)) + mutableListOf.add(Data(26.82400846212442,112.58045082651485,351.1414880288254 ,6.062161)) + mutableListOf.add(Data(26.82400846212442,112.58045082651485,351.1414880288254 ,6.062161)) + mutableListOf.add(Data(26.824060398302887,112.58044942761538,6.345352517490426 ,5.5890617)) + mutableListOf.add(Data(26.824060398302887,112.58044942761538,6.345352517490426 ,5.5890617)) + mutableListOf.add(Data(26.82410717835299,112.58045986670147,15.169950094957699 ,5.0569997)) + mutableListOf.add(Data(26.82410717835299,112.58045986670147,15.169950094957699 ,5.0569997)) + mutableListOf.add(Data(26.824153274522928,112.58047698923471,22.21982546943474 ,5.927354)) + mutableListOf.add(Data(26.824153274522928,112.58047698923471,22.21982546943474 ,5.927354)) + mutableListOf.add(Data(26.82420820422086,112.58050675346034,28.072225248435984 ,7.5890827)) + mutableListOf.add(Data(26.82420820422086,112.58050675346034,28.072225248435984 ,7.5890827)) + mutableListOf.add(Data(26.824271397494158,112.58054781114281,33.366052157113586 ,8.47322)) + mutableListOf.add(Data(26.824271397494158,112.58054781114281,33.366052157113586 ,8.47322)) + mutableListOf.add(Data(26.824335395451552,112.58059964957953,39.51156267415672 ,8.985364)) + mutableListOf.add(Data(26.824335395451552,112.58059964957953,39.51156267415672 ,8.985364)) + mutableListOf.add(Data(26.824395490943697,112.58066019726031,45.24210163308118 ,9.010218)) + mutableListOf.add(Data(26.824395490943697,112.58066019726031,45.24210163308118 ,9.010218)) + mutableListOf.add(Data(26.824450500955546,112.5807291061281,51.63071224306344 ,9.249808)) + mutableListOf.add(Data(26.824450500955546,112.5807291061281,51.63071224306344 ,9.249808)) + mutableListOf.add(Data(26.82449811991814,112.58080421285314,58.4833590750672 ,9.367973)) + mutableListOf.add(Data(26.82449811991814,112.58080421285314,58.4833590750672 ,9.367973)) + mutableListOf.add(Data(26.824538848426627,112.58088982957428,65.9710803111933 ,9.695224)) + mutableListOf.add(Data(26.824538848426627,112.58088982957428,65.9710803111933 ,9.695224)) + mutableListOf.add(Data(26.8245709793362,112.58098361641142,72.2269171663524 ,10.104207)) + mutableListOf.add(Data(26.8245709793362,112.58098361641142,72.2269171663524 ,10.104207)) + mutableListOf.add(Data(26.82459393783725,112.5810786789352,76.83474207290874 ,9.46164)) + mutableListOf.add(Data(26.82459393783725,112.5810786789352,76.83474207290874 ,9.46164)) + mutableListOf.add(Data(26.82461098240031,112.58116886149608,78.96607186755995 ,8.802579)) + mutableListOf.add(Data(26.82461098240031,112.58116886149608,78.96607186755995 ,8.802579)) + mutableListOf.add(Data(26.824624897258907,112.58125259016583,79.77531524174401 ,8.213966)) + mutableListOf.add(Data(26.824624897258907,112.58125259016583,79.77531524174401 ,8.213966)) + mutableListOf.add(Data(26.824637602560202,112.58133367965361,80.0445023884443 ,8.11556)) + mutableListOf.add(Data(26.824637602560202,112.58133367965361,80.0445023884443 ,8.11556)) + mutableListOf.add(Data(26.824650401766355,112.58141466975431,80.0775895323311 ,8.164914)) + mutableListOf.add(Data(26.824650401766355,112.58141466975431,80.0775895323311 ,8.164914)) + mutableListOf.add(Data(26.824664299167868,112.58149569608165,78.12252130694856 ,8.347733)) + mutableListOf.add(Data(26.824664299167868,112.58149569608165,78.12252130694856 ,8.347733)) + mutableListOf.add(Data(26.824680465602725,112.58158016934632,77.63346354067636 ,8.871422)) + mutableListOf.add(Data(26.824680465602725,112.58158016934632,77.63346354067636 ,8.871422)) + mutableListOf.add(Data(26.824698071237794,112.5816714712686,77.57790507442019 ,9.538839)) + mutableListOf.add(Data(26.824698071237794,112.5816714712686,77.57790507442019 ,9.538839)) + mutableListOf.add(Data(26.824716810952108,112.58176774318086,77.44957350387847 ,10.009091)) + mutableListOf.add(Data(26.824716810952108,112.58176774318086,77.44957350387847 ,10.009091)) + mutableListOf.add(Data(26.824736346219844,112.58186742933266,77.70056588040353 ,10.273892)) + mutableListOf.add(Data(26.824736346219844,112.58186742933266,77.70056588040353 ,10.273892)) + mutableListOf.add(Data(26.82475624119252,112.58196927550934,77.2926738133595 ,10.368853)) + mutableListOf.add(Data(26.82475624119252,112.58196927550934,77.2926738133595 ,10.368853)) + mutableListOf.add(Data(26.824776321201686,112.58207074730377,77.99243352401652 ,10.352851)) + mutableListOf.add(Data(26.824776321201686,112.58207074730377,77.99243352401652 ,10.352851)) + mutableListOf.add(Data(26.824795173856856,112.58217470637561,79.23096197149869 ,10.704494)) + mutableListOf.add(Data(26.824795173856856,112.58217470637561,79.23096197149869 ,10.704494)) + mutableListOf.add(Data(26.824813008893262,112.58228182337149,79.66565313952486 ,10.874358)) + mutableListOf.add(Data(26.824813008893262,112.58228182337149,79.66565313952486 ,10.874358)) + mutableListOf.add(Data(26.824830937998897,112.5823899189086,79.68082128212416 ,10.942389)) + mutableListOf.add(Data(26.824830937998897,112.5823899189086,79.68082128212416 ,10.942389)) + mutableListOf.add(Data(26.824848069663854,112.58249889778686,80.14145692371261 ,10.985577)) + mutableListOf.add(Data(26.824848069663854,112.58249889778686,80.14145692371261 ,10.985577)) + mutableListOf.add(Data(26.824864747770675,112.58260734311246,80.0448934167743 ,10.931011)) + mutableListOf.add(Data(26.824864747770675,112.58260734311246,80.0448934167743 ,10.931011)) + mutableListOf.add(Data(26.824882072902202,112.58271533362611,79.72259813418253 ,10.872131)) + mutableListOf.add(Data(26.824882072902202,112.58271533362611,79.72259813418253 ,10.872131)) + mutableListOf.add(Data(26.824898658212664,112.58282301050227,80.15790572678134 ,10.803015)) + mutableListOf.add(Data(26.824898658212664,112.58282301050227,80.15790572678134 ,10.803015)) + mutableListOf.add(Data(26.824915330378445,112.58293057308566,79.8746065554821 ,10.830168)) + mutableListOf.add(Data(26.824915330378445,112.58293057308566,79.8746065554821 ,10.830168)) + mutableListOf.add(Data(26.824932651505765,112.58303827378298,79.61621110767044 ,10.868644)) + mutableListOf.add(Data(26.824932651505765,112.58303827378298,79.61621110767044 ,10.868644)) + mutableListOf.add(Data(26.82494998141344,112.58314556269549,80.13490250343034 ,10.779586)) + mutableListOf.add(Data(26.82494998141344,112.58314556269549,80.13490250343034 ,10.779586)) + mutableListOf.add(Data(26.82496632888347,112.58325114989803,80.10408298234796 ,10.57883)) + mutableListOf.add(Data(26.82496632888347,112.58325114989803,80.10408298234796 ,10.57883)) + mutableListOf.add(Data(26.824982616660503,112.5833574520516,80.0832449289639 ,10.798956)) + mutableListOf.add(Data(26.824982616660503,112.5833574520516,80.0832449289639 ,10.798956)) + mutableListOf.add(Data(26.825000029272786,112.58346564536672,79.64116349625579 ,11.000219)) + mutableListOf.add(Data(26.825000029272786,112.58346564536672,79.64116349625579 ,11.000219)) + mutableListOf.add(Data(26.82501782306914,112.58357367268343,80.0479729783163 ,10.887358)) + mutableListOf.add(Data(26.82501782306914,112.58357367268343,80.0479729783163 ,10.887358)) + mutableListOf.add(Data(26.825034644140306,112.5836819669284,80.39041646518592 ,10.887838)) + mutableListOf.add(Data(26.825034644140306,112.5836819669284,80.39041646518592 ,10.887838)) + mutableListOf.add(Data(26.825050825910466,112.58379012234309,79.99435343201077 ,10.847428)) + mutableListOf.add(Data(26.825050825910466,112.58379012234309,79.99435343201077 ,10.847428)) + mutableListOf.add(Data(26.82506848640962,112.58389620345477,79.68656034857423 ,10.79047)) + mutableListOf.add(Data(26.82508624503321,112.58400483164121,80.33252805064916 ,10.902022)) + mutableListOf.add(Data(26.825102551245067,112.5841132971028,80.34150291921856 ,10.943128)) + mutableListOf.add(Data(26.825119995319334,112.58422127548491,79.928671771631 ,10.812377)) + mutableListOf.add(Data(26.825136584562436,112.58432887362649,80.3882692244656 ,10.840047)) + mutableListOf.add(Data(26.825152339750225,112.58443770296758,80.06505101256226 ,10.956093)) + mutableListOf.add(Data(26.82516950026469,112.58454632285358,79.41718024902991 ,10.955121)) + mutableListOf.add(Data(26.825187322302735,112.58465452397829,79.75200465988036 ,10.914424)) + mutableListOf.add(Data(26.82520508970052,112.58476268654412,80.23870430334165 ,10.900922)) + mutableListOf.add(Data(26.82522160867826,112.5848709467686,80.44165825188668 ,10.936707)) + mutableListOf.add(Data(26.825238429747245,112.5849796588726,79.97719514304202 ,10.95725)) + mutableListOf.add(Data(26.82525602953279,112.58508773702944,80.00920140949273 ,10.904101)) + mutableListOf.add(Data(26.82527317500041,112.58519603083177,80.24089764783884 ,10.8971195)) + mutableListOf.add(Data(26.825290036476883,112.58530443946485,80.20050390908739 ,10.926449)) + mutableListOf.add(Data(26.82530659361771,112.58541239287453,80.04904787933697 ,10.85935)) + mutableListOf.add(Data(26.82532336881114,112.5855199067927,80.04164736937122 ,10.782148)) + mutableListOf.add(Data(26.825340290024027,112.58562428673645,79.76805645820355 ,10.10985)) + mutableListOf.add(Data(26.82535567687754,112.58571917203813,80.07238578195722 ,9.093919)) + mutableListOf.add(Data(26.82536901649892,112.58580534392024,80.083560825213 ,8.268731)) + mutableListOf.add(Data(26.825381954739342,112.58588575869024,79.89287389641731 ,8.168556)) + mutableListOf.add(Data(26.825394786288715,112.58596894528253,80.33394019226006 ,8.655088)) + mutableListOf.add(Data(26.82540806483152,112.5860544640404,79.8452282043146 ,8.341439)) + mutableListOf.add(Data(26.825421391715953,112.58613679909993,79.92148641262412 ,8.457919)) + mutableListOf.add(Data(26.82543495743159,112.5862224944188,80.25262935151198 ,8.937425)) + mutableListOf.add(Data(26.82544887111177,112.58631295507655,80.08629375465466 ,9.368444)) + mutableListOf.add(Data(26.82546366378044,112.58640477758786,79.78908661065805 ,9.034008)) + mutableListOf.add(Data(26.82547791361014,112.58649216206204,80.10327445870496 ,8.63131)) + mutableListOf.add(Data(26.825491576317813,112.58658089699335,80.45077996952324 ,9.251799)) + mutableListOf.add(Data(26.825506335597126,112.58667589584078,80.12832503125964 ,9.939442)) + mutableListOf.add(Data(26.82552223441907,112.58677732670597,80.41312599040259 ,10.415545)) + mutableListOf.add(Data(26.825538277383547,112.58688045012173,80.3277366729464 ,10.310362)) + mutableListOf.add(Data(26.825554208115665,112.5869811637487,80.0571194553886 ,9.979941)) + mutableListOf.add(Data(26.82556927129904,112.58707547979726,80.22023034918402 ,9.056645)) + mutableListOf.add(Data(26.825582903082594,112.5871616534857,80.40227623490603 ,8.297718)) + mutableListOf.add(Data(26.825595447076772,112.58724267783181,80.58279642712216 ,8.240325)) + mutableListOf.add(Data(26.825607062333198,112.58732773893132,82.92822447772295 ,8.885467)) + mutableListOf.add(Data(26.8256163967207,112.58742007652688,83.91451403915653 ,9.53883)) + mutableListOf.add(Data(26.825625805673585,112.58751790162299,83.49849276633978 ,9.8336315)) + mutableListOf.add(Data(26.82563596715511,112.58761468270157,83.35401718992108 ,9.501984)) + mutableListOf.add(Data(26.825646863924856,112.5877102491863,82.55524663016877 ,9.71343)) + mutableListOf.add(Data(26.825659541247234,112.58780732835037,81.94595789771051 ,9.71838)) + mutableListOf.add(Data(26.825672293111914,112.5879045928294,81.89237762499266 ,9.677105)) + mutableListOf.add(Data(26.825685337681932,112.58799809299924,80.8824043826121 ,9.080445)) + mutableListOf.add(Data(26.82569847648075,112.58808400269606,79.89877603363385 ,8.160078)) + mutableListOf.add(Data(26.825711805743254,112.58816030310517,79.63162684462714 ,7.2267)) + mutableListOf.add(Data(26.82572189552541,112.58822581838183,83.05601176756522 ,5.997647)) + mutableListOf.add(Data(26.82572447823082,112.5882790961332,92.82558460020824 ,4.5657516)) + mutableListOf.add(Data(26.825718263255567,112.58831958891977,105.99306916896894 ,3.6916084)) + mutableListOf.add(Data(26.825705384757367,112.58835137594669,117.39571481846839 ,3.4976408)) + mutableListOf.add(Data(26.82568773592112,112.58838171407714,126.8308015341406 ,3.7412977)) + mutableListOf.add(Data(26.825664209114287,112.58841049240998,136.7715408144472 ,3.8619535)) + mutableListOf.add(Data(26.825635321161386,112.58843565279595,146.28077606374907 ,4.1901913)) + mutableListOf.add(Data(26.82560115459976,112.5884567796701,156.0422092179645 ,4.372593)) + mutableListOf.add(Data(26.8255626836711,112.58847136977255,166.78803655611884 ,4.56643)) + mutableListOf.add(Data(26.82552087332516,112.58847674422513,178.44471060122942 ,5.053988)) + mutableListOf.add(Data(26.825468360723992,112.58847264490073,185.2122805969315 ,6.715906)) + mutableListOf.add(Data(26.825401186671062,112.58846318500233,186.65640115352562 ,8.006904)) + mutableListOf.add(Data(26.82532605586703,112.58845198261439,187.28742867056476 ,8.70072)) + mutableListOf.add(Data(26.8252457471272,112.58843933355529,188.2250770398241 ,9.278515)) + mutableListOf.add(Data(26.82516033433597,112.58842418755573,188.72999194402811 ,9.884587)) + mutableListOf.add(Data(26.825068937761582,112.58840750767082,188.55380038419847 ,10.508339)) + mutableListOf.add(Data(26.824972867801122,112.58839022105084,189.05396147674017 ,10.945375)) + mutableListOf.add(Data(26.824875043536103,112.58837048811633,190.37926406253277 ,11.015351)) + mutableListOf.add(Data(26.82477736812146,112.58834859022588,190.74765714560658 ,10.961484)) + mutableListOf.add(Data(26.82468029797548,112.58832657515805,190.7464003907993 ,10.924771)) + mutableListOf.add(Data(26.824583225389507,112.58830488028168,191.0691678102174 ,10.944002)) + mutableListOf.add(Data(26.824486236537098,112.58828204069819,191.41682443897108 ,10.972908)) + mutableListOf.add(Data(26.82438935491626,112.58825925251047,191.13828932461794 ,10.922421)) + mutableListOf.add(Data(26.824292058061655,112.58823714439076,190.51417395901885 ,10.983685)) + mutableListOf.add(Data(26.824194978703208,112.58821677322887,189.4132567478395 ,10.865106)) + mutableListOf.add(Data(26.824097661934157,112.58819829218662,188.33140942482285 ,10.886163)) + mutableListOf.add(Data(26.82399966406215,112.5881817191164,186.76314334987458 ,10.996041)) + mutableListOf.add(Data(26.82390099423371,112.58816868906779,184.95688616348636 ,10.964688)) + mutableListOf.add(Data(26.823802803259678,112.58815906442507,183.5099242481975 ,10.888597)) + mutableListOf.add(Data(26.823703886909744,112.58815186387652,182.20369155056758 ,10.969546)) + mutableListOf.add(Data(26.823604841012653,112.58814776818956,180.27973654440171 ,10.942759)) + mutableListOf.add(Data(26.823506182087286,112.58814756502561,178.41990335416392 ,10.901522)) + mutableListOf.add(Data(26.8234077732812,112.58815050565116,177.07771654074304 ,10.863581)) + mutableListOf.add(Data(26.823309027975455,112.58815577451051,175.84363796150515 ,10.914522)) + mutableListOf.add(Data(26.823210579428864,112.58816315720807,174.83184105861613 ,10.904749)) + mutableListOf.add(Data(26.82311176082705,112.58817200770986,174.3510777033173 ,10.960163)) + mutableListOf.add(Data(26.8230130510353,112.58818159990454,174.25116569613834 ,10.949297)) + mutableListOf.add(Data(26.8229147108448,112.58819100914526,174.4300620108793 ,10.86557)) + mutableListOf.add(Data(26.822815982451136,112.58819998942029,174.38741430970174 ,10.961633)) + mutableListOf.add(Data(26.822717658398695,112.58820959147286,173.98943284714346 ,10.884146)) + mutableListOf.add(Data(26.822619025345805,112.58821937006674,174.21477444824052 ,10.94364)) + mutableListOf.add(Data(26.822520398766574,112.58822881737137,174.50188828019117 ,10.928565)) + mutableListOf.add(Data(26.82242135045806,112.58823800170606,174.39203151758068 ,11.003972)) + mutableListOf.add(Data(26.82232288454279,112.58824734785314,174.21564871245428 ,10.937689)) + mutableListOf.add(Data(26.82222440307578,112.58825691597944,174.16925806761154 ,10.9371195)) + mutableListOf.add(Data(26.822125599059973,112.58826617121782,174.505658544613 ,10.904333)) + mutableListOf.add(Data(26.822027680356275,112.58827501278103,174.41369687762796 ,10.894905)) + mutableListOf.add(Data(26.82192881779245,112.58828425392758,174.03677971846997 ,10.942385)) + mutableListOf.add(Data(26.821829987245398,112.58829436532618,174.09423526976812 ,10.993935)) + mutableListOf.add(Data(26.821731474322508,112.58830369366189,174.458011144963 ,10.912243)) + mutableListOf.add(Data(26.82163298773937,112.58831277133513,174.29083543483776 ,10.906608)) + mutableListOf.add(Data(26.821534477288782,112.58832251669477,174.07890832527062 ,10.930833)) + mutableListOf.add(Data(26.82143603055604,112.58833213847254,174.3435371744736 ,10.910077)) + mutableListOf.add(Data(26.821337437902788,112.58834046715273,175.3574104548703 ,10.923147)) + mutableListOf.add(Data(26.82123870294786,112.5883459066746,177.2432256847108 ,10.943883)) + mutableListOf.add(Data(26.821139617348642,112.58834848729124,177.67729786684345 ,10.97326)) + mutableListOf.add(Data(26.82104042684288,112.5883516739536,176.89996769778264 ,10.979047)) + mutableListOf.add(Data(26.820941492509043,112.58835610568427,177.2468047038359 ,10.953704)) + mutableListOf.add(Data(26.820842365150224,112.58835964324697,176.68708436173168 ,10.956896)) + mutableListOf.add(Data(26.82074348179931,112.58836548765069,175.08942115259566 ,10.924478)) + mutableListOf.add(Data(26.820644894992096,112.5883738706066,174.5613928882403 ,10.922756)) + mutableListOf.add(Data(26.82054592431787,112.58838272264623,174.56396103936825 ,10.973723)) + mutableListOf.add(Data(26.82044709968575,112.58839144578067,174.37763347881028 ,10.921038)) + mutableListOf.add(Data(26.820350203145193,112.58840097729004,173.61869017899517 ,10.51492)) + mutableListOf.add(Data(26.820258686700708,112.58841127187114,173.23824864222544 ,9.750838)) + mutableListOf.add(Data(26.82017508368214,112.58842030622239,174.08024704234793 ,8.816113)) + mutableListOf.add(Data(26.820100223700994,112.58842630948175,176.73598851618897 ,7.82164)) + mutableListOf.add(Data(26.820033299572902,112.58842614363626,183.5862311216049 ,6.977247)) + mutableListOf.add(Data(26.81997327271163,112.58841548604096,193.57521885820844 ,6.478256)) + mutableListOf.add(Data(26.81991927150576,112.58839498736432,202.85463190231775 ,6.3534274)) + mutableListOf.add(Data(26.819867127007132,112.58836446736944,210.9787321086977 ,6.6902227)) + mutableListOf.add(Data(26.81981675325887,112.58832481437109,218.38637279190002 ,6.9047847)) + mutableListOf.add(Data(26.819771552548968,112.58827786859652,226.603035721912 ,6.7886267)) + mutableListOf.add(Data(26.81973314144824,112.58822495699303,232.99868825692852 ,6.7599373)) + mutableListOf.add(Data(26.819698452510536,112.58816757745821,237.22470388133385 ,7.2045116)) + mutableListOf.add(Data(26.819663217361732,112.5881007591936,240.00845676059924 ,8.158858)) + mutableListOf.add(Data(26.819626000292175,112.58802453540116,240.8784999174538 ,8.999233)) + mutableListOf.add(Data(26.819586534576935,112.58794197732135,240.76522806025832 ,9.600716)) + mutableListOf.add(Data(26.819543977857247,112.58785492336641,240.00827917568083 ,10.142109)) + mutableListOf.add(Data(26.819497317310454,112.58776324429233,239.45918660792518 ,10.695647)) + mutableListOf.add(Data(26.819448768856812,112.587668386066,239.3843823761352 ,10.932611)) + mutableListOf.add(Data(26.81939918638018,112.58757314768673,238.63705039790906 ,10.928658)) + mutableListOf.add(Data(26.819348833837722,112.58747899858194,238.34806509412584 ,10.828743)) + mutableListOf.add(Data(26.819298543965182,112.58738510707593,238.20517753668918 ,10.846967)) + mutableListOf.add(Data(26.819247448176384,112.58729177541909,237.1934625960702 ,10.858182)) + mutableListOf.add(Data(26.819194632031977,112.5871997947454,236.50368179179063 ,10.823321)) + mutableListOf.add(Data(26.81914190798688,112.58710814764821,236.76342022554786 ,10.759948)) + mutableListOf.add(Data(26.81908940434915,112.58701628899507,236.13558923704028 ,10.808216)) + mutableListOf.add(Data(26.819035575518786,112.58692584568828,235.18217679117654 ,10.71068)) + mutableListOf.add(Data(26.81898073231781,112.5868359376484,235.13092305164477 ,10.8211355)) + mutableListOf.add(Data(26.81892555318869,112.58674535807322,235.32996842443728 ,10.85881)) + mutableListOf.add(Data(26.81887105463057,112.58665496701065,235.21492071805758 ,10.777623)) + mutableListOf.add(Data(26.818815922622132,112.58656520621176,234.90702945065175 ,10.759572)) + mutableListOf.add(Data(26.818760790349998,112.58647523807899,235.211041170609 ,10.825326)) + mutableListOf.add(Data(26.818706084816025,112.5863853958238,235.1533533928791 ,10.755462)) + mutableListOf.add(Data(26.818651422997945,112.58629555556442,235.04497195112933 ,10.756754)) + mutableListOf.add(Data(26.818596768469828,112.58620567612797,235.18598803673342 ,10.776001)) + mutableListOf.add(Data(26.818542351463606,112.58611652045523,234.8494782767052 ,10.687228)) + mutableListOf.add(Data(26.818487635742752,112.58602741332314,234.98692900356255 ,10.736459)) + mutableListOf.add(Data(26.818433311586134,112.5859383346022,235.22746094537374 ,10.653758)) + mutableListOf.add(Data(26.818378710306522,112.58584926454115,235.01718674158573 ,10.708648)) + mutableListOf.add(Data(26.81832410447011,112.58575969356657,235.37343574831525 ,10.767325)) + mutableListOf.add(Data(26.818270113201255,112.5856699225492,235.18238169685165 ,10.741438)) + mutableListOf.add(Data(26.818215754477475,112.5855806078428,234.962640850874 ,10.717836)) + mutableListOf.add(Data(26.81816119807655,112.58549201301568,235.00922274101347 ,10.64606)) + mutableListOf.add(Data(26.818106882589856,112.58540284786379,235.37503401258104 ,10.699273)) + mutableListOf.add(Data(26.818052845270795,112.58531349223125,235.15450086465967 ,10.689224)) + mutableListOf.add(Data(26.81799849537033,112.58522428835666,235.13877776919028 ,10.715375 )) + mutableListOf.add(Data(26.817944471910003,112.58513476623239,235.33824661371133 ,10.698519)) + mutableListOf.add(Data(26.817890134992844,112.58504554973807,234.86815201389604 ,10.693531)) + mutableListOf.add(Data(26.817835319728093,112.58495664165265,235.02019202482052 ,10.712638)) + mutableListOf.add(Data(26.817780786837695,112.58486759996185,234.98798085269473 ,10.703126)) + mutableListOf.add(Data(26.817726344560015,112.58477895119715,234.72041502214867 ,10.559478)) + mutableListOf.add(Data(26.817672896045035,112.58469285935371,234.80909819833212 ,10.268126)) + mutableListOf.add(Data(26.81762034092348,112.5846076693991,235.4481989989702 ,10.194944)) + mutableListOf.add(Data(26.81757000080714,112.58452312548724,236.82009713528063 ,9.998541)) + mutableListOf.add(Data(26.81752307710616,112.58443938857062,238.62282994405712 ,9.646217)) + mutableListOf.add(Data(26.81747927640272,112.5843556948273,239.96605494623182 ,9.61409)) + mutableListOf.add(Data(26.817437035117667,112.5842705975036,241.02851819238398 ,9.784999)) + mutableListOf.add(Data(26.817394588032748,112.58418206729552,241.47888720587628 ,10.220616)) + mutableListOf.add(Data(26.81734916434496,112.58408728482055,240.92852422293498 ,10.946569)) + mutableListOf.add(Data(26.817300427653745,112.58398997361219,239.22969225181274 ,11.08842)) + mutableListOf.add(Data(26.81724905918242,112.58389508879584,237.37255015610793 ,10.959397)) + mutableListOf.add(Data(26.817195687670125,112.58380236411111,236.10377421588638 ,10.868602)) + mutableListOf.add(Data(26.817141281661353,112.58371061366645,235.69349841282204 ,10.867909)) + mutableListOf.add(Data(26.81708765945191,112.58361944929223,236.51455545294928 ,10.751019)) + mutableListOf.add(Data(26.817037237801387,112.58352946632557,238.18176364821437 ,10.172699)) + mutableListOf.add(Data(26.816991758745935,112.58344394169914,238.81318731622537 ,9.476438)) + mutableListOf.add(Data(26.81695008311907,112.58336549123571,238.35449913232398 ,8.670373)) + mutableListOf.add(Data(26.816911519966908,112.58329384142816,238.00583163557317 ,7.9418206)) + mutableListOf.add(Data(26.816875769929663,112.58322842149074,237.9069304963914 ,7.250271)) + mutableListOf.add(Data(26.816842700317792,112.58316889814716,237.12501044020834 ,6.608085)) + mutableListOf.add(Data(26.816812547895015,112.58311627111057,236.47424367646786 ,5.8385525)) + mutableListOf.add(Data(26.81678497120257,112.58306956006162,235.61325735045273 ,5.1207457)) + mutableListOf.add(Data(26.816762161812772,112.58303220941076,235.7694501163926 ,3.907349)) + mutableListOf.add(Data(26.816744452403828,112.58300245495224,236.2325232817411 ,3.0969348)) + mutableListOf.add(Data(26.816731497575027,112.58298000037128,236.6114211957584 ,2.2574704 )) + mutableListOf.add(Data(26.816722462577506,112.58296434850722,236.4161051062527 ,1.5331981 )) + mutableListOf.add(Data(26.816716398581754,112.5829537450492,236.21764712972882 ,1.0040071 )) + mutableListOf.add(Data(26.816712164282283,112.5829466272515,236.12834923652008 ,0.737751 )) + mutableListOf.add(Data(26.816193817151735,112.58251966330332,54.59367562577165 ,0.018921295)) + mutableListOf.add(Data(26.816193817151735,112.58251966330332,54.59367562577165 ,0.018921295)) + mutableListOf.add(Data(26.816193817151735,112.58251966330332,54.59367562577165 ,0.018921295)) + mutableListOf.add(Data(26.81619396445322,112.58251998494924,54.613592457391405 ,0.027000831)) + mutableListOf.add(Data(26.81619407811497,112.58252024223145,54.669067253830235 ,-0.0011194336)) + mutableListOf.add(Data(26.816195171832447,112.582522095685,54.64187627074443 ,0.612925)) + mutableListOf.add(Data(26.816204331708672,112.58253646642525,53.960872259548296 ,2.6901135)) + mutableListOf.add(Data(26.816223192189753,112.58256468184578,51.595331863162755 ,4.345004)) + mutableListOf.add(Data(26.816251222259027,112.5826029300781,49.506195562109326 ,5.6220856)) + mutableListOf.add(Data(26.816287694595495,112.58265190405298,50.01768110829488 ,7.31063)) + mutableListOf.add(Data(26.816332750019175,112.58271403398732,50.59955858406664 ,8.614218)) + + mutableListOf.forEach { + val wgS84ToGCJ02 = CoordinateTransform.GCJ02ToWGS84(it.a2,it.a1) + println("{\"localTime\":1694072487989,\"class\":\"MoGoAdasListenerImpl\",\"msg\":{\"GnssInfo\":{\"longitude\": ${wgS84ToGCJ02[0]},\"latitude\": ${wgS84ToGCJ02[1]},\"altitude\": 26.97,\"heading\": ${it.heading},\"acceleration\": 0.33836419161950765,\"yawRate\": 0.00300991842921123,\"gnssSpeed\": ${it.speed},\"vehicleSpeed\": 15.375,\"satelliteTime\": 1.69407248798E9,\"systemTime\": 1.6940724879893079E9},\"traceInfo\":{\"endPoint\":true,\"linkChainLog\":1,\"linkCode\":1,\"methodName\":\"onGnssInfo\",\"nodeAliasCode\":\"CHAIN_CODE_ADAS_CAR_LOC\",\"paramIndexes\":[0,1],\"parentNodeAliasCode\":\"\",\"recordDataChange\":true,\"spanId\":null,\"traceId\":null},\"Header\":{\"msgID\": 160606,\"msgType\": \"MsgTypeGnssInfo\",\"timestamp\": 1.6940724879929435E9,\"sourceTimestamp\": 1.69407248798E9}}}") + } + } + + data class Data(val a1:Double,val a2:Double,val heading:Double,val speed:Double) } \ No newline at end of file From 0e086b5c3d0951c5209cd6078a2193371c006171 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 27 Sep 2023 10:47:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.1.0]=20mogo=20taxi=E6=A8=A1=E5=9D=97,?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A8=A1=E5=9D=97=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?INVISIBLE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 28c22f948a..4cc7601535 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -561,7 +561,7 @@ public abstract class BaseTaxiTabFragment Date: Wed, 27 Sep 2023 14:09:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.1.0]=20=E6=9B=B4=E6=96=B0=E5=88=B0?= =?UTF-8?q?=E7=AB=99=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/ui/task/TaxiTaskModel.kt | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 753b29ef78..d6d6f7453f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -31,7 +31,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.* import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage @@ -119,7 +118,7 @@ object TaxiTaskModel { private var mPrepareTaskDelayRunnable: Runnable? = null - private var mIsArrivedSiteTag = false //到站标志位,防止围栏触发多次调用到站接口 + private var mIsArrivedSiteStartTag = false //到站接口请求标志位,防止围栏触发多次调用到站接口, true 接口请求, false : 接口请求完成 fun addTaskWithOrderListener(tag: String, listener: ITaxiTaskWithOrderCallback) { if (mTaxiTaskWithOrderCallbackMap.containsKey(tag)) { @@ -557,12 +556,12 @@ object TaxiTaskModel { siteId: Long, isArriveAtEndSite: Boolean, isArrivedNearestStation: Boolean = false ) { - if (mIsArrivedSiteTag) { + if (mIsArrivedSiteStartTag) { DebugView.printInfoMsg("arriveSite接口正在调用中") - i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteTag") + i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteStartTag") return } - mIsArrivedSiteTag = true + mIsArrivedSiteStartTag = true DebugView.printInfoMsg("[上报ArriveSite] siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite") i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite") TaxiTaskWithOrderServiceManager.arriveSite( @@ -570,8 +569,10 @@ object TaxiTaskModel { siteId, object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { - mIsArrivedSiteTag = false - if (data == null || data.code != 0) return + if (data == null || data.code != 0) { + mIsArrivedSiteStartTag = false + return + } DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite") d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data)) mDriveToNearestStationTask = null @@ -587,7 +588,7 @@ object TaxiTaskModel { override fun onError() { super.onError() - mIsArrivedSiteTag = false + mIsArrivedSiteStartTag = false if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试 ToastUtils.showShort("网络出现异常,请稍后重试") DebugView.printErrorMsg("[上报ArriveSite] 网络出现异常,请稍后重试") @@ -598,7 +599,7 @@ object TaxiTaskModel { } override fun onFail(code: Int, msg: String?) { - mIsArrivedSiteTag = false + mIsArrivedSiteStartTag = false DebugView.printErrorMsg("[上报ArriveSite] failed, code=$code, msg=$msg") d(TAG, "code=$code msg=$msg") ToastUtils.showShort("到站接口请求出现异常,请稍后重试,code=$code msg=$msg") @@ -718,6 +719,7 @@ object TaxiTaskModel { //注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务 if (result.currentStatus == TaskStatusEnum.CompleteTask.code ) { + mIsArrivedSiteStartTag = false //任务完成说明到站, 更新到站标识位, 不再到站接口请求成功更新 mADASStatusCallback?.updateAutopilotStatus() mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value