egovamap 0.18.8 → 0.18.11
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.
- package/egovamap/egovamap.js +10 -3
- package/package.json +1 -1
package/egovamap/egovamap.js
CHANGED
|
@@ -1327,7 +1327,11 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
|
|
|
1327
1327
|
if (globeMap != null && gisMap != null) {
|
|
1328
1328
|
//三维先调用queryFeature查询要素再用locateFeatureByCoords显示
|
|
1329
1329
|
var keyvalueWhere = '';
|
|
1330
|
-
if (!keyValue || keyValue.trim() == '' || !keyField || keyField.trim() == '')
|
|
1330
|
+
if (!keyValue || keyValue.trim() == '' || !keyField || keyField.trim() == ''){
|
|
1331
|
+
|
|
1332
|
+
keyvalueWhere = '';
|
|
1333
|
+
}
|
|
1334
|
+
else {
|
|
1331
1335
|
var whereList = [];
|
|
1332
1336
|
|
|
1333
1337
|
if (keyValue != null && keyField != null && keyValue != "" && keyField != "") {
|
|
@@ -1344,10 +1348,13 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
|
|
|
1344
1348
|
var geometry = '';
|
|
1345
1349
|
var where = options.where || '1=1';
|
|
1346
1350
|
var filterNullGeometry = options.filterNullGeometry;//by cp,2020-08-12,空geometry的过滤
|
|
1347
|
-
|
|
1351
|
+
var queryWhere = where;
|
|
1352
|
+
if(keyvalueWhere != ''){
|
|
1353
|
+
queryWhere = where + " AND " + keyvalueWhere;
|
|
1354
|
+
}
|
|
1348
1355
|
var queryParam = {
|
|
1349
1356
|
layerID: layerID,
|
|
1350
|
-
where:
|
|
1357
|
+
where: queryWhere,
|
|
1351
1358
|
geometry: geometry,
|
|
1352
1359
|
outFields: "*",
|
|
1353
1360
|
outGeometry: true,
|