Merge pull request #24 from emxsys/develop

Merge v1.7.0 develop into master

Gruntfile.js

@@ -77,27 +77,6 @@ module.exports = function (grunt) {
             'build/'
         ],
 
-        compress: {
-            images: {
-                options: {
-                    archive: 'build/dist/images.zip'
-                },
-                files: [
-                    {src: ['images/**']}
-                ]
-            },
-            dist: {
-                options: {
-                    archive: 'build/WebWorldWind-Distribution-<%= pkg.version %>.zip'
-                },
-                files: [{
-                    expand: true,
-                    cwd: 'build/dist/',
-                    src: ['**/*']
-                }]
-            }
-        },
-
         copy: {
             main: {
                 files: [
@@ -119,15 +98,27 @@ module.exports = function (grunt) {
                     }
                 ]
             }
+        },
+
+        zip: {
+            images: {
+                src: ['images/**'],
+                dest: 'build/dist/images.zip'
+            },
+            dist: {
+                cwd: 'build/dist',
+                src: ['build/dist/**'],
+                dest: 'build/WebWorldWind-Distribution-<%= pkg.version %>.zip'
+            }
         }
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
     grunt.loadNpmTasks('grunt-jsdoc');
     grunt.loadNpmTasks('grunt-karma');
+    grunt.loadNpmTasks('grunt-zip');
 
-    grunt.registerTask('default', ['clean', 'karma', 'jsdoc', 'requirejs', 'copy', 'compress']);
+    grunt.registerTask('default', ['clean', 'karma', 'jsdoc', 'requirejs', 'copy', 'zip']);
 };

README.md

