Merge pull request #347 from momoAmch/Get_complete_information_about_…

…preset_points get complete information about preset points
agsh · Nov 4, 2024 · 6df0f69 · 6df0f69
2 parents f04f0e3 + 04cfe08
commit 6df0f69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/ptz.js b/lib/ptz.js
@@ -32,7 +32,7 @@ module.exports = function(Cam) {
 						presets = [presets];
 					}
 					presets.forEach(function(preset) {
-						this.presets[preset.$.token] = preset.name;
+						this.presets[preset.$.token] = preset;
 					}.bind(this));
 				}
 			}

diff --git a/test/ptz.js b/test/ptz.js
@@ -20,18 +20,25 @@ describe('Imaging', () => {
 	});
 
 	describe('getPresets', () => {
+		const isValidPrest = (preset) => {
+			return typeof preset == 'object' &&
+				// name and PTZPosition are optional in the standard onvif specs
+				// https://www.onvif.org/ver20/ptz/wsdl/ptz.wsdl
+				// only token is required
+				typeof preset.$.token == 'string';
+		};
 		it('should return array of preset objects and sets them to #presets', (done) => {
 			cam.getPresets({}, (err, data) => {
 				assert.strictEqual(err, null);
-				assert.ok(Object.keys(data).every((presetName) => typeof data[presetName] == 'string'));
+				assert.ok(Object.keys(data).every((presetName) => isValidPrest(data[presetName])));
 				assert.strictEqual(cam.presets, data);
 				done();
 			});
 		});
 		it('should return array of preset objects and sets them to #presets without options', (done) => {
 			cam.getPresets((err, data) => {
 				assert.strictEqual(err, null);
-				assert.ok(Object.keys(data).every((presetName) => typeof data[presetName] == 'string'));
+				assert.ok(Object.keys(data).every((presetName) => isValidPrest(data[presetName])));
 				assert.strictEqual(cam.presets, data);
 				done();
 			});
@@ -41,7 +48,7 @@ describe('Imaging', () => {
 				serverMockup.conf.one = true;
 				cam.getPresets((err, data) => {
 					assert.strictEqual(err, null);
-					assert.ok(Object.keys(data).every((presetName) => typeof data[presetName] == 'string'));
+					assert.ok(Object.keys(data).every((presetName) => isValidPrest(data[presetName])));
 					assert.strictEqual(cam.presets, data);
 					delete serverMockup.conf.one;
 					done();