Use lodash to handle camera with no zoom

agsh · Nov 25, 2019 · b6de685 · b6de685
1 parent 6c6f089
commit b6de685
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/ptz.js b/lib/ptz.js
@@ -6,8 +6,8 @@
  */
 module.exports = function(Cam) {
 
-	const linerase = require('./utils').linerase
-		;
+	const linerase = require('./utils').linerase;
+	const _get = require('lodash/get');
 
 	/**
 	 * Receive cam presets
@@ -175,12 +175,13 @@ module.exports = function(Cam) {
 			this._envelopeFooter()
 		}, function(err, data, xml) {
 			if (!err) {
+				// Some cameras have Pan/Tilt but no Zoom
 				var res = linerase(data).getStatusResponse.PTZStatus;
 				var status = {
 					position: {
-						x: res.position.panTilt.$.x
-						, y: res.position.panTilt.$.y
-						, zoom: res.position.zoom.$.x
+						x: _get(res, 'position.panTilt.$.x', 0) 
+						, y: _get(res, 'position.panTilt.$.y', 0) 
+						, zoom: _get(res, 'position.zoom.$.x', 0)
 					}
 					, moveStatus: res.moveStatus
 					, error: res.error

diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "url": "https://github.com/agsh/onvif.git"
   },
   "dependencies": {
+    "lodash": "^4.17.15",
     "xml2js": "^0.4.19"
   },
   "keywords": [