gridviz 3.0.13 → 3.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gridviz",
-    "version": "3.0.13",
+    "version": "3.0.15",
     "description": "Visualization tool for gridded statistics",
     "keywords": [
         "statistics",

package/src/legend/TernaryLegend.js

@@ -113,15 +113,15 @@ export class TernaryLegend extends Legend {
         //triangle s0
         const t0_ = g.append('polygon')
             .attr('points', w / 2 + "," + h * 2 / 3 + " " + w * 5 / 6 + "," + h * 2 / 3 + " " + w * 2 / 3 + "," + h / 3)
-        setAttributes(t0_, classifier.mixColors[0], texts["12"])
+        setAttributes(t0_, classifier.mixColors[0], texts["m12"])
         //triangle s1
         const t1_ = g.append('polygon')
             .attr('points', w / 2 + "," + h * 2 / 3 + " " + w / 3 + "," + h + " " + w * 2 / 3 + "," + h)
-        setAttributes(t1_, classifier.mixColors[1], texts["02"])
+        setAttributes(t1_, classifier.mixColors[1], texts["m02"])
         //triangle s2
         const t2_ = g.append('polygon')
             .attr('points', w / 2 + "," + h * 2 / 3 + " " + w / 6 + "," + h * 2 / 3 + " " + w / 3 + "," + h / 3)
-        setAttributes(t2_, classifier.mixColors[2], texts["01"])
+        setAttributes(t2_, classifier.mixColors[2], texts["m01"])
 
         //center
         if (this.centerCoefficient) {

package/src/utils/ternary.js

@@ -53,21 +53,21 @@ export const ternaryClassifier = (properties, totalFunction, opts = {}) => {
         if (s0 <= c0 && s1 >= c1 && s2 >= c2) {
             //central class
             if (cc != undefined && s0 > cc * c0) return "center"
-            if (withMixedClasses) return "m0"
+            if (withMixedClasses) return "m12"
             return s1 > s2 ? "1" : "2"
         }
         //middle class 1 - intersection class 0 and 1
         if (s0 >= c0 && s1 <= c1 && s2 >= c2) {
             //central class
             if (cc != undefined && s1 > cc * c1) return "center"
-            if (withMixedClasses) return "m1"
+            if (withMixedClasses) return "m02"
             return s0 > s2 ? "0" : "2"
         }
         //middle class 2 - intersection class 0 and 1
         if (s0 >= c0 && s1 >= c1 && s2 <= c2) {
             //central class
             if (cc != undefined && s2 > cc * c2) return "center"
-            if (withMixedClasses) return "m2"
+            if (withMixedClasses) return "m01"
             return s1 > s0 ? "1" : "0"
         }
         //should not happen
@@ -110,9 +110,9 @@ export const ternaryColorClassifier = (properties, totalFunction, colors, opts =
         if (cla == "0") return color0
         if (cla == "1") return color1
         if (cla == "2") return color2
-        if (cla == "m0") return mixColor0
-        if (cla == "m1") return mixColor1
-        if (cla == "m2") return mixColor2
+        if (cla == "m12") return mixColor0
+        if (cla == "m02") return mixColor1
+        if (cla == "m01") return mixColor2
         if (cla == "center") return centerColor
         return opts.defaultColor || "black"
     }
@@ -121,6 +121,7 @@ export const ternaryColorClassifier = (properties, totalFunction, colors, opts =
     fun.colors = [color0, color1, color2]
     fun.mixColors = [mixColor0, mixColor1, mixColor2]
     fun.centerColor = centerColor
+    fun.classifier = classifier
 
     return fun
 }