egovamap 0.14.2 → 0.14.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,9 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <module type="JAVA_MODULE" version="4">
3
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+ <exclude-output />
5
+ <content url="file://$MODULE_DIR$" />
6
+ <orderEntry type="inheritedJdk" />
7
+ <orderEntry type="sourceFolder" forTests="false" />
8
+ </component>
9
+ </module>
package/.idea/misc.xml ADDED
@@ -0,0 +1,6 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <project version="4">
3
+ <component name="JavaScriptSettings">
4
+ <option name="languageLevel" value="ES6" />
5
+ </component>
6
+ </project>
@@ -0,0 +1,8 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <project version="4">
3
+ <component name="ProjectModuleManager">
4
+ <modules>
5
+ <module fileurl="file://$PROJECT_DIR$/.idea/egovamap-npm.iml" filepath="$PROJECT_DIR$/.idea/egovamap-npm.iml" />
6
+ </modules>
7
+ </component>
8
+ </project>
package/.idea/vcs.xml ADDED
@@ -0,0 +1,6 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <project version="4">
3
+ <component name="VcsDirectoryMappings">
4
+ <mapping directory="" vcs="Git" />
5
+ </component>
6
+ </project>
@@ -0,0 +1,237 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <project version="4">
3
+ <component name="ChangeListManager">
4
+ <list default="true" id="b9682ea7-e404-4d9e-8895-5e80bc8cafd2" name="Default" comment="" />
5
+ <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6
+ <option name="TRACKING_ENABLED" value="true" />
7
+ <option name="SHOW_DIALOG" value="false" />
8
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
9
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
10
+ <option name="LAST_RESOLUTION" value="IGNORE" />
11
+ </component>
12
+ <component name="FileEditorManager">
13
+ <leaf>
14
+ <file leaf-file-name="egovamap.js" pinned="false" current-in-tab="true">
15
+ <entry file="file://$PROJECT_DIR$/egovamap/egovamap.js">
16
+ <provider selected="true" editor-type-id="text-editor">
17
+ <state relative-caret-position="749">
18
+ <caret line="1694" lean-forward="true" selection-start-line="1694" selection-end-line="1694" />
19
+ <folding>
20
+ <element signature="e#0#41#0" expanded="true" />
21
+ </folding>
22
+ </state>
23
+ </provider>
24
+ </entry>
25
+ </file>
26
+ </leaf>
27
+ </component>
28
+ <component name="Git.Settings">
29
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
30
+ </component>
31
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
32
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
33
+ <component name="JsGulpfileManager">
34
+ <detection-done>true</detection-done>
35
+ <sorting>DEFINITION_ORDER</sorting>
36
+ </component>
37
+ <component name="MavenProjectNavigator">
38
+ <treeState>
39
+ <expand />
40
+ <select />
41
+ </treeState>
42
+ </component>
43
+ <component name="NodePackageJsonFileManager">
44
+ <packageJsonPaths>
45
+ <path value="$PROJECT_DIR$/package.json" />
46
+ </packageJsonPaths>
47
+ </component>
48
+ <component name="ProjectFrameBounds" extendedState="6">
49
+ <option name="x" value="-10" />
50
+ <option name="y" value="-10" />
51
+ <option name="width" value="1750" />
52
+ <option name="height" value="975" />
53
+ </component>
54
+ <component name="ProjectView">
55
+ <navigator proportions="" version="1">
56
+ <foldersAlwaysOnTop value="true" />
57
+ </navigator>
58
+ <panes>
59
+ <pane id="ProjectPane">
60
+ <subPane>
61
+ <expand>
62
+ <path>
63
+ <item name="egovamap-npm" type="b2602c69:ProjectViewProjectNode" />
64
+ <item name="egovamap-npm" type="462c0819:PsiDirectoryNode" />
65
+ </path>
66
+ <path>
67
+ <item name="egovamap-npm" type="b2602c69:ProjectViewProjectNode" />
68
+ <item name="egovamap-npm" type="462c0819:PsiDirectoryNode" />
69
+ <item name="egovamap" type="462c0819:PsiDirectoryNode" />
70
+ </path>
71
+ </expand>
72
+ <select />
73
+ </subPane>
74
+ </pane>
75
+ <pane id="PackagesPane" />
76
+ <pane id="AndroidView" />
77
+ <pane id="Scope" />
78
+ </panes>
79
+ </component>
80
+ <component name="PropertiesComponent">
81
+ <property name="WebServerToolWindowFactoryState" value="false" />
82
+ <property name="aspect.path.notification.shown" value="true" />
83
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
84
+ <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
85
+ <property name="nodejs_npm_path_reset_for_default_project" value="true" />
86
+ <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
87
+ </component>
88
+ <component name="RunDashboard">
89
+ <option name="ruleStates">
90
+ <list>
91
+ <RuleState>
92
+ <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
93
+ </RuleState>
94
+ <RuleState>
95
+ <option name="name" value="StatusDashboardGroupingRule" />
96
+ </RuleState>
97
+ </list>
98
+ </option>
99
+ </component>
100
+ <component name="RunManager">
101
+ <configuration default="true" type="Application" factoryName="Application">
102
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
103
+ </configuration>
104
+ <configuration default="true" type="JUnit" factoryName="JUnit">
105
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
106
+ <option name="ALTERNATIVE_JRE_PATH" />
107
+ <option name="PACKAGE_NAME" />
108
+ <option name="MAIN_CLASS_NAME" />
109
+ <option name="METHOD_NAME" />
110
+ <option name="TEST_OBJECT" value="class" />
111
+ <option name="VM_PARAMETERS" value="-ea" />
112
+ <option name="PARAMETERS" />
113
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
114
+ <option name="PASS_PARENT_ENVS" value="true" />
115
+ <option name="TEST_SEARCH_SCOPE">
116
+ <value defaultName="singleModule" />
117
+ </option>
118
+ <patterns />
119
+ </configuration>
120
+ <configuration default="true" type="TestNG" factoryName="TestNG">
121
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
122
+ <option name="ALTERNATIVE_JRE_PATH" />
123
+ <option name="SUITE_NAME" />
124
+ <option name="PACKAGE_NAME" />
125
+ <option name="MAIN_CLASS_NAME" />
126
+ <option name="METHOD_NAME" />
127
+ <option name="GROUP_NAME" />
128
+ <option name="TEST_OBJECT" value="CLASS" />
129
+ <option name="VM_PARAMETERS" value="-ea" />
130
+ <option name="PARAMETERS" />
131
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
132
+ <option name="OUTPUT_DIRECTORY" />
133
+ <option name="PASS_PARENT_ENVS" value="true" />
134
+ <option name="TEST_SEARCH_SCOPE">
135
+ <value defaultName="singleModule" />
136
+ </option>
137
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
138
+ <option name="PROPERTIES_FILE" />
139
+ <properties />
140
+ <listeners />
141
+ </configuration>
142
+ </component>
143
+ <component name="SvnConfiguration">
144
+ <configuration />
145
+ </component>
146
+ <component name="TaskManager">
147
+ <task active="true" id="Default" summary="Default task">
148
+ <changelist id="b9682ea7-e404-4d9e-8895-5e80bc8cafd2" name="Default" comment="" />
149
+ <created>1644908680682</created>
150
+ <option name="number" value="Default" />
151
+ <option name="presentableId" value="Default" />
152
+ <updated>1644908680682</updated>
153
+ <workItem from="1644908683117" duration="211000" />
154
+ </task>
155
+ <servers />
156
+ </component>
157
+ <component name="TimeTrackingManager">
158
+ <option name="totallyTimeSpent" value="211000" />
159
+ </component>
160
+ <component name="ToolWindowManager">
161
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
162
+ <layout>
163
+ <window_info anchor="right" id="Palette" order="3" />
164
+ <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5113941" side_tool="true" weight="0.36880466" />
165
+ <window_info anchor="bottom" id="JRebel Console" order="12" sideWeight="0.42895442" side_tool="true" weight="0.39941692" />
166
+ <window_info anchor="right" id="Maven Projects" order="5" visible="true" weight="0.1673774" />
167
+ <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
168
+ <window_info anchor="bottom" id="JRebel Executor" order="11" weight="0.32944608" />
169
+ <window_info id="Capture Tool" order="6" />
170
+ <window_info id="Designer" order="2" />
171
+ <window_info anchor="bottom" id="Profiler" />
172
+ <window_info anchor="right" id="Database" order="6" />
173
+ <window_info id="Structure" order="1" sideWeight="0.11600928" side_tool="true" weight="0.34986594" />
174
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
175
+ <window_info id="UI Designer" order="4" />
176
+ <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.4886059" weight="0.37026238" />
177
+ <window_info anchor="bottom" id="TODO" order="7" sideWeight="0.49932975" weight="0.32944608" />
178
+ <window_info anchor="right" id="Palette&#9;" order="8" />
179
+ <window_info id="Image Layers" order="7" />
180
+ <window_info anchor="right" id="Capture Analysis" order="4" />
181
+ <window_info anchor="bottom" id="Version Control" order="16" />
182
+ <window_info anchor="bottom" id="Run" order="3" sideWeight="0.56769437" weight="0.32944608" />
183
+ <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932975" weight="0.35276967" />
184
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.5571587" visible="true" weight="0.23614073" />
185
+ <window_info id="JRebel" order="3" sideWeight="0.4428413" side_tool="true" visible="true" weight="0.23614073" />
186
+ <window_info anchor="right" id="Theme Preview" order="7" />
187
+ <window_info id="Favorites" order="5" side_tool="true" />
188
+ <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
189
+ <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
190
+ <window_info anchor="bottom" id="Java Enterprise" order="18" sideWeight="0.49932975" weight="0.32944608" />
191
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
192
+ <window_info anchor="bottom" id="Problems" order="15" sideWeight="0.49932975" weight="0.32944608" />
193
+ <window_info anchor="bottom" id="TypeScript" order="0" />
194
+ <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.4953083" weight="0.32944608" />
195
+ <window_info anchor="bottom" id="Application Servers" order="13" weight="0.32944608" />
196
+ <window_info anchor="bottom" id="Spring" order="17" sideWeight="0.49932975" weight="0.32944608" />
197
+ <window_info anchor="bottom" id="Find" order="2" weight="0.329927" />
198
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
199
+ <window_info id="Web" order="8" side_tool="true" />
200
+ <window_info anchor="bottom" id="Message" order="1" />
201
+ </layout>
202
+ </component>
203
+ <component name="TypeScriptGeneratedFilesManager">
204
+ <option name="version" value="1" />
205
+ </component>
206
+ <component name="VcsContentAnnotationSettings">
207
+ <option name="myLimit" value="2678400000" />
208
+ </component>
209
+ <component name="editorHistoryManager">
210
+ <entry file="file://$PROJECT_DIR$/egovamap/egovamap.js">
211
+ <provider selected="true" editor-type-id="text-editor">
212
+ <state relative-caret-position="749">
213
+ <caret line="1694" lean-forward="true" selection-start-line="1694" selection-end-line="1694" />
214
+ <folding>
215
+ <element signature="e#0#41#0" expanded="true" />
216
+ </folding>
217
+ </state>
218
+ </provider>
219
+ </entry>
220
+ </component>
221
+ <component name="masterDetails">
222
+ <states>
223
+ <state key="ProjectJDKs.UI">
224
+ <settings>
225
+ <last-edited>1.6</last-edited>
226
+ <splitter-proportions>
227
+ <option name="proportions">
228
+ <list>
229
+ <option value="0.2" />
230
+ </list>
231
+ </option>
232
+ </splitter-proportions>
233
+ </settings>
234
+ </state>
235
+ </states>
236
+ </component>
237
+ </project>
@@ -278,88 +278,186 @@ var egovaBI = function(globeMap, gisMap, mapType){
278
278
  args.highLightType,
279
279
  args.infoStyle,
280
280
  args.renderCanvas,
281
- options.clickCallback,
282
281
  args.tagName,
282
+ options.clickCallback,
283
+ options.mouseOverCallback,
283
284
  args.clusterOption,
284
285
  args.hasHover,
285
- options.mouseOverCallback,
286
- options.mouseOutCallback,
287
286
  layerName,
287
+ options.mouseOutCallback,
288
288
  options.option
289
289
  );
