@google/earthengine 1.7.4 → 1.7.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/earthengine",
-  "version": "1.7.4",
+  "version": "1.7.10",
   "description": "JavaScript client for Google Earth Engine API.",
   "author": "Google LLC",
   "license": "Apache-2.0",

package/src/apiclient.js

@@ -24,7 +24,7 @@ const {trustedResourceUrl} = goog.require('safevalues.index');
 /** @namespace */
 const apiclient = {};
 
-const API_CLIENT_VERSION = '1.7.4';
+const API_CLIENT_VERSION = '1.7.10';
 
 exports.VERSION = apiVersion.VERSION;
 exports.API_CLIENT_VERSION = API_CLIENT_VERSION;
@@ -706,9 +706,9 @@ apiclient.getUserAgent = function() {
 /**
  * Initializes the data module, setting base URLs.
  *
- * @param {?string=} apiBaseUrl The (proxied) EarthEngine REST API
+ * @param {?string=} apiBaseUrl The (proxied) Earth Engine REST API
  *     endpoint.
- * @param {?string=} tileBaseUrl The (unproxied) EarthEngine REST tile
+ * @param {?string=} tileBaseUrl The (unproxied) Earth Engine REST tile
  *     endpoint.
  * @param {?string=} xsrfToken A string to pass in the X-XSRF-Token header
  *     of XHRs.

package/src/ee.js

@@ -459,6 +459,13 @@ ee.promote_ = function(arg, klass) {
     default:
       // Handle dynamically generated classes.
       if (klass in exportedEE) {
+        if (!(exportedEE[klass].prototype instanceof ee.ComputedObject)) {
+          // Block things that should not be replaced.
+          throw new Error(
+              'Algorithm not an instance of ee.ComputedObject: ' + klass +
+              ': ' + arg);
+        }
+
         const ctor = ee.ApiFunction.lookupInternal(klass);
         if (arg instanceof exportedEE[klass]) {
           // Return unchanged.

package/src/eeapiclient/request_params.ts

@@ -150,7 +150,10 @@ const simpleCorsAllowedContentTypes: readonly string[] = [
  * by the browser.
  */
 // TODO(user): Return a changed copy of params.
-export function bypassCorsPreflight(params: MakeRequestParams): void {
+export function bypassCorsPreflight(
+  params: MakeRequestParams,
+  singleEncode = false,
+): void {
   const safeHeaders: {[key: string]: string} = {};
   const unsafeHeaders: {[key: string]: string} = {};
   let hasUnsafeHeaders = false;
@@ -196,8 +199,10 @@ export function bypassCorsPreflight(params: MakeRequestParams): void {
   }
 
   if (hasUnsafeHeaders) {
-    const finalParam =
-      httpCors.generateEncodedHttpHeadersOverwriteParam(unsafeHeaders);
+    const generator = singleEncode
+      ? httpCors.generateHttpHeadersOverwriteParam
+      : httpCors.generateEncodedHttpHeadersOverwriteParam;
+    const finalParam = generator(unsafeHeaders);
     addQueryParameter(params, httpCors.HTTP_HEADERS_PARAM_NAME, finalParam);
   }
   params.headers = safeHeaders;

package/src/eeapiclient/request_params_test.ts

@@ -253,4 +253,25 @@ describe('bypassCorsPreflight', () => {
       '$httpMethod': 'PUT',
     });
   });
+
+  it('handles singleEncode=true', () => {
+    const params: MakeRequestParams = {
+      path: 'v1/whatever',
+      httpMethod: 'PUT',
+      methodId: 'someservice.whatever.put',
+      headers: {'accept-language': 'de', 'foo': 'bar'},
+      queryParams: {'hello': 'world'},
+    };
+    bypassCorsPreflight(params, /** singleEncode= */ true);
+    expect(params.headers).toEqual({
+      'accept-language': 'de',
+      'Content-Type': 'text/plain',
+    });
+    expect(params.httpMethod).toEqual('POST');
+    expect(params.queryParams).toEqual({
+      'hello': 'world',
+      '$httpHeaders': 'foo:bar\r\nContent-Type:application/json\r\n',
+      '$httpMethod': 'PUT',
+    });
+  });
 });

package/src/examples/UserInterface/ZoomBox.js

@@ -13,51 +13,81 @@ var collection = ee.ImageCollection('NOAA/DMSP-OLS/NIGHTTIME_LIGHTS')
 var fit = collection.reduce(ee.Reducer.linearFit());
 
 // Display trend in red/blue, brightness in green.
-var visParams = {min: 0, max: [0.18, 20, -0.18], bands: ['scale', 'offset', 'scale']};
+var visParams = {
+  min: 0,
+  max: [0.18, 20, -0.18],
+  bands: ['scale', 'offset', 'scale']
+};
 Map.addLayer(fit, visParams);
 
 Map.style().set('cursor', 'crosshair');
+Map.setCenter(-95, 38, 4);
 
 // Create a map to be used as the zoom box.
-var zoomBox = ui.Map({style: {stretch: 'both', shown: false}})
-    .setControlVisibility(false);
+var zoomBox = ui.Map({style: {stretch: 'both'}});
+zoomBox.setControlVisibility(false);
 zoomBox.addLayer(fit, visParams);
+zoomBox.setCenter(-115.13, 36.18, 8);
 
