RC2 Release - amended stream rendering, corrected street line adding, check for existence of ZL16 tiles so that work can continue at a later stage

layergen.py

@@ -293,6 +293,12 @@ class mstr_layergen:
                     osm_edge = osm_edge.filter(ImageFilter.BoxBlur(radius=2))
                     layer_border = self.genborder(osm_edge, "landuse", "meadow")
                     layer_comp.alpha_composite(layer_border)
+            # Give streams a more natural look
+            if self._tag == "waterway" and (self._value == "stream" or self._value == "river"):
+                osm_edge = osm_edge.filter(ImageFilter.ModeFilter(size=15))
+                osm_edge = osm_edge.filter(ImageFilter.BoxBlur(radius=2))
+                layer_border = self.genborder(osm_edge, "natural", "wetland")
+                layer_comp.alpha_composite(layer_border)
 
 
             # Store layer
@@ -502,7 +508,7 @@ class mstr_layergen:
                     mstr_msg("mstr_layergen", "Shadow layer completed")
             
             # Highways and runways of any kind get some special treatment
-            if (self._tag == "highway" and self._value == "motorway") or (self._tag == "highway" and self._value == "unclassified") or (self._tag == "aeroway" and self._value == "runway"):
+            if (self._tag == "highway" and self._value == "motorway") or (self._tag == "highway" and self._value == "primary") or (self._tag == "highway" and self._value == "secondary") or (self._tag == "highway" and self._value == "tertiary") or (self._tag == "aeroway" and self._value == "runway"):
                 # We will now add some white lines for coolness
                 mask_pix = osm_edge.load()
                 layer_comp_pix = layer_comp.load()

tiledb.py

@@ -53,7 +53,7 @@ class mstr_tiledb:
 
     # Insert an airport with ICAO code
     def insert_icao(self, icao, tv, th, lat, lng):
-        self._conn.execute("INSERT INTO airports VALUES ('"+icao+"', "+tv+", "+th+", "+lat+", "+lng+");")
+        self._conn.execute("INSERT INTO airports VALUES ('"+icao+"', "+str(tv)+", "+str(th)+", "+str(lat)+", "+str(lng)+");")
 
 
     # Commit a query or a number of queries

tilegen.py

@@ -67,6 +67,11 @@ class mstr_tilegen:
         # OK... so. Let's finish this.
         for lt in range(1, steps_lat):
             for ln in range(1, steps_lng):
+                # Check if we need to do something
+                if os.path.isfile(mstr_datafolder + "Tiles\\" + str(self._lat) + "_" + str(self._lng) + "\\Textures\\" + str(self._lat) + "-" + str(ln) + "_" + str(self._lng) + "-" + str(lt) + "_OG16.jpg") == False:
+
+                    mstr_msg("mstr_tilegen", "Generating missing zoom level 16 ortho " + str(self._lat) + "-" + str(ln) + "_" + str(self._lng) + "-" + str(lt) + "_OG16.jpg")
+
                     # Find out which tiles to process
                     tiles = findZL16tiles(cur_lat, cur_lng)
 
@@ -104,7 +109,6 @@ NO_ALPHA"""
                         textfile.write(ter_content)
                     mstr_msg("mstr_tilegen", "Wrote .ter file")
 
-
                 # Adjust
                 a_lng = a_lng + (mstr_zl_16 * 4)
                 cur_lng = cur_lng + 4