Corrected residential and forest textures, fixed bug in layergen with river and stream rendering, corrected order for nature reserve and forests in defines.py .

defines.py

@@ -97,10 +97,10 @@ mstr_ortho_layers = [
     ("leisure", "pitch", "leisure", "green"),
     ("landuse", "farmland", "landuse", "farmland"),
     ("landuse", "farmyard", "landuse", "farmland"),
-    # Z-Order 2
-    ("landuse", "forest", "landuse", "forest"),
-    ("leisure", "nature_reserve", "landuse", "forest"),
     ("landuse", "military", "landuse", "residential-boundary"),
+    # Z-Order 2
+    ("leisure", "nature_reserve", "landuse", "forest"),
+    ("landuse", "forest", "landuse", "forest"),
     # Z-Order 3
     ("natural", "water", "natural", "water"),
     ("natural", "bay", "natural", "beach"),
@@ -108,7 +108,7 @@ mstr_ortho_layers = [
     ("water", "lake", "natural", "water"),
     ("water", "pond", "natural", "water"),
     ("water", "river", "natural", "water"),
-    ("waterway", "river", "natural", "water"),
+    ("waterway", "river", 10),
     ("waterway", "stream", 10),
     ("amenity", "parking", "amenities", "parking"),
     ("highway", "pedestrian", 4),

layergen.py

@@ -391,7 +391,7 @@ class mstr_layergen:
                         if self._tag == "highway":
                             d = randrange(81, 101)
                             layer_comp_pix[x, y] = ( d,d,d,a[3] )
-                        if self._tag == "waterway" and self._value == "stream":
+                        if self._tag == "waterway" and (self._value == "stream" or self._value == "river"):
                             d = randrange(1, 15)
                             layer_comp_pix[x, y] = ( 19-d, 62-d, 71-d, a[3] )
                         if self._tag == "building":