From 42fd2eca1c1b37b5a33b6030b26526ac442779ec Mon Sep 17 00:00:00 2001
From: thinkinggis <lzx199065@gmail.com>
Date: Thu, 28 May 2020 16:50:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(boundry):=20fix=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/boundry/src/config.ts          | 8 ++++----
 packages/boundry/src/layer/baseLayer.ts | 4 +++-
 packages/boundry/src/layer/country.ts   | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/boundry/src/config.ts b/packages/boundry/src/config.ts
index 0d3cca7732..e68a4a8407 100644
--- a/packages/boundry/src/config.ts
+++ b/packages/boundry/src/config.ts
@@ -2,7 +2,7 @@
 import merge from 'lodash/merge';
 
 let DataLevel = 2;
-const dataLevel1: { [key: string]: any } = {
+const dataLevel2: { [key: string]: any } = {
   world: {
     fill: {
       type: 'pbf',
@@ -122,7 +122,7 @@ const dataLevel1: { [key: string]: any } = {
     110000: '',
   },
 };
-const dataLevel2: { [key: string]: any } = {
+const dataLevel1: { [key: string]: any } = {
   world: {
     fill: {
       type: 'pbf',
@@ -181,12 +181,12 @@ const dataLevel2: { [key: string]: any } = {
         line: {
           type: 'pbf',
           url:
-            '//gw.alipayobjects.com/os/bmw-prod/8bfbfe7e-bd0e-4bbe-84d8-629f4dc7abc4.bin',
+            '//gw.alipayobjects.com/os/bmw-prod/561e2cfe-9460-42d1-a2f8-3fd2e1274c52.bin',
         },
         cityLine: {
           type: 'pbf',
           url:
-            '//gw.alipayobjects.com/os/bmw-prod/8bfbfe7e-bd0e-4bbe-84d8-629f4dc7abc4.bin',
+            '//gw.alipayobjects.com/os/bmw-prod/561e2cfe-9460-42d1-a2f8-3fd2e1274c52.bin',
         },
         provinceLine: {
           type: 'pbf',
diff --git a/packages/boundry/src/layer/baseLayer.ts b/packages/boundry/src/layer/baseLayer.ts
index cefef4dcab..6488c08bdd 100644
--- a/packages/boundry/src/layer/baseLayer.ts
+++ b/packages/boundry/src/layer/baseLayer.ts
@@ -312,7 +312,9 @@ export default class BaseLayer extends EventEmitter {
     });
 
     popupLayer.on(popup.closeTriggerEvent as string, (e) => {
-      this.popup.remove();
+      if (this.popup) {
+        this.popup.remove();
+      }
     });
   }
 
diff --git a/packages/boundry/src/layer/country.ts b/packages/boundry/src/layer/country.ts
index a282ddced9..f8a8eb3db5 100644
--- a/packages/boundry/src/layer/country.ts
+++ b/packages/boundry/src/layer/country.ts
@@ -16,10 +16,10 @@ export default class CountryLayer extends BaseLayer {
     this.addProvinceLine(countryConfig.provinceLine);
 
     if (depth === 2 * 1) {
-      this.addCityBorder(countryConfig.cityLine);
+      this.addCityBorder(countryConfig.fill);
     }
     if (depth === 3 * 1) {
-      this.addCountyBorder(countryConfig.countryLine);
+      this.addCountyBorder(countryConfig.fill);
     }
   }
   protected async addProvinceFill() {