From d407c70d260ed8d9c289643a4c16886ca9ec0e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kom=D1=8Fpa?= <me@komzpa.net>
Date: Wed, 5 May 2010 00:36:03 +0300
Subject: [PATCH] Added basic overlapping text dropping

---
 src/kothic.py | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/kothic.py b/src/kothic.py
index acd4f54..9d4ca6b 100644
--- a/src/kothic.py
+++ b/src/kothic.py
@@ -294,6 +294,8 @@ class RasterTile:
     timer = Timer("Rasterizing image")
     linecaps = {"butt":0, "round":1, "square":2}
     linejoin = {"miter":0, "round":1, "bevel":2}
+
+    text_rendered_at = set([(-100,-100)])
     #cr.set_antialias(2)
     for layer in layers:
       data = objs_by_layers[layer]
@@ -343,22 +345,27 @@ class RasterTile:
           cr.set_line_width (obj[1].get("width", 1))
           cr.set_font_size(obj[1].get("font-size", 9))
           where = self.lonlat2screen(obj[0].center)
+          for t in text_rendered_at:
+            if ((t[0]-where[0])**2+(t[1]-where[1])**2)**(0.5) < 15:
+              break
+          else:
+              text_rendered_at.add(where)
           #debug ("drawing text: %s at %s"%(text, where))
-          if "text-halo-color" in obj[1] or "text-halo-radius" in obj[1]:
-            cr.new_path()
-            cr.move_to(where[0], where[1])
-            cr.set_line_width (obj[1].get("text-halo-radius", 1))
-            color = obj[1].get("text-halo-color", (1.,1.,1.))
-            cr.set_source_rgb(color[0], color[1], color[2])
-            cr.text_path(text)
-            cr.stroke()
-          cr.new_path()
-          cr.move_to(where[0], where[1])
-          cr.set_line_width (obj[1].get("text-halo-radius", 1))
-          color = obj[1].get("text-color", (0.,0.,0.))
-          cr.set_source_rgb(color[0], color[1], color[2])
-          cr.text_path(text)
-          cr.fill()
+              if "text-halo-color" in obj[1] or "text-halo-radius" in obj[1]:
+                cr.new_path()
+                cr.move_to(where[0], where[1])
+                cr.set_line_width (obj[1].get("text-halo-radius", 1))
+                color = obj[1].get("text-halo-color", (1.,1.,1.))
+                cr.set_source_rgb(color[0], color[1], color[2])
+                cr.text_path(text)
+                cr.stroke()
+              cr.new_path()
+              cr.move_to(where[0], where[1])
+              cr.set_line_width (obj[1].get("text-halo-radius", 1))
+              color = obj[1].get("text-color", (0.,0.,0.))
+              cr.set_source_rgb(color[0], color[1], color[2])
+              cr.text_path(text)
+              cr.fill()
       texttimer.stop()
           
     timer.stop()