Long-overdue updates to 4.2 and cleanup. breaking changes.

Author: PraxisMapper

.gitattributes

@@ -0,0 +1,2 @@
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf

.gitignore

@@ -0,0 +1,3 @@
+# Godot 4+ specific ignores
+.godot/
+android/build

PraxisMapper/APICalls/PraxisAPICall.gd

@@ -25,13 +25,13 @@ func _init():
 	var err = 0
 	http = HTTPClient.new() # Create the Client. 
 
-	var split = PraxisMapper.serverURL.split(":")
+	var split = PraxisServer.serverURL.split(":")
 	if (split.size() == 3): #http:\\url:port
 		err =  http.connect_to_host(split[0] + ":" + split[1], int(split[2])) # Connect to host/port.
 	elif (split.size() == 2 and !split[0].begins_with("http")): #url:port
 		err =  http.connect_to_host(split[0], int(split[1])) # Connect to host/port.
 	else: # url
-		err = http.connect_to_host(PraxisMapper.serverURL)
+		err = http.connect_to_host(PraxisServer.serverURL)
 
 	assert(err == OK) # Make sure connection is OK.
 
@@ -51,8 +51,8 @@ func call_url(endpoint, method = HTTPClient.METHOD_GET, body = ''):
 	lastResponseCode = 0
 	# Some headers
 	var headers = [
-		"AuthKey: " + PraxisMapper.authKey,
-		"PraxisAuthKey: " + PraxisMapper.headerKey,
+		"AuthKey: " + PraxisServer.authKey,
+		"PraxisAuthKey: " + PraxisServer.headerKey,
 		"User-Agent: Pirulo/1.0 (Godot)",
 		"Accept: */*"
 	]
@@ -92,7 +92,7 @@ func call_url(endpoint, method = HTTPClient.METHOD_GET, body = ''):
 					OS.delay_msec(25)
 		else:		
 			_isReauthing = true
-			await self.Login(PraxisMapper.username, PraxisMapper.password)
+			await self.Login(PraxisServer.username, PraxisServer.password)
 			_isReauthing = false
 		return await call_url(endpoint, method, body)
 	elif(statusCode != 200 and statusCode != 204):
@@ -319,7 +319,7 @@ func ExpireTiles(place, styleSet): #expires all map tiles in styleSet that conta
 	await call_url(url)
 
 func GetTileGenerationID(plusCode, styleSet): #Gets the current generation ID (creation count) for a tile. -1 is "expired"
-	var url = "/MapTile/Generation/" + plusCode + "/" + styleSet
+	var url = "/MapTile/Generatiion/" + plusCode + "/" + styleSet
 	await call_url(url)
 
 #Demo endpoint API calls, so this can server immediately as a test client.

PraxisMapper/APICalls/PraxisEndpoints.gd

@@ -19,8 +19,8 @@ func response_received(result, responseCode, headers, body):
 
 func callEndpoint(url, method = null, body = null):
 	var headers = [
-		"AuthKey: " + PraxisMapper.authKey,
-		"PraxisAuthKey: " + PraxisMapper.headerKey,
+		"AuthKey: " + PraxisServer.authKey,
+		"PraxisAuthKey: " + PraxisServer.headerKey,
 		"User-Agent: Pirulo/1.0 (Godot)",
 		"Accept: */*"
 	]
@@ -34,10 +34,10 @@ func callEndpoint(url, method = null, body = null):
 	request.request_completed.connect(response_received)
 	var ok
 	if (body != null): 
-		ok = request.request(PraxisMapper.serverURL + url, headers, method, body)
+		ok = request.request(PraxisServer.serverURL + url, headers, method, body)
 	else:
-		ok = request.request(PraxisMapper.serverURL + url, headers, method)
-	print(PraxisMapper.serverURL + url)
+		ok = request.request(PraxisServer.serverURL + url, headers, method)
+	print(PraxisServer.serverURL + url)
 	print('request called')
 
 	#TODO: check if OK isn't OK and handle pre-call errors.
@@ -198,7 +198,7 @@ func ExpireTiles(place, styleSet): #expires all map tiles in styleSet that conta
 	callEndpoint("/MapTile/Expire/" + place + "/" + styleSet)
 
 func GetTileGenerationID(plusCode, styleSet): #Gets the current generation ID (creation count) for a tile. -1 is "expired"
-	callEndpoint("/MapTile/Generation/" + plusCode + "/" + styleSet)
+	callEndpoint("/MapTile/Generatiion/" + plusCode + "/" + styleSet)
 
 #Demo endpoint API calls, so this can server immediately as a test client.
 func DemoSplatterEnter(plusCode): #Grants the player 1 splat point when walking into a Cell10 the first time in 24 hours

PraxisMapper/Controls/DebugMovement.gd

@@ -1,26 +1,27 @@
 extends Node2D
 
