diff --git a/Dockerfile b/Dockerfile
index ae8731a389..209a5a99b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,11 @@
 FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:edge-chromium
 
-# RUN echo -e 'https://dl-cdn.alpinelinux.org/alpine/edge/main/\nhttps://dl-cdn.alpinelinux.org/alpine/edge/community/' > /etc/apk/repositories 
-
-# RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
-
-# ADD simsun.ttc /usr/share/fonts/
-
-# RUN cd /usr/share/fonts/ \
-#    && mkfontscale \
-#    && mkfontdir \
-#    && fc-cache -fv
-
 ARG IMAGE_TAG
 
-RUN mkdir -p /opt/apps
-
-RUN mkdir -p /opt/dataease/data/feature/full
+RUN mkdir -p /opt/apps /opt/dataease/data/feature/full /opt/dataease/drivers
 
 ADD mapFiles/* /opt/dataease/data/feature/full/
 
-RUN mkdir -p /opt/dataease/drivers
-
 ADD drivers/* /opt/dataease/drivers/
 
 ADD backend/target/backend-$IMAGE_TAG.jar /opt/apps
diff --git a/backend/pom.xml b/backend/pom.xml
index 1049621672..7d1e213fc0 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -106,6 +106,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.28</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -279,6 +280,16 @@
             <artifactId>json-path</artifactId>
             <version>2.4.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -403,7 +414,7 @@
                     <dependency>
                         <groupId>mysql</groupId>
                         <artifactId>mysql-connector-java</artifactId>
-                        <version>8.0.16</version>
+                        <version>8.0.28</version>
                     </dependency>
                     <dependency>
                         <groupId>com.itfsw</groupId>
diff --git a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
index 99ae03a2e2..cd0c12fff2 100644
--- a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
+++ b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
@@ -1,6 +1,5 @@
 package io.dataease.auth.entity;
 
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -39,4 +38,7 @@ public class SysUserEntity implements Serializable {
 
     @ApiModelProperty(hidden = true)
     private Boolean isAdmin;
+
+    @ApiModelProperty(hidden = true)
+    private Integer from;
 }
diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index a5748dc71a..9bea8f4a0e 100644
--- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -141,7 +141,7 @@ public class AuthServer implements AuthApi {
     @Override
     public Boolean useInitPwd() {
         CurrentUserDto user = AuthUtils.getUser();
-        if (null == user) {
+        if (null == user || 0 != user.getFrom()) {
             return false;
         }
         String md5 = CodingUtil.md5(DEFAULT_PWD);
diff --git a/backend/src/main/java/io/dataease/base/domain/ChartView.java b/backend/src/main/java/io/dataease/base/domain/ChartView.java
index 569746859c..dd6a16307b 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartView.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartView.java
@@ -1,39 +1,42 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChartView implements Serializable {
+    @ApiModelProperty("ID")
     private String id;
-
+    @ApiModelProperty("名称")
     private String name;
-
-    private String title;
-
-    private String sceneId;
-
+    @ApiModelProperty("数据集ID")
     private String tableId;
-
+    @ApiModelProperty("图表类型")
     private String type;
-
+    @ApiModelProperty("渲染方式")
     private String render;
-
+    @ApiModelProperty("展示结果数量")
     private Integer resultCount;
-
+    @ApiModelProperty("展示结果")
     private String resultMode;
-
+    @ApiModelProperty("标题")
+    private String title;
+    @ApiModelProperty("场景ID")
+    private String sceneId;
+    @ApiModelProperty("创建人")
     private String createBy;
-
+    @ApiModelProperty("创建时间")
     private Long createTime;
-
+    @ApiModelProperty("更新时间")
     private Long updateTime;
-
+    @ApiModelProperty("样式优先级")
     private String stylePriority;
-
+    @ApiModelProperty("public or private")
     private String chartType;
-
+    @ApiModelProperty("是否插件")
     private Boolean isPlugin;
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java
index 51a45711b1..f4d44ca52a 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java
@@ -244,146 +244,6 @@ public class ChartViewExample {
             return (Criteria) this;
         }
 
-        public Criteria andTitleIsNull() {
-            addCriterion("title is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleIsNotNull() {
-            addCriterion("title is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleEqualTo(String value) {
-            addCriterion("title =", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotEqualTo(String value) {
-            addCriterion("title <>", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleGreaterThan(String value) {
-            addCriterion("title >", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleGreaterThanOrEqualTo(String value) {
-            addCriterion("title >=", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleLessThan(String value) {
-            addCriterion("title <", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleLessThanOrEqualTo(String value) {
-            addCriterion("title <=", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleLike(String value) {
-            addCriterion("title like", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotLike(String value) {
-            addCriterion("title not like", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleIn(List<String> values) {
-            addCriterion("title in", values, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotIn(List<String> values) {
-            addCriterion("title not in", values, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleBetween(String value1, String value2) {
-            addCriterion("title between", value1, value2, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotBetween(String value1, String value2) {
-            addCriterion("title not between", value1, value2, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdIsNull() {
-            addCriterion("scene_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdIsNotNull() {
-            addCriterion("scene_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdEqualTo(String value) {
-            addCriterion("scene_id =", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdNotEqualTo(String value) {
-            addCriterion("scene_id <>", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdGreaterThan(String value) {
-            addCriterion("scene_id >", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdGreaterThanOrEqualTo(String value) {
-            addCriterion("scene_id >=", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdLessThan(String value) {
-            addCriterion("scene_id <", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdLessThanOrEqualTo(String value) {
-            addCriterion("scene_id <=", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdLike(String value) {
-            addCriterion("scene_id like", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdNotLike(String value) {
-            addCriterion("scene_id not like", value, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdIn(List<String> values) {
-            addCriterion("scene_id in", values, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdNotIn(List<String> values) {
-            addCriterion("scene_id not in", values, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdBetween(String value1, String value2) {
-            addCriterion("scene_id between", value1, value2, "sceneId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSceneIdNotBetween(String value1, String value2) {
-            addCriterion("scene_id not between", value1, value2, "sceneId");
-            return (Criteria) this;
-        }
-
         public Criteria andTableIdIsNull() {
             addCriterion("table_id is null");
             return (Criteria) this;
@@ -724,6 +584,146 @@ public class ChartViewExample {
             return (Criteria) this;
         }
 
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdIsNull() {
+            addCriterion("scene_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdIsNotNull() {
+            addCriterion("scene_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdEqualTo(String value) {
+            addCriterion("scene_id =", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdNotEqualTo(String value) {
+            addCriterion("scene_id <>", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdGreaterThan(String value) {
+            addCriterion("scene_id >", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdGreaterThanOrEqualTo(String value) {
+            addCriterion("scene_id >=", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdLessThan(String value) {
+            addCriterion("scene_id <", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdLessThanOrEqualTo(String value) {
+            addCriterion("scene_id <=", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdLike(String value) {
+            addCriterion("scene_id like", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdNotLike(String value) {
+            addCriterion("scene_id not like", value, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdIn(List<String> values) {
+            addCriterion("scene_id in", values, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdNotIn(List<String> values) {
+            addCriterion("scene_id not in", values, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdBetween(String value1, String value2) {
+            addCriterion("scene_id between", value1, value2, "sceneId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSceneIdNotBetween(String value1, String value2) {
+            addCriterion("scene_id not between", value1, value2, "sceneId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateByIsNull() {
             addCriterion("create_by is null");
             return (Criteria) this;
@@ -1207,4 +1207,4 @@ public class ChartViewExample {
             this(condition, value, secondValue, null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
index d928332ac5..f0492a42d3 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
@@ -1,6 +1,8 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -9,27 +11,30 @@ import lombok.ToString;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ChartViewWithBLOBs extends ChartView implements Serializable {
+    @ApiModelProperty("x轴")
     private String xAxis;
-
+    @ApiModelProperty("x副轴")
     private String xAxisExt;
-
+    @ApiModelProperty("y轴")
     private String yAxis;
-
+    @ApiModelProperty("y副轴")
     private String yAxisExt;
-
+    @ApiModelProperty("堆叠字段")
     private String extStack;
-
+    @ApiModelProperty("气泡大小字段")
     private String extBubble;
-
+    @ApiModelProperty("图形属性")
     private String customAttr;
-
+    @ApiModelProperty("组件样式")
     private String customStyle;
-
+    @ApiModelProperty("过滤器字段")
     private String customFilter;
-
+    @ApiModelProperty("下钻字段")
     private String drillFields;
-
+    @ApiModelProperty("高级设置")
+    private String senior;
+    @ApiModelProperty("视图截图快照")
     private String snapshot;
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
index d7e9404ad0..c8d1f5c55f 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
@@ -4,13 +4,13 @@
   <resultMap id="BaseResultMap" type="io.dataease.base.domain.ChartView">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="scene_id" jdbcType="VARCHAR" property="sceneId" />
     <result column="table_id" jdbcType="VARCHAR" property="tableId" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="render" jdbcType="VARCHAR" property="render" />
     <result column="result_count" jdbcType="INTEGER" property="resultCount" />
     <result column="result_mode" jdbcType="VARCHAR" property="resultMode" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="scene_id" jdbcType="VARCHAR" property="sceneId" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
@@ -29,6 +29,7 @@
     <result column="custom_style" jdbcType="LONGVARCHAR" property="customStyle" />
     <result column="custom_filter" jdbcType="LONGVARCHAR" property="customFilter" />
     <result column="drill_fields" jdbcType="LONGVARCHAR" property="drillFields" />
+    <result column="senior" jdbcType="LONGVARCHAR" property="senior" />
     <result column="snapshot" jdbcType="LONGVARCHAR" property="snapshot" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -90,12 +91,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, title, scene_id, table_id, `type`, render, result_count, result_mode, 
+    id, `name`, table_id, `type`, render, result_count, result_mode, title, scene_id,
     create_by, create_time, update_time, style_priority, chart_type, is_plugin
   </sql>
   <sql id="Blob_Column_List">
-    x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, 
-    custom_filter, drill_fields, snapshot
+    x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style,
+    custom_filter, drill_fields, senior, snapshot
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ChartViewExample" resultMap="ResultMapWithBLOBs">
     select
@@ -128,7 +129,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -146,24 +147,26 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
-    insert into chart_view (id, `name`, title, 
-      scene_id, table_id, `type`, 
-      render, result_count, result_mode, 
-      create_by, create_time, update_time, 
-      style_priority, chart_type, is_plugin, 
-      x_axis, x_axis_ext, y_axis, 
-      y_axis_ext, ext_stack, ext_bubble, 
-      custom_attr, custom_style, custom_filter, 
-      drill_fields, snapshot)
-    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
-      #{sceneId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{render,jdbcType=VARCHAR}, #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, 
-      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{stylePriority,jdbcType=VARCHAR}, #{chartType,jdbcType=VARCHAR}, #{isPlugin,jdbcType=BIT}, 
-      #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
-      #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, 
-      #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, 
-      #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR})
+    insert into chart_view (id, `name`, table_id,
+      `type`, render, result_count,
+      result_mode, title, scene_id,
+      create_by, create_time, update_time,
+      style_priority, chart_type, is_plugin,
+      x_axis, x_axis_ext, y_axis,
+      y_axis_ext, ext_stack, ext_bubble,
+      custom_attr, custom_style, custom_filter,
+      drill_fields, senior, snapshot
+      )
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR},
+      #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, #{resultCount,jdbcType=INTEGER},
+      #{resultMode,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR},
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
+      #{stylePriority,jdbcType=VARCHAR}, #{chartType,jdbcType=VARCHAR}, #{isPlugin,jdbcType=BIT},
+      #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR},
+      #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR},
+      #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR},
+      #{drillFields,jdbcType=LONGVARCHAR}, #{senior,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     insert into chart_view
@@ -174,12 +177,6 @@
       <if test="name != null">
         `name`,
       </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="sceneId != null">
-        scene_id,
-      </if>
       <if test="tableId != null">
         table_id,
       </if>
@@ -195,6 +192,12 @@
       <if test="resultMode != null">
         result_mode,
       </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="sceneId != null">
+        scene_id,
+      </if>
       <if test="createBy != null">
         create_by,
       </if>
@@ -243,6 +246,9 @@
       <if test="drillFields != null">
         drill_fields,
       </if>
+      <if test="senior != null">
+        senior,
+      </if>
       <if test="snapshot != null">
         snapshot,
       </if>
@@ -254,12 +260,6 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="sceneId != null">
-        #{sceneId,jdbcType=VARCHAR},
-      </if>
       <if test="tableId != null">
         #{tableId,jdbcType=VARCHAR},
       </if>
@@ -275,6 +275,12 @@
       <if test="resultMode != null">
         #{resultMode,jdbcType=VARCHAR},
       </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="sceneId != null">
+        #{sceneId,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null">
         #{createBy,jdbcType=VARCHAR},
       </if>
@@ -323,6 +329,9 @@
       <if test="drillFields != null">
         #{drillFields,jdbcType=LONGVARCHAR},
       </if>
+      <if test="senior != null">
+        #{senior,jdbcType=LONGVARCHAR},
+      </if>
       <if test="snapshot != null">
         #{snapshot,jdbcType=LONGVARCHAR},
       </if>
@@ -343,12 +352,6 @@
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sceneId != null">
-        scene_id = #{record.sceneId,jdbcType=VARCHAR},
-      </if>
       <if test="record.tableId != null">
         table_id = #{record.tableId,jdbcType=VARCHAR},
       </if>
@@ -364,6 +367,12 @@
       <if test="record.resultMode != null">
         result_mode = #{record.resultMode,jdbcType=VARCHAR},
       </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sceneId != null">
+        scene_id = #{record.sceneId,jdbcType=VARCHAR},
+      </if>
       <if test="record.createBy != null">
         create_by = #{record.createBy,jdbcType=VARCHAR},
       </if>
@@ -412,6 +421,9 @@
       <if test="record.drillFields != null">
         drill_fields = #{record.drillFields,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.senior != null">
+        senior = #{record.senior,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.snapshot != null">
         snapshot = #{record.snapshot,jdbcType=LONGVARCHAR},
       </if>
@@ -424,13 +436,13 @@
     update chart_view
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
-      title = #{record.title,jdbcType=VARCHAR},
-      scene_id = #{record.sceneId,jdbcType=VARCHAR},
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       render = #{record.render,jdbcType=VARCHAR},
       result_count = #{record.resultCount,jdbcType=INTEGER},
       result_mode = #{record.resultMode,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      scene_id = #{record.sceneId,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
@@ -447,6 +459,7 @@
       custom_style = #{record.customStyle,jdbcType=LONGVARCHAR},
       custom_filter = #{record.customFilter,jdbcType=LONGVARCHAR},
       drill_fields = #{record.drillFields,jdbcType=LONGVARCHAR},
+      senior = #{record.senior,jdbcType=LONGVARCHAR},
       snapshot = #{record.snapshot,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -456,13 +469,13 @@
     update chart_view
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
-      title = #{record.title,jdbcType=VARCHAR},
-      scene_id = #{record.sceneId,jdbcType=VARCHAR},
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       render = #{record.render,jdbcType=VARCHAR},
       result_count = #{record.resultCount,jdbcType=INTEGER},
       result_mode = #{record.resultMode,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      scene_id = #{record.sceneId,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
@@ -479,12 +492,6 @@
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="sceneId != null">
-        scene_id = #{sceneId,jdbcType=VARCHAR},
-      </if>
       <if test="tableId != null">
         table_id = #{tableId,jdbcType=VARCHAR},
       </if>
@@ -500,6 +507,12 @@
       <if test="resultMode != null">
         result_mode = #{resultMode,jdbcType=VARCHAR},
       </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="sceneId != null">
+        scene_id = #{sceneId,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null">
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
@@ -548,6 +561,9 @@
       <if test="drillFields != null">
         drill_fields = #{drillFields,jdbcType=LONGVARCHAR},
       </if>
+      <if test="senior != null">
+        senior = #{senior,jdbcType=LONGVARCHAR},
+      </if>
       <if test="snapshot != null">
         snapshot = #{snapshot,jdbcType=LONGVARCHAR},
       </if>
@@ -557,13 +573,13 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     update chart_view
     set `name` = #{name,jdbcType=VARCHAR},
-      title = #{title,jdbcType=VARCHAR},
-      scene_id = #{sceneId,jdbcType=VARCHAR},
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       render = #{render,jdbcType=VARCHAR},
       result_count = #{resultCount,jdbcType=INTEGER},
       result_mode = #{resultMode,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      scene_id = #{sceneId,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
@@ -580,19 +596,20 @@
       custom_style = #{customStyle,jdbcType=LONGVARCHAR},
       custom_filter = #{customFilter,jdbcType=LONGVARCHAR},
       drill_fields = #{drillFields,jdbcType=LONGVARCHAR},
+      senior = #{senior,jdbcType=LONGVARCHAR},
       snapshot = #{snapshot,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.ChartView">
     update chart_view
     set `name` = #{name,jdbcType=VARCHAR},
-      title = #{title,jdbcType=VARCHAR},
-      scene_id = #{sceneId,jdbcType=VARCHAR},
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       render = #{render,jdbcType=VARCHAR},
       result_count = #{resultCount,jdbcType=INTEGER},
       result_mode = #{resultMode,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      scene_id = #{sceneId,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
@@ -601,4 +618,4 @@
       is_plugin = #{isPlugin,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
index d9aafa514b..15742fab74 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
@@ -12,6 +12,7 @@
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
         <result column="enabled" property="enabled"/>
         <result column="is_admin" jdbcType="BIT" property="isAdmin"/>
+        <result column="from" property="from"/>
     </resultMap>
 
     <resultMap id="roleMap" type="io.dataease.auth.api.dto.CurrentRoleDto">
@@ -21,19 +22,19 @@
 
 
     <select id="findUser" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language,is_admin from sys_user where user_id = #{userId}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language,is_admin, `from` from sys_user where user_id = #{userId}
     </select>
 
     <select id="findUserByName" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where username = #{username}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where username = #{username}
     </select>
 
     <select id="findLdapUserByName" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user a where username = #{username} and a.from = 1
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user a where username = #{username} and a.from = 1
     </select>
 
     <select id="findUserBySub" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where sub = #{sub}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where sub = #{sub}
     </select>
 
     <select id="roleCodes" resultType="String">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
index 89a85b05c5..3f5dd6a57c 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
@@ -9,9 +9,9 @@
     </resultMap>
 
     <select id="searchOneWithPrivileges" resultMap="BaseResultMapDTO">
-        select
-        chart_view.*
-        from chart_view where id = #{id}
+        select chart_view.*
+        from chart_view
+        where id = #{id}
     </select>
 
     <select id="searchOne" resultMap="BaseResultMapDTO">
@@ -88,7 +88,7 @@
         <where>
             FIND_IN_SET(chart_view.id,cids)
             <if test="sceneId != null">
-               and scene_id = #{sceneId,jdbcType=VARCHAR}
+                and scene_id = #{sceneId,jdbcType=VARCHAR}
             </if>
             <if test="name != null">
                 and name like CONCAT('%', #{name},'%')
@@ -99,158 +99,183 @@
     </select>
 
     <insert id="chartCopy">
-        INSERT INTO chart_view (
-            `id`,
-            `name`,
-            `scene_id`,
-            `table_id`,
-            `type`,
-            `title`,
-            `x_axis`,
-            `x_axis_ext`,
-            `y_axis`,
-            `custom_attr`,
-            `custom_style`,
-            `custom_filter`,
-            `drill_fields`,
-            `create_by`,
-            `create_time`,
-            `update_time`,
-            `snapshot`,
-            `style_priority`,
-            `ext_stack`,
-            `ext_bubble`,
-            `y_axis_ext`,
-            `render`,
-            `result_count`,
-            `result_mode`,
-            `chart_type`
-        ) SELECT
-        #{newChartId},
-        GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
-        #{panelId},
-        `table_id`,
-        `type`,
-        GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
-        `x_axis`,
-        `x_axis_ext`,
-        `y_axis`,
-        `custom_attr`,
-        `custom_style`,
-        `custom_filter`,
-        `drill_fields`,
-        `create_by`,
-        `create_time`,
-        `update_time`,
-        `snapshot`,
-        `style_priority`,
-        `ext_stack`,
-        `ext_bubble`,
-        `y_axis_ext`,
-        `render`,
-        `result_count`,
-        `result_mode`,
-        'private'
-        FROM
-            chart_view
-        WHERE
-            id = #{oldChartId}
+        INSERT INTO chart_view (`id`,
+                                `name`,
+                                `scene_id`,
+                                `table_id`,
+                                `type`,
+                                `title`,
+                                `x_axis`,
+                                `x_axis_ext`,
+                                `y_axis`,
+                                `custom_attr`,
+                                `custom_style`,
+                                `custom_filter`,
+                                `drill_fields`,
+                                `create_by`,
+                                `create_time`,
+                                `update_time`,
+                                `snapshot`,
+                                `style_priority`,
+                                `ext_stack`,
+                                `ext_bubble`,
+                                `y_axis_ext`,
+                                `render`,
+                                `result_count`,
+                                `result_mode`,
+                                `chart_type`,
+                                `senior`)
+        SELECT #{newChartId},
+               GET_CHART_VIEW_COPY_NAME(#{oldChartId}),
+               #{panelId},
+               `table_id`,
+               `type`,
+               GET_CHART_VIEW_COPY_NAME(#{oldChartId}),
+               `x_axis`,
+               `x_axis_ext`,
+               `y_axis`,
+               `custom_attr`,
+               `custom_style`,
+               `custom_filter`,
+               `drill_fields`,
+               `create_by`,
+               `create_time`,
+               `update_time`,
+               `snapshot`,
+               `style_priority`,
+               `ext_stack`,
+               `ext_bubble`,
+               `y_axis_ext`,
+               `render`,
+               `result_count`,
+               `result_mode`,
+               'private',
+               `senior`
+        FROM chart_view
+        WHERE id = #{oldChartId}
     </insert>
 
     <select id="searchAdviceSceneId" resultType="String">
-        SELECT DISTINCT
-            ( scene_id )
-        FROM
-            ( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{userId}, 'chart' ) cids ) t,
-            panel_view
-            LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
-            LEFT JOIN chart_group ON chart_view.scene_id = chart_group.id
-        WHERE
-            FIND_IN_SET( chart_view.scene_id, cids )  and panel_view.panel_id =#{panelId}
-        ORDER BY
-            chart_group.create_time DESC
-            LIMIT 1
+        SELECT DISTINCT (scene_id)
+        FROM (SELECT GET_V_AUTH_MODEL_ID_P_USE(#{userId}, 'chart') cids) t,
+             panel_view
+                 LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+                 LEFT JOIN chart_group ON chart_view.scene_id = chart_group.id
+        WHERE FIND_IN_SET(chart_view.scene_id, cids)
+          and panel_view.panel_id = #{panelId}
+        ORDER BY chart_group.create_time DESC LIMIT 1
     </select>
 
     <select id="checkSameDataSet" resultType="int">
-       select count(DISTINCT table_id)  from chart_view where id = #{viewIdSource} or id = #{viewIdTarget}
+        select count(DISTINCT table_id)
+        from chart_view
+        where id = #{viewIdSource}
+           or id = #{viewIdTarget}
     </select>
 
-    <insert id ='chartCopyWithPanel'>
-        INSERT INTO chart_view (
-            id,
-            `name`,
-            title,
-            scene_id,
-            table_id,
-            `type`,
-            render,
-            result_count,
-            result_mode,
-            create_by,
-            create_time,
-            update_time,
-            style_priority,
-            chart_type,
-            is_plugin,
-            x_axis,
-            x_axis_ext,
-            y_axis,
-            y_axis_ext,
-            ext_stack,
-            ext_bubble,
-            custom_attr,
-            custom_style,
-            custom_filter,
-            drill_fields,
-            SNAPSHOT
-            ) SELECT
-            pv_copy.chart_view_id AS id,
-            `name`,
-            title,
-            pv_copy.panel_id AS scene_id,
-            table_id,
-            `type`,
-            render,
-            result_count,
-            result_mode,
-            create_by,
-            create_time,
-            update_time,
-            style_priority,
-            chart_type,
-            is_plugin,
-            x_axis,
-            x_axis_ext,
-            y_axis,
-            y_axis_ext,
-            ext_stack,
-            ext_bubble,
-            custom_attr,
-            custom_style,
-            custom_filter,
-            drill_fields,
-        SNAPSHOT
-        FROM
-            (
-            SELECT
-                panel_id,
-                copy_from_view,
-                chart_view_id
-            FROM
-                panel_view
-            WHERE
-                copy_id = #{copyId}
-            ) pv_copy
-            LEFT JOIN chart_view ON chart_view.id = pv_copy.copy_from_view
+    <insert id='chartCopyWithPanel'>
+        INSERT INTO chart_view (id,
+                                `name`,
+                                title,
+                                scene_id,
+                                table_id,
+                                `type`,
+                                render,
+                                result_count,
+                                result_mode,
+                                create_by,
+                                create_time,
+                                update_time,
+                                style_priority,
+                                chart_type,
+                                is_plugin,
+                                x_axis,
+                                x_axis_ext,
+                                y_axis,
+                                y_axis_ext,
+                                ext_stack,
+                                ext_bubble,
+                                custom_attr,
+                                custom_style,
+                                custom_filter,
+                                drill_fields,
+                                SNAPSHOT)
+        SELECT pv_copy.chart_view_id AS id,
+               `name`,
+               title,
+               pv_copy.panel_id      AS scene_id,
+               table_id,
+               `type`,
+               render,
+               result_count,
+               result_mode,
+               create_by,
+               create_time,
+               update_time,
+               style_priority,
+               chart_type,
+               is_plugin,
+               x_axis,
+               x_axis_ext,
+               y_axis,
+               y_axis_ext,
+               ext_stack,
+               ext_bubble,
+               custom_attr,
+               custom_style,
+               custom_filter,
+               drill_fields,
+               SNAPSHOT
+        FROM (
+                 SELECT panel_id,
+                        copy_from_view,
+                        chart_view_id
+                 FROM panel_view
+                 WHERE copy_id = #{copyId}
+             ) pv_copy
+                 LEFT JOIN chart_view ON chart_view.id = pv_copy.copy_from_view
     </insert>
 
     <delete id="deleteCircleView">
-        delete chart_view from (select GET_CHART_GROUP_WITH_CHILDREN(#{pid}) cids) t,chart_view where FIND_IN_SET(chart_view.id,cids) and chart_type='public'
+        delete
+        chart_view from (select GET_CHART_GROUP_WITH_CHILDREN(
+        #{pid}
+        )
+        cids
+        )
+        t,
+        chart_view
+        where
+        FIND_IN_SET
+        (
+        chart_view
+        .
+        id,
+        cids
+        )
+        and
+        chart_type
+        =
+        'public'
     </delete>
 
     <delete id="deleteCircleGroup">
-        delete chart_group from (select GET_CHART_GROUP_WITH_CHILDREN(#{pid}) cids) t,chart_group where FIND_IN_SET(chart_group.id,cids)
+        delete
+        chart_group from (select GET_CHART_GROUP_WITH_CHILDREN(
+        #{pid}
+        )
+        cids
+        )
+        t,
+        chart_group
+        where
+        FIND_IN_SET
+        (
+        chart_group
+        .
+        id,
+        cids
+        )
     </delete>
 
 
diff --git a/backend/src/main/java/io/dataease/commons/condition/RedisStatusCondition.java b/backend/src/main/java/io/dataease/commons/condition/RedisStatusCondition.java
new file mode 100644
index 0000000000..ad23200b57
--- /dev/null
+++ b/backend/src/main/java/io/dataease/commons/condition/RedisStatusCondition.java
@@ -0,0 +1,23 @@
+package io.dataease.commons.condition;
+
+import io.dataease.commons.utils.CommonBeanFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class RedisStatusCondition implements Condition {
+
+    private static final String DEFAULT_TYPE = "ehcache";
+    private static final String TARGET_TYPE = "redis";
+    private static final String TYPE_KEY = "spring.cache.type";
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        Environment environment = context.getEnvironment();
+        String ehcacheType = environment.getProperty(TYPE_KEY, String.class, DEFAULT_TYPE);
+
+        return StringUtils.equals(TARGET_TYPE, ehcacheType);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/config/RedisConfig.java b/backend/src/main/java/io/dataease/config/RedisConfig.java
new file mode 100644
index 0000000000..c3778545bc
--- /dev/null
+++ b/backend/src/main/java/io/dataease/config/RedisConfig.java
@@ -0,0 +1,27 @@
+package io.dataease.config;
+
+
+import io.dataease.commons.condition.RedisStatusCondition;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+
+
+
+@Configuration
+public class RedisConfig {
+
+    @Conditional({RedisStatusCondition.class})
+    @Bean
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(factory);
+        Jackson2JsonRedisSerializer<Object> serializer = new Jackson2JsonRedisSerializer<Object>(Object.class);
+        redisTemplate.setDefaultSerializer(serializer);
+        return redisTemplate;
+    }
+
+}
diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java
index fd981b1fc1..c9f401e47f 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java
@@ -26,17 +26,18 @@ public class DataSetTableUnionController {
     @Resource
     private DataSetTableUnionService dataSetTableUnionService;
 
+    @DePermission(type = DePermissionType.DATASET, value = "sourceTableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     @ApiOperation("保存")
     @PostMapping("save")
     public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) {
         return dataSetTableUnionService.save(datasetTableUnion);
     }
 
-    @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
+    @DePermission(type = DePermissionType.DATASET, value = "sourceTableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     @ApiOperation("删除")
-    @PostMapping("delete/{id}")
-    public void delete(@PathVariable String id) {
-        dataSetTableUnionService.delete(id);
+    @PostMapping("delete")
+    public void delete(@RequestBody DatasetTableUnion datasetTableUnion) {
+        dataSetTableUnionService.delete(datasetTableUnion.getId());
     }
 
     @DePermission(type = DePermissionType.DATASET)
diff --git a/backend/src/main/java/io/dataease/listener/util/CacheUtils.java b/backend/src/main/java/io/dataease/listener/util/CacheUtils.java
index 443a9dc3fd..913fa42bb4 100644
--- a/backend/src/main/java/io/dataease/listener/util/CacheUtils.java
+++ b/backend/src/main/java/io/dataease/listener/util/CacheUtils.java
@@ -1,30 +1,46 @@
 package io.dataease.listener.util;
 
+import io.dataease.commons.utils.CommonBeanFactory;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.Element;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.ehcache.EhCacheCacheManager;
-import org.springframework.context.annotation.Configuration;
-import java.util.Date;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
-@Configuration
 public class CacheUtils {
 
-    private static CacheManager manager;
+    private static CacheManager cacheManager;
 
-    @Autowired
-    public void setManager(CacheManager manager) {
-        CacheUtils.manager = manager;
+
+    private static CacheManager getCacheManager() {
+        if (cacheManager == null)
+            cacheManager = CommonBeanFactory.getBean(CacheManager.class);
+        return cacheManager;
     }
 
     public static Object get(String cacheName, Object key) {
+        if (getCacheManager() instanceof RedisCacheManager) {
+            org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName);
+            if (null == cache) return null;
+            return cache.get(key);
+        }
         Element element = cache(cacheName).get(key);
         if (null == element) return null;
         return element.getObjectValue();
     }
 
     public static void put(String cacheName, Object key, Object value, Integer ttl, Integer tti) {
+        if (getCacheManager() instanceof RedisCacheManager) {
+            RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate");
+            ValueOperations valueOperations = redisTemplate.opsForValue();
+            valueOperations.setIfPresent(cacheName + "::" + key , value );
+            return;
+        }
         Element e = new Element(key, value);
         //不设置则使用xml配置
         if (ttl != null) {
@@ -33,19 +49,35 @@ public class CacheUtils {
         }
         if (tti != null)
             e.setTimeToIdle(tti);
-        cache(cacheName).put(e);
+        Cache cache = cache(cacheName);
+        if (null != cache)
+            cache.put(e);
     }
 
     public static boolean remove(String cacheName, Object key) {
+        if (getCacheManager() instanceof RedisCacheManager) {
+            org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName);
+            if (null == cache) return false;
+            return cache.evictIfPresent(key);
+        }
         return cache(cacheName).remove(key);
     }
 
     public static void removeAll(String cacheName) {
+        if (getCacheManager() instanceof RedisCacheManager) {
+            org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName);
+            if (null == cache) return;
+            cache.clear();
+            return;
+        }
         cache(cacheName).removeAll();
     }
 
     private static Cache cache(String cacheName) {
-        net.sf.ehcache.CacheManager cacheManager = ((EhCacheCacheManager) manager).getCacheManager();
+        if (getCacheManager() instanceof RedisCacheManager) {
+            return null;
+        }
+        net.sf.ehcache.CacheManager cacheManager = ((EhCacheCacheManager) getCacheManager()).getCacheManager();
         if (!cacheManager.cacheExists(cacheName))
             cacheManager.addCache(cacheName);
         Cache cacheManagerCache = cacheManager.getCache(cacheName);
@@ -57,6 +89,12 @@ public class CacheUtils {
         long exp = (time - System.currentTimeMillis()) / 1000;
         int intExp = (int)exp;
         removeAll("lic_info");
+        if (getCacheManager() instanceof RedisCacheManager) {
+            RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate");
+            ValueOperations valueOperations = redisTemplate.opsForValue();
+            valueOperations.set("lic_info::lic", "lic", exp, TimeUnit.SECONDS);
+            return;
+        }
         put("lic_info", "lic", "lic", intExp, intExp);
     }
 }
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index c8b81bb235..e95faa427a 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -3,7 +3,6 @@ package io.dataease.service.dataset;
 import com.google.gson.Gson;
 import io.dataease.auth.annotation.DeCleaner;
 import io.dataease.auth.api.dto.CurrentUserDto;
-import io.dataease.auth.entity.SysUserEntity;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.*;
 import io.dataease.base.mapper.ext.ExtDataSetGroupMapper;
@@ -51,9 +50,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
@@ -1181,6 +1181,14 @@ public class DataSetTableService {
                 DEException.throwException(
                         Translator.get("i18n_custom_ds_delete") + String.format(":table id [%s]", tableId));
             }
+            CurrentUserDto user = AuthUtils.getUser();
+            if (user != null && !user.getIsAdmin()) {
+                DataSetTableDTO withPermission = getWithPermission(datasetTable.getId(), user.getUserId());
+                if (ObjectUtils.isEmpty(withPermission.getPrivileges()) || !withPermission.getPrivileges().contains("use")) {
+                    DEException.throwException(
+                            Translator.get("i18n_dataset_no_permission") + String.format(":table name [%s]", withPermission.getName()));
+                }
+            }
             List<DatasetTableField> fields = dataSetTableFieldsService.getListByIdsEach(unionDTO.getCurrentDsField());
 
             String[] array = fields.stream()
@@ -1309,6 +1317,14 @@ public class DataSetTableService {
                 DEException.throwException(
                         Translator.get("i18n_custom_ds_delete") + String.format(":table id [%s]", tableId));
             }
+            CurrentUserDto user = AuthUtils.getUser();
+            if (user != null && !user.getIsAdmin()) {
+                DataSetTableDTO withPermission = getWithPermission(datasetTable.getId(), user.getUserId());
+                if (ObjectUtils.isEmpty(withPermission.getPrivileges()) || !withPermission.getPrivileges().contains("use")) {
+                    DEException.throwException(
+                            Translator.get("i18n_dataset_no_permission") + String.format(":table name [%s]", withPermission.getName()));
+                }
+            }
             List<DatasetTableField> fields = dataSetTableFieldsService.getListByIdsEach(unionDTO.getCurrentDsField());
 
             String[] array = fields.stream()
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 6afd148af2..ebf6e5bb9e 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -119,9 +119,9 @@ public class ExtractDataService {
 
     private static final String dropTableSql = "DROP TABLE IF EXISTS TABLE_NAME;";
     private static final String shellScript = "result=`curl --location-trusted -u %s:%s -H \"label:%s\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load`\n" +
-            "if [ $? == 0 ] ; then\n" +
+            "if [ $? -eq 0 ] ; then\n" +
             "  failstatus=$(echo $result | grep '\"Status\": \"Fail\"')\n" +
-            "  if [[ \"$failstatus\" != \"\" ]]; then\n" +
+            "  if [ \"x${failstatus}\" != \"x\" ];then" +
             "     echo $result\n" +
             "     exit 1\n" +
             "  fi\n" +
@@ -342,34 +342,26 @@ public class ExtractDataService {
                 try {
                     if(datasource.getType().equalsIgnoreCase(DatasourceTypes.api.name())){
                         extractData(datasetTable, datasource, datasetTableFields, "incremental_add", null);
-                        return;
-                    }
-                    DatasetTableIncrementalConfig datasetTableIncrementalConfig = dataSetTableService.incrementalConfig(datasetTableId);
-                    if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) {
-                        updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null);
-                        return;
-                    }
-                    if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) {
-                        updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null);
-                        saveErrorLog(datasetTableId, taskId, new Exception("未进行全量同步"));
-                        lastExecStatus = JobStatus.Error;
-                        return;
-                    }
+                    }else{
+                        DatasetTableIncrementalConfig datasetTableIncrementalConfig = dataSetTableService.incrementalConfig(datasetTableId);
+                        if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) {
+                            throw new Exception("未进行全量同步");
+                        }
 
-                    execTime = System.currentTimeMillis();
-                    if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加
-                        String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString())
-                                .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString());
-                        extractData(datasetTable, datasource, datasetTableFields, "incremental_add", sql);
-                    }
+                        execTime = System.currentTimeMillis();
+                        if (datasetTableIncrementalConfig != null && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加
+                            String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString())
+                                    .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString());
+                            extractData(datasetTable, datasource, datasetTableFields, "incremental_add", sql);
+                        }
 
-                    if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete().replace(" ", ""))) {// 增量删除
-                        String sql = datasetTableIncrementalConfig.getIncrementalDelete().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString())
-                                .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString());
-                        extractData(datasetTable, datasource, datasetTableFields, "incremental_delete", sql);
+                        if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete().replace(" ", ""))) {// 增量删除
+                            String sql = datasetTableIncrementalConfig.getIncrementalDelete().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString())
+                                    .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString());
+                            extractData(datasetTable, datasource, datasetTableFields, "incremental_delete", sql);
+                        }
                     }
                     saveSuccessLog(datasetTableTaskLog);
-
                     msg = true;
                     lastExecStatus = JobStatus.Completed;
                 } catch (Exception e) {
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index 0883d92131..4d2fecdaf5 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -323,11 +323,14 @@ public class DatasourceService {
     public void initAllDataSourceConnectionPool() {
         List<Datasource> datasources = datasourceMapper.selectByExampleWithBLOBs(new DatasourceExample());
         datasources.forEach(datasource -> {
-            try {
-                handleConnectionPool(datasource, "add");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            commonThreadPool.addTask(()->{
+                System.out.println(System.currentTimeMillis());
+                try {
+                    handleConnectionPool(datasource, "add");
+                } catch (Exception e) {
+                    LogUtil.error("Failed to init datasource: " + datasource.getName(), e);
+                }
+            });
         });
     }
 
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index fdb33ea352..df130211f2 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -61,13 +61,14 @@ quartz.scheduler-name=deServerJob
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 # actuator
-management.server.port=8083
-management.endpoints.web.exposure.include=*
+management.health.redis.enabled=false
+#management.server.port=8083
+#management.endpoints.web.exposure.include=*
 #spring.freemarker.checkTemplateLocation=false
 #RSA非对称加密参数：私钥
 rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 rsa.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==
-spring.cache.type=ehcache
+#spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:/ehcache/ehcache.xml
 #打印URL路径
 #logging.level.org.springframework.web=trace
@@ -85,6 +86,32 @@ server.compression.enabled=true
 server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
 server.compression.min-response-size=1024
 
+#下面的配置新增到/opt/dataease/conf/dataease/properties
+#缓存类型
+##spring.cache.type=redis
+#spring.cache.type=ehcache
+#redis公共配置
+#spring.redis.timeout=10000
+#spring.redis.lettuce.pool.max-active=8
+#spring.redis.lettuce.pool.max-wait=-1
+#spring.redis.lettuce.pool.max-idle=8
+
+#单机模式redis配置
+#spring.redis.database=0
+#spring.redis.host=192.168.0.110
+#spring.redis.port=6379
+#spring.redis.password=DataEase_ZNB@REDIS
+
+#哨兵模式redis配置
+#spring.redis.sentinel.master=mymaster
+#spring.redis.sentinel.nodes=192.168.0.110:26379,192.168.0.110:26380,192.168.0.110:26381
+#spring.redis.sentinel.password=
+
+#cluster模式redis配置
+#spring.redis.cluster.nodes=192.168.0.110:7001,192.168.0.110:7002,192.168.0.110:7003,192.168.0.110:7004,192.168.0.110:7005,192.168.0.110:7006
+#spring.redis.cluster.max-redirects=3
+#spring.redis.password=DataEase_ZNB@REDIS
+
 
 
 
diff --git a/backend/src/main/resources/db/migration/V33__1.9.sql b/backend/src/main/resources/db/migration/V33__1.9.sql
new file mode 100644
index 0000000000..d182498b0b
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V33__1.9.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `chart_view` ADD COLUMN `senior` LONGTEXT COMMENT '高级' AFTER `drill_fields`;
+UPDATE `chart_view` SET `senior` = '{}';
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index 71ca683b77..9cbb2f2d7a 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -60,6 +60,8 @@
         </javaClientGenerator>
 
         <!--要生成的数据库表 -->
+<!--        <table tableName="dataease_code_version"/>-->
+        <table tableName="chart_view"/>
         <table tableName="chart_view_cache"/>
 <!--        <table tableName="chart_view"/>-->
 <!--        <table tableName="panel_view"/>-->
diff --git a/frontend/package.json b/frontend/package.json
index 47e65a4e38..9cd95b9828 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,8 +13,9 @@
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
   },
   "dependencies": {
-    "@antv/g2plot": "^2.3.32",
-    "@antv/s2": "^1.7.0",
+    "@antv/g2plot": "^2.4.9",
+    "@antv/s2": "^1.11.0",
+    "@antv/util": "^2.0.17",
     "@riophae/vue-treeselect": "0.4.0",
     "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.21.1",
diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index fb40d17deb..359fd7945b 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="de-tabs-div">
-    <el-tabs v-model="activeTabName" type="card" class="de-tabs">
+    <el-tabs v-model="activeTabName" type="card" class="de-tabs" @tab-click="handleClick">
       <el-tab-pane
         v-for="(item, index) in element.options.tabList"
         :key="item.name+index"
@@ -295,6 +295,15 @@ export default {
     },
     chartResize() {
       // this.$refs[this.activeTabName]
+    },
+    handleClick(tab) {
+      const name = tab.name
+      this.element.options.tabList.forEach(item => {
+        if (item && item.name === name && item.content && item.content.propValue && item.content.propValue.viewId) {
+          this.filterMap[item.content.propValue.viewId] = item.content.filters
+        }
+      })
+      // console.log(tab)
     }
 
   }
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 75986c8dcb..32fbe656ac 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1031,6 +1031,32 @@ export default {
     table_align_center: 'Center',
     table_align_right: 'Right',
     draw_back: 'Draw Back'
+    senior: 'Senior',
+    senior_cfg: 'Senior Config',
+    function_cfg: 'Function Config',
+    analyse_cfg: 'Analyse',
+    slider: 'Slider',
+    slider_range: 'Range',
+    chart_no_senior: 'This chart type not support senior config,please look forward to.',
+    assist_line: 'Assist Line',
+    field_fixed: 'Fixed',
+    line_type_dotted: 'Dotted',
+    value_can_not_empty: 'Value can not be empty',
+    value_error: 'Value illegal',
+    threshold: 'Threshold',
+    threshold_range: 'Range',
+    gauge_threshold_format_error: 'Format Error',
+    total_cfg: 'Total Config',
+    col_cfg: 'Column',
+    row_cfg: 'Row',
+    total_show: 'Total',
+    total_position: 'Position',
+    total_label: 'Alias',
+    sub_total_show: 'Sub Total',
+    total_pos_top: 'Top',
+    total_pos_bottom: 'Bottom',
+    total_pos_left: 'Left',
+    total_pos_right: 'Right'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 36fb4a8459..5e08ce5d66 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1031,6 +1031,32 @@ export default {
     table_align_center: '居中',
     table_align_right: '右對齊',
     draw_back: '收回'
+    senior: '高級',
+    senior_cfg: '高級設置',
+    function_cfg: '功能設置',
+    analyse_cfg: '分析預警',
+    slider: '縮略軸',
+    slider_range: '默認範圍',
+    chart_no_senior: '當前圖表類型暫無高級配置，敬請期待',
+    assist_line: '輔助線',
+    field_fixed: '固定值',
+    line_type_dotted: '點',
+    value_can_not_empty: '值不能為空',
+    value_error: '值必須為數值',
+    threshold: '閾值',
+    threshold_range: '閾值區間',
+    gauge_threshold_format_error: '格式錯誤',
+    total_cfg: '總計配置',
+    col_cfg: '列匯總',
+    row_cfg: '行匯總',
+    total_show: '總計',
+    total_position: '位置',
+    total_label: '別名',
+    sub_total_show: '小計',
+    total_pos_top: '頂部',
+    total_pos_bottom: '底部',
+    total_pos_left: '左側',
+    total_pos_right: '右側'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index e79e8b4dca..78022d5387 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1033,7 +1033,33 @@ export default {
     table_align_left: '左对齐',
     table_align_center: '居中',
     table_align_right: '右对齐',
-    draw_back: '收回'
+    draw_back: '收回',
+    senior: '高级',
+    senior_cfg: '高级设置',
+    function_cfg: '功能设置',
+    analyse_cfg: '分析预警',
+    slider: '缩略轴',
+    slider_range: '默认范围',
+    chart_no_senior: '当前图表类型暂无高级配置，敬请期待',
+    assist_line: '辅助线',
+    field_fixed: '固定值',
+    line_type_dotted: '点',
+    value_can_not_empty: '值不能为空',
+    value_error: '值必须为数值',
+    threshold: '阈值',
+    threshold_range: '阈值区间',
+    gauge_threshold_format_error: '格式错误',
+    total_cfg: '总计配置',
+    col_cfg: '列汇总',
+    row_cfg: '行汇总',
+    total_show: '总计',
+    total_position: '位置',
+    total_label: '别名',
+    sub_total_show: '小计',
+    total_pos_top: '顶部',
+    total_pos_bottom: '底部',
+    total_pos_left: '左侧',
+    total_pos_right: '右侧'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/chart/bar/bar.js b/frontend/src/views/chart/chart/bar/bar.js
index fdb3f08a07..aee859135f 100644
--- a/frontend/src/views/chart/chart/bar/bar.js
+++ b/frontend/src/views/chart/chart/bar/bar.js
@@ -1,5 +1,5 @@
 import { hexColorToRGBA } from '../util.js'
-import { componentStyle } from '../common/common'
+import { componentStyle, seniorCfg } from '../common/common'
 
 export function baseBarOption(chart_option, chart) {
   // 处理shape attr
@@ -25,7 +25,7 @@ export function baseBarOption(chart_option, chart) {
       const y = chart.data.series[i]
       // color
       y.itemStyle = {
-        color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+        color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
       }
       // size
       if (customAttr.size) {
@@ -48,6 +48,7 @@ export function baseBarOption(chart_option, chart) {
   }
   // console.log(chart_option);
   componentStyle(chart_option, chart)
+  seniorCfg(chart_option, chart)
   return chart_option
 }
 
@@ -87,7 +88,7 @@ export function horizontalBarOption(chart_option, chart) {
       const y = chart.data.series[i]
       // color
       y.itemStyle = {
-        color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+        color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
       }
       // size
       if (customAttr.size) {
@@ -110,6 +111,7 @@ export function horizontalBarOption(chart_option, chart) {
   }
   // console.log(chart_option);
   componentStyle(chart_option, chart)
+  seniorCfg(chart_option, chart)
   return chart_option
 }
 
diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js
index ded5f4bffa..d84248628c 100644
--- a/frontend/src/views/chart/chart/bar/bar_antv.js
+++ b/frontend/src/views/chart/chart/bar/bar_antv.js
@@ -1,5 +1,15 @@
 import { Column, Bar } from '@antv/g2plot'
-import { getTheme, getLabel, getTooltip, getLegend, getXAxis, getYAxis, getPadding } from '@/views/chart/chart/common/common_antv'
+import {
+  getTheme,
+  getLabel,
+  getTooltip,
+  getLegend,
+  getXAxis,
+  getYAxis,
+  getPadding,
+  getSlider,
+  getAnalyse
+} from '@/views/chart/chart/common/common_antv'
 
 export function baseBarOptionAntV(plot, container, chart, action, isGroup, isStack) {
   // theme
@@ -13,6 +23,9 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta
   const yAxis = getYAxis(chart)
   // data
   const data = chart.data.datas
+  // config
+  const slider = getSlider(chart)
+  const analyse = getAnalyse(chart)
   // options
   const options = {
     theme: theme,
@@ -26,6 +39,8 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta
     legend: legend,
     xAxis: xAxis,
     yAxis: yAxis,
+    slider: slider,
+    annotations: analyse,
     interactions: [
       {
         type: 'element-active', cfg: {
@@ -108,6 +123,9 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt
   const yAxis = getYAxis(chart)
   // data
   const data = chart.data.datas
+  // config
+  const slider = getSlider(chart)
+  const analyse = getAnalyse(chart)
   // options
   const options = {
     theme: theme,
@@ -121,6 +139,8 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt
     legend: legend,
     xAxis: xAxis,
     yAxis: yAxis,
+    slider: slider,
+    annotations: analyse,
     interactions: [
       {
         type: 'element-active', cfg: {
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index df770bd6e8..5da618a310 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -78,6 +78,38 @@ export const DEFAULT_TOOLTIP = {
   },
   formatter: ''
 }
+export const DEFAULT_TOTAL = {
+  row: {
+    showGrandTotals: true,
+    showSubTotals: true,
+    reverseLayout: false,
+    reverseSubLayout: false,
+    label: '总计',
+    subLabel: '小计',
+    subTotalsDimensions: [],
+    calcTotals: {
+      aggregation: 'SUM'
+    },
+    calcSubTotals: {
+      aggregation: 'SUM'
+    }
+  },
+  col: {
+    showGrandTotals: true,
+    showSubTotals: true,
+    reverseLayout: false,
+    reverseSubLayout: false,
+    label: '总计',
+    subLabel: '小计',
+    subTotalsDimensions: [],
+    calcTotals: {
+      aggregation: 'SUM'
+    },
+    calcSubTotals: {
+      aggregation: 'SUM'
+    }
+  }
+}
 export const DEFAULT_TITLE_STYLE = {
   show: true,
   fontSize: '18',
@@ -240,6 +272,13 @@ export const DEFAULT_SPLIT = {
     show: true
   }
 }
+export const DEFAULT_FUNCTION_CFG = {
+  sliderShow: false,
+  sliderRange: [0, 10]
+}
+export const DEFAULT_THRESHOLD = {
+  gaugeThreshold: ''
+}
 // chart config
 export const BASE_BAR = {
   title: {
diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js
index 3945d4f4bf..632f6aeff4 100644
--- a/frontend/src/views/chart/chart/common/common.js
+++ b/frontend/src/views/chart/chart/common/common.js
@@ -178,3 +178,79 @@ export function componentStyle(chart_option, chart) {
     }
   }
 }
+
+export function seniorCfg(chart_option, chart) {
+  if (chart.senior && chart.type && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('mix'))) {
+    const senior = JSON.parse(chart.senior)
+    if (senior.functionCfg) {
+      if (senior.functionCfg.sliderShow) {
+        chart_option.dataZoom = [
+          {
+            type: 'inside',
+            start: parseInt(senior.functionCfg.sliderRange[0]),
+            end: parseInt(senior.functionCfg.sliderRange[1])
+          },
+          {
+            type: 'slider',
+            start: parseInt(senior.functionCfg.sliderRange[0]),
+            end: parseInt(senior.functionCfg.sliderRange[1])
+          }
+        ]
+        if (chart.type.includes('horizontal')) {
+          chart_option.dataZoom[0].yAxisIndex = [0]
+          chart_option.dataZoom[1].yAxisIndex = [0]
+          chart_option.dataZoom[1].left = '10px'
+        }
+      }
+    }
+    if (senior.assistLine && senior.assistLine.length > 0) {
+      if (chart_option.series && chart_option.series.length > 0) {
+        chart_option.series[0].markLine = {
+          symbol: 'none',
+          data: []
+        }
+        senior.assistLine.forEach(ele => {
+          if (chart.type.includes('horizontal')) {
+            chart_option.series[0].markLine.data.push({
+              symbol: 'none',
+              xAxis: parseFloat(ele.value),
+              name: ele.name,
+              lineStyle: {
+                color: ele.color,
+                type: ele.lineType
+              },
+              label: {
+                show: true,
+                color: ele.color,
+                fontSize: 10,
+                position: 'insideStartTop'
+              },
+              tooltip: {
+                show: false
+              }
+            })
+          } else {
+            chart_option.series[0].markLine.data.push({
+              symbol: 'none',
+              yAxis: parseFloat(ele.value),
+              name: ele.name,
+              lineStyle: {
+                color: ele.color,
+                type: ele.lineType
+              },
+              label: {
+                show: true,
+                color: ele.color,
+                fontSize: 10,
+                position: 'insideStartTop'
+              },
+              tooltip: {
+                show: false
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+}
diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index 331a3e45dc..d23b76fdb1 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -435,3 +435,67 @@ function transAxisPosition(chart, axis) {
     return axis.position
   }
 }
+
+export function getSlider(chart) {
+  let senior = {}
+  let cfg = false
+  if (chart.senior && chart.type && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('mix'))) {
+    senior = JSON.parse(chart.senior)
+    if (senior.functionCfg) {
+      if (senior.functionCfg.sliderShow) {
+        cfg = {
+          start: parseInt(senior.functionCfg.sliderRange[0]) / 100,
+          end: parseInt(senior.functionCfg.sliderRange[1]) / 100
+        }
+      }
+    }
+  }
+  return cfg
+}
+
+export function getAnalyse(chart) {
+  let senior = {}
+  const assistLine = []
+  if (chart.senior && chart.type && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('mix'))) {
+    senior = JSON.parse(chart.senior)
+    if (senior.assistLine && senior.assistLine.length > 0) {
+      senior.assistLine.forEach(ele => {
+        assistLine.push({
+          type: 'line',
+          start: ['start', parseFloat(ele.value)],
+          end: ['end', parseFloat(ele.value)],
+          style: {
+            stroke: ele.color,
+            lineDash: getLineDash(ele.lineType)
+          }
+        })
+        assistLine.push({
+          type: 'text',
+          position: ['start', parseFloat(ele.value)],
+          content: parseFloat(ele.value),
+          offsetY: -2,
+          offsetX: 2,
+          style: {
+            textBaseline: 'bottom',
+            fill: ele.color,
+            fontSize: 10
+          }
+        })
+      })
+    }
+  }
+  return assistLine
+}
+
+function getLineDash(type) {
+  switch (type) {
+    case 'solid':
+      return [0, 0]
+    case 'dashed':
+      return [10, 8]
+    case 'dotted':
+      return [2, 2]
+    default:
+      return [0, 0]
+  }
+}
diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js
index 4ffed26eeb..23f1a32b73 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -77,6 +77,11 @@ export function getCustomTheme(chart) {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
         fontSize: DEFAULT_SIZE.tableItemFontSize,
         textAlign: itemAlign
+      },
+      bolderText: {
+        fill: DEFAULT_COLOR_CASE.tableFontColor,
+        fontSize: DEFAULT_SIZE.tableItemFontSize,
+        textAlign: itemAlign
       }
     }
   }
@@ -114,6 +119,7 @@ export function getCustomTheme(chart) {
       theme.dataCell.cell.backgroundColor = i_c
       theme.dataCell.cell.horizontalBorderColor = b_c
       theme.dataCell.cell.verticalBorderColor = b_c
+      theme.dataCell.bolderText.fill = c.tableFontColor
       theme.dataCell.text.fill = c.tableFontColor
     }
     // size
@@ -137,6 +143,8 @@ export function getCustomTheme(chart) {
       theme.colCell.text.fontSize = parseInt(s.tableTitleFontSize)
       theme.colCell.text.textAlign = h_a
 
+      theme.dataCell.bolderText.fontSize = parseInt(s.tableItemFontSize)
+      theme.dataCell.bolderText.textAlign = i_a
       theme.dataCell.text.fontSize = parseInt(s.tableItemFontSize)
       theme.dataCell.text.textAlign = i_a
     }
diff --git a/frontend/src/views/chart/chart/funnel/funnel.js b/frontend/src/views/chart/chart/funnel/funnel.js
index 522016ecfe..16f699d2b7 100644
--- a/frontend/src/views/chart/chart/funnel/funnel.js
+++ b/frontend/src/views/chart/chart/funnel/funnel.js
@@ -40,7 +40,7 @@ export function baseFunnelOption(chart_option, chart) {
         y.name = chart.data.x[i]
         // color
         y.itemStyle = {
-          color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+          color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
         }
         // y.type = 'funnel'
         chart_option.series[0].data.push(y)
diff --git a/frontend/src/views/chart/chart/gauge/gauge.js b/frontend/src/views/chart/chart/gauge/gauge.js
index 616d0b8561..71c6a1814c 100644
--- a/frontend/src/views/chart/chart/gauge/gauge.js
+++ b/frontend/src/views/chart/chart/gauge/gauge.js
@@ -1,5 +1,6 @@
 import { componentStyle } from '../common/common'
 import { hexColorToRGBA } from '@/views/chart/chart/util'
+import { DEFAULT_THRESHOLD } from '@/views/chart/chart/chart'
 
 export function baseGaugeOption(chart_option, chart) {
   // 处理shape attr
@@ -49,6 +50,57 @@ export function baseGaugeOption(chart_option, chart) {
         value: chart.data.series[0].data[0]
       }
       chart_option.series[0].data.push(y)
+      // threshold
+      if (chart.senior) {
+        const range = []
+        let index = 0
+        let flag = false
+        const senior = JSON.parse(chart.senior)
+        const threshold = JSON.parse(JSON.stringify(senior.threshold ? senior.threshold : DEFAULT_THRESHOLD))
+        if (threshold.gaugeThreshold && threshold.gaugeThreshold !== '') {
+          const arr = threshold.gaugeThreshold.split(',')
+          const per = parseFloat(chart.data.series[0].data[0]) / parseFloat(chart_option.series[0].max)
+          for (let i = 0; i < arr.length; i++) {
+            const ele = arr[i]
+            const p = parseInt(ele) / 100
+            range.push([p, hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)])
+            if (!flag && per <= p) {
+              flag = true
+              index = i
+            }
+          }
+          if (!flag) {
+            index = arr.length
+          }
+
+          range.push([1, hexColorToRGBA(customAttr.color.colors[arr.length % customAttr.color.colors.length], customAttr.color.alpha)])
+          chart_option.series[0].axisLine = {
+            lineStyle: {
+              color: range
+            }
+          }
+
+          chart_option.series[0].itemStyle = {
+            color: hexColorToRGBA(customAttr.color.colors[index], customAttr.color.alpha)
+          }
+          chart_option.series[0].progress = {
+            show: false
+          }
+          chart_option.series[0].axisTick = {
+            lineStyle: {
+              color: 'auto'
+            }
+          }
+          chart_option.series[0].splitLine = {
+            lineStyle: {
+              color: 'auto'
+            }
+          }
+          chart_option.series[0].axisLabel = {
+            color: 'auto'
+          }
+        }
+      }
     }
   }
   // console.log(chart_option);
diff --git a/frontend/src/views/chart/chart/gauge/gauge_antv.js b/frontend/src/views/chart/chart/gauge/gauge_antv.js
index 1fe0979e30..82cd5071d7 100644
--- a/frontend/src/views/chart/chart/gauge/gauge_antv.js
+++ b/frontend/src/views/chart/chart/gauge/gauge_antv.js
@@ -1,6 +1,6 @@
 import { getPadding, getTheme } from '@/views/chart/chart/common/common_antv'
 import { Gauge } from '@antv/g2plot'
-import { DEFAULT_SIZE } from '@/views/chart/chart/chart'
+import { DEFAULT_SIZE, DEFAULT_THRESHOLD } from '@/views/chart/chart/chart'
 
 export function baseGaugeOptionAntV(plot, container, chart, action) {
   let max, labelContent, startAngel, endAngel
@@ -33,11 +33,39 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
       labelContent = false
     }
   }
+  const per = (parseFloat(data) / parseFloat(max))
+
+  const range = [0]
+  let index = 0
+  let flag = false
+  let hasThreshold = false
+
+  if (chart.senior) {
+    const senior = JSON.parse(chart.senior)
+    const threshold = JSON.parse(JSON.stringify(senior.threshold ? senior.threshold : DEFAULT_THRESHOLD))
+    if (threshold.gaugeThreshold && threshold.gaugeThreshold !== '') {
+      hasThreshold = true
+      const arr = threshold.gaugeThreshold.split(',')
+      for (let i = 0; i < arr.length; i++) {
+        const ele = arr[i]
+        const p = parseInt(ele) / 100
+        range.push(p)
+        if (!flag && per <= p) {
+          flag = true
+          index = i
+        }
+      }
+      if (!flag) {
+        index = arr.length
+      }
+    }
+  }
+  range.push(1)
 
   // options
   const options = {
     theme: theme,
-    percent: (parseFloat(data) / parseFloat(max)),
+    percent: per,
     startAngle: startAngel,
     endAngle: endAngel,
     appendPadding: getPadding(chart),
@@ -52,6 +80,24 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
     //   lineCap: 'round'
     // }
   }
+  if (hasThreshold) {
+    options.range = {
+      color: theme.styleSheet.paletteQualitative10,
+      ticks: range
+    }
+    options.indicator = {
+      pointer: {
+        style: {
+          stroke: theme.styleSheet.paletteQualitative10[index % theme.styleSheet.paletteQualitative10.length]
+        }
+      },
+      pin: {
+        style: {
+          stroke: theme.styleSheet.paletteQualitative10[index % theme.styleSheet.paletteQualitative10.length]
+        }
+      }
+    }
+  }
 
   // 开始渲染
   if (plot) {
diff --git a/frontend/src/views/chart/chart/line/line.js b/frontend/src/views/chart/chart/line/line.js
index d8439617b8..faf0f5fb88 100644
--- a/frontend/src/views/chart/chart/line/line.js
+++ b/frontend/src/views/chart/chart/line/line.js
@@ -1,5 +1,5 @@
 import { hexColorToRGBA } from '@/views/chart/chart/util'
-import { componentStyle } from '../common/common'
+import { componentStyle, seniorCfg } from '../common/common'
 
 export function baseLineOption(chart_option, chart) {
   // 处理shape attr
@@ -25,7 +25,7 @@ export function baseLineOption(chart_option, chart) {
       const y = chart.data.series[i]
       // color
       y.itemStyle = {
-        color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+        color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
       }
       // size
       if (customAttr.size) {
@@ -55,6 +55,7 @@ export function baseLineOption(chart_option, chart) {
   }
   // console.log(chart_option);
   componentStyle(chart_option, chart)
+  seniorCfg(chart_option, chart)
   return chart_option
 }
 
diff --git a/frontend/src/views/chart/chart/line/line_antv.js b/frontend/src/views/chart/chart/line/line_antv.js
index 66e8c9b84c..eb7d0eacc0 100644
--- a/frontend/src/views/chart/chart/line/line_antv.js
+++ b/frontend/src/views/chart/chart/line/line_antv.js
@@ -1,5 +1,15 @@
 import { Line, Area } from '@antv/g2plot'
-import { getTheme, getLabel, getTooltip, getLegend, getXAxis, getYAxis, getPadding } from '@/views/chart/chart/common/common_antv'
+import {
+  getTheme,
+  getLabel,
+  getTooltip,
+  getLegend,
+  getXAxis,
+  getYAxis,
+  getPadding,
+  getSlider,
+  getAnalyse
+} from '@/views/chart/chart/common/common_antv'
 
 export function baseLineOptionAntV(plot, container, chart, action) {
   // theme
@@ -13,6 +23,9 @@ export function baseLineOptionAntV(plot, container, chart, action) {
   const yAxis = getYAxis(chart)
   // data
   const data = chart.data.datas
+  // config
+  const slider = getSlider(chart)
+  const analyse = getAnalyse(chart)
   // options
   const options = {
     point: {},
@@ -27,6 +40,8 @@ export function baseLineOptionAntV(plot, container, chart, action) {
     legend: legend,
     xAxis: xAxis,
     yAxis: yAxis,
+    slider: slider,
+    annotations: analyse,
     interactions: [
       {
         type: 'element-active', cfg: {
@@ -100,6 +115,9 @@ export function baseAreaOptionAntV(plot, container, chart, action) {
   const yAxis = getYAxis(chart)
   // data
   const data = chart.data.datas
+  // config
+  const slider = getSlider(chart)
+  const analyse = getAnalyse(chart)
   // options
   const options = {
     point: {},
@@ -114,6 +132,8 @@ export function baseAreaOptionAntV(plot, container, chart, action) {
     legend: legend,
     xAxis: xAxis,
     yAxis: yAxis,
+    slider: slider,
+    annotations: analyse,
     interactions: [
       {
         type: 'element-active', cfg: {
diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js
index aee4192f28..27ec15676d 100644
--- a/frontend/src/views/chart/chart/map/map.js
+++ b/frontend/src/views/chart/chart/map/map.js
@@ -73,7 +73,7 @@ export function baseMapOption(chart_option, chart) {
         y.name = chart.data.x[i]
         // color
         // y.itemStyle = {
-        //   color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),
+        //   color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha),
         //   borderRadius: 0
         // }
         chart_option.series[0].data.push(y)
diff --git a/frontend/src/views/chart/chart/mix/mix.js b/frontend/src/views/chart/chart/mix/mix.js
index 7e1935738e..3380996cb4 100644
--- a/frontend/src/views/chart/chart/mix/mix.js
+++ b/frontend/src/views/chart/chart/mix/mix.js
@@ -1,5 +1,5 @@
 import { hexColorToRGBA } from '@/views/chart/chart/util'
-import { componentStyle } from '../common/common'
+import { componentStyle, seniorCfg } from '../common/common'
 
 export function baseMixOption(chart_option, chart) {
   // 处理shape attr
@@ -27,7 +27,7 @@ export function baseMixOption(chart_option, chart) {
       y.type = y.type ? y.type : 'bar'
       // color
       y.itemStyle = {
-        color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+        color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
       }
       // size
       if (customAttr.size) {
@@ -68,5 +68,6 @@ export function baseMixOption(chart_option, chart) {
   }
   // console.log(chart_option);
   componentStyle(chart_option, chart)
+  seniorCfg(chart_option, chart)
   return chart_option
 }
diff --git a/frontend/src/views/chart/chart/mix/mix_antv.js b/frontend/src/views/chart/chart/mix/mix_antv.js
index c361008d3b..8298d79b5c 100644
--- a/frontend/src/views/chart/chart/mix/mix_antv.js
+++ b/frontend/src/views/chart/chart/mix/mix_antv.js
@@ -43,7 +43,7 @@ export function baseMixOptionAntV(plot, container, chart, action) {
     const o = {
       type: '',
       options: {
-        color: colors[i % 9],
+        color: colors[i % colors.length],
         data: d.data,
         xField: 'field',
         yField: 'value',
diff --git a/frontend/src/views/chart/chart/pie/pie.js b/frontend/src/views/chart/chart/pie/pie.js
index d2afdd159d..e7622d8dda 100644
--- a/frontend/src/views/chart/chart/pie/pie.js
+++ b/frontend/src/views/chart/chart/pie/pie.js
@@ -41,7 +41,7 @@ export function basePieOption(chart_option, chart) {
         y.name = chart.data.x[i]
         // color
         y.itemStyle = {
-          color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),
+          color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha),
           borderRadius: 0
         }
         y.type = 'pie'
@@ -94,7 +94,7 @@ export function rosePieOption(chart_option, chart) {
         y.name = chart.data.x[i]
         // color
         y.itemStyle = {
-          color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),
+          color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha),
           borderRadius: customAttr.size.pieRoseRadius
         }
         y.type = 'pie'
diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js
index d2b582981c..0de2f39d7c 100644
--- a/frontend/src/views/chart/chart/radar/radar.js
+++ b/frontend/src/views/chart/chart/radar/radar.js
@@ -33,7 +33,7 @@ export function baseRadarOption(chart_option, chart) {
       }
       // color
       y.itemStyle = {
-        color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+        color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
       }
       // label
       if (customAttr.label) {
diff --git a/frontend/src/views/chart/chart/scatter/scatter.js b/frontend/src/views/chart/chart/scatter/scatter.js
index e1883f3855..d6f1a88a95 100644
--- a/frontend/src/views/chart/chart/scatter/scatter.js
+++ b/frontend/src/views/chart/chart/scatter/scatter.js
@@ -1,5 +1,5 @@
 import { hexColorToRGBA } from '@/views/chart/chart/util'
-import { componentStyle } from '../common/common'
+import { componentStyle, seniorCfg } from '../common/common'
 
 let bubbleArray = []
 let terminalType = 'pc'
@@ -30,7 +30,7 @@ export function baseScatterOption(chart_option, chart, terminal = 'pc') {
       const y = chart.data.series[i]
       // color
       y.itemStyle = {
-        color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+        color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
       }
       // size
       if (customAttr.size) {
@@ -57,6 +57,7 @@ export function baseScatterOption(chart_option, chart, terminal = 'pc') {
   }
   // console.log(chart_option);
   componentStyle(chart_option, chart)
+  seniorCfg(chart_option, chart)
   return chart_option
 }
 
diff --git a/frontend/src/views/chart/chart/scatter/scatter_antv.js b/frontend/src/views/chart/chart/scatter/scatter_antv.js
index 70592c85dd..77fd43d137 100644
--- a/frontend/src/views/chart/chart/scatter/scatter_antv.js
+++ b/frontend/src/views/chart/chart/scatter/scatter_antv.js
@@ -1,4 +1,14 @@
-import { getTheme, getLabel, getTooltip, getLegend, getXAxis, getYAxis, getPadding } from '@/views/chart/chart/common/common_antv'
+import {
+  getTheme,
+  getLabel,
+  getTooltip,
+  getLegend,
+  getXAxis,
+  getYAxis,
+  getPadding,
+  getSlider,
+  getAnalyse
+} from '@/views/chart/chart/common/common_antv'
 
 import { Scatter } from '@antv/g2plot'
 
@@ -14,6 +24,9 @@ export function baseScatterOptionAntV(plot, container, chart, action) {
   const yAxis = getYAxis(chart)
   // data
   const data = chart.data.datas
+  // config
+  const slider = getSlider(chart)
+  const analyse = getAnalyse(chart)
   // options
   const options = {
     theme: theme,
@@ -27,6 +40,8 @@ export function baseScatterOptionAntV(plot, container, chart, action) {
     legend: legend,
     xAxis: xAxis,
     yAxis: yAxis,
+    slider: slider,
+    annotations: analyse,
     pieStyle: {
       lineWidth: 0
     },
diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index dd6b000952..d3e4f9ec90 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -1,5 +1,6 @@
 import { TableSheet, S2Event, PivotSheet } from '@antv/s2'
 import { getCustomTheme, getSize } from '@/views/chart/chart/common/common_table'
+import { DEFAULT_TOTAL } from '@/views/chart/chart/chart'
 
 export function baseTableInfo(s2, container, chart, action, tableData) {
   const containerDom = document.getElementById(container)
@@ -281,11 +282,31 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
     data: tableData
   }
 
+  // total config
+  let totalCfg = {}
+  const chartObj = JSON.parse(JSON.stringify(chart))
+  if (chartObj.customAttr) {
+    let customAttr = null
+    if (Object.prototype.toString.call(chartObj.customAttr) === '[object Object]') {
+      customAttr = JSON.parse(JSON.stringify(chartObj.customAttr))
+    } else {
+      customAttr = JSON.parse(chartObj.customAttr)
+    }
+    if (customAttr.totalCfg) {
+      totalCfg = customAttr.totalCfg
+    } else {
+      totalCfg = JSON.parse(JSON.stringify(DEFAULT_TOTAL))
+    }
+  }
+  totalCfg.row.subTotalsDimensions = r
+  totalCfg.col.subTotalsDimensions = c
+
   // options
   const s2Options = {
     width: containerDom.offsetWidth,
     height: containerDom.offsetHeight,
-    style: getSize(chart)
+    style: getSize(chart),
+    totals: totalCfg
   }
 
   // 开始渲染
diff --git a/frontend/src/views/chart/chart/treemap/treemap.js b/frontend/src/views/chart/chart/treemap/treemap.js
index 4db4572bea..6c6befa083 100644
--- a/frontend/src/views/chart/chart/treemap/treemap.js
+++ b/frontend/src/views/chart/chart/treemap/treemap.js
@@ -49,7 +49,7 @@ export function baseTreemapOption(chart_option, chart) {
         y.name = chart.data.x[i]
         // color
         y.itemStyle = {
-          color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)
+          color: hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)
         }
         // y.type = 'treemap'
         chart_option.series[0].data.push(y)
diff --git a/frontend/src/views/chart/components/senior/AssistLine.vue b/frontend/src/views/chart/components/senior/AssistLine.vue
new file mode 100644
index 0000000000..9e8a33ceda
--- /dev/null
+++ b/frontend/src/views/chart/components/senior/AssistLine.vue
@@ -0,0 +1,200 @@
+<template>
+  <div style="width: 100%;padding: 0 18px;">
+    <el-col>
+      <el-button
+        :title="$t('chart.edit')"
+        icon="el-icon-edit"
+        type="text"
+        size="small"
+        style="width: 24px;margin-left: 4px;"
+        @click="editLine"
+      />
+      <el-col>
+        <el-row v-for="(item,index) in assistLine" :key="index" class="line-style">
+          <el-col :span="8">
+            <span :title="item.name">{{ item.name }}</span>
+          </el-col>
+          <el-col :span="8">
+            <span v-if="item.field === '0'" :title="$t('chart.field_fixed')">{{ $t('chart.field_fixed') }}</span>
+          </el-col>
+          <el-col :span="8">
+            <span :title="item.value">{{ item.value }}</span>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-col>
+
+    <!--编辑辅助线-->
+    <el-dialog
+      v-if="editLineDialog"
+      v-dialogDrag
+      :title="$t('chart.assist_line')"
+      :visible="editLineDialog"
+      :show-close="false"
+      width="70%"
+      class="dialog-css"
+    >
+      <assist-line-edit :line="assistLine" @onAssistLineChange="lineChange" />
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="closeEditLine">{{ $t('chart.cancel') }}</el-button>
+        <el-button type="primary" size="mini" @click="changeLine">{{ $t('chart.confirm') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import AssistLineEdit from '@/views/chart/components/senior/dialog/AssistLineEdit'
+export default {
+  name: 'AssistLine',
+  components: { AssistLineEdit },
+  props: {
+    chart: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      assistLine: [],
+      editLineDialog: false,
+      lineArr: []
+    }
+  },
+  watch: {
+    'chart': {
+      handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.senior) {
+        let senior = null
+        if (Object.prototype.toString.call(chart.senior) === '[object Object]') {
+          senior = JSON.parse(JSON.stringify(chart.senior))
+        } else {
+          senior = JSON.parse(chart.senior)
+        }
+        if (senior.assistLine) {
+          this.assistLine = senior.assistLine
+        } else {
+          this.assistLine = []
+        }
+      }
+    },
+    changeAssistLine() {
+      this.$emit('onAssistLineChange', this.assistLine)
+    },
+    lineChange(val) {
+      this.lineArr = val
+    },
+
+    editLine() {
+      this.editLineDialog = true
+    },
+    closeEditLine() {
+      this.editLineDialog = false
+    },
+    changeLine() {
+      // check line config
+      for (let i = 0; i < this.lineArr.length; i++) {
+        const ele = this.lineArr[i]
+        if (!ele.name || ele.name === '') {
+          this.$message({
+            message: this.$t('chart.name_can_not_empty'),
+            type: 'error',
+            showClose: true
+          })
+          return
+        }
+        if (!ele.value) {
+          this.$message({
+            message: this.$t('chart.value_can_not_empty'),
+            type: 'error',
+            showClose: true
+          })
+          return
+        }
+        if (parseFloat(ele.value).toString() === 'NaN') {
+          this.$message({
+            message: this.$t('chart.value_error'),
+            type: 'error',
+            showClose: true
+          })
+          return
+        }
+      }
+      this.assistLine = JSON.parse(JSON.stringify(this.lineArr))
+      this.changeAssistLine()
+      this.closeEditLine()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.shape-item{
+  padding: 6px;
+  border: none;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.form-item-slider>>>.el-form-item__label{
+  font-size: 12px;
+  line-height: 38px;
+}
+.form-item>>>.el-form-item__label{
+  font-size: 12px;
+}
+.el-select-dropdown__item{
+  padding: 0 20px;
+}
+span{
+  font-size: 12px
+}
+.el-form-item{
+  margin-bottom: 6px;
+}
+
+.switch-style{
+  position: absolute;
+  right: 10px;
+  margin-top: -4px;
+}
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
+
+.line-style{
+
+}
+.line-style >>> span{
+  display: inline-block;
+  width: 100%;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  padding: 0 10px;
+}
+
+.dialog-css >>> .el-dialog__title {
+  font-size: 14px;
+}
+
+.dialog-css >>> .el-dialog__header {
+  padding: 20px 20px 0;
+}
+
+.dialog-css >>> .el-dialog__body {
+  padding: 10px 20px 20px;
+}
+</style>
diff --git a/frontend/src/views/chart/components/senior/FunctionCfg.vue b/frontend/src/views/chart/components/senior/FunctionCfg.vue
new file mode 100644
index 0000000000..242b66233a
--- /dev/null
+++ b/frontend/src/views/chart/components/senior/FunctionCfg.vue
@@ -0,0 +1,101 @@
+<template>
+  <div style="width: 100%">
+    <el-col>
+      <el-form ref="functionForm" :model="functionForm" label-width="80px" size="mini">
+        <el-form-item :label="$t('chart.slider')" class="form-item">
+          <el-checkbox v-model="functionForm.sliderShow" @change="changeFunctionCfg">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <el-form-item v-show="functionForm.sliderShow" :label="$t('chart.slider_range')+'(%)'" class="form-item form-item-slider">
+          <el-slider v-model="functionForm.sliderRange" :min="0" :max="100" input-size="mini" range @change="changeFunctionCfg" />
+        </el-form-item>
+      </el-form>
+    </el-col>
+  </div>
+</template>
+
+<script>
+import { DEFAULT_FUNCTION_CFG } from '../../chart/chart'
+
+export default {
+  name: 'FunctionCfg',
+  props: {
+    chart: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      functionForm: JSON.parse(JSON.stringify(DEFAULT_FUNCTION_CFG))
+    }
+  },
+  watch: {
+    'chart': {
+      handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.senior) {
+        let senior = null
+        if (Object.prototype.toString.call(chart.senior) === '[object Object]') {
+          senior = JSON.parse(JSON.stringify(chart.senior))
+        } else {
+          senior = JSON.parse(chart.senior)
+        }
+        if (senior.functionCfg) {
+          this.functionForm = senior.functionCfg
+        } else {
+          this.functionForm = JSON.parse(JSON.stringify(DEFAULT_FUNCTION_CFG))
+        }
+      }
+    },
+    changeFunctionCfg() {
+      this.$emit('onFunctionCfgChange', this.functionForm)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.shape-item{
+  padding: 6px;
+  border: none;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.form-item-slider>>>.el-form-item__label{
+  font-size: 12px;
+  line-height: 38px;
+}
+.form-item>>>.el-form-item__label{
+  font-size: 12px;
+}
+.el-select-dropdown__item{
+  padding: 0 20px;
+}
+span{
+  font-size: 12px
+}
+.el-form-item{
+  margin-bottom: 6px;
+}
+
+.switch-style{
+  position: absolute;
+  right: 10px;
+  margin-top: -4px;
+}
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
+</style>
diff --git a/frontend/src/views/chart/components/senior/Threshold.vue b/frontend/src/views/chart/components/senior/Threshold.vue
new file mode 100644
index 0000000000..b180ca18c6
--- /dev/null
+++ b/frontend/src/views/chart/components/senior/Threshold.vue
@@ -0,0 +1,123 @@
+<template>
+  <div style="width: 100%">
+    <el-col v-if="chart.type && chart.type === 'gauge'">
+      <el-form ref="thresholdForm" :model="thresholdForm" label-width="80px" size="mini">
+        <el-form-item :label="$t('chart.threshold_range')+'(%)'" class="form-item">
+          <span>0,</span>
+          <el-input v-model="thresholdForm.gaugeThreshold" style="width: 160px;margin: 0 10px;" :placeholder="$t('chart.threshold_range')" size="mini" clearable @change="changeThreshold" />
+          <span>,100</span>
+          <el-tooltip class="item" effect="dark" placement="bottom">
+            <div slot="content">
+              阈值设置，决定仪表盘区间颜色，为空则不开启阈值，范围(0-100)，仅限整数，且逐级递增
+              <br>
+              例如：输入 30,70；表示：分为3段，分别为[0,30],(30,70],(70,100]
+            </div>
+            <i class="el-icon-info" style="cursor: pointer;margin-left: 10px;font-size: 12px;" />
+          </el-tooltip>
+        </el-form-item>
+      </el-form>
+    </el-col>
+  </div>
+</template>
+
+<script>
+import { DEFAULT_THRESHOLD } from '@/views/chart/chart/chart'
+
+export default {
+  name: 'Threshold',
+  props: {
+    chart: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      thresholdForm: JSON.parse(JSON.stringify(DEFAULT_THRESHOLD))
+    }
+  },
+  watch: {
+    'chart': {
+      handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.senior) {
+        let senior = null
+        if (Object.prototype.toString.call(chart.senior) === '[object Object]') {
+          senior = JSON.parse(JSON.stringify(chart.senior))
+        } else {
+          senior = JSON.parse(chart.senior)
+        }
+        if (senior.threshold) {
+          this.thresholdForm = senior.threshold
+        } else {
+          this.thresholdForm = JSON.parse(JSON.stringify(DEFAULT_THRESHOLD))
+        }
+      }
+    },
+    changeThreshold() {
+      // check input
+      if (this.thresholdForm.gaugeThreshold) {
+        const arr = this.thresholdForm.gaugeThreshold.split(',')
+        for (let i = 0; i < arr.length; i++) {
+          const ele = arr[i]
+          if (ele.indexOf('.') > -1 || parseInt(ele).toString() === 'NaN' || parseInt(ele) < 1 || parseInt(ele) > 99) {
+            this.$message({
+              message: this.$t('chart.gauge_threshold_format_error'),
+              type: 'error',
+              showClose: true
+            })
+            return
+          }
+        }
+      }
+      this.$emit('onThresholdChange', this.thresholdForm)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.shape-item{
+  padding: 6px;
+  border: none;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.form-item-slider>>>.el-form-item__label{
+  font-size: 12px;
+  line-height: 38px;
+}
+.form-item>>>.el-form-item__label{
+  font-size: 12px;
+}
+.el-select-dropdown__item{
+  padding: 0 20px;
+}
+span{
+  font-size: 12px
+}
+.el-form-item{
+  margin-bottom: 6px;
+}
+
+.switch-style{
+  position: absolute;
+  right: 10px;
+  margin-top: -4px;
+}
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
+</style>
diff --git a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue
new file mode 100644
index 0000000000..27b0449355
--- /dev/null
+++ b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-col>
+    <el-button icon="el-icon-plus" circle size="mini" style="margin-bottom: 10px;" @click="addLine" />
+    <div style="max-height: 50vh;overflow-y: auto;">
+      <el-row v-for="(item,index) in lineArr" :key="index" class="line-item">
+        <el-col :span="6">
+          <el-input v-model="item.name" class="value-item" :placeholder="$t('chart.name')" size="mini" clearable @change="changeAssistLine" />
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="item.field" size="mini" class="select-item" @change="changeAssistLine">
+            <el-option
+              v-for="opt in fieldOptions"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-input v-model="item.value" class="value-item" :placeholder="$t('chart.drag_block_label_value')" size="mini" clearable @change="changeAssistLine" />
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="item.lineType" size="mini" class="select-item" @change="changeAssistLine">
+            <el-option
+              v-for="opt in lineOptions"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="2" style="text-align: center;">
+          <el-color-picker v-model="item.color" class="color-picker-style" :predefine="predefineColors" @change="changeAssistLine" />
+        </el-col>
+        <el-col :span="2">
+          <el-button type="text" icon="el-icon-delete" circle style="float: right" @click="removeLine(index)" />
+        </el-col>
+      </el-row>
+    </div>
+  </el-col>
+</template>
+
+<script>
+import { COLOR_PANEL } from '@/views/chart/chart/chart'
+
+export default {
+  name: 'AssistLineEdit',
+  props: {
+    line: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      lineArr: [],
+      lineObj: {
+        name: '辅助线',
+        field: '0', // 固定值
+        axis: 'y', // 主轴
+        value: 0,
+        lineType: 'solid',
+        color: '#ff0000'
+      },
+      fieldOptions: [
+        { label: this.$t('chart.field_fixed'), value: '0' }
+      ],
+      lineOptions: [
+        { label: this.$t('chart.line_type_solid'), value: 'solid' },
+        { label: this.$t('chart.line_type_dashed'), value: 'dashed' },
+        { label: this.$t('chart.line_type_dotted'), value: 'dotted' }
+      ],
+      predefineColors: COLOR_PANEL
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.lineArr = JSON.parse(JSON.stringify(this.line))
+    },
+    addLine() {
+      this.lineArr.push(this.lineObj)
+      this.changeAssistLine()
+    },
+    removeLine(index) {
+      this.lineArr.splice(index, 1)
+      this.changeAssistLine()
+    },
+
+    changeAssistLine() {
+      this.$emit('onAssistLineChange', this.lineArr)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.line-item {
+  width: 100%;
+  border-radius: 4px;
+  border: 1px solid #DCDFE6;
+  padding: 4px 14px;
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: left;
+  align-items: center;
+}
+
+.form-item >>> .el-form-item__label {
+  font-size: 12px;
+}
+
+span {
+  font-size: 12px;
+}
+
+.value-item {
+  position: relative;
+  display: inline-block;
+  width: 120px !important;
+}
+
+.select-item {
+  position: relative;
+  display: inline-block;
+  width: 100px !important;
+}
+
+.el-select-dropdown__item {
+  padding: 0 20px;
+  font-size: 12px;
+}
+
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+  width: 28px;
+  height: 28px;
+  margin-top: 6px;
+}
+
+.color-picker-style >>> .el-color-picker__trigger{
+  width: 28px;
+  height: 28px;
+}
+</style>
diff --git a/frontend/src/views/chart/components/shape-attr/TotalCfg.vue b/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
new file mode 100644
index 0000000000..48e577833b
--- /dev/null
+++ b/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
@@ -0,0 +1,182 @@
+<template>
+  <div style="width: 100%">
+    <el-col>
+      <el-form ref="totalForm" :model="totalForm" label-width="80px" size="mini">
+        <el-divider content-position="center" class="divider-style">{{ $t('chart.row_cfg') }}</el-divider>
+        <el-form-item :label="$t('chart.total_show')" class="form-item">
+          <el-checkbox v-model="totalForm.row.showGrandTotals" @change="changeTotalCfg">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="totalForm.row.showGrandTotals">
+          <el-form-item :label="$t('chart.total_position')" class="form-item">
+            <el-radio-group v-model="totalForm.row.reverseLayout" @change="changeTotalCfg">
+              <el-radio :label="true">{{ $t('chart.total_pos_top') }}</el-radio>
+              <el-radio :label="false">{{ $t('chart.total_pos_bottom') }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('chart.total_label')" class="form-item">
+            <el-input v-model="totalForm.row.label" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg" />
+          </el-form-item>
+        </div>
+
+        <el-form-item :label="$t('chart.sub_total_show')" class="form-item">
+          <el-checkbox v-model="totalForm.row.showSubTotals" :disabled="rowNum < 2" @change="changeTotalCfg">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="totalForm.row.showSubTotals">
+          <el-form-item :label="$t('chart.total_position')" class="form-item">
+            <el-radio-group v-model="totalForm.row.reverseSubLayout" :disabled="rowNum < 2" @change="changeTotalCfg">
+              <el-radio :label="true">{{ $t('chart.total_pos_top') }}</el-radio>
+              <el-radio :label="false">{{ $t('chart.total_pos_bottom') }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('chart.total_label')" class="form-item">
+            <el-input v-model="totalForm.row.subLabel" :disabled="rowNum < 2" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg" />
+          </el-form-item>
+        </div>
+
+        <el-divider content-position="center" class="divider-style">{{ $t('chart.col_cfg') }}</el-divider>
+        <el-form-item :label="$t('chart.total_show')" class="form-item">
+          <el-checkbox v-model="totalForm.col.showGrandTotals" @change="changeTotalCfg">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="totalForm.col.showGrandTotals">
+          <el-form-item :label="$t('chart.total_position')" class="form-item">
+            <el-radio-group v-model="totalForm.col.reverseLayout" @change="changeTotalCfg">
+              <el-radio :label="true">{{ $t('chart.total_pos_left') }}</el-radio>
+              <el-radio :label="false">{{ $t('chart.total_pos_right') }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('chart.total_label')" class="form-item">
+            <el-input v-model="totalForm.col.label" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg" />
+          </el-form-item>
+        </div>
+
+        <el-form-item :label="$t('chart.sub_total_show')" class="form-item">
+          <el-checkbox v-model="totalForm.col.showSubTotals" :disabled="colNum < 2" @change="changeTotalCfg">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="totalForm.col.showSubTotals">
+          <el-form-item :label="$t('chart.total_position')" class="form-item">
+            <el-radio-group v-model="totalForm.col.reverseSubLayout" :disabled="colNum < 2" @change="changeTotalCfg">
+              <el-radio :label="true">{{ $t('chart.total_pos_left') }}</el-radio>
+              <el-radio :label="false">{{ $t('chart.total_pos_right') }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('chart.total_label')" class="form-item">
+            <el-input v-model="totalForm.col.subLabel" :disabled="colNum < 2" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-col>
+  </div>
+</template>
+
+<script>
+import { DEFAULT_TOTAL } from '@/views/chart/chart/chart'
+
+export default {
+  name: 'TotalCfg',
+  props: {
+    chart: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      totalForm: JSON.parse(JSON.stringify(DEFAULT_TOTAL))
+    }
+  },
+  computed: {
+    rowNum() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.xaxisExt) {
+        let arr = null
+        if (Object.prototype.toString.call(chart.xaxisExt) === '[object Object]') {
+          arr = JSON.parse(JSON.stringify(chart.xaxisExt))
+        } else {
+          arr = JSON.parse(chart.xaxisExt)
+        }
+        return arr.length
+      }
+      return 0
+    },
+    colNum() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.xaxis) {
+        let arr = null
+        if (Object.prototype.toString.call(chart.xaxis) === '[object Object]') {
+          arr = JSON.parse(JSON.stringify(chart.xaxis))
+        } else {
+          arr = JSON.parse(chart.xaxis)
+        }
+        return arr.length
+      }
+      return 0
+    }
+  },
+  watch: {
+    'chart': {
+      handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.customAttr) {
+        let customAttr = null
+        if (Object.prototype.toString.call(chart.customAttr) === '[object Object]') {
+          customAttr = JSON.parse(JSON.stringify(chart.customAttr))
+        } else {
+          customAttr = JSON.parse(chart.customAttr)
+        }
+        if (customAttr.totalCfg) {
+          this.totalForm = customAttr.totalCfg
+        } else {
+          this.totalForm = JSON.parse(JSON.stringify(DEFAULT_TOTAL))
+        }
+      }
+    },
+    changeTotalCfg() {
+      this.$emit('onTotalCfgChange', this.totalForm)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.shape-item{
+  padding: 6px;
+  border: none;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.form-item-slider>>>.el-form-item__label{
+  font-size: 12px;
+  line-height: 38px;
+}
+.form-item>>>.el-form-item__label{
+  font-size: 12px;
+}
+.el-select-dropdown__item{
+  padding: 0 20px;
+}
+span{font-size: 12px}
+
+.el-form-item{
+  margin-bottom: 6px;
+}
+.el-divider--horizontal {
+  margin: 10px 0
+}
+.divider-style>>>.el-divider__text{
+  color: #606266;
+  font-size: 12px;
+  font-weight: 400;
+  padding: 0 10px;
+}
+</style>
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 5b89b3b00c..ecf1bca916 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -308,7 +308,10 @@ import {
   DEFAULT_YAXIS_STYLE,
   DEFAULT_YAXIS_EXT_STYLE,
   DEFAULT_BACKGROUND_COLOR,
-  DEFAULT_SPLIT
+  DEFAULT_SPLIT,
+  DEFAULT_FUNCTION_CFG,
+  DEFAULT_THRESHOLD,
+  DEFAULT_TOTAL
 } from '../chart/chart'
 
 export default {
@@ -753,7 +756,8 @@ export default {
         tableColor: DEFAULT_COLOR_CASE,
         size: DEFAULT_SIZE,
         label: DEFAULT_LABEL,
-        tooltip: DEFAULT_TOOLTIP
+        tooltip: DEFAULT_TOOLTIP,
+        totalCfg: DEFAULT_TOTAL
       })
       view.customStyle = JSON.stringify({
         text: DEFAULT_TITLE_STYLE,
@@ -764,6 +768,11 @@ export default {
         background: DEFAULT_BACKGROUND_COLOR,
         split: DEFAULT_SPLIT
       })
+      view.senior = JSON.stringify({
+        functionCfg: DEFAULT_FUNCTION_CFG,
+        assistLine: [],
+        threshold: DEFAULT_THRESHOLD
+      })
       view.stylePriority = 'view' // 默认样式优先级视图
       view.xaxis = JSON.stringify([])
       view.xaxisExt = JSON.stringify([])
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index ac57e049cb..b1aab2e1fe 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -695,6 +695,18 @@
                       @onTooltipChange="onTooltipChange"
                     />
                   </el-collapse-item>
+                  <el-collapse-item
+                    v-show="view.type === 'table-pivot'"
+                    name="totalCfg"
+                    :title="$t('chart.total_cfg')"
+                  >
+                    <total-cfg
+                      :param="param"
+                      class="attr-selector"
+                      :chart="chart"
+                      @onTotalCfgChange="onTotalCfgChange"
+                    />
+                  </el-collapse-item>
                 </el-collapse>
               </el-row>
               <el-row>
@@ -829,6 +841,38 @@
             </div>
           </el-row>
         </el-tab-pane>
+        <el-tab-pane :label="$t('chart.senior')" class="padding-tab" style="width: 360px;">
+          <el-row class="view-panel">
+            <div
+              v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge'))"
+              style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;"
+              class="attr-style theme-border-class"
+            >
+              <el-row v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix'))">
+                <span class="padding-lr">{{ $t('chart.senior_cfg') }}</span>
+                <el-collapse v-model="attrActiveNames" class="style-collapse">
+                  <el-collapse-item name="function" :title="$t('chart.function_cfg')">
+                    <function-cfg :param="param" class="attr-selector" :chart="chart" @onFunctionCfgChange="onFunctionCfgChange" />
+                  </el-collapse-item>
+                </el-collapse>
+              </el-row>
+              <el-row v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge'))">
+                <span class="padding-lr">{{ $t('chart.analyse_cfg') }}</span>
+                <el-collapse v-model="styleActiveNames" class="style-collapse">
+                  <el-collapse-item v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix'))" name="analyse" :title="$t('chart.assist_line')">
+                    <assist-line :param="param" class="attr-selector" :chart="chart" @onAssistLineChange="onAssistLineChange" />
+                  </el-collapse-item>
+                  <el-collapse-item v-if="view.type && (view.type.includes('gauge'))" name="threshold" :title="$t('chart.threshold')">
+                    <threshold :param="param" class="attr-selector" :chart="chart" @onThresholdChange="onThresholdChange" />
+                  </el-collapse-item>
+                </el-collapse>
+              </el-row>
+            </div>
+            <div v-else class="no-senior">
+              {{ $t('chart.chart_no_senior') }}
+            </div>
+          </el-row>
+        </el-tab-pane>
       </el-tabs>
 
       <el-col v-if="editFrom==='view'" style="height: 100%;min-width: 500px;border-top: 1px solid #E6E6E6;">
@@ -1032,12 +1076,15 @@ import DatasetChartDetail from '../../dataset/common/DatasetChartDetail'
 import {
   DEFAULT_BACKGROUND_COLOR,
   DEFAULT_COLOR_CASE,
+  DEFAULT_FUNCTION_CFG,
   DEFAULT_LABEL,
   DEFAULT_LEGEND_STYLE,
   DEFAULT_SIZE,
   DEFAULT_SPLIT,
+  DEFAULT_THRESHOLD,
   DEFAULT_TITLE_STYLE,
   DEFAULT_TOOLTIP,
+  DEFAULT_TOTAL,
   DEFAULT_XAXIS_STYLE,
   DEFAULT_YAXIS_EXT_STYLE,
   DEFAULT_YAXIS_STYLE
@@ -1080,9 +1127,17 @@ import DimensionExtItem from '@/views/chart/components/drag-item/DimensionExtIte
 import PluginCom from '@/views/system/plugin/PluginCom'
 import { mapState } from 'vuex'
 
+import FunctionCfg from '@/views/chart/components/senior/FunctionCfg'
+import AssistLine from '@/views/chart/components/senior/AssistLine'
+import Threshold from '@/views/chart/components/senior/Threshold'
+import TotalCfg from '@/views/chart/components/shape-attr/TotalCfg'
 export default {
   name: 'ChartEdit',
   components: {
+    TotalCfg,
+    Threshold,
+    AssistLine,
+    FunctionCfg,
     DimensionExtItem,
     ChartComponentS2,
     CompareEdit,
@@ -1160,7 +1215,8 @@ export default {
           color: DEFAULT_COLOR_CASE,
           size: DEFAULT_SIZE,
           label: DEFAULT_LABEL,
-          tooltip: DEFAULT_TOOLTIP
+          tooltip: DEFAULT_TOOLTIP,
+          totalCfg: DEFAULT_TOTAL
         },
         customStyle: {
           text: DEFAULT_TITLE_STYLE,
@@ -1171,6 +1227,11 @@ export default {
           background: DEFAULT_BACKGROUND_COLOR,
           split: DEFAULT_SPLIT
         },
+        senior: {
+          functionCfg: DEFAULT_FUNCTION_CFG,
+          assistLine: [],
+          threshold: DEFAULT_THRESHOLD
+        },
         customFilter: [],
         render: 'antv',
         isPlugin: false
@@ -1489,6 +1550,7 @@ export default {
       view.extStack = JSON.stringify(view.extStack)
       view.drillFields = JSON.stringify(view.drillFields)
       view.extBubble = JSON.stringify(view.extBubble)
+      view.senior = JSON.stringify(view.senior)
       delete view.data
       return view
     },
@@ -1514,7 +1576,8 @@ export default {
     //   this.view.customAttr = view.customAttr ? JSON.parse(view.customAttr) : {}
     //   this.view.customStyle = view.customStyle ? JSON.parse(view.customStyle) : {}
     //   this.view.customFilter = view.customFilter ? JSON.parse(view.customFilter) : {}
-    //   // 将视图传入echart组件
+    // this.view.senior = view.senior ? JSON.parse(view.senior) : {}
+    // 将视图传入echart组件
     //   this.chart = response.data
     //   this.data = response.data.data
     //   // console.log(JSON.stringify(this.chart))
@@ -1555,6 +1618,7 @@ export default {
       view.customAttr = JSON.stringify(this.view.customAttr)
       view.customStyle = JSON.stringify(this.view.customStyle)
       view.customFilter = JSON.stringify(this.view.customFilter)
+      view.senior = JSON.stringify(this.view.senior)
       // view.data = this.data
       this.chart = view
 
@@ -1617,6 +1681,7 @@ export default {
           this.view.customAttr = this.view.customAttr ? JSON.parse(this.view.customAttr) : {}
           this.view.customStyle = this.view.customStyle ? JSON.parse(this.view.customStyle) : {}
           this.view.customFilter = this.view.customFilter ? JSON.parse(this.view.customFilter) : {}
+          this.view.senior = this.view.senior ? JSON.parse(this.view.senior) : {}
           // 将视图传入echart组件
           this.chart = response.data
           this.data = response.data.data
@@ -1661,6 +1726,7 @@ export default {
           this.view.customAttr = this.view.customAttr ? JSON.parse(this.view.customAttr) : {}
           this.view.customStyle = this.view.customStyle ? JSON.parse(this.view.customStyle) : {}
           this.view.customFilter = this.view.customFilter ? JSON.parse(this.view.customFilter) : {}
+          this.view.senior = this.view.senior ? JSON.parse(this.view.senior) : {}
 
           // 将视图传入echart组件
           this.chart = response.data
@@ -1739,6 +1805,11 @@ export default {
       this.calcStyle()
     },
 
+    onTotalCfgChange(val) {
+      this.view.customAttr.totalCfg = val
+      this.calcStyle()
+    },
+
     onChangeXAxisForm(val) {
       this.view.customStyle.xAxis = val
       this.calcStyle()
@@ -1764,6 +1835,21 @@ export default {
       this.calcStyle()
     },
 
+    onFunctionCfgChange(val) {
+      this.view.senior.functionCfg = val
+      this.calcStyle()
+    },
+
+    onAssistLineChange(val) {
+      this.view.senior.assistLine = val
+      this.calcStyle()
+    },
+
+    onThresholdChange(val) {
+      this.view.senior.threshold = val
+      this.calcStyle()
+    },
+
     showDimensionEditFilter(item) {
       this.dimensionItem = JSON.parse(JSON.stringify(item))
       this.dimensionFilterEdit = true
@@ -2680,4 +2766,14 @@ export default {
     width: 80px !important;
   }
 
+  .no-senior {
+    width: 100%;
+    text-align: center;
+    font-size: 12px;
+    padding-top: 40px;
+    overflow:auto;
+    border-right: 1px solid #e6e6e6;
+    height: 100%;
+  }
+
 </style>
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index 8906e24097..e5d13885fc 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -84,7 +84,7 @@ export default {
       height: 500,
       data: [],
       fields: [],
-      customType: ['db', 'sql', 'excel']
+      customType: ['db', 'sql', 'excel', 'api']
     }
   },
   watch: {
diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index 6861d36ce8..c117d87893 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -287,7 +287,7 @@ export default {
         cancelButtonText: this.$t('dataset.cancel'),
         type: 'warning'
       }).then(() => {
-        post('dataset/union/delete/' + item.id, {}).then(response => {
+        post('dataset/union/delete', item).then(response => {
           this.$message({
             type: 'success',
             message: this.$t('dataset.delete_success'),
diff --git a/mapFiles/full/110100.json b/mapFiles/full/110100.json
new file mode 100644
index 0000000000..2a7831c644
--- /dev/null
+++ b/mapFiles/full/110100.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"adcode":110000,"name":"北京市","center":[116.405285,39.904989],"centroid":[116.41995,40.18994],"childrenNum":16,"level":"province","acroutes":[100000],"parent":{"adcode":100000}},"geometry":{"type":"MultiPolygon","coordinates":[[[[117.223901,40.375538],[117.226661,40.378558],[117.229045,40.386843],[117.235382,40.389556],[117.23695,40.394078],[117.240694,40.394417],[117.240484,40.39763],[117.236616,40.400844],[117.237515,40.407786],[117.234085,40.417149],[117.243872,40.422848],[117.246737,40.426883],[117.257654,40.435372],[117.263342,40.442375],[117.252635,40.446038],[117.252154,40.450459],[117.243308,40.455428],[117.236532,40.456558],[117.233207,40.463204],[117.237243,40.468785],[117.230907,40.470463],[117.225783,40.47585],[117.22846,40.481301],[117.21792,40.494589],[117.212065,40.494685],[117.208426,40.498071],[117.208572,40.501102],[117.21449,40.50739],[117.212504,40.507906],[117.215013,40.513273],[117.219969,40.514321],[117.230405,40.511162],[117.239543,40.516723],[117.246821,40.511968],[117.255562,40.514934],[117.263133,40.513145],[117.264115,40.517271],[117.26146,40.51906],[117.255123,40.527973],[117.252007,40.53632],[117.247427,40.540236],[117.250606,40.542024],[117.24954,40.548179],[117.25964,40.552867],[117.268507,40.559842],[117.273191,40.561501],[117.279256,40.560342],[117.285592,40.565061],[117.299562,40.566801],[117.311837,40.578026],[117.325451,40.578155],[117.328442,40.575948],[117.334611,40.576464],[117.342767,40.581585],[117.350023,40.582197],[117.353014,40.578831],[117.365917,40.575965],[117.369221,40.57036],[117.375453,40.567799],[117.378422,40.56337],[117.389297,40.561244],[117.39465,40.567912],[117.400589,40.569345],[117.40358,40.574257],[117.413471,40.569893],[117.42123,40.569104],[117.429992,40.576126],[117.429804,40.579298],[117.423217,40.58144],[117.420623,40.590875],[117.421753,40.593178],[117.414747,40.600728],[117.412739,40.605123],[117.419954,40.617517],[117.430285,40.626014],[117.438002,40.625692],[117.442289,40.627977],[117.448876,40.62838],[117.45402,40.642844],[117.451448,40.646577],[117.456467,40.649167],[117.449106,40.651596],[117.462009,40.653076],[117.464309,40.648652],[117.467885,40.649521],[117.473093,40.644453],[117.475539,40.644421],[117.477986,40.635331],[117.486163,40.633496],[117.489948,40.636023],[117.500425,40.6362],[117.501972,40.644518],[117.505026,40.646142],[117.50283,40.653076],[117.513913,40.656196],[117.514583,40.660523],[117.502934,40.669674],[117.493357,40.67527],[117.484741,40.677087],[117.482399,40.679033],[117.471503,40.674338],[117.465188,40.673534],[117.453958,40.677618],[117.442226,40.676605],[117.437332,40.683599],[117.432711,40.681622],[117.426437,40.685304],[117.419348,40.68696],[117.414852,40.685947],[117.409226,40.687281],[117.397223,40.683776],[117.386996,40.684178],[117.378192,40.678808],[117.37058,40.679708],[117.359748,40.673919],[117.342411,40.673437],[117.336681,40.666956],[117.337622,40.664447],[117.331851,40.661504],[117.321164,40.658287],[117.290423,40.660185],[117.278608,40.664463],[117.278629,40.667551],[117.273401,40.670076],[117.267754,40.676669],[117.261397,40.681155],[117.256775,40.679467],[117.241635,40.676669],[117.234336,40.680577],[117.233207,40.683583],[117.218715,40.689484],[117.217335,40.69196],[117.210622,40.691976],[117.208405,40.694435],[117.202361,40.695577],[117.197802,40.694291],[117.193996,40.696268],[117.182453,40.697072],[117.180947,40.694082],[117.176639,40.693567],[117.169236,40.699097],[117.16474,40.699628],[117.159491,40.696332],[117.147571,40.698968],[117.142531,40.6972],[117.132493,40.698663],[117.128792,40.700913],[117.117792,40.700078],[117.110661,40.708243],[117.095144,40.705559],[117.086047,40.702055],[117.081153,40.702617],[117.076804,40.700029],[117.058338,40.70154],[117.054887,40.699804],[117.044494,40.700367],[117.036108,40.697265],[117.035585,40.694467],[117.031047,40.692136],[117.027848,40.694355],[117.018291,40.696011],[117.013418,40.694082],[117.005513,40.694853],[117.002481,40.697345],[116.990456,40.701203],[116.988177,40.703164],[116.979938,40.702826],[116.977533,40.705559],[116.969628,40.706362],[116.965111,40.709593],[116.96647,40.71525],[116.960134,40.721083],[116.946645,40.726916],[116.942714,40.729857],[116.940706,40.739786],[116.926548,40.744894],[116.923516,40.750596],[116.927908,40.757824],[116.923181,40.766897],[116.923391,40.773722],[116.904569,40.777286],[116.898589,40.77674],[116.895013,40.781733],[116.89495,40.790675],[116.896686,40.796438],[116.889073,40.798348],[116.886961,40.801076],[116.880207,40.804367],[116.882172,40.814172],[116.876735,40.818456],[116.876171,40.8212],[116.870378,40.821601],[116.861448,40.825356],[116.860633,40.830457],[116.855425,40.835447],[116.848587,40.837147],[116.84819,40.839313],[116.839741,40.839024],[116.837775,40.841542],[116.831815,40.842585],[116.828009,40.841109],[116.823471,40.842681],[116.820732,40.848263],[116.813622,40.848423],[116.805947,40.840836],[116.802496,40.842392],[116.802413,40.851198],[116.796996,40.854886],[116.797226,40.860034],[116.776795,40.878376],[116.772362,40.87852],[116.769392,40.882961],[116.762135,40.880765],[116.758539,40.881983],[116.759501,40.889854],[116.750257,40.891665],[116.739759,40.896665],[116.730432,40.897771],[116.726145,40.901185],[116.723678,40.906313],[116.716881,40.910175],[116.713347,40.910431],[116.717111,40.921695],[116.722318,40.92743],[116.713891,40.929416],[116.712197,40.934846],[116.70722,40.934029],[116.702786,40.936512],[116.702368,40.940628],[116.696178,40.94452],[116.689298,40.951118],[116.687248,40.962551],[116.677921,40.970972],[116.677921,40.975983],[116.681267,40.980737],[116.685304,40.982641],[116.682543,40.986259],[116.683066,41.000486],[116.69095,41.007254],[116.690866,41.012982],[116.693836,41.013686],[116.698855,41.021253],[116.695739,41.025396],[116.69509,41.033265],[116.691347,41.037503],[116.692246,41.040813],[116.688629,41.044651],[116.682878,41.041789],[116.67698,41.042732],[116.673279,41.046378],[116.665207,41.046682],[116.657009,41.051303],[116.653914,41.05626],[116.647431,41.059393],[116.641158,41.058322],[116.637937,41.060497],[116.630848,41.0608],[116.624093,41.054437],[116.61646,41.053382],[116.617736,41.048649],[116.613491,41.040782],[116.614118,41.036096],[116.617589,41.034704],[116.621228,41.028978],[116.62288,41.020693],[116.621897,41.015749],[116.619179,41.01423],[116.614892,41.003574],[116.617067,40.998725],[116.614515,40.983314],[116.597764,40.97475],[116.589692,40.976703],[116.574928,40.986307],[116.569177,40.991636],[116.561231,40.993461],[116.558617,40.988627],[116.547826,40.988003],[116.541991,40.99026],[116.535634,40.988675],[116.533417,40.985698],[116.524718,40.981073],[116.519573,40.981569],[116.51629,40.975198],[116.504516,40.975919],[116.496737,40.978432],[116.493726,40.977919],[116.485612,40.982465],[116.47894,40.979104],[116.474193,40.978608],[116.464135,40.984498],[116.455519,40.980481],[116.451713,40.968667],[116.453302,40.964584],[116.447446,40.95384],[116.454829,40.949533],[116.455372,40.945433],[116.462315,40.935231],[116.461541,40.932684],[116.467209,40.931322],[116.468422,40.925091],[116.473608,40.91974],[116.477581,40.901746],[116.474047,40.896008],[116.464344,40.896329],[116.458676,40.900592],[116.45073,40.901345],[116.448492,40.899919],[116.436614,40.89939],[116.430905,40.903364],[116.418922,40.902339],[116.413715,40.899758],[116.404764,40.905736],[116.398533,40.906024],[116.396316,40.911264],[116.39274,40.913123],[116.384877,40.922848],[116.384019,40.928535],[116.379732,40.933228],[116.379941,40.935775],[116.370343,40.943655],[116.364801,40.942999],[116.358925,40.93608],[116.35012,40.936048],[116.339894,40.929416],[116.338828,40.925732],[116.334122,40.920829],[116.33544,40.910495],[116.334436,40.90463],[116.342236,40.899887],[116.344683,40.894694],[116.353864,40.887786],[116.360514,40.884885],[116.365972,40.880188],[116.366599,40.876645],[116.374881,40.871531],[116.38174,40.863465],[116.389707,40.861814],[116.391778,40.854838],[116.399306,40.850492],[116.406145,40.837933],[116.406458,40.833361],[116.414991,40.829318],[116.422477,40.822772],[116.436823,40.820735],[116.439897,40.815038],[116.440002,40.809133],[116.450981,40.801927],[116.452152,40.798059],[116.457233,40.7983],[116.461416,40.78854],[116.460663,40.78244],[116.465849,40.774525],[116.465452,40.772742],[116.45395,40.76587],[116.444414,40.76921],[116.437722,40.766865],[116.431846,40.768246],[116.424861,40.767443],[116.416496,40.76937],[116.4143,40.777912],[116.407838,40.780417],[116.403217,40.778635],[116.392635,40.778394],[116.379837,40.772325],[116.37097,40.772453],[116.367687,40.77088],[116.361204,40.772646],[116.353111,40.770221],[116.342947,40.773096],[116.33314,40.772694],[116.330149,40.77377],[116.31756,40.77218],[116.313168,40.770205],[116.30794,40.763734],[116.311119,40.75511],[116.30794,40.752122],[116.304762,40.755656],[116.29786,40.756812],[116.290918,40.763814],[116.281402,40.763926],[116.277366,40.76163],[116.273456,40.762883],[116.274167,40.766335],[116.26988,40.770703],[116.269587,40.777158],[116.261013,40.782938],[116.257834,40.787898],[116.247943,40.791831],[116.245224,40.78838],[116.235019,40.78313],[116.235625,40.775135],[116.231757,40.77149],[116.229979,40.762417],[116.23366,40.759896],[116.223308,40.753793],[116.220485,40.749183],[116.220359,40.744669],[116.213249,40.740139],[116.210551,40.741713],[116.204717,40.739946],[116.2057,40.733038],[116.197753,40.7269],[116.192274,40.724779],[116.184913,40.713675],[116.181128,40.712438],[116.177907,40.707889],[116.176213,40.700544],[116.171341,40.695979],[116.173683,40.689034],[116.171487,40.68167],[116.168413,40.67892],[116.167597,40.672633],[116.162683,40.662437],[116.151432,40.663338],[116.142858,40.666972],[116.13694,40.667648],[116.125229,40.654089],[116.113225,40.648845],[116.111531,40.646287],[116.112744,40.640946],[116.120419,40.633287],[116.122071,40.629989],[116.118349,40.627961],[116.1044,40.626996],[116.098879,40.630584],[116.088507,40.626626],[116.08583,40.623825],[116.076691,40.619883],[116.073492,40.612125],[116.069811,40.610258],[116.062722,40.610322],[116.058289,40.607006],[116.050907,40.606121],[116.04457,40.602032],[116.032357,40.599875],[116.030036,40.597364],[116.028509,40.607328],[116.025268,40.60654],[116.005109,40.584097],[115.996116,40.58392],[115.995238,40.579862],[115.982147,40.579008],[115.97512,40.590779],[115.971983,40.60237],[115.965877,40.601002],[115.967404,40.605896],[115.955107,40.609534],[115.948331,40.608809],[115.944672,40.611095],[115.935031,40.613316],[115.928297,40.612753],[115.920372,40.616632],[115.907803,40.617291],[115.897849,40.608101],[115.894733,40.606878],[115.888146,40.597026],[115.885406,40.595223],[115.867777,40.595786],[115.86623,40.593371],[115.854895,40.590151],[115.846175,40.593049],[115.827374,40.587027],[115.820662,40.568234],[115.82154,40.563305],[115.819804,40.559343],[115.815036,40.55741],[115.804915,40.55865],[115.79908,40.5577],[115.7922,40.561292],[115.784713,40.558376],[115.776327,40.552158],[115.773902,40.548582],[115.770179,40.548002],[115.763885,40.540574],[115.759577,40.538914],[115.75506,40.540042],[115.752968,40.536288],[115.755624,40.531019],[115.748702,40.526087],[115.743788,40.518464],[115.743098,40.513854],[115.73605,40.503988],[115.743077,40.494959],[115.744039,40.498249],[115.768088,40.498345],[115.774529,40.493911],[115.782204,40.492073],[115.776202,40.482704],[115.776683,40.477511],[115.771559,40.47285],[115.770367,40.46493],[115.772856,40.462301],[115.779527,40.464075],[115.7734,40.457397],[115.77547,40.45204],[115.77248,40.452831],[115.773546,40.44812],[115.77043,40.444166],[115.786679,40.437066],[115.78992,40.432483],[115.796884,40.432531],[115.796445,40.426834],[115.836555,40.38568],[115.837454,40.381255],[115.840633,40.381094],[115.846865,40.375085],[115.855962,40.37712],[115.861859,40.373422],[115.861922,40.364811],[115.85981,40.36213],[115.86441,40.36192],[115.864452,40.359335],[115.872754,40.359593],[115.876226,40.362146],[115.878066,40.359367],[115.883169,40.359545],[115.88526,40.357024],[115.890927,40.357897],[115.892997,40.355554],[115.909539,40.357622],[115.918301,40.35389],[115.920581,40.346473],[115.924094,40.341059],[115.921417,40.338668],[115.922881,40.332898],[115.92721,40.329601],[115.922672,40.325899],[115.926792,40.319611],[115.929239,40.32105],[115.935721,40.316717],[115.937185,40.313047],[115.943814,40.310945],[115.939757,40.304397],[115.945885,40.296199],[115.946115,40.289034],[115.950088,40.289228],[115.951698,40.282015],[115.955212,40.276984],[115.960231,40.274914],[115.961611,40.269219],[115.967006,40.265612],[115.968888,40.264269],[115.965605,40.259415],[115.960001,40.256648],[115.950276,40.256163],[115.942706,40.253557],[115.935826,40.25558],[115.916984,40.247068],[115.916628,40.242391],[115.911965,40.234477],[115.906695,40.23412],[115.898079,40.236419],[115.898476,40.234509],[115.891994,40.228147],[115.891366,40.225379],[115.883106,40.216119],[115.885072,40.212039],[115.883169,40.209594],[115.886326,40.206663],[115.877313,40.200849],[115.87633,40.193918],[115.873695,40.192687],[115.870308,40.186079],[115.863072,40.186095],[115.855502,40.188865],[115.848099,40.183843],[115.854205,40.179939],[115.846865,40.169458],[115.844418,40.168016],[115.84676,40.163171],[115.853557,40.154162],[115.853348,40.149332],[115.846384,40.147096],[115.834234,40.15024],[115.83576,40.145426],[115.829047,40.149981],[115.822272,40.152606],[115.806567,40.153254],[115.802091,40.156754],[115.789837,40.168939],[115.78693,40.170414],[115.787014,40.178708],[115.773023,40.176197],[115.768213,40.165553],[115.762212,40.16262],[115.754328,40.163252],[115.749539,40.152995],[115.75485,40.145459],[115.749246,40.137711],[115.741111,40.132216],[115.734126,40.129379],[115.724841,40.128812],[115.715891,40.133383],[115.708697,40.134291],[115.699746,40.132394],[115.704765,40.129655],[115.711039,40.128941],[115.712064,40.126899],[115.702172,40.128196],[115.697216,40.12672],[115.693096,40.131924],[115.68699,40.13053],[115.681197,40.13267],[115.678667,40.130935],[115.657734,40.128098],[115.654806,40.131276],[115.64458,40.126639],[115.641882,40.120819],[115.643722,40.117511],[115.635943,40.115793],[115.631468,40.117852],[115.625048,40.116295],[115.621388,40.118711],[115.616223,40.117138],[115.606979,40.120057],[115.599116,40.120008],[115.59485,40.116279],[115.594432,40.108982],[115.592403,40.110182],[115.590709,40.096397],[115.584038,40.094889],[115.578538,40.096365],[115.576196,40.100825],[115.567769,40.096543],[115.563419,40.097922],[115.553736,40.091661],[115.555472,40.082626],[115.552168,40.079252],[115.544263,40.07591],[115.537885,40.077775],[115.527324,40.076072],[115.514944,40.066937],[115.509695,40.065477],[115.510427,40.062913],[115.500954,40.052478],[115.488323,40.046132],[115.488992,40.043746],[115.478557,40.036165],[115.468414,40.031896],[115.460656,40.032172],[115.454528,40.029704],[115.452082,40.02079],[115.442169,40.010885],[115.442817,40.007345],[115.449196,40.001985],[115.450346,39.993247],[115.443905,39.994644],[115.436815,39.991427],[115.428513,39.984328],[115.427635,39.979471],[115.423411,39.969819],[115.426924,39.965302],[115.423745,39.955697],[115.42615,39.95035],[115.43577,39.950919],[115.438468,39.95256],[115.444595,39.951358],[115.447042,39.948806],[115.452312,39.948188],[115.456787,39.944271],[115.464462,39.940142],[115.472387,39.93876],[115.48069,39.93585],[115.487277,39.923835],[115.494994,39.917948],[115.50386,39.915818],[115.52013,39.902547],[115.523016,39.898919],[115.509026,39.884164],[115.51003,39.88148],[115.516659,39.880406],[115.526299,39.875655],[115.529185,39.875948],[115.527345,39.869862],[115.521929,39.868186],[115.522368,39.858779],[115.515948,39.847678],[115.510992,39.84509],[115.514505,39.83835],[115.526509,39.835241],[115.530482,39.829916],[115.534957,39.830714],[115.546396,39.825992],[115.548027,39.822703],[115.563461,39.816417],[115.569274,39.813274],[115.566367,39.809788],[115.566577,39.804609],[115.56229,39.803713],[115.554866,39.795601],[115.539432,39.794754],[115.536275,39.792131],[115.513815,39.788693],[115.508712,39.784082],[115.497336,39.791088],[115.49238,39.796057],[115.483241,39.798679],[115.475859,39.791821],[115.45777,39.782143],[115.452751,39.781964],[115.443382,39.785646],[115.434076,39.782274],[115.431169,39.775756],[115.425209,39.77336],[115.427029,39.769775],[115.430918,39.772073],[115.435414,39.769938],[115.434411,39.763859],[115.439158,39.752678],[115.457728,39.744918],[115.46672,39.740451],[115.470568,39.742391],[115.482321,39.742473],[115.492108,39.73887],[115.488866,39.733163],[115.491229,39.714719],[115.493404,39.707494],[115.490247,39.701409],[115.492631,39.701719],[115.49926,39.696189],[115.499783,39.691278],[115.496395,39.685665],[115.494408,39.686481],[115.488783,39.681619],[115.489724,39.678012],[115.486733,39.673362],[115.491334,39.668694],[115.482593,39.66303],[115.477971,39.654216],[115.478515,39.650331],[115.494659,39.649237],[115.496771,39.652551],[115.506705,39.652127],[115.511493,39.644388],[115.515864,39.641237],[115.522452,39.639964],[115.520423,39.633416],[115.521699,39.622311],[115.523414,39.620384],[115.514358,39.613508],[115.512121,39.605129],[115.515948,39.591193],[115.518834,39.593072],[115.518311,39.597156],[115.524229,39.598937],[115.530586,39.602874],[115.533891,39.608608],[115.533263,39.611434],[115.539119,39.616285],[115.545978,39.618751],[115.551875,39.614064],[115.55451,39.609408],[115.564569,39.605619],[115.567267,39.599623],[115.573875,39.596552],[115.571867,39.591569],[115.586109,39.589412],[115.592445,39.59665],[115.598719,39.597761],[115.599785,39.600865],[115.605285,39.600032],[115.6125,39.601126],[115.618439,39.604067],[115.625947,39.599394],[115.632555,39.597695],[115.634688,39.603871],[115.641589,39.603332],[115.643576,39.598937],[115.650268,39.600996],[115.657273,39.600081],[115.665304,39.605325],[115.667583,39.609637],[115.667479,39.615256],[115.673271,39.608526],[115.685317,39.603675],[115.68929,39.599035],[115.689269,39.592941],[115.694226,39.587778],[115.693431,39.580327],[115.697906,39.579248],[115.698596,39.570586],[115.694393,39.56941],[115.692072,39.565781],[115.698722,39.563248],[115.710161,39.563019],[115.717104,39.560403],[115.72022,39.554747],[115.7216,39.543499],[115.726953,39.543908],[115.726765,39.548143],[115.739124,39.545363],[115.73879,39.539314],[115.741487,39.536289],[115.743934,39.526771],[115.752508,39.515453],[115.759451,39.513916],[115.765328,39.514848],[115.768736,39.508878],[115.770828,39.510971],[115.767419,39.515862],[115.776537,39.512722],[115.777917,39.513834],[115.785006,39.51035],[115.792681,39.510742],[115.821456,39.509499],[115.828692,39.507045],[115.829487,39.512885],[115.822146,39.514145],[115.819762,39.518528],[115.824447,39.518774],[115.824112,39.522405],[115.819804,39.524923],[115.819219,39.530762],[115.822753,39.530533],[115.824321,39.534212],[115.828399,39.535455],[115.828692,39.541309],[115.84216,39.54157],[115.846028,39.543287],[115.847555,39.550284],[115.851361,39.550448],[115.855481,39.554993],[115.862026,39.548551],[115.866041,39.549843],[115.866355,39.546361],[115.872315,39.546099],[115.873298,39.548829],[115.88296,39.54811],[115.883587,39.551102],[115.887686,39.55066],[115.888752,39.555614],[115.89306,39.556219],[115.893416,39.561875],[115.890028,39.567873],[115.896009,39.569916],[115.907866,39.566876],[115.91276,39.572842],[115.911777,39.574182],[115.915604,39.582958],[115.908744,39.58402],[115.909665,39.588284],[115.9068,39.590016],[115.910187,39.600832],[115.912488,39.599149],[115.923759,39.597287],[115.924178,39.59384],[115.930221,39.593382],[115.929991,39.589935],[115.934174,39.588072],[115.934969,39.581814],[115.938105,39.581699],[115.937938,39.577467],[115.943187,39.577385],[115.943083,39.574672],[115.949147,39.573299],[115.950423,39.56637],[115.954982,39.566092],[115.957554,39.560927],[115.963409,39.565503],[115.967592,39.564604],[115.968909,39.570995],[115.974576,39.570832],[115.978153,39.572842],[115.977086,39.590931],[115.978445,39.595686],[115.990993,39.593791],[115.990721,39.586471],[115.996953,39.583203],[115.995196,39.577075],[116.007618,39.577205],[116.010588,39.583023],[116.013703,39.583039],[116.014038,39.588072],[116.020667,39.585981],[116.02623,39.587402],[116.024766,39.575604],[116.032859,39.574607],[116.032964,39.572302],[116.039237,39.571943],[116.098817,39.575146],[116.102016,39.576143],[116.101368,39.580049],[116.105801,39.576568],[116.106282,39.570979],[116.11379,39.570668],[116.116634,39.574002],[116.121465,39.574917],[116.121528,39.570554],[116.130311,39.569459],[116.130373,39.567743],[116.138425,39.568887],[116.13878,39.571044],[116.149613,39.573087],[116.151788,39.583415],[116.165527,39.583562],[116.176924,39.585899],[116.177071,39.590016],[116.184432,39.590915],[116.190768,39.589396],[116.19058,39.587386],[116.196854,39.588987],[116.196394,39.586095],[116.201726,39.586373],[116.206243,39.583219],[116.208105,39.577728],[116.221175,39.578921],[116.225817,39.568151],[116.229373,39.565471],[116.236462,39.568396],[116.234684,39.563934],[116.240644,39.564098],[116.243007,39.55836],[116.246186,39.557167],[116.242505,39.552966],[116.246521,39.539788],[116.245601,39.53014],[116.248256,39.530271],[116.246479,39.525299],[116.24353,39.524236],[116.246709,39.520098],[116.245831,39.514897],[116.253861,39.510055],[116.25706,39.505491],[116.257939,39.500518],[116.269315,39.495495],[116.275631,39.495201],[116.279269,39.491306],[116.283201,39.493941],[116.305284,39.489179],[116.306957,39.485023],[116.312708,39.480556],[116.314779,39.476104],[116.319944,39.473436],[116.320048,39.468543],[116.325088,39.466153],[116.325611,39.462961],[116.334499,39.457019],[116.350162,39.45291],[116.351124,39.455529],[116.362187,39.454874],[116.367791,39.451633],[116.373563,39.452058],[116.388557,39.450732],[116.391903,39.452893],[116.399787,39.450044],[116.408947,39.450257],[116.425635,39.446885],[116.434397,39.442758],[116.437241,39.445951],[116.450353,39.448522],[116.450667,39.452648],[116.454682,39.453302],[116.453992,39.45751],[116.448638,39.465122],[116.448764,39.476284],[116.444059,39.47887],[116.444142,39.482192],[116.436258,39.482912],[116.433644,39.478183],[116.428333,39.476219],[116.425342,39.481259],[116.429964,39.481325],[116.427329,39.487788],[116.423544,39.485154],[116.412376,39.482077],[116.411582,39.485105],[116.415827,39.48823],[116.418504,39.496575],[116.422895,39.496608],[116.418734,39.506391],[116.40857,39.508011],[116.407253,39.512116],[116.40282,39.51439],[116.402652,39.526886],[116.405538,39.528194],[116.411247,39.524678],[116.421473,39.525103],[116.424046,39.522732],[116.423125,39.516337],[116.424631,39.509728],[116.431699,39.51053],[116.433017,39.507438],[116.443829,39.509875],[116.442741,39.516189],[116.440378,39.516271],[116.439876,39.523353],[116.437513,39.52651],[116.440985,39.527311],[116.45372,39.526477],[116.453846,39.528652],[116.464553,39.527638],[116.464595,39.531628],[116.468819,39.534359],[116.478188,39.535487],[116.47802,39.543205],[116.475134,39.545756],[116.470952,39.5546],[116.473378,39.553096],[116.48948,39.553472],[116.489773,39.550268],[116.508448,39.551053],[116.50805,39.560256],[116.510581,39.560502],[116.511564,39.565503],[116.519385,39.566484],[116.520389,39.57191],[116.527248,39.57294],[116.52614,39.577271],[116.520389,39.577156],[116.519699,39.581863],[116.52317,39.586242],[116.521267,39.590229],[116.525052,39.593807],[116.524446,39.596535],[116.530615,39.598774],[116.530866,39.596715],[116.541803,39.59348],[116.540883,39.60142],[116.544124,39.603609],[116.544187,39.596519],[116.549436,39.596143],[116.557132,39.601502],[116.562276,39.601714],[116.566605,39.604361],[116.566103,39.61114],[116.569637,39.61176],[116.565978,39.616138],[116.565936,39.61978],[116.579382,39.619666],[116.579194,39.623487],[116.591993,39.621299],[116.593561,39.618588],[116.600128,39.619649],[116.602177,39.624533],[116.607886,39.624696],[116.607781,39.619698],[116.611755,39.618882],[116.613177,39.613802],[116.616648,39.614096],[116.616857,39.607301],[116.620182,39.606893],[116.620517,39.601665],[116.628338,39.599558],[116.635407,39.599934],[116.635595,39.604818],[116.645549,39.60209],[116.646532,39.599117],[116.657678,39.60075],[116.6568,39.602776],[116.662384,39.60521],[116.670037,39.604916],[116.669975,39.603381],[116.6889,39.598496],[116.694087,39.601355],[116.696408,39.595392],[116.699127,39.595457],[116.700695,39.590964],[116.705108,39.587974],[116.727065,39.593055],[116.724953,39.598006],[116.718324,39.601077],[116.718282,39.603021],[116.702577,39.610421],[116.700737,39.62107],[116.705338,39.621462],[116.70929,39.618114],[116.716149,39.62156],[116.721858,39.621756],[116.725518,39.624075],[116.730202,39.622932],[116.730516,39.619143],[116.737877,39.61537],[116.744004,39.616824],[116.748689,39.619943],[116.762616,39.613819],[116.774202,39.605439],[116.774892,39.599166],[116.778196,39.593382],[116.785055,39.593497],[116.785474,39.596209],[116.790702,39.596045],[116.789384,39.602596],[116.792835,39.602155],[116.790012,39.610535],[116.802078,39.6123],[116.809711,39.614521],[116.81954,39.618996],[116.823994,39.617183],[116.82504,39.613884],[116.835391,39.617004],[116.834116,39.621495],[116.838445,39.62223],[116.826357,39.633122],[116.82893,39.635163],[116.826901,39.638217],[116.834555,39.641841],[116.833572,39.644127],[116.840766,39.644241],[116.839135,39.647523],[116.85141,39.652845],[116.849946,39.667552],[116.860486,39.667258],[116.863979,39.670391],[116.87318,39.671387],[116.883239,39.675352],[116.891144,39.67408],[116.906661,39.677425],[116.905197,39.681651],[116.909024,39.682859],[116.902896,39.690576],[116.88991,39.687656],[116.887819,39.690952],[116.89336,39.693187],[116.893841,39.695879],[116.886376,39.707004],[116.887108,39.714311],[116.8828,39.71847],[116.887589,39.725515],[116.89976,39.726168],[116.90229,39.729413],[116.911533,39.731516],[116.916678,39.731353],[116.916364,39.73587],[116.912934,39.73569],[116.910718,39.740989],[116.914461,39.741755],[116.913185,39.745962],[116.907163,39.75597],[116.901558,39.755204],[116.901809,39.763615],[116.908292,39.766711],[116.910613,39.762278],[116.920902,39.769107],[116.91649,39.775935],[116.921718,39.780628],[116.933784,39.781801],[116.939284,39.781361],[116.945788,39.777369],[116.94974,39.778542],[116.948004,39.785369],[116.953797,39.78607],[116.950828,39.791528],[116.938301,39.793124],[116.934809,39.801139],[116.942881,39.801677],[116.92979,39.811368],[116.92818,39.814153],[116.92887,39.820912],[116.9259,39.835403],[116.917431,39.846913],[116.910383,39.850608],[116.902813,39.848248],[116.902896,39.841346],[116.907581,39.834117],[116.903357,39.830682],[116.897501,39.832587],[116.885665,39.844585],[116.878304,39.84522],[116.878638,39.842257],[116.871507,39.842062],[116.866049,39.843902],[116.865505,39.846913],[116.85829,39.84846],[116.85254,39.859056],[116.847249,39.858616],[116.839407,39.865777],[116.836897,39.864736],[116.827277,39.877071],[116.823681,39.879137],[116.817009,39.878649],[116.81312,39.881301],[116.812304,39.889712],[116.80831,39.889631],[116.808247,39.884913],[116.804253,39.88488],[116.804148,39.877933],[116.794738,39.881252],[116.787084,39.886833],[116.7847,39.89142],[116.78424,39.902221],[116.78217,39.910419],[116.782358,39.928273],[116.78332,39.936045],[116.782567,39.947554],[116.78058,39.949716],[116.762826,39.956006],[116.757326,39.961483],[116.759605,39.969933],[116.766443,39.976351],[116.766757,39.982281],[116.775373,39.992759],[116.775749,40.002943],[116.770459,40.011632],[116.771755,40.014474],[116.777485,40.027204],[116.77782,40.032448],[116.781542,40.034818],[116.790221,40.034477],[116.789531,40.032318],[116.800259,40.028844],[116.803375,40.032155],[116.815295,40.030905],[116.82,40.028357],[116.820816,40.038779],[116.823158,40.039834],[116.822739,40.046473],[116.831732,40.048485],[116.831502,40.051196],[116.849486,40.051926],[116.850197,40.054977],[116.857809,40.051894],[116.867826,40.041863],[116.873619,40.041522],[116.88075,40.046164],[116.890265,40.04597],[116.90137,40.047723],[116.906431,40.051423],[116.914252,40.052592],[116.917974,40.044704],[116.924164,40.047463],[116.928096,40.054929],[116.931693,40.052024],[116.938824,40.050887],[116.937632,40.046911],[116.945014,40.048631],[116.945265,40.041425],[116.961932,40.051358],[116.964902,40.047836],[116.969293,40.048583],[116.972095,40.036977],[116.985626,40.038828],[116.991837,40.036896],[117.00016,40.032253],[117.000683,40.029915],[117.011369,40.031246],[117.018061,40.030467],[117.020884,40.032448],[117.024836,40.03011],[117.023916,40.033746],[117.028517,40.033957],[117.027032,40.038828],[117.033159,40.04235],[117.038639,40.049378],[117.051437,40.051163],[117.053382,40.052884],[117.052022,40.059375],[117.061182,40.060105],[117.064382,40.062783],[117.070634,40.064179],[117.069652,40.06757],[117.081049,40.068819],[117.080986,40.065087],[117.085064,40.068592],[117.085608,40.075131],[117.103927,40.075585],[117.107775,40.071805],[117.119507,40.072421],[117.128896,40.06546],[117.139227,40.064049],[117.15625,40.069338],[117.160139,40.075553],[117.158466,40.077435],[117.172227,40.074157],[117.175593,40.071642],[117.183603,40.072081],[117.186426,40.076202],[117.181533,40.080095],[117.18538,40.083875],[117.189207,40.082853],[117.191842,40.072973],[117.198576,40.070101],[117.197572,40.067748],[117.205247,40.07028],[117.208175,40.076834],[117.203616,40.076704],[117.204285,40.079657],[117.213989,40.086243],[117.21104,40.090785],[117.211249,40.096608],[117.224487,40.094662],[117.224403,40.098619],[117.228606,40.100257],[117.229025,40.103533],[117.236009,40.108382],[117.238226,40.111755],[117.245357,40.113215],[117.249268,40.116474],[117.255541,40.113279],[117.260393,40.114155],[117.266834,40.112177],[117.269908,40.107198],[117.274362,40.105804],[117.276663,40.109307],[117.275659,40.113636],[117.285425,40.121322],[117.297094,40.118857],[117.297073,40.121273],[117.302991,40.125926],[117.307613,40.136982],[117.313761,40.139964],[117.318571,40.138522],[117.323276,40.14071],[117.33093,40.13575],[117.330617,40.133691],[117.349082,40.136528],[117.351404,40.139932],[117.35636,40.140904],[117.356883,40.145037],[117.350525,40.144827],[117.355272,40.148587],[117.351717,40.150564],[117.360626,40.156965],[117.357343,40.164273],[117.351111,40.171661],[117.353746,40.17367],[117.359413,40.173346],[117.364014,40.176683],[117.368844,40.17299],[117.372023,40.176538],[117.377021,40.176327],[117.381225,40.172455],[117.380597,40.17691],[117.393186,40.174901],[117.391618,40.177607],[117.401217,40.183617],[117.404751,40.183244],[117.4077,40.187504],[117.397704,40.192914],[117.388356,40.188249],[117.38409,40.187828],[117.384382,40.195278],[117.381455,40.194906],[117.379552,40.201319],[117.393145,40.203376],[117.385679,40.207894],[117.378443,40.21029],[117.377586,40.218612],[117.39373,40.221656],[117.390029,40.227969],[117.386829,40.227111],[117.373989,40.232777],[117.36027,40.23255],[117.355691,40.229556],[117.351613,40.229459],[117.348246,40.234574],[117.345464,40.234946],[117.343457,40.242909],[117.339881,40.246194],[117.342202,40.256502],[117.337622,40.263266],[117.337999,40.265903],[117.334005,40.285654],[117.331244,40.289665],[117.32336,40.284441],[117.316794,40.285104],[117.316835,40.281999],[117.304309,40.278181],[117.29632,40.2781],[117.292368,40.286236],[117.294647,40.290894],[117.293309,40.296748],[117.285739,40.302214],[117.274342,40.308552],[117.274697,40.314405],[117.271853,40.319853],[117.271288,40.325285],[117.274969,40.331944],[117.267127,40.335694],[117.259828,40.336195],[117.261125,40.338781],[117.257089,40.341463],[117.25437,40.351191],[117.254182,40.357105],[117.250188,40.358381],[117.247762,40.364101],[117.242283,40.369981],[117.237055,40.370627],[117.22618,40.369044],[117.223901,40.375538]]]]}}]}
diff --git a/mapFiles/full/120100.json b/mapFiles/full/120100.json
new file mode 100644
index 0000000000..a31bde712d
--- /dev/null
+++ b/mapFiles/full/120100.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[117.805291,39.373299],[117.803377,39.362037],[117.806771,39.35694],[117.816451,39.354341],[117.821012,39.356107],[117.833204,39.356311],[117.837032,39.350823],[117.853228,39.360729],[117.848096,39.367116],[117.852074,39.369613],[117.854749,39.366555],[117.853242,39.362971],[117.860668,39.364806],[117.862935,39.362274],[117.853337,39.351656],[117.84997,39.342361],[117.846155,39.342854],[117.841933,39.336414],[117.847974,39.332233],[117.846875,39.328494],[117.849644,39.327372],[117.855753,39.329225],[117.855319,39.331995],[117.861347,39.334187],[117.867266,39.329853],[117.878534,39.331808],[117.888553,39.331893],[117.893019,39.327372],[117.892164,39.323072],[117.902618,39.320471],[117.90574,39.316136],[117.910315,39.319519],[117.933421,39.319043],[117.939476,39.317598],[117.947377,39.317785],[117.951654,39.315405],[117.966044,39.316425],[117.972276,39.314351],[117.97252,39.309965],[117.977625,39.300665],[117.982675,39.298676],[117.983761,39.295513],[117.992137,39.296669],[117.995206,39.29354],[117.995708,39.288796],[118.006406,39.28951],[118.016846,39.284119],[118.022222,39.286959],[118.024733,39.292435],[118.028412,39.290411],[118.031698,39.285394],[118.028426,39.27769],[118.035309,39.274679],[118.033408,39.271566],[118.036829,39.265034],[118.063656,39.256834],[118.064782,39.255932],[118.065611,39.235427],[118.064742,39.231206],[118.037074,39.230526],[118.034875,39.218593],[118.032838,39.219887],[117.977421,39.205944],[117.973267,39.188797],[117.964605,39.172684],[117.925697,39.151405],[117.871651,39.122586],[117.859039,39.106509],[117.84644,39.088416],[117.840426,39.073782],[117.837385,39.057012],[117.839055,39.032865],[117.847418,39.010724],[117.850717,38.992914],[117.852536,38.963022],[117.855346,38.95764],[117.897907,38.948618],[117.899088,38.94156],[117.892422,38.925066],[117.875574,38.920365],[117.859514,38.888988],[117.861075,38.881514],[117.859908,38.871695],[117.847377,38.85563],[117.834072,38.855254],[117.821949,38.857238],[117.778479,38.869078],[117.768677,38.86398],[117.752196,38.847502],[117.689217,38.837097],[117.657734,38.836172],[117.646086,38.829103],[117.646439,38.788849],[117.654463,38.778299],[117.671527,38.771995],[117.729076,38.764782],[117.73638,38.761373],[117.741267,38.753936],[117.740751,38.700026],[117.738783,38.689102],[117.729062,38.680062],[117.656716,38.660488],[117.649222,38.6545],[117.642231,38.64326],[117.639027,38.626714],[117.582143,38.61856],[117.557802,38.613804],[117.55453,38.617015],[117.546887,38.617856],[117.542271,38.611796],[117.538565,38.609735],[117.541443,38.603571],[117.529143,38.600772],[117.524201,38.601253],[117.526903,38.60661],[117.523224,38.606353],[117.523821,38.611624],[117.516436,38.610353],[117.511603,38.613942],[117.505358,38.613993],[117.502914,38.617908],[117.495393,38.615521],[117.478925,38.617238],[117.481505,38.611538],[117.476061,38.608894],[117.471513,38.611246],[117.432428,38.601321],[117.415553,38.590623],[117.410041,38.593937],[117.401203,38.588012],[117.409213,38.585144],[117.396302,38.574563],[117.369041,38.564753],[117.368865,38.582464],[117.354746,38.580747],[117.358045,38.570543],[117.350782,38.565819],[117.350483,38.561523],[117.346424,38.564925],[117.32492,38.564616],[117.315403,38.557692],[117.308289,38.555578],[117.305628,38.556609],[117.30408,38.564616],[117.299926,38.571471],[117.291591,38.571677],[117.292215,38.562417],[117.278938,38.56008],[117.265389,38.55673],[117.263543,38.562279],[117.253184,38.55618],[117.246491,38.566867],[117.245079,38.566935],[117.239432,38.57872],[117.24231,38.578737],[117.262348,38.583735],[117.261303,38.586724],[117.238359,38.581039],[117.237816,38.585264],[117.245351,38.595311],[117.256673,38.598351],[117.255126,38.602455],[117.259538,38.603056],[117.25894,38.608327],[117.255967,38.613804],[117.246532,38.618663],[117.237246,38.619212],[117.235115,38.62395],[117.230689,38.624002],[117.236608,38.631211],[117.225055,38.630782],[117.229671,38.635657],[117.230336,38.641698],[117.225109,38.643861],[117.216909,38.642917],[117.212972,38.63969],[117.210284,38.630044],[117.203225,38.629684],[117.203795,38.626439],[117.200238,38.62189],[117.189309,38.621358],[117.186092,38.616534],[117.183852,38.618182],[117.176602,38.618234],[117.167113,38.615126],[117.165334,38.617238],[117.15112,38.617719],[117.150835,38.609323],[117.147577,38.606627],[117.138264,38.603932],[117.136431,38.598728],[117.124606,38.599931],[117.12166,38.597698],[117.119542,38.589661],[117.109483,38.589111],[117.109849,38.584869],[117.098201,38.586896],[117.097468,38.590708],[117.093001,38.594435],[117.097074,38.595517],[117.096871,38.600411],[117.087232,38.599862],[117.086336,38.60637],[117.071551,38.607383],[117.070085,38.616757],[117.064261,38.635708],[117.060501,38.635708],[117.060759,38.639107],[117.055586,38.639261],[117.051717,38.6435],[117.056319,38.644976],[117.056048,38.654191],[117.06198,38.674385],[117.068157,38.680646],[117.063257,38.68044],[117.063379,38.682961],[117.054351,38.684265],[117.052871,38.686718],[117.04459,38.68622],[117.045377,38.692549],[117.039064,38.688467],[117.039281,38.694435],[117.041644,38.701603],[117.045268,38.70577],[117.042309,38.70649],[117.015741,38.700403],[117.014464,38.689942],[117.002938,38.690422],[116.992838,38.692274],[116.994454,38.695721],[116.951173,38.689582],[116.947209,38.689616],[116.945594,38.685877],[116.930823,38.685757],[116.926805,38.687438],[116.92732,38.680062],[116.917722,38.679616],[116.921225,38.686923],[116.910364,38.685568],[116.903291,38.681915],[116.896069,38.680285],[116.877293,38.680697],[116.875596,38.682687],[116.875501,38.693166],[116.871903,38.701878],[116.875162,38.712629],[116.87284,38.716143],[116.866487,38.717],[116.870138,38.729892],[116.86745,38.745882],[116.86035,38.744974],[116.859115,38.741307],[116.812916,38.744323],[116.796543,38.746688],[116.791221,38.74506],[116.791221,38.740055],[116.78404,38.738342],[116.784515,38.740518],[116.778867,38.740621],[116.775025,38.742798],[116.76635,38.741941],[116.762807,38.750544],[116.758938,38.754879],[116.746299,38.754245],[116.747018,38.76288],[116.751308,38.7802],[116.742321,38.780834],[116.742769,38.78402],[116.737338,38.784482],[116.741425,38.796214],[116.745769,38.795751],[116.746095,38.798594],[116.74076,38.799228],[116.744018,38.805324],[116.738479,38.807053],[116.745253,38.816744],[116.746244,38.824636],[116.749082,38.82443],[116.751199,38.831277],[116.74376,38.831568],[116.743081,38.834923],[116.746027,38.851455],[116.723124,38.852533],[116.722337,38.89706],[116.708028,38.897026],[116.708136,38.931852],[116.709996,38.931937],[116.710186,38.93903],[116.716228,38.938962],[116.718359,38.942978],[116.722622,38.956529],[116.723043,38.966592],[116.725364,38.966456],[116.728609,38.975356],[116.734895,38.977867],[116.735329,38.980617],[116.740366,38.980839],[116.745457,38.991411],[116.750521,38.994007],[116.752394,39.003467],[116.754607,39.003228],[116.756331,39.01308],[116.75496,39.019123],[116.759087,39.021189],[116.759359,39.031636],[116.751715,39.034503],[116.751742,39.038958],[116.756616,39.050306],[116.760743,39.050562],[116.773016,39.046876],[116.774835,39.050425],[116.77884,39.049419],[116.781379,39.053446],[116.781596,39.058462],[116.786809,39.059332],[116.787325,39.061925],[116.797181,39.060253],[116.796136,39.056329],[116.785017,39.055698],[116.783347,39.050187],[116.7878,39.052678],[116.797073,39.054418],[116.802679,39.050903],[116.818984,39.050937],[116.821984,39.046757],[116.831474,39.049521],[116.842145,39.049385],[116.860445,39.050562],[116.860309,39.053531],[116.871645,39.054674],[116.869921,39.059622],[116.873722,39.060544],[116.86988,39.06991],[116.877809,39.072588],[116.881474,39.071718],[116.882818,39.077944],[116.886606,39.077279],[116.890638,39.084852],[116.894195,39.084323],[116.896707,39.091674],[116.901893,39.090974],[116.906047,39.103099],[116.909549,39.103065],[116.911097,39.111044],[116.919283,39.109237],[116.923696,39.118614],[116.926112,39.119636],[116.919786,39.119943],[116.918455,39.12354],[116.923804,39.124],[116.918998,39.138573],[116.91536,39.138266],[116.914002,39.146157],[116.909251,39.150758],[116.893964,39.154728],[116.870071,39.153654],[116.865808,39.157522],[116.865713,39.173468],[116.863106,39.174967],[116.864328,39.182052],[116.863201,39.185816],[116.863174,39.201364],[116.860771,39.205604],[116.857051,39.205382],[116.855789,39.215682],[116.871659,39.217691],[116.875623,39.216483],[116.874591,39.230066],[116.879397,39.230049],[116.880307,39.225624],[116.883551,39.226202],[116.884651,39.221232],[116.887855,39.224449],[116.892634,39.223939],[116.890502,39.22753],[116.891941,39.231155],[116.8859,39.232738],[116.884923,39.24055],[116.882425,39.238661],[116.876628,39.240924],[116.875772,39.253839],[116.878759,39.255371],[116.871645,39.269287],[116.876329,39.270342],[116.874754,39.283166],[116.872392,39.291279],[116.86688,39.290768],[116.863215,39.292673],[116.862549,39.297485],[116.866907,39.298029],[116.867939,39.302518],[116.884217,39.305392],[116.882085,39.313722],[116.887081,39.314334],[116.88943,39.323106],[116.887068,39.332182],[116.889851,39.332692],[116.889606,39.338164],[116.881597,39.340662],[116.875772,39.339184],[116.872378,39.34124],[116.870967,39.346881],[116.872664,39.352777],[116.876071,39.352675],[116.874605,39.356328],[116.870749,39.357484],[116.860242,39.354188],[116.861586,39.349549],[116.857757,39.347612],[116.849164,39.339473],[116.847127,39.343755],[116.842932,39.340713],[116.829193,39.338861],[116.823138,39.357891],[116.83351,39.360423],[116.834922,39.365961],[116.826872,39.363617],[116.820627,39.366623],[116.818143,39.37352],[116.823749,39.372942],[116.837597,39.374097],[116.836959,39.377885],[116.841167,39.381519],[116.837923,39.391115],[116.839728,39.394035],[116.835099,39.397041],[116.834108,39.402678],[116.839226,39.40463],[116.838153,39.410436],[116.840081,39.413645],[116.844303,39.412542],[116.85196,39.413849],[116.852517,39.416853],[116.860771,39.424237],[116.864599,39.425204],[116.864314,39.430517],[116.87098,39.427377],[116.875881,39.434556],[116.868903,39.43722],[116.862848,39.43683],[116.855504,39.443346],[116.847181,39.441395],[116.847263,39.438663],[116.840244,39.439647],[116.832506,39.435489],[116.827075,39.438612],[116.826763,39.445671],[116.81574,39.451728],[116.810323,39.450795],[116.807431,39.44562],[116.799883,39.449641],[116.795973,39.446842],[116.792335,39.453883],[116.797969,39.450625],[116.79805,39.457344],[116.794425,39.461195],[116.791629,39.460838],[116.790149,39.465385],[116.785099,39.465894],[116.788859,39.472017],[116.799109,39.473408],[116.798498,39.475579],[116.811232,39.477546],[116.810716,39.480311],[116.820722,39.482397],[116.817274,39.496573],[116.811015,39.500829],[116.816405,39.501609],[116.813988,39.510289],[116.825677,39.512306],[116.823098,39.52734],[116.825636,39.527171],[116.821998,39.534458],[116.818373,39.533001],[116.819609,39.52851],[116.815672,39.529578],[116.806209,39.528849],[116.803019,39.530374],[116.801919,39.536712],[116.798471,39.536458],[116.795267,39.54576],[116.787502,39.548742],[116.78909,39.555756],[116.792375,39.556231],[116.791561,39.559754],[116.798104,39.566716],[116.796883,39.567885],[116.807227,39.571476],[116.808463,39.576489],[116.81164,39.576963],[116.800277,39.586091],[116.797901,39.594371],[116.804485,39.597893],[116.8083,39.597402],[116.803671,39.601381],[116.805232,39.603378],[116.799869,39.604005],[116.80982,39.608677],[116.807255,39.60458],[116.808164,39.60045],[116.813948,39.600145],[116.81206,39.60453],[116.81574,39.606561],[116.812386,39.615922],[116.819527,39.619002],[116.82398,39.617175],[116.825039,39.613874],[116.835398,39.617005],[116.834121,39.621491],[116.838439,39.622218],[116.82637,39.633134],[116.828922,39.635148],[116.826899,39.63821],[116.834556,39.641848],[116.833565,39.644116],[116.84076,39.644251],[116.839145,39.647533],[116.851404,39.652845],[116.849951,39.667545],[116.860486,39.667258],[116.863826,39.670336],[116.873166,39.671384],[116.883226,39.675359],[116.891154,39.674073],[116.906658,39.677422],[116.905205,39.68165],[116.90902,39.682867],[116.905952,39.687923],[116.91259,39.689225],[116.911287,39.695379],[116.916867,39.699352],[116.916921,39.706385],[116.932425,39.706672],[116.934828,39.703545],[116.937679,39.706402],[116.950848,39.706825],[116.952667,39.699657],[116.948377,39.702818],[116.944575,39.695143],[116.944141,39.686807],[116.951458,39.678149],[116.945471,39.67661],[116.945689,39.670792],[116.957513,39.666243],[116.955341,39.658665],[116.957744,39.651069],[116.964369,39.643591],[116.971388,39.648887],[116.975352,39.644843],[116.974565,39.636789],[116.977036,39.636366],[116.989919,39.641493],[117.004405,39.644505],[117.00788,39.648582],[117.015768,39.654063],[117.033131,39.65068],[117.04087,39.647956],[117.057066,39.644572],[117.078597,39.637906],[117.088277,39.633489],[117.10093,39.629648],[117.103278,39.625163],[117.112374,39.624402],[117.112659,39.621372],[117.127064,39.616971],[117.125109,39.621914],[117.136078,39.618072],[117.140083,39.620949],[117.147875,39.622608],[117.154161,39.626043],[117.150278,39.628633],[117.154989,39.631374],[117.157949,39.636603],[117.172828,39.636755],[117.173005,39.641205],[117.177892,39.642965],[117.177675,39.645621],[117.169068,39.648159],[117.169258,39.651797],[117.164017,39.651746],[117.163461,39.6588],[117.158899,39.661236],[117.159605,39.666852],[117.164655,39.666699],[117.166135,39.672974],[117.170113,39.673363],[117.16771,39.686875],[117.170357,39.689259],[117.168294,39.70816],[117.170697,39.708295],[117.169149,39.713535],[117.164289,39.711828],[117.163569,39.715817],[117.169203,39.717592],[117.166312,39.722189],[117.160705,39.720803],[117.158858,39.723389],[117.153184,39.722729],[117.155288,39.729236],[117.15374,39.736316],[117.160501,39.736468],[117.160365,39.739019],[117.166122,39.738022],[117.161872,39.748126],[117.173072,39.751876],[117.184734,39.75191],[117.186934,39.755795],[117.192825,39.754984],[117.194957,39.759832],[117.201745,39.7599],[117.205899,39.763852],[117.192242,39.775793],[117.180621,39.782463],[117.178734,39.795345],[117.167764,39.799667],[117.157501,39.79673],[117.157148,39.806757],[117.161669,39.807027],[117.156333,39.817491],[117.159089,39.821862],[117.162524,39.817829],[117.167194,39.819213],[117.167153,39.823736],[117.190531,39.826368],[117.195079,39.825491],[117.19216,39.833084],[117.199858,39.834586],[117.200672,39.832595],[117.207352,39.834991],[117.208438,39.831397],[117.21247,39.832308],[117.220113,39.830637],[117.22067,39.827195],[117.226236,39.830958],[117.237382,39.833911],[117.25723,39.829794],[117.252234,39.834603],[117.25556,39.842667],[117.259959,39.843393],[117.247455,39.861054],[117.239798,39.860447],[117.236893,39.855792],[117.230852,39.856905],[117.227797,39.852772],[117.220045,39.856551],[117.213189,39.856264],[117.211615,39.859519],[117.199125,39.862302],[117.192377,39.862117],[117.185739,39.866434],[117.180105,39.86527],[117.181042,39.869217],[117.177851,39.870886],[117.175584,39.866839],[117.168429,39.866687],[117.166841,39.868947],[117.173833,39.873062],[117.17052,39.877513],[117.168158,39.873028],[117.164642,39.872809],[117.16285,39.876586],[117.157759,39.878744],[117.153672,39.875625],[117.152152,39.877463],[117.15841,39.889316],[117.149124,39.896279],[117.150564,39.902061],[117.157582,39.904589],[117.158831,39.909207],[117.144767,39.911567],[117.142513,39.918797],[117.136716,39.919639],[117.137422,39.921645],[117.149871,39.92424],[117.146396,39.933136],[117.150726,39.936034],[117.155044,39.934147],[117.156863,39.938039],[117.146952,39.947271],[117.151039,39.944862],[117.158641,39.950774],[117.16452,39.952071],[117.166407,39.955373],[117.164873,39.963137],[117.172407,39.96307],[117.175937,39.959112],[117.17967,39.965596],[117.178625,39.977282],[117.188115,39.978797],[117.191142,39.981828],[117.190898,39.986475],[117.19812,39.992737],[117.195744,40.003948],[117.197672,40.010596],[117.193219,40.016772],[117.194088,40.021568],[117.187802,40.025858],[117.188318,40.032555],[117.186811,40.041875],[117.188712,40.047779],[117.183404,40.053026],[117.181775,40.059014],[117.184069,40.062579],[117.192025,40.061486],[117.192364,40.066279],[117.202532,40.064967],[117.209307,40.065791],[117.217873,40.064395],[117.22291,40.066648],[117.219733,40.071121],[117.215117,40.073677],[117.213027,40.07941],[117.209782,40.082235],[117.215117,40.085093],[117.211031,40.090775],[117.211262,40.096607],[117.22443,40.094624],[117.22439,40.098557],[117.228612,40.100255],[117.229019,40.103465],[117.235997,40.108389],[117.238224,40.11175],[117.245364,40.113229],[117.249261,40.116489],[117.255533,40.113279],[117.260393,40.114153],[117.266828,40.11217],[117.269923,40.107196],[117.274363,40.105801],[117.276657,40.109313],[117.275422,40.113464],[117.285414,40.121328],[117.297102,40.118858],[117.297062,40.121261],[117.302994,40.125931],[117.30761,40.136969],[117.31376,40.139959],[117.318566,40.138514],[117.323277,40.140715],[117.330934,40.135759],[117.330608,40.133693],[117.349071,40.136515],[117.351393,40.139925],[117.356348,40.140916],[117.356891,40.145048],[117.350524,40.144813],[117.355275,40.148592],[117.351719,40.150557],[117.360624,40.156973],[117.357339,40.16426],[117.351121,40.171665],[117.353741,40.17368],[117.362878,40.172152],[117.364018,40.176685],[117.368838,40.172991],[117.372028,40.176534],[117.377024,40.176316],[117.381219,40.172454],[117.380595,40.176903],[117.393193,40.174905],[117.391618,40.177608],[117.40123,40.183618],[117.404746,40.183232],[117.407692,40.187496],[117.397714,40.192917],[117.388346,40.188251],[117.384097,40.187832],[117.384382,40.195267],[117.381545,40.194797],[117.379563,40.198926],[117.382346,40.204565],[117.383446,40.20235],[117.393152,40.20339],[117.385686,40.207888],[117.378436,40.210304],[117.377594,40.21861],[117.393723,40.221663],[117.390016,40.227971],[117.397551,40.235168],[117.403009,40.233423],[117.405357,40.230185],[117.411561,40.235604],[117.415363,40.236862],[117.412647,40.24352],[117.41615,40.248921],[117.426739,40.248082],[117.42997,40.246539],[117.434179,40.248116],[117.438849,40.252996],[117.45028,40.252476],[117.458589,40.248183],[117.461439,40.248351],[117.472843,40.243185],[117.474106,40.241105],[117.481097,40.241726],[117.484071,40.235302],[117.488985,40.232534],[117.499194,40.230957],[117.505005,40.227216],[117.514318,40.227719],[117.524011,40.229632],[117.527134,40.228978],[117.546629,40.23292],[117.550905,40.228038],[117.554476,40.229682],[117.564264,40.229045],[117.569491,40.225455],[117.571649,40.219247],[117.569178,40.213895],[117.564467,40.211009],[117.563992,40.205236],[117.56926,40.204162],[117.57283,40.200319],[117.572246,40.194915],[117.575545,40.191894],[117.57317,40.190031],[117.576401,40.178599],[117.579673,40.177961],[117.584112,40.171766],[117.588633,40.168307],[117.60119,40.171212],[117.609974,40.160079],[117.613137,40.157779],[117.618595,40.157611],[117.618459,40.15133],[117.621527,40.14656],[117.630501,40.147836],[117.632334,40.140782],[117.63695,40.136851],[117.636013,40.132097],[117.650159,40.128183],[117.648516,40.126402],[117.653146,40.110758],[117.657558,40.109162],[117.650254,40.105246],[117.648313,40.098607],[117.644878,40.096204],[117.649589,40.091279],[117.657802,40.092741],[117.660802,40.097431],[117.663694,40.096439],[117.668106,40.100927],[117.674541,40.092153],[117.674908,40.082134],[117.67932,40.085664],[117.688253,40.082857],[117.690928,40.094187],[117.696467,40.094926],[117.703947,40.092237],[117.707884,40.094002],[117.711753,40.085849],[117.722003,40.079898],[117.730529,40.080554],[117.733868,40.077393],[117.744566,40.07862],[117.751639,40.081999],[117.755576,40.079545],[117.758454,40.07329],[117.753391,40.073324],[117.7543,40.068666],[117.758196,40.065959],[117.767808,40.066077],[117.769247,40.061688],[117.776144,40.05893],[117.772967,40.051782],[117.767116,40.047997],[117.758291,40.044347],[117.747906,40.047459],[117.746915,40.034439],[117.743738,40.031276],[117.744783,40.027928],[117.744145,40.018438],[117.755834,40.010394],[117.758454,40.012985],[117.757884,40.018135],[117.760654,40.020659],[117.76736,40.018943],[117.770347,40.023553],[117.782443,40.02352],[117.784154,40.015308],[117.785919,40.017916],[117.791946,40.015577],[117.791756,40.012464],[117.797064,40.010141],[117.792951,40.005631],[117.796467,39.996676],[117.791512,39.993747],[117.786665,39.981272],[117.787222,39.973477],[117.7819,39.966354],[117.772153,39.970193],[117.769071,39.969233],[117.763545,39.972719],[117.756445,39.965175],[117.752114,39.966084],[117.74162,39.973342],[117.733923,39.971119],[117.727718,39.972433],[117.723958,39.979959],[117.719437,39.979892],[117.711264,39.984842],[117.706689,39.98602],[117.695693,39.985751],[117.688986,39.984017],[117.68566,39.979488],[117.68209,39.979858],[117.674731,39.974807],[117.663219,39.974756],[117.657504,39.972163],[117.638049,39.972231],[117.631886,39.968711],[117.620007,39.970665],[117.611427,39.975278],[117.615622,39.978781],[117.615337,39.982535],[117.610924,39.982619],[117.603037,39.987754],[117.599643,39.993747],[117.592529,39.994673],[117.589244,39.996861],[117.584641,39.994135],[117.578912,39.993848],[117.57579,39.996424],[117.570604,39.995111],[117.566653,39.990987],[117.562132,39.992872],[117.563028,39.995666],[117.547063,39.998932],[117.544307,39.994454],[117.537492,39.997383],[117.537709,39.989977],[117.546289,39.981424],[117.547335,39.976844],[117.538945,39.970766],[117.536284,39.961537],[117.534424,39.961588],[117.532917,39.952493],[117.527283,39.952358],[117.524323,39.946647],[117.519612,39.948433],[117.514956,39.946681],[117.511141,39.941071],[117.512472,39.933675],[117.525504,39.929615],[117.522056,39.924796],[117.521961,39.920634],[117.514386,39.921442],[117.503484,39.918999],[117.504665,39.915696],[117.513625,39.916673],[117.512743,39.910522],[117.514359,39.906831],[117.507435,39.909055],[117.503932,39.904875],[117.50719,39.904168],[117.510082,39.893817],[117.516829,39.895166],[117.518811,39.891289],[117.521038,39.871375],[117.529808,39.860987],[117.534139,39.851962],[117.53718,39.85284],[117.544728,39.844591],[117.545746,39.848032],[117.548556,39.845535],[117.548108,39.839917],[117.543099,39.838163],[117.544334,39.833017],[117.537275,39.835159],[117.540859,39.82193],[117.548842,39.824073],[117.558426,39.811517],[117.56144,39.800038],[117.568242,39.799245],[117.560395,39.795008],[117.554652,39.795379],[117.554869,39.788727],[117.553118,39.784506],[117.548624,39.781027],[117.54614,39.776147],[117.554842,39.771419],[117.550376,39.762957],[117.546126,39.763667],[117.539162,39.76044],[117.543316,39.760626],[117.548774,39.756809],[117.555453,39.762552],[117.559824,39.755542],[117.56759,39.756792],[117.573536,39.754917],[117.575016,39.752113],[117.581424,39.748937],[117.595896,39.746132],[117.591524,39.743024],[117.59743,39.736586],[117.593411,39.735201],[117.589936,39.737938],[117.587845,39.730841],[117.584003,39.731669],[117.583447,39.727326],[117.577623,39.726938],[117.578166,39.72327],[117.585171,39.722087],[117.580053,39.719451],[117.588443,39.719485],[117.592339,39.716747],[117.59352,39.710746],[117.602439,39.705371],[117.614902,39.705979],[117.620957,39.702953],[117.627134,39.703646],[117.634479,39.700959],[117.636909,39.696783],[117.642597,39.70133],[117.646969,39.69964],[117.648978,39.694838],[117.643968,39.688684],[117.649915,39.685404],[117.650797,39.68192],[117.657436,39.682816],[117.653214,39.678217],[117.660205,39.674462],[117.657028,39.668644],[117.663857,39.665854],[117.668324,39.667088],[117.667536,39.661574],[117.663586,39.657751],[117.66774,39.651526],[117.665337,39.64618],[117.666477,39.642914],[117.661997,39.636332],[117.6532,39.639158],[117.651503,39.634843],[117.652928,39.630003],[117.650892,39.627939],[117.643805,39.629699],[117.641986,39.628413],[117.64462,39.623691],[117.640113,39.619713],[117.641348,39.612841],[117.632144,39.613738],[117.630324,39.606121],[117.6245,39.602684],[117.620034,39.606476],[117.619056,39.603209],[117.621935,39.591679],[117.62651,39.594287],[117.632198,39.602346],[117.636827,39.6037],[117.637153,39.59769],[117.63938,39.593118],[117.651014,39.594168],[117.655779,39.588174],[117.655711,39.585329],[117.650702,39.579233],[117.655657,39.574914],[117.660816,39.575388],[117.67165,39.582044],[117.673795,39.589021],[117.681642,39.589986],[117.685877,39.588191],[117.693602,39.581045],[117.705861,39.576489],[117.708576,39.573796],[117.70825,39.568732],[117.704069,39.565378],[117.697295,39.564785],[117.688796,39.569223],[117.685674,39.56443],[117.689597,39.559517],[117.695774,39.557315],[117.703689,39.557501],[117.708441,39.555079],[117.708712,39.548217],[117.707192,39.543405],[117.708848,39.538085],[117.715948,39.530086],[117.723496,39.535119],[117.732945,39.536102],[117.738036,39.540423],[117.744878,39.548624],[117.736081,39.560822],[117.735783,39.567631],[117.737737,39.57405],[117.748177,39.574423],[117.753133,39.576015],[117.755155,39.58113],[117.747879,39.58941],[117.767713,39.59901],[117.775424,39.599129],[117.78934,39.597199],[117.793928,39.601059],[117.801952,39.60177],[117.817374,39.595489],[117.826565,39.590816],[117.839354,39.58963],[117.847051,39.591137],[117.851395,39.589258],[117.8535,39.592306],[117.857342,39.592035],[117.86827,39.596843],[117.8841,39.590121],[117.892585,39.59151],[117.899821,39.589512],[117.914849,39.582942],[117.930068,39.578149],[117.933992,39.574152],[117.931127,39.568173],[117.924787,39.563312],[117.917931,39.554621],[117.917117,39.548319],[117.913302,39.542151],[117.909813,39.541965],[117.909813,39.537983],[117.905387,39.535102],[117.905292,39.53012],[117.91041,39.528001],[117.909446,39.523171],[117.912691,39.521425],[117.912284,39.516154],[117.909053,39.512001],[117.898585,39.509695],[117.897038,39.489299],[117.892395,39.487043],[117.896522,39.485721],[117.899726,39.476885],[117.898192,39.472509],[117.888322,39.469167],[117.886313,39.466776],[117.878072,39.4672],[117.874081,39.454918],[117.870334,39.454952],[117.871854,39.411557],[117.847078,39.408077],[117.848137,39.401948],[117.859378,39.403289],[117.862501,39.39716],[117.860491,39.384661],[117.865704,39.378276],[117.858034,39.373486],[117.8524,39.380772],[117.849305,39.37904],[117.838973,39.37729],[117.820999,39.376917],[117.805291,39.373299]],[[117.765555,39.400657],[117.737289,39.410555],[117.699738,39.407601],[117.702331,39.388924],[117.673197,39.386665],[117.670808,39.405275],[117.669097,39.412015],[117.663748,39.412389],[117.655006,39.40974],[117.656295,39.407499],[117.64348,39.405853],[117.64185,39.400165],[117.635823,39.398501],[117.635103,39.404477],[117.631668,39.404308],[117.630976,39.408535],[117.614128,39.407109],[117.614305,39.411065],[117.611305,39.413017],[117.611087,39.417108],[117.60138,39.419484],[117.601788,39.416412],[117.597145,39.415037],[117.590642,39.405462],[117.575518,39.404206],[117.571133,39.404613],[117.571486,39.400318],[117.56869,39.397244],[117.560327,39.396497],[117.560924,39.393033],[117.553688,39.392575],[117.557883,39.385595],[117.552874,39.382572],[117.543981,39.381248],[117.545135,39.377953],[117.538931,39.377324],[117.535333,39.374012],[117.537261,39.363684],[117.534166,39.36241],[117.529428,39.366657],[117.526183,39.365604],[117.528545,39.36134],[117.520875,39.357229],[117.529279,39.347408],[117.533636,39.348954],[117.536229,39.338045],[117.569749,39.342616],[117.595285,39.349124],[117.597511,39.34508],[117.606947,39.346966],[117.609227,39.34316],[117.616667,39.344418],[117.617332,39.338079],[117.635307,39.343789],[117.642108,39.344367],[117.642163,39.339269],[117.637547,39.335972],[117.642556,39.331655],[117.646466,39.322732],[117.650811,39.32212],[117.650811,39.315201],[117.66383,39.316867],[117.669315,39.324142],[117.670944,39.35784],[117.687547,39.359217],[117.692204,39.357959],[117.706201,39.35152],[117.744607,39.354595],[117.784575,39.377002],[117.782362,39.39463],[117.765555,39.400657]]]},"properties":{"adcode":120000,"name":"天津市","center":[117.190182,39.125596],"centroid":[117.347043,39.288036],"childrenNum":16,"level":"province","acroutes":[100000],"parent":"{ \"adcode\": 100000 }"}}]}
diff --git a/mapFiles/full/310100.json b/mapFiles/full/310100.json
new file mode 100644
index 0000000000..953e6faa43
--- /dev/null
+++ b/mapFiles/full/310100.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"adcode":310000,"name":"上海市","center":[121.472644,31.231706],"centroid":[121.438737,31.072559],"childrenNum":16,"level":"province","acroutes":[100000],"parent":{"adcode":100000}},"geometry":{"type":"MultiPolygon","coordinates":[[[[121.153743,31.276646],[121.150392,31.275437],[121.142996,31.275473],[121.142885,31.277664],[121.141161,31.276742],[121.137601,31.277592],[121.138032,31.278753],[121.131678,31.281363],[121.131053,31.280106],[121.127215,31.281207],[121.124323,31.283111],[121.125018,31.284404],[121.120361,31.286151],[121.11929,31.285122],[121.114994,31.285265],[121.111115,31.281746],[121.106666,31.276706],[121.103829,31.27533],[121.105442,31.273654],[121.09881,31.276251],[121.095404,31.287001],[121.093096,31.28821],[121.090134,31.291909],[121.086909,31.291717],[121.087326,31.290664],[121.084698,31.2876],[121.081361,31.277257],[121.084545,31.275713],[121.082154,31.271535],[121.080416,31.270158],[121.072741,31.26914],[121.068695,31.268098],[121.063245,31.267907],[121.061952,31.257945],[121.060979,31.246486],[121.057669,31.246749],[121.061646,31.24524],[121.064343,31.246138],[121.063565,31.242222],[121.063898,31.238438],[121.061243,31.237827],[121.062605,31.234689],[121.06458,31.232965],[121.067388,31.232929],[121.06718,31.230917],[121.064649,31.230785],[121.064719,31.227275],[121.0628,31.226964],[121.062633,31.224664],[121.065608,31.211871],[121.067805,31.201005],[121.069209,31.196524],[121.066609,31.197183],[121.06679,31.194966],[121.069599,31.195314],[121.070113,31.193612],[121.072185,31.193169],[121.07256,31.191527],[121.070614,31.1913],[121.07035,31.188735],[121.071684,31.185955],[121.068751,31.184889],[121.069474,31.182888],[121.074993,31.184386],[121.075591,31.182852],[121.071225,31.181462],[121.071406,31.179472],[121.074229,31.176225],[121.075424,31.173444],[121.072532,31.172701],[121.072379,31.169609],[121.075466,31.170316],[121.077371,31.16454],[121.07313,31.163257],[121.0737,31.161711],[121.076787,31.162622],[121.07605,31.160536],[121.077023,31.158451],[121.073839,31.157072],[121.072046,31.153512],[121.067777,31.152289],[121.069126,31.148705],[121.06572,31.148597],[121.066067,31.150947],[121.064135,31.150839],[121.062564,31.153129],[121.057378,31.152781],[121.055834,31.150659],[121.050273,31.150719],[121.049133,31.154615],[121.04542,31.154028],[121.045254,31.151582],[121.041472,31.14982],[121.041541,31.146931],[121.044781,31.145528],[121.041819,31.138899],[121.038649,31.136909],[121.036258,31.137376],[121.036119,31.140325],[121.033088,31.142208],[121.028778,31.141249],[121.028375,31.143874],[121.02672,31.143766],[121.025677,31.140769],[121.022271,31.140457],[121.022813,31.138311],[121.018489,31.134103],[121.007269,31.13342],[120.991252,31.13318],[120.983911,31.131705],[120.952642,31.138251],[120.93034,31.141404],[120.916923,31.136189],[120.905397,31.134211],[120.89921,31.136057],[120.881289,31.134727],[120.876422,31.131489],[120.872349,31.127161],[120.871014,31.123804],[120.870597,31.119715],[120.865967,31.11475],[120.862241,31.112508],[120.860225,31.10933],[120.857917,31.108526],[120.856804,31.102829],[120.859766,31.100287],[120.863993,31.100299],[120.865744,31.097624],[120.869582,31.097216],[120.869818,31.098943],[120.872543,31.098884],[120.873169,31.100323],[120.876631,31.099939],[120.876005,31.097864],[120.878967,31.09838],[120.878077,31.095753],[120.887476,31.094074],[120.891021,31.094302],[120.891216,31.09718],[120.892842,31.096533],[120.892175,31.094194],[120.895415,31.090703],[120.896694,31.086649],[120.899294,31.086937],[120.902116,31.085653],[120.901671,31.084094],[120.90473,31.080495],[120.904619,31.078528],[120.899614,31.07836],[120.898863,31.070514],[120.895915,31.063075],[120.894622,31.058659],[120.894567,31.053896],[120.895442,31.050332],[120.897208,31.04822],[120.897027,31.04558],[120.899739,31.039603],[120.901977,31.037647],[120.901338,31.0255],[120.900559,31.020423],[120.901365,31.017494],[120.910055,31.016942],[120.909944,31.012644],[120.911014,31.010555],[120.918105,31.012788],[120.926155,31.010423],[120.92699,31.012068],[120.931383,31.01178],[120.933789,31.010027],[120.938085,31.009007],[120.940087,31.010027],[120.935749,31.015381],[120.936305,31.01711],[120.949972,31.017638],[120.951168,31.024012],[120.948735,31.025068],[120.949124,31.029953],[120.951085,31.029077],[120.952197,31.030254],[120.958301,31.028573],[120.960483,31.021659],[120.964293,31.020771],[120.964849,31.019751],[120.963209,31.016594],[120.970202,31.016149],[120.982993,31.016089],[120.983855,31.014445],[120.989514,31.014397],[120.989987,31.010495],[120.991933,31.008154],[120.991057,31.00747],[120.992086,31.003424],[120.992045,30.997109],[120.989834,30.996664],[120.990515,30.994551],[120.994839,30.99526],[120.994603,30.991922],[120.997133,30.989232],[120.999344,30.980106],[121.000832,30.980466],[121.002361,30.97762],[121.000567,30.977007],[121.000512,30.973933],[120.99737,30.972444],[120.993143,30.972119],[120.991433,30.968372],[120.993699,30.964024],[120.992601,30.962835],[120.994756,30.958703],[120.991683,30.958211],[120.992531,30.955028],[120.994797,30.954824],[120.995368,30.950367],[120.99673,30.950307],[120.996813,30.944625],[120.995673,30.944336],[120.997481,30.941141],[121.000818,30.937729],[121.000025,30.934701],[120.999622,30.91395],[120.998982,30.909527],[121.004572,30.909299],[121.004516,30.906955],[121.00257,30.904852],[120.998704,30.905946],[120.998635,30.903386],[120.995715,30.903723],[120.992809,30.90216],[120.992656,30.899732],[120.99046,30.89579],[120.992907,30.893915],[120.993824,30.88966],[121.005017,30.888794],[121.00852,30.888121],[121.008298,30.882964],[121.011092,30.882219],[121.017474,30.882724],[121.0186,30.880716],[121.021465,30.878793],[121.019421,30.876665],[121.021896,30.875162],[121.019796,30.873996],[121.020463,30.87188],[121.01778,30.873359],[121.014819,30.871027],[121.01778,30.86938],[121.013971,30.86439],[121.016265,30.862851],[121.015403,30.86053],[121.010981,30.856033],[121.015013,30.853604],[121.013359,30.851692],[121.010133,30.853135],[121.008006,30.850574],[121.006463,30.850454],[121.003974,30.846101],[121.000985,30.845632],[120.9999,30.843335],[120.997759,30.84408],[120.995659,30.838572],[120.992865,30.838392],[120.989987,30.834724],[120.989125,30.832318],[120.992462,30.831572],[120.989153,30.828698],[120.992754,30.825691],[120.990918,30.822708],[120.994603,30.821493],[121.00054,30.829431],[121.003446,30.826304],[121.006935,30.830779],[121.010898,30.834615],[121.014402,30.835818],[121.014874,30.833954],[121.030057,30.828553],[121.036647,30.818449],[121.037912,30.81389],[121.044976,30.815526],[121.043752,30.820013],[121.03908,30.818582],[121.03769,30.820266],[121.039192,30.820867],[121.040276,30.82438],[121.04175,30.825378],[121.039956,30.827218],[121.043516,30.828157],[121.045101,30.825907],[121.048896,30.825186],[121.046755,30.831091],[121.056335,30.835602],[121.062049,30.83779],[121.060228,30.842793],[121.061674,30.843383],[121.06052,30.845187],[121.066999,30.84877],[121.080471,30.848746],[121.097712,30.857103],[121.097684,30.854927],[121.102272,30.850261],[121.104789,30.849335],[121.110906,30.851416],[121.113159,30.854049],[121.114744,30.851476],[121.120055,30.849119],[121.121153,30.850165],[121.123545,30.847267],[121.12025,30.843299],[121.119832,30.83773],[121.117747,30.835301],[121.120639,30.836335],[121.127688,30.83565],[121.129982,30.834892],[121.131609,30.83601],[121.134612,30.833028],[121.132916,30.831608],[121.134264,30.828505],[121.136239,30.827868],[121.13742,30.829985],[121.13742,30.825029],[121.132373,30.819279],[121.130218,30.815574],[121.128202,30.810221],[121.126047,30.79304],[121.126576,30.788998],[121.125255,30.788179],[121.120041,30.788552],[121.117219,30.786073],[121.12342,30.77895],[121.127521,30.778673],[121.131817,30.777313],[121.13603,30.777337],[121.1387,30.77842],[121.140618,30.776928],[121.144122,30.779479],[121.152687,30.778974],[121.155815,30.777205],[121.160681,30.776579],[121.160737,30.773221],[121.163434,30.775279],[121.168968,30.775953],[121.170789,30.777084],[121.170984,30.774677],[121.174668,30.772018],[121.179965,30.774376],[121.183441,30.775038],[121.185791,30.776651],[121.186361,30.779034],[121.189517,30.778974],[121.190963,30.781092],[121.191839,30.778853],[121.196956,30.773354],[121.20032,30.773618],[121.199166,30.780755],[121.200098,30.783294],[121.205534,30.785905],[121.213723,30.785929],[121.217992,30.784954],[121.2234,30.775977],[121.224624,30.776976],[121.226209,30.775087],[121.226918,30.770826],[121.229115,30.767974],[121.230686,30.763737],[121.232298,30.755817],[121.23729,30.752651],[121.243102,30.750533],[121.244756,30.749185],[121.256393,30.743948],[121.261343,30.738217],[121.266835,30.733498],[121.26817,30.734931],[121.271451,30.73227],[121.269755,30.730729],[121.271451,30.726948],[121.270339,30.725864],[121.272035,30.723252],[121.270102,30.72047],[121.270339,30.716894],[121.267057,30.715039],[121.268448,30.712149],[121.265862,30.709488],[121.266668,30.706296],[121.268031,30.706103],[121.268656,30.702129],[121.270672,30.701563],[121.270422,30.69807],[121.271604,30.69689],[121.274649,30.6774],[121.291041,30.678328],[121.326718,30.67593],[121.346642,30.675593],[121.35433,30.676991],[121.361894,30.67952],[121.406997,30.718086],[121.426365,30.730283],[121.478767,30.756347],[121.517197,30.775387],[121.552832,30.789395],[121.601327,30.805084],[121.648419,30.8162],[121.68119,30.818401],[121.727071,30.817716],[121.77914,30.817222],[121.793767,30.816862],[121.904467,30.814155],[121.915284,30.812892],[121.9246,30.8066],[121.943689,30.777096],[121.969703,30.789202],[121.955466,30.817138],[121.954326,30.821409],[121.954715,30.825811],[121.970732,30.839077],[121.985372,30.850694],[121.993951,30.863055],[121.996982,30.874898],[121.998497,30.899961],[121.996231,30.935458],[121.990934,30.968432],[121.977558,31.016101],[121.962682,31.047284],[121.94679,31.065883],[121.889465,31.121705],[121.884029,31.130638],[121.853358,31.155346],[121.809812,31.196907],[121.743742,31.283207],[121.729101,31.298288],[121.722511,31.303518],[121.712431,31.309407],[121.689448,31.322462],[121.610559,31.368195],[121.603038,31.372656],[121.593708,31.376411],[121.559811,31.38361],[121.538011,31.388489],[121.521229,31.39479],[121.507353,31.405933],[121.509425,31.408288],[121.516585,31.405287],[121.517239,31.406303],[121.510801,31.409973],[121.502362,31.413404],[121.501319,31.411982],[121.507228,31.409722],[121.505991,31.407021],[121.49427,31.417851],[121.481339,31.427294],[121.463696,31.438277],[121.446024,31.450717],[121.434276,31.458496],[121.41869,31.470682],[121.409694,31.476321],[121.404328,31.479212],[121.403966,31.481494],[121.406288,31.485388],[121.405426,31.487215],[121.376298,31.501106],[121.362255,31.50679],[121.357751,31.508259],[121.343499,31.512057],[121.335838,31.508295],[121.329512,31.504247],[121.327218,31.504247],[121.323131,31.502288],[121.323701,31.499649],[121.319905,31.49972],[121.32003,31.502993],[121.321879,31.503399],[121.320169,31.505883],[121.316652,31.505775],[121.315345,31.501273],[121.311938,31.502909],[121.310353,31.505919],[121.305529,31.505333],[121.305876,31.503435],[121.302595,31.502599],[121.299926,31.499756],[121.300857,31.496747],[121.300496,31.494537],[121.298563,31.493713],[121.298605,31.491515],[121.293488,31.489807],[121.29061,31.491694],[121.289387,31.489031],[121.285355,31.490679],[121.283686,31.489795],[121.279696,31.490404],[121.280321,31.488672],[121.276442,31.486654],[121.27622,31.485376],[121.272049,31.484337],[121.268879,31.487466],[121.267322,31.486224],[121.267433,31.483357],[121.265153,31.48313],[121.261732,31.480777],[121.261454,31.478854],[121.254794,31.477635],[121.255643,31.483632],[121.253627,31.483082],[121.253362,31.479809],[121.251221,31.479606],[121.249692,31.477623],[121.247064,31.477062],[121.245813,31.479881],[121.248176,31.481876],[121.244409,31.481183],[121.243797,31.487311],[121.241141,31.490906],[121.240877,31.493701],[121.237234,31.491957],[121.234746,31.492686],[121.235413,31.488099],[121.232994,31.487896],[121.22867,31.482127],[121.230839,31.481111],[121.230352,31.477432],[121.226209,31.477683],[121.225361,31.476022],[121.220731,31.47607],[121.219062,31.475222],[121.21364,31.475939],[121.21503,31.477528],[121.214377,31.479128],[121.206368,31.474995],[121.203421,31.472331],[121.202906,31.469356],[121.195051,31.467827],[121.186055,31.460814],[121.185457,31.457468],[121.186055,31.454362],[121.180814,31.451458],[121.174974,31.449295],[121.16983,31.450024],[121.16773,31.448315],[121.166048,31.450168],[121.163045,31.448865],[121.160917,31.449678],[121.147348,31.44393],[121.146569,31.439006],[121.14782,31.436186],[121.152492,31.433604],[121.158484,31.432254],[121.162711,31.432218],[121.16253,31.429565],[121.16431,31.427222],[121.162002,31.427951],[121.161362,31.425776],[121.155273,31.42574],[121.151157,31.421796],[121.146249,31.421078],[121.146208,31.419704],[121.149266,31.41913],[121.148905,31.415867],[121.153493,31.413679],[121.155523,31.413835],[121.154508,31.411575],[121.15886,31.410117],[121.157887,31.407893],[121.153104,31.405837],[121.153896,31.403685],[121.15049,31.402215],[121.149586,31.399381],[121.152742,31.398174],[121.147653,31.397325],[121.149475,31.394503],[121.14383,31.392327],[121.147097,31.3899],[121.148988,31.38691],[121.148432,31.385404],[121.141425,31.38355],[121.141049,31.384531],[121.137518,31.382785],[121.138408,31.381147],[121.131762,31.378815],[121.131247,31.379664],[121.124268,31.376722],[121.12328,31.37848],[121.118206,31.375837],[121.113757,31.37445],[121.11523,31.371137],[121.119082,31.370563],[121.120208,31.368674],[121.113173,31.36688],[121.112853,31.365133],[121.10928,31.364703],[121.10889,31.366509],[121.106958,31.366593],[121.106749,31.364535],[121.108251,31.360457],[121.107361,31.354763],[121.108418,31.354034],[121.10832,31.350649],[121.111157,31.351534],[121.111838,31.350517],[121.117246,31.351689],[121.120194,31.347562],[121.11733,31.34712],[121.117969,31.343447],[121.123948,31.342753],[121.130441,31.344213],[121.130816,31.341509],[121.130121,31.334702],[121.13115,31.332106],[121.132582,31.331962],[121.133305,31.325585],[121.131539,31.325441],[121.131637,31.32324],[121.127257,31.319315],[121.127076,31.316934],[121.128633,31.314265],[121.127966,31.311884],[121.129773,31.308306],[121.129134,31.307528],[121.129954,31.302597],[121.133778,31.30207],[121.139645,31.302992],[121.13895,31.305625],[121.143774,31.309706],[121.146903,31.305936],[121.150782,31.299018],[121.148933,31.298875],[121.152714,31.294075],[121.151282,31.291933],[121.154689,31.290053],[121.156399,31.287408],[121.159305,31.28766],[121.161293,31.283985],[121.159402,31.281579],[121.155537,31.280765],[121.155481,31.278442],[121.153743,31.276646]]],[[[121.975181,31.617034],[121.887616,31.63638],[121.817806,31.652025],[121.715267,31.673842],[121.642649,31.697454],[121.633278,31.696167],[121.627341,31.697776],[121.611755,31.704283],[121.602746,31.70694],[121.60091,31.707],[121.599659,31.703115],[121.593249,31.705379],[121.592262,31.706487],[121.578539,31.710527],[121.565025,31.716711],[121.551386,31.727386],[121.549509,31.726969],[121.540124,31.733307],[121.539429,31.735499],[121.528361,31.738347],[121.526693,31.740217],[121.514986,31.742873],[121.51304,31.743695],[121.498566,31.75326],[121.487749,31.753415],[121.476807,31.756142],[121.464141,31.757142],[121.455576,31.759346],[121.449751,31.761668],[121.445385,31.7643],[121.431481,31.769266],[121.425781,31.774267],[121.420915,31.779602],[121.410904,31.79558],[121.416312,31.79764],[121.411488,31.806341],[121.405468,31.809841],[121.399142,31.817483],[121.395388,31.821291],[121.385043,31.833525],[121.376381,31.838571],[121.369291,31.843283],[121.323061,31.868529],[121.315859,31.871479],[121.310367,31.872502],[121.3019,31.872716],[121.291166,31.870992],[121.281336,31.869041],[121.265584,31.864128],[121.252111,31.857727],[121.242073,31.853397],[121.225305,31.847043],[121.200334,31.835144],[121.181509,31.820411],[121.149225,31.787294],[121.118498,31.759084],[121.142064,31.755308],[121.145332,31.753927],[121.179868,31.720774],[121.289109,31.616283],[121.345585,31.571685],[121.37221,31.55321],[121.395457,31.585444],[121.403521,31.590002],[121.414797,31.591076],[121.43422,31.590336],[121.471176,31.57443],[121.547673,31.531125],[121.608794,31.50691],[121.617678,31.503673],[121.625784,31.501775],[121.638645,31.49972],[121.670609,31.494214],[121.682858,31.491061],[121.72988,31.471973],[121.763443,31.458233],[121.819183,31.438206],[121.834212,31.433975],[121.845377,31.431895],[121.857807,31.430043],[121.87299,31.429338],[121.882096,31.428656],[121.89055,31.428788],[121.901144,31.430126],[121.918051,31.434692],[121.934304,31.442364],[121.967284,31.456656],[121.981813,31.4641],[121.991698,31.476763],[121.995716,31.493104],[121.993867,31.51189],[121.98825,31.529597],[121.975181,31.617034]]],[[[121.778862,31.310196],[121.785494,31.311058],[121.791042,31.308353],[121.796701,31.30736],[121.798772,31.310352],[121.795866,31.329976],[121.796478,31.33542],[121.796005,31.345624],[121.793002,31.355074],[121.792377,31.363304],[121.790875,31.367059],[121.787886,31.37164],[121.780572,31.380154],[121.774135,31.386982],[121.76938,31.390749],[121.760857,31.395185],[121.753725,31.400362],[121.742185,31.407212],[121.737485,31.408814],[121.729296,31.410356],[121.723707,31.412364],[121.708316,31.419728],[121.697193,31.423995],[121.688294,31.425883],[121.673835,31.427748],[121.621752,31.444145],[121.606319,31.449403],[121.599812,31.450681],[121.585561,31.454672],[121.58303,31.456262],[121.575828,31.463813],[121.572811,31.469452],[121.567347,31.4835],[121.562356,31.486367],[121.549926,31.489747],[121.521132,31.493976],[121.516933,31.494298],[121.513457,31.493355],[121.509355,31.489795],[121.509105,31.485352],[121.510134,31.482581],[121.516849,31.477313],[121.529515,31.471172],[121.537413,31.466704],[121.54328,31.462403],[121.549773,31.457062],[121.558463,31.448793],[121.572255,31.436066],[121.590371,31.427545],[121.601425,31.421855],[121.641036,31.401115],[121.686682,31.376591],[121.727933,31.354799],[121.740766,31.346486],[121.744659,31.343675],[121.751166,31.337801],[121.76076,31.320344],[121.76425,31.315306],[121.770951,31.31168],[121.778862,31.310196]]],[[[122.242018,31.419082],[122.243562,31.417839],[122.247149,31.419333],[122.245369,31.421318],[122.242018,31.419082]]],[[[121.801775,31.356976],[121.802693,31.342789],[121.803152,31.332106],[121.80375,31.328445],[121.806642,31.324173],[121.81319,31.316228],[121.822617,31.307372],[121.832043,31.301711],[121.833601,31.299653],[121.840566,31.29544],[121.852885,31.292364],[121.856681,31.292818],[121.860782,31.294949],[121.865968,31.294937],[121.88959,31.292028],[121.900755,31.291167],[121.932261,31.283147],[121.975779,31.279998],[122.016447,31.282285],[122.072005,31.266829],[122.087285,31.257538],[122.097769,31.255658],[122.105207,31.262136],[122.122684,31.307205],[122.121975,31.315438],[122.116678,31.321229],[122.078012,31.323527],[122.04107,31.323814],[122.001556,31.329246],[121.951726,31.337274],[121.913074,31.350445],[121.870376,31.366007],[121.858516,31.369379],[121.852885,31.371376],[121.845586,31.374582],[121.831752,31.375526],[121.828401,31.376447],[121.824744,31.378588],[121.817445,31.380585],[121.803458,31.381219],[121.796756,31.381075],[121.793864,31.380477],[121.792808,31.377571],[121.797674,31.369642],[121.800566,31.363997],[121.801775,31.356976]]],[[[121.627049,31.444993],[121.631512,31.445101],[121.634001,31.445937],[121.636295,31.449881],[121.635044,31.452988],[121.631609,31.456823],[121.625172,31.462212],[121.61366,31.471339],[121.608571,31.474446],[121.602134,31.476835],[121.595293,31.478292],[121.586896,31.479535],[121.577149,31.479343],[121.575814,31.478197],[121.57612,31.474768],[121.577886,31.472486],[121.58627,31.464076],[121.594153,31.458568],[121.613855,31.447885],[121.616872,31.446643],[121.627049,31.444993]]],[[[121.426671,30.682183],[121.426796,30.680315],[121.428589,30.681749],[121.426671,30.682183]]],[[[121.943244,31.215465],[121.941826,31.207678],[121.942619,31.198465],[121.944843,31.186878],[121.948027,31.176405],[121.952629,31.1672],[121.959637,31.159278],[121.965685,31.15754],[121.970773,31.157552],[121.975862,31.158834],[121.99573,31.1608],[121.999554,31.165079],[122.010593,31.188004],[122.012011,31.192043],[122.012609,31.210002],[122.011038,31.217405],[122.008563,31.220987],[121.989655,31.224521],[121.980659,31.22809],[121.969188,31.230282],[121.957259,31.230414],[121.951044,31.228821],[121.946595,31.224365],[121.943244,31.215465]]],[[[121.422458,30.691482],[121.419469,30.691626],[121.419482,30.689856],[121.425364,30.687374],[121.428909,30.689109],[121.426615,30.691277],[121.422458,30.691482]]],[[[121.882625,31.240857],[121.880873,31.23633],[121.882541,31.225611],[121.885155,31.22052],[121.889271,31.214997],[121.901645,31.20146],[121.908777,31.195266],[121.913852,31.19384],[121.918788,31.194319],[121.922445,31.196859],[121.925448,31.205438],[121.927519,31.224017],[121.926727,31.229731],[121.923557,31.233863],[121.915451,31.236558],[121.897363,31.242115],[121.88991,31.242594],[121.882625,31.240857]]],[[[121.406775,30.704995],[121.406622,30.703093],[121.409291,30.704514],[121.406775,30.704995]]]]}}]}
diff --git a/mapFiles/full/500100.json b/mapFiles/full/500100.json
new file mode 100644
index 0000000000..4cacd6825e
--- /dev/null
+++ b/mapFiles/full/500100.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"adcode":500000,"name":"重庆市","center":[106.504962,29.533155],"centroid":[107.8839,30.067297],"childrenNum":38,"level":"province","acroutes":[100000],"parent":{"adcode":100000}},"geometry":{"type":"MultiPolygon","coordinates":[[[[108.312103,28.997497],[108.322954,28.953969],[108.339943,28.947872],[108.346916,28.941488],[108.350549,28.930316],[108.350353,28.907107],[108.357423,28.893393],[108.355312,28.870831],[108.346425,28.856333],[108.355165,28.831634],[108.354232,28.814263],[108.382416,28.805781],[108.386492,28.801642],[108.388996,28.785823],[108.385264,28.772216],[108.375051,28.767092],[108.372498,28.760164],[108.347259,28.736302],[108.347898,28.710262],[108.340238,28.689671],[108.332529,28.679579],[108.344019,28.673425],[108.35217,28.676091],[108.39096,28.651759],[108.421697,28.643346],[108.43903,28.633989],[108.461371,28.634153],[108.471142,28.627791],[108.491274,28.630582],[108.500996,28.626642],[108.502715,28.637601],[108.517985,28.639981],[108.524614,28.647122],[108.53851,28.652703],[108.548723,28.64782],[108.561146,28.649174],[108.564828,28.661156],[108.574796,28.660336],[108.586482,28.64704],[108.585303,28.639653],[108.596155,28.64035],[108.609019,28.633619],[108.623259,28.641418],[108.632343,28.638914],[108.636025,28.621757],[108.618889,28.606527],[108.604453,28.589529],[108.610934,28.539381],[108.58933,28.538601],[108.576858,28.533794],[108.573224,28.528124],[108.578036,28.509018],[108.574943,28.497676],[108.589182,28.473837],[108.586776,28.463066],[108.597235,28.456817],[108.602833,28.438849],[108.609952,28.435683],[108.608823,28.407306],[108.587415,28.404961],[108.577545,28.390193],[108.576367,28.364314],[108.580099,28.343285],[108.598021,28.34205],[108.606466,28.336576],[108.611573,28.324557],[108.630771,28.328014],[108.639855,28.333201],[108.647466,28.331101],[108.667352,28.334436],[108.677418,28.345795],[108.670102,28.354396],[108.659103,28.350322],[108.657041,28.362215],[108.664701,28.38287],[108.693523,28.395171],[108.696813,28.404591],[108.690921,28.410555],[108.688318,28.422318],[108.669856,28.431489],[108.663915,28.444318],[108.641476,28.455707],[108.645256,28.468616],[108.658661,28.47803],[108.671133,28.475276],[108.688613,28.482469],[108.701428,28.482469],[108.709727,28.501087],[108.723377,28.491963],[108.729416,28.470918],[108.749106,28.461052],[108.746749,28.450239],[108.773509,28.438315],[108.779303,28.427418],[108.763296,28.398585],[108.762805,28.385791],[108.783084,28.380402],[108.777732,28.367441],[108.777929,28.347236],[108.76143,28.324557],[108.770072,28.314965],[108.763738,28.305619],[108.741053,28.294914],[108.725783,28.280296],[108.7276,28.259827],[108.737567,28.251424],[108.739678,28.226252],[108.749548,28.22757],[108.758681,28.220236],[108.758533,28.196046],[108.765309,28.192131],[108.773313,28.213478],[108.796636,28.22378],[108.807389,28.242855],[108.821776,28.245121],[108.826539,28.22551],[108.836212,28.20738],[108.855116,28.199879],[108.864445,28.206143],[108.897245,28.219536],[108.91227,28.21558],[108.919488,28.217764],[108.933187,28.207874],[108.927884,28.20025],[108.929407,28.190565],[108.956609,28.182321],[108.979539,28.171274],[108.985775,28.161339],[109.001537,28.16138],[109.009786,28.167893],[109.014647,28.17923],[109.013812,28.199591],[109.026186,28.220154],[109.038215,28.217434],[109.041603,28.20536],[109.06144,28.200126],[109.070033,28.191471],[109.086384,28.184712],[109.089477,28.196252],[109.101409,28.201404],[109.096106,28.22106],[109.085353,28.232803],[109.081523,28.24854],[109.088004,28.261392],[109.095959,28.261804],[109.117563,28.278607],[109.11614,28.288614],[109.126844,28.296932],[109.14123,28.320564],[109.137744,28.33423],[109.150805,28.344684],[109.151689,28.350528],[109.138579,28.358635],[109.144766,28.36382],[109.153113,28.38106],[109.153653,28.39731],[109.157139,28.403398],[109.154291,28.417588],[109.164946,28.414997],[109.168383,28.432064],[109.176731,28.43153],[109.180708,28.439466],[109.176583,28.446169],[109.192394,28.464423],[109.191756,28.470877],[109.215521,28.48214],[109.229613,28.474906],[109.274344,28.494676],[109.271988,28.51399],[109.280384,28.5204],[109.274688,28.524837],[109.27459,28.539217],[109.288928,28.546324],[109.29482,28.566286],[109.304738,28.579017],[109.3205,28.579797],[109.309354,28.598808],[109.306604,28.62069],[109.300172,28.626436],[109.287013,28.626806],[109.278469,28.612439],[109.258878,28.605583],[109.249401,28.608662],[109.236144,28.619417],[109.201478,28.598439],[109.186355,28.610632],[109.181395,28.621716],[109.193131,28.636205],[109.202902,28.63797],[109.221069,28.649133],[109.251758,28.660828],[109.270907,28.671783],[109.266194,28.680194],[109.252936,28.691558],[109.265015,28.699474],[109.271497,28.698941],[109.28495,28.713871],[109.294672,28.71912],[109.28824,28.727322],[109.300663,28.739665],[109.297668,28.748152],[109.278469,28.751514],[109.273019,28.760902],[109.256177,28.765616],[109.261333,28.774962],[109.241299,28.776519],[109.241888,28.794266],[109.246406,28.801683],[109.245817,28.812992],[109.239679,28.827168],[109.242674,28.85105],[109.234032,28.863828],[109.235505,28.880372],[109.239924,28.892042],[109.256864,28.907721],[109.25544,28.926141],[109.261038,28.950532],[109.272331,28.970949],[109.284165,28.972299],[109.292463,28.987639],[109.292365,29.004695],[109.295458,29.016391],[109.304836,29.020808],[109.319616,29.04256],[109.312251,29.066351],[109.301154,29.070643],[109.287847,29.07101],[109.266194,29.079552],[109.257748,29.086745],[109.237273,29.086704],[109.22593,29.113508],[109.232559,29.120086],[109.228533,29.129972],[109.215521,29.145289],[109.203098,29.151823],[109.18007,29.171955],[109.16254,29.180693],[109.154488,29.172363],[109.138824,29.169505],[109.123014,29.191267],[109.122965,29.199268],[109.110395,29.215105],[109.118545,29.232409],[109.141967,29.270475],[109.129986,29.282468],[109.106467,29.288545],[109.10465,29.293154],[109.113881,29.314196],[109.108725,29.319333],[109.114568,29.332787],[109.110002,29.342693],[109.112506,29.360995],[109.101704,29.373506],[109.090361,29.378681],[109.080786,29.390661],[109.06419,29.401743],[109.053191,29.40272],[109.039934,29.389805],[109.033453,29.378233],[109.034729,29.360261],[109.009786,29.36022],[108.999425,29.363929],[108.994761,29.355085],[108.985088,29.350479],[108.986168,29.336742],[108.97237,29.32924],[108.956069,29.330953],[108.919734,29.326305],[108.916591,29.334622],[108.931027,29.369634],[108.93412,29.399461],[108.943646,29.410746],[108.932009,29.431682],[108.921256,29.436895],[108.90957,29.436814],[108.89808,29.441945],[108.886541,29.440601],[108.873971,29.449397],[108.873726,29.462753],[108.866557,29.471058],[108.869846,29.485917],[108.885952,29.498047],[108.888652,29.507041],[108.886983,29.530562],[108.878439,29.53935],[108.886934,29.553101],[108.902106,29.563026],[108.913056,29.574455],[108.899995,29.584866],[108.909177,29.593284],[108.901271,29.604791],[108.897589,29.596496],[108.885903,29.588445],[108.868324,29.598001],[108.885854,29.621134],[108.887916,29.628573],[108.879618,29.639222],[108.869699,29.643002],[108.855754,29.636377],[108.84451,29.658364],[108.83302,29.651293],[108.827325,29.654382],[108.835377,29.668442],[108.828061,29.671286],[108.816473,29.644018],[108.819812,29.632435],[108.813625,29.63154],[108.804394,29.640564],[108.785637,29.633857],[108.780089,29.645522],[108.792266,29.647351],[108.79752,29.660071],[108.794132,29.671205],[108.784655,29.677177],[108.786276,29.691518],[108.760645,29.693549],[108.752592,29.689365],[108.758141,29.678721],[108.765113,29.682256],[108.775964,29.67539],[108.773018,29.661534],[108.783281,29.653772],[108.774541,29.65174],[108.765899,29.661046],[108.763002,29.653366],[108.752641,29.649017],[108.743017,29.655926],[108.740611,29.665719],[108.73359,29.671489],[108.710905,29.679168],[108.718221,29.691924],[108.710365,29.699196],[108.691166,29.68969],[108.684783,29.693509],[108.69313,29.704476],[108.681051,29.721413],[108.686649,29.740051],[108.677565,29.748537],[108.67732,29.761447],[108.681788,29.770459],[108.678449,29.777887],[108.680658,29.800167],[108.670986,29.811813],[108.656942,29.816682],[108.670347,29.819076],[108.666124,29.842726],[108.657728,29.84808],[108.662491,29.852582],[108.633226,29.855908],[108.632686,29.86487],[108.622915,29.867304],[108.60843,29.862964],[108.601409,29.8656],[108.587955,29.85388],[108.588151,29.84808],[108.577349,29.844673],[108.579902,29.831206],[108.56581,29.820861],[108.557463,29.819035],[108.534434,29.787506],[108.522503,29.763761],[108.540081,29.756779],[108.548526,29.749512],[108.547004,29.742569],[108.520244,29.730347],[108.51666,29.735666],[108.504188,29.729413],[108.515285,29.71861],[108.506446,29.708172],[108.489506,29.723199],[108.467656,29.729697],[108.460487,29.740904],[108.437115,29.740782],[108.438588,29.75617],[108.445462,29.76437],[108.444235,29.776913],[108.421304,29.774153],[108.416984,29.787344],[108.425478,29.804185],[108.424496,29.815302],[108.408882,29.820658],[108.404561,29.834451],[108.393169,29.83583],[108.3942,29.816479],[108.368177,29.818913],[108.372841,29.834127],[108.371466,29.84159],[108.391598,29.853231],[108.386933,29.860004],[108.392777,29.863492],[108.402793,29.855908],[108.433776,29.880077],[108.453122,29.871683],[108.457394,29.865438],[108.468049,29.864181],[108.489163,29.867466],[108.495693,29.876914],[108.509049,29.878617],[108.517052,29.865479],[108.516169,29.885631],[108.524221,29.896821],[108.524074,29.911658],[108.515874,29.930383],[108.519458,29.943512],[108.534238,29.971833],[108.542634,29.99735],[108.528886,30.00545],[108.530703,30.043104],[108.526185,30.04954],[108.531783,30.055085],[108.524221,30.058647],[108.516414,30.05298],[108.516267,30.064232],[108.525252,30.073824],[108.532323,30.073702],[108.533207,30.084183],[108.546071,30.104372],[108.561489,30.144132],[108.56748,30.155697],[108.552258,30.163338],[108.553829,30.174537],[108.568904,30.225623],[108.56743,30.23435],[108.573519,30.237178],[108.58167,30.255882],[108.567332,30.254872],[108.562029,30.26287],[108.545237,30.269978],[108.54617,30.276279],[108.537921,30.278581],[108.533305,30.292108],[108.52486,30.294733],[108.526382,30.305271],[108.51499,30.315162],[108.498394,30.316332],[108.48273,30.33603],[108.46908,30.343819],[108.459898,30.359799],[108.451011,30.355603],[108.432696,30.35411],[108.421943,30.366457],[108.403284,30.374728],[108.399454,30.389412],[108.420912,30.394131],[108.425331,30.399052],[108.421697,30.410547],[108.430486,30.415628],[108.421206,30.4295],[108.411779,30.436919],[108.421796,30.448852],[108.421206,30.464372],[108.414332,30.475818],[108.424054,30.488956],[108.440994,30.491011],[108.45268,30.495968],[108.455086,30.489319],[108.479146,30.488956],[108.491765,30.501488],[108.513124,30.501407],[108.528297,30.487505],[108.542929,30.491978],[108.55707,30.486014],[108.564926,30.468564],[108.569935,30.470418],[108.581719,30.485893],[108.591245,30.487787],[108.590606,30.494718],[108.598561,30.493872],[108.611376,30.502173],[108.604551,30.510795],[108.621737,30.515468],[108.620116,30.52288],[108.628611,30.525176],[108.649332,30.537824],[108.649725,30.554215],[108.64344,30.562027],[108.639904,30.574751],[108.654487,30.585017],[108.666223,30.5886],[108.690479,30.586708],[108.700004,30.561786],[108.699415,30.544389],[108.711592,30.537864],[108.715815,30.530373],[108.711887,30.523203],[108.726176,30.515548],[108.723966,30.507572],[108.744196,30.494799],[108.761529,30.505315],[108.77292,30.503502],[108.788534,30.51293],[108.799239,30.50592],[108.806948,30.491414],[108.839011,30.50318],[108.853005,30.514984],[108.854429,30.521913],[108.871663,30.532749],[108.893121,30.557799],[108.894643,30.56702],[108.90952,30.581273],[108.919488,30.589365],[108.943842,30.601843],[108.967509,30.624823],[108.978017,30.629813],[108.987494,30.623294],[108.999229,30.632066],[109.009737,30.627238],[109.021766,30.642366],[109.045728,30.653189],[109.049165,30.645545],[109.070181,30.640274],[109.088053,30.646631],[109.096646,30.638745],[109.111917,30.646108],[109.120951,30.635768],[109.121737,30.628726],[109.112506,30.61271],[109.105926,30.610738],[109.105534,30.585661],[109.102686,30.580146],[109.101114,30.579542],[109.106123,30.570765],[109.103668,30.565812],[109.113488,30.548658],[109.12483,30.538912],[109.124389,30.531702],[109.139463,30.534562],[109.141181,30.525096],[109.150609,30.527392],[109.164799,30.538187],[109.17133,30.547007],[109.192787,30.546282],[109.222788,30.569597],[109.247731,30.583205],[109.227845,30.58087],[109.227551,30.585661],[109.251169,30.592907],[109.278813,30.610174],[109.299534,30.630577],[109.313577,30.610174],[109.32816,30.616091],[109.323299,30.604137],[109.314509,30.59979],[109.344265,30.577126],[109.361156,30.554739],[109.361058,30.550994],[109.342252,30.529567],[109.337145,30.520826],[109.341564,30.512728],[109.342841,30.494718],[109.352072,30.487183],[109.368668,30.500279],[109.380846,30.518288],[109.393808,30.531138],[109.418114,30.560014],[109.428032,30.57616],[109.437852,30.598059],[109.449342,30.603735],[109.456511,30.613797],[109.465889,30.619511],[109.48278,30.623173],[109.493337,30.637176],[109.514696,30.655401],[109.528739,30.663929],[109.537921,30.663969],[109.541407,30.65166],[109.533698,30.641562],[109.538756,30.638424],[109.562865,30.646752],[109.574109,30.646872],[109.577104,30.655321],[109.588005,30.664693],[109.581622,30.670847],[109.590656,30.693409],[109.602244,30.698838],[109.62542,30.702657],[109.649038,30.71894],[109.660773,30.73727],[109.656698,30.76046],[109.659153,30.761987],[109.685373,30.768657],[109.692149,30.778902],[109.702117,30.783643],[109.702657,30.770264],[109.718124,30.778661],[109.716601,30.80168],[109.729613,30.815376],[109.759074,30.832804],[109.780777,30.848583],[109.797619,30.855609],[109.81942,30.860225],[109.856099,30.880254],[109.878244,30.889163],[109.894545,30.899797],[109.905642,30.899797],[109.932304,30.887679],[109.940897,30.889685],[109.943696,30.87897],[109.958377,30.877445],[109.975956,30.888682],[109.995056,30.887839],[110.008215,30.883585],[110.005024,30.870381],[110.017937,30.855328],[110.019607,30.829592],[110.03198,30.820476],[110.039198,30.820516],[110.042488,30.80666],[110.052996,30.799591],[110.082309,30.799591],[110.089527,30.816058],[110.095861,30.82156],[110.095812,30.829873],[110.115306,30.845492],[110.124095,30.868133],[110.144324,30.897229],[110.151837,30.912316],[110.145601,30.922145],[110.153899,30.953832],[110.163769,30.961371],[110.161657,30.968308],[110.173245,30.979895],[110.172165,30.98659],[110.163572,30.991641],[110.136075,30.986751],[110.140986,31.00503],[110.140151,31.030638],[110.120854,31.032001],[110.126648,31.054678],[110.13308,31.059806],[110.122131,31.072904],[110.120117,31.088844],[110.12871,31.095131],[110.135437,31.106262],[110.145847,31.108144],[110.146927,31.116912],[110.161264,31.116111],[110.180218,31.121676],[110.1894,31.129482],[110.186895,31.145332],[110.198876,31.156538],[110.196912,31.163581],[110.186404,31.169583],[110.180218,31.179585],[110.176535,31.198067],[110.178008,31.204867],[110.169612,31.227943],[110.174866,31.243497],[110.171428,31.250573],[110.162443,31.251932],[110.156158,31.277315],[110.163965,31.30321],[110.159644,31.315355],[110.151739,31.317872],[110.157975,31.333491],[110.14732,31.34783],[110.14948,31.354299],[110.140053,31.368315],[110.145307,31.381331],[110.140004,31.390472],[110.127384,31.393386],[110.11889,31.400651],[110.115158,31.412265],[110.108824,31.408314],[110.100084,31.411268],[110.089773,31.408674],[110.053978,31.410909],[110.049411,31.41877],[110.034484,31.430822],[110.033502,31.439679],[110.020687,31.442073],[110.003649,31.453642],[109.996382,31.469359],[109.987789,31.474663],[109.967903,31.474304],[109.954744,31.468401],[109.94291,31.475341],[109.942174,31.483238],[109.957248,31.490774],[109.961323,31.499268],[109.98229,31.512504],[109.965595,31.50788],[109.945267,31.506684],[109.934907,31.517727],[109.923859,31.521474],[109.894594,31.519162],[109.878194,31.528848],[109.869209,31.530124],[109.860174,31.543555],[109.83798,31.555272],[109.822071,31.553757],[109.801007,31.541443],[109.788584,31.55045],[109.765457,31.549653],[109.760204,31.547182],[109.735309,31.546106],[109.718909,31.556985],[109.727502,31.570731],[109.746406,31.577982],[109.745326,31.596426],[109.76423,31.602998],[109.737421,31.628683],[109.740416,31.635173],[109.740612,31.663636],[109.731872,31.673148],[109.728091,31.688828],[109.731086,31.700446],[109.709531,31.701122],[109.696028,31.70709],[109.693376,31.716558],[109.683016,31.71978],[109.659005,31.716956],[109.644913,31.720854],[109.617024,31.711585],[109.606172,31.714688],[109.580394,31.72869],[109.572096,31.726343],[109.549755,31.730002],[109.501095,31.717155],[109.491029,31.720973],[109.477134,31.720218],[109.472714,31.714649],[109.459703,31.715205],[109.45656,31.722008],[109.4462,31.722883],[109.425872,31.718786],[109.420274,31.720655],[109.411632,31.708244],[109.389487,31.705101],[109.361254,31.708642],[109.3232,31.70888],[109.302038,31.71067],[109.281611,31.716876],[109.2795,31.723479],[109.283085,31.739627],[109.27076,31.749291],[109.2713,31.756607],[109.256177,31.758635],[109.254655,31.766905],[109.263689,31.773544],[109.281268,31.777917],[109.274786,31.791075],[109.274835,31.800455],[109.255293,31.803038],[109.239875,31.811304],[109.232363,31.809436],[109.213606,31.817503],[109.196224,31.817543],[109.191854,31.827953],[109.199563,31.842494],[109.190921,31.855681],[109.167009,31.87534],[109.131901,31.891343],[109.124585,31.892137],[109.114225,31.905556],[109.069935,31.938936],[109.05982,31.941356],[109.039345,31.96072],[109.035122,31.958061],[109.020883,31.963219],[108.988427,31.979404],[108.978213,31.978135],[108.968295,31.982538],[108.95273,31.979682],[108.937116,31.988924],[108.91831,31.988249],[108.902401,31.984918],[108.873529,32.000227],[108.837881,32.038805],[108.810581,32.047169],[108.788682,32.048318],[108.776259,32.055096],[108.767961,32.065519],[108.751708,32.074158],[108.752543,32.08759],[108.747731,32.099831],[108.726421,32.106803],[108.714833,32.103713],[108.674717,32.103396],[108.66691,32.111913],[108.654045,32.117418],[108.646975,32.128666],[108.606024,32.155155],[108.592178,32.160223],[108.583978,32.172217],[108.551031,32.176096],[108.509736,32.201187],[108.492944,32.194935],[108.479342,32.182073],[108.457296,32.181479],[108.434022,32.192085],[108.425282,32.187416],[108.406378,32.196201],[108.39916,32.194064],[108.379175,32.177521],[108.369404,32.173325],[108.38821,32.157531],[108.390862,32.151315],[108.406623,32.141337],[108.414872,32.126369],[108.423465,32.117339],[108.431616,32.101693],[108.439276,32.094721],[108.452091,32.091036],[108.44944,32.072969],[108.429995,32.061358],[108.412712,32.070116],[108.395183,32.066311],[108.373774,32.077169],[108.362825,32.070037],[108.344608,32.068253],[108.344804,32.060526],[108.35978,32.053748],[108.364298,32.047248],[108.362874,32.036783],[108.340091,32.023106],[108.32919,32.01926],[108.33847,32.009506],[108.361401,31.998085],[108.369502,31.989876],[108.367146,31.984521],[108.3505,31.971947],[108.337488,31.981705],[108.3259,31.984957],[108.307094,31.997252],[108.297176,31.988527],[108.283919,31.986068],[108.282151,31.979206],[108.265849,31.983728],[108.267175,31.973097],[108.259368,31.966869],[108.275817,31.957625],[108.28603,31.938856],[108.282691,31.917742],[108.289516,31.910955],[108.299484,31.911272],[108.30842,31.905953],[108.326244,31.881615],[108.33523,31.876452],[108.340974,31.863546],[108.353741,31.856396],[108.370779,31.852742],[108.386197,31.853894],[108.384135,31.848611],[108.394741,31.826523],[108.441436,31.807608],[108.455135,31.813927],[108.462501,31.812814],[108.464072,31.803674],[108.454399,31.791075],[108.456314,31.783999],[108.478213,31.777917],[108.488574,31.780302],[108.489261,31.774737],[108.515727,31.7611],[108.535269,31.757681],[108.506103,31.734815],[108.518673,31.726184],[108.524761,31.69973],[108.514794,31.69412],[108.532225,31.677168],[108.542831,31.673626],[108.546464,31.666701],[108.532814,31.669129],[108.519066,31.665706],[108.513272,31.656193],[108.506692,31.657307],[108.494564,31.649545],[108.486168,31.639871],[108.468786,31.636169],[108.46525,31.61837],[108.456461,31.628882],[108.442664,31.6337],[108.423072,31.621277],[108.417916,31.610087],[108.402646,31.603874],[108.388357,31.586906],[108.393611,31.576349],[108.377948,31.570413],[108.391795,31.560452],[108.388652,31.546385],[108.381139,31.542599],[108.347603,31.545189],[108.33906,31.537896],[108.346572,31.525141],[108.345345,31.514936],[108.323298,31.502378],[108.311415,31.506684],[108.295998,31.503494],[108.281709,31.507282],[108.276995,31.501181],[108.259564,31.502497],[108.254801,31.498829],[108.236683,31.506365],[108.226764,31.505846],[108.218417,31.496197],[108.190478,31.491492],[108.193326,31.468202],[108.206829,31.464293],[108.210806,31.467883],[108.223131,31.46517],[108.225586,31.453004],[108.210561,31.435769],[108.216551,31.427031],[108.216306,31.411188],[108.203392,31.395382],[108.182868,31.393027],[108.175257,31.382608],[108.157826,31.376659],[108.154143,31.37075],[108.158906,31.360289],[108.171182,31.356975],[108.180609,31.349227],[108.185519,31.338005],[108.180462,31.325782],[108.162834,31.31971],[108.16141,31.313757],[108.146533,31.30277],[108.111916,31.286586],[108.094485,31.275036],[108.092374,31.265764],[108.080589,31.261446],[108.066399,31.261766],[108.059967,31.254971],[108.040866,31.253611],[108.021422,31.245736],[108.031635,31.23682],[108.027903,31.221984],[108.040081,31.218625],[108.076268,31.231822],[108.071113,31.218345],[108.080737,31.218945],[108.089919,31.201867],[108.085696,31.188107],[108.070278,31.177785],[108.069443,31.169383],[108.055253,31.156658],[108.056628,31.145652],[108.045629,31.145893],[108.0363,31.139929],[108.035318,31.128962],[108.025743,31.116351],[108.014744,31.115271],[108.009294,31.108785],[108.01386,31.098735],[108.024712,31.089244],[108.028984,31.061728],[108.050245,31.059966],[108.059869,31.053196],[108.053289,31.040736],[108.043321,31.035407],[108.033599,31.036128],[108.011062,31.023666],[108.003795,31.025389],[107.995889,31.004308],[107.983123,30.984225],[107.971535,30.982421],[107.943547,30.989437],[107.937409,30.968669],[107.936329,30.952749],[107.938735,30.940035],[107.948261,30.919056],[107.957345,30.919858],[107.971535,30.911794],[107.982435,30.913239],[107.994711,30.908665],[107.986953,30.901924],[107.95597,30.882983],[107.954202,30.872428],[107.929504,30.859342],[107.896508,30.834932],[107.876131,30.813287],[107.849861,30.792601],[107.831399,30.798426],[107.817749,30.798024],[107.799189,30.814934],[107.783722,30.819311],[107.775375,30.814853],[107.763836,30.817102],[107.755341,30.829551],[107.757452,30.840232],[107.752788,30.850751],[107.760349,30.862272],[107.750038,30.864801],[107.749547,30.873471],[107.737714,30.88499],[107.715864,30.887839],[107.704128,30.872227],[107.691951,30.874756],[107.670445,30.851996],[107.647465,30.823247],[107.633766,30.817785],[107.616138,30.828588],[107.614665,30.839148],[107.598266,30.844729],[107.584075,30.840473],[107.577594,30.848141],[107.560654,30.849868],[107.556529,30.846295],[107.535465,30.84766],[107.526626,30.839429],[107.523288,30.848222],[107.514793,30.854926],[107.482926,30.838305],[107.492108,30.833165],[107.489997,30.821118],[107.498982,30.810757],[107.490193,30.810757],[107.493778,30.803688],[107.47777,30.799792],[107.47345,30.785772],[107.460339,30.784165],[107.466379,30.774041],[107.453809,30.77167],[107.44556,30.778179],[107.446837,30.770103],[107.43957,30.759776],[107.44502,30.752503],[107.439029,30.747077],[107.425674,30.746756],[107.437065,30.721031],[107.458621,30.704788],[107.460929,30.687498],[107.456559,30.682712],[107.469718,30.677604],[107.477427,30.664774],[107.499179,30.660148],[107.516806,30.647838],[107.515431,30.642045],[107.493728,30.618988],[107.485332,30.598341],[107.46741,30.586305],[107.460241,30.571329],[107.42754,30.547611],[107.442859,30.535287],[107.433825,30.523565],[107.419929,30.516475],[107.408734,30.521551],[107.404855,30.516112],[107.388848,30.49089],[107.381237,30.485329],[107.360025,30.45627],[107.34554,30.425508],[107.341367,30.41212],[107.34284,30.401674],[107.33901,30.387072],[107.31878,30.364278],[107.304197,30.354594],[107.288779,30.337564],[107.277535,30.311246],[107.264866,30.289766],[107.255979,30.263799],[107.239432,30.237582],[107.228335,30.223805],[107.221068,30.213743],[107.187335,30.181248],[107.16848,30.160306],[107.136466,30.134426],[107.13131,30.121524],[107.106563,30.113838],[107.111032,30.104251],[107.103077,30.090131],[107.093797,30.095391],[107.080147,30.094177],[107.073911,30.080986],[107.084517,30.063868],[107.075286,30.051118],[107.058395,30.043063],[107.0554,30.040553],[107.054221,30.040837],[107.053779,30.043751],[107.050588,30.053426],[107.042486,30.055085],[107.037821,30.047273],[107.042682,30.035007],[107.020636,30.036829],[107.014351,30.051604],[107.005316,30.052495],[106.998295,30.059456],[106.985332,30.084061],[106.966477,30.079894],[106.954889,30.066094],[106.956755,30.06059],[106.948604,30.040149],[106.941877,30.042739],[106.914871,30.033955],[106.913594,30.025574],[106.88433,30.0344],[106.861449,30.028165],[106.842054,30.049135],[106.836996,30.049742],[106.830171,30.033955],[106.812495,30.028975],[106.799974,30.030554],[106.797764,30.023145],[106.785587,30.017233],[106.768598,30.017274],[106.764228,30.024602],[106.759416,30.018893],[106.742132,30.025938],[106.73241,30.026829],[106.726076,30.034319],[106.72583,30.057068],[106.698825,30.076535],[106.698726,30.098708],[106.703195,30.118126],[106.689643,30.117802],[106.688857,30.124031],[106.673881,30.12213],[106.67501,30.147165],[106.677613,30.157395],[106.665779,30.158972],[106.662195,30.170171],[106.653995,30.169726],[106.649527,30.176922],[106.639265,30.180156],[106.646973,30.189494],[106.63185,30.186543],[106.633618,30.199679],[106.626989,30.19778],[106.624436,30.211318],[106.632734,30.216208],[106.619133,30.229664],[106.611473,30.228047],[106.609804,30.23532],[106.621686,30.236492],[106.633029,30.24643],[106.642653,30.249863],[106.634845,30.265697],[106.627578,30.265899],[106.623061,30.281609],[106.611669,30.292431],[106.590507,30.294248],[106.586382,30.302969],[106.571603,30.30624],[106.56026,30.315162],[106.547052,30.310358],[106.544842,30.296752],[106.521372,30.300305],[106.509391,30.289363],[106.499865,30.288918],[106.498,30.296025],[106.481845,30.298407],[106.476149,30.306966],[106.472123,30.300022],[106.458964,30.302283],[106.44826,30.299618],[106.4515,30.308137],[106.441042,30.308945],[106.436475,30.303575],[106.444774,30.295702],[106.441877,30.289484],[106.43569,30.295177],[106.428619,30.291543],[106.434708,30.277046],[106.41821,30.278783],[106.407997,30.276117],[106.422138,30.262466],[106.429405,30.261174],[106.427834,30.253782],[106.416786,30.253418],[106.410795,30.24336],[106.401319,30.242673],[106.397391,30.249662],[106.383102,30.254711],[106.390222,30.243683],[106.372545,30.248167],[106.359632,30.241218],[106.34932,30.245258],[106.343968,30.237219],[106.336799,30.237906],[106.335032,30.226391],[106.318681,30.229138],[106.309794,30.2373],[106.300563,30.238552],[106.305816,30.225704],[106.292706,30.220209],[106.296684,30.205135],[106.28431,30.201983],[106.278467,30.195718],[106.279793,30.207924],[106.26192,30.213784],[106.27174,30.204004],[106.264424,30.193536],[106.254358,30.198426],[106.245913,30.196527],[106.249742,30.189736],[106.241788,30.177731],[106.240315,30.18533],[106.232704,30.186139],[106.240315,30.200164],[106.232213,30.212531],[106.212524,30.203115],[106.204471,30.205701],[106.201819,30.213137],[106.192539,30.2154],[106.201083,30.228411],[106.180362,30.232855],[106.178251,30.248611],[106.170542,30.250591],[106.178447,30.256892],[106.179822,30.278661],[106.169069,30.3041],[106.156499,30.313668],[106.149428,30.309469],[106.137153,30.315686],[106.132685,30.323679],[106.124092,30.324769],[106.124828,30.317907],[106.134403,30.308622],[106.131801,30.301799],[106.122324,30.306805],[106.122864,30.313708],[106.114812,30.317341],[106.106072,30.310761],[106.098019,30.323558],[106.088346,30.323154],[106.091047,30.336837],[106.088591,30.345958],[106.079311,30.344344],[106.073517,30.334133],[106.070768,30.341196],[106.061046,30.342003],[106.033745,30.361817],[106.030897,30.374244],[106.01381,30.372347],[106.002222,30.376906],[105.992009,30.36916],[105.97826,30.373477],[105.970257,30.378883],[105.940894,30.372267],[105.939568,30.380537],[105.925575,30.385338],[105.917031,30.395987],[105.901515,30.386346],[105.899011,30.396027],[105.905983,30.397036],[105.905296,30.406433],[105.876522,30.399536],[105.886784,30.392639],[105.877602,30.386669],[105.869108,30.401513],[105.873772,30.408692],[105.862332,30.406353],[105.846227,30.392437],[105.839107,30.399698],[105.846128,30.411152],[105.836946,30.41583],[105.831103,30.429016],[105.820154,30.437524],[105.802183,30.427927],[105.792313,30.427282],[105.795456,30.418491],[105.782787,30.403086],[105.770708,30.404054],[105.760299,30.384571],[105.770021,30.37618],[105.751854,30.357136],[105.756224,30.347088],[105.74984,30.339703],[105.735012,30.336676],[105.741493,30.319158],[105.729905,30.316897],[105.714831,30.322791],[105.711738,30.315848],[105.718612,30.307733],[105.711001,30.294208],[105.711787,30.282255],[105.722982,30.275552],[105.734963,30.277046],[105.730102,30.265818],[105.735159,30.261537],[105.720969,30.263193],[105.723866,30.254751],[105.701475,30.257862],[105.67334,30.252772],[105.667203,30.265697],[105.660672,30.264324],[105.645745,30.273371],[105.622668,30.273856],[105.620163,30.261779],[105.610589,30.255882],[105.62036,30.248934],[105.618739,30.23536],[105.636269,30.219724],[105.655418,30.220815],[105.662342,30.210066],[105.645549,30.206873],[105.642406,30.186422],[105.632832,30.183754],[105.618052,30.185694],[105.607888,30.178297],[105.595122,30.183673],[105.5799,30.173446],[105.567036,30.183188],[105.546904,30.180722],[105.536445,30.164834],[105.536151,30.152907],[105.549605,30.151734],[105.556086,30.144779],[105.558197,30.151977],[105.571406,30.161559],[105.582159,30.162974],[105.59684,30.157112],[105.593207,30.144738],[105.569982,30.134304],[105.574155,30.130422],[105.580244,30.129694],[105.582699,30.12755],[105.583141,30.12395],[105.598068,30.109227],[105.606759,30.109712],[105.619721,30.104129],[105.640835,30.101338],[105.637496,30.093691],[105.639264,30.076413],[105.649231,30.074592],[105.660476,30.066296],[105.674617,30.071274],[105.676728,30.056057],[105.683455,30.052859],[105.68699,30.038975],[105.699413,30.043144],[105.705354,30.035776],[105.721312,30.042051],[105.728039,30.027194],[105.742033,30.03359],[105.743359,30.027113],[105.75367,30.01861],[105.74876,30.005895],[105.732508,29.998768],[105.723326,29.976005],[105.731034,29.95664],[105.721116,29.950563],[105.714978,29.930747],[105.702507,29.923939],[105.715027,29.911171],[105.711639,29.899497],[105.717433,29.893578],[105.73403,29.893578],[105.735257,29.871967],[105.733146,29.860693],[105.719397,29.856557],[105.720625,29.849662],[105.708939,29.840576],[105.695436,29.843497],[105.690428,29.852298],[105.677759,29.854286],[105.661801,29.84082],[105.656204,29.844389],[105.641473,29.836844],[105.617659,29.845728],[105.605875,29.827879],[105.604107,29.816844],[105.588444,29.823133],[105.580293,29.790753],[105.587511,29.784868],[105.572289,29.768713],[105.576218,29.757388],[105.574941,29.744477],[105.564335,29.737818],[105.56571,29.724012],[105.557952,29.726651],[105.549212,29.737615],[105.542829,29.726529],[105.550341,29.722022],[105.52962,29.707604],[105.538851,29.69489],[105.527951,29.692412],[105.520095,29.703583],[105.49903,29.709553],[105.49029,29.720275],[105.482188,29.718082],[105.473448,29.707523],[105.474234,29.697124],[105.481353,29.692737],[105.482777,29.679127],[105.475658,29.674699],[105.436377,29.676974],[105.420615,29.688309],[105.400532,29.67157],[105.389681,29.676487],[105.383887,29.669823],[105.393167,29.650724],[105.377553,29.643287],[105.380794,29.628248],[105.369648,29.621053],[105.365965,29.627516],[105.354377,29.626703],[105.346766,29.620199],[105.341611,29.60292],[105.335522,29.595195],[105.325653,29.595927],[105.329826,29.604384],[105.320988,29.60971],[105.320644,29.601782],[105.311315,29.593365],[105.317649,29.578156],[105.298647,29.572503],[105.289759,29.552613],[105.294326,29.53398],[105.304686,29.531254],[105.318877,29.512413],[105.323247,29.495157],[105.321234,29.475984],[105.331299,29.47175],[105.338026,29.461857],[105.336111,29.455546],[105.324622,29.450008],[105.334147,29.441416],[105.345588,29.448501],[105.360417,29.444225],[105.362037,29.454691],[105.373821,29.458274],[105.389534,29.452818],[105.399207,29.438972],[105.387471,29.438361],[105.388797,29.431886],[105.371759,29.423862],[105.373281,29.420766],[105.39631,29.422884],[105.413544,29.418567],[105.417031,29.423373],[105.427293,29.418852],[105.431466,29.408179],[105.443103,29.399094],[105.443693,29.386382],[105.432203,29.379659],[105.438586,29.370816],[105.434805,29.363114],[105.418602,29.352313],[105.422972,29.326509],[105.420075,29.316968],[105.436573,29.319496],[105.44929,29.317498],[105.454691,29.329077],[105.466476,29.321576],[105.466083,29.313421],[105.474283,29.309996],[105.466427,29.305592],[105.465395,29.292379],[105.459307,29.290136],[105.488866,29.278185],[105.509145,29.285404],[105.50939,29.274677],[105.518425,29.264438],[105.537869,29.272882],[105.55584,29.273576],[105.558295,29.27847],[105.583288,29.270353],[105.596005,29.274473],[105.609508,29.27276],[105.607986,29.255748],[105.614173,29.258359],[105.619771,29.27174],[105.6318,29.280388],[105.644076,29.270965],[105.63946,29.261582],[105.647611,29.25326],[105.666515,29.252933],[105.671622,29.260889],[105.664698,29.269048],[105.66514,29.276594],[105.678054,29.273494],[105.689838,29.29193],[105.70506,29.29923],[105.715911,29.29087],[105.69519,29.287362],[105.693963,29.267579],[105.70889,29.238],[105.705845,29.223757],[105.711983,29.218901],[105.70452,29.202411],[105.705796,29.174732],[105.719594,29.172159],[105.729463,29.152558],[105.728825,29.134424],[105.733195,29.130993],[105.742868,29.137569],[105.752099,29.129767],[105.735208,29.122414],[105.729267,29.107748],[105.729905,29.098759],[105.740855,29.088625],[105.745028,29.075465],[105.757795,29.069008],[105.741788,29.039494],[105.747631,29.037899],[105.754063,29.02412],[105.76624,29.013365],[105.76187,28.992998],[105.779105,28.979949],[105.788778,28.977617],[105.801348,28.958184],[105.80886,28.956547],[105.803852,28.947586],[105.796339,28.949632],[105.792706,28.943453],[105.797567,28.935923],[105.810579,28.940874],[105.830514,28.944271],[105.844262,28.93093],[105.852708,28.927369],[105.875049,28.933958],[105.888061,28.926837],[105.889338,28.909523],[105.909567,28.900189],[105.915607,28.907476],[105.909764,28.920452],[105.920321,28.930643],[105.934511,28.933876],[105.95808,28.952496],[105.961566,28.960107],[105.971877,28.965957],[105.9761,28.959166],[105.988424,28.964198],[105.985969,28.970131],[105.974627,28.973567],[105.984103,28.979008],[106.001535,28.973608],[106.017443,28.952905],[106.02417,28.949714],[106.036102,28.955729],[106.043811,28.954133],[106.047346,28.943575],[106.04003,28.940465],[106.042338,28.929538],[106.03949,28.918651],[106.042534,28.910587],[106.051913,28.906862],[106.062813,28.918201],[106.070522,28.919797],[106.085645,28.9103],[106.087708,28.904201],[106.10126,28.898961],[106.134354,28.90506],[106.149183,28.901949],[106.162538,28.908908],[106.173684,28.92082],[106.191606,28.908663],[106.206926,28.904528],[106.215371,28.891714],[106.225585,28.890568],[106.228089,28.881764],[106.242181,28.86821],[106.253229,28.865753],[106.255586,28.857398],[106.265062,28.846708],[106.260201,28.833641],[106.246698,28.826472],[106.254358,28.819179],[106.24439,28.814631],[106.252394,28.785823],[106.267665,28.779348],[106.273213,28.739788],[106.287698,28.732366],[106.303509,28.709113],[106.307191,28.687907],[106.30616,28.675763],[106.321087,28.665465],[106.311168,28.660048],[106.304049,28.649872],[106.310776,28.639981],[106.329778,28.63403],[106.324524,28.616749],[106.332184,28.603366],[106.340187,28.59889],[106.34662,28.58378],[106.345196,28.573021],[106.339304,28.566368],[106.344803,28.562014],[106.332037,28.553224],[106.338371,28.546858],[106.34225,28.532603],[106.349811,28.540121],[106.363903,28.526892],[106.374313,28.525618],[106.378487,28.533835],[106.373576,28.537656],[106.389829,28.553266],[106.385704,28.560823],[106.399109,28.571173],[106.412956,28.563123],[106.423218,28.562671],[106.43402,28.556675],[106.439471,28.559427],[106.454054,28.549774],[106.453072,28.544721],[106.466918,28.541846],[106.471632,28.532603],[106.483858,28.530589],[106.493384,28.538313],[106.501191,28.534533],[106.504726,28.54468],[106.488867,28.557496],[106.478899,28.574992],[106.466967,28.586408],[106.473842,28.598973],[106.498785,28.585874],[106.508802,28.564889],[106.524711,28.577826],[106.513319,28.577046],[106.494464,28.599999],[106.494955,28.615148],[106.501093,28.617898],[106.501338,28.628735],[106.506641,28.635343],[106.502762,28.661321],[106.520144,28.6621],[106.529719,28.673137],[106.515774,28.688194],[106.510324,28.715183],[106.499325,28.717398],[106.493826,28.73946],[106.462057,28.76123],[106.454201,28.776068],[106.451648,28.79279],[106.462794,28.797216],[106.46029,28.804961],[106.451402,28.808116],[106.453514,28.816967],[106.46844,28.826472],[106.461861,28.831019],[106.47448,28.833027],[106.476199,28.826759],[106.490585,28.806518],[106.508753,28.795864],[106.521126,28.794266],[106.523041,28.78111],[106.533795,28.778733],[106.53404,28.770904],[106.547985,28.769838],[106.561831,28.756064],[106.563894,28.746184],[106.559229,28.731546],[106.56026,28.72072],[106.576857,28.702387],[106.582356,28.702223],[106.587315,28.691517],[106.598068,28.691886],[106.606072,28.685035],[106.619182,28.689178],[106.614272,28.680276],[106.61766,28.667311],[106.626891,28.659269],[106.635238,28.658448],[106.643684,28.664316],[106.651393,28.64942],[106.641179,28.644167],[106.620213,28.645727],[106.618887,28.637272],[106.62861,28.63444],[106.636809,28.623235],[106.636466,28.613219],[106.629641,28.604762],[106.614665,28.609442],[106.607054,28.594292],[106.616825,28.562795],[106.615254,28.549651],[106.600622,28.541353],[106.584615,28.523276],[106.568657,28.523646],[106.560309,28.513374],[106.56792,28.505278],[106.562814,28.497388],[106.568018,28.484031],[106.589181,28.488387],[106.591489,28.499073],[106.584958,28.50684],[106.593404,28.510169],[106.610147,28.497922],[106.632734,28.503553],[106.631114,28.490237],[106.649772,28.47955],[106.661066,28.491881],[106.678349,28.481359],[106.688268,28.484647],[106.696713,28.4784],[106.693276,28.45653],[106.708547,28.450486],[106.716207,28.456365],[106.725241,28.454433],[106.732901,28.46356],[106.746649,28.466643],[106.744833,28.489867],[106.726027,28.518551],[106.723965,28.529891],[106.728187,28.54201],[106.73732,28.553307],[106.754358,28.558318],[106.765161,28.558153],[106.779891,28.56378],[106.780922,28.574869],[106.766634,28.580166],[106.758581,28.588133],[106.759023,28.611084],[106.773901,28.611946],[106.780333,28.625],[106.792559,28.616256],[106.793443,28.606486],[106.800514,28.602134],[106.807732,28.589447],[106.827078,28.598562],[106.833264,28.613219],[106.829287,28.622742],[106.856146,28.622496],[106.866359,28.624507],[106.871515,28.658817],[106.883201,28.69246],[106.862136,28.690983],[106.854722,28.697095],[106.853936,28.706324],[106.862529,28.707555],[106.852905,28.724452],[106.828354,28.737696],[106.824033,28.756146],[106.833363,28.768772],[106.838469,28.765985],[106.845393,28.781028],[106.862333,28.780577],[106.864591,28.77447],[106.874215,28.779716],[106.886392,28.794716],[106.897882,28.80115],[106.905345,28.79611],[106.923071,28.810042],[106.938391,28.792381],[106.94227,28.782135],[106.950224,28.777626],[106.951746,28.766969],[106.967803,28.774101],[106.987885,28.774675],[106.988671,28.790331],[106.981355,28.804347],[106.980814,28.812951],[106.98926,28.829585],[106.983368,28.851173],[106.997853,28.853507],[107.005169,28.859159],[107.019114,28.860675],[107.016118,28.882501],[107.036594,28.88115],[107.04062,28.863869],[107.058689,28.868947],[107.045579,28.874926],[107.052552,28.8911],[107.057462,28.894785],[107.066546,28.895358],[107.07234,28.879308],[107.063354,28.877055],[107.059819,28.868456],[107.072683,28.866613],[107.08707,28.872264],[107.096694,28.890076],[107.141965,28.887742],[107.146827,28.876236],[107.155861,28.882993],[107.166565,28.880659],[107.178644,28.883361],[107.184095,28.879922],[107.193571,28.888766],[107.198432,28.878407],[107.194013,28.876605],[107.206534,28.868005],[107.19691,28.847405],[107.195142,28.838065],[107.226371,28.836795],[107.216354,28.828151],[107.210609,28.814795],[107.213408,28.795003],[107.21876,28.788733],[107.219202,28.772707],[107.24665,28.761845],[107.253573,28.766805],[107.252395,28.780577],[107.261429,28.792708],[107.277142,28.799183],[107.304639,28.806764],[107.325409,28.809591],[107.345147,28.829585],[107.331988,28.841178],[107.359878,28.849985],[107.367243,28.844988],[107.383447,28.848551],[107.395378,28.86088],[107.391941,28.868497],[107.406131,28.89155],[107.415657,28.88979],[107.41443,28.913248],[107.422875,28.928269],[107.433579,28.933754],[107.441043,28.94378],[107.438784,28.955278],[107.421549,28.954542],[107.412957,28.960148],[107.405542,28.972258],[107.404413,28.981872],[107.396949,28.993325],[107.370435,28.993897],[107.364542,29.010543],[107.378536,29.021912],[107.381041,29.029926],[107.395182,29.039657],[107.390714,29.059075],[107.379862,29.05744],[107.369747,29.091608],[107.374412,29.097574],[107.392285,29.091281],[107.412957,29.095735],[107.427589,29.127357],[107.4215,29.135813],[107.408439,29.138345],[107.408095,29.150271],[107.412318,29.161379],[107.401516,29.175957],[107.401565,29.184694],[107.405444,29.188613],[107.428473,29.191144],[107.441435,29.203962],[107.463973,29.195431],[107.462353,29.176855],[107.473106,29.170975],[107.486707,29.174242],[107.514891,29.194206],[107.532224,29.195471],[107.549557,29.210085],[107.553387,29.218697],[107.565711,29.220982],[107.575139,29.20784],[107.575237,29.189062],[107.580147,29.183591],[107.583437,29.16828],[107.590164,29.165299],[107.585057,29.158357],[107.589231,29.150026],[107.601015,29.147821],[107.600622,29.15897],[107.606711,29.165463],[107.616924,29.163013],[107.629936,29.165585],[107.641573,29.16093],[107.659446,29.16289],[107.66362,29.147535],[107.698629,29.141245],[107.707565,29.154151],[107.718515,29.156152],[107.727206,29.175712],[107.724751,29.182203],[107.739383,29.189021],[107.751609,29.199635],[107.76089,29.189021],[107.760251,29.177712],[107.767911,29.17514],[107.775227,29.162808],[107.781905,29.161992],[107.795162,29.146473],[107.808567,29.142838],[107.810629,29.138345],[107.799974,29.106195],[107.78981,29.082372],[107.785244,29.04722],[107.823543,29.034219],[107.821186,29.005758],[107.810433,28.984285],[107.82811,28.976144],[107.842005,28.964648],[107.867538,28.960475],[107.872006,28.983058],[107.883054,28.986535],[107.887571,29.000114],[107.885215,29.008417],[107.908783,29.007353],[107.931124,29.035241],[107.949292,29.033729],[107.993925,29.033851],[108.02427,29.038676],[108.034532,29.046771],[108.035956,29.054047],[108.070474,29.086418],[108.109854,29.076078],[108.130624,29.063326],[108.132686,29.054088],[108.150068,29.053311],[108.171427,29.06537],[108.197745,29.070643],[108.204718,29.056786],[108.215029,29.056132],[108.230398,29.046975],[108.224653,29.031562],[108.24228,29.028372],[108.256962,29.041987],[108.260203,29.063735],[108.268648,29.077795],[108.270612,29.090913],[108.28657,29.089197],[108.301939,29.083067],[108.307193,29.077509],[108.297863,29.047179],[108.309795,29.018436],[108.308715,29.003386],[108.312103,28.997497]]],[[[109.105534,30.585661],[109.105926,30.610738],[109.09316,30.609007],[109.083585,30.598261],[109.092865,30.578737],[109.098659,30.579099],[109.101114,30.579542],[109.102686,30.580146],[109.105534,30.585661]]],[[[105.583141,30.12395],[105.582699,30.12755],[105.580244,30.129694],[105.574155,30.130422],[105.583141,30.12395]]],[[[109.098659,30.579099],[109.092865,30.578737],[109.103668,30.565812],[109.106123,30.570765],[109.098659,30.579099]]],[[[107.058395,30.043063],[107.053779,30.043751],[107.054221,30.040837],[107.0554,30.040553],[107.058395,30.043063]]]]}}]}
diff --git a/simsun.ttc b/simsun.ttc
deleted file mode 100644
index e64e92ed9c..0000000000
Binary files a/simsun.ttc and /dev/null differ