Corrected residential and forest textures, fixed bug in layergen with river and strea...

diff --git a/Textures/landuse/forest/brd/b13.png b/Textures/landuse/forest/brd/b13.png
index adfec0ecbd42b5b4c0a6273a89dc340ee657787c..7bdd2ec52720d64463f9f111785bdd8e7832ca0c 100644 (file)
Binary files a/Textures/landuse/forest/brd/b13.png and b/Textures/landuse/forest/brd/b13.png differ

diff --git a/Textures/landuse/forest/brd/b14.png b/Textures/landuse/forest/brd/b14.png
index 0c346f97d642e1af68d3dec46ea8d7efa27fb605..f40cf1652c4a95f99bb82e6de40219d7201d759b 100644 (file)
Binary files a/Textures/landuse/forest/brd/b14.png and b/Textures/landuse/forest/brd/b14.png differ

diff --git a/Textures/landuse/forest/brd/b15.png b/Textures/landuse/forest/brd/b15.png
index 408a177649efc6989bf362c81bf1ec57be2a7045..101299f882c4c8fd5e966f5d4fd1423f5500b8a1 100644 (file)
Binary files a/Textures/landuse/forest/brd/b15.png and b/Textures/landuse/forest/brd/b15.png differ

diff --git a/Textures/landuse/forest/ptc/b13_p1.png b/Textures/landuse/forest/ptc/b13_p1.png
index 4fd8be88922d4558b4324c7fed6020c99014dc92..25802a481472a7ef25c8777e510337d5a5dab5c0 100644 (file)
Binary files a/Textures/landuse/forest/ptc/b13_p1.png and b/Textures/landuse/forest/ptc/b13_p1.png differ

diff --git a/Textures/landuse/forest/ptc/b13_p2.png b/Textures/landuse/forest/ptc/b13_p2.png
index 5df61f189224e8ee0ccd978847c82858ee325ea6..25761ef532bf60a3529e392b4e6c2e2f0aa4f7f8 100644 (file)
Binary files a/Textures/landuse/forest/ptc/b13_p2.png and b/Textures/landuse/forest/ptc/b13_p2.png differ

diff --git a/Textures/landuse/forest/ptc/b14_p1.png b/Textures/landuse/forest/ptc/b14_p1.png
index 60f16f40dc03ced8d089e335a8e328b8da3d9633..329b591d92f59297f002305d63a2575402069d27 100644 (file)
Binary files a/Textures/landuse/forest/ptc/b14_p1.png and b/Textures/landuse/forest/ptc/b14_p1.png differ

diff --git a/Textures/landuse/forest/ptc/b14_p2.png b/Textures/landuse/forest/ptc/b14_p2.png
index a78816e2e9b4e3476752305bfe230b86a5465143..1730c18f8af37dd6659b42785a95c73ef084c020 100644 (file)
Binary files a/Textures/landuse/forest/ptc/b14_p2.png and b/Textures/landuse/forest/ptc/b14_p2.png differ

diff --git a/Textures/landuse/forest/ptc/b15_p1.png b/Textures/landuse/forest/ptc/b15_p1.png
index 91f0f2e742b79610a4498f5f7ddf29bc353918fe..a1faa3f1a40d9c22c691294654855f31b9196979 100644 (file)
Binary files a/Textures/landuse/forest/ptc/b15_p1.png and b/Textures/landuse/forest/ptc/b15_p1.png differ

diff --git a/Textures/landuse/forest/ptc/b15_p2.png b/Textures/landuse/forest/ptc/b15_p2.png
index cb3eb1fd8a103e6680719812d41f3a9f7d9aa46d..043a2d17a8e3f11af0ae5e540f21d3cadca84b63 100644 (file)
Binary files a/Textures/landuse/forest/ptc/b15_p2.png and b/Textures/landuse/forest/ptc/b15_p2.png differ

diff --git a/Textures/landuse/residential-boundary/brd/b1.png b/Textures/landuse/residential-boundary/brd/b1.png
index 1bca2e6edf9c5693529a5197cad4fa1c9878feaa..9db9a74e6475dd67c2882a2b7cd52b95a1b4fa29 100644 (file)
Binary files a/Textures/landuse/residential-boundary/brd/b1.png and b/Textures/landuse/residential-boundary/brd/b1.png differ

diff --git a/Textures/landuse/residential-boundary/brd/b2.png b/Textures/landuse/residential-boundary/brd/b2.png
index 523ab373cf4a535d3b3a5f22aa8e5b4fd7761c37..aae185aeef793f8a23b5b7f31c25ef57b6c33cfb 100644 (file)
Binary files a/Textures/landuse/residential-boundary/brd/b2.png and b/Textures/landuse/residential-boundary/brd/b2.png differ

