From: Marcus Str Date: Fri, 27 Sep 2024 09:54:32 +0000 (+0200) Subject: Text-based tile info now split into single files for performance reasons. This seems... X-Git-Url: https://marstr.online/code/gitweb.cgi?a=commitdiff_plain;h=1fba4590c30eb72410989b29a3316f2ef604da2e;p=orthographic 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. --- diff --git a/layergen.py b/layergen.py index dd59d2c..b47d29d 100644 --- a/layergen.py +++ b/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") diff --git a/textures/amenities/parking/brd/b1.png b/textures/amenities/parking/brd/b1.png new file mode 100644 index 0000000..e9b3ec6 Binary files /dev/null and b/textures/amenities/parking/brd/b1.png differ diff --git a/textures/amenities/parking/ptc/b1_p1.png b/textures/amenities/parking/ptc/b1_p1.png new file mode 100644 index 0000000..c8b87c6 Binary files /dev/null and b/textures/amenities/parking/ptc/b1_p1.png differ diff --git a/textures/building/area/p1.png b/textures/building/area/p1.png new file mode 100644 index 0000000..6f63830 Binary files /dev/null and b/textures/building/area/p1.png differ diff --git a/textures/building/area/p10.png b/textures/building/area/p10.png new file mode 100644 index 0000000..c1c43be Binary files /dev/null and b/textures/building/area/p10.png differ diff --git a/textures/building/area/p2.png b/textures/building/area/p2.png new file mode 100644 index 0000000..dcb68ec Binary files /dev/null and b/textures/building/area/p2.png differ diff --git a/textures/building/area/p3.png b/textures/building/area/p3.png new file mode 100644 index 0000000..a2bd69f Binary files /dev/null and b/textures/building/area/p3.png differ diff --git a/textures/building/area/p4.png b/textures/building/area/p4.png new file mode 100644 index 0000000..91e6ede Binary files /dev/null and b/textures/building/area/p4.png differ diff --git a/textures/building/area/p5.png b/textures/building/area/p5.png new file mode 100644 index 0000000..ab98392 Binary files /dev/null and b/textures/building/area/p5.png differ diff --git a/textures/building/area/p6.png b/textures/building/area/p6.png new file mode 100644 index 0000000..8187a4c Binary files /dev/null and b/textures/building/area/p6.png differ diff --git a/textures/building/area/p7.png b/textures/building/area/p7.png new file mode 100644 index 0000000..0610966 Binary files /dev/null and b/textures/building/area/p7.png differ diff --git a/textures/building/area/p8.png b/textures/building/area/p8.png new file mode 100644 index 0000000..d3e7fd0 Binary files /dev/null and b/textures/building/area/p8.png differ diff --git a/textures/building/area/p9.png b/textures/building/area/p9.png new file mode 100644 index 0000000..f64b45a Binary files /dev/null and b/textures/building/area/p9.png differ diff --git a/textures/landuse/farmland/brd/b1.png b/textures/landuse/farmland/brd/b1.png new file mode 100644 index 0000000..b072cfe Binary files /dev/null and b/textures/landuse/farmland/brd/b1.png differ diff --git a/textures/landuse/farmland/brd/b10.png b/textures/landuse/farmland/brd/b10.png new file mode 100644 index 0000000..1235fd6 Binary files /dev/null and b/textures/landuse/farmland/brd/b10.png differ diff --git a/textures/landuse/farmland/brd/b11.png b/textures/landuse/farmland/brd/b11.png new file mode 100644 index 0000000..4b8976e Binary files /dev/null and b/textures/landuse/farmland/brd/b11.png differ diff --git a/textures/landuse/farmland/brd/b12.png b/textures/landuse/farmland/brd/b12.png new file mode 100644 index 0000000..c6b614d Binary files /dev/null and b/textures/landuse/farmland/brd/b12.png differ diff --git a/textures/landuse/farmland/brd/b13.png b/textures/landuse/farmland/brd/b13.png new file mode 100644 index 0000000..9453121 Binary files /dev/null and b/textures/landuse/farmland/brd/b13.png differ diff --git a/textures/landuse/farmland/brd/b14.png b/textures/landuse/farmland/brd/b14.png new file mode 100644 index 0000000..22f54a2 Binary files /dev/null and b/textures/landuse/farmland/brd/b14.png differ diff --git a/textures/landuse/farmland/brd/b15.png b/textures/landuse/farmland/brd/b15.png new file mode 100644 index 0000000..ad0dfe3 Binary files /dev/null and b/textures/landuse/farmland/brd/b15.png differ diff --git a/textures/landuse/farmland/brd/b16.png b/textures/landuse/farmland/brd/b16.png new file mode 100644 index 0000000..3797c77 Binary files /dev/null and b/textures/landuse/farmland/brd/b16.png differ diff --git a/textures/landuse/farmland/brd/b2.png b/textures/landuse/farmland/brd/b2.png new file mode 100644 index 0000000..79f99d6 Binary files /dev/null and b/textures/landuse/farmland/brd/b2.png differ diff --git a/textures/landuse/farmland/brd/b3.png b/textures/landuse/farmland/brd/b3.png new file mode 100644 index 0000000..d051b5f Binary files /dev/null and b/textures/landuse/farmland/brd/b3.png differ diff --git a/textures/landuse/farmland/brd/b4.png b/textures/landuse/farmland/brd/b4.png new file mode 100644 index 0000000..84641f8 Binary files /dev/null and b/textures/landuse/farmland/brd/b4.png differ diff --git a/textures/landuse/farmland/brd/b5.png b/textures/landuse/farmland/brd/b5.png new file mode 100644 index 0000000..67f40b8 Binary files /dev/null and b/textures/landuse/farmland/brd/b5.png differ diff --git a/textures/landuse/farmland/brd/b6.png b/textures/landuse/farmland/brd/b6.png new file mode 100644 index 0000000..e14bf49 Binary files /dev/null and b/textures/landuse/farmland/brd/b6.png differ diff --git a/textures/landuse/farmland/brd/b7.png b/textures/landuse/farmland/brd/b7.png new file mode 100644 index 0000000..59190a8 Binary files /dev/null and b/textures/landuse/farmland/brd/b7.png differ diff --git a/textures/landuse/farmland/brd/b8.png b/textures/landuse/farmland/brd/b8.png new file mode 100644 index 0000000..e7e12e0 Binary files /dev/null and b/textures/landuse/farmland/brd/b8.png differ diff --git a/textures/landuse/farmland/brd/b9.png b/textures/landuse/farmland/brd/b9.png new file mode 100644 index 0000000..bd9d0d6 Binary files /dev/null and b/textures/landuse/farmland/brd/b9.png differ diff --git a/textures/landuse/farmland/ptc/b10_p1.png b/textures/landuse/farmland/ptc/b10_p1.png new file mode 100644 index 0000000..c6f319d Binary files /dev/null and b/textures/landuse/farmland/ptc/b10_p1.png differ diff --git a/textures/landuse/farmland/ptc/b10_p2.png b/textures/landuse/farmland/ptc/b10_p2.png new file mode 100644 index 0000000..c9d1887 Binary files /dev/null and b/textures/landuse/farmland/ptc/b10_p2.png differ diff --git a/textures/landuse/farmland/ptc/b11_p1.png b/textures/landuse/farmland/ptc/b11_p1.png new file mode 100644 index 0000000..7a1a0bc Binary files /dev/null and b/textures/landuse/farmland/ptc/b11_p1.png differ diff --git a/textures/landuse/farmland/ptc/b11_p2.png b/textures/landuse/farmland/ptc/b11_p2.png new file mode 100644 index 0000000..877d867 Binary files /dev/null and b/textures/landuse/farmland/ptc/b11_p2.png differ diff --git a/textures/landuse/farmland/ptc/b12_p1.png b/textures/landuse/farmland/ptc/b12_p1.png new file mode 100644 index 0000000..1ea0426 Binary files /dev/null and b/textures/landuse/farmland/ptc/b12_p1.png differ diff --git a/textures/landuse/farmland/ptc/b12_p2.png b/textures/landuse/farmland/ptc/b12_p2.png new file mode 100644 index 0000000..a64a255 Binary files /dev/null and b/textures/landuse/farmland/ptc/b12_p2.png differ diff --git a/textures/landuse/farmland/ptc/b13_p1.png b/textures/landuse/farmland/ptc/b13_p1.png new file mode 100644 index 0000000..8729da2 Binary files /dev/null and b/textures/landuse/farmland/ptc/b13_p1.png differ diff --git a/textures/landuse/farmland/ptc/b13_p2.png b/textures/landuse/farmland/ptc/b13_p2.png new file mode 100644 index 0000000..49668c7 Binary files /dev/null and b/textures/landuse/farmland/ptc/b13_p2.png differ diff --git a/textures/landuse/farmland/ptc/b14_p1.png b/textures/landuse/farmland/ptc/b14_p1.png new file mode 100644 index 0000000..a6e348e Binary files /dev/null and b/textures/landuse/farmland/ptc/b14_p1.png differ diff --git a/textures/landuse/farmland/ptc/b14_p2.png b/textures/landuse/farmland/ptc/b14_p2.png new file mode 100644 index 0000000..ab5f07a Binary files /dev/null and b/textures/landuse/farmland/ptc/b14_p2.png differ diff --git a/textures/landuse/farmland/ptc/b15_p1.png b/textures/landuse/farmland/ptc/b15_p1.png new file mode 100644 index 0000000..afac470 Binary files /dev/null and b/textures/landuse/farmland/ptc/b15_p1.png differ diff --git a/textures/landuse/farmland/ptc/b15_p2.png b/textures/landuse/farmland/ptc/b15_p2.png new file mode 100644 index 0000000..cf842af Binary files /dev/null and b/textures/landuse/farmland/ptc/b15_p2.png differ diff --git a/textures/landuse/farmland/ptc/b16_p1.png b/textures/landuse/farmland/ptc/b16_p1.png new file mode 100644 index 0000000..845cdb7 Binary files /dev/null and b/textures/landuse/farmland/ptc/b16_p1.png differ diff --git a/textures/landuse/farmland/ptc/b16_p2.png b/textures/landuse/farmland/ptc/b16_p2.png new file mode 100644 index 0000000..c794d17 Binary files /dev/null and b/textures/landuse/farmland/ptc/b16_p2.png differ diff --git a/textures/landuse/farmland/ptc/b1_p1.png b/textures/landuse/farmland/ptc/b1_p1.png new file mode 100644 index 0000000..cf11ed1 Binary files /dev/null and b/textures/landuse/farmland/ptc/b1_p1.png differ diff --git a/textures/landuse/farmland/ptc/b1_p2.png b/textures/landuse/farmland/ptc/b1_p2.png new file mode 100644 index 0000000..541df3e Binary files /dev/null and b/textures/landuse/farmland/ptc/b1_p2.png differ diff --git a/textures/landuse/farmland/ptc/b2_p1.png b/textures/landuse/farmland/ptc/b2_p1.png new file mode 100644 index 0000000..529992c Binary files /dev/null and b/textures/landuse/farmland/ptc/b2_p1.png differ diff --git a/textures/landuse/farmland/ptc/b2_p2.png b/textures/landuse/farmland/ptc/b2_p2.png new file mode 100644 index 0000000..d00aa33 Binary files /dev/null and b/textures/landuse/farmland/ptc/b2_p2.png differ diff --git a/textures/landuse/farmland/ptc/b3_p1.png b/textures/landuse/farmland/ptc/b3_p1.png new file mode 100644 index 0000000..d65c611 Binary files /dev/null and b/textures/landuse/farmland/ptc/b3_p1.png differ diff --git a/textures/landuse/farmland/ptc/b3_p2.png b/textures/landuse/farmland/ptc/b3_p2.png new file mode 100644 index 0000000..9bcb2b0 Binary files /dev/null and b/textures/landuse/farmland/ptc/b3_p2.png differ diff --git a/textures/landuse/farmland/ptc/b4_p1.png b/textures/landuse/farmland/ptc/b4_p1.png new file mode 100644 index 0000000..d5e4723 Binary files /dev/null and b/textures/landuse/farmland/ptc/b4_p1.png differ diff --git a/textures/landuse/farmland/ptc/b4_p2.png b/textures/landuse/farmland/ptc/b4_p2.png new file mode 100644 index 0000000..77efb75 Binary files /dev/null and b/textures/landuse/farmland/ptc/b4_p2.png differ diff --git a/textures/landuse/farmland/ptc/b5_p1.png b/textures/landuse/farmland/ptc/b5_p1.png new file mode 100644 index 0000000..186ea3a Binary files /dev/null and b/textures/landuse/farmland/ptc/b5_p1.png differ diff --git a/textures/landuse/farmland/ptc/b5_p2.png b/textures/landuse/farmland/ptc/b5_p2.png new file mode 100644 index 0000000..4fd665b Binary files /dev/null and b/textures/landuse/farmland/ptc/b5_p2.png differ diff --git a/textures/landuse/farmland/ptc/b6_p1.png b/textures/landuse/farmland/ptc/b6_p1.png new file mode 100644 index 0000000..f36c7f1 Binary files /dev/null and b/textures/landuse/farmland/ptc/b6_p1.png differ diff --git a/textures/landuse/farmland/ptc/b6_p2.png b/textures/landuse/farmland/ptc/b6_p2.png new file mode 100644 index 0000000..86bf27e Binary files /dev/null and b/textures/landuse/farmland/ptc/b6_p2.png differ diff --git a/textures/landuse/farmland/ptc/b7_p1.png b/textures/landuse/farmland/ptc/b7_p1.png new file mode 100644 index 0000000..afd0c7e Binary files /dev/null and b/textures/landuse/farmland/ptc/b7_p1.png differ diff --git a/textures/landuse/farmland/ptc/b7_p2.png b/textures/landuse/farmland/ptc/b7_p2.png new file mode 100644 index 0000000..a1906b0 Binary files /dev/null and b/textures/landuse/farmland/ptc/b7_p2.png differ diff --git a/textures/landuse/farmland/ptc/b8_p1.png b/textures/landuse/farmland/ptc/b8_p1.png new file mode 100644 index 0000000..bc7152b Binary files /dev/null and b/textures/landuse/farmland/ptc/b8_p1.png differ diff --git a/textures/landuse/farmland/ptc/b8_p2.png b/textures/landuse/farmland/ptc/b8_p2.png new file mode 100644 index 0000000..a6882b6 Binary files /dev/null and b/textures/landuse/farmland/ptc/b8_p2.png differ diff --git a/textures/landuse/farmland/ptc/b9_p1.png b/textures/landuse/farmland/ptc/b9_p1.png new file mode 100644 index 0000000..2739d88 Binary files /dev/null and b/textures/landuse/farmland/ptc/b9_p1.png differ diff --git a/textures/landuse/farmland/ptc/b9_p2.png b/textures/landuse/farmland/ptc/b9_p2.png new file mode 100644 index 0000000..cfad265 Binary files /dev/null and b/textures/landuse/farmland/ptc/b9_p2.png differ diff --git a/textures/landuse/forest/_backup/p1.png b/textures/landuse/forest/_backup/p1.png new file mode 100644 index 0000000..9d38c8a Binary files /dev/null and b/textures/landuse/forest/_backup/p1.png differ diff --git a/textures/landuse/forest/_backup/p10.png b/textures/landuse/forest/_backup/p10.png new file mode 100644 index 0000000..5f1b7f1 Binary files /dev/null and b/textures/landuse/forest/_backup/p10.png differ diff --git a/textures/landuse/forest/_backup/p11.png b/textures/landuse/forest/_backup/p11.png new file mode 100644 index 0000000..eb7c69e Binary files /dev/null and b/textures/landuse/forest/_backup/p11.png differ diff --git a/textures/landuse/forest/_backup/p12.png b/textures/landuse/forest/_backup/p12.png new file mode 100644 index 0000000..3a5f488 Binary files /dev/null and b/textures/landuse/forest/_backup/p12.png differ diff --git a/textures/landuse/forest/_backup/p13.png b/textures/landuse/forest/_backup/p13.png new file mode 100644 index 0000000..d2a9ab7 Binary files /dev/null and b/textures/landuse/forest/_backup/p13.png differ diff --git a/textures/landuse/forest/_backup/p14.png b/textures/landuse/forest/_backup/p14.png new file mode 100644 index 0000000..ad5f56e Binary files /dev/null and b/textures/landuse/forest/_backup/p14.png differ diff --git a/textures/landuse/forest/_backup/p15.png b/textures/landuse/forest/_backup/p15.png new file mode 100644 index 0000000..47bf6c0 Binary files /dev/null and b/textures/landuse/forest/_backup/p15.png differ diff --git a/textures/landuse/forest/_backup/p16.png b/textures/landuse/forest/_backup/p16.png new file mode 100644 index 0000000..afccbbf Binary files /dev/null and b/textures/landuse/forest/_backup/p16.png differ diff --git a/textures/landuse/forest/_backup/p17.png b/textures/landuse/forest/_backup/p17.png new file mode 100644 index 0000000..579210f Binary files /dev/null and b/textures/landuse/forest/_backup/p17.png differ diff --git a/textures/landuse/forest/_backup/p18.png b/textures/landuse/forest/_backup/p18.png new file mode 100644 index 0000000..08282d2 Binary files /dev/null and b/textures/landuse/forest/_backup/p18.png differ diff --git a/textures/landuse/forest/_backup/p19.png b/textures/landuse/forest/_backup/p19.png new file mode 100644 index 0000000..c63ee01 Binary files /dev/null and b/textures/landuse/forest/_backup/p19.png differ diff --git a/textures/landuse/forest/_backup/p2.png b/textures/landuse/forest/_backup/p2.png new file mode 100644 index 0000000..eecf41e Binary files /dev/null and b/textures/landuse/forest/_backup/p2.png differ diff --git a/textures/landuse/forest/_backup/p20.png b/textures/landuse/forest/_backup/p20.png new file mode 100644 index 0000000..aa0c221 Binary files /dev/null and b/textures/landuse/forest/_backup/p20.png differ diff --git a/textures/landuse/forest/_backup/p3.png b/textures/landuse/forest/_backup/p3.png new file mode 100644 index 0000000..abe9965 Binary files /dev/null and b/textures/landuse/forest/_backup/p3.png differ diff --git a/textures/landuse/forest/_backup/p4.png b/textures/landuse/forest/_backup/p4.png new file mode 100644 index 0000000..ba3ddae Binary files /dev/null and b/textures/landuse/forest/_backup/p4.png differ diff --git a/textures/landuse/forest/_backup/p5.png b/textures/landuse/forest/_backup/p5.png new file mode 100644 index 0000000..58e1a89 Binary files /dev/null and b/textures/landuse/forest/_backup/p5.png differ diff --git a/textures/landuse/forest/_backup/p6.png b/textures/landuse/forest/_backup/p6.png new file mode 100644 index 0000000..d5c48a6 Binary files /dev/null and b/textures/landuse/forest/_backup/p6.png differ diff --git a/textures/landuse/forest/_backup/p7.png b/textures/landuse/forest/_backup/p7.png new file mode 100644 index 0000000..989c96e Binary files /dev/null and b/textures/landuse/forest/_backup/p7.png differ diff --git a/textures/landuse/forest/_backup/p8.png b/textures/landuse/forest/_backup/p8.png new file mode 100644 index 0000000..69e624a Binary files /dev/null and b/textures/landuse/forest/_backup/p8.png differ diff --git a/textures/landuse/forest/_backup/p9.png b/textures/landuse/forest/_backup/p9.png new file mode 100644 index 0000000..e85f860 Binary files /dev/null and b/textures/landuse/forest/_backup/p9.png differ diff --git a/textures/landuse/forest/brd/b1.png b/textures/landuse/forest/brd/b1.png new file mode 100644 index 0000000..67e60fe Binary files /dev/null and b/textures/landuse/forest/brd/b1.png differ diff --git a/textures/landuse/forest/brd/b10.png b/textures/landuse/forest/brd/b10.png new file mode 100644 index 0000000..7bd3df3 Binary files /dev/null and b/textures/landuse/forest/brd/b10.png differ diff --git a/textures/landuse/forest/brd/b11.png b/textures/landuse/forest/brd/b11.png new file mode 100644 index 0000000..8472950 Binary files /dev/null and b/textures/landuse/forest/brd/b11.png differ diff --git a/textures/landuse/forest/brd/b12.png b/textures/landuse/forest/brd/b12.png new file mode 100644 index 0000000..f605106 Binary files /dev/null and b/textures/landuse/forest/brd/b12.png differ diff --git a/textures/landuse/forest/brd/b13.png b/textures/landuse/forest/brd/b13.png new file mode 100644 index 0000000..da8a1f5 Binary files /dev/null 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 new file mode 100644 index 0000000..301459d Binary files /dev/null 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 new file mode 100644 index 0000000..eafa74d Binary files /dev/null and b/textures/landuse/forest/brd/b15.png differ diff --git a/textures/landuse/forest/brd/b2.png b/textures/landuse/forest/brd/b2.png new file mode 100644 index 0000000..fa50e2e Binary files /dev/null and b/textures/landuse/forest/brd/b2.png differ diff --git a/textures/landuse/forest/brd/b3.png b/textures/landuse/forest/brd/b3.png new file mode 100644 index 0000000..59cf2fa Binary files /dev/null and b/textures/landuse/forest/brd/b3.png differ diff --git a/textures/landuse/forest/brd/b4.png b/textures/landuse/forest/brd/b4.png new file mode 100644 index 0000000..051b3e9 Binary files /dev/null and b/textures/landuse/forest/brd/b4.png differ diff --git a/textures/landuse/forest/brd/b5.png b/textures/landuse/forest/brd/b5.png new file mode 100644 index 0000000..6dff1d2 Binary files /dev/null and b/textures/landuse/forest/brd/b5.png differ diff --git a/textures/landuse/forest/brd/b6.png b/textures/landuse/forest/brd/b6.png new file mode 100644 index 0000000..75f685c Binary files /dev/null and b/textures/landuse/forest/brd/b6.png differ diff --git a/textures/landuse/forest/brd/b7.png b/textures/landuse/forest/brd/b7.png new file mode 100644 index 0000000..6218426 Binary files /dev/null and b/textures/landuse/forest/brd/b7.png differ diff --git a/textures/landuse/forest/brd/b8.png b/textures/landuse/forest/brd/b8.png new file mode 100644 index 0000000..073d5f2 Binary files /dev/null and b/textures/landuse/forest/brd/b8.png differ diff --git a/textures/landuse/forest/brd/b9.png b/textures/landuse/forest/brd/b9.png new file mode 100644 index 0000000..b7b955d Binary files /dev/null and b/textures/landuse/forest/brd/b9.png differ diff --git a/textures/landuse/forest/ptc/b10_p1.png b/textures/landuse/forest/ptc/b10_p1.png new file mode 100644 index 0000000..26b15f5 Binary files /dev/null and b/textures/landuse/forest/ptc/b10_p1.png differ diff --git a/textures/landuse/forest/ptc/b11_p1.png b/textures/landuse/forest/ptc/b11_p1.png new file mode 100644 index 0000000..c8e9251 Binary files /dev/null and b/textures/landuse/forest/ptc/b11_p1.png differ diff --git a/textures/landuse/forest/ptc/b12_p1.png b/textures/landuse/forest/ptc/b12_p1.png new file mode 100644 index 0000000..1da0768 Binary files /dev/null and b/textures/landuse/forest/ptc/b12_p1.png differ diff --git a/textures/landuse/forest/ptc/b13_p1.png b/textures/landuse/forest/ptc/b13_p1.png new file mode 100644 index 0000000..55d2faa Binary files /dev/null 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 new file mode 100644 index 0000000..f944e11 Binary files /dev/null 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 new file mode 100644 index 0000000..cbea942 Binary files /dev/null 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 new file mode 100644 index 0000000..0cce264 Binary files /dev/null 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 new file mode 100644 index 0000000..6c949e8 Binary files /dev/null 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 new file mode 100644 index 0000000..dddbedb Binary files /dev/null and b/textures/landuse/forest/ptc/b15_p2.png differ diff --git a/textures/landuse/forest/ptc/b1_p1.png b/textures/landuse/forest/ptc/b1_p1.png new file mode 100644 index 0000000..fefe94c Binary files /dev/null and b/textures/landuse/forest/ptc/b1_p1.png differ diff --git a/textures/landuse/forest/ptc/b2_p1.png b/textures/landuse/forest/ptc/b2_p1.png new file mode 100644 index 0000000..5e0e492 Binary files /dev/null and b/textures/landuse/forest/ptc/b2_p1.png differ diff --git a/textures/landuse/forest/ptc/b3_p1.png b/textures/landuse/forest/ptc/b3_p1.png new file mode 100644 index 0000000..5d0eff2 Binary files /dev/null and b/textures/landuse/forest/ptc/b3_p1.png differ diff --git a/textures/landuse/forest/ptc/b4_p1.png b/textures/landuse/forest/ptc/b4_p1.png new file mode 100644 index 0000000..062f5c9 Binary files /dev/null and b/textures/landuse/forest/ptc/b4_p1.png differ diff --git a/textures/landuse/forest/ptc/b5_p1.png b/textures/landuse/forest/ptc/b5_p1.png new file mode 100644 index 0000000..dfe70a6 Binary files /dev/null and b/textures/landuse/forest/ptc/b5_p1.png differ diff --git a/textures/landuse/forest/ptc/b6_p1.png b/textures/landuse/forest/ptc/b6_p1.png new file mode 100644 index 0000000..dd0a4bb Binary files /dev/null and b/textures/landuse/forest/ptc/b6_p1.png differ diff --git a/textures/landuse/forest/ptc/b7_p1.png b/textures/landuse/forest/ptc/b7_p1.png new file mode 100644 index 0000000..51fa5cc Binary files /dev/null and b/textures/landuse/forest/ptc/b7_p1.png differ diff --git a/textures/landuse/forest/ptc/b8_p1.png b/textures/landuse/forest/ptc/b8_p1.png new file mode 100644 index 0000000..e0b9ef6 Binary files /dev/null and b/textures/landuse/forest/ptc/b8_p1.png differ diff --git a/textures/landuse/forest/ptc/b9_p1.png b/textures/landuse/forest/ptc/b9_p1.png new file mode 100644 index 0000000..a1f9e31 Binary files /dev/null and b/textures/landuse/forest/ptc/b9_p1.png differ diff --git a/textures/landuse/grass/brd/b1.png b/textures/landuse/grass/brd/b1.png new file mode 100644 index 0000000..e140282 Binary files /dev/null and b/textures/landuse/grass/brd/b1.png differ diff --git a/textures/landuse/grass/brd/b2.png b/textures/landuse/grass/brd/b2.png new file mode 100644 index 0000000..3358762 Binary files /dev/null and b/textures/landuse/grass/brd/b2.png differ diff --git a/textures/landuse/grass/brd/b3.png b/textures/landuse/grass/brd/b3.png new file mode 100644 index 0000000..a3254af Binary files /dev/null and b/textures/landuse/grass/brd/b3.png differ diff --git a/textures/landuse/grass/brd/b4.png b/textures/landuse/grass/brd/b4.png new file mode 100644 index 0000000..82d5839 Binary files /dev/null and b/textures/landuse/grass/brd/b4.png differ diff --git a/textures/landuse/grass/brd/b5.png b/textures/landuse/grass/brd/b5.png new file mode 100644 index 0000000..9630292 Binary files /dev/null and b/textures/landuse/grass/brd/b5.png differ diff --git a/textures/landuse/grass/ptc/b1_p1.png b/textures/landuse/grass/ptc/b1_p1.png new file mode 100644 index 0000000..d97b974 Binary files /dev/null and b/textures/landuse/grass/ptc/b1_p1.png differ diff --git a/textures/landuse/grass/ptc/b2_p1.png b/textures/landuse/grass/ptc/b2_p1.png new file mode 100644 index 0000000..a68bb51 Binary files /dev/null and b/textures/landuse/grass/ptc/b2_p1.png differ diff --git a/textures/landuse/grass/ptc/b2_p2.png b/textures/landuse/grass/ptc/b2_p2.png new file mode 100644 index 0000000..a8edf6c Binary files /dev/null and b/textures/landuse/grass/ptc/b2_p2.png differ diff --git a/textures/landuse/grass/ptc/b3_p1.png b/textures/landuse/grass/ptc/b3_p1.png new file mode 100644 index 0000000..a6c0506 Binary files /dev/null and b/textures/landuse/grass/ptc/b3_p1.png differ diff --git a/textures/landuse/grass/ptc/b3_p2.png b/textures/landuse/grass/ptc/b3_p2.png new file mode 100644 index 0000000..dc31e0f Binary files /dev/null and b/textures/landuse/grass/ptc/b3_p2.png differ diff --git a/textures/landuse/grass/ptc/b4_p1.png b/textures/landuse/grass/ptc/b4_p1.png new file mode 100644 index 0000000..4195505 Binary files /dev/null and b/textures/landuse/grass/ptc/b4_p1.png differ diff --git a/textures/landuse/grass/ptc/b4_p2.png b/textures/landuse/grass/ptc/b4_p2.png new file mode 100644 index 0000000..46e31ae Binary files /dev/null and b/textures/landuse/grass/ptc/b4_p2.png differ diff --git a/textures/landuse/grass/ptc/b5_p1.png b/textures/landuse/grass/ptc/b5_p1.png new file mode 100644 index 0000000..6349358 Binary files /dev/null and b/textures/landuse/grass/ptc/b5_p1.png differ diff --git a/textures/landuse/grass/ptc/b5_p2.png b/textures/landuse/grass/ptc/b5_p2.png new file mode 100644 index 0000000..e09374f Binary files /dev/null and b/textures/landuse/grass/ptc/b5_p2.png differ diff --git a/textures/landuse/meadow/brd/b1.png b/textures/landuse/meadow/brd/b1.png new file mode 100644 index 0000000..439abf0 Binary files /dev/null and b/textures/landuse/meadow/brd/b1.png differ diff --git a/textures/landuse/meadow/brd/b2.png b/textures/landuse/meadow/brd/b2.png new file mode 100644 index 0000000..85cc8e8 Binary files /dev/null and b/textures/landuse/meadow/brd/b2.png differ diff --git a/textures/landuse/meadow/brd/b3.png b/textures/landuse/meadow/brd/b3.png new file mode 100644 index 0000000..4cf033c Binary files /dev/null and b/textures/landuse/meadow/brd/b3.png differ diff --git a/textures/landuse/meadow/brd/b4.png b/textures/landuse/meadow/brd/b4.png new file mode 100644 index 0000000..1790836 Binary files /dev/null and b/textures/landuse/meadow/brd/b4.png differ diff --git a/textures/landuse/meadow/ptc/b1_p1.png b/textures/landuse/meadow/ptc/b1_p1.png new file mode 100644 index 0000000..46b4f89 Binary files /dev/null and b/textures/landuse/meadow/ptc/b1_p1.png differ diff --git a/textures/landuse/meadow/ptc/b1_p2.png b/textures/landuse/meadow/ptc/b1_p2.png new file mode 100644 index 0000000..32e40f3 Binary files /dev/null and b/textures/landuse/meadow/ptc/b1_p2.png differ diff --git a/textures/landuse/meadow/ptc/b2_p1.png b/textures/landuse/meadow/ptc/b2_p1.png new file mode 100644 index 0000000..566c220 Binary files /dev/null and b/textures/landuse/meadow/ptc/b2_p1.png differ diff --git a/textures/landuse/meadow/ptc/b2_p2.png b/textures/landuse/meadow/ptc/b2_p2.png new file mode 100644 index 0000000..10a211d Binary files /dev/null and b/textures/landuse/meadow/ptc/b2_p2.png differ diff --git a/textures/landuse/meadow/ptc/b3_p1.png b/textures/landuse/meadow/ptc/b3_p1.png new file mode 100644 index 0000000..4322b13 Binary files /dev/null and b/textures/landuse/meadow/ptc/b3_p1.png differ diff --git a/textures/landuse/meadow/ptc/b3_p2.png b/textures/landuse/meadow/ptc/b3_p2.png new file mode 100644 index 0000000..1cc9162 Binary files /dev/null and b/textures/landuse/meadow/ptc/b3_p2.png differ diff --git a/textures/landuse/meadow/ptc/b4_p1.png b/textures/landuse/meadow/ptc/b4_p1.png new file mode 100644 index 0000000..7a09e4e Binary files /dev/null and b/textures/landuse/meadow/ptc/b4_p1.png differ diff --git a/textures/landuse/meadow/ptc/b4_p2.png b/textures/landuse/meadow/ptc/b4_p2.png new file mode 100644 index 0000000..fff420c Binary files /dev/null and b/textures/landuse/meadow/ptc/b4_p2.png differ diff --git a/textures/landuse/residential-boundary/brd/b1.png b/textures/landuse/residential-boundary/brd/b1.png new file mode 100644 index 0000000..921b503 Binary files /dev/null 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 new file mode 100644 index 0000000..13f583a Binary files /dev/null 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 new file mode 100644 index 0000000..099ecfd Binary files /dev/null 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 new file mode 100644 index 0000000..954bdf9 Binary files /dev/null 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 new file mode 100644 index 0000000..61e1afa Binary files /dev/null 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 new file mode 100644 index 0000000..347a7ea Binary files /dev/null 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 new file mode 100644 index 0000000..ec82ffa Binary files /dev/null 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 new file mode 100644 index 0000000..86d472c Binary files /dev/null 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 new file mode 100644 index 0000000..c513faa Binary files /dev/null and b/textures/landuse/residential-boundary/ptc/b3_p2.png differ diff --git a/textures/leisure/golf_course/brd/b1.png b/textures/leisure/golf_course/brd/b1.png new file mode 100644 index 0000000..58027c6 Binary files /dev/null and b/textures/leisure/golf_course/brd/b1.png differ diff --git a/textures/leisure/golf_course/brd/b2.png b/textures/leisure/golf_course/brd/b2.png new file mode 100644 index 0000000..1684ef4 Binary files /dev/null and b/textures/leisure/golf_course/brd/b2.png differ diff --git a/textures/leisure/golf_course/ptc/b1_p1.png b/textures/leisure/golf_course/ptc/b1_p1.png new file mode 100644 index 0000000..0650207 Binary files /dev/null and b/textures/leisure/golf_course/ptc/b1_p1.png differ diff --git a/textures/leisure/golf_course/ptc/b1_p2.png b/textures/leisure/golf_course/ptc/b1_p2.png new file mode 100644 index 0000000..c505406 Binary files /dev/null and b/textures/leisure/golf_course/ptc/b1_p2.png differ diff --git a/textures/leisure/golf_course/ptc/b2_p1.png b/textures/leisure/golf_course/ptc/b2_p1.png new file mode 100644 index 0000000..1de018a Binary files /dev/null and b/textures/leisure/golf_course/ptc/b2_p1.png differ diff --git a/textures/leisure/golf_course/ptc/b2_p2.png b/textures/leisure/golf_course/ptc/b2_p2.png new file mode 100644 index 0000000..73086ef Binary files /dev/null and b/textures/leisure/golf_course/ptc/b2_p2.png differ diff --git a/textures/leisure/green/brd/b1.png b/textures/leisure/green/brd/b1.png new file mode 100644 index 0000000..341917d Binary files /dev/null and b/textures/leisure/green/brd/b1.png differ diff --git a/textures/leisure/green/ptc/b1_p1.png b/textures/leisure/green/ptc/b1_p1.png new file mode 100644 index 0000000..fd5b848 Binary files /dev/null and b/textures/leisure/green/ptc/b1_p1.png differ diff --git a/textures/leisure/green/ptc/b1_p2.png b/textures/leisure/green/ptc/b1_p2.png new file mode 100644 index 0000000..cc3cea7 Binary files /dev/null and b/textures/leisure/green/ptc/b1_p2.png differ diff --git a/textures/natural/bare_rock/brd/b1.png b/textures/natural/bare_rock/brd/b1.png new file mode 100644 index 0000000..a7cb6f7 Binary files /dev/null and b/textures/natural/bare_rock/brd/b1.png differ diff --git a/textures/natural/bare_rock/brd/b2.png b/textures/natural/bare_rock/brd/b2.png new file mode 100644 index 0000000..5bd2d3f Binary files /dev/null and b/textures/natural/bare_rock/brd/b2.png differ diff --git a/textures/natural/bare_rock/brd/b3.png b/textures/natural/bare_rock/brd/b3.png new file mode 100644 index 0000000..8e84d05 Binary files /dev/null and b/textures/natural/bare_rock/brd/b3.png differ diff --git a/textures/natural/bare_rock/brd/b4.png b/textures/natural/bare_rock/brd/b4.png new file mode 100644 index 0000000..3e7c7e1 Binary files /dev/null and b/textures/natural/bare_rock/brd/b4.png differ diff --git a/textures/natural/bare_rock/brd/b5.png b/textures/natural/bare_rock/brd/b5.png new file mode 100644 index 0000000..3bd8f72 Binary files /dev/null and b/textures/natural/bare_rock/brd/b5.png differ diff --git a/textures/natural/bare_rock/brd/b6.png b/textures/natural/bare_rock/brd/b6.png new file mode 100644 index 0000000..e3ee51e Binary files /dev/null and b/textures/natural/bare_rock/brd/b6.png differ diff --git a/textures/natural/bare_rock/ptc/b1_p1.png b/textures/natural/bare_rock/ptc/b1_p1.png new file mode 100644 index 0000000..f3445a6 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b1_p1.png differ diff --git a/textures/natural/bare_rock/ptc/b1_p2.png b/textures/natural/bare_rock/ptc/b1_p2.png new file mode 100644 index 0000000..44123b3 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b1_p2.png differ diff --git a/textures/natural/bare_rock/ptc/b1_p3.png b/textures/natural/bare_rock/ptc/b1_p3.png new file mode 100644 index 0000000..f5dab0a Binary files /dev/null and b/textures/natural/bare_rock/ptc/b1_p3.png differ diff --git a/textures/natural/bare_rock/ptc/b2_p1.png b/textures/natural/bare_rock/ptc/b2_p1.png new file mode 100644 index 0000000..0cfcddd Binary files /dev/null and b/textures/natural/bare_rock/ptc/b2_p1.png differ diff --git a/textures/natural/bare_rock/ptc/b2_p2.png b/textures/natural/bare_rock/ptc/b2_p2.png new file mode 100644 index 0000000..5b6aa05 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b2_p2.png differ diff --git a/textures/natural/bare_rock/ptc/b2_p3.png b/textures/natural/bare_rock/ptc/b2_p3.png new file mode 100644 index 0000000..5248f35 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b2_p3.png differ diff --git a/textures/natural/bare_rock/ptc/b3_p1.png b/textures/natural/bare_rock/ptc/b3_p1.png new file mode 100644 index 0000000..15c79d7 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b3_p1.png differ diff --git a/textures/natural/bare_rock/ptc/b3_p2.png b/textures/natural/bare_rock/ptc/b3_p2.png new file mode 100644 index 0000000..df45bec Binary files /dev/null and b/textures/natural/bare_rock/ptc/b3_p2.png differ diff --git a/textures/natural/bare_rock/ptc/b3_p3.png b/textures/natural/bare_rock/ptc/b3_p3.png new file mode 100644 index 0000000..cbb2488 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b3_p3.png differ diff --git a/textures/natural/bare_rock/ptc/b4_p1.png b/textures/natural/bare_rock/ptc/b4_p1.png new file mode 100644 index 0000000..cdf6ce2 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b4_p1.png differ diff --git a/textures/natural/bare_rock/ptc/b4_p2.png b/textures/natural/bare_rock/ptc/b4_p2.png new file mode 100644 index 0000000..12d8c27 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b4_p2.png differ diff --git a/textures/natural/bare_rock/ptc/b4_p3.png b/textures/natural/bare_rock/ptc/b4_p3.png new file mode 100644 index 0000000..96e0b44 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b4_p3.png differ diff --git a/textures/natural/bare_rock/ptc/b5_p1.png b/textures/natural/bare_rock/ptc/b5_p1.png new file mode 100644 index 0000000..dd0c6b8 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b5_p1.png differ diff --git a/textures/natural/bare_rock/ptc/b5_p2.png b/textures/natural/bare_rock/ptc/b5_p2.png new file mode 100644 index 0000000..a5a8b03 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b5_p2.png differ diff --git a/textures/natural/bare_rock/ptc/b5_p3.png b/textures/natural/bare_rock/ptc/b5_p3.png new file mode 100644 index 0000000..3e82a63 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b5_p3.png differ diff --git a/textures/natural/bare_rock/ptc/b6_p1.png b/textures/natural/bare_rock/ptc/b6_p1.png new file mode 100644 index 0000000..e2ab70a Binary files /dev/null and b/textures/natural/bare_rock/ptc/b6_p1.png differ diff --git a/textures/natural/bare_rock/ptc/b6_p2.png b/textures/natural/bare_rock/ptc/b6_p2.png new file mode 100644 index 0000000..53b67d0 Binary files /dev/null and b/textures/natural/bare_rock/ptc/b6_p2.png differ diff --git a/textures/natural/bare_rock/ptc/b6_p3.png b/textures/natural/bare_rock/ptc/b6_p3.png new file mode 100644 index 0000000..65fad6e Binary files /dev/null and b/textures/natural/bare_rock/ptc/b6_p3.png differ diff --git a/textures/natural/beach/brd/b1.png b/textures/natural/beach/brd/b1.png new file mode 100644 index 0000000..965a339 Binary files /dev/null and b/textures/natural/beach/brd/b1.png differ diff --git a/textures/natural/beach/ptc/b1_p1.png b/textures/natural/beach/ptc/b1_p1.png new file mode 100644 index 0000000..f49cc85 Binary files /dev/null and b/textures/natural/beach/ptc/b1_p1.png differ diff --git a/textures/natural/beach/ptc/b1_p2.png b/textures/natural/beach/ptc/b1_p2.png new file mode 100644 index 0000000..48098d9 Binary files /dev/null and b/textures/natural/beach/ptc/b1_p2.png differ diff --git a/textures/natural/desert/brd/b1.png b/textures/natural/desert/brd/b1.png new file mode 100644 index 0000000..d6b6de4 Binary files /dev/null and b/textures/natural/desert/brd/b1.png differ diff --git a/textures/natural/desert/ptc/b1_p1.png b/textures/natural/desert/ptc/b1_p1.png new file mode 100644 index 0000000..2864548 Binary files /dev/null and b/textures/natural/desert/ptc/b1_p1.png differ diff --git a/textures/natural/desert/ptc/b1_p2.png b/textures/natural/desert/ptc/b1_p2.png new file mode 100644 index 0000000..ea426ed Binary files /dev/null and b/textures/natural/desert/ptc/b1_p2.png differ diff --git a/textures/natural/heath/brd/b1.png b/textures/natural/heath/brd/b1.png new file mode 100644 index 0000000..8601724 Binary files /dev/null and b/textures/natural/heath/brd/b1.png differ diff --git a/textures/natural/heath/brd/b2.png b/textures/natural/heath/brd/b2.png new file mode 100644 index 0000000..ce02400 Binary files /dev/null and b/textures/natural/heath/brd/b2.png differ diff --git a/textures/natural/heath/brd/b3.png b/textures/natural/heath/brd/b3.png new file mode 100644 index 0000000..3929e84 Binary files /dev/null and b/textures/natural/heath/brd/b3.png differ diff --git a/textures/natural/heath/ptc/b1_p1.png b/textures/natural/heath/ptc/b1_p1.png new file mode 100644 index 0000000..f8f8aa1 Binary files /dev/null and b/textures/natural/heath/ptc/b1_p1.png differ diff --git a/textures/natural/heath/ptc/b1_p2.png b/textures/natural/heath/ptc/b1_p2.png new file mode 100644 index 0000000..e8f5677 Binary files /dev/null and b/textures/natural/heath/ptc/b1_p2.png differ diff --git a/textures/natural/heath/ptc/b2_p1.png b/textures/natural/heath/ptc/b2_p1.png new file mode 100644 index 0000000..1b2d7eb Binary files /dev/null and b/textures/natural/heath/ptc/b2_p1.png differ diff --git a/textures/natural/heath/ptc/b2_p2.png b/textures/natural/heath/ptc/b2_p2.png new file mode 100644 index 0000000..d973b09 Binary files /dev/null and b/textures/natural/heath/ptc/b2_p2.png differ diff --git a/textures/natural/heath/ptc/b3_p1.png b/textures/natural/heath/ptc/b3_p1.png new file mode 100644 index 0000000..bebe284 Binary files /dev/null and b/textures/natural/heath/ptc/b3_p1.png differ diff --git a/textures/natural/heath/ptc/b3_p2.png b/textures/natural/heath/ptc/b3_p2.png new file mode 100644 index 0000000..7f77d9f Binary files /dev/null and b/textures/natural/heath/ptc/b3_p2.png differ diff --git a/textures/natural/sand/brd/b1.png b/textures/natural/sand/brd/b1.png new file mode 100644 index 0000000..ea862ab Binary files /dev/null and b/textures/natural/sand/brd/b1.png differ diff --git a/textures/natural/sand/ptc/b1_p1.png b/textures/natural/sand/ptc/b1_p1.png new file mode 100644 index 0000000..764ea78 Binary files /dev/null and b/textures/natural/sand/ptc/b1_p1.png differ diff --git a/textures/natural/sand/ptc/b1_p2.png b/textures/natural/sand/ptc/b1_p2.png new file mode 100644 index 0000000..43355ab Binary files /dev/null and b/textures/natural/sand/ptc/b1_p2.png differ diff --git a/textures/natural/scree/brd/b1.png b/textures/natural/scree/brd/b1.png new file mode 100644 index 0000000..08d807e Binary files /dev/null and b/textures/natural/scree/brd/b1.png differ diff --git a/textures/natural/scree/ptc/b1_p1.png b/textures/natural/scree/ptc/b1_p1.png new file mode 100644 index 0000000..4f27f1b Binary files /dev/null and b/textures/natural/scree/ptc/b1_p1.png differ diff --git a/textures/natural/scrub/brd/b1.png b/textures/natural/scrub/brd/b1.png new file mode 100644 index 0000000..42b4d35 Binary files /dev/null and b/textures/natural/scrub/brd/b1.png differ diff --git a/textures/natural/scrub/brd/b2.png b/textures/natural/scrub/brd/b2.png new file mode 100644 index 0000000..d217c8a Binary files /dev/null and b/textures/natural/scrub/brd/b2.png differ diff --git a/textures/natural/scrub/brd/b3.png b/textures/natural/scrub/brd/b3.png new file mode 100644 index 0000000..b7da5f5 Binary files /dev/null and b/textures/natural/scrub/brd/b3.png differ diff --git a/textures/natural/scrub/brd/b4.png b/textures/natural/scrub/brd/b4.png new file mode 100644 index 0000000..5956dea Binary files /dev/null and b/textures/natural/scrub/brd/b4.png differ diff --git a/textures/natural/scrub/brd/b5.png b/textures/natural/scrub/brd/b5.png new file mode 100644 index 0000000..601db3f Binary files /dev/null and b/textures/natural/scrub/brd/b5.png differ diff --git a/textures/natural/scrub/ptc/b1_p1.png b/textures/natural/scrub/ptc/b1_p1.png new file mode 100644 index 0000000..7ca77d7 Binary files /dev/null and b/textures/natural/scrub/ptc/b1_p1.png differ diff --git a/textures/natural/scrub/ptc/b1_p2.png b/textures/natural/scrub/ptc/b1_p2.png new file mode 100644 index 0000000..9159bec Binary files /dev/null and b/textures/natural/scrub/ptc/b1_p2.png differ diff --git a/textures/natural/scrub/ptc/b2_p1.png b/textures/natural/scrub/ptc/b2_p1.png new file mode 100644 index 0000000..f927243 Binary files /dev/null and b/textures/natural/scrub/ptc/b2_p1.png differ diff --git a/textures/natural/scrub/ptc/b2_p2.png b/textures/natural/scrub/ptc/b2_p2.png new file mode 100644 index 0000000..e0e2fd4 Binary files /dev/null and b/textures/natural/scrub/ptc/b2_p2.png differ diff --git a/textures/natural/scrub/ptc/b3_p1.png b/textures/natural/scrub/ptc/b3_p1.png new file mode 100644 index 0000000..36dabf8 Binary files /dev/null and b/textures/natural/scrub/ptc/b3_p1.png differ diff --git a/textures/natural/scrub/ptc/b3_p2.png b/textures/natural/scrub/ptc/b3_p2.png new file mode 100644 index 0000000..d94f012 Binary files /dev/null and b/textures/natural/scrub/ptc/b3_p2.png differ diff --git a/textures/natural/scrub/ptc/b4_p1.png b/textures/natural/scrub/ptc/b4_p1.png new file mode 100644 index 0000000..e77c5c2 Binary files /dev/null and b/textures/natural/scrub/ptc/b4_p1.png differ diff --git a/textures/natural/scrub/ptc/b4_p2.png b/textures/natural/scrub/ptc/b4_p2.png new file mode 100644 index 0000000..1122ba0 Binary files /dev/null and b/textures/natural/scrub/ptc/b4_p2.png differ diff --git a/textures/natural/scrub/ptc/b5_p1.png b/textures/natural/scrub/ptc/b5_p1.png new file mode 100644 index 0000000..97a37d0 Binary files /dev/null and b/textures/natural/scrub/ptc/b5_p1.png differ diff --git a/textures/natural/scrub/ptc/b5_p2.png b/textures/natural/scrub/ptc/b5_p2.png new file mode 100644 index 0000000..c5aeeb8 Binary files /dev/null and b/textures/natural/scrub/ptc/b5_p2.png differ diff --git a/textures/natural/water/brd/b1.png b/textures/natural/water/brd/b1.png new file mode 100644 index 0000000..c0d4267 Binary files /dev/null and b/textures/natural/water/brd/b1.png differ diff --git a/textures/natural/water/brd/b2.png b/textures/natural/water/brd/b2.png new file mode 100644 index 0000000..acea7aa Binary files /dev/null and b/textures/natural/water/brd/b2.png differ diff --git a/textures/natural/water/brd/b3.png b/textures/natural/water/brd/b3.png new file mode 100644 index 0000000..4cf2eed Binary files /dev/null and b/textures/natural/water/brd/b3.png differ diff --git a/textures/natural/water/brd/b4.png b/textures/natural/water/brd/b4.png new file mode 100644 index 0000000..8bfd39e Binary files /dev/null and b/textures/natural/water/brd/b4.png differ diff --git a/textures/natural/water/brd/b5.png b/textures/natural/water/brd/b5.png new file mode 100644 index 0000000..e399fea Binary files /dev/null and b/textures/natural/water/brd/b5.png differ diff --git a/textures/natural/water/normal_template.png b/textures/natural/water/normal_template.png new file mode 100644 index 0000000..249134e Binary files /dev/null and b/textures/natural/water/normal_template.png differ diff --git a/textures/natural/water/ptc/b1_p1.png b/textures/natural/water/ptc/b1_p1.png new file mode 100644 index 0000000..f883c3c Binary files /dev/null and b/textures/natural/water/ptc/b1_p1.png differ diff --git a/textures/natural/water/ptc/b2_p1.png b/textures/natural/water/ptc/b2_p1.png new file mode 100644 index 0000000..196c988 Binary files /dev/null and b/textures/natural/water/ptc/b2_p1.png differ diff --git a/textures/natural/water/ptc/b2_p2.png b/textures/natural/water/ptc/b2_p2.png new file mode 100644 index 0000000..9395ee9 Binary files /dev/null and b/textures/natural/water/ptc/b2_p2.png differ diff --git a/textures/natural/water/ptc/b3_p1.png b/textures/natural/water/ptc/b3_p1.png new file mode 100644 index 0000000..26dc7c2 Binary files /dev/null and b/textures/natural/water/ptc/b3_p1.png differ diff --git a/textures/natural/water/ptc/b3_p2.png b/textures/natural/water/ptc/b3_p2.png new file mode 100644 index 0000000..c735718 Binary files /dev/null and b/textures/natural/water/ptc/b3_p2.png differ diff --git a/textures/natural/water/ptc/b4_p1.png b/textures/natural/water/ptc/b4_p1.png new file mode 100644 index 0000000..65cbe36 Binary files /dev/null and b/textures/natural/water/ptc/b4_p1.png differ diff --git a/textures/natural/water/ptc/b4_p2.png b/textures/natural/water/ptc/b4_p2.png new file mode 100644 index 0000000..cb68715 Binary files /dev/null and b/textures/natural/water/ptc/b4_p2.png differ diff --git a/textures/natural/water/ptc/b5_p1.png b/textures/natural/water/ptc/b5_p1.png new file mode 100644 index 0000000..148b8e3 Binary files /dev/null and b/textures/natural/water/ptc/b5_p1.png differ diff --git a/textures/natural/water/ptc/b5_p2.png b/textures/natural/water/ptc/b5_p2.png new file mode 100644 index 0000000..93a478a Binary files /dev/null and b/textures/natural/water/ptc/b5_p2.png differ diff --git a/textures/natural/wetland/brd/b1.png b/textures/natural/wetland/brd/b1.png new file mode 100644 index 0000000..f49e3ac Binary files /dev/null and b/textures/natural/wetland/brd/b1.png differ diff --git a/textures/natural/wetland/ptc/b1_p1.png b/textures/natural/wetland/ptc/b1_p1.png new file mode 100644 index 0000000..8b52e4c Binary files /dev/null and b/textures/natural/wetland/ptc/b1_p1.png differ diff --git a/textures/natural/wetland/ptc/b1_p2.png b/textures/natural/wetland/ptc/b1_p2.png new file mode 100644 index 0000000..a1ef145 Binary files /dev/null and b/textures/natural/wetland/ptc/b1_p2.png differ diff --git a/textures/tile/completion/p1.png b/textures/tile/completion/p1.png new file mode 100644 index 0000000..6d66ed3 Binary files /dev/null and b/textures/tile/completion/p1.png differ diff --git a/textures/tile/completion/p10.png b/textures/tile/completion/p10.png new file mode 100644 index 0000000..9e009a7 Binary files /dev/null and b/textures/tile/completion/p10.png differ diff --git a/textures/tile/completion/p11.png b/textures/tile/completion/p11.png new file mode 100644 index 0000000..fe11e15 Binary files /dev/null and b/textures/tile/completion/p11.png differ diff --git a/textures/tile/completion/p12.png b/textures/tile/completion/p12.png new file mode 100644 index 0000000..92bd3bb Binary files /dev/null and b/textures/tile/completion/p12.png differ diff --git a/textures/tile/completion/p13.png b/textures/tile/completion/p13.png new file mode 100644 index 0000000..bc6f542 Binary files /dev/null and b/textures/tile/completion/p13.png differ diff --git a/textures/tile/completion/p2.png b/textures/tile/completion/p2.png new file mode 100644 index 0000000..94f682b Binary files /dev/null and b/textures/tile/completion/p2.png differ diff --git a/textures/tile/completion/p3.png b/textures/tile/completion/p3.png new file mode 100644 index 0000000..fad29a5 Binary files /dev/null and b/textures/tile/completion/p3.png differ diff --git a/textures/tile/completion/p4.png b/textures/tile/completion/p4.png new file mode 100644 index 0000000..41c9393 Binary files /dev/null and b/textures/tile/completion/p4.png differ diff --git a/textures/tile/completion/p5.png b/textures/tile/completion/p5.png new file mode 100644 index 0000000..6860ab4 Binary files /dev/null and b/textures/tile/completion/p5.png differ diff --git a/textures/tile/completion/p6.png b/textures/tile/completion/p6.png new file mode 100644 index 0000000..2053872 Binary files /dev/null and b/textures/tile/completion/p6.png differ diff --git a/textures/tile/completion/p7.png b/textures/tile/completion/p7.png new file mode 100644 index 0000000..b54bfe4 Binary files /dev/null and b/textures/tile/completion/p7.png differ diff --git a/textures/tile/completion/p8.png b/textures/tile/completion/p8.png new file mode 100644 index 0000000..a21d1a1 Binary files /dev/null and b/textures/tile/completion/p8.png differ diff --git a/textures/tile/completion/p9.png b/textures/tile/completion/p9.png new file mode 100644 index 0000000..bbf7f3c Binary files /dev/null and b/textures/tile/completion/p9.png differ diff --git a/tiledb.py b/tiledb.py deleted file mode 100644 index c43185c..0000000 --- a/tiledb.py +++ /dev/null @@ -1,148 +0,0 @@ - -# ------------------------------------------------------------------- -# ORTHOGRAPHIC -# Your personal aerial satellite. Always on. At any altitude.* -# Developed by MarStrMind -# License: Open Software License 3.0 -# Up to date version always on marstr.online -# ------------------------------------------------------------------- -# tiledb.py -# Manages information concerning the information for a particular -# tile, particularly its consisting smaller subtiles. Used for -# consistent layer generation. -# ------------------------------------------------------------------- - -import sqlite3 -from defines import * -from functions import * -from log import * - -class mstr_tiledb: - def __init__(self, lat, lng, latlngfld): - # Note coords - self._latitude = lat - self._longitude = lng - self._latlngfld = latlngfld - - # The db file will be created, should it not exist - self._conn = sqlite3.connect(mstr_datafolder + "z_orthographic/data/" + latlngfld + "/data.db") - self._crs = self._conn.cursor() - #mstr_msg("tiledb", "Database object initiated") - - - # Opens a database file - used by maskgen - def openDB(self, dbfile): - self._conn = sqlite3.connect(dbfile + ".db") - self._crs = self._conn.cursor() - - - # Creates tables for this particular degree of lat/lng - def create_tables(self): - self._conn.execute("CREATE TABLE IF NOT EXISTS tiledata (tile_v INTEGER, tile_h INTEGER, tag TEXT, value TEXT, source INTEGER, adjacent TEXT);") - self._conn.execute("CREATE TABLE IF NOT EXISTS airports (icao TEXT, tile_v INTEGER, tile_h INTEGER, latitude REAL, longitude REAL);") - self._conn.execute("CREATE TABLE IF NOT EXISTS completion (tile_v INTEGER, tile_h INTEGER, tag TEXT, value TEXT, source INTEGER, adjacent TEXT);") - - - # Insert data into their segments - def insert_info(self, tv, th, tag, value, src, adj): - self._conn.execute("INSERT INTO tiledata VALUES ( "+ str(tv) +", "+ str(th)+", '"+ tag +"', '"+ value +"', '"+ str(src) +"', '"+adj+"' );") - - # Insert data into the completion data - def insert_completion_info(self, tv, th, tag, value, src, adj): - self._conn.execute("INSERT INTO completion VALUES ( "+ str(tv) +", "+ str(th)+", '"+ tag +"', '"+ value +"', '"+ str(src) +"', '"+adj+"' );") - - # Insert an airport with ICAO code - def insert_icao(self, 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 - def commit_query(self): - self._conn.commit() - - - # Retrieve the adjacency string for normal tile generation - def get_adjacency_for_source(self, v, h, tag, value): - r = self._crs.execute("SELECT * FROM tiledata where tile_v="+str(v)+" and tile_h="+str(h)+" and tag='"+tag+"' and value='"+value+"';") - rws = r.fetchall() - return rws - - # Retrieve the adjacency info for completion of a tile - def get_adjacency_for_completion(self, v, h): - r = self._crs.execute("SELECT * FROM completion where tile_v="+str(v)+" and tile_h="+str(h)+";") - rws = r.fetchall() - return rws - - # These calls are a bit more complex. We also need to know adjacency info when we are directly - # next to another latitude or longitude. We want seamless generation in those situations too. - def get_adjacency_for_source_in_lat_lng(self, lat, lng, v, h, tag, value): - # The rows to return - rws = [] - - # For this we need to tap into the database of the tile, should there be one. - dbn = mstr_datafolder + "Tiles/" + str(lat) + "_" + str(lng) + "/data.db" - if os.path.isfile(dbn): - tileconn = sqlite3.connect(dbn) - tilecrsr = tileconn.cursor() - r = tilecrsr.execute("SELECT * from tiledata WHERE tile_v="+str(v)+" AND tile_h="+str(h)+" AND tag='"+tag+"' AND value='"+value+"';") - rws = r.fetchall() - tileconn.close() - - return rws - - # These calls are a bit more complex. We also need to know adjacency info when we are directly - # next to another latitude or longitude. We want seamless generation in those situations too. - def get_adjacency_for_completion_in_lat_lng(self, lat, lng, v, h): - # The rows to return - rws = [] - - # For this we need to tap into the database of the tile, should there be one. - dbn = mstr_datafolder + "Tiles/" + str(lat) + "_" + str(lng) + "/data.db" - if os.path.isfile(dbn): - tileconn = sqlite3.connect(dbn) - tilecrsr = tileconn.cursor() - r = tilecrsr.execute("SELECT * from completion WHERE tile_v="+str(v)+" AND tile_h="+str(h)+";") - rws = r.fetchall() - tileconn.close() - - return rws - - # Acquire the highest latitude and longitude tile number of a neighbouring tile - def get_highest_latlong_from_tile(self, lat, lng): - latlng = [-1, -1] - # For this we need to tap into the database of the tile, should there be one. - dbn = mstr_datafolder + "Tiles/" + str(lat) + "_" + str(lng) + "/data.db" - if os.path.isfile(dbn): - tileconn = sqlite3.connect(dbn) - tilecrsr = tileconn.cursor() - lt = tilecrsr.execute("SELECT * FROM tiledata ORDER BY tile_v DESC") - rws = lt.fetchall() - lat = rws[0][0] - ln = tilecrsr.execute("SELECT * FROM tiledata ORDER BY tile_h DESC") - rws = ln.fetchall() - lng = rws[0][1] - latlng[0] = lat - latlng[1] = lng - tileconn.close() - - return latlng - - - # Get all tiles with detected airports (ICAO codes) - def get_tiles_with_airports(self): - r = self._crs.execute("SELECT * FROM airports") - rws = r.fetchall - return rws - - - # Perform a custom query and retrieve results - def perform_query(self, qry): - r = self._crs.execute(qry) - rws = r.fetchall() - return rws - - - # Close DB - def close_db(self): - mstr_msg("tiledb", "Closing database connection") - self._conn.close() - diff --git a/tileinfo.py b/tileinfo.py index 9ddab58..18a13e8 100644 --- a/tileinfo.py +++ b/tileinfo.py @@ -19,11 +19,14 @@ from log import * class mstr_tileinfo: - def __init__(self, lat, lng, latlngfld): + def __init__(self, lat, lng, latnum, lngnum, latlngfld): self._lat = lat self._lng = lng + self._latnum = latnum + self._lngnum = lngnum self._latlngfld = latlngfld - self._adjfile = mstr_datafolder + "z_orthographic/data/" + self._latlngfld + "/adjinfo" + self._adjfile = mstr_datafolder + "z_orthographic/data/" + self._latlngfld + "/" + str(self._latnum) + "_" + str(self._lngnum) + #self._adjfile = mstr_datafolder + "z_orthographic/data/" + self._latlngfld + "/adjinfo" self._cplfile = mstr_datafolder + "z_orthographic/data/" + self._latlngfld + "/cplinfo" self.createDataFile() self.createCompletionFile() @@ -68,17 +71,19 @@ class mstr_tileinfo: def get_adjacency_for_tag_and_value(self, tv, th, tag, value): adj = [] fnlines = [] - with open(self._adjfile) as textfile: - fnlines = textfile.readlines() + fn = mstr_datafolder + "z_orthographic/data/" + self._latlngfld + "/" + str(tv) + "_" + str(th) + if os.path.isfile(fn) == True: # It is possible that the requested file does not yet exist + with open(fn) as textfile: + fnlines = textfile.readlines() - for ln in fnlines: - l = ln.split(" ") - if int(l[0]) == tv and int(l[1]) == th: - if l[2] == tag and l[3] == value: - l[5] = l[5].replace("\n", "") - adj.append(int(l[4])) - adj.append(l[5]) - break + for ln in fnlines: + l = ln.split(" ") + if int(l[0]) == tv and int(l[1]) == th: + if l[2] == tag and l[3] == value: + l[5] = l[5].replace("\n", "") + adj.append(int(l[4])) + adj.append(l[5]) + break return adj @@ -86,7 +91,7 @@ class mstr_tileinfo: def get_adjacency_for_tag_and_value_in_lat_lng(self, lat, lng, tag, value, tv, th, brd): latlngfld = self.latlng_folder([lat, lng]) adj = [] - fn = mstr_datafolder + "z_orthographic/data/" + latlngfld + "/adjinfo" + fn = mstr_datafolder + "z_orthographic/data/" + latlngfld + "/" + str(tv) + "_" + str(th) if os.path.isfile(fn) == True: fnlines = [] with open(fn) as textfile: