merge code

designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

@@ -6,7 +6,7 @@ import com.fr.data.TableDataSource;
 import com.fr.data.TableDataSourceTailor;
 import com.fr.data.impl.EmbeddedTableData;
 import com.fr.data.impl.NameTableData;
-import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
+import com.fr.decision.webservice.v10.map.geojson.helper.GEOMatchHelper;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataComboBox;
@@ -246,7 +246,7 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
     private void populateMatchData(Object[] columnData) {
         Set<String> geoAreas = matchAreaTable.getItems();
 
-        Map<String, String> resultMap = GEOJSONHelper.getInstance().matchAreaList(columnData, geoAreas, matchResultTable.getCustomResult());
+        Map<String, String> resultMap = GEOMatchHelper.getInstance().matchAreaList(columnData, geoAreas, matchResultTable.getCustomResult());
 
         Object[][] data = new Object[resultMap.size()][2];
 

designer-chart/src/main/java/com/fr/design/chartx/component/MatchAreaTable.java

@@ -1,6 +1,6 @@
 package com.fr.design.chartx.component;
 
-import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
+import com.fr.decision.webservice.v10.map.geojson.helper.GEOMatchHelper;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.GeneralUtils;
 
@@ -88,7 +88,7 @@ public class MatchAreaTable extends JTable {
             return;
         }
         int index = areaNameIndex.get(areaName);
-        String result = GEOJSONHelper.getInstance().matchArea(GeneralUtils.objectToString(areaName), items, new HashMap<>());
+        String result = GEOMatchHelper.getInstance().matchArea(GeneralUtils.objectToString(areaName), items, new HashMap<>());
         getColumnModel().getColumn(1).getCellEditor().stopCellEditing();
         this.setValueAt(result, index, 1);
     }