290
290
  });
291
291
  }
292
- }
293
- this.getLabel = function(attributes){
294
- if(!attributes) return;
295
- var label = [], field = {};
296
- for(var key in attributes){
297
- field = {};
298
- field[key] = attributes[key];
299
- label.push(field);
300
- }
301
- return label;
302
- }
303
- this.drawParts = function (options, data) {
304
- var self = this;
292
+ }
293
+ this.getLabel = function (attributes) {
294
+ if (!attributes) return;
295
+ var label = [], field = {};
296
+ for (var key in attributes) {
297
+ field = {};
298
+ field[key] = attributes[key];
299
+ label.push(field);
300
+ }
301
+ return label;
302
+ };
303
+ this.drawParts = function (options, data) {
304
+ var self = this;
305
305
  function showParts(data) {
306
- var drawParam = options.drawParam || [];
307
- drawParam.unshift(data);
306
+ var drawParam = options.drawParam || {};
307
+ var ctrOption = drawParam.clusterOption;
308
+ var clusterOption = {
309
+ level: ctrOption.level || 0,
310
+ style: {
311
+ "type": "simple-marker",
312
+ "style": "circle",
313
+ "color": ctrOption.color || [255, 0, 0, 0.6],
314
+ "size": ctrOption.size || 20,
315
+ "outline": { //if outline has been specified
316
+ "color": ctrOption.outlineColor || [255, 168, 0, 1],
317
+ "width": ctrOption.outlineWidth || 2
318
+ }
319
+ },
320
+ labelStyle: {
321
+ "type": "text",
322
+ "color": ctrOption.labelColor || [255, 255, 255, 1],
323
+ "text": "",
324
+ "zlevel": ctrOption.labelZlevel || 1,
325
+ "yoffset": -4,
326
+ "font": ctrOption.labelFont || {
327
+ "family": "Arial",
328
+ "size": 10
329
+ }
330
+ },
331
+ distance: ctrOption.distance || 50
332
+ };
333
+
334
+ var param = [data, true, false, null, null, false, drawParam.tagName, drawParam.clickCallback, drawParam.mouseOverCallback, clusterOption, false, drawParam.layerName, drawParam.callback, drawParam.drawOptions];
308
335
  if (globeMap) {
309
- globeMap.showMultiObjectCurrentPosition(...drawParam);
336
+ globeMap.showMultiObjectCurrentPosition(...param);
310
337
  } else if (gisMap) {
311
- gisMap.showMultiObjectCurrentPosition(...drawParam);
338
+ gisMap.showMultiObjectCurrentPosition(...param);
312
339
  }
313
340
  }
314
341
 
315
- if(data) {
342
+ if (data) {
316
343
  showParts(data);
317
344
  } else {
318
345
  let queryFromGIS = () => {
319
- let queryParam = options.queryParam;
320
- var subTypeName = options.subTypeName;
346
+ let queryParam = options.queryParam;
347
+ var subTypeName = options.subTypeName;
321
348
  var subUniqueCode = options.subUniqueCode;
322
349
  let queryCallback = function (featureInfos) {
323
- var features = featureInfos[queryParam.phyLayerIDs];
324
- var symbolUrl = "";
325
- if(subUniqueCode.indexOf("http") > -1){
326
- symbolUrl = subUniqueCode;
327
- }else if(subUniqueCode.indexOf(".") > -1){
328
- symbolUrl = subUniqueCode;
329
- }else{
330
- symbolUrl = "".concat(subUniqueCode, ".png");
331
- }
332
- var dataList = features.map((function (feature) {
333
- return Object.assign({}, {x:feature.geometry.x,y:feature.geometry.y}, {
334
- attributes: feature.attributes,
335
- //label:self.getLabel(feature.attributes),
336
- symbolType: -1,
337
- symbolUrl: symbolUrl,
338
- });
339
- }));
350
+ var features = featureInfos[queryParam.phyLayerIDs];
351
+ var symbolUrl = "";
352
+ if (subUniqueCode.indexOf("http") > -1) {
353
+ symbolUrl = subUniqueCode;
354
+ } else if (subUniqueCode.indexOf(".") > -1) {
355
+ symbolUrl = subUniqueCode;
356
+ } else {
357
+ symbolUrl = "".concat(subUniqueCode, ".png");
358
+ }
359
+ var dataList = features.map((function (feature) {
360
+ return Object.assign({}, { x: feature.geometry.x, y: feature.geometry.y }, {
361
+ attributes: feature.attributes,
362
+ //label:self.getLabel(feature.attributes),
363
+ symbolType: -1,
364
+ symbolUrl: symbolUrl,
365
+ });
366
+ }));
340
367
  showParts(dataList);
341
368
  };
342
- if(gisMap) {
343
- gisMap.queryPhylayerFeatures(queryParam, queryCallback);
369
+ if (gisMap) {
370
+ gisMap.queryPhylayerFeatures(queryParam, queryCallback);
344
371
  }
345
372
  }
346
- queryFromGIS();
373
+ queryFromGIS();
347
374
  }
348
- }
349
-
350
-
351
-
352
- /*
353
- * @description:新的轨迹线接口
354
- * @method traceOperation
355
- * @param {Array} posArr 位置数组
356
- * @param {Object} options 配置项
357
- *
358
- * @return {Void} 无返回
359
- *
360
- * @author: Hetianhong
361
- * @date: 2021-09-09 14:49:49
362
- */
375
+ };
376
+
377
+ this.drawOtherParts = function (options, data) {
378
+ var self = this;
379
+ const geomType = options.geomType;
380
+ let queryParam = options.queryParam;
381
+ function showParts(data) {
382
+
383
+ }
384
+
385
+ if (data) {
386
+ showParts(data);
387
+ } else {
388
+ const layerID = queryParam.phyLayerIDs;
389
+ const keyField = null;
390
+ const keyValue = null;
391
+ const clearMap = queryParam.clearMap || true;
392
+ let inStyle = queryParam.style || {
393
+ color: "lightblue"
394
+ };
395
+ let inHStyle = queryParam.hStyle || {
396
+ color: "lightblue"
397
+ };
398
+ let style = null, hStyle = null;
399
+ if (geomType == 1) {
400
+ } else if (geomType == 2) {
401
+ style = {
402
+ type: "simple-line", // autocasts as new SimpleLineSymbol()
403
+ color: inStyle.color || "lightblue",
404
+ width: inStyle.width || "2px",
405
+ style: inStyle.style || "solid"
406
+ };
407
+ hStyle = {
408
+ type: "simple-line", // autocasts as new SimpleLineSymbol()
409
+ color: inHStyle.color || "lightblue",
410
+ width: inHStyle.width || "2px",
411
+ style: inHStyle.style || "solid"
412
+ };
413
+ } else if (geomType == 3) {
414
+ style = {
415
+ type: "simple-fill", // autocasts as new SimpleFillSymbol()
416
+ color: inStyle.color || [51, 51, 204, 0.9],
417
+ style: inStyle.style || "solid",
418
+ outline: { // autocasts as new SimpleLineSymbol()
419
+ color: inStyle.outlineColor || "white",
420
+ width: inStyle.outlineWidth || "1px"
421
+ }
422
+ };
423
+ hStyle = {
424
+ type: "simple-fill", // autocasts as new SimpleFillSymbol()
425
+ color: inHStyle.color || [51, 51, 204, 0.9],
426
+ style: inHStyle.style || "solid",
427
+ outline: { // autocasts as new SimpleLineSymbol()
428
+ color: inHStyle.outlineColor || "white",
429
+ width: inHStyle.outlineWidth || "1px"
430
+ }
431
+ };
432
+ }
433
+ const bZoom = queryParam.bZoom || true;
434
+ const randomColor = null;
435
+ const labelField = null;
436
+ const labelstyle = null;
437
+ const geometry = null;
438
+ const where = queryParam.where || "1=1";
439
+
440
+ let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where];
441
+ if (globeMap) {
442
+ gisMap.locateFeatureByIDs(...param);
443
+ } else if (gisMap) {
444
+ gisMap.locateFeatureByIDs(...param);
445
+ }
446
+
447
+ }
448
+ };
449
+
450
+ /*
451
+ * @description:新的轨迹线接口
452
+ * @method traceOperation
453
+ * @param {Array} posArr 位置数组
454
+ * @param {Object} options 配置项
455
+ *
456
+ * @return {Void} 无返回
457
+ *
458
+ * @author: Hetianhong
459
+ * @date: 2021-09-09 14:49:49
460
+ */
363
461
  this.traceOperation = function (posArr, options) {
364
462
  globeMap.traceOperation(posArr, options);
365
463
  }
