Skip to content

Commit

Permalink
Migrate tile layer (#2236)
Browse files Browse the repository at this point in the history
* fix: 修复栅格瓦片显示

* fix: 修复冲突

* chore: renderer ts  定义

* docs: add 矢量瓦片demo

* fix: clear depth & stencil before rende mask

* chore: update tile snapshot

* chore: update tile vector snapshot

---------

Co-authored-by: yuqi.pyq <yuqi.pyq@antgroup.com>
  • Loading branch information
lzxue and xiaoiver authored Jan 8, 2024
1 parent 249e404 commit 83d41db
Show file tree
Hide file tree
Showing 48 changed files with 520 additions and 206 deletions.
Binary file added __tests__/e2e/snapshots/Tile_vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed __tests__/e2e/snapshots/mask-single-mask.png
Binary file not shown.
252 changes: 131 additions & 121 deletions __tests__/e2e/tests.ts
Original file line number Diff line number Diff line change
@@ -1,124 +1,134 @@
export const TestDemoList: Array<{
type: string,
snapshots?:boolean
demos: Array<{
name: string;
sleepTime?: number;
snapshots?:boolean
}>
type: string;
snapshots?: boolean;
demos: Array<{
name: string;
sleepTime?: number;
snapshots?: boolean;
}>;
}> = [
{
type: 'Point',
demos: [
{
name:'billboard'
},{
name:'column'
},
{
name:'fill_image'
},
{
name: "fill",
sleepTime: 1
{
type: 'Point',
demos: [
{
name: 'billboard',
},
{
name: 'column',
},
{
name: 'fill_image',
},
{
name: 'fill',
sleepTime: 1,
},
{
name: 'image',
snapshots: false,
sleepTime: 1,
},
],
},
{
type: 'Line',
snapshots: false,
demos: [
{
name: 'arc',
},
{
name: 'arc_plane',
},

}, {
name: "image",
snapshots: false,
sleepTime: 1
}]
},
{
type: 'Line',
snapshots: false,
demos: [
{
name: 'arc'
},
{
name: 'arc_plane'
},

{
name: 'flow'
}
,
{
name: 'arc'
}
,
{
name: 'dash'
}
]

},
{
type: 'Polygon',
demos: [
{
name: 'extrude'
},
{
name: 'fill'
}
,
{
name: 'ocean',
snapshots:false
}
,
{
name: 'texture',
snapshots:false
}
,
{
name: 'water',
snapshots:false
}
]
},
{
type: 'HeatMap',
snapshots: false,
demos: [
{
name: 'grid',
sleepTime: 2
},
{
name: 'hexagon',
sleepTime: 2
},
{
name: 'normal',
sleepTime: 2
}
]
},
{
type: 'Raster',
snapshots: false,
demos: [{
name: "tiff",
sleepTime: 2
},
{
name: "image",
}
]
},{
type:'Mask',
demos:[{
name:'single'
}]
},
{
type: 'Gallery',
demos: [{
name: "fujian",
sleepTime: 2
}]
}
]
{
name: 'flow',
},
{
name: 'arc',
},
{
name: 'dash',
},
],
},
{
type: 'Polygon',
demos: [
{
name: 'extrude',
},
{
name: 'fill',
},
{
name: 'ocean',
snapshots: false,
},
{
name: 'texture',
snapshots: false,
},
{
name: 'water',
snapshots: false,
},
],
},
{
type: 'HeatMap',
snapshots: false,
demos: [
{
name: 'grid',
sleepTime: 2,
},
{
name: 'hexagon',
sleepTime: 2,
},
{
name: 'normal',
sleepTime: 2,
},
],
},
{
type: 'Raster',
snapshots: false,
demos: [
{
name: 'tiff',
sleepTime: 2,
},
{
name: 'image',
},
],
},
{
type: 'Mask',
demos: [
{
name: 'single',
},
],
},
{
type: 'Tile',
demos: [
{
name: 'vector',
},
],
},
{
type: 'Gallery',
demos: [
{
name: 'fujian',
sleepTime: 2,
},
],
},
];
2 changes: 1 addition & 1 deletion examples/demos/bugfix/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {
const scene = new Scene({
id: 'map',
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/gallery/fujian.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {

const scene = new Scene({
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/heatmap/grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {

const scene = new Scene({
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/heatmap/hexagon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {

const scene = new Scene({
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/heatmap/normal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {

const scene = new Scene({
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/line/arc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {

const scene = new Scene({
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/line/arc_plane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string,
renderer: 'regl' | 'device',
animate:boolean
}) {
console.log(option)
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/line/dash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {

const scene = new Scene({
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/line/flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {
const scene = new Scene({
id: 'map',
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/line/normal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as allMap from '@antv/l7-maps';

export function MapRender(option: {
map: string
renderer: string
renderer: 'regl' | 'device'
}) {
const scene = new Scene({
id: 'map',
Expand Down
3 changes: 2 additions & 1 deletion examples/demos/mask/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export { MapRender as single } from "./single";
export { MapRender as single } from "./single";
export { MapRender as raster_tile } from "./raster_tile";
Loading

0 comments on commit 83d41db

Please sign in to comment.