From b55843321198310e47520a699cf47e331e479f69 Mon Sep 17 00:00:00 2001 From: reger Date: Mon, 17 Nov 2014 01:24:30 +0100 Subject: [PATCH] adjust tag cloud font size calculation to limit max font size to ~ TOPWORDS_MAXSIZE --- htroot/yacysearchtrailer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java index f62216329..9137ec1d4 100644 --- a/htroot/yacysearchtrailer.java +++ b/htroot/yacysearchtrailer.java @@ -53,9 +53,7 @@ public class yacysearchtrailer { private static final int TOPWORDS_MAXCOUNT = 16; private static final int TOPWORDS_MINSIZE = 8; - private static final int TOPWORDS_MAXSIZE = 20; - private static final int MAXLIMIT_NAV_LOW = 5; - private static final int MAXLIMIT_NAV_HIGH = 20; + private static final int TOPWORDS_MAXSIZE = 22; public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { final serverObjects prop = new serverObjects(); @@ -334,7 +332,7 @@ public class yacysearchtrailer { prop.put(fileType, "nav-topics_element_" + i + "_name", name); prop.put(fileType, "nav-topics_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, name, false).toString()); prop.put("nav-topics_element_" + i + "_count", count); - int fontsize = TOPWORDS_MINSIZE + (TOPWORDS_MAXSIZE - TOPWORDS_MINSIZE) * (count - mincount) / (maxcount / mincount); + int fontsize = TOPWORDS_MINSIZE + (TOPWORDS_MAXSIZE - TOPWORDS_MINSIZE) * (count - mincount) / (maxcount - mincount); fontsize = Math.max(TOPWORDS_MINSIZE, fontsize - (name.length() - 5)); prop.put("nav-topics_element_" + i + "_size", fontsize); // font size in pixel prop.put("nav-topics_element_" + i + "_nl", 1);