From b5575698bc8a42daf42fe5f139af8741eec0fb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Mon, 9 Mar 2020 17:30:48 +0800
Subject: [PATCH] =?UTF-8?q?CHART-12933=20=E5=8C=B9=E9=85=8D=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E5=8C=BA=E5=88=86=E7=82=B9=E5=9C=B0=E5=9B=BE=E5=92=8C?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java  | 2 +-
 .../data/contentpane/table/VanMapTableDataContentPane.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
index e445a07ef3..1b6c6f9be0 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
@@ -63,7 +63,7 @@ public abstract class MapDataSetFieldsPane<T extends ColumnFieldCollectionWithSe
             public void actionPerformed(ActionEvent e) {
                 VanChartMapPlot plot = chart.getPlot();
                 if (treeNodeAndItems == null) {
-                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level);
+                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType());
                 }
                 final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
index 5b66ff308a..feb7ffd37a 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
@@ -63,7 +63,7 @@ public abstract class VanMapTableDataContentPane extends AbstractTableDataConten
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (treeNodeAndItems == null) {
-                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level);
+                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType());
                 }
                 final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);