Mercurial > gemma
changeset 4762:c93c8a837af8
Removed unused code that interplolated height levels between class breaks.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Sat, 19 Oct 2019 18:34:17 +0200 |
| parents | a5ff1bbac4dc |
| children | d786c37b02c0 |
| files | pkg/controllers/diff.go pkg/imports/sr.go pkg/octree/classbreaks.go |
| diffstat | 3 files changed, 0 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/diff.go Sat Oct 19 18:13:56 2019 +0200 +++ b/pkg/controllers/diff.go Sat Oct 19 18:34:17 2019 +0200 @@ -278,7 +278,6 @@ heights = octree.SampleDiffHeights(tin.Min.Z, tin.Max.Z, contourStep) } else { heights = octree.ExtrapolateClassBreaks(heights, tin.Min.Z, tin.Max.Z) - // heights = octree.InBetweenClassBreaks(heights, 0.05, 2) } log.Printf("info: z range: %.3f - %.3f\n", tin.Min.Z, tin.Max.Z)
--- a/pkg/imports/sr.go Sat Oct 19 18:13:56 2019 +0200 +++ b/pkg/imports/sr.go Sat Oct 19 18:34:17 2019 +0200 @@ -864,12 +864,6 @@ } } else { heights = octree.ExtrapolateClassBreaks(heights, minZ, maxZ) - // We set steps for InBetweenClassBreaks to 1, so it - // becomes a null operation. The extra class breaks - // were considered unexpected and confusing by the - // users. Once we get filled polygones the visual will - // be considerably different anyway. -- sw - // heights = octree.InBetweenClassBreaks(heights, 0.05, 1) } /*
--- a/pkg/octree/classbreaks.go Sat Oct 19 18:13:56 2019 +0200 +++ b/pkg/octree/classbreaks.go Sat Oct 19 18:34:17 2019 +0200 @@ -148,35 +148,3 @@ return n } - -func InBetweenClassBreaks(cbs []float64, min float64, steps int) []float64 { - if len(cbs) < 2 || steps < 2 { - return cbs - } - - out := make([]float64, 1, len(cbs)*steps) - - out[0] = cbs[0] - - _1steps := 1 / float64(steps) - - for i := 1; i < len(cbs); i++ { - last, curr := cbs[i-1], cbs[i] - - // Gap already too small -> proceed with next gap. - diff := curr - last - if math.Abs(diff) < min { - out = append(out, curr) - continue - } - - delta := diff * _1steps - for p := last + delta; p < curr; p += delta { - out = append(out, p) - } - - out = append(out, curr) - } - - return out -}