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

Merge branch 'master' into tile

This commit is contained in:
thinkinggis 2019-04-23 10:23:01 +08:00
parent 7101abcd0b 9d8bfb159a
commit af7ead3443
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore
View File

@ -10,4 +10,5 @@ demos/index.html
demos/* demos/*
rollup/* rollup/*
webpack/* webpack/*
src/core/three.js src/core/three.js
testdemo/*

3
.gitignore vendored
View File

@ -74,4 +74,5 @@ demos/data
demos/image demos/image
.vscode .vscode
demos/hexagon.html demos/hexagon.html
demos/model demos/model
testdemo

2
demos/04_choropleths_polygon.html
View File

@ -61,7 +61,7 @@ const scene = new L7.Scene({
window.scene = scene; window.scene = scene;
scene.on('loaded', () => { scene.on('loaded', () => {
var colors = ["#FFF5B8","#FFDC7D","#FFAB5C","#F27049","#D42F31","#730D1C"]; var colors = ["#FFF5B8","#FFDC7D","#FFAB5C","#F27049","#D42F31","#730D1C"];
$.getJSON('https://gw.alipayobjects.com/os/basement_prod/7224a078-e3a3-4cc3-8749-7026af9e5c7f.json', city => { $.getJSON('https://gw.alipayobjects.com/os/basement_prod/77497aa8-8dd0-4a0c-bf3b-3bb55c5d453c.json', city => {
const citylayer = scene.PolygonLayer() const citylayer = scene.PolygonLayer()
.source(city) .source(city)

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7", "name": "@antv/l7",
"version": "1.1.9", "version": "1.1.10",
"description": "Large-scale WebGL-powered Geospatial Data Visualization", "description": "Large-scale WebGL-powered Geospatial Data Visualization",
"main": "build/l7.js", "main": "build/l7.js",
"browser": "build/l7.js", "browser": "build/l7.js",

1
src/source/parser/geojson.js
View File

@ -3,6 +3,7 @@ import { getCoords } from '@turf/invariant';
export default function geoJSON(data) { export default function geoJSON(data) {
const resultData = []; const resultData = [];
// 数据为空时处理
turfMeta.flattenEach(data, (currentFeature, featureIndex) => { // 多个polygon 拆成一个 turfMeta.flattenEach(data, (currentFeature, featureIndex) => { // 多个polygon 拆成一个
const coord = getCoords(currentFeature); const coord = getCoords(currentFeature);
const dataItem = { const dataItem = {