@@ -514,8 +514,8 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
514
514
  if (scene == null)
515
515
  return;
516
516
  // 移除监听
517
- that.removeEventBind("showMultiObjectCurrentPositionClick");
518
- that.removeEventBind("showMultiObjectCurrentPositionMouseover");
517
+ that.removeEventBind("showMultiObjectCurrentPositionClick"+tagName);
518
+ that.removeEventBind("showMultiObjectCurrentPositionMouseover"+tagName);
519
519
  var args =[];
520
520
  var FuncList = [];
521
521
  for(var i = 0;i<arguments.length;i++){
@@ -526,12 +526,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
526
526
  }
527
527
  }
528
528
  if (FuncList[0] instanceof Function) {
529
- that.bindEvent("showMultiObjectCurrentPositionClick", function(evt) {
529
+ that.bindEvent("showMultiObjectCurrentPositionClick"+tagName, function(evt) {
530
530
  FuncList[0](evt.args);
531
531
  });
532
532
  }
533
533
  if (FuncList[1] instanceof Function) {
534
- that.bindEvent("showMultiObjectCurrentPositionMouseover", function(evt) {
534
+ that.bindEvent("showMultiObjectCurrentPositionMouseover"+tagName, function(evt) {
535
535
  FuncList[1](evt.args);
536
536
  });
537
537
  }
@@ -928,7 +928,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
928
928
  scene.fire(msgPrefix + ":addChart", {args: [option, zoom,id,minZoom,maxZoom]}, parentScene);
929
929
  }
930
930
 
931
- that.drawGeometry = function(type, style, clear, callback) {
931
+ that.drawGeometry = function(type, style, clear, callback, option) {
932
932
  type = type || "point";
933
933
  style = style || {"type":"esriSLS","style":"esriSLSSolid","color":[255,0,0,255],"width":2};
934
934
  //移除监听
@@ -939,7 +939,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
939
939
  });
940
940
  }
941
941
 
942
- scene.fire(msgPrefix + ":drawGeometry", {args: [type, style, clear]}, parentScene);
942
+ scene.fire(msgPrefix + ":drawGeometry", {args: [type, style, clear, callback, option]}, parentScene);
943
943
  }
944
944
 
945
945
  /* 热力图*/
@@ -741,7 +741,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
741
741
  that.callMap('getCellNameByPosXY', x, y, gridType, keyField, queryID, cb);
742
742
  }
