Skip to content

Commit 98efba3

Browse files
committed
修改事件名称;更新标绘包
1 parent 0da04a3 commit 98efba3

11 files changed

+18
-27
lines changed

dist/iclient9-plot-leaflet.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/js/include-web.js

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,30 +148,21 @@
148148
inputScript("https://cdn.bootcss.com/i18next/10.0.7/i18next.min.js");
149149
inputScript("https://cdn.bootcss.com/jquery-i18next/1.2.1/jquery-i18next.min.js");
150150
}
151-
<<<<<<< .mine
152-
if (inArray(includes, 'plottingPanel')) {
153-
154-
155-
156-
157-
158-
159-
=======
160-
if (inArray(includes, 'ionRangeSlider')) {
151+
if (inArray(includes, 'ionRangeSlider')) {
161152
inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.css");
162153
inputCSS("https://cdn.bootcss.com/normalize/8.0.0/normalize.css");
163154
inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.skinHTML5.css");
164155
inputScript("https://cdn.bootcss.com/ion-rangeslider/2.2.0/js/ion.rangeSlider.min.js");
165156
}
166-
if (inArray(includes, 'plottingPanel')) {
167-
>>>>>>> .theirs
157+
if (inArray(includes, 'plottingPanel')) {
168158
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/jquery.ztree.core.js");
169159
inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/css/zTreeStyle.css");
170160
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/jquery.easyui.min.js");
171161
inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/css/easyui.css");
172162
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/colorpicker/js/colorpicker.js");
173163
inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/colorpicker/css/colorpicker.css");
174-
} }
164+
}
165+
}
175166

176167
function datGuiI18N() {
177168
document.writeln("<script>function registerEventListener(evt,fn){" +

examples/js/plottingPanel/PlotPanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ L.supermap.plotting.initPlotPanel = function(div, serverUrl, drawControl){
6565

6666
$.fn.zTree.init($("#tree"), setting, symbolTreeData);
6767
} else {
68-
symbolLibManager.on(L.supermap.plotting.event.initializecompleted, function(result){
68+
symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, function(result){
6969
if(result.libIDs.length !== 0){
7070
var symbolTreeData = analysisSymbolTree(symbolLibManager);
7171
$.fn.zTree.init($("#tree"), setting, symbolTreeData);

examples/js/plottingPanel/StylePanel.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ var displayNameNew = [
3131
var plotting;
3232
var group = ["基本", "军标大小", "线形", "填充", "注记", "子标号", "衬线", "箭头类型", "半径", "文字","解除锁定","对象间连线"];
3333
L.supermap.plotting.initStylePanel = function(div, serverUrl, editControl){
34-
editControl.on(L.supermap.plotting.event.featuresselected, function(event){
34+
editControl.on(SuperMap.Plot.Event.featuresselected, function(event){
3535
showFeatureProperty(event);
3636
});
37-
editControl.on(L.supermap.plotting.event.featuresmodified, function(event){
37+
editControl.on(SuperMap.Plot.Event.featuresmodified, function(event){
3838
showFeatureProperty(event);
3939
});
40-
editControl.on(L.supermap.plotting.event.featuresunselected, function(event){
40+
editControl.on(SuperMap.Plot.Event.featuresunselected, function(event){
4141
hideFeatureProperty(event);
4242
});
4343

examples/leaflet/plot_defaultStyle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
7979
var plotting = L.supermap.plotting.getControl(map, serverUrl);
8080
function loadSymbolLib() {
8181
symbolLibManager = plotting.getSymbolLibManager();
82-
symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);
82+
symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, initializeCompleted);
8383
symbolLibManager.initializeAsync();
8484
}
8585
function initializeCompleted() {

examples/leaflet/plot_loadSymbolLib.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h5 class='panel-title text-center'>标号库加载</h5></div>
5050
var plotting = L.supermap.plotting.getControl(map, serverUrl);
5151
function loadSymbolLib(){
5252
symbolLibManager = plotting.getSymbolLibManager();
53-
symbolLibManager.on(L.supermap.plotting.event.initializecompleted,showSymbolLibInfo);
53+
symbolLibManager.on(SuperMap.Plot.Event.initializecompleted,showSymbolLibInfo);
5454
symbolLibManager.initializeAsync();
5555
}
5656
function showSymbolLibInfo(result) {

examples/leaflet/plot_modifySymbolStyle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
6666
function loadSymbolLib(){
6767
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);
6969
symbolLibManager.initializeAsync();
7070
}
7171
function symbolLibInitializeCompleted(){

examples/leaflet/plot_querySymbolLib.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h5 class='panel-title text-center'>查询标号</h5></div>
5858
var symbolLibManager,loadSymbolComplete = false;
5959
function loadSymbolLib(){
6060
symbolLibManager = plotting.getSymbolLibManager();
61-
symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);
61+
symbolLibManager.on(SuperMap.Plot.Event.initializecompleted, initializeCompleted);
6262
symbolLibManager.initializeAsync();
6363
}
6464
function initializeCompleted(){

examples/leaflet/plot_symbolAvoid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h5 class='panel-title text-center'>避让区域</h5></div>
4040
function loadSymbolLib() {
4141
symbolLibManager = plotting.getSymbolLibManager();
4242
symbolLibManager.libIDs = [421];
43-
symbolLibManager.on( L.supermap.plotting.event.initializecompleted,initializeCompleted);
43+
symbolLibManager.on( SuperMap.Plot.Event.initializecompleted,initializeCompleted);
4444
symbolLibManager.initializeAsync();
4545
}
4646
function initializeCompleted() {

examples/leaflet/plot_symbolExtendProperty.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ <h5 class='panel-title text-center'>自定义属性</h5></div>
7474
plottingLayer.createSymbol(421, 9, dotPoints,{symbolType:SuperMap.Plot.SymbolType.DOTSYMBOL});
7575
}
7676

77-
map.on(L.supermap.plotting.event.featuresselected, function(event){
77+
map.on(SuperMap.Plot.Event.featuresselected, function(event){
7878
showExtendProperty(event);
7979
});
80-
map.on(L.supermap.plotting.event.featuresunselected, function(event){
80+
map.on(SuperMap.Plot.Event.featuresunselected, function(event){
8181
showExtendProperty(event);
8282
});
8383

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy