esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

MAPG-119 handle the case if no mapId is present when editing map

Browse Source
This commit is contained in:
Bence Pőcze 2020-06-10 23:14:19 +02:00
parent 5237c3f454
commit 6fc83c9459
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.php
View File

@ -23,7 +23,7 @@ Container::$routeCollection->group('game', function (MapGuesser\Routing\RouteCol
$routeCollection->post('guess-json', '{mapId}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'evaluateGuess']); $routeCollection->post('guess-json', '{mapId}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'evaluateGuess']);
}); });
Container::$routeCollection->group('admin', function (MapGuesser\Routing\RouteCollection $routeCollection) { Container::$routeCollection->group('admin', function (MapGuesser\Routing\RouteCollection $routeCollection) {
$routeCollection->get('admin.mapEditor', 'mapEditor/{mapId}', [MapGuesser\Controller\MapAdminController::class, 'getMapEditor']); $routeCollection->get('admin.mapEditor', 'mapEditor/{mapId?}', [MapGuesser\Controller\MapAdminController::class, 'getMapEditor']);
$routeCollection->get('admin.place', 'place.json/{placeId}', [MapGuesser\Controller\MapAdminController::class, 'getPlace']); $routeCollection->get('admin.place', 'place.json/{placeId}', [MapGuesser\Controller\MapAdminController::class, 'getPlace']);
$routeCollection->post('admin.saveMap', 'saveMap/{mapId}/json', [MapGuesser\Controller\MapAdminController::class, 'saveMap']); $routeCollection->post('admin.saveMap', 'saveMap/{mapId}/json', [MapGuesser\Controller\MapAdminController::class, 'saveMap']);
}); });

37
src/Controller/MapAdminController.php
View File

@ -17,6 +17,8 @@ use MapGuesser\Util\Geo\Position;
class MapAdminController implements ISecured class MapAdminController implements ISecured
{ {
private static string $unnamedMapName = '[unnamed map]';
private IRequest $request; private IRequest $request;
private MapRepository $mapRepository; private MapRepository $mapRepository;
@ -41,9 +43,18 @@ class MapAdminController implements ISecured
{ {
$mapId = (int) $this->request->query('mapId'); $mapId = (int) $this->request->query('mapId');
$map = $this->mapRepository->getById($mapId); if ($mapId) {
$bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']); $map = $this->mapRepository->getById($mapId);
$places = $this->getPlaces($mapId); $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
$places = $this->getPlaces($mapId);
} else {
$map = [
'name' => self::$unnamedMapName,
'description' => ''
];
$bounds = Bounds::createDirectly(-90.0, -180.0, 90.0, 180.0);
$places = [];
}
$data = ['mapId' => $mapId, 'mapName' => $map['name'], 'mapDescription' => str_replace('<br>', "\n", $map['description']), 'bounds' => $bounds->toArray(), 'places' => &$places]; $data = ['mapId' => $mapId, 'mapName' => $map['name'], 'mapDescription' => str_replace('<br>', "\n", $map['description']), 'bounds' => $bounds->toArray(), 'places' => &$places];
return new HtmlContent('admin/map_editor', $data); return new HtmlContent('admin/map_editor', $data);
@ -63,6 +74,10 @@ class MapAdminController implements ISecured
{ {
$mapId = (int) $this->request->query('mapId'); $mapId = (int) $this->request->query('mapId');
if (!$mapId) {
$mapId = $this->addNewMap();
}
if (isset($_POST['added'])) { if (isset($_POST['added'])) {
$addedIds = []; $addedIds = [];
foreach ($_POST['added'] as $placeRaw) { foreach ($_POST['added'] as $placeRaw) {
@ -107,7 +122,7 @@ class MapAdminController implements ISecured
]; ];
if (isset($_POST['name'])) { if (isset($_POST['name'])) {
$map['name'] = $_POST['name'] ? $_POST['name'] : '[unnamed map]'; $map['name'] = $_POST['name'] ? $_POST['name'] : self::$unnamedMapName;
} }
if (isset($_POST['description'])) { if (isset($_POST['description'])) {
$map['description'] = str_replace(["\n", "\r\n"], '<br>', $_POST['description']); $map['description'] = str_replace(["\n", "\r\n"], '<br>', $_POST['description']);
@ -115,7 +130,7 @@ class MapAdminController implements ISecured
$this->saveMapData($mapId, $map); $this->saveMapData($mapId, $map);
$data = ['added' => $addedIds]; $data = ['mapId' => $mapId, 'added' => $addedIds];
return new JsonContent($data); return new JsonContent($data);
} }
@ -135,6 +150,18 @@ class MapAdminController implements ISecured
return $bounds; return $bounds;
} }
private function addNewMap(): int
{
$modify = new Modify(\Container::$dbConnection, 'maps');
$modify->fill([
'name' => self::$unnamedMapName,
'description' => ''
]);
$modify->save();
return $modify->getId();
}
private function saveMapData(int $mapId, array $map): void private function saveMapData(int $mapId, array $map): void
{ {
$modify = new Modify(\Container::$dbConnection, 'maps'); $modify = new Modify(\Container::$dbConnection, 'maps');