【update】优化行政区划上图字段匹配规则

review by zhaoq

Author: chenguanglin

src/openlayers/core/Util.js

@@ -446,6 +446,34 @@ export class Util {
  }
  return false;
  }
+
+ /**
+ * @function ol.supermap.Util.getHighestMatchAdministration
+ * @param {string} featureName 初始匹配的要素数组
+ * @param {string} fieldName 要匹配的地名
+ * @returns {boolean} 是否匹配
+ */
+ static getHighestMatchAdministration(features, fieldName) {
+ let filterFeatures = features.filter(item => {
+ return Util.isMatchAdministrativeName(item.properties.Name, fieldName);
+ })
+
+ let maxMatchPercent = 0, maxMatchFeature = null;
+ filterFeatures.forEach(feature => {
+ let count = 0;
+ Array.from(new Set(feature.properties.Name.split(''))).forEach((char) => {
+ if (fieldName.includes(char)) {
+ count++;
+ }
+ });
+ if (count > maxMatchPercent) {
+ maxMatchPercent = count;
+ maxMatchFeature = feature;
+ }
+ });
+ return maxMatchFeature;
+ }
+
  /**
  * @function ol.supermap.Util.setMask
  * @description 为图层设置掩膜。

src/openlayers/mapping/WebMap.js

@@ -2184,13 +2184,12 @@ export class WebMap extends Observable {
  rows = datas.slice(1),
  fieldIndex = titles.findIndex(title => title === divisionField);
  rows.forEach(row => {
- let feature = features.find(item => {
- if (divisionType === 'GB-T_2260') {
- return item.properties.GB === row[fieldIndex];
- } else {
- return Util.isMatchAdministrativeName(item.properties.Name, row[fieldIndex]);
- }
- })
+ let feature;
+ if (divisionType === 'GB-T_2260') {
+ feature = features.find(item => item.properties.GB === row[fieldIndex])
+ } else {
+ feature = Util.getHighestMatchAdministration(features, row[fieldIndex]);
+ }
  //todo 需提示忽略无效数据
  if (feature) {
  let newFeature = window.cloneDeep(feature);