@@ -1,13 +1,25 @@
+![Emxsys](docs/emxsys_logo.png)
+
 # WorldWindJS
 [![NPM](https://img.shields.io/npm/v/worldwindjs.svg)](https://www.npmjs.com/package/worldwindjs) 
 
 ## A community supported and enhanced Web WorldWind library
+___Note: This is personal project and is not the official Web WorldWind library from NASA___
 
 __WorldWindJS__ is a fork of the popular [Web WorldWind](https://github.com/NASAWorldWind/WebWorldWind)
-library from NASA and ESA. This fork provides a release channel for builds based on the latest fixes
-and features from WebWorldWind's develop branch plus several enhancements from the WorldWind community.
+library from NASA (with contributions from ESA). This fork provides a release channel for builds based on the latest fixes
+and features from WebWorldWind's [develop branch](https://github.com/NASAWorldWind/WebWorldWind/commits/develop) plus several "cherry-picked" enhancements from the WorldWind community.
+
+This fork exists to support the development of several personal projects, including:
+
+- [Explorer](https://worldwind.earth/explorer) - the WorldWind Explorer
+- [WMT v2.0](https://worldwind.earth/wildfire) -  Wildfire Management Tool v2.0 (_under development_)
+- [Bible Atlas](https://viewer.earth/bible-atlas) - Geography and cartography of the Holy Land (_under development_)
+- [worldwind-react-globe](https://emxsys.github.io/worldwind-react-globe/) - A React component for Web WorldWind
+- [worldwind-react-globe-bs4](https://emxsys.github.io/worldwind-react-globe-bs4/) - React Bootstrap4 UI components for Web WorldWind
+- [worldwind-react-app](https://emxsys.github.io/worldwind-react-app/) - A geo-browser web app using Web WorldWind with React and Bootstrap 4 
 
-Show your support for this project by giving it a [star](https://github.com/emxsys/worldwindjs/stargazers)!
+WorldWindJS is made available in the spirit of the NASA motto: _For the benefit of all._  Show your support for this project by giving it a [star](https://github.com/emxsys/worldwindjs/stargazers)!
 
 ### Enhancements include:
 
@@ -16,6 +28,7 @@ Show your support for this project by giving it a [star](https://github.com/emxs
 - Improved the resolution of Bing imagery
 - Support for a translucent night-image
 - Removed dependency vulnerabilities
+- Fixed WMTS tile geo-registration 
 
 ### Migrating from NASA WebWorldWind
 
@@ -27,9 +40,11 @@ Show your support for this project by giving it a [star](https://github.com/emxs
 
 #### Changes from WebWorldWind release 0.9.0
 - `NavigatorState` has been deprecated. Its properties have migrated to `DrawContext`.
+- Added the `HeatMap` from the WorldWind `NASAWorldWind/feature/heatmap` branch.
+- Added the `ShapeEditor` from the WorldWind `NASAWorldWind/enhancement/shape_editor_refactoring` branch.
 
-#### From the WebWorldWind develop branch
-- WorldWindJS is a drop in replacement for the WebWorldWind __worldwindjs__ and __worldwind.min.js__ libraries built from the WebWorldWind develop branch
+#### Changes from the WebWorldWind develop branch
+- WorldWindJS is a drop in replacement for WebWorldWind's __worldwind.js__ and __worldwind.min.js__ libraries built from the WebWorldWind develop branch. There are no changes to the API other than additions.
 
 ### Additional Resources
 #### Tutorials
@@ -82,6 +97,10 @@ Web WorldWind release provides many simple examples showing how to use all of We
 
 - `npm run test:watch` automatically runs WorldWind's unit tests when source code changes
 
+- `npm version <newversioo>` changes the version number in package.json
+
+- `npm publish` publishes the build to npm
+
 ## License
 
 Copyright 2003-2006, 2009, 2017, United States Government, as represented by the Administrator of the

build/dist/README.md

@@ -1,11 +1,25 @@
+![Emxsys](docs/emxsys_logo.png)
+
 # WorldWindJS
 [![NPM](https://img.shields.io/npm/v/worldwindjs.svg)](https://www.npmjs.com/package/worldwindjs) 
 
 ## A community supported and enhanced Web WorldWind library
+___Note: This is personal project and is not the official Web WorldWind library from NASA___
 
 __WorldWindJS__ is a fork of the popular [Web WorldWind](https://github.com/NASAWorldWind/WebWorldWind)
-library from NASA and ESA. This fork provides a release channel for builds based on the latest fixes
-and features from WebWorldWind's develop branch plus several enhancements from the WorldWind community.
+library from NASA (with contributions from ESA). This fork provides a release channel for builds based on the latest fixes
+and features from WebWorldWind's [develop branch](https://github.com/NASAWorldWind/WebWorldWind/commits/develop) plus several "cherry-picked" enhancements from the WorldWind community.
+
+This fork exists to support the development of several personal projects, including:
+
+- [Explorer](https://worldwind.earth/explorer) - the WorldWind Explorer
+- [WMT v2.0](https://worldwind.earth/wildfire) -  Wildfire Management Tool v2.0 (_under development_)
+- [Bible Atlas](https://viewer.earth/bible-atlas) - Geography and cartography of the Holy Land (_under development_)
+- [worldwind-react-globe](https://emxsys.github.io/worldwind-react-globe/) - A React component for Web WorldWind
+- [worldwind-react-globe-bs4](https://emxsys.github.io/worldwind-react-globe-bs4/) - React Bootstrap4 UI components for Web WorldWind
+- [worldwind-react-app](https://emxsys.github.io/worldwind-react-app/) - A geo-browser web app using Web WorldWind with React and Bootstrap 4 
+
+WorldWindJS is made available in the spirit of the NASA motto: _For the benefit of all._  Show your support for this project by giving it a [star](https://github.com/emxsys/worldwindjs/stargazers)!
 
 ### Enhancements include:
 
@@ -14,19 +28,23 @@ and features from WebWorldWind's develop branch plus several enhancements from t
 - Improved the resolution of Bing imagery
 - Support for a translucent night-image
 - Removed dependency vulnerabilities
+- Fixed WMTS tile geo-registration 
 
 ### Migrating from NASA WebWorldWind
 
 - The WorldWindJS npm package is available in the [npm repository](https://www.npmjs.com/package/worldwindjs).
-- The project supports npm dependencies on its git repository: See [npm dependencies](https://github.com/emxsys/worldwindjs/wiki/npm-dependencies)is in the wiki. 
+- WorldWindJS is available on the __unpkg__ and __jsDelivr__ CDNs. See [CDN providers](https://github.com/emxsys/worldwindjs/wiki/CDN-providers) in the wiki for examples.
+- The project supports npm dependencies on its git repository: See [npm dependencies](https://github.com/emxsys/worldwindjs/wiki/npm-dependencies) in the wiki for examples. 
 - The JS libraries (production and debug) and the image resources are available in the [GitHub releases](https://github.com/emxsys/worldwindjs/releases/latest).
 
 
 #### Changes from WebWorldWind release 0.9.0
 - `NavigatorState` has been deprecated. Its properties have migrated to `DrawContext`.
+- Added the `HeatMap` from the WorldWind `NASAWorldWind/feature/heatmap` branch.
+- Added the `ShapeEditor` from the WorldWind `NASAWorldWind/enhancement/shape_editor_refactoring` branch.
 
-#### From the WebWorldWind develop branch
-- WorldWindJS is a drop in replacement for the WebWorldWind __worldwindjs__ and __worldwind.min.js__ libraries built from the WebWorldWind develop branch
+#### Changes from the WebWorldWind develop branch
+- WorldWindJS is a drop in replacement for WebWorldWind's __worldwind.js__ and __worldwind.min.js__ libraries built from the WebWorldWind develop branch. There are no changes to the API other than additions.
 
 ### Additional Resources
 #### Tutorials
@@ -79,6 +97,10 @@ Web WorldWind release provides many simple examples showing how to use all of We
 
 - `npm run test:watch` automatically runs WorldWind's unit tests when source code changes
 
+- `npm version <newversioo>` changes the version number in package.json
+
+- `npm publish` publishes the build to npm
+
 ## License
 
 Copyright 2003-2006, 2009, 2017, United States Government, as represented by the Administrator of the