Full migration to webcolors as color chooser

src/kothic.py

@@ -224,17 +224,7 @@ def poly(cr, c):
   for k in range(2, len(c), 2):
     cr.line_to(c[k], c[k + 1])
   cr.fill()
-class Color:
-  def __init__(self):
-    self.colortable = {}
-  def translate(self, col):
-    try:
-      return self.colortable[col]
-    except KeyError:
-      colz = gtk.gdk.Color(col)
-      self.colortable[col] = (colz.red/65536., colz.green/65536., colz.blue/65536.)
-      return self.colortable[col]
-color_tool = Color()
+
 
 
 class RasterTile:
@@ -309,9 +299,9 @@ class RasterTile:
         #debug(obj[1])
         if "fill-color" in obj[1]:
           #color = color_tool.translate(obj[1]["fill-color"])
-          color = gtk.gdk.Color(obj[1]["fill-color"])
+          color = obj[1]["fill-color"]
           #debug((color.red/65536., color.green/65536., color.blue/65536.))
-          cr.set_source_rgb(color.red/65535., color.green/65535., color.blue/65535.)
+          cr.set_source_rgb(color[0], color[1], color[2])
           #cr.set_source_rgb(color[0], color[1], color[2])
           cr.set_line_width (1)
           #debug("poly!")
@@ -319,15 +309,15 @@ class RasterTile:
       # - draw casings on layer
       for obj in data:
         if "casing-width" in obj[1] or "casing-color" in obj[1]:
-          color = gtk.gdk.Color(obj[1].get("casing-color", "#000"))
-          cr.set_source_rgb(color.red/65535., color.green/65535., color.blue/65535.)
+          color = obj[1].get("casing-color", (0,0,0))
+          cr.set_source_rgb(color[0], color[1], color[2])
           cr.set_line_width (obj[1].get("casing-width", obj[1].get("width",0)+1 ))
           line(cr, obj[0].cs)
       # - draw line centers
       for obj in data:
         if "width" in obj[1] or "color" in obj[1]:
-          color = gtk.gdk.Color(obj[1].get("color", "#000"))
-          cr.set_source_rgb(color.red/65535., color.green/65535., color.blue/65535.)
+          color = obj[1].get("color", (0,0,0))
+          cr.set_source_rgb(color[0], color[1], color[2])
           cr.set_line_width (obj[1].get("width", 1))
           line(cr, obj[0].cs)
       #debug("pass %s" % passn)

src/style.py

@@ -20,6 +20,8 @@
 
 from debug import debug
 
+from webcolors.webcolors import whatever_to_cairo as colorparser
+
 class Styling():
   """
   Class used to choose the right way of rendering an object.
@@ -98,7 +100,17 @@ class StyleSelector():
     style - MapCSS rules to apply
     """
     self.tags = tags
-    self.style = style
+    self.style = {}
+    for key in style:
+      
+      keyz = key.lower()
+      
+      if "color" in keyz:
+        self.style[keyz] = colorparser(style[key])
+        debug((colorparser(style[key]),style[key]))
+      else:
+        self.style[keyz] = style[key]
+    
   def get_style(self, tags):
     """
     Get actual styling for object.

src/webcolors/webcolors.py

@@ -848,7 +848,10 @@ def whatever_to_rgb(string):
       a = md5.new(string)
       return hex_to_rgb("#"+a.hexdigest()[:6])
     
-    
+def whatever_to_cairo(string):
+  a = whatever_to_rgb(string)
+  return a[0]/255.,a[1]/255.,a[2]/255.,
+