From e6d1b7e97cfb2b6a04dec0aabeac79d87f20e2e0 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Tue, 30 Jun 2020 15:10:04 +0200
Subject: [PATCH] chore(carlton) Removed circumference suffix from measurements

---
 packages/carlton/config/index.js    | 14 +++++++-------
 packages/carlton/src/back.js        |  5 +----
 packages/carlton/src/collarstand.js |  2 +-
 packages/carlton/src/front.js       |  2 +-
 packages/carlton/src/shared.js      |  8 ++++----
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/carlton/config/index.js b/packages/carlton/config/index.js
index 9b100b7417a..d38bb36db1b 100644
--- a/packages/carlton/config/index.js
+++ b/packages/carlton/config/index.js
@@ -51,21 +51,21 @@ export default {
     collar: ['collarHeight', 'collarSpread', 'collarFlare']
   },
   measurements: [
-    'bicepsCircumference',
-    'chestCircumference',
-    'hipsCircumference',
+    'biceps',
+    'chest',
+    'hips',
     'hpsToWaistBack',
-    'waistCircumference',
+    'waist',
     'waistToHips',
-    'neckCircumference',
+    'neck',
     'shoulderSlope',
     'shoulderToElbow',
     'shoulderToShoulder',
     'shoulderToWrist',
-    'wristCircumference',
+    'wrist',
     'waistToFloor',
     'waistToSeat',
-    'seatCircumference'
+    'seat'
   ],
   dependencies: {
     bentBack: 'bentBase',
diff --git a/packages/carlton/src/back.js b/packages/carlton/src/back.js
index 9ea5db21da8..e6acef5b10d 100644
--- a/packages/carlton/src/back.js
+++ b/packages/carlton/src/back.js
@@ -24,10 +24,7 @@ export default function (part) {
 
   // Box pleat (bp)
   points.bpStart = new Point(0, points.armholePitch.y)
-  points.bpTop = new Point(
-    measurements.chestCircumference * options.backPleat * -1,
-    points.armholePitch.y
-  )
+  points.bpTop = new Point(measurements.chest * options.backPleat * -1, points.armholePitch.y)
   points.bpBottom = new Point(points.bpTop.x, points.cbWaist.y - bw / 2)
   points.bpTriangleEdge = points.bpStart.shift(0, points.bpTop.dx(points.bpStart) * 0.6)
   points.bpTriangleTip = points.bpStart.shift(90, points.bpStart.dx(points.bpTriangleEdge))
diff --git a/packages/carlton/src/collarstand.js b/packages/carlton/src/collarstand.js
index c264206cae2..66cd82c0484 100644
--- a/packages/carlton/src/collarstand.js
+++ b/packages/carlton/src/collarstand.js
@@ -13,7 +13,7 @@ export default function (part) {
     Path
   } = part.shorthand()
 
-  let height = measurements.chestCircumference * options.collarHeight
+  let height = measurements.chest * options.collarHeight
   let length = store.get('frontCollarLength') + store.get('backCollarLength')
   points.topLeft = new Point(0, 0)
   points.bottomLeft = new Point(0, height)
diff --git a/packages/carlton/src/front.js b/packages/carlton/src/front.js
index 58f70793c30..ee1ea71ede2 100644
--- a/packages/carlton/src/front.js
+++ b/packages/carlton/src/front.js
@@ -47,7 +47,7 @@ export default function (part) {
 
   // Front closure edge
   points.collarEdge = new Point(
-    points.button1Left.x - measurements.waistCircumference * options.frontOverlap,
+    points.button1Left.x - measurements.waist * options.frontOverlap,
     points.cfNeck.y
   )
   points.hemEdge = new Point(points.collarEdge.x, points.hem.y)
diff --git a/packages/carlton/src/shared.js b/packages/carlton/src/shared.js
index 91e4c6e0eca..1b399fc2055 100644
--- a/packages/carlton/src/shared.js
+++ b/packages/carlton/src/shared.js
@@ -5,10 +5,10 @@ export const calculateRatios = (part) => {
   let { store, measurements, options } = part.shorthand()
 
   // Calculate different values for reducing from chest to hips via waist
-  store.set('chest', measurements.chestCircumference * (1 + options.chestEase))
-  store.set('waist', measurements.waistCircumference * (1 + options.waistEase))
-  store.set('hips', measurements.hipsCircumference * (1 + options.hipsEase))
-  store.set('seat', measurements.seatCircumference * (1 + options.seatEase))
+  store.set('chest', measurements.chest * (1 + options.chestEase))
+  store.set('waist', measurements.waist * (1 + options.waistEase))
+  store.set('hips', measurements.hips * (1 + options.hipsEase))
+  store.set('seat', measurements.seat * (1 + options.seatEase))
 
   store.set('waistReduction', store.get('chest') - store.get('waist'))
   store.set('hipsReduction', store.get('chest') - store.get('hips'))