From 24c4e7eacc0966283c76f72248910bdf4eef72bc Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Sat, 16 Jan 2021 00:41:34 +0800 Subject: [PATCH 1/4] chore: update version 2.3.7 --- packages/l7/src/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index ff33fe85dd..ff1054fbab 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.3.6'; +const version = '2.3.7'; export { version }; From d71082f0455bd141c11588980b716a6e552cbb7f Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Sun, 28 Feb 2021 11:55:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/component/src/marker.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/component/src/marker.ts b/packages/component/src/marker.ts index ab75bd8a11..864324a492 100644 --- a/packages/component/src/marker.ts +++ b/packages/component/src/marker.ts @@ -226,7 +226,7 @@ export default class Marker extends EventEmitter { const { lng, lat } = this.lngLat; const bounds = this.mapsService.getBounds(); const pos = this.mapsService.lngLatToContainer([lng, lat]); - + if (element) { element.style.display = 'block'; const container = this.mapsService.getContainer(); @@ -236,21 +236,26 @@ export default class Marker extends EventEmitter { containerWidth = container.scrollWidth; containerHeight = container.scrollHeight; } - //当前可视区域包含跨日界线 - if(Math.abs(bounds[0][0]) > 180 || Math.abs(bounds[1][0]) >180){ - if(pos.x > containerWidth){ + // 当前可视区域包含跨日界线 + if (Math.abs(bounds[0][0]) > 180 || Math.abs(bounds[1][0]) > 180) { + if (pos.x > containerWidth) { // 日界线右侧点左移 - let newPos = this.mapsService.lngLatToContainer([lng - 360, lat]); + const newPos = this.mapsService.lngLatToContainer([lng - 360, lat]); pos.x = newPos.x; } - if(pos.x < 0){ + if (pos.x < 0) { // 日界线左侧点右移 - let newPos = this.mapsService.lngLatToContainer([lng + 360, lat]); + const newPos = this.mapsService.lngLatToContainer([lng + 360, lat]); pos.x = newPos.x; } } // 不在当前可视区域内隐藏点 - if (pos.x > containerWidth || pos.x < 0 || pos.y > containerHeight || pos.y < 0) { + if ( + pos.x > containerWidth || + pos.x < 0 || + pos.y > containerHeight || + pos.y < 0 + ) { element.style.display = 'none'; } element.style.left = pos.x + offsets[0] + 'px'; From 46adc1cf5a8f7ebcdcf1b237c8b5a6e6726f54f3 Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Sun, 28 Feb 2021 12:20:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8C=85=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/three/package.json | 2 +- tsconfig.build.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/three/package.json b/packages/three/package.json index 06e14c9cf2..62450ff08b 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -34,7 +34,7 @@ "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", "build:esm": "BABEL_ENV=esm babel src --root-mode upward --out-dir es --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments", - "build:cdn": "node_modules/.bin/rollup -c", + "buildcdn": "node_modules/.bin/rollup -c", "lint:ts": "run-p -c lint:ts-*", "test": "jest", "sync": "tnpm sync" diff --git a/tsconfig.build.json b/tsconfig.build.json index 5cffc17722..f4770ca653 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -13,7 +13,6 @@ "@antv/l7-map": ["packages/map/src"], "@antv/l7-maps": ["packages/maps/src"], "@antv/l7-scene": ["packages/scene/src"], - "@antv/l7-scene": ["packages/scene/src"], "@antv/l7-renderer": ["packages/renderer/src"], "@antv/l7-three": ["packages/three/src"], "@antv/l7-mini": ["packages/mini/src"], From 21b40b43fd8b2a5989183dee7b85ddd9fc19c3e0 Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Sun, 28 Feb 2021 12:21:55 +0800 Subject: [PATCH 4/4] chore: publish --- lerna.json | 2 +- packages/component/package.json | 6 +++--- packages/core/package.json | 4 ++-- packages/l7/package.json | 14 +++++++------- packages/layers/package.json | 8 ++++---- packages/map/package.json | 4 ++-- packages/maps/package.json | 8 ++++---- packages/renderer/package.json | 4 ++-- packages/scene/package.json | 12 ++++++------ packages/source/package.json | 6 +++--- packages/three/package.json | 4 ++-- packages/utils/package.json | 2 +- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/lerna.json b/lerna.json index fa2ba8b4f3..41c7417546 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.3.8", + "version": "2.3.9", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index 5918141f40..0c57ca452a 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "2.3.8", - "@antv/l7-utils": "2.3.8", + "@antv/l7-core": "2.3.9", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.0", "inversify": "^5.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index 95266592f0..4636514233 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -24,7 +24,7 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-utils": "2.3.8", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "@mapbox/tiny-sdf": "^1.1.1", "ajv": "^6.10.2", diff --git a/packages/l7/package.json b/packages/l7/package.json index f80fa7a6e6..7287affe8f 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.3.8", + "version": "2.3.9", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,12 +25,12 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "2.3.8", - "@antv/l7-core": "2.3.8", - "@antv/l7-layers": "2.3.8", - "@antv/l7-maps": "2.3.8", - "@antv/l7-scene": "2.3.8", - "@antv/l7-utils": "2.3.8", + "@antv/l7-component": "2.3.9", + "@antv/l7-core": "2.3.9", + "@antv/l7-layers": "2.3.9", + "@antv/l7-maps": "2.3.9", + "@antv/l7-scene": "2.3.9", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7" }, "gitHead": "20154fe30d512024b03ac5e40f77731bc0580bb0", diff --git a/packages/layers/package.json b/packages/layers/package.json index 00f707e893..29b4afe60e 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.3.8", + "version": "2.3.9", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -24,9 +24,9 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "2.3.8", - "@antv/l7-source": "2.3.8", - "@antv/l7-utils": "2.3.8", + "@antv/l7-core": "2.3.9", + "@antv/l7-source": "2.3.9", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/meta": "^6.0.2", diff --git a/packages/map/package.json b/packages/map/package.json index 45442f57c6..9979559ac6 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.3.8", + "version": "2.3.9", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "2.3.8", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "@mapbox/point-geometry": "^0.1.0", "@mapbox/unitbezier": "^0.0.0", diff --git a/packages/maps/package.json b/packages/maps/package.json index c207f138fe..6daeeffb81 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -27,9 +27,9 @@ "license": "ISC", "dependencies": { "@amap/amap-jsapi-loader": "^0.0.3", - "@antv/l7-core": "2.3.8", - "@antv/l7-map": "2.3.8", - "@antv/l7-utils": "2.3.8", + "@antv/l7-core": "2.3.9", + "@antv/l7-map": "2.3.9", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 652d0aeb49..9e527cd44c 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "2.3.8", + "@antv/l7-core": "2.3.9", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "lodash": "^4.17.15", diff --git a/packages/scene/package.json b/packages/scene/package.json index ca05160e26..f4b380a42d 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,11 +23,11 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "2.3.8", - "@antv/l7-core": "2.3.8", - "@antv/l7-maps": "2.3.8", - "@antv/l7-renderer": "2.3.8", - "@antv/l7-utils": "2.3.8", + "@antv/l7-component": "2.3.9", + "@antv/l7-core": "2.3.9", + "@antv/l7-maps": "2.3.9", + "@antv/l7-renderer": "2.3.9", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "mapbox-gl": "^1.2.1", diff --git a/packages/source/package.json b/packages/source/package.json index 49f7c505f6..80fea2696d 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "2.3.8", - "@antv/l7-utils": "2.3.8", + "@antv/l7-core": "2.3.9", + "@antv/l7-utils": "2.3.9", "@babel/runtime": "^7.7.7", "@mapbox/geojson-rewind": "^0.4.0", "@turf/helpers": "^6.1.4", diff --git a/packages/three/package.json b/packages/three/package.json index 62450ff08b..31bacedf18 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.3.8", + "version": "2.3.9", "description": "three for L7 ", "keywords": [ "3D", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7": "2.3.8", + "@antv/l7": "2.3.9", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "rollup": "^2.3.3", diff --git a/packages/utils/package.json b/packages/utils/package.json index 29e1ad78bd..341577f973 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.3.8", + "version": "2.3.9", "description": "", "main": "lib/index.js", "module": "es/index.js",