Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/views/cmpt/road.jsp

@@ -97,7 +97,7 @@
                 </div>
                 <span class="btn right upload">载入路线</span>
 
-                <input type="file" style="display: none;" onchange="uploadFile(this)">
+                <input type="file" id="route-file" style="display: none;" onchange="uploadFile(this)">
             </div>
 
             <div id="map" class="map"></div>

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

+var layers = [];
 $(document).ready(function () {
     $('body').on('click', '.addTempalte', function () {
         $(this).parent().parent().find('.equip-container').append("<div class=\"equip-item\">\n" +
@@ -127,8 +128,10 @@ function uploadFile(obj) {
                     $('.equip-item[data-id=' + dataId + ']').attr('data-file-size', logoFile.size / 1024);
                     $('#gpsName').text(logoFile.name);
                     saveRoad(dataId, logoFile.name, res.result, logoFile.size / 1024);
+                    clearLayers()
                     loadGps(res.result);
                     // $('.equip-item[data-id='+dataId+']').find('.edit-new').trigger('click');
+                    $('#route-file').val('');
                 } else {
                     console.log(res);
                 }
@@ -238,14 +241,22 @@ function createPath(pathObj) {
         });
         var marker = L.marker([Number(e.latitude), Number(e.longitude)]).setIcon(myIcon1);
         marker.addTo(map.instance);
+        layers.push(marker)
     });
 
-    var polyline = L.polyline(lineArr, {stroke: true, fill: false, color: 'red', lineCap: 'none', weight: 6})
+    var polyline = L.polyline(lineArr, {stroke: true, fill: false, color: 'red', lineCap: 'none', weight: 6});
+    layers.push(polyline);
     polyline.addTo(map.instance);
     map.instance.setView(center);
     map.instance.setZoom(12);
-}
 
+}
+function clearLayers() {
+    layers.forEach(function (e) {
+        map.instance.removeLayer(e)
+    });
+    layers = [];
+}
 function getPath(roadId) {
     $.ajax({
         url: '/gk/road/gps/' + roadId,