修改动态标绘模块产品包

hhyu1 · hhyu1 · commit 0da04a308085 · 2018-07-23T14:14:28.000+08:00
diff --git a/dist/iclient9-plot-leaflet.min.js b/dist/iclient9-plot-leaflet.min.js
diff --git a/examples/leaflet/plot_dynamicPlot.html b/examples/leaflet/plot_dynamicPlot.html
@@ -138,10 +138,6 @@
         </ul>
     </li>
 
-    <li>
-        <a class="glyphicon glyphicon-retweet notArrow" data-i18n="[title]resources.text_screenshot" onclick="mapToImg1()"></a>
-    </li>
-
     <li>
         <a class="glyphicon glyphicon-adjust notArrow" data-i18n="[title]resources.text_avoid"></a>
         <ul>
@@ -224,7 +220,7 @@
         cancelDraw();
 
         for(var i = 0; i < map.getPlottingLayers().length; i++){
-            map.getPlottingLayers().removeAllFeatures();
+            map.getPlottingLayers()[i].removeAllFeatures();
         }
     }
 
@@ -346,14 +342,29 @@
         }
     }
 
-    //截屏
-    function mapToImg1() {
-        MapToImg && MapToImg.excute(map);
+    //绘制避让区域
+    function drawAvoidRegion() {
+        if(editControl.getSelectedFeatures().length === 0){
+            return;
+        }
+        editControl.avoidEdit(true);
     }
 
     //绘制避让区域
-    function drawAvoidRegion() {
-        editControl.avoidEdit();
+    function doneAvoidEdit() {
+        editControl.avoidEdit(false);
+    }
+
+    //绘制避让区域
+    function deleteAvoidEdit() {
+        if(editControl.getSelectedFeatures().length === 0){
+            return;
+        } else {
+            if(editControl._avoidEditing === true){
+                editControl.avoidEdit(false);
+            }
+            editControl.getSelectedFeatures()[0].removeAvoidRegions();
+        }
     }
 
     //创建组合对象
@@ -383,7 +394,7 @@
     function unGroupObject() {
         var features = editControl.getSelectedFeatures();
         for (var i = features.length - 1; i >= 0; i--) {
-            if (features[i] instanceof L.GroupObject) {
+            if (features[i] instanceof L.supermap.plotting.GroupObject) {
                 var subLayers = plottingLayer.unGroupObject(features[i]);
                 editControl.selectFeatures(subLayers);
             }
diff --git a/examples/leaflet/plot_graphicLayer.html b/examples/leaflet/plot_graphicLayer.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/html">
 <head>
     <meta charset="UTF-8">
-    <title data-i18n="resources.title_graphicLayer"></title>
+    <title data-i18n="resources.title_plotSymbolPerformance"></title>
     <script type="text/javascript" include="bootstrap-css" src="../js/include-web.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
@@ -47,7 +47,7 @@ <h5 class="panel-title text-center" style=" font-size: 16px;color: #ffffff;">高
         L.supermap.symbolInfoService(serverUrl).getSymbolInfo(params, function(result){
             for (var i = 0; i < count; ++i) {
                 var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
-                var dotSymbol = L.PlottingObject.createSymbol(421, 10100, L.latLng(coordinates[0], coordinates[1]), {serverUrl:serverUrl,symbolData: result.result, textContent: "常住人口"}, null, null);
+                var dotSymbol = L.supermap.plotting.PlottingObject.createSymbol(421, 10100, L.latLng(coordinates[0], coordinates[1]), {serverUrl:serverUrl,symbolData: result.result, textContent: "常住人口"}, null, null);
                 features.push(dotSymbol);
             }
             graphicLayer.addFeatures(features);
@@ -76,7 +76,7 @@ <h5 class="panel-title text-center" style=" font-size: 16px;color: #ffffff;">高
                 for(var i = 0; i < count; ++i){
                     var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
                     var randomIndex = Math.floor(10 * Math.random());
-                    var dotSymbol = L.PlottingObject.createSymbol(421, randomCode[randomIndex], L.latLng(coordinates[0], coordinates[1]), {serverUrl:serverUrl,symbolData: randomSymbolData[randomIndex]}, null, null);
+                    var dotSymbol = L.supermap.plotting.PlottingObject.createSymbol(421, randomCode[randomIndex], L.latLng(coordinates[0], coordinates[1]), {serverUrl:serverUrl,symbolData: randomSymbolData[randomIndex]}, null, null);
                     features.push(dotSymbol);
                 }
                 graphicLayer.addFeatures(features);
