Text-based tile info now split into single files for performance reasons. This seems to have fixed image generation issue. Updated a landuse:meadow texture. Public release imminent.

layergen.py

@@ -63,7 +63,7 @@ class mstr_layergen:
 
     # Tile info object
     def open_tile_info(self):
-        self._tileinfo = mstr_tileinfo(self._latitude, self._longitude, self._latlngfld)
+        self._tileinfo = mstr_tileinfo(self._latitude, self._longitude, self._lat_number, self._lng_number, self._latlngfld)
 
     # This generates a "border" image, for example farmland usually has a small space of grass
     # before the actual crop of farm field itself. This generates this "border" layer,
@@ -123,7 +123,6 @@ class mstr_layergen:
         mstr_msg("layergen", "Layer to be generated: " + str(self._latitude) + "-" + str(self._lat_number) + ":" + str(self._longitude) + "-" + str(self._lng_number) + " -- tag: " + self._tag + " - value: " + self._value )
 
         # Before we generate the layer, let's check for airports in this chunk
-        """
         mstr_msg("layergen", "Checking for airport/s with ICAO code")
         osmxml = mstr_osmxml(0,0)
         icao = osmxml.find_icao_codes(mstr_datafolder + "_cache/tile.xml")
@@ -132,14 +131,13 @@ class mstr_layergen:
         rw_surface = ""
         # If we find an airport, make a note ...
         if len(icao) >= 1:
-            for i in icao:
+            #for i in icao:
                 # ... but only, if this airport is not already noted
-                iccheck = self._tiledb.perform_query("SELECT * FROM airports WHERE icao='" + i +"';")
-                if len(iccheck) == 0:
-                    self._tiledb.insert_icao(i, self._lat_number, self._lng_number, self._latitude, self._longitude)
-                    mstr_msg("layergen", "Airport/s noted in data file")
+                #iccheck = self._tiledb.perform_query("SELECT * FROM airports WHERE icao='" + i +"';")
+                #if len(iccheck) == 0:
+                    #self._tiledb.insert_icao(i, self._lat_number, self._lng_number, self._latitude, self._longitude)
+                #    mstr_msg("layergen", "Airport/s noted in data file")
             rw_surface = osmxml.find_runway_surface(mstr_datafolder + "_cache/tile.xml")
-        """
 
         # The image for the layer itself
         layer = Image.new("RGBA", (self._imgsize, self._imgsize))
@@ -404,7 +402,7 @@ class mstr_layergen:
 
             # Here we need to do some magic to make some features look more natural
             if (self._tag == "landuse" and self._value == "meadow") or (self._tag == "natural" and self._value == "grassland") or (self._tag == "natural" and self._value == "heath"):
-                amt = randrange(1,5)
+                amt = randrange(1,16)
                 for i in range(1, amt+1):
                     ptc = randrange(1, 14)
                     img = Image.open(mstr_datafolder + "textures/tile/completion/p" + str(ptc)+".png")