From 9826c6944cbb60f45d2e8736a69daf4ab8a856fb Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 13:02:32 +0200
Subject: [PATCH 01/10] Draw quest objective areas on the world map instead of
 pins

Replaces the per-spawn dots for quest objectives on the world map with
numbered areas, in the style of the retail quest POI blobs:

- Objective coordinates of each quest on the current map are grouped by
  single-linkage clustering (8 map-% threshold), so a quest whose targets
  live in two separate places gets two areas.
- Each cluster is drawn as its padded convex hull, filled as a triangle
  fan with Texture:SetVertexOffset, one uniform translucent colour for all
  quests. Areas are children of the map canvas so they zoom with it.
- A badge at the cluster centroid shows the quest's position in the quest
  log (main.lua now records meta.ordinal). Hovering an area or badge shows
  the quest title and its objective lines; clicking the badge opens the
  quest in the quest log via QuestLog_SetSelection.
- Areas rebuild, debounced, whenever the node tables or the map change;
  rebuilds while the map is closed are deferred to the next OnShow.
- New WorldMap setting "worldmap_quest_area" (default on) switches between
  areas and the previous dots. The minimap is unchanged.

Geometry (clustering, monotone-chain hull with octagon padding, centroid)
lives in map-area-geometry.lua and is covered by tests/geometry_test.lua,
runnable with lua5.1 or via tests/run_lupa.py when only Python is around.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 Locale/deDE.lua         |   1 +
 Locale/enUS.lua         |   1 +
 Locale/esES.lua         |   1 +
 Locale/esMX.lua         |   1 +
 Locale/frFR.lua         |   1 +
 Locale/koKR.lua         |   1 +
 Locale/ptBR.lua         |   1 +
 Locale/ruRU.lua         |   1 +
 Locale/zhCN.lua         |   1 +
 Locale/zhTW.lua         |   1 +
 load.xml                |   2 +
 main.lua                |   6 +
 map-area-geometry.lua   | 149 +++++++++++++++++++
 map-area.lua            | 311 ++++++++++++++++++++++++++++++++++++++++
 map.lua                 |  30 +++-
 setting.lua             |  14 ++
 tests/geometry_test.lua | 151 +++++++++++++++++++
 tests/run_lupa.py       |  14 ++
 18 files changed, 682 insertions(+), 5 deletions(-)
 create mode 100644 map-area-geometry.lua
 create mode 100644 map-area.lua
 create mode 100644 tests/geometry_test.lua
 create mode 100644 tests/run_lupa.py

diff --git a/Locale/deDE.lua b/Locale/deDE.lua
index 7a525e2..6ca7acf 100644
--- a/Locale/deDE.lua
+++ b/Locale/deDE.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/enUS.lua b/Locale/enUS.lua
index 2dc43cd..2365dc0 100644
--- a/Locale/enUS.lua
+++ b/Locale/enUS.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/esES.lua b/Locale/esES.lua
index 855f70f..9a2714c 100644
--- a/Locale/esES.lua
+++ b/Locale/esES.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/esMX.lua b/Locale/esMX.lua
index aa48915..8552789 100644
--- a/Locale/esMX.lua
+++ b/Locale/esMX.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/frFR.lua b/Locale/frFR.lua
index 60ae292..7201a6a 100644
--- a/Locale/frFR.lua
+++ b/Locale/frFR.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/koKR.lua b/Locale/koKR.lua
index 51e5a93..ae73ffc 100644
--- a/Locale/koKR.lua
+++ b/Locale/koKR.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/ptBR.lua b/Locale/ptBR.lua
index 72e36b2..78202fe 100644
--- a/Locale/ptBR.lua
+++ b/Locale/ptBR.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Minium Drop Rate";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Size of WorldMap normal pins";
 uil10n.worldmap_large_size = "Size of WorldMap BOSS pins";
diff --git a/Locale/ruRU.lua b/Locale/ruRU.lua
index 4d1954b..a472086 100644
--- a/Locale/ruRU.lua
+++ b/Locale/ruRU.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "Modifier of poping menu of pin";
 --	map
 uil10n.min_rate = "Минимальный шанс выпадения";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "Alpha of icons on world map";
 uil10n.worldmap_normal_size = "Размер большинства контактов";
 uil10n.worldmap_large_size = "Размер отображения босса";
diff --git a/Locale/zhCN.lua b/Locale/zhCN.lua
index bd18d3f..5c85f53 100644
--- a/Locale/zhCN.lua
+++ b/Locale/zhCN.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "任务标记弹出菜单按键";
 --	map
 uil10n.min_rate = "最低物品掉率";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "大地图图标透明度";
 uil10n.worldmap_normal_size = "大地图普通标记点大小";
 uil10n.worldmap_large_size = "大地图boss标记点大小";
diff --git a/Locale/zhTW.lua b/Locale/zhTW.lua
index a6bb8e9..362c853 100644
--- a/Locale/zhTW.lua
+++ b/Locale/zhTW.lua
@@ -59,6 +59,7 @@ uil10n.node_menu_modifier = "任務标记彈出菜單按鍵";
 --	map
 uil10n.min_rate = "最低物品掉率";
 --	worldmap
+uil10n.worldmap_quest_area = "Show quest areas instead of objective pins";
 uil10n.worldmap_alpha = "大地圖圖標透明度";
 uil10n.worldmap_normal_size = "大地圖普通標記點大小";
 uil10n.worldmap_large_size = "大地圖boss標記點大小";
diff --git a/load.xml b/load.xml
index f5e7902..a1d2197 100644
--- a/load.xml
+++ b/load.xml
@@ -16,6 +16,8 @@
     <script file = "db-extra.lua" />
     <script file = "main.lua" />
     <script file = "map.lua" />
+    <script file = "map-area-geometry.lua" />
+    <script file = "map-area.lua" />
     <script file = "comm.lua" />
     <script file = "util.lua" />
     <script file = "setting.lua" />
diff --git a/main.lua b/main.lua
index 92129dd..580c608 100644
--- a/main.lua
+++ b/main.lua
@@ -987,10 +987,12 @@ MT.BuildEnv("main");
 				meta.flag = -1;
 			end
 			if num > 0 then
+				local ordinal = 0;
 				for index = 1, 40 do
 					local title, level, group, header, collapsed, completed, frequency, quest_id = GetQuestLogTitle(index);
 						-->	completed:	1 = completed, nil = not completed, -1 = failed		>>	0 = not completed
 					if not header and quest_id then
+						ordinal = ordinal + 1;
 						local info = DataAgent.quest[quest_id];
 						if info ~= nil then
 							local num_lines = GetNumQuestLeaderBoards(index);
@@ -1007,6 +1009,10 @@ MT.BuildEnv("main");
 								quest_changed = true;
 								MT.PushAddQuest(quest_id, completed, title, num_lines);
 							end
+							if meta.ordinal ~= ordinal then					--	position in the quest log, shown on map areas
+								meta.ordinal = ordinal;
+								need_re_draw = true;
+							end
 							--
 							-- local details = GetQuestObjectives(quest_id);
 							-- local detail = details[line];
