From 26d63a760613ab6060675e4a75dc3374664c3ed6 Mon Sep 17 00:00:00 2001 From: Emux Date: Fri, 2 Dec 2022 10:13:25 +0200 Subject: [PATCH] RenderTheme: increase cache size See: https://github.com/mapsforge/mapsforge/pull/1369 --- vtm/src/org/oscim/theme/RenderTheme.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vtm/src/org/oscim/theme/RenderTheme.java b/vtm/src/org/oscim/theme/RenderTheme.java index 9861d849..eb3b3207 100644 --- a/vtm/src/org/oscim/theme/RenderTheme.java +++ b/vtm/src/org/oscim/theme/RenderTheme.java @@ -39,7 +39,7 @@ import java.util.Map; public class RenderTheme implements IRenderTheme { static final Logger log = LoggerFactory.getLogger(RenderTheme.class); - private static final int MATCHING_CACHE_SIZE = 512; + private static final int MATCHING_CACHE_SIZE = 8192; private final float mBaseTextSize; private final int mMapBackground; @@ -51,19 +51,19 @@ public class RenderTheme implements IRenderTheme { private final Map mTransformBackwardKeyMap, mTransformForwardKeyMap; private final Map mTransformBackwardTagMap, mTransformForwardTagMap; - class RenderStyleCache { + static class RenderStyleCache { final int matchType; final LRUCache cache; final MatchingCacheKey cacheKey; /* temporary matching instructions list */ - final ArrayList instructionList; + final List instructionList; RenderStyleItem prevItem; public RenderStyleCache(int type) { - cache = new LRUCache(MATCHING_CACHE_SIZE); - instructionList = new ArrayList(4); + cache = new LRUCache<>(MATCHING_CACHE_SIZE); + instructionList = new ArrayList<>(4); cacheKey = new MatchingCacheKey(); matchType = type; } @@ -73,7 +73,7 @@ public class RenderTheme implements IRenderTheme { } } - class RenderStyleItem { + static class RenderStyleItem { RenderStyleItem next; int zoom; RenderStyle[] list;