fix: 给图层描边宽度加限制 (#67)

antvis · Nov 3, 2023 · 7516d77 · 7516d77
1 parent 3c8fc56
commit 7516d77
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 28 deletions.
diff --git a/README.en-US.md b/README.en-US.md
@@ -4,17 +4,17 @@
 
 <div align="center">
 
-🌍 L7VP （<a href="https://github.com/antvis/L7">L7</a> Visualization Platform）is an geospatial intelligent visual analysis application and development platform.
-
-[![SDK Version](https://badgen.net/npm/v/@antv/li-sdk)](https://npmjs.com/@antv/li-sdk) [![Release Status](https://github.com/antvis/L7VP/workflows/release/badge.svg)](https://github.com/antvis/L7VP/actions?query=workflow:release) [![Percentage of issues still open](http://isitmaintained.com/badge/open/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Percentage of issues still open') [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Average time to resolve an issue') ![License](https://flat-badgen.vercel.app/github/license/antvis/L7VP)
+🌍 L7VP （<a href="https://github.com/antvis/L7" target="_blank">L7</a> Visualization Platform）is an geospatial intelligent visual analysis and application development tools.
 
 <p align="center">
-  <a href="https://locationinsight.antv.antgroup.com">Website</a> •
-  <a href="https://www.yuque.com/antv/l7vp">Document</a> •
-  <a href="https://www.yuque.com/antv/l7vp/cmp1vz2u5p07ghrt">SDK</a> •
-  <a href="https://locationinsight.antv.antgroup.com/#/case">Case</a>
+  <a href="https://locationinsight.antv.antgroup.com" target="_blank">Website</a> •
+    <a href="https://locationinsight.antv.antgroup.com/#/docs" target="_blank">Document</a> •
+  <a href="https://locationinsight.antv.antgroup.com/#/docs?path=cmp1vz2u5p07ghrt" target="_blank">SDK</a> •
+  <a href="https://locationinsight.antv.antgroup.com/#/case" target="_blank">Case</a>
 </p>
 
+[![SDK Version](https://badgen.net/npm/v/@antv/li-sdk)](https://npmjs.com/@antv/li-sdk) [![Release Status](https://github.com/antvis/L7VP/workflows/release/badge.svg)](https://github.com/antvis/L7VP/actions?query=workflow:release) [![Percentage of issues still open](http://isitmaintained.com/badge/open/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Percentage of issues still open') [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Average time to resolve an issue') ![License](https://flat-badgen.vercel.app/github/license/antvis/L7VP)
+
 <div align="center">
   <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*EAcUQb_UzAEAAAAAAAAAAAAADmJ7AQ/original.png" width="800">
 </div>
@@ -23,15 +23,50 @@
 
 <br>
 
-L7VP means AntV L7 Visualization Platform，L in L7 stands for Location, and 7 stands for the seven continents of the world, implying the ability to provide visual analysis for global location data.
+AntV [L7VP](https://locationinsight.antv.antgroup.com) is a geospatial intelligent visual analysis tool and application development tool, originally named LocationInsight. L7VP is named after AntV L7 Visualization Platform, where L represents Location and 7 represents the seven continents of the world, implying the ability to provide visual analysis for global location data.
+
+[L7VP](https://locationinsight.antv.antgroup.com) provides users with a powerful and flexible geographic visualization analysis tool through its rich geographic visualization effects, insight analysis capabilities, map application building tools, and open expansion capabilities, meeting various visualization needs and data analysis application scenarios.
 
 ## ✨ Features
 
 - 🚀 Fast: Possess insight into spatio-temporal data, and quickly produce visualization results.
 - 🛠 Expansion: With scalability, the business can be customized.
 - 🏗 Embedding: Provide open components, business systems can be easily embedded.
 
-## 🖥 Local Case
+## 🖥 Online
+
+- <a href="https://locationinsight.antv.antgroup.com" target="_blank">Website</a>
+- <a href="https://locationinsight.antv.antgroup.com/#/docs?path=get-started" target="_blank">Get Started</a>
+- <a href="https://locationinsight.antv.antgroup.com/#/docs?path=data-formats" target="_blank">Data Formats</a>
+- <a href="https://locationinsight.antv.antgroup.com/#/docs?path=layer-category" target="_blank">Layer Category</a>
+
+<div align="center">
+  <img src="https://github.com/antvis/L7VP/assets/26923747/9d064849-ef9f-4999-9d98-3a704df554fc" width="800">
+</div>
+
+Learn more 👉 <a href="https://locationinsight.antv.antgroup.com/#/docs" target="_blank">User Guide</a>
+
+## 🐍 PyL7VP
+
+```py
+from pyl7vp import L7VP
+
+l7vp_map = L7VP(height = 600)
+
+# add dataset to map
+l7vp_map.add_dataset({"id": "my_dataset", "type": 'local', "data": df})
+
+# display map
+l7vp_map.show()
+```
+
+<div align="center">
+  <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*MsnaS4IHywoAAAAAAAAAAAAADmJ7AQ/original" width="800">
+</div>
+
+Learn more 👉 [PyL7VP](https://github.com/antvis/L7VP/tree/master/bindings/pyl7vp)
+
+## 🔬 Local Case
 
 ### 🔨 PreBuild
 

diff --git a/README.md b/README.md
@@ -4,17 +4,17 @@
 
 <div align="center">
 
-🌍 L7VP （<a href="https://github.com/antvis/L7">L7</a> Visualization Platform）是一款地理空间智能应用研发平台。
-
-[![SDK Version](https://badgen.net/npm/v/@antv/li-sdk)](https://npmjs.com/@antv/li-sdk) [![Release Status](https://github.com/antvis/L7VP/workflows/release/badge.svg)](https://github.com/antvis/L7VP/actions?query=workflow:release) [![Percentage of issues still open](http://isitmaintained.com/badge/open/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Percentage of issues still open') [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Average time to resolve an issue') ![License](https://flat-badgen.vercel.app/github/license/antvis/L7VP)
+🌍 L7VP （<a href="https://github.com/antvis/L7" target="_blank">L7</a> Visualization Platform）地理空间智能可视分析工具和应用研发工具。
 
 <p align="center">
-  <a href="https://locationinsight.antv.antgroup.com">网站</a> •
-  <a href="https://www.yuque.com/antv/l7vp">文档</a> •
-  <a href="https://www.yuque.com/antv/l7vp/cmp1vz2u5p07ghrt">SDK</a> •
-  <a href="https://locationinsight.antv.antgroup.com/#/case">案例</a>
+  <a href="https://locationinsight.antv.antgroup.com" target="_blank">网站</a> •
+  <a href="https://locationinsight.antv.antgroup.com/#/docs" target="_blank">文档</a> •
+  <a href="https://locationinsight.antv.antgroup.com/#/docs?path=cmp1vz2u5p07ghrt" target="_blank">SDK</a> •
+  <a href="https://locationinsight.antv.antgroup.com/#/case" target="_blank">案例</a>
 </p>
 
+[![SDK Version](https://badgen.net/npm/v/@antv/li-sdk)](https://npmjs.com/@antv/li-sdk) [![Release Status](https://github.com/antvis/L7VP/workflows/release/badge.svg)](https://github.com/antvis/L7VP/actions?query=workflow:release) [![Percentage of issues still open](http://isitmaintained.com/badge/open/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Percentage of issues still open') [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/antvis/l7vp.svg)](http://isitmaintained.com/project/antvis/l7vp 'Average time to resolve an issue') ![License](https://flat-badgen.vercel.app/github/license/antvis/L7VP)
+
 <div align="center">
   <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*EAcUQb_UzAEAAAAAAAAAAAAADmJ7AQ/original.png" width="800">
 </div>
@@ -23,15 +23,50 @@
 
 <br>
 
-L7VP 取名意为 AntV L7 Visualization Platform，L7 中的 L 代表 Location，7 代表世界七大洲，寓意能为全球位置数据提供可视分析的能力。
+AntV [L7VP](https://locationinsight.antv.antgroup.com) 是一款地理空间智能可视分析工具&应用研发工具，其原名 LocationInsight，L7VP 取名意为 AntV L7 Visualization Platform，[L7](https://github.com/antvis/L7) 中的 L 代表 Location，7 代表世界七大洲，寓意能为全球位置数据提供可视分析的能力。
+
+[L7VP](https://locationinsight.antv.antgroup.com) 通过其丰富的地理可视化效果、洞察分析能力、地图应用搭建工具和开放扩展能力，为用户提供了一个强大而灵活的地理可视分析工具，满足各类可视化需求和数据分析应用场景。
 
 ## ✨ 特性
 
 - 🚀 快速：具备有时空数据的洞察能力，快速出可视化成果。
 - 🛠 扩展：拥有可扩展能力，业务可自定义定制。
 - 🏗 嵌入：提供开放的组件，业务系统可轻松嵌入。
 
-## 🖥 查看示例
+## 🖥 在线工具
+
+- <a href="https://locationinsight.antv.antgroup.com" target="_blank">在线网址</a>
+- <a href="https://locationinsight.antv.antgroup.com/#/docs?path=get-started" target="_blank">快速入门</a>
+- <a href="https://locationinsight.antv.antgroup.com/#/docs?path=data-formats" target="_blank">数据格式</a>
+- <a href="https://locationinsight.antv.antgroup.com/#/docs?path=layer-category" target="_blank">图层分类</a>
+
+<div align="center">
+  <img src="https://github.com/antvis/L7VP/assets/26923747/9d064849-ef9f-4999-9d98-3a704df554fc" width="800">
+</div>
+
+更多了解 👉 <a href="https://locationinsight.antv.antgroup.com/#/docs" target="_blank">使用文档</a>
+
+## 🐍 PyL7VP
+
+```py
+from pyl7vp import L7VP
+
+l7vp_map = L7VP(height = 600)
+
+# add dataset to map
+l7vp_map.add_dataset({"id": "my_dataset", "type": 'local', "data": df})
+
+# display map
+l7vp_map.show()
+```
+
+<div align="center">
+  <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*MsnaS4IHywoAAAAAAAAAAAAADmJ7AQ/original" width="800">
+</div>
+
+更多了解 👉 [PyL7VP](https://github.com/antvis/L7VP/tree/master/bindings/pyl7vp)
+
+## 🔬 本地示例
 
 ### 🔨 构建依赖
 
@@ -45,7 +80,7 @@ yarn install && yarn build:package
 cd examples/builder && yarn install
 ```
 
-### 💻 启动示例
+### 🛫 启动示例
 
 ```bash
 yarn run dev

diff --git a/bindings/pyl7vp/README.md b/bindings/pyl7vp/README.md
@@ -7,7 +7,7 @@
 [![Latest Stable Version](https://img.shields.io/pypi/v/pyl7vp.svg)](https://pypi.python.org/pypi/pyl7vp) [![Test Status](https://github.com/antvis/L7VP/workflows/pyl7vp-test/badge.svg)](https://github.com/antvis/L7VP/actions?query=workflow:pyl7vp-test) [![Pypi Download](https://img.shields.io/pypi/dm/pyl7vp)](https://pypi.python.org/pypi/pyl7vp)
 
 <div align="center">
-  <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*BxIZT4x7pQ4AAAAAAAAAAAAADmJ7AQ/original" width="800">
+  <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*MsnaS4IHywoAAAAAAAAAAAAADmJ7AQ/original" width="800">
 </div>
 
 ## Installation

diff --git a/bindings/pyl7vp/README.zh-CN.md b/bindings/pyl7vp/README.zh-CN.md
@@ -7,7 +7,7 @@
 [![Latest Stable Version](https://img.shields.io/pypi/v/pyl7vp.svg)](https://pypi.python.org/pypi/pyl7vp) [![Test Status](https://github.com/antvis/L7VP/workflows/pyl7vp-test/badge.svg)](https://github.com/antvis/L7VP/actions?query=workflow:pyl7vp-test) [![Pypi Download](https://img.shields.io/pypi/dm/pyl7vp)](https://pypi.python.org/pypi/pyl7vp)
 
 <div align="center">
-  <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*BxIZT4x7pQ4AAAAAAAAAAAAADmJ7AQ/original" width="800">
+  <img src="https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*MsnaS4IHywoAAAAAAAAAAAAADmJ7AQ/original" width="800">
 </div>
 
 ## 安装

diff --git a/packages/li-core-assets/src/layers/BubbleLayer/index.tsx b/packages/li-core-assets/src/layers/BubbleLayer/index.tsx
@@ -30,7 +30,7 @@ export default implementLayer({
     radius: 10,
     fillColor: 'rgb(90, 216, 166)',
     opacity: 0.8,
-    strokeColor: 'rgb(146, 112, 202)',
+    strokeColor: '#a9abb1',
     lineWidth: 1,
     lineOpacity: 1,
     label: {

diff --git a/packages/li-core-assets/src/layers/ChoroplethLayer/index.tsx b/packages/li-core-assets/src/layers/ChoroplethLayer/index.tsx
@@ -47,7 +47,7 @@ export default implementLayer({
     lineOpacity: 0.7,
     label: {
       style: {
-        fill: 'red',
+        fill: '#c0c0c0',
         fontSize: 14,
         textAnchor: 'center',
         textOffset: [0, 0],

diff --git a/packages/li-p2/src/LayerAttribute/common-schema/label-collapse.ts b/packages/li-p2/src/LayerAttribute/common-schema/label-collapse.ts
@@ -48,7 +48,9 @@ export default (options: AttributeSchemaOptions) => {
             'x-decorator': 'FormItem',
             'x-component': 'Slider',
             'x-component-props': {
-              placeholder: '字号',
+              min: 0,
+              max: 50,
+              step: 1,
             },
             'x-decorator-props': {},
           },

diff --git a/packages/li-p2/src/LayerAttribute/common-schema/stroke-collapse.ts b/packages/li-p2/src/LayerAttribute/common-schema/stroke-collapse.ts
@@ -30,7 +30,9 @@ export default () => {
             'x-decorator': 'FormItem',
             'x-component': 'Slider',
             'x-component-props': {
-              placeholder: '描边宽度',
+              min: 0,
+              max: 10,
+              step: 0.5,
             },
             'x-decorator-props': {},
           },

diff --git a/packages/li-sdk/package.json b/packages/li-sdk/package.json
@@ -42,7 +42,7 @@
     "classnames": "^2.3.1",
     "dayjs": "^1.11.7",
     "h3-js": "^4.1.0",
-    "immer": "^9.0.15",
+    "immer": "^10.0.3",
     "lodash-es": "^4.17.21",
     "wkt": "^0.1.1"
   },

diff --git a/packages/li-sdk/src/hooks/useDatasetFilter.ts b/packages/li-sdk/src/hooks/useDatasetFilter.ts
@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import type { DatasetFilter, FilterNode } from '../specs';
 import { isLocalOrRemoteDataset } from '../utils';
 import { useDatasetBase, useStateManager } from './internal';

diff --git a/packages/li-sdk/src/state/map.ts b/packages/li-sdk/src/state/map.ts
@@ -1,5 +1,5 @@
 import type { Scene } from '@antv/l7';
-import produce from 'immer';
+import { produce } from 'immer';
 import type { MapSchema } from '../specs';
 import BaseStore from './base-store';
 import { MapStoreEvent } from './constants';