|
|
|
@ -6,6 +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.design.beans.BasicBeanPane; |
|
|
|
|
import com.fr.design.data.DesignTableDataManager; |
|
|
|
|
import com.fr.design.data.datapane.TableDataComboBox; |
|
|
|
@ -21,7 +22,6 @@ import com.fr.general.GeneralUtils;
|
|
|
|
|
import com.fr.general.data.DataModel; |
|
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
import com.fr.plugin.chart.map.data.MapMatchResult; |
|
|
|
|
import com.fr.plugin.chart.map.server.ChartGEOJSONHelper; |
|
|
|
|
import com.fr.script.Calculator; |
|
|
|
|
import com.fr.stable.StringUtils; |
|
|
|
|
|
|
|
|
@ -246,7 +246,7 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
|
|
|
|
|
private void populateMatchData(Object[] columnData) { |
|
|
|
|
Set<String> geoAreas = matchAreaTable.getItems(); |
|
|
|
|
|
|
|
|
|
Map<String, String> resultMap = ChartGEOJSONHelper.matchAreaList(columnData, geoAreas, matchResultTable.getCustomResult()); |
|
|
|
|
Map<String, String> resultMap = GEOJSONHelper.getInstance().matchAreaList(columnData, geoAreas, matchResultTable.getCustomResult()); |
|
|
|
|
|
|
|
|
|
Object[][] data = new Object[resultMap.size()][2]; |
|
|
|
|
|
|
|
|
|