Update: 2026-06-21 02:07:00

This commit is contained in:
Hamza-Ayed
2026-06-21 02:07:00 +03:00
parent af3dcae5b7
commit b2fae9ec66
23 changed files with 1412 additions and 210 deletions

View File

@@ -0,0 +1,72 @@
<?php
require_once __DIR__ . '/../connect.php';
// If Main Redis is not available, return empty array
if (!isset($redis) || $redis === null) {
echo json_encode([]);
exit();
}
$grid_size = 0.0135;
$keys = [];
try {
// Prefix 'siro:' is automatically applied by $redis
$keys = $redis->keys("demand:grid:*");
} catch (Exception $e) {
error_log("[heatmap_live.php] Redis keys error: " . $e->getMessage());
echo json_encode([]);
exit();
}
$heatmap_data = [];
foreach ($keys as $key) {
// The keys returned by $redis->keys() will actually contain the 'siro:' prefix
// e.g. siro:demand:grid:33.5135_36.2735
$parts = explode(":", $key);
$coords = explode("_", end($parts));
if (count($coords) == 2) {
$lat = (float)$coords[0];
$lng = (float)$coords[1];
// We must strip 'siro:' to use $redis->get() because $redis auto-prefixes everything!
// Actually, $redis->keys() returns the physical key "siro:demand:grid:X"
// But $redis->get("demand:grid:X") automatically prepends "siro:".
// So we must strip the "siro:" part before passing to get()
$clean_key = str_replace("siro:", "", $key);
$count = (int)$redis->get($clean_key);
// Fetch active drivers using Location Redis
$available_drivers = 0;
try {
global $redisLocation;
if (isset($redisLocation) && $redisLocation !== null) {
$drivers = $redisLocation->georadius('geo:drivers:available', $lng, $lat, 0.75, 'km');
$availableDrivers = count($drivers);
}
} catch (Exception $e) {}
$intensity = 'low';
$surge_ratio = ($available_drivers > 0) ? ($count / $available_drivers) : $count;
if ($surge_ratio > 2.0 || $count >= 5) {
$intensity = 'high';
} else if ($surge_ratio > 1.2 || $count >= 3) {
$intensity = 'medium';
}
$heatmap_data[] = [
"lat" => $lat,
"lng" => $lng,
"count" => $count,
"intensity" => $intensity
];
}
}
// Output the JSON array as expected by home_captain_controller.dart
header('Content-Type: application/json');
echo json_encode($heatmap_data);
?>

View File

@@ -0,0 +1,43 @@
<?php
require_once __DIR__ . '/../connect.php';
$lat = filterRequest("lat");
$lng = filterRequest("lng");
if (!$lat || !$lng) {
jsonError("Missing coordinates");
exit();
}
if (!isset($redis) || $redis === null) {
// If Redis is not available, we fail gracefully.
jsonSuccess(null, "Demand logged (fallback)");
exit();
}
// Create a 1.5 km grid cell
// 1 degree latitude is approximately 111 km.
// 1.5 km / 111 km ≈ 0.0135 degrees.
$grid_size = 0.0135;
$grid_lat = round((float)$lat / $grid_size) * $grid_size;
$grid_lng = round((float)$lng / $grid_size) * $grid_size;
$grid_id = $grid_lat . "_" . $grid_lng;
$redisKey = "demand:grid:" . $grid_id;
try {
// Increment the demand count for this grid
$currentCount = $redis->incr($redisKey);
// If this is the first request, set the expiry to 60 seconds
if ($currentCount == 1) {
$redis->expire($redisKey, 60);
}
jsonSuccess(["grid_id" => $grid_id, "count" => $currentCount], "Demand logged successfully");
} catch (Exception $e) {
error_log("[log_demand.php] Redis error: " . $e->getMessage());
jsonError("Error logging demand");
}
?>