fix: Change to using unit types as an enum from str

pkg/units/distance.go

@@ -28,13 +28,13 @@ type Distance Unit[DistanceUnit]
 // MarshalJSON is a custom marshaler for the unit type to add the UnitType string
 func (u Distance) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
-		Value    float32 `json:"value"`
-		Unit     int     `json:"unit"`
-		UnitType string  `json:"unitType"`
+		Value    float32  `json:"value"`
+		Unit     int      `json:"unit"`
+		UnitType UnitType `json:"unitType"`
 	}{
 		Value:    u.Value,
 		Unit:     int(u.Unit),
-		UnitType: "dist",
+		UnitType: UnitTypeDistance,
 	})
 }
 

pkg/units/flow.go

@@ -24,13 +24,13 @@ type Flow Unit[FlowUnit]
 // MarshalJSON is a custom marshaler for the unit type to add the UnitType string
 func (u Flow) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
-		Value    float32 `json:"value"`
-		Unit     int     `json:"unit"`
-		UnitType string  `json:"unitType"`
+		Value    float32  `json:"value"`
+		Unit     int      `json:"unit"`
+		UnitType UnitType `json:"unitType"`
 	}{
 		Value:    u.Value,
 		Unit:     int(u.Unit),
-		UnitType: "flow",
+		UnitType: UnitTypeFlow,
 	})
 }
 

pkg/units/pressure.go

@@ -24,13 +24,13 @@ type Pressure Unit[PressureUnit]
 // MarshalJSON is a custom marshaler for the unit type to add the UnitType string
 func (u Pressure) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
-		Value    float32 `json:"value"`
-		Unit     int     `json:"unit"`
-		UnitType string  `json:"unitType"`
+		Value    float32  `json:"value"`
+		Unit     int      `json:"unit"`
+		UnitType UnitType `json:"unitType"`
 	}{
 		Value:    u.Value,
 		Unit:     int(u.Unit),
-		UnitType: "pres",
+		UnitType: UnitTypePressure,
 	})
 }
 

pkg/units/temperature.go

@@ -17,13 +17,13 @@ type Temperature Unit[TemperatureUnit]
 // MarshalJSON is a custom marshaler for the unit type to add the UnitType string
 func (u Temperature) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
-		Value    float32 `json:"value"`
-		Unit     int     `json:"unit"`
-		UnitType string  `json:"unitType"`
+		Value    float32  `json:"value"`
+		Unit     int      `json:"unit"`
+		UnitType UnitType `json:"unitType"`
 	}{
 		Value:    u.Value,
 		Unit:     int(u.Unit),
-		UnitType: "temp",
+		UnitType: UnitTypeTemperature,
 	})
 }
 

pkg/units/units.go

@@ -3,6 +3,12 @@
 // units transferred from boatweb.
 package units
 
+// UnitType is an enum for all unit types
+// ENUM(Distance,Flow,Pressure,Temperature,Velocity,Volume)
+//
+//go:generate go run github.com/abice/go-enum@latest --values
+type UnitType int
+
 // Unit is a base type for all other unit structs
 type Unit[T ~int] struct {
 	Value float32

pkg/units/velocity.go

@@ -22,13 +22,13 @@ type Velocity Unit[VelocityUnit]
 // MarshalJSON is a custom marshaler for the unit type to add the UnitType string
 func (u Velocity) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
-		Value    float32 `json:"value"`
-		Unit     int     `json:"unit"`
-		UnitType string  `json:"unitType"`
+		Value    float32  `json:"value"`
+		Unit     int      `json:"unit"`
+		UnitType UnitType `json:"unitType"`
 	}{
 		Value:    u.Value,
 		Unit:     int(u.Unit),
-		UnitType: "spd",
+		UnitType: UnitTypeVelocity,
 	})
 }
 

pkg/units/volume.go

@@ -21,13 +21,13 @@ type Volume Unit[VolumeUnit]
 // MarshalJSON is a custom marshaler for the unit type to add the UnitType string
 func (u Volume) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
-		Value    float32 `json:"value"`
-		Unit     int     `json:"unit"`
-		UnitType string  `json:"unitType"`
+		Value    float32  `json:"value"`
+		Unit     int      `json:"unit"`
+		UnitType UnitType `json:"unitType"`
 	}{
 		Value:    u.Value,
 		Unit:     int(u.Unit),
-		UnitType: "vol",
+		UnitType: UnitTypeVolume,
 	})
 }