support 2 classes, fix reclass, textual changes

74f703ee · Anne Blankert · 47f87a56 · 74f703ee · 74f703ee · 74f703ee
Commit 74f703ee authored Aug 20, 2019 by Anne Blankert
Show whitespace changes
Inline Side-by-side

Showing with 16 additions and 10 deletions

attrinfo.html public/attrinfo.html +14 -8

info.html public/info.html +1 -1

tableinfo.html public/tableinfo.html +1 -1

No files found.
--- a/public/attrinfo.html
+++ b/public/attrinfo.html
@@ -357,6 +357,15 @@
                return result;
            }
        }
+        if (numClasses === 2) {
+            return colorbrewer.filter(scheme=>scheme.type===legendType)
+                .map(scheme=>{
+                    const result = {colors: [scheme.sets[0].colors[0],scheme.sets[0].colors[2]]}
+                    result.name = scheme.name;
+                    result.type = scheme.type;
+                    return result;
+                })
+        }
        return [];
    }

@@ -400,7 +409,7 @@
                        let percentileBreaks = globalStats.percentiles.reduce((result, percentile)=>{
                            percentile.pcount = 1;
                            if (result.length === 0) {
-                                result.push(percentile);
+                                result.push(Object.assign({}, percentile)); // spread operator not supported by current Edge
                                return result;
                            }
                            if (result[result.length - 1].to === percentile.from) {
@@ -409,10 +418,10 @@
                                result[result.length - 1].pcount++;
                                return result;
                            }
-                            result.push(percentile);
+                            result.push(Object.assign({}, percentile)); 
                            return result;
                        },[]);
-                        const legendType = (typeof percentileBreaks[0].value === "string") ? 'qual' : 'seq';
+                        const legendType = (typeof percentileBreaks[0].from === "string") ? 'qual' : 'seq';
                        const seqSchemes = getColorSchemes(classCount, legendType);
                        classCount = seqSchemes[0].colors.length;
                        if (classCount > percentileBreaks.length) {
@@ -424,7 +433,7 @@
                            let sumClassCount = 0
                            percentileBreaks = percentileBreaks.reduce((result, percentile)=>{
                                sumPCount += percentile.pcount;
-                                if (sumPCount > sumClassCount * pCountPerClass) {
+                                if (sumPCount >= sumClassCount * pCountPerClass && result.length < classCount) {
                                    // new class
                                    result.push(percentile);
                                    sumClassCount++;
@@ -436,10 +445,7 @@
                                return result;
                            },[])
                        }
-                        mapboxPaint = [
-                                "case"
-                            ]
-                        
+                        mapboxPaint = ["case"]
                        percentileBreaks.forEach((brk, index, arr)=>{
                            addLegendLine(seqSchemes[0].colors[index], `${brk.from} - ${brk.to}`, layerType);
                            mapboxPaint.push(["<",["get", globalStats.column],brk.to],seqSchemes[0].colors[index])

--- a/public/info.html
+++ b/public/info.html
@@ -126,7 +126,7 @@
 </head>
 <body onload="init()">
    <h1>Layers in database</h1>
-    <input id="filter" type="text" placeholder="Filter.." size="20" oninput="filterLayerInfo()"><br>
+    <input id="filter" type="text" placeholder="Search..." size="20" oninput="filterLayerInfo()"><br>
    <table id="layerinfo"></table>
 </body>
 </html>
\ No newline at end of file
--- a/public/tableinfo.html
+++ b/public/tableinfo.html
@@ -87,6 +87,6 @@
    <h2 id="tablename"></h2>
    <div id="bbox">waiting for table stats...</div>
    <ul id="columns"></ul>
-    <a href="info.html">Back to layer overviewe</a>
+    <a href="info.html">Back to layer overview</a>
 </body>
 </html>
\ No newline at end of file