diff --git a/Textures/landuse/residential-boundary/brd/b3.png b/Textures/landuse/residential-boundary/brd/b3.png
index d124f15ebae627e0cf80c0382729b910e096d2b9..e8af8851bb047ac6f6256cde9e8d0d3bc0ef9155 100644 (file)
Binary files a/Textures/landuse/residential-boundary/brd/b3.png and b/Textures/landuse/residential-boundary/brd/b3.png differ

diff --git a/Textures/landuse/residential-boundary/ptc/b1_p1.png b/Textures/landuse/residential-boundary/ptc/b1_p1.png
index ab39df6be9f77fc26d52f80d145e3d639d91e3e2..e54040b192cea1bdc9e9bec7bea7d751557e231c 100644 (file)
Binary files a/Textures/landuse/residential-boundary/ptc/b1_p1.png and b/Textures/landuse/residential-boundary/ptc/b1_p1.png differ

diff --git a/Textures/landuse/residential-boundary/ptc/b1_p2.png b/Textures/landuse/residential-boundary/ptc/b1_p2.png
index 3fe6dd9dc8040b00649cbd8ba0c8d3fd513aa56b..cdc40babd29806021dc4a822b4b7a1856adca0ac 100644 (file)
Binary files a/Textures/landuse/residential-boundary/ptc/b1_p2.png and b/Textures/landuse/residential-boundary/ptc/b1_p2.png differ

diff --git a/Textures/landuse/residential-boundary/ptc/b2_p1.png b/Textures/landuse/residential-boundary/ptc/b2_p1.png
index ee8e1149a1276371dcbef379fd13488fa7939236..bb1e7692ea74356705c74876f058adf70eb800ff 100644 (file)
Binary files a/Textures/landuse/residential-boundary/ptc/b2_p1.png and b/Textures/landuse/residential-boundary/ptc/b2_p1.png differ

diff --git a/Textures/landuse/residential-boundary/ptc/b2_p2.png b/Textures/landuse/residential-boundary/ptc/b2_p2.png
index 7a90ce54095e7dc5df5e5e4aafebcf21c5022d92..e8f8fa7ee4c093f799b73f4a6316302ace79e9aa 100644 (file)
Binary files a/Textures/landuse/residential-boundary/ptc/b2_p2.png and b/Textures/landuse/residential-boundary/ptc/b2_p2.png differ

diff --git a/Textures/landuse/residential-boundary/ptc/b3_p1.png b/Textures/landuse/residential-boundary/ptc/b3_p1.png
index 568affdff94fff54ed4d25f3f9623038181c19ca..aeb528bf5716128a552932f7bbebc1ec7a89d2e3 100644 (file)
Binary files a/Textures/landuse/residential-boundary/ptc/b3_p1.png and b/Textures/landuse/residential-boundary/ptc/b3_p1.png differ

diff --git a/Textures/landuse/residential-boundary/ptc/b3_p2.png b/Textures/landuse/residential-boundary/ptc/b3_p2.png
index 42a60c339e019424e872544cb4d6eb80e3e10506..b1b96afffc37ecf119417cd224d769a4c3041bb3 100644 (file)
Binary files a/Textures/landuse/residential-boundary/ptc/b3_p2.png and b/Textures/landuse/residential-boundary/ptc/b3_p2.png differ

diff --git a/defines.py b/defines.py
index 0421b4393e8b4d1ed4db4a77bf146ce315278663..531494ddad94ad640cb1d7b04c2d86c01c1ca0f1 100644 (file)
--- a/defines.py
+++ b/defines.py
@@ -97,10 +97,10 @@ mstr_ortho_layers = [
     ("leisure", "pitch", "leisure", "green"),
     ("landuse", "farmland", "landuse", "farmland"),
     ("landuse", "farmyard", "landuse", "farmland"),
+    ("landuse", "military", "landuse", "residential-boundary"),
     # Z-Order 2
-    ("landuse", "forest", "landuse", "forest"),
     ("leisure", "nature_reserve", "landuse", "forest"),
-    ("landuse", "military", "landuse", "residential-boundary"),
+    ("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),

diff --git a/layergen.py b/layergen.py
index bc0ded04b8f6da031f76206bdf1b3e0be77dea51..074a3f6ed7a6569f876f276eaab24f2b893c95da 100644 (file)
--- a/layergen.py
+++ b/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":