diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000000..5bac9a4f3b --- /dev/null +++ b/.npmignore @@ -0,0 +1,82 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# lock +package-lock.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +.DS_Store + +# npmignore - content above this line is automatically generated and modifications may be omitted +# see npmjs.com/npmignore for more details. +test + +*.sw* +*.un~ +.idea +bin +bundler +demos +docs +src +temp +webpack-dev.config.js +webpack.config.js +testdemo +rollup +.si.yml \ No newline at end of file diff --git a/package.json b/package.json index 15ba66461d..30a45bb8d6 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "1.3.3", + "version": "1.3.3-beta.0", "description": "Large-scale WebGL-powered Geospatial Data Visualization", "main": "build/L7.js", "homepage": "https://github.com/antvis/l7", diff --git a/src/map/AMap.js b/src/map/AMap.js index 81e7c238e5..e86c2c6776 100644 --- a/src/map/AMap.js +++ b/src/map/AMap.js @@ -46,7 +46,7 @@ export default class GaodeMap extends Base { this.set('mapStyle', mapStyle); } } - this.set('zooms', [ this.get('minZoom'), this.get('maxZoom') ]); + this.set('zooms', [this.get('minZoom'), this.get('maxZoom')]); const map = this.get('map'); if (map instanceof AMap.Map) { this.map = map; @@ -143,6 +143,23 @@ export default class GaodeMap extends Base { scene.getBounds = () => { return map.getBounds(); }; + scene.setMapStyle = style => { + + switch (style) { + case 'dark': + this.set('mapStyle', Theme.DarkTheme.mapStyle); + break; + case 'light': + this.set('mapStyle', Theme.LightTheme.mapStyle); + break; + case 'blank': + map.setFeature([]); + break; + default: + this.set('mapStyle', style); + } + return map.setMapStyle(this.get('mapStyle')); + }; scene.setZoomAndCenter = (zoom, center) => { const lnglat = new AMap.LngLat(center[0], center[1]); return map.setZoomAndCenter(zoom, lnglat); @@ -151,7 +168,7 @@ export default class GaodeMap extends Base { return map.setFeature(features); }; scene.setBounds = extent => { - return map.setBounds(new AMap.Bounds([ extent[0], extent[1] ], [ extent[2], extent[3] ])); + return map.setBounds(new AMap.Bounds([extent[0], extent[1]], [extent[2], extent[3]])); }; scene.setRotation = rotation => { return map.setRotation(rotation);