p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: merge conflict

This commit is contained in:
thinkinggis 2020-03-30 22:57:01 +08:00
parent 2d79d7bc03 bcb8060ba8
commit a686de7b8f
18 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -14,7 +14,7 @@
"message": "chore: publish"
}
},
"version": "2.1.8",
"version": "2.1.9",
"npmClient": "yarn",
"useWorkspaces": true,
"publishConfig": {

6
packages/component/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-component",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -24,8 +24,8 @@
"author": "lzxue",
"license": "ISC",
"dependencies": {
"@antv/l7-core": "^2.1.8",
"@antv/l7-utils": "^2.1.8",
"@antv/l7-core": "^2.1.9",
"@antv/l7-utils": "^2.1.9",
"@babel/runtime": "^7.7.7",
"eventemitter3": "^4.0.0",
"inversify": "^5.0.1",

4
packages/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-core",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -23,7 +23,7 @@
"license": "ISC",
"dependencies": {
"@antv/async-hook": "^2.1.0",
"@antv/l7-utils": "^2.1.8",
"@antv/l7-utils": "^2.1.9",
"@babel/runtime": "^7.7.7",
"@mapbox/tiny-sdf": "^1.1.1",
"ajv": "^6.10.2",

2
packages/core/src/services/map/IMapService.ts
View File

@ -65,7 +65,7 @@ export interface IMapService<RawMap = {}> {
setPitch(pitch: number): void;
setZoom(zoom: number): void;
setMapStyle(style: any): void;
setStatus(option: Partial<IStatusOptions>): void;
setMapStatus(option: Partial<IStatusOptions>): void;
// coordinates methods
pixelToLngLat(pixel: Point): ILngLat;

6
packages/draw/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-draw",
"version": "2.1.8",
"version": "2.1.9",
"description": "L7 Draw moudules",
"keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>",
@ -34,8 +34,8 @@
},
"dependencies": {
"@turf/midpoint": "^5.1.5",
"@antv/l7": "^2.1.8",
"@antv/l7-component": "^2.1.8",
"@antv/l7-component": "^2.1.9",
"@antv/l7": "^2.1.9",
"@babel/runtime": "^7.7.7",
"@turf/circle": "^6.0.1",
"@turf/distance": "^6.0.1",

12
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7",
"version": "2.1.8",
"version": "2.1.9",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js",
"module": "es/index.js",
@ -24,11 +24,11 @@
"author": "antv",
"license": "MIT",
"dependencies": {
"@antv/l7-component": "^2.1.8",
"@antv/l7-core": "^2.1.8",
"@antv/l7-layers": "^2.1.8",
"@antv/l7-maps": "^2.1.8",
"@antv/l7-scene": "^2.1.8",
"@antv/l7-component": "^2.1.9",
"@antv/l7-core": "^2.1.9",
"@antv/l7-layers": "^2.1.9",
"@antv/l7-maps": "^2.1.9",
"@antv/l7-scene": "^2.1.9",
"@babel/runtime": "^7.7.7"
},
"gitHead": "a5d354b66873f700730248d015c5e539c54b34b7",

2
packages/l7/src/index.ts
View File

@ -3,4 +3,4 @@ export * from '@antv/l7-scene';
export * from '@antv/l7-maps';
export * from '@antv/l7-layers';
export * from '@antv/l7-component';
export const version = '2.1.8';
export const version = '2.1.9';

8
packages/layers/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-layers",
"version": "2.1.8",
"version": "2.1.9",
"description": "L7's collection of built-in layers",
"main": "lib/index.js",
"module": "es/index.js",
@ -23,9 +23,9 @@
"license": "ISC",
"dependencies": {
"@antv/async-hook": "^2.1.0",
"@antv/l7-core": "^2.1.8",
"@antv/l7-source": "^2.1.8",
"@antv/l7-utils": "^2.1.8",
"@antv/l7-core": "^2.1.9",
"@antv/l7-source": "^2.1.9",
"@antv/l7-utils": "^2.1.9",
"@babel/runtime": "^7.7.7",
"@mapbox/martini": "^0.1.0",
"@turf/meta": "^6.0.2",

6
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-maps",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,8 +25,8 @@
"author": "xiaoiver",
"license": "ISC",
"dependencies": {
"@antv/l7-core": "^2.1.8",
"@antv/l7-utils": "^2.1.8",
"@antv/l7-core": "^2.1.9",
"@antv/l7-utils": "^2.1.9",
"@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6",
"gl-matrix": "^3.1.0",

2
packages/maps/src/amap/map.ts
View File

@ -203,7 +203,7 @@ export default class AMapService
this.map.setMapStyle(this.getMapStyle(style));
}
public setStatus(option: Partial<IStatusOptions>) {
public setMapStatus(option: Partial<IStatusOptions>): void {
this.map.setStatus(option);
}
public pixelToLngLat(pixel: [number, number]): ILngLat {

2
packages/maps/src/mapbox/map.ts
View File

@ -167,7 +167,7 @@ export default class MapboxService
public setMinZoom(min: number): void {
this.map.setMinZoom(min);
}
public setStatus(option: Partial<IStatusOptions>) {
public setMapStatus(option: Partial<IStatusOptions>): void {
if (option.doubleClickZoom === true) {
this.map.doubleClickZoom.enable();
}

6
packages/react/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-react",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -24,8 +24,8 @@
"author": "lzxue",
"license": "ISC",
"dependencies": {
"@antv/l7": "^2.1.8",
"@antv/l7-maps": "^2.1.8",
"@antv/l7": "^2.1.9",
"@antv/l7-maps": "^2.1.9",
"@babel/runtime": "^7.7.7",
"load-styles": "^2.0.0"
},

4
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-renderer",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,7 +25,7 @@
"gl": "^4.4.0"
},
"dependencies": {
"@antv/l7-core": "^2.1.8",
"@antv/l7-core": "^2.1.9",
"@babel/runtime": "^7.7.7",
"inversify": "^5.0.1",
"lodash": "^4.17.15",

12
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-scene",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -22,11 +22,11 @@
"author": "xiaoiver",
"license": "ISC",
"dependencies": {
"@antv/l7-component": "^2.1.8",
"@antv/l7-core": "^2.1.8",
"@antv/l7-maps": "^2.1.8",
"@antv/l7-renderer": "^2.1.8",
"@antv/l7-utils": "^2.1.8",
"@antv/l7-component": "^2.1.9",
"@antv/l7-core": "^2.1.9",
"@antv/l7-maps": "^2.1.9",
"@antv/l7-renderer": "^2.1.9",
"@antv/l7-utils": "^2.1.9",
"@babel/runtime": "^7.7.7",
"inversify": "^5.0.1",
"mapbox-gl": "^1.2.1",

2
packages/scene/src/IMapController.ts
View File

@ -67,7 +67,7 @@ export default interface IMapController {
setPitch(pitch: number): void;
setZoom(zoom: number): void;
setMapStyle(style: any): void;
setStatus(option: Partial<IStatusOptions>): void;
setMapStatus(option: Partial<IStatusOptions>): void;
// coordinates methods
pixelToLngLat(pixel: Point): ILngLat;

4
packages/scene/src/index.ts
View File

@ -305,8 +305,8 @@ class Scene
this.mapService.setMapStyle(style);
}
public setStatus(options: IStatusOptions) {
this.mapService.setStatus(options);
public setMapStatus(options: IStatusOptions) {
this.mapService.setMapStatus(options);
}
// conversion Method

6
packages/source/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-source",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",
@ -25,8 +25,8 @@
"license": "ISC",
"dependencies": {
"@antv/async-hook": "^2.1.0",
"@antv/l7-core": "^2.1.8",
"@antv/l7-utils": "^2.1.8",
"@antv/l7-core": "^2.1.9",
"@antv/l7-utils": "^2.1.9",
"@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4",

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-utils",
"version": "2.1.8",
"version": "2.1.9",
"description": "",
"main": "lib/index.js",
"module": "es/index.js",