743
743
  /* 根据图层字段定位显示 */
744
- that.locateFeatureByIDs = function (layerID, keyFiled, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, callback, popupTemplate) {
744
+ that.locateFeatureByIDs = function (layerID, keyFiled, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, index, clipGeom, callback, popupTemplate) {
745
745
  if (scene == null)
746
746
  return;
747
747
  if (bZoom == undefined)
@@ -755,7 +755,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
755
755
  that.fireCallback(type, data);
756
756
  }
757
757
  };
758
- that.callMap('locateFeatureByIDs', layerID, keyValue, keyFiled, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, cb, popupTemplate);
758
+ that.callMap('locateFeatureByIDs', layerID, keyValue, keyFiled, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, index, clipGeom, cb, popupTemplate);
759
759
  }
760
760
  /* 显示案件分布 */
761
761
  that.showRecListDistribution = function (infoJson, zoom, clickCallback, labelInfo, isShowLegend, symbolUrl) {
@@ -930,7 +930,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
930
930
  };
931
931
 
932
932
  /* 根据图层字段定位显示 */
933
- that.locateFeatureByIDs = function (layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, successFunc,outFieldStr,animiteStep,index,clipGeom) {
933
+ that.locateFeatureByIDs = function (layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, successFunc, outFieldStr, animiteStep, index, clipGeom, callback, popupTemplate) {
934
934
  if (scene == null)
935
935
  return;
936
936
 
@@ -939,7 +939,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
939
939
  }
940
940
 
941
941
  if (gisMap != null) {
942
- gisMap.locateFeatureByIDs.apply(this, [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag,outFieldStr,animiteStep,index,clipGeom]);
942
+ gisMap.locateFeatureByIDs.apply(this, [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, index, clipGeom, callback, popupTemplate]);
943
943
  }
944
944
  if (globeMap != null && gisMap != null) {
945
945
  //三维先调用queryFeature查询要素再用locateFeatureByCoords显示
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "egovamap",
3
- "version": "0.14.2",
3
+ "version": "0.14.6",
4
4
  "description": "eUrbanGIS SDK",
5
5
  "main": "index.js",
6
6
  "scripts": {