Skip to content

Commit 31a2a67

Browse files
aldasaldas
committed
drop fieldValue.Type
1 parent 589ecb1 commit 31a2a67

File tree

6 files changed

+119
-130
lines changed

6 files changed

+119
-130
lines changed

‎canboat/canboatpgns.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,17 @@ func (f *Field) decodeNumber(rawData nmea.RawData, bitOffset uint16) (nmea.Field
338338
if f.Signed {
339339
tmpIntValue += int64(f.Offset)
340340
if f.Resolution == 1 {
341-
return nmea.FieldValue{ID: f.ID, Type: "INT64", Value: tmpIntValue}, nil
341+
return nmea.FieldValue{ID: f.ID, Value: tmpIntValue}, nil
342342
}
343343
value = float64(tmpIntValue) * f.Resolution
344344
} else {
345345
tmpUIntValue += uint64(f.Offset)
346346
if f.Resolution == 1 {
347-
return nmea.FieldValue{ID: f.ID, Type: "UINT64", Value: tmpUIntValue}, nil
347+
return nmea.FieldValue{ID: f.ID, Value: tmpUIntValue}, nil
348348
}
349349
value = float64(tmpUIntValue) * f.Resolution
350350
}
351-
return nmea.FieldValue{ID: f.ID, Type: "FLOAT64", Value: value}, nil
351+
return nmea.FieldValue{ID: f.ID, Value: value}, nil
352352
}
353353

354354
func (f *Field) decodeBytes(rawData nmea.RawData, bitOffset uint16) (nmea.FieldValue, uint16, error) {
@@ -358,7 +358,6 @@ func (f *Field) decodeBytes(rawData nmea.RawData, bitOffset uint16) (nmea.FieldV
358358
}
359359
return nmea.FieldValue{
360360
ID: f.ID,
361-
Type: "BYTES",
362361
Value: value,
363362
}, bits, nil
364363
}
@@ -370,7 +369,6 @@ func (f *Field) decodeTime(rawData nmea.RawData, bitOffset uint16) (nmea.FieldVa
370369
}
371370
return nmea.FieldValue{
372371
ID: f.ID,
373-
Type: "DURATION",
374372
Value: value,
375373
}, nil
376374
}
@@ -382,7 +380,6 @@ func (f *Field) decodeDate(rawData nmea.RawData, bitOffset uint16) (nmea.FieldVa
382380
}
383381
return nmea.FieldValue{
384382
ID: f.ID,
385-
Type: "DATE",
386383
Value: str,
387384
}, nil
388385
}
@@ -395,7 +392,6 @@ func (f *Field) decodeMMSI(rawData nmea.RawData, bitOffset uint16) (nmea.FieldVa
395392
// FIXME: should we validate that MMSI is in range of 0 to 999_999_999
396393
return nmea.FieldValue{
397394
ID: f.ID,
398-
Type: "UINT64",
399395
Value: mmsi,
400396
}, nil
401397
}
@@ -407,7 +403,6 @@ func (f *Field) decodeStringFIX(rawData nmea.RawData, bitOffset uint16) (nmea.Fi
407403
}
408404
return nmea.FieldValue{
409405
ID: f.ID,
410-
Type: "STRING",
411406
Value: str,
412407
}, nil
413408
}
@@ -419,7 +414,6 @@ func (f *Field) decodeStringLZ(rawData nmea.RawData, bitOffset uint16) (nmea.Fie
419414
}
420415
return nmea.FieldValue{
421416
ID: f.ID,
422-
Type: "STRING",
423417
Value: str,
424418
}, readBits, nil
425419
}
@@ -431,7 +425,6 @@ func (f *Field) decodeStringLAU(rawData nmea.RawData, bitOffset uint16) (nmea.Fi
431425
}
432426
return nmea.FieldValue{
433427
ID: f.ID,
434-
Type: "STRING",
435428
Value: str,
436429
}, readBits, nil
437430
}
@@ -443,7 +436,6 @@ func (f *Field) decodeDecimal(rawData nmea.RawData, bitOffset uint16) (nmea.Fiel
443436
}
444437
return nmea.FieldValue{
445438
ID: f.ID,
446-
Type: "UINT64",
447439
Value: decimal,
448440
}, nil
449441
}
@@ -455,7 +447,6 @@ func (f *Field) decodeFloat(rawData nmea.RawData, bitOffset uint16) (nmea.FieldV
455447
}
456448
return nmea.FieldValue{
457449
ID: f.ID,
458-
Type: "FLOAT64",
459450
Value: float,
460451
}, nil
461452
}

‎canboat/canboatpgns_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func TestField_Decode(t *testing.T) {
225225
Resolution: 1,
226226
FieldType: FieldTypeNumber,
227227
},
228-
expect: nmea.FieldValue{ID: "manufacturerCode", Type: "UINT64", Value: uint64(1855)},
228+
expect: nmea.FieldValue{ID: "manufacturerCode", Value: uint64(1855)},
229229
expectReadBits: 11,
230230
},
231231
{
@@ -240,7 +240,7 @@ func TestField_Decode(t *testing.T) {
240240
Resolution: 1,
241241
FieldType: FieldTypeNumber,
242242
},
243-
expect: nmea.FieldValue{ID: "pitch", Type: "INT64", Value: int64(-905)},
243+
expect: nmea.FieldValue{ID: "pitch", Value: int64(-905)},
244244
expectReadBits: 16,
245245
},
246246
{
@@ -255,7 +255,7 @@ func TestField_Decode(t *testing.T) {
255255
Resolution: 0.0001,
256256
FieldType: FieldTypeNumber,
257257
},
258-
expect: nmea.FieldValue{ID: "pitch", Type: "FLOAT64", Value: -0.0905},
258+
expect: nmea.FieldValue{ID: "pitch", Value: -0.0905},
259259
expectReadBits: 16,
260260
},
261261
{
@@ -270,7 +270,7 @@ func TestField_Decode(t *testing.T) {
270270
Resolution: 1,
271271
FieldType: FieldTypeLookup,
272272
},
273-
expect: nmea.FieldValue{ID: "manufacturerCode", Type: "UINT64", Value: uint64(1855)},
273+
expect: nmea.FieldValue{ID: "manufacturerCode", Value: uint64(1855)},
274274
expectReadBits: 11,
275275
},
276276
{
@@ -285,7 +285,7 @@ func TestField_Decode(t *testing.T) {
285285
Resolution: 1,
286286
FieldType: FieldTypeReserved,
287287
},
288-
expect: nmea.FieldValue{ID: "reserved", Type: "BYTES", Value: []byte{3}},
288+
expect: nmea.FieldValue{ID: "reserved", Value: []byte{3}},
289289
expectReadBits: 2,
290290
},
291291
}

‎canboat/decoder.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ func (d *Decoder) postProcessFields(decodedFields []decoded) (nmea.FieldValues,
292292
}
293293
fields = append(fields, nmea.FieldValue{
294294
ID: f.Field.ID,
295-
Type: "FIELDSET",
296295
Value: fieldsets,
297296
})
298297
continue

0 commit comments

Comments
 (0)