full sync commit

src/kothic.py

@@ -29,7 +29,7 @@ import Queue
 from debug import debug, Timer
 
 from backend.postgis import PostGisBackend as DataBackend
-#from backend.vtile import QuadTileBackend as DataBackend
+from backend.vtile import QuadTileBackend as DataBackend
 #from style import Styling
 from mapcss import MapCSS as Styling
 from render import RasterTile
@@ -79,8 +79,8 @@ class Navigator:
     self.rastertile = None
     self.f = True
     undef = None
-    self.style = Styling()
-    self.style.parse(open("styles/openstreetinfo.mapcss","r").read())
+    self.style = Styling(0,25)
+    self.style.parse(open("styles/default.mapcss","r").read())
     
     da = gtk.DrawingArea()
     da.add_events(gtk.gdk.BUTTON1_MOTION_MASK)

src/make_postgis_style.py

@@ -20,7 +20,7 @@ from debug import debug, Timer
 from mapcss import MapCSS
 
 style = MapCSS(1, 19)     #zoom levels
-style.parse(open("styles/mapink.mapcss","r").read())
+style.parse(open("styles/default.mapcss","r").read())
 
 t = ("way", "node")
 dct = {}

src/mapcss/Eval.py

@@ -42,12 +42,12 @@ class Eval():
       """
       for t in x:
         q = x
-      return 0
+      return ""
     tags = set([])
     a = eval(self.expr,{},{
       "tag":lambda x: tags.add(x),
       "prop": lambda x: "",
-      "num": fake_compute,
+      "num": lambda x: 0,
       "metric": fake_compute,
       "zmetric": fake_compute,
       "str": fake_compute,

src/mapcss/StyleChooser.py

@@ -121,9 +121,11 @@ class StyleChooser:
                       elif "dashes" in a:
                         "these things are arrays of float's or not in table at all"
                         try:
+                          print b
                           b = b.split(",")
                           b = [float(x) for x in b]
                           ra[a]= b
+                          print b
                         except ValueError:
                           pass
                       else:

src/render.py

@@ -159,6 +159,7 @@ class RasterTile:
       objs_by_layers[layer] = []
     for obj in ww:
       objs_by_layers[int(obj[1]["layer"]/100.)].append(obj)
+
     del ww
     timer.stop()
     timer = Timer("Rasterizing image")
@@ -166,10 +167,9 @@ class RasterTile:
     linejoin = {"miter":0, "round":1, "bevel":2}
 
     text_rendered_at = set([(-100,-100)])
-    
     for layer in layers:
       data = objs_by_layers[layer]
-      data.sort(lambda x,y:cmp(max([x1[1] for x1 in x[0].cs]), max([x1[1] for x1 in y[0].cs])))
+      #data.sort(lambda x,y:cmp(max([x1[1] for x1 in x[0].cs]), max([x1[1] for x1 in y[0].cs])))
 
 
 

src/styles/default.mapcss

@@ -6,7 +6,8 @@ way[highway]
     eval(
             any(
                metric(tag("width")),
-               metric( num(tag("lanes")) * 4)
+               metric( num(tag("lanes")) * 4),
+               metric( "1m"),
                )
 
          );
@@ -22,7 +23,7 @@ way[barrier]
 way[highway=residential],
 way[highway=tertiary],
 way[highway=living_street]
-    {width: 3; color:#ffffff; z-index:10}
+{width: eval(max(3, prop("width"))); color:#ffffff; z-index:10}
 
 way[highway=service],
 way[highway=unclassified]
@@ -54,12 +55,12 @@ way[landuse=wood]
 way[highway=footway],
 way[highway=pedestrian],
 way[highway=path]
-{width:eval(max(2, prop("width"))); color:#655; casing-dashes: 3,1; z-index:3; linecap: butt;}
+{width:eval(max(2, prop("width"))); color:#655; casing-dashes: 3,1; z-index:3; linecap: round;}
 
 way[highway=steps]
-{ width:eval(max(2, prop("width"))); color:#655; casing-dashes: 1,0;  z-index:5;
-dashes:  eval(str( max(any(metric(tag("step:length"))/100, metric("0.3m"))-1, 2) ) + ",1"); linecap: butt;
-}
+{z-index:5;  width:eval(max(2, prop("width"))); color:#655; casing-dashes: 1,0;  linecap: butt;}
+{z-index:6; width:eval(max(2, prop("width"))); dashes: eval("1," + str( max(num(any(num(metric(tag("step:length")))/100, num(metric("0.3m"))))-1, 1) ) ); color: black;}
+
 
 way[highway][area=yes]
 {fill-color: eval(prop("color")); width:0}
@@ -75,14 +76,16 @@ way[waterway=river],
 way[waterway=stream]{color: #002}
 
 way[landuse=grass],
-way[natural=grass]{fill-color: #050}
+way[natural=grass]{fill-color: #050; opacity: 0.8}
 
 
-way[bridge=yes] {casing-width:eval(min(3, num(prop("width"))/2 ));}
+way[bridge=yes] {casing-width:eval(min(3, num(prop("width"))/2 ));casing-linecap:butt}
 way[power=line] {width: 1; color:#ccc}
 way|z16-[building] {fill-color: #522; text: addr:housenumber; text-halo-radius:2; z-index:100; text-position: center;
+opacity: 0.7;
 extrude:  eval( any( metric(tag("height")), metric ( num(tag("building:levels")) * 3)));
 extrude-face-color: #e2e2e2;
+extrude-face-opacity: 0.7;
 extrude-edge-width: 1;
 extrude-edge-color: #404040;
 }