From 901cb20396fa3790ff92d8548594b213aa37acdb Mon Sep 17 00:00:00 2001
From: vargburz <vargburz@corpglory.com>
Date: Fri, 5 Mar 2021 14:19:44 +0300
Subject: [PATCH] use new options

---
 examples/01-basic.html | 10 +++++-----
 src/index.ts           | 30 ++++++++++++++++++++----------
 src/types.ts           |  2 ++
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/examples/01-basic.html b/examples/01-basic.html
index 2938fe0..6f2ee51 100644
--- a/examples/01-basic.html
+++ b/examples/01-basic.html
@@ -12,21 +12,21 @@
     <script type="text/javascript">
       var pod = new ChartwerkGaugePod(
         document.getElementById('chart'),
-        [{ target: 'test', datapoints: [[5, 5], [0, 10], [30, 15], [50, 20], [30, 25]] }],
+        [{ target: 'test', datapoints: [[5, 5], [0, 10], [30, 15], [50, 20], [17, 25]] }],
         {
           stops: [
             {
               color: 'green',
-              value: 20
+              value: 18
             }, 
             {
               color: 'orange',
-              value: 30
+              value: 14
             }
           ],
           defaultColor: 'red',
-          maxValue: 40,
-          minValue: 10,
+          maxValue: 20,
+          minValue: -20,
           icons: [ { src: 'https://cityhost.ua/upload_img/blog5ef308ea5529c_trash2-01.jpg', position: 'middle', size: 30 }]
         }
       );
diff --git a/src/index.ts b/src/index.ts
index 07a1b55..be9c419 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -46,7 +46,9 @@ const DEFAULT_GAUGE_OPTIONS: GaugeOptions = {
   stat: Stat.CURRENT,
   innerRadius: DEFAULT_INNER_RADIUS,
   outerRadius: DEFAULT_OUTER_RADIUS,
-  icons: []
+  icons: [],
+  valueSize: VALUE_TEXT_FONT_SIZE,
+  valueArcBackgroundColor: BACKGROUND_COLOR
 };
 
 export class ChartwerkGaugePod extends ChartwerkPod<GaugeTimeSerie, GaugeOptions> {
@@ -219,12 +221,11 @@ export class ChartwerkGaugePod extends ChartwerkPod<GaugeTimeSerie, GaugeOptions
   }
 
   private get _valueArcColors(): [string, string] {
-    return [this._mainCircleColor, BACKGROUND_COLOR];
+    return [this._mainCircleColor, this._valueArcBackgroundColor];
   }
 
   private get _mainCircleColor(): string {
-    if(this.aggregatedValue > _.max(this._stopsValues) || this.aggregatedValue < 0 || this._sortedStops.length === 0) {
-      // TODO: aggregatedValue can be less than 0
+    if(this.aggregatedValue > _.max(this._stopsValues) || this._sortedStops.length === 0) {
       return this.options.defaultColor;
     }
     // TODO: refactor
@@ -260,13 +261,14 @@ export class ChartwerkGaugePod extends ChartwerkPod<GaugeTimeSerie, GaugeOptions
   }
 
   private get _valueRange(): [number, number] {
+    const valueRange = this._maxValue - this._minValue;
     const startValue = this.aggregatedValue - this._minValue;
-    const endValue = this._maxValue - startValue;
+    const endValue = valueRange - startValue;
     return [startValue, endValue];
   }
 
   private get _sortedStops(): Stop[] {
-    return _.sortBy(this.options.stops);
+    return _.sortBy(this.options.stops, [stop => stop.value]);
   }
 
   private get _stopsValues(): number[] {
@@ -289,13 +291,13 @@ export class ChartwerkGaugePod extends ChartwerkPod<GaugeTimeSerie, GaugeOptions
   private get _valueTextFontSize(): number {
     let font;
     if(this._valueText.length <= 6) {
-      font = VALUE_TEXT_FONT_SIZE;
+      font = this._valueSize;
     } else if(this._valueText.length > 6 && this._valueText.length <= 10) {
-      font = VALUE_TEXT_FONT_SIZE - 2;
+      font = this._valueSize - 2;
     } else if(this._valueText.length > 10 && this._valueText.length <= 12) {
-      font = VALUE_TEXT_FONT_SIZE - 4;
+      font = this._valueSize - 4;
     } else {
-      font = VALUE_TEXT_FONT_SIZE - 6;
+      font = this._valueSize - 6;
     }
     return this.rescaleValueFont(font);
   }
@@ -304,6 +306,14 @@ export class ChartwerkGaugePod extends ChartwerkPod<GaugeTimeSerie, GaugeOptions
     return this.options.stat;
   }
 
+  private get _valueSize(): number {
+    return this.options.valueSize;
+  }
+
+  private get _valueArcBackgroundColor(): string {
+    return this.options.valueArcBackgroundColor;
+  }
+
   private get _innerRadius(): number {
     // TODO: scale shouldn't be here
     return this.rescaleArcRadius(this.options.innerRadius);
diff --git a/src/types.ts b/src/types.ts
index fc82aff..a6efffe 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -38,5 +38,7 @@ export type GaugeOptionsParams = {
   stat: Stat;
   valueFormatter: ValueFormatter;
   icons: IconConfig[];
+  valueSize: number;
+  valueArcBackgroundColor: string;
 }
 export type GaugeOptions = Options & Partial<GaugeOptionsParams>;