Fix types for Reading, see #401

phetsims · Oct 11, 2021 · 4deca4f · 4deca4f
1 parent 39347ef
commit 4deca4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/js/common/model/IntensityMeter.ts b/js/common/model/IntensityMeter.ts
@@ -30,7 +30,7 @@ class IntensityMeter {
    */
   constructor( sensorX: number, sensorY: number, bodyX: number, bodyY: number ) {
 
-    this.readingProperty = new Property( 'miss' ); // @public, value to show on the body
+    this.readingProperty = new Property( Reading.MISS ); // @public, value to show on the body
     this.sensorPositionProperty = new Vector2Property( new Vector2( sensorX, sensorY ) ); // @public
     this.bodyPositionProperty = new Vector2Property( new Vector2( bodyX, bodyY ) ); // @public
     this.enabledProperty = new Property( false ); // @public, True if it is in the play area
@@ -79,7 +79,7 @@ class IntensityMeter {
    */
   clearRayReadings() {
     this.rayReadings = [];
-    this.readingProperty.set( 'miss' );
+    this.readingProperty.set( Reading.MISS );
   }
 
   /**
@@ -106,9 +106,9 @@ class IntensityMeter {
       }
     } );
 
-    // if not hits, say "MISS"
+    // if no hits, say "MISS"
     if ( hits.length === 0 ) {
-      this.readingProperty.set( 'miss' );
+      this.readingProperty.set( Reading.MISS );
     }
     else {
 

diff --git a/js/common/view/IntensityMeterNode.ts b/js/common/view/IntensityMeterNode.ts
@@ -95,7 +95,7 @@ class IntensityMeterNode extends Node {
     }
 
     // Add the reading to the body node
-    const valueNode = new Text( intensityMeter.readingProperty.get(), {
+    const valueNode = new Text( intensityMeter.readingProperty.get().getString(), {
       font: new PhetFont( 25 ),
       fill: 'black',
       maxWidth: valueBackground.width * 0.85
@@ -111,8 +111,8 @@ class IntensityMeterNode extends Node {
     titleNode.centerX = outerRectangle.centerX;
 
     // displayed value
-    intensityMeter.readingProperty.link( ( reading: Reading | string ) => {
-      valueNode.setText( typeof reading === 'string' ? reading : reading.getString() );
+    intensityMeter.readingProperty.link( ( reading: Reading ) => {
+      valueNode.setText( reading.getString() );
       valueNode.center = valueBackground.center;
     } );