-#this control should show up when no GPS is available.
+#this control should show up when no GPS is available. Can use PC Keyboard to navigate faster.
 @onready var label : Label = $CanvasLayer/ColorRect/Label
 
 func GoNorth():
-	PraxisMapper.forceChange(PlusCodes.ShiftCode(PraxisMapper.currentPlusCode, 0, 1))
+	PraxisCore.forceChange(PlusCodes.ShiftCode(PraxisCore.currentPlusCode, 0, 1))
 
 func GoSouth():
-	PraxisMapper.forceChange(PlusCodes.ShiftCode(PraxisMapper.currentPlusCode, 0, -1))
+	PraxisCore.forceChange(PlusCodes.ShiftCode(PraxisCore.currentPlusCode, 0, -1))
 
 func GoEast():
-	PraxisMapper.forceChange(PlusCodes.ShiftCode(PraxisMapper.currentPlusCode, 1, 0))
+	PraxisCore.forceChange(PlusCodes.ShiftCode(PraxisCore.currentPlusCode, 1, 0))
 
 func GoWest():
-	PraxisMapper.forceChange(PlusCodes.ShiftCode(PraxisMapper.currentPlusCode, -1, 0))
+	PraxisCore.forceChange(PlusCodes.ShiftCode(PraxisCore.currentPlusCode, -1, 0))
 
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-	label.text = PraxisMapper.currentPlusCode	
-	pass
+	label.text = PraxisCore.currentPlusCode	
+	if (Input.is_key_pressed(KEY_UP)):
+		GoNorth()
+	if (Input.is_key_pressed(KEY_DOWN)):
+		GoSouth()
+	if (Input.is_key_pressed(KEY_LEFT)):
+		GoWest()
+	if (Input.is_key_pressed(KEY_RIGHT)):
+		GoEast()

PraxisMapper/Controls/DebugMovement.tscn

@@ -7,6 +7,7 @@
 script = ExtResource("1_1g2xv")
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
+layer = 128
 
 [node name="ColorRect" type="ColorRect" parent="CanvasLayer"]
 offset_right = 75.0

PraxisMapper/Controls/MapTile.gd

@@ -20,8 +20,8 @@ var noiseTex : NoiseTexture2D
 signal user_tapped(plusCode) 
 
 func getTappedCode(x, y):
-	var cellsX = PraxisMapper.mapTileWidth / 20
-	var cellsY = PraxisMapper.mapTileHeight / 20
+	var cellsX = PraxisCore.mapTileWidth / 20
+	var cellsY = PraxisCore.mapTileHeight / 20
 	#TODO: this needs adjusted to match the screen being centered?
 	var tappedCell = PlusCodes.ShiftCode(currentTile + "22", x / cellsX, (400 - y) / cellsY )
 	return tappedCell
@@ -68,11 +68,11 @@ func LoadTile(plusCode):
 	else:
 		request.response_data.connect(tile_called)
 
-		print("getting " + PraxisMapper.serverURL + "/MapTile/Area/" + plusCode + "/" + styleSet)
+		print("getting " + PraxisServer.serverURL + "/MapTile/Area/" + plusCode + "/" + styleSet)
 		request.DrawMapTile(plusCode, styleSet)
 
 func GetTile(plusCode):	
-	if PraxisMapper.currentPlusCode.substr(0,8) == PraxisMapper.lastPlusCode.substr(0,8):
+	if PraxisCore.currentPlusCode.substr(0,8) == PraxisCore.lastPlusCode.substr(0,8):
 		return
 
 	currentTile = plusCode.substr(0,8)
@@ -87,15 +87,13 @@ func OnPlusCodeChanged(current, previous):
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	#TODO: make NoiseTexture a proper node to reference multiple times?
 	noiseTex = NoiseTexture2D.new()
-	noiseTex.width = PraxisMapper.mapTileWidth
-	noiseTex.height = PraxisMapper.mapTileHeight
+	noiseTex.width = PraxisCore.mapTileWidth
+	noiseTex.height = PraxisCore.mapTileHeight
 	noiseTex.noise = FastNoiseLite.new()
 	texRect.texture = noiseTex
 
 	if (autoRefresh == true):
 		timer.one_shot = false
 		timer.autostart = true
-		timer.wait_time = autoRefreshSeconds
 		timer.start()

PraxisMapper/Scenes/LoadingModal.gd

@@ -1,6 +1,6 @@
 extends Node2D
 
-#A default input-blocking 
+#A default input-blocking modal.
 
 @onready var spinner: Sprite2D = $ColorRect/Spinner
 

PraxisMapper/Scenes/LoginScene.gd

@@ -7,12 +7,11 @@ extends Node2D
 @onready var request: HTTPRequest = $HTTPRequest
 @onready var timer: Timer = $Timer
 @onready var api2: PraxisEndpoints = $PraxisEndpoints