diff --git a/map-area-geometry.lua b/map-area-geometry.lua
new file mode 100644
index 0000000..fb8c8b2
--- /dev/null
+++ b/map-area-geometry.lua
@@ -0,0 +1,149 @@
+--[[--
+	Quest-area geometry: pure Lua, no WoW API.
+	Groups objective coordinates into clusters and builds padded convex hulls
+	for drawing quest areas on the world map.  Tested by tests/geometry_test.lua.
+--]]--
+local __addon, __private = ...;
+local MT = __private.MT;
+
+-->		upvalue
+	local cos, sin, pi = math.cos, math.sin, math.pi;
+	local tsort = table.sort;
+
+-->
+	--	points are any tables with [1] = x, [2] = y (map coords, 0-100)
+	--	Single linkage: two points share a cluster when a chain of points, each within
+	--	`threshold` of the next, connects them.  Clusters keep input order of first appearance.
+	function MT.AreaCluster(points, threshold)
+		local clusters = {  };
+		local n = #points;
+		if n == 0 then
+			return clusters;
+		end
+		local t2 = threshold * threshold;
+		local parent = {  };
+		for i = 1, n do
+			parent[i] = i;
+		end
+		local function find(i)
+			while parent[i] ~= i do
+				parent[i] = parent[parent[i]];
+				i = parent[i];
+			end
+			return i;
+		end
+		for i = 1, n - 1 do
+			local p = points[i];
+			local px, py = p[1], p[2];
+			for j = i + 1, n do
+				local q = points[j];
+				local dx, dy = q[1] - px, q[2] - py;
+				if dx * dx + dy * dy <= t2 then
+					local ri, rj = find(i), find(j);
+					if ri ~= rj then
+						parent[rj] = ri;
+					end
+				end
+			end
+		end
+		local byRoot = {  };
+		for i = 1, n do
+			local root = find(i);
+			local cluster = byRoot[root];
+			if cluster == nil then
+				cluster = {  };
+				byRoot[root] = cluster;
+				clusters[#clusters + 1] = cluster;
+			end
+			cluster[#cluster + 1] = points[i];
+		end
+		return clusters;
+	end
+
+	local function cross(o, a, b)
+		return (a[1] - o[1]) * (b[2] - o[2]) - (a[2] - o[2]) * (b[1] - o[1]);
+	end
+	local function lessXY(a, b)
+		if a[1] == b[1] then
+			return a[2] < b[2];
+		end
+		return a[1] < b[1];
+	end
+	--	Andrew's monotone chain.  Returns vertices with positive signed area
+	--	(counter-clockwise for y-up), dropping duplicate and collinear points.
+	local function ConvexHull(points)
+		local n = #points;
+		if n == 0 then
+			return {  };
+		elseif n == 1 then
+			return { { points[1][1], points[1][2], }, };
+		end
+		local sorted = {  };
+		for i = 1, n do
+			sorted[i] = points[i];
+		end
+		tsort(sorted, lessXY);
+		local hull = {  };
+		local k = 0;
+		for i = 1, n do
+			local p = sorted[i];
+			while k >= 2 and cross(hull[k - 1], hull[k], p) <= 0 do
+				hull[k] = nil;
+				k = k - 1;
+			end
+			k = k + 1;
+			hull[k] = p;
+		end
+		local lower = k + 1;
+		for i = n - 1, 1, -1 do
+			local p = sorted[i];
+			while k >= lower and cross(hull[k - 1], hull[k], p) <= 0 do
+				hull[k] = nil;
+				k = k - 1;
+			end
+			k = k + 1;
+			hull[k] = p;
+		end
+		hull[k] = nil;		--	last vertex repeats the first
+		return hull;
+	end
+
+	local OCTAGON = {  };
+	for i = 0, 7 do
+		local a = (i + 0.5) * pi / 4;
+		OCTAGON[i + 1] = { cos(a), sin(a), };
+	end
+	--	Convex hull of the points, grown outward by `pad` on every side.
+	--	Padding surrounds each hull vertex with an octagon of radius `pad` and hulls those,
+	--	so one or two points still yield a real polygon.
+	function MT.AreaPaddedHull(points, pad)
+		if #points == 0 then
+			return {  };
+		end
+		if pad == nil or pad <= 0 then
+			return ConvexHull(points);
+		end
+		local base = ConvexHull(points);
+		local expanded = {  };
+		for i = 1, #base do
+			local p = base[i];
+			for k = 1, 8 do
+				local o = OCTAGON[k];
+				expanded[#expanded + 1] = { p[1] + o[1] * pad, p[2] + o[2] * pad, };
+			end
+		end
+		return ConvexHull(expanded);
+	end
+
+	function MT.AreaCentroid(points)
+		local n = #points;
+		if n == 0 then
+			return nil;
+		end
+		local sx, sy = 0, 0;
+		for i = 1, n do
+			sx = sx + points[i][1];
+			sy = sy + points[i][2];
+		end
+		return sx / n, sy / n;
+	end
diff --git a/map-area.lua b/map-area.lua
new file mode 100644
index 0000000..82d3d25
--- /dev/null
+++ b/map-area.lua
@@ -0,0 +1,311 @@
+--[[--
+	Quest areas on the world map.
+	For every quest on the current map the objective coordinates are clustered and each
+	cluster is drawn as a filled polygon with a numbered badge (position in the quest log).
+	Hovering shows the objectives, clicking the badge opens the quest in the quest log.
+	Geometry lives in map-area-geometry.lua.
+--]]--
+local __addon, __private = ...;
+local MT = __private.MT;
+local CT = __private.CT;
+local VT = __private.VT;
+local DT = __private.DT;
+
+-->		upvalue
+	local next = next;
+	local max, floor = math.max, math.floor;
+	local CreateFrame = CreateFrame;
+	local WorldMapFrame = WorldMapFrame;
+	local GameTooltip = GameTooltip;
+	local GetQuestLogIndexByID = GetQuestLogIndexByID;
+	local ShowUIPanel = ShowUIPanel;
+	local _G = _G;
+
+-->
+	local mapCanvas = WorldMapFrame:GetCanvas();
+	local __MAIN_META = VT.MAIN_META;
+	local BADGE_FONT = GameFontNormal:GetFont();
+
+-->
+MT.BuildEnv("map-area");
+-->		constant
+	local CLUSTER_DIST = 8.0;			--	map-% units: points chained closer than this share one area
+	local AREA_PAD = 1.5;				--	map-% units: how far an area extends beyond its points
+	local FILL_R, FILL_G, FILL_B, FILL_A = 0.55, 0.50, 1.00, 0.60;
+	local IDLE_ALPHA, HOVER_ALPHA = 0.6, 1.0;	--	multiplies the fill; hover brightens
+	local BADGE_BASE_SIZE = 22;
+	local BADGE_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\Circle]];
+	local COMMON_TAG, LARGE_TAG = -9998, -9999;	--	uuid ref textures, see main.lua uuid comment
+	local BADGE_LEVEL_OFS = 12;				--	above the varied pins (wm_wrap level + 0..10)
+-->
+	local wrap = CreateFrame('FRAME', nil, VT.MAP_WM_WRAP);
+	wrap:SetSize(1, 1);
+	wrap:SetPoint("CENTER");
+	local areas_inuse = {  };
+	local areas_unused = {  };
+	local badge_size = BADGE_BASE_SIZE;
+	local timer_armed = false;
+	local stale = false;
+	-->		function predef
+		local Area_OnEnter, Area_OnLeave, Area_OnMouseWheel, Badge_OnEnter, Badge_OnLeave, Badge_OnClick;
+	-->		--	tooltip / click
+		local function SetQuestTooltip(owner, quest, anchor)
+			local qmeta = __MAIN_META[quest];
+			if qmeta == nil then
+				return;
+			end
+			GameTooltip:SetOwner(owner, anchor);
+			GameTooltip:AddLine(qmeta.title or ("Quest: " .. quest), 1.0, 0.82, 0.0);
+			for line = 1, qmeta.num_lines or 0 do
+				local meta_line = qmeta[line];
+				if meta_line ~= nil and meta_line[4] ~= nil then
+					if meta_line[5] then
+						GameTooltip:AddLine("- " .. meta_line[4], 0.5, 1.0, 0.5);
+					else
+						GameTooltip:AddLine("- " .. meta_line[4], 1.0, 1.0, 1.0);
+					end
+				end
+			end
+			GameTooltip:Show();
+		end
+		function Area_OnEnter(self)
+			self.fill:SetAlpha(HOVER_ALPHA);
+			SetQuestTooltip(self, self.quest, "ANCHOR_CURSOR");
+		end
+		function Area_OnLeave(self)
+			self.fill:SetAlpha(IDLE_ALPHA);
+			MT.OnLeave(self);
+		end
+		function Area_OnMouseWheel(self, delta)	--	zoom keeps working over an area
+			local container = WorldMapFrame.ScrollContainer;
+			if container ~= nil and container.OnMouseWheel ~= nil then
+				container:OnMouseWheel(delta);
+			end
+		end
+		function Badge_OnEnter(self)
+			local area = self:GetParent();
+			area.fill:SetAlpha(HOVER_ALPHA);
+			SetQuestTooltip(self, area.quest, "ANCHOR_RIGHT");
+		end
+		function Badge_OnLeave(self)
+			self:GetParent().fill:SetAlpha(IDLE_ALPHA);
+			MT.OnLeave(self);
+		end
+		function Badge_OnClick(self)
+			local index = GetQuestLogIndexByID(self:GetParent().quest);
+			if index ~= nil and index > 0 then
+				ShowUIPanel(QuestLogFrame);
+				QuestLog_SetSelection(index);		--	expands a collapsed header itself
+			end
+		end
+	-->		--	frames
+		local function NewArea()
+			local area = next(areas_unused);
+			if area == nil then
+				area = CreateFrame('FRAME', nil, wrap);
+				area:EnableMouse(true);
+				if area.SetPropagateMouseClicks ~= nil then
+					area:SetPropagateMouseClicks(true);	--	map dragging and zone clicks keep working through the area
+				end
+				area:SetScript("OnEnter", Area_OnEnter);
+				area:SetScript("OnLeave", Area_OnLeave);
+				area:EnableMouseWheel(true);
+				area:SetScript("OnMouseWheel", Area_OnMouseWheel);
+				local fill = CreateFrame('FRAME', nil, area);
+				fill:SetAllPoints();
+				area.fill = fill;
+				area.tris = {  };
+				area.num_tris = 0;
+				local badge = CreateFrame('BUTTON', nil, area);
+				badge:SetScript("OnEnter", Badge_OnEnter);
+				badge:SetScript("OnLeave", Badge_OnLeave);
+				badge:SetScript("OnClick", Badge_OnClick);
+				local bg = badge:CreateTexture(nil, "BACKGROUND");
+				bg:SetAllPoints();
+				bg:SetTexture(BADGE_TEXTURE);
+				bg:SetVertexColor(0.10, 0.10, 0.10, 0.90);
+				local text = badge:CreateFontString(nil, "OVERLAY", "GameFontNormal");
+				text:SetPoint("CENTER");
+				badge.text = text;
+				area.badge = badge;
+			else
+				areas_unused[area] = nil;
+			end
+			areas_inuse[area] = 1;
+			return area;
+		end
+		local function ReleaseArea(area)
+			areas_inuse[area] = nil;
+			areas_unused[area] = 1;
+			area.quest = nil;
+			for index = 1, area.num_tris do
+				area.tris[index]:Hide();
+			end
+			area.num_tris = 0;
+			area:Hide();
+		end
+		local function ReleaseAll()
+			for area, _ in next, areas_inuse do
+				ReleaseArea(area);
+			end
+		end
+		--	local coords in canvas pixels, y growing downward
+		local function SetTriangle(area, index, ax, ay, bx, by, cx, cy)
+			local tex = area.tris[index];
+			if tex == nil then
+				tex = area.fill:CreateTexture(nil, "ARTWORK");
+				tex:SetColorTexture(FILL_R, FILL_G, FILL_B, FILL_A);
+				tex:SetPoint("TOPLEFT", area.fill, "TOPLEFT", 0, 0);
+				tex:SetSize(1, 1);
+				area.tris[index] = tex;
+			end
+			--	a 1x1 quad whose corners are moved onto the triangle; corners 3 and 4 coincide so one half collapses
+			tex:SetVertexOffset(1, ax, -ay);			--	upper-left,  natural (0, 0)
+			tex:SetVertexOffset(2, bx, 1 - by);		--	lower-left,  natural (0, -1)
+			tex:SetVertexOffset(3, cx - 1, -cy);		--	upper-right, natural (1, 0)
+			tex:SetVertexOffset(4, cx - 1, 1 - cy);	--	lower-right, natural (1, -1)
+			tex:Show();
+		end
+		local function SetBadgeSize(badge)
+			badge:SetSize(badge_size, badge_size);
+			badge.text:SetFont(BADGE_FONT, floor(badge_size * 0.55 + 0.5), "OUTLINE");
+		end
+		--	hull vertices and centroid in map-% units; sx, sy convert to canvas pixels
+		local function DrawArea(quest, ordinal, hull, cx, cy, sx, sy, level)
+			local minx, miny, maxx, maxy = hull[1][1], hull[1][2], hull[1][1], hull[1][2];
+			for index = 2, #hull do
+				local v = hull[index];
+				if v[1] < minx then minx = v[1]; end
+				if v[2] < miny then miny = v[2]; end
+				if v[1] > maxx then maxx = v[1]; end
+				if v[2] > maxy then maxy = v[2]; end
+			end
+			local area = NewArea();
+			area.quest = quest;
+			area:SetFrameLevel(level);
+			area.fill:SetFrameLevel(level);
+			area.badge:SetFrameLevel(level + BADGE_LEVEL_OFS);
+			area:ClearAllPoints();
+			area:SetPoint("TOPLEFT", mapCanvas, "TOPLEFT", minx * sx, -miny * sy);
+			area:SetSize(max((maxx - minx) * sx, 1), max((maxy - miny) * sy, 1));
+			local ox, oy = (cx - minx) * sx, (cy - miny) * sy;
+			local num = #hull;
+			for index = 1, num do
+				local a, b = hull[index], hull[index % num + 1];
+				SetTriangle(area, index, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
+			end
+			area.num_tris = num;
+			area.fill:SetAlpha(IDLE_ALPHA);
+			local badge = area.badge;
+			badge:ClearAllPoints();
+			badge:SetPoint("CENTER", area, "TOPLEFT", ox, -oy);
+			SetBadgeSize(badge);
+			badge.text:SetText(ordinal ~= nil and ordinal or "?");
+			area:Show();
+		end
+	-->		--	data
+		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map
+		local function CollectQuestPoints(map)
+			local byQuest = {  };
+			local tblocked, pblocked = VT.QUEST_TEMPORARILY_BLOCKED, VT.QUEST_PREMANENTLY_BLOCKED;
+			for layer = 1, 2 do
+				local meta = VT.MAP_META[layer][map];
+				if meta ~= nil then
+					local tag = layer == 1 and COMMON_TAG or LARGE_TAG;
+					for uuid, data in next, meta do
+						local coords = data[1];
+						if #coords > 0 then
+							for quest, refs in next, uuid[4] do
+								local qmeta = __MAIN_META[quest];
+								if qmeta ~= nil and tblocked[quest] ~= true and pblocked[quest] ~= true then
+									local active = false;
+									for line, texture in next, refs do
+										if line == 'extra' then
+											active = true;
+											break;
+										end
+										local meta_line = qmeta[line];
+										if meta_line ~= nil and not meta_line[5] and texture == tag then
+											active = true;
+											break;
+										end
+									end
+									if active then
+										local points = byQuest[quest];
+										if points == nil then
+											points = {  };
+											byQuest[quest] = points;
+										end
+										for index = 1, #coords do
+											points[#points + 1] = coords[index];
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+			return byQuest;
+		end
+		local function Rebuild()
+			timer_armed = false;
+			if not WorldMapFrame:IsShown() then
+				stale = true;
+				return;
+			end
+			stale = false;
+			ReleaseAll();
+			if not VT.SETTING.worldmap_quest_area then
+				return;
+			end
+			local map = WorldMapFrame:GetMapID();
+			if map == nil or (not VT.SETTING.show_in_continent and CT.ContinentMapID[map] ~= nil) then
+				return;
+			end
+			local W, H = mapCanvas:GetWidth(), mapCanvas:GetHeight();
+			if W <= 0 or H <= 0 then
+				return;
+			end
+			local sx, sy = W * 0.01, H * 0.01;
+			local level = max(VT.MAP_WM_WRAP:GetFrameLevel() - 1, 0);	--	fills stay under every pin
+			wrap:SetFrameLevel(level);
+			local byQuest = CollectQuestPoints(map);
+			for quest, points in next, byQuest do
+				local ordinal = __MAIN_META[quest].ordinal;
+				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
+				for index = 1, #clusters do
+					local cluster = clusters[index];
+					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
+					if #hull >= 3 then
+						local cx, cy = MT.AreaCentroid(cluster);
+						DrawArea(quest, ordinal, hull, cx, cy, sx, sy, level);
+					end
+				end
+			end
+		end
+	-->		--	extern method
+		--	coalesces every node/map change into one rebuild
+		function MT.MapAreaMarkDirty()
+			if not timer_armed then
+				timer_armed = true;
+				MT._TimerStart(Rebuild, 0.1, 1);
+			end
+		end
+		function MT.MapAreaOnShow()
+			if stale then
+				MT.MapAreaMarkDirty();
+			end
+		end
+		--	badges keep a readable size when the canvas zooms, like the pins
+		function MT.MapAreaSetCanvasScale(scale)
+			badge_size = BADGE_BASE_SIZE;
+			local worldmap_pin_scale_max = VT.SETTING.worldmap_pin_scale_max;
+			if scale > worldmap_pin_scale_max then
+				badge_size = badge_size * worldmap_pin_scale_max / scale;
+			end
+			for area, _ in next, areas_inuse do
+				SetBadgeSize(area.badge);
+			end
+		end
+--
diff --git a/map.lua b/map.lua
index 1b1e83e..285a62d 100644
--- a/map.lua
+++ b/map.lua
@@ -39,6 +39,7 @@ local DT = __private.DT;
 	local wm_wrap = CreateFrame('FRAME', nil, mapCanvas);
 		wm_wrap:SetSize(1, 1);
 		wm_wrap:SetPoint("CENTER");
+	VT.MAP_WM_WRAP = wm_wrap;
 	local mm_wrap = CreateFrame('FRAME', nil, Minimap);
 		mm_wrap:SetSize(1, 1);
 		mm_wrap:SetPoint("CENTER");
@@ -113,7 +114,7 @@ MT.BuildEnv("map");
 		local MapPermanentlyShowQuestNodes, MapPermanentlyHideQuestNodes, MapPermanentlyToggleQuestNodes;
 		local MapHideNodes, MapDrawNodes;
 		--	setting
-		local SetShowPinInContinent, SetNodeMenuModifier;
+		local SetShowPinInContinent, SetNodeMenuModifier, SetWorldmapQuestArea;
 		local SetWorldmapAlpha;
 		local SetWorldmapCommonPinSize, SetWorldmapLargePinSize, SetWorldmapVariedPinSize;
 		local SetMinimapAlpha;
@@ -406,7 +407,7 @@ MT.BuildEnv("map");
 			end
 		end
 		function WorldMap_ShowNodesQuest(map, quest)
-			local meta = META_COMMON[map];
+			local meta = not VT.SETTING.worldmap_quest_area and META_COMMON[map] or nil;
 			if meta ~= nil then
 				for uuid, data in next, meta do
 					if uuid[4][quest] ~= nil then
@@ -428,7 +429,7 @@ MT.BuildEnv("map");
 					end
 				end
 			end
-			local large = META_LARGE[map];
+			local large = not VT.SETTING.worldmap_quest_area and META_LARGE[map] or nil;
 			if large ~= nil then
 				for uuid, data in next, large do
 					if uuid[4][quest] ~= nil then
@@ -473,6 +474,7 @@ MT.BuildEnv("map");
 					end
 				end
 			end
+			MT.MapAreaMarkDirty();
 		end
 		function WorldMap_HideNodesQuest(map, quest)
 			local meta = META_COMMON[map];
@@ -523,12 +525,14 @@ MT.BuildEnv("map");
 					end
 				end
 			end
+			MT.MapAreaMarkDirty();
 		end
 		function WorldMap_DrawNodesMap(map)
+			MT.MapAreaMarkDirty();
 			if not VT.SETTING.show_in_continent and CT.ContinentMapID[map] ~= nil then
 				return;
 			end
-			local meta = META_COMMON[map];
+			local meta = not VT.SETTING.worldmap_quest_area and META_COMMON[map] or nil;
 			if meta ~= nil then
 				for uuid, data in next, meta do
 					if UUIDCheckState(uuid, -9998) then
@@ -550,7 +554,7 @@ MT.BuildEnv("map");
 					end
 				end
 			end
-			local large = META_LARGE[map];
+			local large = not VT.SETTING.worldmap_quest_area and META_LARGE[map] or nil;
 			if large ~= nil then
 				for uuid, data in next, large do
 					if UUIDCheckState(uuid, -9999) then
@@ -639,6 +643,7 @@ MT.BuildEnv("map");
 					end
 				end
 			end
+			MT.MapAreaMarkDirty();
 		end
 	-->
 	-->		--	Minimap Pin
@@ -1271,6 +1276,7 @@ MT.BuildEnv("map");
 	-->		--	interface
 		--	common_objective pin
 		function MapAddCommonNodes(uuid, coords_table)
+			MT.MapAreaMarkDirty();
 			if coords_table ~= nil then
 				for index = 1, #coords_table do
 					local coord = coords_table[index];
@@ -1294,6 +1300,7 @@ MT.BuildEnv("map");
 			end
 		end
 		function MapDelCommonNodes(uuid)
+			MT.MapAreaMarkDirty();
 			WorldMap_HideCommonNodesMapUUID(wm_map, uuid);
 			Minimap_HideCommonNodesMapUUID(mm_map, uuid);
 			for map, meta in next, META_COMMON do
@@ -1301,6 +1308,7 @@ MT.BuildEnv("map");
 			end
 		end
 		function MapUpdCommonNodes(uuid)
+			MT.MapAreaMarkDirty();
 			if not UUIDCheckState(uuid, -9998) then
 				WorldMap_HideCommonNodesMapUUID(wm_map, uuid);
 				Minimap_HideCommonNodesMapUUID(mm_map, uuid);
@@ -1308,6 +1316,7 @@ MT.BuildEnv("map");
 		end
 		--	large_objective pin
 		function MapAddLargeNodes(uuid, coords_table)
+			MT.MapAreaMarkDirty();
 			if coords_table ~= nil then
 				for index = 1, #coords_table do
 					local coord = coords_table[index];
@@ -1331,6 +1340,7 @@ MT.BuildEnv("map");
 			end
 		end
 		function MapDelLargeNodes(uuid)
+			MT.MapAreaMarkDirty();
 			WorldMap_HideLargeNodesMapUUID(wm_map, uuid);
 			Minimap_HideLargeNodesMapUUID(mm_map, uuid);
 			for map, meta in next, META_LARGE do
@@ -1338,6 +1348,7 @@ MT.BuildEnv("map");
 			end
 		end
 		function MapUpdLargeNodes(uuid)
+			MT.MapAreaMarkDirty();
 			if not UUIDCheckState(uuid, -9999) then
 				WorldMap_HideLargeNodesMapUUID(wm_map, uuid);
 				Minimap_HideLargeNodesMapUUID(mm_map, uuid);
@@ -1553,11 +1564,16 @@ MT.BuildEnv("map");
 		function SetMinimapPlayerArrowOnTop()
 			mm_arrow_wrap:SetShown(VT.SETTING.minimap_player_arrow_on_top);
 		end
+		function SetWorldmapQuestArea()
+			WorldMap_HideNodesMap(wm_map);
+			WorldMap_DrawNodesMap(wm_map);
+		end
 	-->
 	-->		--	extern method
 		--
 		MT.SetShowPinInContinent = SetShowPinInContinent;
 		MT.SetNodeMenuModifier = SetNodeMenuModifier;
+		MT.SetWorldmapQuestArea = SetWorldmapQuestArea;
 		MT.SetWorldmapAlpha = SetWorldmapAlpha;
 		MT.SetWorldmapCommonPinSize = SetWorldmapCommonPinSize;
 		MT.SetWorldmapLargePinSize = SetWorldmapLargePinSize;
@@ -1598,6 +1614,7 @@ MT.BuildEnv("map");
 			wipe(MM_LARGE_PINS);
 			wipe(MM_VARIED_PINS);
 			ResetMMPin();
+			MT.MapAreaMarkDirty();
 		end
 		function MT.MapToggleWorldMapPin(shown)
 			wm_wrap:SetShown(shown ~= false);
@@ -1617,6 +1634,7 @@ MT.BuildEnv("map");
 			end
 			function mapCallback:OnShow()
 				-- Override in your mixin, called when the map canvas is shown
+				MT.MapAreaOnShow();
 			end
 			function mapCallback:OnHide()
 				-- Override in your mixin, called when the map canvas is closed
@@ -1652,6 +1670,7 @@ MT.BuildEnv("map");
 						wm_varied_size = wm_varied_size * worldmap_pin_scale_max / scale;
 					end
 					IterateWorldMapPinSetSize();
+					MT.MapAreaSetCanvasScale(scale);
 				end
 			end
 			function mapCallback:OnCanvasSizeChanged()
@@ -1718,6 +1737,7 @@ MT.BuildEnv("map");
 		mm_normal_size = VT.SETTING.minimap_normal_size;
 		mm_large_size = VT.SETTING.minimap_large_size;
 		mm_varied_size = VT.SETTING.minimap_varied_size;
+		MT.MapAreaSetCanvasScale(map_canvas_scale);
 		SetNodeMenuModifier();
 		SetMinimapPlayerArrowOnTop();
 	end);
diff --git a/setting.lua b/setting.lua
index b8e1271..3c3cc51 100644
--- a/setting.lua
+++ b/setting.lua
@@ -215,6 +215,18 @@ MT.BuildEnv("setting");
 				},
 			--	tab.map
 			--	tab.worldmap
+				worldmap_quest_area = {
+					'boolean',
+					function(val)
+						VT.SETTING['worldmap_quest_area'] = val;
+						MT.SetWorldmapQuestArea();
+						RefreshSettingWidget('worldmap_quest_area');
+						return true;
+					end,
+					nil,
+					boolean_func,
+					'tab.worldmap',
+				},
 				worldmap_alpha = {
 					'number',
 					function(val)
@@ -494,6 +506,7 @@ MT.BuildEnv("setting");
 		--	map
 			min_rate = 1.0,
 		--	worldmap
+			worldmap_quest_area = true,
 			worldmap_alpha = 1.0,
 			worldmap_normal_size = 15,
 			worldmap_large_size = 24,
@@ -532,6 +545,7 @@ MT.BuildEnv("setting");
 		--	map
 			-- "min_rate",
 		--	worldmap
+			"worldmap_quest_area",
 			"worldmap_alpha",
 			"worldmap_normal_size",
 			"worldmap_large_size",
diff --git a/tests/geometry_test.lua b/tests/geometry_test.lua
new file mode 100644
index 0000000..576d264
--- /dev/null
+++ b/tests/geometry_test.lua
@@ -0,0 +1,151 @@
+--[[--
+	Unit tests for map-area-geometry.lua (pure Lua, no WoW API).
+	Run from the addon root:   lua5.1 tests/geometry_test.lua
+	(or via tests/run_lupa.py when no Lua binary is installed)
+--]]--
+local private = { MT = {  }, CT = {  }, VT = {  }, DT = {  }, };
+local chunk = assert(loadfile("map-area-geometry.lua"));
+chunk("CodexLite-Snerror", private);
+local MT = private.MT;
+
+local passed, failed = 0, 0;
+local function check(name, cond, detail)
+	if cond then
+		passed = passed + 1;
+	else
+		failed = failed + 1;
+		print("FAIL: " .. name .. (detail ~= nil and ("  -- " .. tostring(detail)) or ""));
+	end
+end
+local function P(x, y) return { x, y, }; end
+local function dist(ax, ay, bx, by) return math.sqrt((ax - bx) ^ 2 + (ay - by) ^ 2); end
+local function signedArea(poly)		--	shoelace, in the input coordinate system
+	local a = 0;
+	local n = #poly;
+	for i = 1, n do
+		local p, q = poly[i], poly[i % n + 1];
+		a = a + p[1] * q[2] - q[1] * p[2];
+	end
+	return a * 0.5;
+end
+local function contains(poly, x, y)	--	independent ray-cast, so the tests don't trust the module for verification
+	local inside = false;
+	local n = #poly;
+	local j = n;
+	for i = 1, n do
+		local xi, yi, xj, yj = poly[i][1], poly[i][2], poly[j][1], poly[j][2];
+		if ((yi > y) ~= (yj > y)) and (x < (xj - xi) * (y - yi) / (yj - yi) + xi) then
+			inside = not inside;
+		end
+		j = i;
+	end
+	return inside;
+end
+local function sameSet(cluster, source)
+	if #cluster ~= #source then return false; end
+	for i = 1, #source do
+		local found = false;
+		for j = 1, #cluster do
+			if cluster[j] == source[i] then found = true; break; end
+		end
+		if not found then return false; end
+	end
+	return true;
+end
+
+-->		AreaCluster
+do
+	local clusters = MT.AreaCluster({  }, 8);
+	check("cluster: empty input -> no clusters", #clusters == 0, #clusters);
+end
+do
+	local p = P(10, 10);
+	local clusters = MT.AreaCluster({ p, }, 8);
+	check("cluster: single point -> one cluster of one", #clusters == 1 and #clusters[1] == 1 and clusters[1][1] == p);
+end
+do
+	local clusters = MT.AreaCluster({ P(10, 10), P(12, 12), }, 8);
+	check("cluster: two points 3 apart -> one cluster", #clusters == 1 and #clusters[1] == 2);
+end
+do	--	Duskwood shape: two groups ~20 apart
+	local A = { P(33, 58), P(35, 60), P(34, 63), P(36, 56), };
+	local B = { P(55, 50), P(57, 45), P(58, 54), P(54, 47), };
+	local input = { A[1], B[1], A[2], B[2], A[3], B[3], A[4], B[4], };
+	local clusters = MT.AreaCluster(input, 8);
+	check("cluster: two far groups -> two clusters", #clusters == 2, #clusters);
+	if #clusters == 2 then
+		local ok = (sameSet(clusters[1], A) and sameSet(clusters[2], B)) or (sameSet(clusters[1], B) and sameSet(clusters[2], A));
+		check("cluster: membership preserved", ok);
+	end
+end
+do	--	chain: each link < threshold, whole chain > threshold
+	local chain = { P(0, 0), P(5, 0), P(10, 0), P(15, 0), P(20, 0), P(25, 0), P(30, 0), };
+	local clusters = MT.AreaCluster(chain, 8);
+	check("cluster: chain joins into one cluster (single linkage)", #clusters == 1 and #clusters[1] == 7, #clusters);
+	local split = MT.AreaCluster(chain, 4);
+	check("cluster: chain splits when threshold < link", #split == 7, #split);
+end
+
+-->		AreaPaddedHull
+do
+	local hull = MT.AreaPaddedHull({ P(50, 50), }, 2);
+	check("hull: single point -> 8 vertices", #hull == 8, #hull);
+	local within = true;
+	for i = 1, #hull do
+		if dist(hull[i][1], hull[i][2], 50, 50) > 2 + 1e-6 then within = false; end
+	end
+	check("hull: single point vertices within pad", within);
+	check("hull: single point is inside", contains(hull, 50, 50));
+end
+do
+	local corners = { P(0, 0), P(10, 0), P(10, 10), P(0, 10), };
+	local hull = MT.AreaPaddedHull({ corners[1], corners[2], corners[3], corners[4], P(5, 5), }, 0);
+	check("hull: square+interior, pad 0 -> 4 vertices", #hull == 4, #hull);
+	check("hull: positive orientation", signedArea(hull) > 0, signedArea(hull));
+	local allCorners = true;
+	for i = 1, #hull do
+		local hit = false;
+		for j = 1, 4 do
+			if math.abs(hull[i][1] - corners[j][1]) < 1e-9 and math.abs(hull[i][2] - corners[j][2]) < 1e-9 then hit = true; end
+		end
+		if not hit then allCorners = false; end
+	end
+	check("hull: vertices are exactly the corners", allCorners);
+end
+do
+	local pts = { P(0, 0), P(5, 0), P(10, 0), };
+	local hull = MT.AreaPaddedHull(pts, 1);
+	check("hull: collinear points padded -> area > 0", signedArea(hull) > 0, signedArea(hull));
+	check("hull: collinear points all inside", contains(hull, 0, 0) and contains(hull, 5, 0) and contains(hull, 10, 0));
+end
+do
+	math.randomseed(42);
+	local pts = {  };
+	for i = 1, 50 do
+		pts[i] = P(math.random() * 100, math.random() * 100);
+	end
+	local hull = MT.AreaPaddedHull(pts, 1.5);
+	local allInside = true;
+	for i = 1, 50 do
+		if not contains(hull, pts[i][1], pts[i][2]) then allInside = false; end
+	end
+	check("hull: 50 random points all inside padded hull", allInside);
+	check("hull: random hull is convex (positive turns)", (function()
+		local n = #hull;
+		for i = 1, n do
+			local a, b, c = hull[i], hull[i % n + 1], hull[(i + 1) % n + 1];
+			local cross = (b[1] - a[1]) * (c[2] - a[2]) - (b[2] - a[2]) * (c[1] - a[1]);
+			if cross < -1e-9 then return false; end
+		end
+		return true;
+	end)());
+end
+
+-->		AreaCentroid
+do
+	local cx, cy = MT.AreaCentroid({ P(0, 0), P(10, 0), P(10, 10), P(0, 10), });
+	check("centroid: mean of points", math.abs(cx - 5) < 1e-9 and math.abs(cy - 5) < 1e-9, tostring(cx) .. "," .. tostring(cy));
+end
+
+print(string.format("%d passed, %d failed", passed, failed));
+if failed > 0 then os.exit(1); end
diff --git a/tests/run_lupa.py b/tests/run_lupa.py
new file mode 100644
index 0000000..b382e36
--- /dev/null
+++ b/tests/run_lupa.py
@@ -0,0 +1,14 @@
+"""Run tests/geometry_test.lua without a Lua binary, via the lupa package (LuaJIT, Lua 5.1 semantics).
+
+    PYTHONPATH=<dir containing lupa> python3 tests/run_lupa.py
+"""
+import os
+import sys
+
+from lupa.luajit21 import LuaRuntime  # LuaJIT 2.1 == Lua 5.1 API, same as WoW
+
+os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
+lua = LuaRuntime()
+lua.globals()["arg"] = lua.table_from(sys.argv)
+with open("tests/geometry_test.lua", encoding="utf-8") as f:
+    lua.execute(f.read())

From ba81c87234f78e4b081cb49738cc57c6e037514e Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 14:33:46 +0200
Subject: [PATCH 02/10] Colour quest areas per quest, outline them and
 highlight on hover

- Each quest's areas use one of eight palette colours keyed by its quest
  log position, so overlapping areas of different quests stay apart.
- Hulls get a thin outline in the quest colour so both boundaries remain
  visible where areas overlap.
- Hovering an area or its badge lights up every area of that quest, turns
  the badge gold with a dark number and adds a glow, so it is clear which
  quest a click would open.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area.lua | 127 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 98 insertions(+), 29 deletions(-)

diff --git a/map-area.lua b/map-area.lua
index 82d3d25..42fe8c1 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -1,8 +1,9 @@
 --[[--
 	Quest areas on the world map.
 	For every quest on the current map the objective coordinates are clustered and each
-	cluster is drawn as a filled polygon with a numbered badge (position in the quest log).
-	Hovering shows the objectives, clicking the badge opens the quest in the quest log.
+	cluster is drawn as a filled, outlined polygon with a numbered badge (position in the
+	quest log).  Hovering highlights every area of that quest and shows the objectives,
+	clicking the badge opens the quest in the quest log.
 	Geometry lives in map-area-geometry.lua.
 --]]--
 local __addon, __private = ...;
@@ -13,7 +14,7 @@ local DT = __private.DT;
 
 -->		upvalue
 	local next = next;
-	local max, floor = math.max, math.floor;
+	local max, floor, sqrt = math.max, math.floor, math.sqrt;
 	local CreateFrame = CreateFrame;
 	local WorldMapFrame = WorldMapFrame;
 	local GameTooltip = GameTooltip;
@@ -31,10 +32,23 @@ MT.BuildEnv("map-area");
 -->		constant
 	local CLUSTER_DIST = 8.0;			--	map-% units: points chained closer than this share one area
 	local AREA_PAD = 1.5;				--	map-% units: how far an area extends beyond its points
-	local FILL_R, FILL_G, FILL_B, FILL_A = 0.55, 0.50, 1.00, 0.60;
-	local IDLE_ALPHA, HOVER_ALPHA = 0.6, 1.0;	--	multiplies the fill; hover brightens
+	local FILL_ALPHA, OUTLINE_ALPHA = 0.60, 0.95;
+	local OUTLINE_WIDTH = 2.0;			--	canvas pixels at normal zoom
+	local IDLE_ALPHA, HOVER_ALPHA = 0.6, 1.0;	--	multiplies fill and outline; hover brightens
+	local PALETTE = {					--	one colour per quest, keyed by its position in the quest log
+		{ 0.55, 0.50, 1.00, },	--	violet
+		{ 1.00, 0.55, 0.20, },	--	orange
+		{ 0.20, 0.85, 0.95, },	--	cyan
+		{ 1.00, 0.35, 0.60, },	--	pink
+		{ 0.45, 0.95, 0.35, },	--	green
+		{ 1.00, 0.90, 0.20, },	--	yellow
+		{ 0.30, 0.55, 1.00, },	--	blue
+		{ 1.00, 0.35, 0.30, },	--	red
+	};
 	local BADGE_BASE_SIZE = 22;
+	local BADGE_GLOW_SCALE = 2.2;
 	local BADGE_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\Circle]];
+	local BADGE_GLOW_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\HLCircle]];
 	local COMMON_TAG, LARGE_TAG = -9998, -9999;	--	uuid ref textures, see main.lua uuid comment
 	local BADGE_LEVEL_OFS = 12;				--	above the varied pins (wm_wrap level + 0..10)
 -->
@@ -48,7 +62,33 @@ MT.BuildEnv("map-area");
 	local stale = false;
 	-->		function predef
 		local Area_OnEnter, Area_OnLeave, Area_OnMouseWheel, Badge_OnEnter, Badge_OnLeave, Badge_OnClick;
-	-->		--	tooltip / click
+	-->		--	hover / tooltip / click
+		local function QuestColor(ordinal)
+			return PALETTE[((ordinal or 1) - 1) % #PALETTE + 1];
+		end
+		local function SetAreaHover(area, hover)
+			local badge = area.badge;
+			if hover then
+				area.fill:SetAlpha(HOVER_ALPHA);
+				badge.bg:SetVertexColor(1.0, 0.82, 0.0, 1.0);
+				badge.text:SetTextColor(0.1, 0.1, 0.1);
+				badge.glow:Show();
+			else
+				local color = area.color;
+				area.fill:SetAlpha(IDLE_ALPHA);
+				badge.bg:SetVertexColor(0.1, 0.1, 0.1, 0.9);
+				badge.text:SetTextColor(color[1], color[2], color[3]);
+				badge.glow:Hide();
+			end
+		end
+		--	every area of the quest lights up, so a quest split in two places reads as one
+		local function SetQuestHover(quest, hover)
+			for area, _ in next, areas_inuse do
+				if area.quest == quest then
+					SetAreaHover(area, hover);
+				end
+			end
+		end
 		local function SetQuestTooltip(owner, quest, anchor)
 			local qmeta = __MAIN_META[quest];
 			if qmeta == nil then
@@ -69,11 +109,11 @@ MT.BuildEnv("map-area");
 			GameTooltip:Show();
 		end
 		function Area_OnEnter(self)
-			self.fill:SetAlpha(HOVER_ALPHA);
+			SetQuestHover(self.quest, true);
 			SetQuestTooltip(self, self.quest, "ANCHOR_CURSOR");
 		end
 		function Area_OnLeave(self)
-			self.fill:SetAlpha(IDLE_ALPHA);
+			SetQuestHover(self.quest, false);
 			MT.OnLeave(self);
 		end
 		function Area_OnMouseWheel(self, delta)	--	zoom keeps working over an area
@@ -84,11 +124,11 @@ MT.BuildEnv("map-area");
 		end
 		function Badge_OnEnter(self)
 			local area = self:GetParent();
-			area.fill:SetAlpha(HOVER_ALPHA);
+			SetQuestHover(area.quest, true);
 			SetQuestTooltip(self, area.quest, "ANCHOR_RIGHT");
 		end
 		function Badge_OnLeave(self)
-			self:GetParent().fill:SetAlpha(IDLE_ALPHA);
+			SetQuestHover(self:GetParent().quest, false);
 			MT.OnLeave(self);
 		end
 		function Badge_OnClick(self)
@@ -115,15 +155,21 @@ MT.BuildEnv("map-area");
 				fill:SetAllPoints();
 				area.fill = fill;
 				area.tris = {  };
-				area.num_tris = 0;
+				area.edges = {  };
+				area.num_quads = 0;
 				local badge = CreateFrame('BUTTON', nil, area);
 				badge:SetScript("OnEnter", Badge_OnEnter);
 				badge:SetScript("OnLeave", Badge_OnLeave);
 				badge:SetScript("OnClick", Badge_OnClick);
+				local glow = badge:CreateTexture(nil, "BACKGROUND", nil, -1);
+				glow:SetPoint("CENTER");
+				glow:SetTexture(BADGE_GLOW_TEXTURE);
+				glow:SetVertexColor(1.0, 0.82, 0.0, 0.8);
+				badge.glow = glow;
 				local bg = badge:CreateTexture(nil, "BACKGROUND");
 				bg:SetAllPoints();
 				bg:SetTexture(BADGE_TEXTURE);
-				bg:SetVertexColor(0.10, 0.10, 0.10, 0.90);
+				badge.bg = bg;
 				local text = badge:CreateFontString(nil, "OVERLAY", "GameFontNormal");
 				text:SetPoint("CENTER");
 				badge.text = text;
@@ -138,10 +184,11 @@ MT.BuildEnv("map-area");
 			areas_inuse[area] = nil;
 			areas_unused[area] = 1;
 			area.quest = nil;
-			for index = 1, area.num_tris do
+			for index = 1, area.num_quads do
 				area.tris[index]:Hide();
+				area.edges[index]:Hide();
 			end
-			area.num_tris = 0;
+			area.num_quads = 0;
 			area:Hide();
 		end
 		local function ReleaseAll()
@@ -149,25 +196,46 @@ MT.BuildEnv("map-area");
 				ReleaseArea(area);
 			end
 		end
-		--	local coords in canvas pixels, y growing downward
-		local function SetTriangle(area, index, ax, ay, bx, by, cx, cy)
-			local tex = area.tris[index];
+		--	moves the corners of a 1x1 texture anchored at the fill's top-left onto four points
+		--	given in local coords with y growing downward: upper-left, lower-left, upper-right, lower-right
+		local function SetQuad(tex, x1, y1, x2, y2, x3, y3, x4, y4)
+			tex:SetVertexOffset(1, x1, -y1);			--	natural (0, 0)
+			tex:SetVertexOffset(2, x2, 1 - y2);		--	natural (0, -1)
+			tex:SetVertexOffset(3, x3 - 1, -y3);		--	natural (1, 0)
+			tex:SetVertexOffset(4, x4 - 1, 1 - y4);	--	natural (1, -1)
+			tex:Show();
+		end
+		local function GetQuad(area, list, sublevel)
+			local index = area.num_quads;
+			local tex = list[index];
 			if tex == nil then
-				tex = area.fill:CreateTexture(nil, "ARTWORK");
-				tex:SetColorTexture(FILL_R, FILL_G, FILL_B, FILL_A);
+				tex = area.fill:CreateTexture(nil, "ARTWORK", nil, sublevel);
 				tex:SetPoint("TOPLEFT", area.fill, "TOPLEFT", 0, 0);
 				tex:SetSize(1, 1);
-				area.tris[index] = tex;
+				list[index] = tex;
+			end
+			return tex;
+		end
+		--	one fan triangle (apex o) and one outline strip for the hull edge a -> b
+		local function AddEdge(area, color, ox, oy, ax, ay, bx, by)
+			area.num_quads = area.num_quads + 1;
+			local tri = GetQuad(area, area.tris, 0);
+			tri:SetColorTexture(color[1], color[2], color[3], FILL_ALPHA);
+			SetQuad(tri, ox, oy, ax, ay, bx, by, bx, by);	--	corners 3 and 4 coincide: half the quad collapses
+			local edge = GetQuad(area, area.edges, 1);	--	always created so tris and edges stay index-aligned
+			local dx, dy = bx - ax, by - ay;
+			local len = sqrt(dx * dx + dy * dy);
+			if len > 0 then
+				local nx, ny = -dy / len * OUTLINE_WIDTH * 0.5, dx / len * OUTLINE_WIDTH * 0.5;
+				edge:SetColorTexture(color[1], color[2], color[3], OUTLINE_ALPHA);
+				SetQuad(edge, ax + nx, ay + ny, ax - nx, ay - ny, bx + nx, by + ny, bx - nx, by - ny);
+			else
+				edge:Hide();
 			end
-			--	a 1x1 quad whose corners are moved onto the triangle; corners 3 and 4 coincide so one half collapses
-			tex:SetVertexOffset(1, ax, -ay);			--	upper-left,  natural (0, 0)
-			tex:SetVertexOffset(2, bx, 1 - by);		--	lower-left,  natural (0, -1)
-			tex:SetVertexOffset(3, cx - 1, -cy);		--	upper-right, natural (1, 0)
-			tex:SetVertexOffset(4, cx - 1, 1 - cy);	--	lower-right, natural (1, -1)
-			tex:Show();
 		end
 		local function SetBadgeSize(badge)
 			badge:SetSize(badge_size, badge_size);
+			badge.glow:SetSize(badge_size * BADGE_GLOW_SCALE, badge_size * BADGE_GLOW_SCALE);
 			badge.text:SetFont(BADGE_FONT, floor(badge_size * 0.55 + 0.5), "OUTLINE");
 		end
 		--	hull vertices and centroid in map-% units; sx, sy convert to canvas pixels
@@ -180,8 +248,10 @@ MT.BuildEnv("map-area");
 				if v[1] > maxx then maxx = v[1]; end
 				if v[2] > maxy then maxy = v[2]; end
 			end
+			local color = QuestColor(ordinal);
 			local area = NewArea();
 			area.quest = quest;
+			area.color = color;
 			area:SetFrameLevel(level);
 			area.fill:SetFrameLevel(level);
 			area.badge:SetFrameLevel(level + BADGE_LEVEL_OFS);
@@ -192,15 +262,14 @@ MT.BuildEnv("map-area");
 			local num = #hull;
 			for index = 1, num do
 				local a, b = hull[index], hull[index % num + 1];
-				SetTriangle(area, index, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
+				AddEdge(area, color, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
 			end
-			area.num_tris = num;
-			area.fill:SetAlpha(IDLE_ALPHA);
 			local badge = area.badge;
 			badge:ClearAllPoints();
 			badge:SetPoint("CENTER", area, "TOPLEFT", ox, -oy);
 			SetBadgeSize(badge);
 			badge.text:SetText(ordinal ~= nil and ordinal or "?");
+			SetAreaHover(area, false);
 			area:Show();
 		end
 	-->		--	data

From a52e8967d6678d09857d1241bff7c10a16f6773f Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 14:47:42 +0200
Subject: [PATCH 03/10] Merge overlapping quest areas and follow the cursor
 with the tooltip

- Areas whose hulls overlap (separating-axis test, new
  MT.AreaPolygonsOverlap) are merged into one area with one badge per
  quest, so areas never overlap. Badges that would land on the same spot
  are pushed apart; the merged area takes the colour of its lowest quest.
- Hovering an area lights all its badges and lists every quest in the
  tooltip; hovering a badge lights that badge and every area holding its
  quest, and lists that quest only.
- The tooltip is anchored next to the cursor for areas and badges alike
  and follows the cursor while hovering, like the retail quest blobs.
- Fan apex is the hull's vertex mean, which is inside any convex polygon.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area-geometry.lua   |  34 +++++-
 map-area.lua            | 238 ++++++++++++++++++++++++++++++----------
 tests/geometry_test.lua |  18 +++
 3 files changed, 231 insertions(+), 59 deletions(-)

diff --git a/map-area-geometry.lua b/map-area-geometry.lua
index fb8c8b2..c59558e 100644
--- a/map-area-geometry.lua
+++ b/map-area-geometry.lua
@@ -7,7 +7,7 @@ local __addon, __private = ...;
 local MT = __private.MT;
 
 -->		upvalue
-	local cos, sin, pi = math.cos, math.sin, math.pi;
+	local cos, sin, pi, huge = math.cos, math.sin, math.pi, math.huge;
 	local tsort = table.sort;
 
 -->
@@ -135,6 +135,38 @@ local MT = __private.MT;
 		return ConvexHull(expanded);
 	end
 
+	--	true when any projection axis taken from the edges of `a` keeps the two apart
+	local function SeparatedByEdgesOf(a, b)
+		local n = #a;
+		for i = 1, n do
+			local p, q = a[i], a[i % n + 1];
+			local nx, ny = p[2] - q[2], q[1] - p[1];
+			local amin, amax = huge, -huge;
+			for k = 1, n do
+				local d = a[k][1] * nx + a[k][2] * ny;
+				if d < amin then amin = d; end
+				if d > amax then amax = d; end
+			end
+			local bmin, bmax = huge, -huge;
+			for k = 1, #b do
+				local d = b[k][1] * nx + b[k][2] * ny;
+				if d < bmin then bmin = d; end
+				if d > bmax then bmax = d; end
+			end
+			if amax < bmin or bmax < amin then
+				return true;
+			end
+		end
+		return false;
+	end
+	--	Separating axis test for two convex polygons; touching counts as overlapping.
+	function MT.AreaPolygonsOverlap(a, b)
+		if #a < 3 or #b < 3 then
+			return false;
+		end
+		return not (SeparatedByEdgesOf(a, b) or SeparatedByEdgesOf(b, a));
+	end
+
 	function MT.AreaCentroid(points)
 		local n = #points;
 		if n == 0 then
diff --git a/map-area.lua b/map-area.lua
index 42fe8c1..caa739e 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -1,9 +1,10 @@
 --[[--
 	Quest areas on the world map.
 	For every quest on the current map the objective coordinates are clustered and each
-	cluster is drawn as a filled, outlined polygon with a numbered badge (position in the
-	quest log).  Hovering highlights every area of that quest and shows the objectives,
-	clicking the badge opens the quest in the quest log.
+	cluster becomes a padded convex hull.  Hulls that overlap are merged into one area, so
+	areas never overlap; an area carries one numbered badge per quest (position in the
+	quest log).  Hovering highlights and shows the objectives in a tooltip that follows the
+	cursor, clicking a badge opens that quest in the quest log.
 	Geometry lives in map-area-geometry.lua.
 --]]--
 local __addon, __private = ...;
@@ -14,10 +15,13 @@ local DT = __private.DT;
 
 -->		upvalue
 	local next = next;
-	local max, floor, sqrt = math.max, math.floor, math.sqrt;
+	local max, floor, sqrt, huge = math.max, math.floor, math.sqrt, math.huge;
+	local tremove, tsort = table.remove, table.sort;
 	local CreateFrame = CreateFrame;
 	local WorldMapFrame = WorldMapFrame;
 	local GameTooltip = GameTooltip;
+	local UIParent = UIParent;
+	local GetCursorPosition = GetCursorPosition;
 	local GetQuestLogIndexByID = GetQuestLogIndexByID;
 	local ShowUIPanel = ShowUIPanel;
 	local _G = _G;
@@ -46,9 +50,11 @@ MT.BuildEnv("map-area");
 		{ 1.00, 0.35, 0.30, },	--	red
 	};
 	local BADGE_BASE_SIZE = 22;
+	local BADGE_GAP = 2;				--	between badges of one area when their spots coincide
 	local BADGE_GLOW_SCALE = 2.2;
 	local BADGE_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\Circle]];
 	local BADGE_GLOW_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\HLCircle]];
+	local TOOLTIP_OFFSET_X = 16;		--	tooltip sits right of the cursor, like retail
 	local COMMON_TAG, LARGE_TAG = -9998, -9999;	--	uuid ref textures, see main.lua uuid comment
 	local BADGE_LEVEL_OFS = 12;				--	above the varied pins (wm_wrap level + 0..10)
 -->
@@ -66,35 +72,45 @@ MT.BuildEnv("map-area");
 		local function QuestColor(ordinal)
 			return PALETTE[((ordinal or 1) - 1) % #PALETTE + 1];
 		end
-		local function SetAreaHover(area, hover)
-			local badge = area.badge;
+		local function SetFillHover(area, hover)
+			area.fill:SetAlpha(hover and HOVER_ALPHA or IDLE_ALPHA);
+		end
+		local function SetBadgeHover(badge, hover)
 			if hover then
-				area.fill:SetAlpha(HOVER_ALPHA);
 				badge.bg:SetVertexColor(1.0, 0.82, 0.0, 1.0);
 				badge.text:SetTextColor(0.1, 0.1, 0.1);
 				badge.glow:Show();
 			else
-				local color = area.color;
-				area.fill:SetAlpha(IDLE_ALPHA);
+				local color = badge.color;
 				badge.bg:SetVertexColor(0.1, 0.1, 0.1, 0.9);
 				badge.text:SetTextColor(color[1], color[2], color[3]);
 				badge.glow:Hide();
 			end
 		end
-		--	every area of the quest lights up, so a quest split in two places reads as one
-		local function SetQuestHover(quest, hover)
+		--	every area holding the quest lights up, so a quest split in two places reads as one
+		local function SetQuestFillHover(quest, hover)
 			for area, _ in next, areas_inuse do
-				if area.quest == quest then
-					SetAreaHover(area, hover);
+				if area.quests[quest] then
+					SetFillHover(area, hover);
 				end
 			end
 		end
-		local function SetQuestTooltip(owner, quest, anchor)
+		local function AnchorTooltipToCursor()
+			local x, y = GetCursorPosition();
+			local scale = UIParent:GetEffectiveScale();
+			GameTooltip:ClearAllPoints();
+			GameTooltip:SetPoint("LEFT", UIParent, "BOTTOMLEFT", x / scale + TOOLTIP_OFFSET_X, y / scale);
+		end
+		local function Hover_OnUpdate(self)
+			if GameTooltip:IsOwned(self) then
+				AnchorTooltipToCursor();
+			end
+		end
+		local function AddQuestLines(quest)
 			local qmeta = __MAIN_META[quest];
 			if qmeta == nil then
 				return;
 			end
-			GameTooltip:SetOwner(owner, anchor);
 			GameTooltip:AddLine(qmeta.title or ("Quest: " .. quest), 1.0, 0.82, 0.0);
 			for line = 1, qmeta.num_lines or 0 do
 				local meta_line = qmeta[line];
@@ -106,15 +122,36 @@ MT.BuildEnv("map-area");
 					end
 				end
 			end
+		end
+		local function ShowTooltip(owner, quest_list)
+			GameTooltip:SetOwner(owner, "ANCHOR_NONE");
+			for index = 1, #quest_list do
+				if index > 1 then
+					GameTooltip:AddLine(" ");
+				end
+				AddQuestLines(quest_list[index]);
+			end
 			GameTooltip:Show();
+			AnchorTooltipToCursor();
+			owner:SetScript("OnUpdate", Hover_OnUpdate);
+		end
+		local function HideTooltip(owner)
+			owner:SetScript("OnUpdate", nil);
+			MT.OnLeave(owner);
 		end
 		function Area_OnEnter(self)
-			SetQuestHover(self.quest, true);
-			SetQuestTooltip(self, self.quest, "ANCHOR_CURSOR");
+			SetFillHover(self, true);
+			for index = 1, self.num_badges do
+				SetBadgeHover(self.badges[index], true);
+			end
+			ShowTooltip(self, self.quest_list);
 		end
 		function Area_OnLeave(self)
-			SetQuestHover(self.quest, false);
-			MT.OnLeave(self);
+			SetFillHover(self, false);
+			for index = 1, self.num_badges do
+				SetBadgeHover(self.badges[index], false);
+			end
+			HideTooltip(self);
 		end
 		function Area_OnMouseWheel(self, delta)	--	zoom keeps working over an area
 			local container = WorldMapFrame.ScrollContainer;
@@ -123,16 +160,17 @@ MT.BuildEnv("map-area");
 			end
 		end
 		function Badge_OnEnter(self)
-			local area = self:GetParent();
-			SetQuestHover(area.quest, true);
-			SetQuestTooltip(self, area.quest, "ANCHOR_RIGHT");
+			SetBadgeHover(self, true);
+			SetQuestFillHover(self.quest, true);
+			ShowTooltip(self, self.quest_list);
 		end
 		function Badge_OnLeave(self)
-			SetQuestHover(self:GetParent().quest, false);
-			MT.OnLeave(self);
+			SetBadgeHover(self, false);
+			SetQuestFillHover(self.quest, false);
+			HideTooltip(self);
 		end
 		function Badge_OnClick(self)
-			local index = GetQuestLogIndexByID(self:GetParent().quest);
+			local index = GetQuestLogIndexByID(self.quest);
 			if index ~= nil and index > 0 then
 				ShowUIPanel(QuestLogFrame);
 				QuestLog_SetSelection(index);		--	expands a collapsed header itself
@@ -157,7 +195,21 @@ MT.BuildEnv("map-area");
 				area.tris = {  };
 				area.edges = {  };
 				area.num_quads = 0;
-				local badge = CreateFrame('BUTTON', nil, area);
+				area.badges = {  };
+				area.num_badges = 0;
+				area.quests = {  };
+			else
+				areas_unused[area] = nil;
+			end
+			areas_inuse[area] = 1;
+			return area;
+		end
+		local function NewBadge(area)
+			local index = area.num_badges + 1;
+			area.num_badges = index;
+			local badge = area.badges[index];
+			if badge == nil then
+				badge = CreateFrame('BUTTON', nil, area);
 				badge:SetScript("OnEnter", Badge_OnEnter);
 				badge:SetScript("OnLeave", Badge_OnLeave);
 				badge:SetScript("OnClick", Badge_OnClick);
@@ -173,22 +225,28 @@ MT.BuildEnv("map-area");
 				local text = badge:CreateFontString(nil, "OVERLAY", "GameFontNormal");
 				text:SetPoint("CENTER");
 				badge.text = text;
-				area.badge = badge;
-			else
-				areas_unused[area] = nil;
+				badge.quest_list = {  };
+				area.badges[index] = badge;
 			end
-			areas_inuse[area] = 1;
-			return area;
+			return badge;
 		end
 		local function ReleaseArea(area)
 			areas_inuse[area] = nil;
 			areas_unused[area] = 1;
-			area.quest = nil;
+			area:SetScript("OnUpdate", nil);
 			for index = 1, area.num_quads do
 				area.tris[index]:Hide();
 				area.edges[index]:Hide();
 			end
 			area.num_quads = 0;
+			for index = 1, area.num_badges do
+				local badge = area.badges[index];
+				badge:SetScript("OnUpdate", nil);
+				badge:Hide();
+			end
+			area.num_badges = 0;
+			area.quests = {  };
+			area.quest_list = nil;
 			area:Hide();
 		end
 		local function ReleaseAll()
@@ -238,8 +296,13 @@ MT.BuildEnv("map-area");
 			badge.glow:SetSize(badge_size * BADGE_GLOW_SCALE, badge_size * BADGE_GLOW_SCALE);
 			badge.text:SetFont(BADGE_FONT, floor(badge_size * 0.55 + 0.5), "OUTLINE");
 		end
-		--	hull vertices and centroid in map-% units; sx, sy convert to canvas pixels
-		local function DrawArea(quest, ordinal, hull, cx, cy, sx, sy, level)
+		local function ByOrdinal(a, b)
+			return (a.ordinal or huge) < (b.ordinal or huge);
+		end
+		--	group: { hull = vertices, members = { { quest, ordinal, cx, cy }, ... } }, coords in map-% units
+		local function DrawArea(group, sx, sy, level)
+			local hull, members = group.hull, group.members;
+			tsort(members, ByOrdinal);
 			local minx, miny, maxx, maxy = hull[1][1], hull[1][2], hull[1][1], hull[1][2];
 			for index = 2, #hull do
 				local v = hull[index];
@@ -248,28 +311,54 @@ MT.BuildEnv("map-area");
 				if v[1] > maxx then maxx = v[1]; end
 				if v[2] > maxy then maxy = v[2]; end
 			end
-			local color = QuestColor(ordinal);
+			local color = QuestColor(members[1].ordinal);
 			local area = NewArea();
-			area.quest = quest;
-			area.color = color;
 			area:SetFrameLevel(level);
 			area.fill:SetFrameLevel(level);
-			area.badge:SetFrameLevel(level + BADGE_LEVEL_OFS);
 			area:ClearAllPoints();
 			area:SetPoint("TOPLEFT", mapCanvas, "TOPLEFT", minx * sx, -miny * sy);
 			area:SetSize(max((maxx - minx) * sx, 1), max((maxy - miny) * sy, 1));
-			local ox, oy = (cx - minx) * sx, (cy - miny) * sy;
+			--	fan apex: mean of the hull vertices, inside any convex polygon
 			local num = #hull;
+			local ox, oy = 0, 0;
+			for index = 1, num do
+				ox = ox + hull[index][1];
+				oy = oy + hull[index][2];
+			end
+			ox, oy = (ox / num - minx) * sx, (oy / num - miny) * sy;
 			for index = 1, num do
 				local a, b = hull[index], hull[index % num + 1];
 				AddEdge(area, color, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
 			end
-			local badge = area.badge;
-			badge:ClearAllPoints();
-			badge:SetPoint("CENTER", area, "TOPLEFT", ox, -oy);
-			SetBadgeSize(badge);
-			badge.text:SetText(ordinal ~= nil and ordinal or "?");
-			SetAreaHover(area, false);
+			SetFillHover(area, false);
+			--	one badge per quest at its own cluster centre, pushed right when spots coincide
+			local quest_list = {  };
+			for index = 1, #members do
+				local member = members[index];
+				quest_list[index] = member.quest;
+				area.quests[member.quest] = true;
+				local bx, by = (member.cx - minx) * sx, (member.cy - miny) * sy;
+				for prev = 1, index - 1 do
+					local other = area.badges[prev];
+					local dx, dy = bx - other.px, by - other.py;
+					if sqrt(dx * dx + dy * dy) < badge_size then
+						bx = other.px + badge_size + BADGE_GAP;
+					end
+				end
+				local badge = NewBadge(area);
+				badge.quest = member.quest;
+				badge.quest_list[1] = member.quest;
+				badge.color = QuestColor(member.ordinal);
+				badge.px, badge.py = bx, by;
+				badge:SetFrameLevel(level + BADGE_LEVEL_OFS);
+				badge:ClearAllPoints();
+				badge:SetPoint("CENTER", area, "TOPLEFT", bx, -by);
+				SetBadgeSize(badge);
+				badge.text:SetText(member.ordinal ~= nil and member.ordinal or "?");
+				SetBadgeHover(badge, false);
+				badge:Show();
+			end
+			area.quest_list = quest_list;
 			area:Show();
 		end
 	-->		--	data
@@ -317,6 +406,46 @@ MT.BuildEnv("map-area");
 			end
 			return byQuest;
 		end
+		--	one group per quest cluster, then groups whose hulls overlap are merged until none do
+		local function BuildGroups(byQuest)
+			local groups = {  };
+			for quest, points in next, byQuest do
+				local ordinal = __MAIN_META[quest].ordinal;
+				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
+				for index = 1, #clusters do
+					local cluster = clusters[index];
+					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
+					if #hull >= 3 then
+						local cx, cy = MT.AreaCentroid(cluster);
+						groups[#groups + 1] = { hull = hull, members = { { quest = quest, ordinal = ordinal, cx = cx, cy = cy, }, }, };
+					end
+				end
+			end
+			local merged = true;
+			while merged do		--	restart the scan after every merge: the grown hull may touch others
+				merged = false;
+				for i = 1, #groups - 1 do
+					local gi = groups[i];
+					for j = i + 1, #groups do
+						local gj = groups[j];
+						if MT.AreaPolygonsOverlap(gi.hull, gj.hull) then
+							local vertices = {  };
+							for k = 1, #gi.hull do vertices[#vertices + 1] = gi.hull[k]; end
+							for k = 1, #gj.hull do vertices[#vertices + 1] = gj.hull[k]; end
+							gi.hull = MT.AreaPaddedHull(vertices, 0);
+							for k = 1, #gj.members do gi.members[#gi.members + 1] = gj.members[k]; end
+							tremove(groups, j);
+							merged = true;
+							break;
+						end
+					end
+					if merged then
+						break;
+					end
+				end
+			end
+			return groups;
+		end
 		local function Rebuild()
 			timer_armed = false;
 			if not WorldMapFrame:IsShown() then
@@ -339,18 +468,9 @@ MT.BuildEnv("map-area");
 			local sx, sy = W * 0.01, H * 0.01;
 			local level = max(VT.MAP_WM_WRAP:GetFrameLevel() - 1, 0);	--	fills stay under every pin
 			wrap:SetFrameLevel(level);
-			local byQuest = CollectQuestPoints(map);
-			for quest, points in next, byQuest do
-				local ordinal = __MAIN_META[quest].ordinal;
-				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
-				for index = 1, #clusters do
-					local cluster = clusters[index];
-					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
-					if #hull >= 3 then
-						local cx, cy = MT.AreaCentroid(cluster);
-						DrawArea(quest, ordinal, hull, cx, cy, sx, sy, level);
-					end
-				end
+			local groups = BuildGroups(CollectQuestPoints(map));
+			for index = 1, #groups do
+				DrawArea(groups[index], sx, sy, level);
 			end
 		end
 	-->		--	extern method
@@ -374,7 +494,9 @@ MT.BuildEnv("map-area");
 				badge_size = badge_size * worldmap_pin_scale_max / scale;
 			end
 			for area, _ in next, areas_inuse do
-				SetBadgeSize(area.badge);
+				for index = 1, area.num_badges do
+					SetBadgeSize(area.badges[index]);
+				end
 			end
 		end
 --
diff --git a/tests/geometry_test.lua b/tests/geometry_test.lua
index 576d264..bac958b 100644
--- a/tests/geometry_test.lua
+++ b/tests/geometry_test.lua
@@ -141,6 +141,24 @@ do
 	end)());
 end
 
+-->		AreaPolygonsOverlap (convex polygons, positive orientation)
+do
+	local sqA = MT.AreaPaddedHull({ P(0, 0), P(10, 0), P(10, 10), P(0, 10), }, 0);
+	local sqFar = MT.AreaPaddedHull({ P(20, 0), P(30, 0), P(30, 10), P(20, 10), }, 0);
+	local sqShift = MT.AreaPaddedHull({ P(5, 5), P(15, 5), P(15, 15), P(5, 15), }, 0);
+	local sqInside = MT.AreaPaddedHull({ P(3, 3), P(5, 3), P(5, 5), P(3, 5), }, 0);
+	check("overlap: separated squares -> false", not MT.AreaPolygonsOverlap(sqA, sqFar));
+	check("overlap: shifted squares -> true", MT.AreaPolygonsOverlap(sqA, sqShift));
+	check("overlap: small square inside big one -> true", MT.AreaPolygonsOverlap(sqA, sqInside));
+	check("overlap: symmetric", MT.AreaPolygonsOverlap(sqInside, sqA) and not MT.AreaPolygonsOverlap(sqFar, sqA));
+	--	bounding boxes overlap, polygons do not: B sits beyond A's hypotenuse x + y = 10
+	local triA = MT.AreaPaddedHull({ P(0, 0), P(10, 0), P(0, 10), }, 0);
+	local triB = MT.AreaPaddedHull({ P(10, 10), P(6, 10), P(10, 6), }, 0);
+	check("overlap: bbox-overlapping triangles that miss -> false", not MT.AreaPolygonsOverlap(triA, triB));
+	local triC = MT.AreaPaddedHull({ P(10, 10), P(2, 6), P(6, 2), }, 0);	--	its lower-left edge lies on x + y = 8
+	check("overlap: triangles that cross the hypotenuse -> true", MT.AreaPolygonsOverlap(triA, triC));
+end
+
 -->		AreaCentroid
 do
 	local cx, cy = MT.AreaCentroid({ P(0, 0), P(10, 0), P(10, 10), P(0, 10), });

From 714dfa993dd673607b5dc99e7cc90d6e75e30e2e Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 14:57:57 +0200
Subject: [PATCH 04/10] Show quest areas retail-style: badges always, shapes on
 hover

Badges (one per quest cluster, position in the quest log) are always
visible and pushed apart when they would stack. A quest's shapes appear
only while its badge is hovered, with the tooltip beside the cursor, so
areas of different quests never compete and the map stays fully
interactive (the shapes take no mouse input).

Within a cluster there is now one shape per mob or object type, so a
quest shows where each of its targets actually lives instead of one
hull spanning all of them.

Area merging is no longer needed; MT.AreaPolygonsOverlap and its tests
are removed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area-geometry.lua   |  34 +----
 map-area.lua            | 308 +++++++++++++++++-----------------------
 tests/geometry_test.lua |  18 ---
 3 files changed, 128 insertions(+), 232 deletions(-)

diff --git a/map-area-geometry.lua b/map-area-geometry.lua
index c59558e..fb8c8b2 100644
--- a/map-area-geometry.lua
+++ b/map-area-geometry.lua
@@ -7,7 +7,7 @@ local __addon, __private = ...;
 local MT = __private.MT;
 
 -->		upvalue
-	local cos, sin, pi, huge = math.cos, math.sin, math.pi, math.huge;
+	local cos, sin, pi = math.cos, math.sin, math.pi;
 	local tsort = table.sort;
 
 -->
@@ -135,38 +135,6 @@ local MT = __private.MT;
 		return ConvexHull(expanded);
 	end
 
-	--	true when any projection axis taken from the edges of `a` keeps the two apart
-	local function SeparatedByEdgesOf(a, b)
-		local n = #a;
-		for i = 1, n do
-			local p, q = a[i], a[i % n + 1];
-			local nx, ny = p[2] - q[2], q[1] - p[1];
-			local amin, amax = huge, -huge;
-			for k = 1, n do
-				local d = a[k][1] * nx + a[k][2] * ny;
-				if d < amin then amin = d; end
-				if d > amax then amax = d; end
-			end
-			local bmin, bmax = huge, -huge;
-			for k = 1, #b do
-				local d = b[k][1] * nx + b[k][2] * ny;
-				if d < bmin then bmin = d; end
-				if d > bmax then bmax = d; end
-			end
-			if amax < bmin or bmax < amin then
-				return true;
-			end
-		end
-		return false;
-	end
-	--	Separating axis test for two convex polygons; touching counts as overlapping.
-	function MT.AreaPolygonsOverlap(a, b)
-		if #a < 3 or #b < 3 then
-			return false;
-		end
-		return not (SeparatedByEdgesOf(a, b) or SeparatedByEdgesOf(b, a));
-	end
-
 	function MT.AreaCentroid(points)
 		local n = #points;
 		if n == 0 then
diff --git a/map-area.lua b/map-area.lua
index caa739e..5fb7dca 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -1,10 +1,9 @@
 --[[--
-	Quest areas on the world map.
-	For every quest on the current map the objective coordinates are clustered and each
-	cluster becomes a padded convex hull.  Hulls that overlap are merged into one area, so
-	areas never overlap; an area carries one numbered badge per quest (position in the
-	quest log).  Hovering highlights and shows the objectives in a tooltip that follows the
-	cursor, clicking a badge opens that quest in the quest log.
+	Quest areas on the world map, retail style.
+	For every quest on the current map the objective coordinates are clustered; each
+	cluster gets a numbered badge (position in the quest log) that is always visible,
+	and a padded convex hull that is shown only while its badge is hovered, together
+	with a tooltip beside the cursor.  Clicking a badge opens the quest in the quest log.
 	Geometry lives in map-area-geometry.lua.
 --]]--
 local __addon, __private = ...;
@@ -16,7 +15,7 @@ local DT = __private.DT;
 -->		upvalue
 	local next = next;
 	local max, floor, sqrt, huge = math.max, math.floor, math.sqrt, math.huge;
-	local tremove, tsort = table.remove, table.sort;
+	local tsort = table.sort;
 	local CreateFrame = CreateFrame;
 	local WorldMapFrame = WorldMapFrame;
 	local GameTooltip = GameTooltip;
@@ -36,9 +35,8 @@ MT.BuildEnv("map-area");
 -->		constant
 	local CLUSTER_DIST = 8.0;			--	map-% units: points chained closer than this share one area
 	local AREA_PAD = 1.5;				--	map-% units: how far an area extends beyond its points
-	local FILL_ALPHA, OUTLINE_ALPHA = 0.60, 0.95;
+	local FILL_ALPHA, OUTLINE_ALPHA = 0.50, 0.95;
 	local OUTLINE_WIDTH = 2.0;			--	canvas pixels at normal zoom
-	local IDLE_ALPHA, HOVER_ALPHA = 0.6, 1.0;	--	multiplies fill and outline; hover brightens
 	local PALETTE = {					--	one colour per quest, keyed by its position in the quest log
 		{ 0.55, 0.50, 1.00, },	--	violet
 		{ 1.00, 0.55, 0.20, },	--	orange
@@ -50,7 +48,7 @@ MT.BuildEnv("map-area");
 		{ 1.00, 0.35, 0.30, },	--	red
 	};
 	local BADGE_BASE_SIZE = 22;
-	local BADGE_GAP = 2;				--	between badges of one area when their spots coincide
+	local BADGE_GAP = 2;				--	badges closer than size + gap are pushed apart
 	local BADGE_GLOW_SCALE = 2.2;
 	local BADGE_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\Circle]];
 	local BADGE_GLOW_TEXTURE = [[Interface\AddOns\]] .. __addon .. [[\libs\ala\Media\Texture\HLCircle]];
@@ -63,18 +61,17 @@ MT.BuildEnv("map-area");
 	wrap:SetPoint("CENTER");
 	local areas_inuse = {  };
 	local areas_unused = {  };
+	local badges_inuse = {  };
+	local badges_unused = {  };
 	local badge_size = BADGE_BASE_SIZE;
 	local timer_armed = false;
 	local stale = false;
 	-->		function predef
-		local Area_OnEnter, Area_OnLeave, Area_OnMouseWheel, Badge_OnEnter, Badge_OnLeave, Badge_OnClick;
+		local Badge_OnEnter, Badge_OnLeave, Badge_OnClick;
 	-->		--	hover / tooltip / click
 		local function QuestColor(ordinal)
 			return PALETTE[((ordinal or 1) - 1) % #PALETTE + 1];
 		end
-		local function SetFillHover(area, hover)
-			area.fill:SetAlpha(hover and HOVER_ALPHA or IDLE_ALPHA);
-		end
 		local function SetBadgeHover(badge, hover)
 			if hover then
 				badge.bg:SetVertexColor(1.0, 0.82, 0.0, 1.0);
@@ -87,11 +84,11 @@ MT.BuildEnv("map-area");
 				badge.glow:Hide();
 			end
 		end
-		--	every area holding the quest lights up, so a quest split in two places reads as one
-		local function SetQuestFillHover(quest, hover)
+		--	every area of the quest, so a quest split in two places shows both
+		local function SetQuestAreasShown(quest, shown)
 			for area, _ in next, areas_inuse do
-				if area.quests[quest] then
-					SetFillHover(area, hover);
+				if area.quest == quest then
+					area:SetShown(shown);
 				end
 			end
 		end
@@ -106,11 +103,12 @@ MT.BuildEnv("map-area");
 				AnchorTooltipToCursor();
 			end
 		end
-		local function AddQuestLines(quest)
+		local function ShowTooltip(owner, quest)
 			local qmeta = __MAIN_META[quest];
 			if qmeta == nil then
 				return;
 			end
+			GameTooltip:SetOwner(owner, "ANCHOR_NONE");
 			GameTooltip:AddLine(qmeta.title or ("Quest: " .. quest), 1.0, 0.82, 0.0);
 			for line = 1, qmeta.num_lines or 0 do
 				local meta_line = qmeta[line];
@@ -122,15 +120,6 @@ MT.BuildEnv("map-area");
 					end
 				end
 			end
-		end
-		local function ShowTooltip(owner, quest_list)
-			GameTooltip:SetOwner(owner, "ANCHOR_NONE");
-			for index = 1, #quest_list do
-				if index > 1 then
-					GameTooltip:AddLine(" ");
-				end
-				AddQuestLines(quest_list[index]);
-			end
 			GameTooltip:Show();
 			AnchorTooltipToCursor();
 			owner:SetScript("OnUpdate", Hover_OnUpdate);
@@ -139,34 +128,14 @@ MT.BuildEnv("map-area");
 			owner:SetScript("OnUpdate", nil);
 			MT.OnLeave(owner);
 		end
-		function Area_OnEnter(self)
-			SetFillHover(self, true);
-			for index = 1, self.num_badges do
-				SetBadgeHover(self.badges[index], true);
-			end
-			ShowTooltip(self, self.quest_list);
-		end
-		function Area_OnLeave(self)
-			SetFillHover(self, false);
-			for index = 1, self.num_badges do
-				SetBadgeHover(self.badges[index], false);
-			end
-			HideTooltip(self);
-		end
-		function Area_OnMouseWheel(self, delta)	--	zoom keeps working over an area
-			local container = WorldMapFrame.ScrollContainer;
-			if container ~= nil and container.OnMouseWheel ~= nil then
-				container:OnMouseWheel(delta);
-			end
-		end
 		function Badge_OnEnter(self)
 			SetBadgeHover(self, true);
-			SetQuestFillHover(self.quest, true);
-			ShowTooltip(self, self.quest_list);
+			SetQuestAreasShown(self.quest, true);
+			ShowTooltip(self, self.quest);
 		end
 		function Badge_OnLeave(self)
 			SetBadgeHover(self, false);
-			SetQuestFillHover(self.quest, false);
+			SetQuestAreasShown(self.quest, false);
 			HideTooltip(self);
 		end
 		function Badge_OnClick(self)
@@ -180,36 +149,31 @@ MT.BuildEnv("map-area");
 		local function NewArea()
 			local area = next(areas_unused);
 			if area == nil then
-				area = CreateFrame('FRAME', nil, wrap);
-				area:EnableMouse(true);
-				if area.SetPropagateMouseClicks ~= nil then
-					area:SetPropagateMouseClicks(true);	--	map dragging and zone clicks keep working through the area
-				end
-				area:SetScript("OnEnter", Area_OnEnter);
-				area:SetScript("OnLeave", Area_OnLeave);
-				area:EnableMouseWheel(true);
-				area:SetScript("OnMouseWheel", Area_OnMouseWheel);
-				local fill = CreateFrame('FRAME', nil, area);
-				fill:SetAllPoints();
-				area.fill = fill;
+				area = CreateFrame('FRAME', nil, wrap);		--	no mouse: the map underneath stays fully interactive
 				area.tris = {  };
 				area.edges = {  };
 				area.num_quads = 0;
-				area.badges = {  };
-				area.num_badges = 0;
-				area.quests = {  };
 			else
 				areas_unused[area] = nil;
 			end
 			areas_inuse[area] = 1;
 			return area;
 		end
-		local function NewBadge(area)
-			local index = area.num_badges + 1;
-			area.num_badges = index;
-			local badge = area.badges[index];
+		local function ReleaseArea(area)
+			areas_inuse[area] = nil;
+			areas_unused[area] = 1;
+			area.quest = nil;
+			for index = 1, area.num_quads do
+				area.tris[index]:Hide();
+				area.edges[index]:Hide();
+			end
+			area.num_quads = 0;
+			area:Hide();
+		end
+		local function NewBadge()
+			local badge = next(badges_unused);
 			if badge == nil then
-				badge = CreateFrame('BUTTON', nil, area);
+				badge = CreateFrame('BUTTON', nil, wrap);
 				badge:SetScript("OnEnter", Badge_OnEnter);
 				badge:SetScript("OnLeave", Badge_OnLeave);
 				badge:SetScript("OnClick", Badge_OnClick);
@@ -225,36 +189,28 @@ MT.BuildEnv("map-area");
 				local text = badge:CreateFontString(nil, "OVERLAY", "GameFontNormal");
 				text:SetPoint("CENTER");
 				badge.text = text;
-				badge.quest_list = {  };
-				area.badges[index] = badge;
+			else
+				badges_unused[badge] = nil;
 			end
+			badges_inuse[badge] = 1;
 			return badge;
 		end
-		local function ReleaseArea(area)
-			areas_inuse[area] = nil;
-			areas_unused[area] = 1;
-			area:SetScript("OnUpdate", nil);
-			for index = 1, area.num_quads do
-				area.tris[index]:Hide();
-				area.edges[index]:Hide();
-			end
-			area.num_quads = 0;
-			for index = 1, area.num_badges do
-				local badge = area.badges[index];
-				badge:SetScript("OnUpdate", nil);
-				badge:Hide();
-			end
-			area.num_badges = 0;
-			area.quests = {  };
-			area.quest_list = nil;
-			area:Hide();
+		local function ReleaseBadge(badge)
+			badges_inuse[badge] = nil;
+			badges_unused[badge] = 1;
+			badge.quest = nil;
+			badge:SetScript("OnUpdate", nil);
+			badge:Hide();
 		end
 		local function ReleaseAll()
 			for area, _ in next, areas_inuse do
 				ReleaseArea(area);
 			end
+			for badge, _ in next, badges_inuse do
+				ReleaseBadge(badge);
+			end
 		end
-		--	moves the corners of a 1x1 texture anchored at the fill's top-left onto four points
+		--	moves the corners of a 1x1 texture anchored at the area's top-left onto four points
 		--	given in local coords with y growing downward: upper-left, lower-left, upper-right, lower-right
 		local function SetQuad(tex, x1, y1, x2, y2, x3, y3, x4, y4)
 			tex:SetVertexOffset(1, x1, -y1);			--	natural (0, 0)
@@ -267,8 +223,8 @@ MT.BuildEnv("map-area");
 			local index = area.num_quads;
 			local tex = list[index];
 			if tex == nil then
-				tex = area.fill:CreateTexture(nil, "ARTWORK", nil, sublevel);
-				tex:SetPoint("TOPLEFT", area.fill, "TOPLEFT", 0, 0);
+				tex = area:CreateTexture(nil, "ARTWORK", nil, sublevel);
+				tex:SetPoint("TOPLEFT", area, "TOPLEFT", 0, 0);
 				tex:SetSize(1, 1);
 				list[index] = tex;
 			end
@@ -291,80 +247,81 @@ MT.BuildEnv("map-area");
 				edge:Hide();
 			end
 		end
-		local function SetBadgeSize(badge)
-			badge:SetSize(badge_size, badge_size);
-			badge.glow:SetSize(badge_size * BADGE_GLOW_SCALE, badge_size * BADGE_GLOW_SCALE);
-			badge.text:SetFont(BADGE_FONT, floor(badge_size * 0.55 + 0.5), "OUTLINE");
-		end
-		local function ByOrdinal(a, b)
-			return (a.ordinal or huge) < (b.ordinal or huge);
-		end
-		--	group: { hull = vertices, members = { { quest, ordinal, cx, cy }, ... } }, coords in map-% units
-		local function DrawArea(group, sx, sy, level)
-			local hull, members = group.hull, group.members;
-			tsort(members, ByOrdinal);
+		--	hull vertices in map-% units; sx, sy convert to canvas pixels; stays hidden until hovered
+		local function DrawArea(quest, color, hull, sx, sy, level)
+			local num = #hull;
 			local minx, miny, maxx, maxy = hull[1][1], hull[1][2], hull[1][1], hull[1][2];
-			for index = 2, #hull do
+			local ox, oy = 0, 0;
+			for index = 1, num do
 				local v = hull[index];
 				if v[1] < minx then minx = v[1]; end
 				if v[2] < miny then miny = v[2]; end
 				if v[1] > maxx then maxx = v[1]; end
 				if v[2] > maxy then maxy = v[2]; end
+				ox = ox + v[1];
+				oy = oy + v[2];
 			end
-			local color = QuestColor(members[1].ordinal);
 			local area = NewArea();
+			area.quest = quest;
 			area:SetFrameLevel(level);
-			area.fill:SetFrameLevel(level);
 			area:ClearAllPoints();
 			area:SetPoint("TOPLEFT", mapCanvas, "TOPLEFT", minx * sx, -miny * sy);
 			area:SetSize(max((maxx - minx) * sx, 1), max((maxy - miny) * sy, 1));
 			--	fan apex: mean of the hull vertices, inside any convex polygon
-			local num = #hull;
-			local ox, oy = 0, 0;
-			for index = 1, num do
-				ox = ox + hull[index][1];
-				oy = oy + hull[index][2];
-			end
 			ox, oy = (ox / num - minx) * sx, (oy / num - miny) * sy;
 			for index = 1, num do
 				local a, b = hull[index], hull[index % num + 1];
 				AddEdge(area, color, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
 			end
-			SetFillHover(area, false);
-			--	one badge per quest at its own cluster centre, pushed right when spots coincide
-			local quest_list = {  };
-			for index = 1, #members do
-				local member = members[index];
-				quest_list[index] = member.quest;
-				area.quests[member.quest] = true;
-				local bx, by = (member.cx - minx) * sx, (member.cy - miny) * sy;
-				for prev = 1, index - 1 do
-					local other = area.badges[prev];
-					local dx, dy = bx - other.px, by - other.py;
-					if sqrt(dx * dx + dy * dy) < badge_size then
-						bx = other.px + badge_size + BADGE_GAP;
+		end
+		local function SetBadgeSize(badge)
+			badge:SetSize(badge_size, badge_size);
+			badge.glow:SetSize(badge_size * BADGE_GLOW_SCALE, badge_size * BADGE_GLOW_SCALE);
+			badge.text:SetFont(BADGE_FONT, floor(badge_size * 0.55 + 0.5), "OUTLINE");
+		end
+		local function ByOrdinal(a, b)
+			return (a.ordinal or huge) < (b.ordinal or huge);
+		end
+		--	spots: { { quest, ordinal, color, px, py }, ... } in canvas pixels; badges that would
+		--	sit on each other are pushed to the right, lower quest numbers keep their spot
+		local function PlaceBadges(spots, level)
+			tsort(spots, ByOrdinal);
+			local min_dist = badge_size + BADGE_GAP;
+			for i = 2, #spots do
+				local spot = spots[i];
+				local moved, guard = true, 0;
+				while moved and guard < 8 do
+					moved, guard = false, guard + 1;
+					for j = 1, i - 1 do
+						local other = spots[j];
+						local dx, dy = spot.px - other.px, spot.py - other.py;
+						if sqrt(dx * dx + dy * dy) < min_dist then
+							spot.px = other.px + min_dist;
+							moved = true;
+						end
 					end
 				end
-				local badge = NewBadge(area);
-				badge.quest = member.quest;
-				badge.quest_list[1] = member.quest;
-				badge.color = QuestColor(member.ordinal);
-				badge.px, badge.py = bx, by;
+			end
+			for index = 1, #spots do
+				local spot = spots[index];
+				local badge = NewBadge();
+				badge.quest = spot.quest;
+				badge.color = spot.color;
 				badge:SetFrameLevel(level + BADGE_LEVEL_OFS);
 				badge:ClearAllPoints();
-				badge:SetPoint("CENTER", area, "TOPLEFT", bx, -by);
+				badge:SetPoint("CENTER", mapCanvas, "TOPLEFT", spot.px, -spot.py);
 				SetBadgeSize(badge);
-				badge.text:SetText(member.ordinal ~= nil and member.ordinal or "?");
+				badge.text:SetText(spot.ordinal ~= nil and spot.ordinal or "?");
 				SetBadgeHover(badge, false);
 				badge:Show();
 			end
-			area.quest_list = quest_list;
-			area:Show();
 		end
 	-->		--	data
-		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map
+		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map,
+		--	plus [coord] = uuid so a quest's shapes can follow each mob or object type separately
 		local function CollectQuestPoints(map)
 			local byQuest = {  };
+			local owner = {  };
 			local tblocked, pblocked = VT.QUEST_TEMPORARILY_BLOCKED, VT.QUEST_PREMANENTLY_BLOCKED;
 			for layer = 1, 2 do
 				local meta = VT.MAP_META[layer][map];
@@ -395,7 +352,9 @@ MT.BuildEnv("map-area");
 											byQuest[quest] = points;
 										end
 										for index = 1, #coords do
-											points[#points + 1] = coords[index];
+											local coord = coords[index];
+											points[#points + 1] = coord;
+											owner[coord] = uuid;
 										end
 									end
 								end
@@ -404,47 +363,26 @@ MT.BuildEnv("map-area");
 					end
 				end
 			end
-			return byQuest;
+			return byQuest, owner;
 		end
-		--	one group per quest cluster, then groups whose hulls overlap are merged until none do
-		local function BuildGroups(byQuest)
+		--	one shape per mob/object type in the cluster, so a quest shows where each target lives
+		local function DrawClusterShapes(quest, color, cluster, owner, sx, sy, level)
 			local groups = {  };
-			for quest, points in next, byQuest do
-				local ordinal = __MAIN_META[quest].ordinal;
-				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
-				for index = 1, #clusters do
-					local cluster = clusters[index];
-					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
-					if #hull >= 3 then
-						local cx, cy = MT.AreaCentroid(cluster);
-						groups[#groups + 1] = { hull = hull, members = { { quest = quest, ordinal = ordinal, cx = cx, cy = cy, }, }, };
-					end
+			for index = 1, #cluster do
+				local point = cluster[index];
+				local group = groups[owner[point]];
+				if group == nil then
+					group = {  };
+					groups[owner[point]] = group;
 				end
+				group[#group + 1] = point;
 			end
-			local merged = true;
-			while merged do		--	restart the scan after every merge: the grown hull may touch others
-				merged = false;
-				for i = 1, #groups - 1 do
-					local gi = groups[i];
-					for j = i + 1, #groups do
-						local gj = groups[j];
-						if MT.AreaPolygonsOverlap(gi.hull, gj.hull) then
-							local vertices = {  };
-							for k = 1, #gi.hull do vertices[#vertices + 1] = gi.hull[k]; end
-							for k = 1, #gj.hull do vertices[#vertices + 1] = gj.hull[k]; end
-							gi.hull = MT.AreaPaddedHull(vertices, 0);
-							for k = 1, #gj.members do gi.members[#gi.members + 1] = gj.members[k]; end
-							tremove(groups, j);
-							merged = true;
-							break;
-						end
-					end
-					if merged then
-						break;
-					end
+			for _, group in next, groups do
+				local hull = MT.AreaPaddedHull(group, AREA_PAD);
+				if #hull >= 3 then
+					DrawArea(quest, color, hull, sx, sy, level);
 				end
 			end
-			return groups;
 		end
 		local function Rebuild()
 			timer_armed = false;
@@ -468,10 +406,20 @@ MT.BuildEnv("map-area");
 			local sx, sy = W * 0.01, H * 0.01;
 			local level = max(VT.MAP_WM_WRAP:GetFrameLevel() - 1, 0);	--	fills stay under every pin
 			wrap:SetFrameLevel(level);
-			local groups = BuildGroups(CollectQuestPoints(map));
-			for index = 1, #groups do
-				DrawArea(groups[index], sx, sy, level);
+			local spots = {  };
+			local byQuest, owner = CollectQuestPoints(map);
+			for quest, points in next, byQuest do
+				local ordinal = __MAIN_META[quest].ordinal;
+				local color = QuestColor(ordinal);
+				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
+				for index = 1, #clusters do
+					local cluster = clusters[index];
+					DrawClusterShapes(quest, color, cluster, owner, sx, sy, level);
+					local cx, cy = MT.AreaCentroid(cluster);
+					spots[#spots + 1] = { quest = quest, ordinal = ordinal, color = color, px = cx * sx, py = cy * sy, };
+				end
 			end
+			PlaceBadges(spots, level);
 		end
 	-->		--	extern method
 		--	coalesces every node/map change into one rebuild
@@ -493,10 +441,8 @@ MT.BuildEnv("map-area");
 			if scale > worldmap_pin_scale_max then
 				badge_size = badge_size * worldmap_pin_scale_max / scale;
 			end
-			for area, _ in next, areas_inuse do
-				for index = 1, area.num_badges do
-					SetBadgeSize(area.badges[index]);
-				end
+			for badge, _ in next, badges_inuse do
+				SetBadgeSize(badge);
 			end
 		end
 --
diff --git a/tests/geometry_test.lua b/tests/geometry_test.lua
index bac958b..576d264 100644
--- a/tests/geometry_test.lua
+++ b/tests/geometry_test.lua
@@ -141,24 +141,6 @@ do
 	end)());
 end
 
--->		AreaPolygonsOverlap (convex polygons, positive orientation)
-do
-	local sqA = MT.AreaPaddedHull({ P(0, 0), P(10, 0), P(10, 10), P(0, 10), }, 0);
-	local sqFar = MT.AreaPaddedHull({ P(20, 0), P(30, 0), P(30, 10), P(20, 10), }, 0);
-	local sqShift = MT.AreaPaddedHull({ P(5, 5), P(15, 5), P(15, 15), P(5, 15), }, 0);
-	local sqInside = MT.AreaPaddedHull({ P(3, 3), P(5, 3), P(5, 5), P(3, 5), }, 0);
-	check("overlap: separated squares -> false", not MT.AreaPolygonsOverlap(sqA, sqFar));
-	check("overlap: shifted squares -> true", MT.AreaPolygonsOverlap(sqA, sqShift));
-	check("overlap: small square inside big one -> true", MT.AreaPolygonsOverlap(sqA, sqInside));
-	check("overlap: symmetric", MT.AreaPolygonsOverlap(sqInside, sqA) and not MT.AreaPolygonsOverlap(sqFar, sqA));
-	--	bounding boxes overlap, polygons do not: B sits beyond A's hypotenuse x + y = 10
-	local triA = MT.AreaPaddedHull({ P(0, 0), P(10, 0), P(0, 10), }, 0);
-	local triB = MT.AreaPaddedHull({ P(10, 10), P(6, 10), P(10, 6), }, 0);
-	check("overlap: bbox-overlapping triangles that miss -> false", not MT.AreaPolygonsOverlap(triA, triB));
-	local triC = MT.AreaPaddedHull({ P(10, 10), P(2, 6), P(6, 2), }, 0);	--	its lower-left edge lies on x + y = 8
-	check("overlap: triangles that cross the hypotenuse -> true", MT.AreaPolygonsOverlap(triA, triC));
-end
-
 -->		AreaCentroid
 do
 	local cx, cy = MT.AreaCentroid({ P(0, 0), P(10, 0), P(10, 10), P(0, 10), });

From 4bc388215b336768aecb4a13951aa53d1069921c Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 15:12:55 +0200
Subject: [PATCH 05/10] Keep quest shapes visible; hovering a badge focuses its
 quest

Shapes are shown all the time again. Hovering a badge brings that
quest's shapes to full strength and in front while the other quests'
shapes dim, so overlapping areas resolve on hover instead of being
hidden until then.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area.lua | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/map-area.lua b/map-area.lua
index 5fb7dca..9cf10a2 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -1,9 +1,10 @@
 --[[--
-	Quest areas on the world map, retail style.
+	Quest areas on the world map.
 	For every quest on the current map the objective coordinates are clustered; each
-	cluster gets a numbered badge (position in the quest log) that is always visible,
-	and a padded convex hull that is shown only while its badge is hovered, together
-	with a tooltip beside the cursor.  Clicking a badge opens the quest in the quest log.
+	cluster gets a numbered badge (position in the quest log) and one padded convex hull
+	per mob or object type.  Everything is always visible; hovering a badge focuses that
+	quest (its shapes at full strength and in front, the others dimmed) and shows a
+	tooltip beside the cursor.  Clicking a badge opens the quest in the quest log.
 	Geometry lives in map-area-geometry.lua.
 --]]--
 local __addon, __private = ...;
@@ -36,6 +37,7 @@ MT.BuildEnv("map-area");
 	local CLUSTER_DIST = 8.0;			--	map-% units: points chained closer than this share one area
 	local AREA_PAD = 1.5;				--	map-% units: how far an area extends beyond its points
 	local FILL_ALPHA, OUTLINE_ALPHA = 0.50, 0.95;
+	local IDLE_ALPHA, FOCUS_ALPHA, DIM_ALPHA = 0.6, 1.0, 0.15;	--	shape alpha: resting, hovered quest, other quests
 	local OUTLINE_WIDTH = 2.0;			--	canvas pixels at normal zoom
 	local PALETTE = {					--	one colour per quest, keyed by its position in the quest log
 		{ 0.55, 0.50, 1.00, },	--	violet
@@ -84,11 +86,18 @@ MT.BuildEnv("map-area");
 				badge.glow:Hide();
 			end
 		end
-		--	every area of the quest, so a quest split in two places shows both
-		local function SetQuestAreasShown(quest, shown)
+		--	quest ~= nil: its shapes at full strength and in front, every other quest's dimmed
+		local function SetQuestFocus(quest)
 			for area, _ in next, areas_inuse do
-				if area.quest == quest then
-					area:SetShown(shown);
+				if quest == nil then
+					area:SetAlpha(IDLE_ALPHA);
+					area:SetFrameLevel(area.level);
+				elseif area.quest == quest then
+					area:SetAlpha(FOCUS_ALPHA);
+					area:SetFrameLevel(area.level + 1);
+				else
+					area:SetAlpha(DIM_ALPHA);
+					area:SetFrameLevel(area.level);
 				end
 			end
 		end
@@ -130,12 +139,12 @@ MT.BuildEnv("map-area");
 		end
 		function Badge_OnEnter(self)
 			SetBadgeHover(self, true);
-			SetQuestAreasShown(self.quest, true);
+			SetQuestFocus(self.quest);
 			ShowTooltip(self, self.quest);
 		end
 		function Badge_OnLeave(self)
 			SetBadgeHover(self, false);
-			SetQuestAreasShown(self.quest, false);
+			SetQuestFocus(nil);
 			HideTooltip(self);
 		end
 		function Badge_OnClick(self)
@@ -247,7 +256,7 @@ MT.BuildEnv("map-area");
 				edge:Hide();
 			end
 		end
-		--	hull vertices in map-% units; sx, sy convert to canvas pixels; stays hidden until hovered
+		--	hull vertices in map-% units; sx, sy convert to canvas pixels
 		local function DrawArea(quest, color, hull, sx, sy, level)
 			local num = #hull;
 			local minx, miny, maxx, maxy = hull[1][1], hull[1][2], hull[1][1], hull[1][2];
@@ -263,7 +272,9 @@ MT.BuildEnv("map-area");
 			end
 			local area = NewArea();
 			area.quest = quest;
+			area.level = level;
 			area:SetFrameLevel(level);
+			area:SetAlpha(IDLE_ALPHA);
 			area:ClearAllPoints();
 			area:SetPoint("TOPLEFT", mapCanvas, "TOPLEFT", minx * sx, -miny * sy);
 			area:SetSize(max((maxx - minx) * sx, 1), max((maxy - miny) * sy, 1));
@@ -273,6 +284,7 @@ MT.BuildEnv("map-area");
 				local a, b = hull[index], hull[index % num + 1];
 				AddEdge(area, color, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
 			end
+			area:Show();
 		end
 		local function SetBadgeSize(badge)
 			badge:SetSize(badge_size, badge_size);

From 75fb422e760857b1dedf3ff3dd9d9309c99c1797 Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 15:14:01 +0200
Subject: [PATCH 06/10] One shape per quest cluster again

Splitting a cluster by mob/object type stacked a dozen shapes for quests
whose item drops from many NPC types (Ghoulish Effigy). Back to a single
hull per cluster; a quest still gets separate shapes only when its
targets are in separate places.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area.lua | 45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/map-area.lua b/map-area.lua
index 9cf10a2..c25c05f 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -1,8 +1,8 @@
 --[[--
 	Quest areas on the world map.
 	For every quest on the current map the objective coordinates are clustered; each
-	cluster gets a numbered badge (position in the quest log) and one padded convex hull
-	per mob or object type.  Everything is always visible; hovering a badge focuses that
+	cluster gets a numbered badge (position in the quest log) and one padded convex hull.
+	Everything is always visible; hovering a badge focuses that
 	quest (its shapes at full strength and in front, the others dimmed) and shows a
 	tooltip beside the cursor.  Clicking a badge opens the quest in the quest log.
 	Geometry lives in map-area-geometry.lua.
@@ -329,11 +329,9 @@ MT.BuildEnv("map-area");
 			end
 		end
 	-->		--	data
-		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map,
-		--	plus [coord] = uuid so a quest's shapes can follow each mob or object type separately
+		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map
 		local function CollectQuestPoints(map)
 			local byQuest = {  };
-			local owner = {  };
 			local tblocked, pblocked = VT.QUEST_TEMPORARILY_BLOCKED, VT.QUEST_PREMANENTLY_BLOCKED;
 			for layer = 1, 2 do
 				local meta = VT.MAP_META[layer][map];
@@ -364,9 +362,7 @@ MT.BuildEnv("map-area");
 											byQuest[quest] = points;
 										end
 										for index = 1, #coords do
-											local coord = coords[index];
-											points[#points + 1] = coord;
-											owner[coord] = uuid;
+											points[#points + 1] = coords[index];
 										end
 									end
 								end
@@ -375,26 +371,7 @@ MT.BuildEnv("map-area");
 					end
 				end
 			end
-			return byQuest, owner;
-		end
-		--	one shape per mob/object type in the cluster, so a quest shows where each target lives
-		local function DrawClusterShapes(quest, color, cluster, owner, sx, sy, level)
-			local groups = {  };
-			for index = 1, #cluster do
-				local point = cluster[index];
-				local group = groups[owner[point]];
-				if group == nil then
-					group = {  };
-					groups[owner[point]] = group;
-				end
-				group[#group + 1] = point;
-			end
-			for _, group in next, groups do
-				local hull = MT.AreaPaddedHull(group, AREA_PAD);
-				if #hull >= 3 then
-					DrawArea(quest, color, hull, sx, sy, level);
-				end
-			end
+			return byQuest;
 		end
 		local function Rebuild()
 			timer_armed = false;
@@ -419,16 +396,18 @@ MT.BuildEnv("map-area");
 			local level = max(VT.MAP_WM_WRAP:GetFrameLevel() - 1, 0);	--	fills stay under every pin
 			wrap:SetFrameLevel(level);
 			local spots = {  };
-			local byQuest, owner = CollectQuestPoints(map);
-			for quest, points in next, byQuest do
+			for quest, points in next, CollectQuestPoints(map) do
 				local ordinal = __MAIN_META[quest].ordinal;
 				local color = QuestColor(ordinal);
 				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
 				for index = 1, #clusters do
 					local cluster = clusters[index];
-					DrawClusterShapes(quest, color, cluster, owner, sx, sy, level);
-					local cx, cy = MT.AreaCentroid(cluster);
-					spots[#spots + 1] = { quest = quest, ordinal = ordinal, color = color, px = cx * sx, py = cy * sy, };
+					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
+					if #hull >= 3 then
+						DrawArea(quest, color, hull, sx, sy, level);
+						local cx, cy = MT.AreaCentroid(cluster);
+						spots[#spots + 1] = { quest = quest, ordinal = ordinal, color = color, px = cx * sx, py = cy * sy, };
+					end
 				end
 			end
 			PlaceBadges(spots, level);

From f2d9f239f1c34a9c4b67499b23a1370dabd85445 Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 15:16:33 +0200
Subject: [PATCH 07/10] Colour the area tooltip title by quest difficulty

The title uses the quest log's difficulty colour for the quest level
(GetQuestDifficultyColor) and shows the level in front, so hovering a
badge tells at a glance how dangerous the quest is.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area.lua | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/map-area.lua b/map-area.lua
index c25c05f..6a2fcec 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -23,11 +23,13 @@ local DT = __private.DT;
 	local UIParent = UIParent;
 	local GetCursorPosition = GetCursorPosition;
 	local GetQuestLogIndexByID = GetQuestLogIndexByID;
+	local GetQuestDifficultyColor = GetQuestDifficultyColor;
 	local ShowUIPanel = ShowUIPanel;
 	local _G = _G;
 
 -->
 	local mapCanvas = WorldMapFrame:GetCanvas();
+	local DataAgent = DT.DB;
 	local __MAIN_META = VT.MAIN_META;
 	local BADGE_FONT = GameFontNormal:GetFont();
 
@@ -117,8 +119,25 @@ MT.BuildEnv("map-area");
 			if qmeta == nil then
 				return;
 			end
+			--	title in the quest log's difficulty colour, with the level in front
+			local title = qmeta.title or ("Quest: " .. quest);
+			local r, g, b = 1.0, 0.82, 0.0;
+			local info = DataAgent.quest[quest];
+			if info ~= nil then
+				local lvl = info.lvl;
+				if lvl == nil or lvl <= 0 then
+					lvl = info.min;
+				end
+				if lvl ~= nil and lvl > 0 then
+					local color = GetQuestDifficultyColor(lvl);
+					if color ~= nil then
+						r, g, b = color.r, color.g, color.b;
+					end
+					title = "[" .. lvl .. "] " .. title;
+				end
+			end
 			GameTooltip:SetOwner(owner, "ANCHOR_NONE");
-			GameTooltip:AddLine(qmeta.title or ("Quest: " .. quest), 1.0, 0.82, 0.0);
+			GameTooltip:AddLine(title, r, g, b);
 			for line = 1, qmeta.num_lines or 0 do
 				local meta_line = qmeta[line];
 				if meta_line ~= nil and meta_line[4] ~= nil then

From 2d39b5b05b096e92194c05a338dec15dcc076f0e Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 15:30:28 +0200
Subject: [PATCH 08/10] Draw quest areas on the minimap

The world map's quest clusters are converted to world yards and drawn
around the player on the minimap, clipped to the minimap shape with a
mask texture. Shapes are laid out once per zoom level and only shifted
while walking (a rotating minimap re-lays them out in place); shapes
beyond twice the visible radius are hidden. Hovering a shape focuses its
quest and shows the same tooltip beside the cursor; clicks and the wheel
fall through to the minimap. No badges on the minimap.

Shared pieces (quest colours, tooltip, vertex-offset shape drawing,
cluster collection) move behind MT.MapArea* so both maps draw the same.
Minimap objective pins are skipped while the new "minimap_quest_area"
setting (default on) is enabled.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 Locale/deDE.lua  |   1 +
 Locale/enUS.lua  |   1 +
 Locale/esES.lua  |   1 +
 Locale/esMX.lua  |   1 +
 Locale/frFR.lua  |   1 +
 Locale/koKR.lua  |   1 +
 Locale/ptBR.lua  |   1 +
 Locale/ruRU.lua  |   1 +
 Locale/zhCN.lua  |   1 +
 Locale/zhTW.lua  |   1 +
 load.xml         |   1 +
 map-area.lua     | 345 ++++++++++++++++++++++++++---------------------
 map.lua          |  20 ++-
 minimap-area.lua | 211 +++++++++++++++++++++++++++++
 setting.lua      |  14 ++
 15 files changed, 445 insertions(+), 156 deletions(-)
 create mode 100644 minimap-area.lua

diff --git a/Locale/deDE.lua b/Locale/deDE.lua
index 6ca7acf..b3745ae 100644
--- a/Locale/deDE.lua
+++ b/Locale/deDE.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/enUS.lua b/Locale/enUS.lua
index 2365dc0..c5ef86c 100644
--- a/Locale/enUS.lua
+++ b/Locale/enUS.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/esES.lua b/Locale/esES.lua
index 9a2714c..36e1b0f 100644
--- a/Locale/esES.lua
+++ b/Locale/esES.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/esMX.lua b/Locale/esMX.lua
index 8552789..40ed8db 100644
--- a/Locale/esMX.lua
+++ b/Locale/esMX.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/frFR.lua b/Locale/frFR.lua
index 7201a6a..21babcf 100644
--- a/Locale/frFR.lua
+++ b/Locale/frFR.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/koKR.lua b/Locale/koKR.lua
index ae73ffc..b722084 100644
--- a/Locale/koKR.lua
+++ b/Locale/koKR.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/ptBR.lua b/Locale/ptBR.lua
index 78202fe..3a73fcd 100644
--- a/Locale/ptBR.lua
+++ b/Locale/ptBR.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Size of WorldMap NPC pins";
 uil10n.worldmap_pin_scale_max = "Maxium scale size";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Size of Minimap normal pins";
 uil10n.minimap_large_size = "Size of Minimap BOSS pins";
diff --git a/Locale/ruRU.lua b/Locale/ruRU.lua
index a472086..4a76869 100644
--- a/Locale/ruRU.lua
+++ b/Locale/ruRU.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "Размер отображения квесто
 uil10n.worldmap_pin_scale_max = "Максимальный размер шкалы";
 uil10n.show_in_continent = "Show pins in continents";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "Alpha of icons on minimap";
 uil10n.minimap_normal_size = "Размер большинства контактов";
 uil10n.minimap_large_size = "Размер отображения босса";
diff --git a/Locale/zhCN.lua b/Locale/zhCN.lua
index 5c85f53..ad2003e 100644
--- a/Locale/zhCN.lua
+++ b/Locale/zhCN.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "大地图交接npc标记点大小";
 uil10n.worldmap_pin_scale_max = "地图缩放时标记点的最大缩放";
 uil10n.show_in_continent = "在大陆地图上显示标记";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "小地图图标透明度";
 uil10n.minimap_normal_size = "小地图普通标记点大小";
 uil10n.minimap_large_size = "小地图boss标记点大小";
diff --git a/Locale/zhTW.lua b/Locale/zhTW.lua
index 362c853..df94377 100644
--- a/Locale/zhTW.lua
+++ b/Locale/zhTW.lua
@@ -67,6 +67,7 @@ uil10n.worldmap_varied_size = "大地圖交接npc標記點大小";
 uil10n.worldmap_pin_scale_max = "地圖縮放時標記點的最大縮放";
 uil10n.show_in_continent = "在大陸地圖上顯示標記";
 --	minimap
+uil10n.minimap_quest_area = "Show quest areas instead of objective pins on the minimap";
 uil10n.minimap_alpha = "小地圖圖標透明度";
 uil10n.minimap_normal_size = "小地圖普通標記點大小";
 uil10n.minimap_large_size = "小地圖boss標記點大小";
diff --git a/load.xml b/load.xml
index a1d2197..1c4eda4 100644
--- a/load.xml
+++ b/load.xml
@@ -18,6 +18,7 @@
     <script file = "map.lua" />
     <script file = "map-area-geometry.lua" />
     <script file = "map-area.lua" />
+    <script file = "minimap-area.lua" />
     <script file = "comm.lua" />
     <script file = "util.lua" />
     <script file = "setting.lua" />
diff --git a/map-area.lua b/map-area.lua
index 6a2fcec..7025aba 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -2,10 +2,11 @@
 	Quest areas on the world map.
 	For every quest on the current map the objective coordinates are clustered; each
 	cluster gets a numbered badge (position in the quest log) and one padded convex hull.
-	Everything is always visible; hovering a badge focuses that
-	quest (its shapes at full strength and in front, the others dimmed) and shows a
-	tooltip beside the cursor.  Clicking a badge opens the quest in the quest log.
-	Geometry lives in map-area-geometry.lua.
+	Everything is always visible; hovering a badge focuses that quest (its shapes at full
+	strength and in front, the others dimmed) and shows a tooltip beside the cursor.
+	Clicking a badge opens the quest in the quest log.
+	Geometry lives in map-area-geometry.lua; the shape drawing, colours, tooltip and
+	cluster collection are shared with minimap-area.lua through MT.MapArea* methods.
 --]]--
 local __addon, __private = ...;
 local MT = __private.MT;
@@ -39,8 +40,8 @@ MT.BuildEnv("map-area");
 	local CLUSTER_DIST = 8.0;			--	map-% units: points chained closer than this share one area
 	local AREA_PAD = 1.5;				--	map-% units: how far an area extends beyond its points
 	local FILL_ALPHA, OUTLINE_ALPHA = 0.50, 0.95;
-	local IDLE_ALPHA, FOCUS_ALPHA, DIM_ALPHA = 0.6, 1.0, 0.15;	--	shape alpha: resting, hovered quest, other quests
 	local OUTLINE_WIDTH = 2.0;			--	canvas pixels at normal zoom
+	local IDLE_ALPHA, FOCUS_ALPHA, DIM_ALPHA = 0.6, 1.0, 0.15;	--	shape alpha: resting, hovered quest, other quests
 	local PALETTE = {					--	one colour per quest, keyed by its position in the quest log
 		{ 0.55, 0.50, 1.00, },	--	violet
 		{ 1.00, 0.55, 0.20, },	--	orange
@@ -59,6 +60,7 @@ MT.BuildEnv("map-area");
 	local TOOLTIP_OFFSET_X = 16;		--	tooltip sits right of the cursor, like retail
 	local COMMON_TAG, LARGE_TAG = -9998, -9999;	--	uuid ref textures, see main.lua uuid comment
 	local BADGE_LEVEL_OFS = 12;				--	above the varied pins (wm_wrap level + 0..10)
+	MT.MapAreaAlpha = { IDLE = IDLE_ALPHA, FOCUS = FOCUS_ALPHA, DIM = DIM_ALPHA, };
 -->
 	local wrap = CreateFrame('FRAME', nil, VT.MAP_WM_WRAP);
 	wrap:SetSize(1, 1);
@@ -72,37 +74,11 @@ MT.BuildEnv("map-area");
 	local stale = false;
 	-->		function predef
 		local Badge_OnEnter, Badge_OnLeave, Badge_OnClick;
-	-->		--	hover / tooltip / click
-		local function QuestColor(ordinal)
+	-->		--	shared: colour, tooltip
+		function MT.MapAreaQuestColor(ordinal)
 			return PALETTE[((ordinal or 1) - 1) % #PALETTE + 1];
 		end
-		local function SetBadgeHover(badge, hover)
-			if hover then
-				badge.bg:SetVertexColor(1.0, 0.82, 0.0, 1.0);
-				badge.text:SetTextColor(0.1, 0.1, 0.1);
-				badge.glow:Show();
-			else
-				local color = badge.color;
-				badge.bg:SetVertexColor(0.1, 0.1, 0.1, 0.9);
-				badge.text:SetTextColor(color[1], color[2], color[3]);
-				badge.glow:Hide();
-			end
-		end
-		--	quest ~= nil: its shapes at full strength and in front, every other quest's dimmed
-		local function SetQuestFocus(quest)
-			for area, _ in next, areas_inuse do
-				if quest == nil then
-					area:SetAlpha(IDLE_ALPHA);
-					area:SetFrameLevel(area.level);
-				elseif area.quest == quest then
-					area:SetAlpha(FOCUS_ALPHA);
-					area:SetFrameLevel(area.level + 1);
-				else
-					area:SetAlpha(DIM_ALPHA);
-					area:SetFrameLevel(area.level);
-				end
-			end
-		end
+		local QuestColor = MT.MapAreaQuestColor;
 		local function AnchorTooltipToCursor()
 			local x, y = GetCursorPosition();
 			local scale = UIParent:GetEffectiveScale();
@@ -114,12 +90,13 @@ MT.BuildEnv("map-area");
 				AnchorTooltipToCursor();
 			end
 		end
-		local function ShowTooltip(owner, quest)
+		--	quest title in the quest log's difficulty colour with the level in front, then the objectives;
+		--	beside the cursor and following it while the owner is hovered
+		function MT.MapAreaShowTooltip(owner, quest)
 			local qmeta = __MAIN_META[quest];
 			if qmeta == nil then
 				return;
 			end
-			--	title in the quest log's difficulty colour, with the level in front
 			local title = qmeta.title or ("Quest: " .. quest);
 			local r, g, b = 1.0, 0.82, 0.0;
 			local info = DataAgent.quest[quest];
@@ -152,19 +129,182 @@ MT.BuildEnv("map-area");
 			AnchorTooltipToCursor();
 			owner:SetScript("OnUpdate", Hover_OnUpdate);
 		end
-		local function HideTooltip(owner)
+		function MT.MapAreaHideTooltip(owner)
 			owner:SetScript("OnUpdate", nil);
 			MT.OnLeave(owner);
 		end
+	-->		--	shared: shape drawing (triangle fan + outline via vertex offsets)
+		--	moves the corners of a 1x1 texture anchored at the frame's top-left onto four points
+		--	given in local coords with y growing downward: upper-left, lower-left, upper-right, lower-right
+		local function SetQuad(tex, x1, y1, x2, y2, x3, y3, x4, y4)
+			tex:SetVertexOffset(1, x1, -y1);			--	natural (0, 0)
+			tex:SetVertexOffset(2, x2, 1 - y2);		--	natural (0, -1)
+			tex:SetVertexOffset(3, x3 - 1, -y3);		--	natural (1, 0)
+			tex:SetVertexOffset(4, x4 - 1, 1 - y4);	--	natural (1, -1)
+			tex:Show();
+		end
+		local function GetQuad(frame, list, sublevel)
+			local index = frame.num_quads;
+			local tex = list[index];
+			if tex == nil then
+				tex = frame:CreateTexture(nil, "ARTWORK", nil, sublevel);
+				tex:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, 0);
+				tex:SetSize(1, 1);
+				if frame.mask ~= nil then
+					tex:AddMaskTexture(frame.mask);
+				end
+				list[index] = tex;
+			end
+			return tex;
+		end
+		--	one fan triangle (apex o) and one outline strip for the hull edge a -> b
+		local function AddEdge(frame, color, ox, oy, ax, ay, bx, by)
+			frame.num_quads = frame.num_quads + 1;
+			local tri = GetQuad(frame, frame.tris, 0);
+			tri:SetColorTexture(color[1], color[2], color[3], FILL_ALPHA);
+			SetQuad(tri, ox, oy, ax, ay, bx, by, bx, by);	--	corners 3 and 4 coincide: half the quad collapses
+			local edge = GetQuad(frame, frame.edges, 1);	--	always created so tris and edges stay index-aligned
+			local dx, dy = bx - ax, by - ay;
+			local len = sqrt(dx * dx + dy * dy);
+			if len > 0 then
+				local nx, ny = -dy / len * OUTLINE_WIDTH * 0.5, dx / len * OUTLINE_WIDTH * 0.5;
+				edge:SetColorTexture(color[1], color[2], color[3], OUTLINE_ALPHA);
+				SetQuad(edge, ax + nx, ay + ny, ax - nx, ay - ny, bx + nx, by + ny, bx - nx, by - ny);
+			else
+				edge:Hide();
+			end
+		end
+		function MT.MapAreaInitShape(frame)
+			frame.tris = {  };
+			frame.edges = {  };
+			frame.num_quads = 0;
+		end
+		function MT.MapAreaClearShape(frame)
+			for index = 1, #frame.tris do
+				frame.tris[index]:Hide();
+				frame.edges[index]:Hide();
+			end
+			frame.num_quads = 0;
+		end
+		--	points: convex polygon in the frame's local pixels (y down, relative to its top-left)
+		function MT.MapAreaDrawShape(frame, color, points)
+			local num = #points;
+			local ox, oy = 0, 0;
+			for index = 1, num do
+				ox = ox + points[index][1];
+				oy = oy + points[index][2];
+			end
+			ox, oy = ox / num, oy / num;		--	fan apex: mean of the vertices, inside any convex polygon
+			frame.num_quads = 0;
+			for index = 1, num do
+				local a, b = points[index], points[index % num + 1];
+				AddEdge(frame, color, ox, oy, a[1], a[2], b[1], b[2]);
+			end
+			for index = num + 1, #frame.tris do	--	quads left from a bigger previous draw
+				frame.tris[index]:Hide();
+				frame.edges[index]:Hide();
+			end
+		end
+	-->		--	shared: clusters
+		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map
+		local function CollectQuestPoints(map)
+			local byQuest = {  };
+			local tblocked, pblocked = VT.QUEST_TEMPORARILY_BLOCKED, VT.QUEST_PREMANENTLY_BLOCKED;
+			for layer = 1, 2 do
+				local meta = VT.MAP_META[layer][map];
+				if meta ~= nil then
+					local tag = layer == 1 and COMMON_TAG or LARGE_TAG;
+					for uuid, data in next, meta do
+						local coords = data[1];
+						if #coords > 0 then
+							for quest, refs in next, uuid[4] do
+								local qmeta = __MAIN_META[quest];
+								if qmeta ~= nil and tblocked[quest] ~= true and pblocked[quest] ~= true then
+									local active = false;
+									for line, texture in next, refs do
+										if line == 'extra' then
+											active = true;
+											break;
+										end
+										local meta_line = qmeta[line];
+										if meta_line ~= nil and not meta_line[5] and texture == tag then
+											active = true;
+											break;
+										end
+									end
+									if active then
+										local points = byQuest[quest];
+										if points == nil then
+											points = {  };
+											byQuest[quest] = points;
+										end
+										for index = 1, #coords do
+											points[#points + 1] = coords[index];
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+			return byQuest;
+		end
+		--	{ { quest, ordinal, color, hull (map-% vertices), cx, cy (cluster centre) }, ... }
+		function MT.MapAreaCollectClusters(map)
+			local items = {  };
+			for quest, points in next, CollectQuestPoints(map) do
+				local ordinal = __MAIN_META[quest].ordinal;
+				local color = QuestColor(ordinal);
+				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
+				for index = 1, #clusters do
+					local cluster = clusters[index];
+					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
+					if #hull >= 3 then
+						local cx, cy = MT.AreaCentroid(cluster);
+						items[#items + 1] = { quest = quest, ordinal = ordinal, color = color, hull = hull, cx = cx, cy = cy, };
+					end
+				end
+			end
+			return items;
+		end
+	-->		--	hover / click
+		local function SetBadgeHover(badge, hover)
+			if hover then
+				badge.bg:SetVertexColor(1.0, 0.82, 0.0, 1.0);
+				badge.text:SetTextColor(0.1, 0.1, 0.1);
+				badge.glow:Show();
+			else
+				local color = badge.color;
+				badge.bg:SetVertexColor(0.1, 0.1, 0.1, 0.9);
+				badge.text:SetTextColor(color[1], color[2], color[3]);
+				badge.glow:Hide();
+			end
+		end
+		--	quest ~= nil: its shapes at full strength and in front, every other quest's dimmed
+		local function SetQuestFocus(quest)
+			for area, _ in next, areas_inuse do
+				if quest == nil then
+					area:SetAlpha(IDLE_ALPHA);
+					area:SetFrameLevel(area.level);
+				elseif area.quest == quest then
+					area:SetAlpha(FOCUS_ALPHA);
+					area:SetFrameLevel(area.level + 1);
+				else
+					area:SetAlpha(DIM_ALPHA);
+					area:SetFrameLevel(area.level);
+				end
+			end
+		end
 		function Badge_OnEnter(self)
 			SetBadgeHover(self, true);
 			SetQuestFocus(self.quest);
-			ShowTooltip(self, self.quest);
+			MT.MapAreaShowTooltip(self, self.quest);
 		end
 		function Badge_OnLeave(self)
 			SetBadgeHover(self, false);
 			SetQuestFocus(nil);
-			HideTooltip(self);
+			MT.MapAreaHideTooltip(self);
 		end
 		function Badge_OnClick(self)
 			local index = GetQuestLogIndexByID(self.quest);
@@ -178,9 +318,7 @@ MT.BuildEnv("map-area");
 			local area = next(areas_unused);
 			if area == nil then
 				area = CreateFrame('FRAME', nil, wrap);		--	no mouse: the map underneath stays fully interactive
-				area.tris = {  };
-				area.edges = {  };
-				area.num_quads = 0;
+				MT.MapAreaInitShape(area);
 			else
 				areas_unused[area] = nil;
 			end
@@ -191,11 +329,7 @@ MT.BuildEnv("map-area");
 			areas_inuse[area] = nil;
 			areas_unused[area] = 1;
 			area.quest = nil;
-			for index = 1, area.num_quads do
-				area.tris[index]:Hide();
-				area.edges[index]:Hide();
-			end
-			area.num_quads = 0;
+			MT.MapAreaClearShape(area);
 			area:Hide();
 		end
 		local function NewBadge()
@@ -238,56 +372,16 @@ MT.BuildEnv("map-area");
 				ReleaseBadge(badge);
 			end
 		end
-		--	moves the corners of a 1x1 texture anchored at the area's top-left onto four points
-		--	given in local coords with y growing downward: upper-left, lower-left, upper-right, lower-right
-		local function SetQuad(tex, x1, y1, x2, y2, x3, y3, x4, y4)
-			tex:SetVertexOffset(1, x1, -y1);			--	natural (0, 0)
-			tex:SetVertexOffset(2, x2, 1 - y2);		--	natural (0, -1)
-			tex:SetVertexOffset(3, x3 - 1, -y3);		--	natural (1, 0)
-			tex:SetVertexOffset(4, x4 - 1, 1 - y4);	--	natural (1, -1)
-			tex:Show();
-		end
-		local function GetQuad(area, list, sublevel)
-			local index = area.num_quads;
-			local tex = list[index];
-			if tex == nil then
-				tex = area:CreateTexture(nil, "ARTWORK", nil, sublevel);
-				tex:SetPoint("TOPLEFT", area, "TOPLEFT", 0, 0);
-				tex:SetSize(1, 1);
-				list[index] = tex;
-			end
-			return tex;
-		end
-		--	one fan triangle (apex o) and one outline strip for the hull edge a -> b
-		local function AddEdge(area, color, ox, oy, ax, ay, bx, by)
-			area.num_quads = area.num_quads + 1;
-			local tri = GetQuad(area, area.tris, 0);
-			tri:SetColorTexture(color[1], color[2], color[3], FILL_ALPHA);
-			SetQuad(tri, ox, oy, ax, ay, bx, by, bx, by);	--	corners 3 and 4 coincide: half the quad collapses
-			local edge = GetQuad(area, area.edges, 1);	--	always created so tris and edges stay index-aligned
-			local dx, dy = bx - ax, by - ay;
-			local len = sqrt(dx * dx + dy * dy);
-			if len > 0 then
-				local nx, ny = -dy / len * OUTLINE_WIDTH * 0.5, dx / len * OUTLINE_WIDTH * 0.5;
-				edge:SetColorTexture(color[1], color[2], color[3], OUTLINE_ALPHA);
-				SetQuad(edge, ax + nx, ay + ny, ax - nx, ay - ny, bx + nx, by + ny, bx - nx, by - ny);
-			else
-				edge:Hide();
-			end
-		end
 		--	hull vertices in map-% units; sx, sy convert to canvas pixels
 		local function DrawArea(quest, color, hull, sx, sy, level)
 			local num = #hull;
 			local minx, miny, maxx, maxy = hull[1][1], hull[1][2], hull[1][1], hull[1][2];
-			local ox, oy = 0, 0;
-			for index = 1, num do
+			for index = 2, num do
 				local v = hull[index];
 				if v[1] < minx then minx = v[1]; end
 				if v[2] < miny then miny = v[2]; end
 				if v[1] > maxx then maxx = v[1]; end
 				if v[2] > maxy then maxy = v[2]; end
-				ox = ox + v[1];
-				oy = oy + v[2];
 			end
 			local area = NewArea();
 			area.quest = quest;
@@ -297,12 +391,12 @@ MT.BuildEnv("map-area");
 			area:ClearAllPoints();
 			area:SetPoint("TOPLEFT", mapCanvas, "TOPLEFT", minx * sx, -miny * sy);
 			area:SetSize(max((maxx - minx) * sx, 1), max((maxy - miny) * sy, 1));
-			--	fan apex: mean of the hull vertices, inside any convex polygon
-			ox, oy = (ox / num - minx) * sx, (oy / num - miny) * sy;
+			local points = {  };
 			for index = 1, num do
-				local a, b = hull[index], hull[index % num + 1];
-				AddEdge(area, color, ox, oy, (a[1] - minx) * sx, (a[2] - miny) * sy, (b[1] - minx) * sx, (b[2] - miny) * sy);
+				local v = hull[index];
+				points[index] = { (v[1] - minx) * sx, (v[2] - miny) * sy, };
 			end
+			MT.MapAreaDrawShape(area, color, points);
 			area:Show();
 		end
 		local function SetBadgeSize(badge)
@@ -347,51 +441,7 @@ MT.BuildEnv("map-area");
 				badge:Show();
 			end
 		end
-	-->		--	data
-		--	[quest] = { coord, ... } for every quest with an unfinished objective drawn on this map
-		local function CollectQuestPoints(map)
-			local byQuest = {  };
-			local tblocked, pblocked = VT.QUEST_TEMPORARILY_BLOCKED, VT.QUEST_PREMANENTLY_BLOCKED;
-			for layer = 1, 2 do
-				local meta = VT.MAP_META[layer][map];
-				if meta ~= nil then
-					local tag = layer == 1 and COMMON_TAG or LARGE_TAG;
-					for uuid, data in next, meta do
-						local coords = data[1];
-						if #coords > 0 then
-							for quest, refs in next, uuid[4] do
-								local qmeta = __MAIN_META[quest];
-								if qmeta ~= nil and tblocked[quest] ~= true and pblocked[quest] ~= true then
-									local active = false;
-									for line, texture in next, refs do
-										if line == 'extra' then
-											active = true;
-											break;
-										end
-										local meta_line = qmeta[line];
-										if meta_line ~= nil and not meta_line[5] and texture == tag then
-											active = true;
-											break;
-										end
-									end
-									if active then
-										local points = byQuest[quest];
-										if points == nil then
-											points = {  };
-											byQuest[quest] = points;
-										end
-										for index = 1, #coords do
-											points[#points + 1] = coords[index];
-										end
-									end
-								end
-							end
-						end
-					end
-				end
-			end
-			return byQuest;
-		end
+	-->		--	rebuild
 		local function Rebuild()
 			timer_armed = false;
 			if not WorldMapFrame:IsShown() then
@@ -414,30 +464,23 @@ MT.BuildEnv("map-area");
 			local sx, sy = W * 0.01, H * 0.01;
 			local level = max(VT.MAP_WM_WRAP:GetFrameLevel() - 1, 0);	--	fills stay under every pin
 			wrap:SetFrameLevel(level);
+			local items = MT.MapAreaCollectClusters(map);
 			local spots = {  };
-			for quest, points in next, CollectQuestPoints(map) do
-				local ordinal = __MAIN_META[quest].ordinal;
-				local color = QuestColor(ordinal);
-				local clusters = MT.AreaCluster(points, CLUSTER_DIST);
-				for index = 1, #clusters do
-					local cluster = clusters[index];
-					local hull = MT.AreaPaddedHull(cluster, AREA_PAD);
-					if #hull >= 3 then
-						DrawArea(quest, color, hull, sx, sy, level);
-						local cx, cy = MT.AreaCentroid(cluster);
-						spots[#spots + 1] = { quest = quest, ordinal = ordinal, color = color, px = cx * sx, py = cy * sy, };
-					end
-				end
+			for index = 1, #items do
+				local item = items[index];
+				DrawArea(item.quest, item.color, item.hull, sx, sy, level);
+				spots[index] = { quest = item.quest, ordinal = item.ordinal, color = item.color, px = item.cx * sx, py = item.cy * sy, };
 			end
 			PlaceBadges(spots, level);
 		end
 	-->		--	extern method
-		--	coalesces every node/map change into one rebuild
+		--	coalesces every node/map change into one rebuild; the minimap follows the same signal
 		function MT.MapAreaMarkDirty()
 			if not timer_armed then
 				timer_armed = true;
 				MT._TimerStart(Rebuild, 0.1, 1);
 			end
+			MT.MinimapAreaMarkDirty();
 		end
 		function MT.MapAreaOnShow()
 			if stale then
diff --git a/map.lua b/map.lua
index 285a62d..d2e10c1 100644
--- a/map.lua
+++ b/map.lua
@@ -43,6 +43,7 @@ local DT = __private.DT;
 	local mm_wrap = CreateFrame('FRAME', nil, Minimap);
 		mm_wrap:SetSize(1, 1);
 		mm_wrap:SetPoint("CENTER");
+	VT.MAP_MM_WRAP = mm_wrap;
 	local CommonPinFrameLevel, LargePinFrameLevel = 1, 1;
 	local function ReCalcFrameLevel(pinFrameLevelsManager)
 		local base = pinFrameLevelsManager:GetValidFrameLevel("PIN_FRAME_LEVEL_AREA_POI", 9999);
@@ -114,7 +115,7 @@ MT.BuildEnv("map");
 		local MapPermanentlyShowQuestNodes, MapPermanentlyHideQuestNodes, MapPermanentlyToggleQuestNodes;
 		local MapHideNodes, MapDrawNodes;
 		--	setting
-		local SetShowPinInContinent, SetNodeMenuModifier, SetWorldmapQuestArea;
+		local SetShowPinInContinent, SetNodeMenuModifier, SetWorldmapQuestArea, SetMinimapQuestArea;
 		local SetWorldmapAlpha;
 		local SetWorldmapCommonPinSize, SetWorldmapLargePinSize, SetWorldmapVariedPinSize;
 		local SetMinimapAlpha;
@@ -894,7 +895,7 @@ MT.BuildEnv("map");
 		function Minimap_ShowNodesMapQuest(map, quest)
 			local Tick = MT.GetUnifiedTime();
 			local num_changed = 0;
-			local meta = META_COMMON[map];
+			local meta = not VT.SETTING.minimap_quest_area and META_COMMON[map] or nil;
 			if meta ~= nil then
 				for uuid, data in next, meta do
 					if uuid[4][quest] ~= nil then
@@ -935,7 +936,7 @@ MT.BuildEnv("map");
 					end
 				end
 			end
-			local large = META_LARGE[map];
+			local large = not VT.SETTING.minimap_quest_area and META_LARGE[map] or nil;
 			if large ~= nil then
 				for uuid, data in next, large do
 					if uuid[4][quest] ~= nil then
@@ -1053,7 +1054,7 @@ MT.BuildEnv("map");
 			local Tick = MT.GetUnifiedTime();
 			local mm_check_range = VT.SETTING.minimap_node_inset and mm_hsize * 0.9 or mm_hsize;
 			local num_changed = 0;
-			local meta = META_COMMON[map];
+			local meta = not VT.SETTING.minimap_quest_area and META_COMMON[map] or nil;
 			if meta ~= nil then
 				for uuid, data in next, meta do
 					if UUIDCheckState(uuid, -9998) then
@@ -1094,7 +1095,7 @@ MT.BuildEnv("map");
 					end
 				end
 			end
-			local large = META_LARGE[map];
+			local large = not VT.SETTING.minimap_quest_area and META_LARGE[map] or nil;
 			if large ~= nil then
 				for uuid, data in next, large do
 					if UUIDCheckState(uuid, -9999) then
@@ -1235,6 +1236,7 @@ MT.BuildEnv("map");
 							mm_hheight = Minimap:GetHeight() * 0.5;
 							mm_hwidth = Minimap:GetWidth() * 0.5;
 							Minimap_DrawNodesMap(mm_map);
+							MT.MinimapAreaUpdate(mm_player_x, mm_player_y, mm_hsize, mm_hwidth, mm_hheight, mm_is_rotate, mm_rotate_sin, mm_rotate_cos);
 							mm_force_update = false;
 						end
 						__mm_prev_update = now;
@@ -1568,12 +1570,20 @@ MT.BuildEnv("map");
 			WorldMap_HideNodesMap(wm_map);
 			WorldMap_DrawNodesMap(wm_map);
 		end
+		function SetMinimapQuestArea()
+			Minimap_HideNodes();
+			mm_force_update = true;
+		end
 	-->
 	-->		--	extern method
 		--
 		MT.SetShowPinInContinent = SetShowPinInContinent;
 		MT.SetNodeMenuModifier = SetNodeMenuModifier;
 		MT.SetWorldmapQuestArea = SetWorldmapQuestArea;
+		MT.SetMinimapQuestArea = SetMinimapQuestArea;
+		function MT.MinimapForceUpdate()
+			mm_force_update = true;
+		end
 		MT.SetWorldmapAlpha = SetWorldmapAlpha;
 		MT.SetWorldmapCommonPinSize = SetWorldmapCommonPinSize;
 		MT.SetWorldmapLargePinSize = SetWorldmapLargePinSize;
diff --git a/minimap-area.lua b/minimap-area.lua
new file mode 100644
index 0000000..1675882
--- /dev/null
+++ b/minimap-area.lua
@@ -0,0 +1,211 @@
+--[[--
+	Quest areas on the minimap.
+	The same quest clusters as on the world map (MT.MapAreaCollectClusters), converted to
+	world yards and drawn around the player, clipped to the minimap shape.  Shapes are laid
+	out once per zoom level and only shifted while walking; a rotating minimap re-lays them
+	out in place.  Hovering a shape focuses its quest and shows the tooltip beside the
+	cursor; clicks and the wheel fall through to the minimap.  No badges here.
+--]]--
+local __addon, __private = ...;
+local MT = __private.MT;
+local CT = __private.CT;
+local VT = __private.VT;
+local DT = __private.DT;
+
+-->		upvalue
+	local next = next;
+	local max, abs = math.max, math.abs;
+	local CreateFrame = CreateFrame;
+	local Minimap = Minimap;
+
+-->
+MT.BuildEnv("minimap-area");
+-->		constant
+	local CULL_RADIUS = 2.0;			--	shapes farther than this many visible radii from the player are hidden
+	local RELAYOUT_DIST = 0.5;			--	walk this fraction of the visible radius and the layout is refreshed
+	local MASK_TEXTURE = [[Interface\CharacterFrame\TempPortraitAlphaMask]];
+-->
+	local wrap = CreateFrame('FRAME', nil, VT.MAP_MM_WRAP);
+	wrap:SetSize(1, 1);
+	wrap:SetPoint("CENTER");
+	local shapes = {  };				--	shapes[index] follows items[index]
+	local num_shapes = 0;
+	local items = nil;					--	clusters of the current map, hull in world yards
+	local items_map = nil;
+	local dirty = true;
+	local ref_x, ref_y, ref_kx, ref_ky = nil, nil, nil, nil;	--	player position and yards->pixels of the current layout
+	local focus_quest = nil;
+	-->		--	hover
+		local function ApplyFocus()
+			local alpha = MT.MapAreaAlpha;
+			for index = 1, num_shapes do
+				local shape = shapes[index];
+				if focus_quest == nil then
+					shape:SetAlpha(alpha.IDLE);
+					shape:SetFrameLevel(shape.level);
+				elseif shape.quest == focus_quest then
+					shape:SetAlpha(alpha.FOCUS);
+					shape:SetFrameLevel(shape.level + 1);
+				else
+					shape:SetAlpha(alpha.DIM);
+					shape:SetFrameLevel(shape.level);
+				end
+			end
+		end
+		local function Shape_OnEnter(self)
+			focus_quest = self.quest;
+			ApplyFocus();
+			MT.MapAreaShowTooltip(self, self.quest);
+		end
+		local function Shape_OnLeave(self)
+			focus_quest = nil;
+			ApplyFocus();
+			MT.MapAreaHideTooltip(self);
+		end
+		local function Shape_OnMouseWheel(self, delta)	--	minimap zoom keeps working over a shape
+			local handler = Minimap:GetScript("OnMouseWheel");
+			if handler ~= nil then
+				handler(Minimap, delta);
+			end
+		end
+	-->		--	frames
+		local function GetShape(index)
+			local shape = shapes[index];
+			if shape == nil then
+				shape = CreateFrame('FRAME', nil, wrap);
+				shape:EnableMouse(true);
+				if shape.SetPropagateMouseClicks ~= nil then
+					shape:SetPropagateMouseClicks(true);	--	ping, tracking menu and dragging reach the minimap
+				end
+				shape:SetScript("OnEnter", Shape_OnEnter);
+				shape:SetScript("OnLeave", Shape_OnLeave);
+				shape:EnableMouseWheel(true);
+				shape:SetScript("OnMouseWheel", Shape_OnMouseWheel);
+				local mask = shape:CreateMaskTexture();
+				mask:SetAllPoints(Minimap);
+				mask:SetTexture(MASK_TEXTURE, "CLAMPTOBLACKADDITIVE", "CLAMPTOBLACKADDITIVE");
+				shape.mask = mask;
+				MT.MapAreaInitShape(shape);
+				shapes[index] = shape;
+			end
+			return shape;
+		end
+		local function HideAll()
+			for index = 1, num_shapes do
+				local shape = shapes[index];
+				shape.quest = nil;
+				shape:SetScript("OnUpdate", nil);
+				shape:Hide();
+			end
+			num_shapes = 0;
+			ref_x = nil;
+		end
+	-->		--	data
+		local function BuildItems(map)
+			local built = {  };
+			if map ~= nil then
+				local clusters = MT.MapAreaCollectClusters(map);
+				for index = 1, #clusters do
+					local item = clusters[index];
+					local hull = {  };
+					for k = 1, #item.hull do
+						local v = item.hull[k];
+						local _, wx, wy = MT.GetWorldPositionFromZonePosition(map, v[1] * 0.01, v[2] * 0.01);
+						if wx == nil then
+							hull = nil;
+							break;
+						end
+						hull[k] = { wx, wy, };
+					end
+					if hull ~= nil then
+						built[#built + 1] = { quest = item.quest, color = item.color, hull = hull, };
+					end
+				end
+			end
+			return built;
+		end
+		--	lays every shape out around (cx, cy) in world yards; kx, ky convert yards to pixels
+		local function Layout(cx, cy, kx, ky, hsize, rsin, rcos)
+			local level = Minimap:GetFrameLevel() + 1;	--	over the terrain, under minimap buttons and CodexLite's pins
+			wrap:SetFrameLevel(level);
+			local cull = hsize * CULL_RADIUS;
+			for index = 1, #items do
+				local item = items[index];
+				local shape = GetShape(index);
+				local hull = item.hull;
+				local num = #hull;
+				local points = {  };
+				local minx, miny, maxx, maxy = nil, nil, nil, nil;
+				local near = false;
+				for k = 1, num do
+					local dx, dy = hull[k][1] - cx, hull[k][2] - cy;
+					if abs(dx) < cull and abs(dy) < cull then
+						near = true;
+					end
+					if rsin ~= nil then
+						dx, dy = dx * rsin - dy * rcos, dx * rcos + dy * rsin;
+					end
+					--	same mapping as the pins: world dx to the left, world dy up; local y grows down
+					local px, py = -kx * dx, -ky * dy;
+					points[k] = { px, py, };
+					if minx == nil or px < minx then minx = px; end
+					if miny == nil or py < miny then miny = py; end
+					if maxx == nil or px > maxx then maxx = px; end
+					if maxy == nil or py > maxy then maxy = py; end
+				end
+				shape.quest = item.quest;
+				shape.level = level;
+				if near then
+					for k = 1, num do
+						points[k][1] = points[k][1] - minx;
+						points[k][2] = points[k][2] - miny;
+					end
+					shape:ClearAllPoints();
+					shape:SetPoint("TOPLEFT", wrap, "CENTER", minx, -miny);
+					shape:SetSize(max(maxx - minx, 1), max(maxy - miny, 1));
+					MT.MapAreaDrawShape(shape, item.color, points);
+					shape:Show();
+				else
+					shape:Hide();
+				end
+			end
+			for index = #items + 1, num_shapes do
+				shapes[index].quest = nil;
+				shapes[index]:Hide();
+			end
+			num_shapes = #items;
+			ref_x, ref_y, ref_kx, ref_ky = cx, cy, kx, ky;
+			ApplyFocus();
+		end
+	-->		--	extern method
+		function MT.MinimapAreaMarkDirty()
+			dirty = true;
+			MT.MinimapForceUpdate();
+		end
+		--	called from map.lua's minimap update whenever the player moved, zoomed or turned
+		function MT.MinimapAreaUpdate(px, py, hsize, hwidth, hheight, is_rotate, rsin, rcos)
+			if not VT.SETTING.minimap_quest_area or px == nil or hsize == nil or hsize <= 0 then
+				if num_shapes > 0 then
+					HideAll();
+				end
+				return;
+			end
+			local map = VT.PlayerMapID;
+			if dirty or map ~= items_map then
+				items = BuildItems(map);
+				items_map = map;
+				dirty = false;
+				ref_x = nil;
+			end
+			local kx, ky = hwidth / hsize, hheight / hsize;
+			if is_rotate then
+				Layout(px, py, kx, ky, hsize, rsin, rcos);
+				wrap:SetPoint("CENTER", Minimap, "CENTER", 0, 0);
+			else
+				if ref_x == nil or kx ~= ref_kx or ky ~= ref_ky or abs(px - ref_x) > hsize * RELAYOUT_DIST or abs(py - ref_y) > hsize * RELAYOUT_DIST then
+					Layout(px, py, kx, ky, hsize, nil, nil);
+				end
+				wrap:SetPoint("CENTER", Minimap, "CENTER", -kx * (ref_x - px), ky * (ref_y - py));
+			end
+		end
+--
diff --git a/setting.lua b/setting.lua
index 3c3cc51..482c608 100644
--- a/setting.lua
+++ b/setting.lua
@@ -317,6 +317,18 @@ MT.BuildEnv("setting");
 					'tab.worldmap',
 				},
 			--	tab.minimap
+				minimap_quest_area = {
+					'boolean',
+					function(val)
+						VT.SETTING['minimap_quest_area'] = val;
+						MT.SetMinimapQuestArea();
+						RefreshSettingWidget('minimap_quest_area');
+						return true;
+					end,
+					nil,
+					boolean_func,
+					'tab.minimap',
+				},
 				minimap_alpha = {
 					'number',
 					function(val)
@@ -514,6 +526,7 @@ MT.BuildEnv("setting");
 			worldmap_pin_scale_max = 1.25,
 			show_in_continent = false,
 		--	minimap
+			minimap_quest_area = true,
 			minimap_alpha = 1.0,
 			minimap_normal_size = 15,
 			minimap_large_size = 24,
@@ -553,6 +566,7 @@ MT.BuildEnv("setting");
 			"worldmap_pin_scale_max",
 			"show_in_continent",
 		--	minimap
+			"minimap_quest_area",
 			"minimap_alpha",
 			"minimap_normal_size",
 			"minimap_large_size",

From bcc3f647e7f5c102a1473fb84bc24f08c824061e Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 17:40:00 +0200
Subject: [PATCH 09/10] Quest log "Show" opens the world map on the quest's
 zone

The button only lifted CodexLite's temporary hide filter, which does
nothing unless the quest was hidden first. It now also opens the world
map on the map holding most of the quest's objective spots (its start or
turn-in spot when there are none) and puts the quest in focus there.
Focus is kept across rebuilds until the next badge hover ends.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area.lua | 75 +++++++++++++++++++++++++++++++++++++++++++---------
 util.lua     |  4 ++-
 2 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/map-area.lua b/map-area.lua
index 7025aba..a672d8c 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -281,19 +281,25 @@ MT.BuildEnv("map-area");
 				badge.glow:Hide();
 			end
 		end
-		--	quest ~= nil: its shapes at full strength and in front, every other quest's dimmed
+		--	focused quest: its shapes at full strength and in front, every other quest's dimmed;
+		--	kept across rebuilds until the next hover ends
+		local focus_quest = nil;
+		local function ApplyAreaFocus(area)
+			if focus_quest == nil then
+				area:SetAlpha(IDLE_ALPHA);
+				area:SetFrameLevel(area.level);
+			elseif area.quest == focus_quest then
+				area:SetAlpha(FOCUS_ALPHA);
+				area:SetFrameLevel(area.level + 1);
+			else
+				area:SetAlpha(DIM_ALPHA);
+				area:SetFrameLevel(area.level);
+			end
+		end
 		local function SetQuestFocus(quest)
+			focus_quest = quest;
 			for area, _ in next, areas_inuse do
-				if quest == nil then
-					area:SetAlpha(IDLE_ALPHA);
-					area:SetFrameLevel(area.level);
-				elseif area.quest == quest then
-					area:SetAlpha(FOCUS_ALPHA);
-					area:SetFrameLevel(area.level + 1);
-				else
-					area:SetAlpha(DIM_ALPHA);
-					area:SetFrameLevel(area.level);
-				end
+				ApplyAreaFocus(area);
 			end
 		end
 		function Badge_OnEnter(self)
@@ -386,8 +392,7 @@ MT.BuildEnv("map-area");
 			local area = NewArea();
 			area.quest = quest;
 			area.level = level;
-			area:SetFrameLevel(level);
-			area:SetAlpha(IDLE_ALPHA);
+			ApplyAreaFocus(area);
 			area:ClearAllPoints();
 			area:SetPoint("TOPLEFT", mapCanvas, "TOPLEFT", minx * sx, -miny * sy);
 			area:SetSize(max((maxx - minx) * sx, 1), max((maxy - miny) * sy, 1));
@@ -473,6 +478,50 @@ MT.BuildEnv("map-area");
 			end
 			PlaceBadges(spots, level);
 		end
+	-->		--	show a quest's zone
+		--	the map holding most of the quest's spots in the given node layers (1-2 objectives, 3 start/end)
+		local function BestQuestMap(quest, first_layer, last_layer)
+			local qmeta = __MAIN_META[quest];
+			local best, best_count = nil, 0;
+			for layer = first_layer, last_layer do
+				for map, meta in next, VT.MAP_META[layer] do
+					local count = 0;
+					for uuid, data in next, meta do
+						local refs = uuid[4][quest];
+						if refs ~= nil then
+							local active = layer == 3;
+							if not active then
+								for line, _ in next, refs do
+									local meta_line = qmeta ~= nil and qmeta[line] or nil;
+									if line == 'extra' or (meta_line ~= nil and not meta_line[5]) then
+										active = true;
+										break;
+									end
+								end
+							end
+							if active then
+								count = count + #data[1];
+							end
+						end
+					end
+					if count > best_count then
+						best, best_count = map, count;
+					end
+				end
+			end
+			return best;
+		end
+		--	opens the world map on the quest's zone and puts the quest in focus
+		function MT.MapAreaShowQuest(quest)
+			local map = BestQuestMap(quest, 1, 2) or BestQuestMap(quest, 3, 3);
+			if not WorldMapFrame:IsShown() then
+				ShowUIPanel(WorldMapFrame);
+			end
+			if map ~= nil then
+				WorldMapFrame:SetMapID(map);
+			end
+			SetQuestFocus(quest);
+		end
 	-->		--	extern method
 		--	coalesces every node/map change into one rebuild; the minimap follows the same signal
 		function MT.MapAreaMarkDirty()
diff --git a/util.lua b/util.lua
index a256c0e..84a465e 100644
--- a/util.lua
+++ b/util.lua
@@ -1109,7 +1109,9 @@ MT.BuildEnv("util");
 			_ShowQuest:SetSize(85, 21);
 			_ShowQuest:SetPoint("TOPLEFT", QuestLogDescriptionTitle, "TOPLEFT", 0, 0);
 			_ShowQuest:SetScript("OnClick", function()
-				MT.MapTemporarilyShowQuestNodes(select(8, GetQuestLogTitle(GetQuestLogSelection())));
+				local quest = select(8, GetQuestLogTitle(GetQuestLogSelection()));
+				MT.MapTemporarilyShowQuestNodes(quest);
+				MT.MapAreaShowQuest(quest);	--	and open the world map on its zone
 			end);
 			_ShowQuest:SetText(l10n.ui.show_quest);
 			local _HideQuest = CreateFrame('BUTTON', nil, QuestLogDetailScrollChildFrame, "UIPanelButtonTemplate");

From 32f5fe3ae97d7ed8368336428d8972c9cff336e1 Mon Sep 17 00:00:00 2001
From: Vladeta Putnikovic <vladetaputnikovic@gmail.com>
Date: Fri, 28 Aug 2026 17:43:53 +0200
Subject: [PATCH 10/10] Pick the quest's home zone for the quest log "Show"
 button

Counting spots per map picked adjoining zones and continents, because
CodexLite copies every spot into those maps. Only an entity's home spots
count now (the first coord sharing each world-coord table), the player's
current zone wins when the quest has spots there, and a finished quest
falls back to the zone of its turn-in or start NPC.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 map-area.lua | 87 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 21 deletions(-)

diff --git a/map-area.lua b/map-area.lua
index a672d8c..853896e 100644
--- a/map-area.lua
+++ b/map-area.lua
@@ -479,41 +479,86 @@ MT.BuildEnv("map-area");
 			PlaceBadges(spots, level);
 		end
 	-->		--	show a quest's zone
-		--	the map holding most of the quest's spots in the given node layers (1-2 objectives, 3 start/end)
-		local function BestQuestMap(quest, first_layer, last_layer)
+		--	CodexLite copies every spot into adjoining and continent maps; the copies share the
+		--	original's world-coord table and follow it, so the first sighting of each is the home spot
+		local function CountHomeMaps(coords, counts)
+			if coords == nil then
+				return;
+			end
+			local seen = {  };
+			for index = 1, #coords do
+				local coord = coords[index];
+				local wcoord = coord[5];
+				if wcoord ~= nil and seen[wcoord] == nil then
+					seen[wcoord] = true;
+					counts[coord[3]] = (counts[coord[3]] or 0) + 1;
+				end
+			end
+		end
+		--	the zone the player stands in when the quest has spots there, else the zone with most of
+		--	its unfinished objective spots, else where it is turned in or picked up
+		local function BestQuestMap(quest)
 			local qmeta = __MAIN_META[quest];
-			local best, best_count = nil, 0;
-			for layer = first_layer, last_layer do
-				for map, meta in next, VT.MAP_META[layer] do
-					local count = 0;
-					for uuid, data in next, meta do
+			local counts = {  };
+			local done = {  };
+			for layer = 1, 2 do
+				for _, meta in next, VT.MAP_META[layer] do
+					for uuid, _ in next, meta do
 						local refs = uuid[4][quest];
-						if refs ~= nil then
-							local active = layer == 3;
-							if not active then
-								for line, _ in next, refs do
-									local meta_line = qmeta ~= nil and qmeta[line] or nil;
-									if line == 'extra' or (meta_line ~= nil and not meta_line[5]) then
-										active = true;
-										break;
-									end
+						if refs ~= nil and done[uuid] == nil then
+							done[uuid] = true;
+							local active = false;
+							for line, _ in next, refs do
+								local meta_line = qmeta ~= nil and qmeta[line] or nil;
+								if line == 'extra' or (meta_line ~= nil and not meta_line[5]) then
+									active = true;
+									break;
 								end
 							end
 							if active then
-								count = count + #data[1];
+								local entities = DataAgent[uuid[1]];
+								local entity = entities ~= nil and entities[uuid[2]] or nil;
+								CountHomeMaps(entity ~= nil and entity.coords or nil, counts);
 							end
 						end
 					end
-					if count > best_count then
-						best, best_count = map, count;
+				end
+			end
+			if counts[VT.PlayerMapID] ~= nil then
+				return VT.PlayerMapID;
+			end
+			local best, best_count = nil, 0;
+			for map, count in next, counts do
+				if count > best_count then
+					best, best_count = map, count;
+				end
+			end
+			if best ~= nil then
+				return best;
+			end
+			local info = DataAgent.quest[quest];
+			if info ~= nil then
+				for _, which in next, { 'end', 'start', } do
+					local where = info[which];
+					if where ~= nil then
+						for _, key in next, { 'U', 'O', } do
+							local list = where[key];
+							if list ~= nil and list[1] ~= nil then
+								local entity = DataAgent[key == 'U' and 'unit' or 'object'][list[1]];
+								local coords = entity ~= nil and entity.coords or nil;
+								if coords ~= nil and coords[1] ~= nil then
+									return coords[1][3];
+								end
+							end
+						end
 					end
 				end
 			end
-			return best;
+			return nil;
 		end
 		--	opens the world map on the quest's zone and puts the quest in focus
 		function MT.MapAreaShowQuest(quest)
-			local map = BestQuestMap(quest, 1, 2) or BestQuestMap(quest, 3, 3);
+			local map = BestQuestMap(quest);
 			if not WorldMapFrame:IsShown() then
 				ShowUIPanel(WorldMapFrame);
 			end