Рефактор.

This commit is contained in:
sasha80
2026-01-22 15:16:00 +03:00
parent baff756648
commit f769d761db
2 changed files with 11 additions and 8 deletions

View File

@@ -2,6 +2,9 @@
extends CanvasGroup
class_name MercatorTileMap
const VECTOR00: = Vector2(0, 0)
const VECTOR11: = Vector2(1, 1)
## Отображение карт WEB Mercator
#http://10.1.1.220/osm_tiles/0/0/0.png
@@ -88,7 +91,7 @@ var _marks: Dictionary = {}
var _req_count: = 0
var image: = Image.new()
var image_load_proc: Callable
var now: = 0
var now: = 0.0
var visible_marks_count: = 0
var border1: ImageTexture
var border2: ImageTexture
@@ -276,8 +279,8 @@ func set_zoom(zoom: float, pivot: Vector2) -> void:
func _draw() -> void:
# Рисование плиток
var z: float = min(max_zoom_level, _xyz.z)
var t1: = screen_to_tile(Vector2(0, 0), z)
var t2: = screen_to_tile($canvas.size, z) + Vector2(1, 1)
var t1: = screen_to_tile(VECTOR00, z)
var t2: = screen_to_tile($canvas.size, z) + VECTOR11
is_out_border1 = true
is_out_border2 = true
for tx in range(t1.x, t2.x):
@@ -363,7 +366,7 @@ func _process(delta) -> void:
remove_child(req)
req.queue_free()
_req_count -= 1
push_error('запрос \"%s\" не отправлен' % tile.url) #TODO: For Deugs
push_error('запрос \"%s\" не отправлен' % tile.url)
if _queue.is_empty():
emit_signal('load_completed')
@@ -630,7 +633,7 @@ class Tile:
var x: int = 0
var y: int = 0
var z: int = 0
var t: int = 0
var t: float = 0.0
var url: String = ''
var texture: Texture2D = null