normalize layer, removed code

layers.py

@@ -20,6 +20,8 @@ def threshold(self, threshold):
         return Threshold(self, threshold)
     def clamp(self, lo=0, hi=1):
         return Clamp(self, lo, hi)
+    def normalize(self, lo, hi, new_lo, new_hi):
+        return Normalize(self, lo, hi, new_lo, new_hi)
     def filter_points(self, points, lo, hi):
         return [(x, y) for x, y in points if lo <= self.get(x, y) < hi]
     def alpha_shape(self, points, lo, hi, alpha):
@@ -111,6 +113,19 @@ def get(self, x, y):
         v = max(v, self.lo)
         return v
 
+class Normalize(Layer):
+    def __init__(self, layer, lo, hi, new_lo, new_hi):
+        self.layer = layer
+        self.lo = lo
+        self.hi = hi
+        self.new_lo = new_lo
+        self.new_hi = new_hi
+    def get(self, x, y):
+        v = self.layer.get(x, y)
+        p = (v - self.lo) / (self.hi - self.lo)
+        v = self.new_lo + p * (self.new_hi - self.new_lo)
+        return v
+
 class Distance(Layer):
     def __init__(self, x, y, maximum):
         self.x = x

main.py

@@ -29,23 +29,14 @@ def render_shape(dc, shape):
             dc.line_to(x, y)
         dc.close_path()
 
-def render_water_symbol(dc, x, y):
-    r = 4
-    e = math.pi / 4
-    for dx in [-r, r]:
-        dc.new_sub_path()
-        dc.arc_negative(dx + x + r, y, r, math.pi, math.pi / 2 - e)
-        dc.new_sub_path()
-        dc.arc(dx + x - r, y, r, 0, math.pi / 2 + e)
-
-def render_mark_symbol(dc, x, y):
+def render_mark(dc, x, y):
     n = 8
     dc.move_to(x - n, y - n)
     dc.line_to(x + n, y + n)
     dc.move_to(x - n, y + n)
     dc.line_to(x + n, y - n)
 
-def render_compass_symbol(dc):
+def render_compass(dc):
     w, h = 4, 32
     dc.line_to(-w, 0)
     dc.line_to(0, h)
@@ -137,14 +128,6 @@ def render(seed=None):
         dc.set_source_rgb(*c.rgb)
         render_shape(dc, shape)
         dc.fill()
-    # land outline
-    # dc.save()
-    # dc.set_source_rgb(*Color('#BDD4DE').rgb)
-    # for _ in range(5):
-    #     render_shape(dc, shape1.buffer(2))
-    #     dc.fill()
-    #     dc.translate(0, 1)
-    # dc.restore()
     # height
     dc.save()
     dc.set_source_rgb(*Color('#CFC291').rgb)
@@ -173,14 +156,14 @@ def render(seed=None):
     dc.set_dash([])
     # mark
     dc.set_source_rgb(*Color('#DC3522').rgb)
-    render_mark_symbol(dc, *mark)
+    render_mark(dc, *mark)
     dc.set_line_width(4)
     dc.stroke()
     # compass
     dc.save()
     dc.translate(48, height - 64)
     dc.rotate(random.random() * math.pi / 4 - math.pi / 8)
-    render_compass_symbol(dc)
+    render_compass(dc)
     dc.restore()
     return surface