Merge remote-tracking branch 'upstream/master'

# Conflicts: # javascript/build/ee_api_js.js # javascript/build/ee_api_js_debug.js # javascript/build/ee_api_js_npm.js # python/ee/data.py
openforis · Nov 17, 2020 · f8dc67a · f8dc67a
2 parents 166a41a + f0424ab
commit f8dc67a
Show file tree

Hide file tree

Showing 45 changed files with 5,404 additions and 4,847 deletions.
diff --git a/demos/client-auth/README.md b/demos/client-auth/README.md
@@ -1,8 +1,6 @@
 Earth Engine Demo: Client-Side Authentication
 =============================================
 
-[Live Demo](https://client-auth-dot-ee-demos.appspot.com/)
-
 This example demonstrates basic web authentication using the Earth Engine
 JavaScript client library. To set up, follow the instructions in the
 Developer Docs to [deploy an EE-based App Engine app](

diff --git a/demos/cloud-functions/README.md b/demos/cloud-functions/README.md
@@ -1,8 +1,5 @@
 # Cloud Functions and Hex Binning
 
-[Live
-Demo](https://storage.googleapis.com/ee-demos/cloudfunctions-demo/index.html)
-
 This demo shows how to integrate the Earth Engine JavaScript client library with
 several other open-source tools:
 

diff --git a/demos/export-to-drive/README.md b/demos/export-to-drive/README.md
@@ -1,8 +1,6 @@
 Earth Engine Demo: Export to Drive
 ==================================
 
-[Live Demo](https://export-to-drive-dot-ee-demos.appspot.com)
-
 This is an example [Google App Engine](https://cloud.google.com/appengine/docs)
 web app that communicates with [Google Earth Engine](https://earthengine.google.org).
 It allows users to view night-time lights for different years and export drawn regions

diff --git a/demos/map-layer/README.md b/demos/map-layer/README.md
@@ -1,7 +1,5 @@
 # Map Layer Demo App
 
-[Live Demo](https://map-layer-dot-ee-demos.appspot.com/)
-
 This example demonstrates how to use the `ee.layers.ImageOverlay` class to
 render Earth Engine map tiles to a Google Map. `ee.layers.ImageOverlay`
 implements the

diff --git a/demos/polygon-drawing/README.md b/demos/polygon-drawing/README.md
@@ -1,8 +1,6 @@
 Earth Engine Demo: Polygon Drawing
 ==================================
 
-[Live Demo](https://polygon-drawing-dot-ee-demos.appspot.com/)
-
 This example demonstrates how to use polygons drawn on a Google Map with
 the Earth Engine JavaScript client library.
 

diff --git a/demos/server-auth-nodejs/README.md b/demos/server-auth-nodejs/README.md
@@ -1,7 +1,5 @@
 # Earth Engine Demo: Server-Side Authentication in Node.js
 
-[Live Demo](https://server-auth-nodejs-dot-ee-demos.appspot.com/)
-
 This example shows how to build a simple Google App Engine web application that
 communicates with Google Earth Engine. Upon successful deployment, you will see
 a webpage with an interactive map showing terrain slope zoomed into the east

diff --git a/demos/server-auth-python/README.md b/demos/server-auth-python/README.md
@@ -1,7 +1,5 @@
 # Earth Engine Demo: Server-Side Authentication in Python
 
-[Live Demo](https://server-auth-python-dot-ee-demos.appspot.com/)
-
 This example shows how to build a simple Google App Engine web application that
 communicates with Google Earth Engine.  Upon successful deployment, you will see
 a webpage with a Google map showing the SRTM DEM zoomed into the east coast of

diff --git a/demos/trendy-lights/README.md b/demos/trendy-lights/README.md
@@ -1,8 +1,6 @@
 Earth Engine Demo: Trendy Lights
 ================================
 
-[Live Demo](https://trendy-lights-dot-ee-demos.appspot.com)
-
 This is an example [Google App Engine](https://cloud.google.com/appengine/docs)
 web app that communicates with [Google Earth Engine](https://earthengine.google.org).
 It uses memcache to cache results and avoid exceeding request quotas.

diff --git a/demos/wmts/app.py b/demos/wmts/app.py
@@ -51,7 +51,7 @@ def setup_ee():
     extracted_key_data = keyfile.read()
     credentials = ee.ServiceAccountCredentials(config.EE_SERVICE_ACCOUNT,
                                                key_data=extracted_key_data)
-  ee.Initialize(credentials, use_cloud_api=True)
+  ee.Initialize(credentials)
 
 
 @server.after_request

diff --git a/javascript/build/ee_api_js.js b/javascript/build/ee_api_js.js