-// Update the center of the zoom box map when the base map is clicked.
-Map.onClick(function(coords) {
-  centerZoomBox(coords.lon, coords.lat);
+// Instruction label.
+var instructionLabel = ui.Label('Click the main map to move this view', {
+  position: 'top-center',
+  padding: '8px',
+  color: 'black',
+  backgroundColor: 'rgba(255, 255, 255, 0.8)',
+  fontWeight: 'bold',
+  fontSize: '12px'
 });
+zoomBox.add(instructionLabel);
+
+// Bounds logic.
+var isMapReady = false;
+var isFirstClick = true;
 
-var centerZoomBox = function(lon, lat) {
-  instructions.style().set('shown', false);
-  zoomBox.style().set('shown', true);
-  zoomBox.setCenter(lon, lat, 8);
+var updateOutline = function() {
   var bounds = zoomBox.getBounds();
-  var w = bounds[0], e = bounds [2];
-  var n = bounds[1], s = bounds [3];
-  var outline = ee.Geometry.MultiLineString([
-    [[w, s], [w, n]],
-    [[e, s], [e, n]],
-    [[w, s], [e, s]],
-    [[w, n], [e, n]],
-  ]);
-  var layer = ui.Map.Layer(outline, {color: 'FFFFFF'}, 'Zoom Box Bounds');
-  Map.layers().set(1, layer);
+  if (!bounds || !Array.isArray(bounds)) return;
+
+  try {
+    var outline = ee.Geometry.Rectangle(bounds);
+    var layer = ui.Map.Layer(outline, {color: 'FFFFFF'}, 'Zoom Box Bounds');
+    Map.layers().set(1, layer);
+  } catch (e) {
+    // Ignore geometry errors during initialization
+  }
 };
 
-// Add a label and the zoom box map to the default map.
-var instructions = ui.Label('Click the map to see an area in detail.', {
-  stretch: 'both',
-  textAlign: 'center',
-  backgroundColor: '#d3d3d3'
+zoomBox.onChangeBounds(function() {
+  if (!isMapReady) return;
+  updateOutline();
+});
+
+// Delay initial bounds drawing to allow map to initialize.
+ui.util.setTimeout(function() {
+  isMapReady = true;
+  updateOutline();
+}, 1000);
+
+// Interaction.
+Map.onClick(function(coords) {
+  if (isFirstClick) {
+    zoomBox.remove(instructionLabel);
+    isFirstClick = false;
+  }
+  zoomBox.setCenter(coords.lon, coords.lat, 8);
 });
+
+// Layout.
 var panel = ui.Panel({
-  widgets: [zoomBox, instructions],
+  widgets: [zoomBox],
   style: {
     position: 'top-right',
     height: '300px',
     width: '300px',
+    border: '1px solid white',
+    padding: '0'
   }
 });
+
 Map.add(ui.Label('Night Light Trends'));
-Map.add(panel);
+Map.add(panel);

package/src/floattileoverlay.js

@@ -130,7 +130,7 @@ ee.FloatTileOverlay =
 
   /** @return {number} The number of tiles successfully loaded. */
   getLoadedFloatTilesCount() {
-    return this.floatTiles_.getCount();
+    return this.floatTiles_.size;
   }
 
   /**

package/src/image.js

@@ -25,8 +25,8 @@ goog.require('goog.object');
 /**
  * An object to represent an Earth Engine image. This constructor accepts a
  * variety of arguments:
- *   - A string: an EarthEngine asset id,
- *   - A string and a number: an EarthEngine asset id and version,
+ *   - A string: an Earth Engine asset id,
+ *   - A string and a number: an Earth Engine asset id and version,
  *   - A number or ee.Array: creates a constant image,
  *   - A list: creates an image out of each list element and combines them
  *     into a single image,

package/src/layers/abstractoverlay.js

@@ -135,7 +135,7 @@ ee.layers.AbstractOverlay = class extends goog.events.EventTarget {
     this.opacity = opacity;
     this.tilesById.forEach(function(tile) {
       goog.style.setOpacity(tile.div, this.opacity);
-    }, this);
+    }.bind(this));
   }
 
   /**
@@ -201,7 +201,7 @@ ee.layers.AbstractOverlay = class extends goog.events.EventTarget {
    */
   releaseTile(tileDiv) {
     var tile = this.tilesById.get(tileDiv.id);
-    this.tilesById.remove(tileDiv.id);
+    this.tilesById.delete(tileDiv.id);
     if (tile) {
       tile.abort();
       goog.dispose(tile);
@@ -283,7 +283,7 @@ ee.layers.AbstractOverlay = class extends goog.events.EventTarget {
    * @private
    */
   getTileCountForStatus_(status) {
-    return goog.array.count(this.tilesById.getValues(), function(tile) {
+    return goog.array.count([...this.tilesById.values()], function(tile) {
       return tile.getStatus() == status;
     });
   }

package/src/maptilemanager.js

@@ -74,7 +74,7 @@ ee.MapTileManager = class extends goog.events.EventTarget {
    * @return {number} The number of requests in flight or pending send.
    */
   getOutstandingCount() {
-    return this.requests_.getCount();
+    return this.requests_.size;
   }
 
   /**
@@ -160,7 +160,7 @@ ee.MapTileManager = class extends goog.events.EventTarget {
    * @private
    */
   releaseRequest_(request) {
-    this.requests_.remove(request.getId());
+    this.requests_.delete(request.getId());
     if (request.getImageLoader()) {
       this.releaseObject_(request.getToken());
       request.getImageLoader().dispose();
@@ -189,7 +189,7 @@ ee.MapTileManager = class extends goog.events.EventTarget {
 
     // Call dispose on each request.
     var requests = this.requests_;
-    goog.array.forEach(requests.getValues(), function(value) {
+    goog.array.forEach([...requests.values()], function(value) {
       value.dispose();
     });
     requests.clear();