Cleanup in CoilModel, see #86

phetsims · Nov 4, 2017 · be9a60b · be9a60b
1 parent a0f6c7d
commit be9a60b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/js/faradays-law/model/CoilModel.js b/js/faradays-law/model/CoilModel.js
@@ -13,23 +13,21 @@ define( function( require ) {
   var faradaysLaw = require( 'FARADAYS_LAW/faradaysLaw' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Property = require( 'AXON/Property' );
-  var Vector2 = require( 'DOT/Vector2' );
 
   /**
-   * @param {number} x - centerX of the coil
-   * @param {number} y - centerY of the coil
+   * @param {Vector2} position - center of the coil
    * @param {number} numberOfSpirals - number of spirals
    * @param {MagnetModel} magnetModel - model of the magnet
    * @constructor
    */
-  function CoilModel( x, y, numberOfSpirals, magnetModel ) {
+  function CoilModel( position, numberOfSpirals, magnetModel ) {
     var self = this;
 
     // @private
     this.sense = 1; //sense of magnet = +1 or -1, simulates flipping of magnet. Magnetic field sign
 
     // @public (read-only) // TODO convert args to Vector2
-    this.position = new Vector2( x, y );
+    this.position = position;
 
     // @private - current value of magnetic field
     this.magneticFieldProperty = new Property( 0 );

diff --git a/js/faradays-law/model/FaradaysLawModel.js b/js/faradays-law/model/FaradaysLawModel.js
@@ -15,6 +15,7 @@ define( function( require ) {
   var inherit = require( 'PHET_CORE/inherit' );
   var MagnetModel = require( 'FARADAYS_LAW/faradays-law/model/MagnetModel' );
   var Property = require( 'AXON/Property' );
+  var Vector2 = require( 'DOT/Vector2' );
   var VoltmeterModel = require( 'FARADAYS_LAW/faradays-law/model/VoltmeterModel' );
 
   // phet-io modules
@@ -48,8 +49,8 @@ define( function( require ) {
     this.magnetModel = new MagnetModel( 647, 219, 140, 30, tandem.createTandem( 'magnetModel' ) );
 
     // coils
-    this.bottomCoil = new CoilModel( 448, 328, 4, this.magnetModel );
-    this.topCoil = new CoilModel( 422, 131, 2, this.magnetModel );
+    this.bottomCoil = new CoilModel( new Vector2( 448, 328 ), 4, this.magnetModel );
+    this.topCoil = new CoilModel( new Vector2( 422, 131 ), 2, this.magnetModel );
 
     // restricted zones for magnet because of coils
     var TWO_COIL_RESTRICTED_BOUNDS = new Bounds2( 0, 0, 25, 11 );