Merge pull request #104 from antvis/docs_fix

docs(docs): fix docs error
This commit is contained in:
@thinkinggis 2019-11-29 00:28:46 +08:00 committed by GitHub
commit 8351aaec28
7 changed files with 15 additions and 15 deletions

View File

@ -18,7 +18,7 @@ order: 0
2.0版本在L7内部动态引入了高德地图JS API因此不再需要单独引入高德JS API只需设置 type 为 ```amap``` 并且传入token 2.0版本在L7内部动态引入了高德地图JS API因此不再需要单独引入高德JS API只需设置 type 为 ```amap``` 并且传入token
```html ```html
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
``` ```
### 添加div 标签指定地图容器 ### 添加div 标签指定地图容器
@ -106,7 +106,7 @@ fetch('https://gw.alipayobjects.com/os/rmsportal/oVTMqfzuuRFKiDwhPSFL.json')
</head> </head>
<body> <body>
<div id="map"></div> <div id="map"></div>
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
<script> <script>
const scene = new L7.Scene({ const scene = new L7.Scene({

View File

@ -18,7 +18,7 @@ order: 0
2.0版本在L7内部动态引入了高德地图JS API因此不再需要单独引入高德JS API只需设置 type 为 ```amap``` 并且传入token 2.0版本在L7内部动态引入了高德地图JS API因此不再需要单独引入高德JS API只需设置 type 为 ```amap``` 并且传入token
```html ```html
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
``` ```
### 添加div 标签指定地图容器 ### 添加div 标签指定地图容器
@ -106,7 +106,7 @@ fetch('https://gw.alipayobjects.com/os/rmsportal/oVTMqfzuuRFKiDwhPSFL.json')
</head> </head>
<body> <body>
<div id="map"></div> <div id="map"></div>
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
<script> <script>
const scene = new L7.Scene({ const scene = new L7.Scene({

View File

@ -24,7 +24,7 @@ order: 0
```html ```html
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
``` ```
@ -114,7 +114,7 @@ fetch('https://gw.alipayobjects.com/os/rmsportal/oVTMqfzuuRFKiDwhPSFL.json')
</head> </head>
<body> <body>
<div id="map"></div> <div id="map"></div>
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
<script> <script>
const scene = new L7.Scene({ const scene = new L7.Scene({
id: 'map', id: 'map',

View File

@ -24,7 +24,7 @@ order: 0
```html ```html
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
``` ```
@ -115,7 +115,7 @@ fetch('https://gw.alipayobjects.com/os/rmsportal/oVTMqfzuuRFKiDwhPSFL.json')
</head> </head>
<body> <body>
<div id="map"></div> <div id="map"></div>
<script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.9/dist/l7.js"></script> <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js"></script>
<script> <script>
const scene = new L7.Scene({ const scene = new L7.Scene({
id: 'map', id: 'map',

View File

@ -18,7 +18,7 @@ Include the L7 JS JavaScript <head> of your HTML file.
```html ```html
<head> <head>
<script src='https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.5/dist/l7.js'> <script src='https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js'>
</script> </script>
</head> </head>
``` ```
@ -44,7 +44,7 @@ npm install --save @antv/l7-maps;
### 初始化地图 ### 初始化地图
#### 使用 Mapbox 底图 #### 使用 高德 底图
```javascript ```javascript

View File

@ -17,14 +17,14 @@ Include the L7 JS JavaScript <head> of your HTML file.
```html ```html
<head> <head>
<script src='https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.5/dist/l7.js'> <script src='https://gw.alipayobjects.com/os/antv/pkg/_antv.l7-2.0.0-beta.13/dist/l7.js'>
</script> </script>
</head> </head>
``` ```
- [use Gaode Map](../map/amap.en.md) - [use Gaode Map](./map/amap)
- [use Mapbox Map ](../map/mapbox.en.md) - [use Mapbox Map ](./map/mapbox)
## 通过 Module bundle 使用 ## 通过 Module bundle 使用
@ -43,7 +43,7 @@ npm install --save @antv/l7-maps;
### 初始化地图 ### 初始化地图
#### 使用 Mapbox 底图 #### 使用 高德 底图
```javascript ```javascript

View File

@ -23,7 +23,7 @@ void main() {
vec2 offset = project_pixel(size.xy); vec2 offset = project_pixel(size.xy);
vec4 project_pos = project_position(vec4(a_Pos.xy, 0, 1.0)); vec4 project_pos = project_position(vec4(a_Pos.xy, 0, 1.0));
vec4 pos = vec4(project_pos.xy + offset, size.z, 1.0); vec4 pos = vec4(project_pos.xy + offset, project_pixel(size.z), 1.0);
float lightWeight = calc_lighting(pos); float lightWeight = calc_lighting(pos);
v_color =vec4(a_Color.rgb * lightWeight, a_Color.w); v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);