Merge remote-tracking branch 'origin/master'

src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/gps/KmlParserUtil.java

@@ -30,36 +30,46 @@ public class KmlParserUtil {
             @SuppressWarnings("rawtypes")
             Node name = doc.selectSingleNode("//default:name");
             route.setName(name.getText().trim());
-            @SuppressWarnings("rawtypes")
-            List<Node> LineStringNodeList = doc.selectNodes("//default:Placemark//default:LineString/default:coordinates");
+            List<Node> selectNodes = doc.selectNodes("//default:Placemark//default:LineString/default:coordinates");
             List<Node> placeMark;
-            if (null != LineStringNodeList && LineStringNodeList.size() > 0) {
-                @SuppressWarnings("rawtypes")
-                List<Node> tempMark = doc.selectNodes("//default:Folder/default:Placemark");
-                placeMark = tempMark;
+            if (null != selectNodes && selectNodes.size() > 0) {
+                placeMark = doc.selectNodes("//default:Folder/default:Placemark");
+                for (Node node : selectNodes) {
+                    String lineString = node.getText();
+                    String[] array = lineString.split("\n");
+                    TracePoint tracePoint;
+                    for (String string : array) {
+                        if (string.trim().length() == 0) {
+                            continue;
+                        }
+                        tracePoint = new TracePoint();
+                        String[] location = string.split(",");
+                        tracePoint.setLongitude(Double.parseDouble(location[0].trim()));
+                        tracePoint.setLatitude(Double.parseDouble(location[1].trim()));
+                        if (location.length >= 3) {
+                            tracePoint.setAltitude(Float.parseFloat(location[2].trim()));
+                        } else {
+                            tracePoint.setAltitude(0);
+                        }
+                        route.getTracePoint().add(tracePoint);
+                    }
+                }
             } else {
-                @SuppressWarnings("rawtypes")
-                List<Node> tempNodeList = doc.selectNodes("//default:Folder/default:Placemark/gx:Track/gx:coord");
-                LineStringNodeList = tempNodeList;
-                @SuppressWarnings("rawtypes")
-                List<Node> tempMark = doc.selectNodes("//default:Folder/default:Folder/default:Placemark");
-                placeMark = tempMark;
-            }
+                List<Node> nodeList = doc.selectNodes("//default:Folder/default:Placemark/gx:Track/gx:coord");
 
-            for (Node node : LineStringNodeList) {
-                String lineString = node.getText();
-                String[] array = lineString.split(" ");
-                TracePoint tracePoint;
-                for (String string : array) {
-                    if (string.trim().length() == 0) {
+                placeMark= doc.selectNodes("//default:Folder/default:Placemark");
+                for (Node node : nodeList) {
+                    String lineString = node.getText();
+                    String[] array = lineString.split(" ");
+                    TracePoint tracePoint;
+                    if (array.length == 0) {
                         continue;
                     }
                     tracePoint = new TracePoint();
-                    String[] location = string.split(",");
-                    tracePoint.setLongitude(Double.parseDouble(location[0].trim()));
-                    tracePoint.setLatitude(Double.parseDouble(location[1].trim()));
-                    if (location.length >= 3) {
-                        tracePoint.setAltitude(Float.parseFloat(location[2].trim()));
+                    tracePoint.setLongitude(Double.parseDouble(array[0].trim()));
+                    tracePoint.setLatitude(Double.parseDouble(array[1].trim()));
+                    if (array.length >= 3) {
+                        tracePoint.setAltitude(Float.parseFloat(array[2].trim()));
                     } else {
                         tracePoint.setAltitude(0);
                     }
@@ -67,6 +77,8 @@ public class KmlParserUtil {
                 }
             }
 
+
+
             @SuppressWarnings("rawtypes")
             Iterator it = placeMark.iterator();
             PlaceMark place;

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/AutoScoreController.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 
 @Controller
 @Log4j2
-@RequestMapping("gk/autoscore")
+@RequestMapping("gk/auto")
 @ApiIgnore
 public class AutoScoreController {
 

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -149,7 +149,7 @@
                 </a>
             </li>
             <li class="auto menu-item">
-                <a href="/gk/autoscore/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
+                <a href="/gk/auto/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                     <span class="menuico left-arrow"></span>
                     <span class="menu-txt">自助打卡</span>
                 </a>

src/main/webapp/static/js/road-new.js

@@ -90,7 +90,7 @@ $(document).ready(function () {
             type: 'post',
             success: function (data) {
                 if (data.status) {
-                    parent.attr('data-id', data.content.roadId);
+                    // parent.attr('data-id', data.content.roadId);
                     $('.map-container').css('transform', 'none');
                     $('.map-container').attr('data-id', data.content.roadId);
                     $('.force').hide();
@@ -163,7 +163,7 @@ function saveRoad(id, fileName, fileUrl, fileSize) {
         type: 'post',
         success: function (data) {
             if (data.status) {
-                parent.attr('data-id', data.content.roadId);
+                // parent.attr('data-id', data.content.roadId);
                 $('.map-container').css('transform', 'none');
                 $('.map-container').attr('data-id', data.content.roadId);
                 $('.force').hide();
@@ -220,7 +220,7 @@ var map = {
 
 function createPath(pathObj) {
     var lineArr = new Array();//经纬度坐标数组
-    var center = [];
+    var center = [39.911836,116.399095];
     var points = JSON.parse(pathObj.points);
     var mid = Math.ceil(points.tracePoint.length / 2);