From 670e8f66abc473f42c45d18a6f8cf2c33db3d460 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Mon, 4 Sep 2017 14:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9C=B0=E5=9B=BE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=80=89=E6=8B=A9=E9=9D=A2=E6=9D=BF=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=82=B9=E8=AE=BE=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/chart/map/designer/type/VanChartMapPlotPane.java  | 3 +--
 .../chart/map/designer/type/VanChartMapSourceChoosePane.java | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java
index 977e7ce3a4..8f73e2d5f1 100644
--- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java
@@ -7,7 +7,6 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane;
 import com.fr.plugin.chart.map.MapIndependentVanChart;
@@ -116,7 +115,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         Plot plot = chart.getPlot();
         if(plot instanceof VanChartMapPlot) {
             sourceChoosePane.updateBean((VanChartMapPlot) plot);
-            if(typeChanged && samePlot){
+            if(!samePlot || (typeChanged && samePlot)){
                 resetAttr(plot);
             }
         }
diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
index 6b15607c6e..3314b180ad 100644
--- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
+++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
@@ -567,8 +567,11 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
     }
 
     private void resetViewCenter(VanChartMapPlot mapPlot) {
-        mapPlot.getViewCenter().setAuto(true);
+        mapPlot.setViewCenter(new ViewCenter());
         viewCenterCom.setSelectedIndex(0);
+        longitude.setValue(0);
+        latitude.setValue(0);
+        longAndLatPane.setVisible(false);
     }
 
     private void resetZoomLevel(VanChartMapPlot mapPlot) {