add new types for independent zoom and pan tilt

kerberos-io · Dec 23, 2022 · 9d65ca2 · 9d65ca2
1 parent 37d8a71
commit 9d65ca2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/ptz/types.go b/ptz/types.go
@@ -145,17 +145,17 @@ type ContinuousMove struct {
 	XMLName      string               `xml:"tptz:ContinuousMove"`
 	ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"`
 	Velocity     onvif.PTZSpeed       `xml:"tptz:Velocity"`
-	Timeout      xsd.Duration         `xml:"tptz:Timeout"`
+	//Timeout      xsd.Duration         `xml:"tptz:Timeout"`
 }
 
 type ContinuousMoveResponse struct {
 }
 
 type RelativeMove struct {
-	XMLName      string               `xml:"tptz:RelativeMove"`
-	ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"`
-	Translation  onvif.PTZVector      `xml:"tptz:Translation"`
-	Speed        onvif.PTZSpeed       `xml:"tptz:Speed"`
+	XMLName      string               `xml:"tptz:RelativeMove,omitempty"`
+	ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken,omitempty"`
+	Translation  onvif.PTZVector      `xml:"tptz:Translation,omitempty"`
+	Speed        onvif.PTZSpeed       `xml:"tptz:Speed,omitempty"`
 }
 
 type RelativeMoveResponse struct {

diff --git a/xsd/onvif/onvif.go b/xsd/onvif/onvif.go
@@ -547,20 +547,26 @@ type PTZConfiguration struct {
 	Extension                              PTZConfigurationExtension `xml:"Extension"`
 }
 
-type PTZSpeed struct {
-	PanTilt Vector2D `xml:"onvif:PanTilt"`
-	Zoom    Vector1D `xml:"onvif:Zoom"`
+type PTZSpeed interface {
+}
+
+type PTZSpeedZoom struct {
+	Zoom Vector1D `xml:"onvif:Zoom,omitempty"`
+}
+
+type PTZSpeedPanTilt struct {
+	PanTilt Vector2D `xml:"onvif:PanTilt,omitempty"`
 }
 
 type Vector2D struct {
-	X     float64    `xml:"x,attr"`
-	Y     float64    `xml:"y,attr"`
-	Space xsd.AnyURI `xml:"space,attr"`
+	X     float64    `xml:"x,attr,omitempty"`
+	Y     float64    `xml:"y,attr,omitempty"`
+	Space xsd.AnyURI `xml:"space,attr,omitempty"`
 }
 
 type Vector1D struct {
-	X     float64    `xml:"x,attr"`
-	Space xsd.AnyURI `xml:"space,attr"`
+	X     float64    `xml:"x,attr,omitempty"`
+	Space xsd.AnyURI `xml:"space,attr,omitempty"`
 }
 
 type PanTiltLimits struct {
@@ -1013,8 +1019,8 @@ type PTZPreset struct {
 }
 
 type PTZVector struct {
-	PanTilt Vector2D `xml:"onvif:PanTilt"`
-	Zoom    Vector1D `xml:"onvif:Zoom"`
+	PanTilt Vector2D `xml:"onvif:PanTilt,omitempty"`
+	Zoom    Vector1D `xml:"onvif:Zoom,omitempty"`
 }
 
 type PTZStatus struct {