-#TODO: move passkey to a variable and change it.
+var passkey = "UniquePasskeyGoesHere"
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	#TODO: check for saved credentials, set into textboxes if found.	
-	var lastData = FileAccess.open_encrypted_with_pass("user://savedData.access", FileAccess.READ, "passkeyGoesHere")
+	var lastData = FileAccess.open_encrypted_with_pass("user://savedData.access", FileAccess.READ, passkey)
 	if (lastData != null):
 		var data = lastData.get_as_text().split("|")
 		if (data[2].ends_with('/')):
@@ -28,7 +27,7 @@ func _on_btn_login_pressed():
 	print("login pressed")
 	lblError.text = "Logging in...."
 
-	PraxisMapper.serverURL = txtServer.text
+	PraxisServer.serverURL = txtServer.text
 	api2.response_data.connect(login_completed)
 	api2.Login('', txtUsername.text, txtPassword.text)
 
@@ -42,22 +41,22 @@ func login_completed(result):
 	json.parse(result.get_string_from_utf8())
 	var data = json.get_data()
 	print(data)
-	#if successful, save name/pwd/server to file to load as auto-login next time. #NOTE: may use ConfigFile for this specifically.
+	#if successful, save name/pwd/server to file to load as auto-login next time.
 	var authData = FileAccess.open_encrypted_with_pass("user://savedData.access", FileAccess.WRITE, "passkeyGoesHere")
 	authData.store_string(txtUsername.text + "|" + txtPassword.text + "|" +txtServer.text)
 	authData.close()
 
-	PraxisMapper.username = txtUsername.text
-	PraxisMapper.password = txtPassword.text
-	PraxisMapper.serverURL = txtServer.text
-	PraxisMapper.authKey = data.authToken
+	PraxisServer.username = txtUsername.text
+	PraxisServer.password = txtPassword.text
+	PraxisServer.serverURL = txtServer.text
+	PraxisServer.authKey = data.authToken
 
 	get_tree().change_scene_to_file("res://Scenes/OverheadView.tscn")
 
 func _on_btn_create_acct_pressed():
 	print("create pressed")
 	lblError.text = "Creating account...."
-	PraxisMapper.serverURL = txtServer.text
+	PraxisServer.serverURL = txtServer.text
 	api2.response_data.connect(createCompleted)
 	api2.CreateAccount(txtUsername.text, txtPassword.text)
 

PraxisMapper/Scripts/PlusCodes.gd

@@ -1,20 +1,9 @@
-extends RefCounted
+extends Node
 class_name PlusCodes
 
 var SEPARATOR_ = '+'
 static var CODE_ALPHABET_ = '23456789CFGHJMPQRVWX'
 
-#var GRID_COLUMNS_ = 4
-#var GRID_ROWS_ = 5
-#note: a reasonable alternative would be a 3x3 grid in a 9-char code set. 
-#would be longer codes but could be number-only, and then indexable similar to S2 codes but 
-#in regular rectangles instead.
-
-#for decoding the 11th digit?
-#var GRID_ROW_MULTIPLIER = 3125
-#var GRID_COL_MULTIPLIER = 1024
-
-
 static func EncodeLatLon(lat, lon):
 	return EncodeLatLonSize(lat, lon, 10)
 
@@ -95,3 +84,35 @@ static func ShiftCode(code, xChange, yChange):
 		newCode = newCode + CODE_ALPHABET_[yVals[i]] + CODE_ALPHABET_[xVals[i]]
 
 	return newCode
+	
+static func Decode(plusCode):
+	var lat = -90.0
+	var lon = -180.0
+	plusCode = plusCode.replace("+", "")
+	var totalChars = plusCode.length()
+	var charsProcessed = 0
+	var precision = 20
+	var xVal = 0
+	var yVal = 0
+	while (charsProcessed < totalChars):
+		if (charsProcessed < 10):
+			xVal = PlusCodes.GetLetterIndex(plusCode[charsProcessed + 1])
+			yVal = PlusCodes.GetLetterIndex(plusCode[charsProcessed])
+			
+			lat += precision * yVal
+			lon += precision * xVal
+			precision /= 20.0
+			charsProcessed += 2
+		else:			
+			#lat/row is /, column/lon is %
+			xVal = PlusCodes.GetLetterIndex(plusCode[charsProcessed]) % 4
+			yVal = PlusCodes.GetLetterIndex(plusCode[charsProcessed]) / 4
+			
+			lon += (xVal * (precision / (4.0 ** (charsProcessed - 9))))
+			lat += (yVal * (precision / (5.0 ** (charsProcessed - 9))))
+			
+			charsProcessed += 1
+	return Vector2(lon, lat) #x, y!
+	
+static func GetLetterIndex(letter):
+	return CODE_ALPHABET_.find(letter)