Skip to content

vision: support ImageContext in detect requests #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenplusplus merged 6 commits into from
May 26, 2016
Merged

vision: support ImageContext in detect requests #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd256cc
vision: support ImageContext in detect requests
okofish May 25, 2016
2246214
Added name to authors/contributors
okofish May 25, 2016
f5e9262
Removed trailing whitespace
okofish May 25, 2016
1580d1b
vision: Alphabetizing imageContext docs and handler locations, simpli…
okofish May 26, 2016
2f59a47
vision: Adding test for imageContext
okofish May 26, 2016
7c3208e
vision: Fixing doc formatting for imageContext
okofish May 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
Google Inc.
Anand Suresh
Brett Bergmann
Jesse Friedman
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Brett Bergmann <[email protected]>
Burcu Dogan <[email protected]>
Hector Rovira <[email protected]>
Ido Shamun <[email protected]>
Jesse Friedman <[email protected]>
Johan Euphrosine <[email protected]>
Marco Ziccardi <[email protected]>
Patrick Costello <[email protected]>
Expand Down
7 changes: 7 additions & 0 deletions lib/vision/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ Vision.prototype.annotate = function(requests, callback) {
* image path, a remote image URL, or a gcloud File object.
* @param {string[]|object=} options - An array of types or a configuration
* object.
* @param {object=} options.imageContext - See an
* [`ImageContext`](https://cloud.google.com/vision/reference/rest/v1/images/annotate#ImageContext)
* resource.
* @param {number} options.maxResults - The maximum number of results, per type,
* to return in the response.
* @param {string[]} options.types - An array of feature types to detect from
Expand Down Expand Up @@ -312,6 +315,10 @@ Vision.prototype.detect = function(images, options, callback) {
}
};

if (is.object(options.imageContext)) {
cfg.imageContext = options.imageContext;
}

if (is.number(options.maxResults)) {
cfg.features.maxResults = options.maxResults;
}
Expand Down
34 changes: 34 additions & 0 deletions test/vision/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,40 @@ describe('Vision', function() {
async.each(shortNames, checkConfig, done);
});

it('should allow setting imageContext', function(done) {
var imageContext = {
latLongRect: {
minLatLng: {
latitude: 37.420901,
longitude: -122.081293
},
maxLatLng: {
latitude: 37.423228,
longitude: -122.086347
}
}
};

vision.annotate = function(config) {
assert.deepEqual(config, [
{
image: IMAGES[0],
features: {
type: 'LABEL_DETECTION'
},
imageContext: imageContext

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

}
]);

done();
};

vision.detect(IMAGE, {
types: ['label'],
imageContext: imageContext
}, assert.ifError);
});

it('should allow setting maxResults', function(done) {
var maxResults = 10;

Expand Down