修改事件名称；更新标绘包

hhyu1 · hhyu1 · commit 98efba39e0f0 · 2018-07-23T14:30:41.000+08:00
diff --git a/dist/iclient9-plot-leaflet.min.js b/dist/iclient9-plot-leaflet.min.js
diff --git a/examples/js/include-web.js b/examples/js/include-web.js
@@ -148,30 +148,21 @@
             inputScript("https://cdn.bootcss.com/i18next/10.0.7/i18next.min.js");
             inputScript("https://cdn.bootcss.com/jquery-i18next/1.2.1/jquery-i18next.min.js");
         }
-<<<<<<< .mine
-        if (inArray(includes, 'plottingPanel')) {
-
-
-
-
-
-
-=======
-if (inArray(includes, 'ionRangeSlider')) {
+        if (inArray(includes, 'ionRangeSlider')) {
             inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.css");
             inputCSS("https://cdn.bootcss.com/normalize/8.0.0/normalize.css");
             inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.skinHTML5.css");
             inputScript("https://cdn.bootcss.com/ion-rangeslider/2.2.0/js/ion.rangeSlider.min.js");
         }
-if (inArray(includes, 'plottingPanel')) {
->>>>>>> .theirs
+        if (inArray(includes, 'plottingPanel')) {
             inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/jquery.ztree.core.js");
             inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/css/zTreeStyle.css");
             inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/jquery.easyui.min.js");
             inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/css/easyui.css");
             inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/colorpicker/js/colorpicker.js");
             inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/colorpicker/css/colorpicker.css");
-        }    }
+        }
+    }
 
     function datGuiI18N() {
         document.writeln("<script>function registerEventListener(evt,fn){" +
diff --git a/examples/js/plottingPanel/PlotPanel.js b/examples/js/plottingPanel/PlotPanel.js
@@ -65,7 +65,7 @@ L.supermap.plotting.initPlotPanel = function(div, serverUrl, drawControl){
 
         $.fn.zTree.init($("#tree"), setting, symbolTreeData);
     } else {
-        symbolLibManager.on(L.supermap.plotting.event.initializecompleted, function(result){
+        symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, function(result){
             if(result.libIDs.length !== 0){
                 var symbolTreeData = analysisSymbolTree(symbolLibManager);
                 $.fn.zTree.init($("#tree"), setting, symbolTreeData);
diff --git a/examples/js/plottingPanel/StylePanel.js b/examples/js/plottingPanel/StylePanel.js
@@ -31,13 +31,13 @@ var displayNameNew = [
 var plotting;
 var group = ["基本", "军标大小", "线形", "填充", "注记", "子标号", "衬线", "箭头类型", "半径", "文字","解除锁定","对象间连线"];
 L.supermap.plotting.initStylePanel = function(div, serverUrl, editControl){
-    editControl.on(L.supermap.plotting.event.featuresselected, function(event){
+    editControl.on(SuperMap.Plot.Event.featuresselected, function(event){
         showFeatureProperty(event);
     });
-    editControl.on(L.supermap.plotting.event.featuresmodified, function(event){
+    editControl.on(SuperMap.Plot.Event.featuresmodified, function(event){
         showFeatureProperty(event);
     });
-    editControl.on(L.supermap.plotting.event.featuresunselected, function(event){
+    editControl.on(SuperMap.Plot.Event.featuresunselected, function(event){
         hideFeatureProperty(event);
     });
 
diff --git a/examples/leaflet/plot_defaultStyle.html b/examples/leaflet/plot_defaultStyle.html
@@ -79,7 +79,7 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
     var plotting = L.supermap.plotting.getControl(map, serverUrl);
     function loadSymbolLib() {
         symbolLibManager = plotting.getSymbolLibManager();
-        symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);
+        symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, initializeCompleted);
         symbolLibManager.initializeAsync();
     }
     function initializeCompleted() {
diff --git a/examples/leaflet/plot_loadSymbolLib.html b/examples/leaflet/plot_loadSymbolLib.html
@@ -50,7 +50,7 @@ <h5 class='panel-title text-center'>标号库加载</h5></div>
     var plotting = L.supermap.plotting.getControl(map, serverUrl);
     function loadSymbolLib(){
         symbolLibManager = plotting.getSymbolLibManager();
-        symbolLibManager.on(L.supermap.plotting.event.initializecompleted,showSymbolLibInfo);
+        symbolLibManager.on(SuperMap.Plot.Event.initializecompleted,showSymbolLibInfo);
         symbolLibManager.initializeAsync();
     }
     function showSymbolLibInfo(result) {
diff --git a/examples/leaflet/plot_modifySymbolStyle.html b/examples/leaflet/plot_modifySymbolStyle.html
@@ -65,7 +65,7 @@
     L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
     function loadSymbolLib(){
         var symbolLibManager = L.supermap.plotting.getControl(map, serverUrl).getSymbolLibManager();
-        symbolLibManager.on(L.supermap.plotting.event.initializecompleted,symbolLibInitializeCompleted);
+        symbolLibManager.on(SuperMap.Plot.Event.initializecompleted,symbolLibInitializeCompleted);
         symbolLibManager.initializeAsync();
     }
     function symbolLibInitializeCompleted(){
diff --git a/examples/leaflet/plot_querySymbolLib.html b/examples/leaflet/plot_querySymbolLib.html
@@ -58,7 +58,7 @@ <h5 class='panel-title text-center'>查询标号</h5></div>
     var symbolLibManager,loadSymbolComplete = false;
     function loadSymbolLib(){
         symbolLibManager = plotting.getSymbolLibManager();
-        symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);
+        symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, initializeCompleted);
         symbolLibManager.initializeAsync();
     }
     function initializeCompleted(){
diff --git a/examples/leaflet/plot_symbolAvoid.html b/examples/leaflet/plot_symbolAvoid.html
@@ -40,7 +40,7 @@ <h5 class='panel-title text-center'>避让区域</h5></div>
     function loadSymbolLib() {
         symbolLibManager = plotting.getSymbolLibManager();
         symbolLibManager.libIDs = [421];
-        symbolLibManager.on( L.supermap.plotting.event.initializecompleted,initializeCompleted);
+        symbolLibManager.on( SuperMap.Plot.Event.initializecompleted,initializeCompleted);
         symbolLibManager.initializeAsync();
     }
     function initializeCompleted() {
diff --git a/examples/leaflet/plot_symbolExtendProperty.html b/examples/leaflet/plot_symbolExtendProperty.html
@@ -74,10 +74,10 @@ <h5 class='panel-title text-center'>自定义属性</h5></div>
         plottingLayer.createSymbol(421, 9, dotPoints,{symbolType:SuperMap.Plot.SymbolType.DOTSYMBOL});
     }
 
-    map.on(L.supermap.plotting.event.featuresselected, function(event){
+    map.on(SuperMap.Plot.Event.featuresselected, function(event){
         showExtendProperty(event);
     });
-    map.on(L.supermap.plotting.event.featuresunselected, function(event){
+    map.on(SuperMap.Plot.Event.featuresunselected, function(event){
         showExtendProperty(event);
     });
 
diff --git a/examples/leaflet/plot_symbolGeometricQuery.html b/examples/leaflet/plot_symbolGeometricQuery.html
@@ -42,7 +42,7 @@ <h5 class='panel-title text-center'>几何查询</h5></div>
     function loadSymbolLib() {
         var symbolLibManager = plotting.getSymbolLibManager();
         symbolLibManager.libIDs = [421];
-        symbolLibManager.on(L.supermap.plotting.event.initializecompleted,symbolLibInitializeCompleted);
+        symbolLibManager.on(SuperMap.Plot.Event.initializecompleted,symbolLibInitializeCompleted);
         symbolLibManager.initializeAsync();
     }
 
@@ -163,7 +163,7 @@ <h5 class='panel-title text-center'>几何查询</h5></div>
         clearStatus();
     }
 
-    drawControl.on(L.supermap.plotting.event.featureadded, function (event) {
+    drawControl.on(SuperMap.Plot.Event.featureadded, function (event) {
         var layer = event.feature;
         var latLngs = layer.getLatLngs();
         var symbolType = layer.symbolType;

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>`
`79`	`79`	`var plotting = L.supermap.plotting.getControl(map, serverUrl);`
`80`	`80`	`function loadSymbolLib() {`
`81`	`81`	`symbolLibManager = plotting.getSymbolLibManager();`
`82`		`- symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);`
	`82`	`+ symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, initializeCompleted);`
`83`	`83`	`symbolLibManager.initializeAsync();`
`84`	`84`	`}`
`85`	`85`	`function initializeCompleted() {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ <h5 class='panel-title text-center'>标号库加载</h5></div>`
`50`	`50`	`var plotting = L.supermap.plotting.getControl(map, serverUrl);`
`51`	`51`	`function loadSymbolLib(){`
`52`	`52`	`symbolLibManager = plotting.getSymbolLibManager();`
`53`		`- symbolLibManager.on(L.supermap.plotting.event.initializecompleted,showSymbolLibInfo);`
	`53`	`+ symbolLibManager.on(SuperMap.Plot.Event.initializecompleted,showSymbolLibInfo);`
`54`	`54`	`symbolLibManager.initializeAsync();`
`55`	`55`	`}`
`56`	`56`	`function showSymbolLibInfo(result) {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);`
`66`	`66`	`function loadSymbolLib(){`
`67`	`67`	`var symbolLibManager = L.supermap.plotting.getControl(map, serverUrl).getSymbolLibManager();`
`68`		`- symbolLibManager.on(L.supermap.plotting.event.initializecompleted,symbolLibInitializeCompleted);`
	`68`	`+ symbolLibManager.on(SuperMap.Plot.Event.initializecompleted,symbolLibInitializeCompleted);`
`69`	`69`	`symbolLibManager.initializeAsync();`
`70`	`70`	`}`
`71`	`71`	`function symbolLibInitializeCompleted(){`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ <h5 class='panel-title text-center'>查询标号</h5></div>`
`58`	`58`	`var symbolLibManager,loadSymbolComplete = false;`
`59`	`59`	`function loadSymbolLib(){`
`60`	`60`	`symbolLibManager = plotting.getSymbolLibManager();`
`61`		`- symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);`
	`61`	`+ symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, initializeCompleted);`
`62`	`62`	`symbolLibManager.initializeAsync();`
`63`	`63`	`}`
`64`	`64`	`function initializeCompleted(){`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ <h5 class='panel-title text-center'>避让区域</h5></div>`
`40`	`40`	`function loadSymbolLib() {`
`41`	`41`	`symbolLibManager = plotting.getSymbolLibManager();`
`42`	`42`	`symbolLibManager.libIDs = [421];`
`43`		`- symbolLibManager.on( L.supermap.plotting.event.initializecompleted,initializeCompleted);`
	`43`	`+ symbolLibManager.on( SuperMap.Plot.Event.initializecompleted,initializeCompleted);`
`44`	`44`	`symbolLibManager.initializeAsync();`
`45`	`45`	`}`
`46`	`46`	`function initializeCompleted() {`