diff options
| -rw-r--r-- | app/Http/Controllers/Admin/LocationController.php | 12 | ||||
| -rw-r--r-- | app/Location.php | 4 | ||||
| -rw-r--r-- | tests/app/Http/Controllers/Admin/LocationControllerTest.php | 7 |
3 files changed, 13 insertions, 10 deletions
diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php index accb13a5a2..4570c72f58 100644 --- a/app/Http/Controllers/Admin/LocationController.php +++ b/app/Http/Controllers/Admin/LocationController.php @@ -154,10 +154,8 @@ class LocationController extends AbstractBaseController $lng = ($lng < 0 ? 'W' : 'E') . abs($lng); $hierarchy = $this->gethierarchy($parent_id); $level = count($hierarchy); - $icon = $request->get('icon', null); - $icon = $icon === '' ? null : $icon; - $zoom = $request->get('new_zoom_factor'); - $zoom = $zoom === '' ? null : $zoom; + $icon = $request->get('icon', ''); + $zoom = (int) $request->get('new_zoom_factor', '2'); if ($place_id === 0) { $place_id = 1 + (int) DB::table('placelocation')->max('pl_id'); @@ -166,9 +164,9 @@ class LocationController extends AbstractBaseController 'pl_id' => $place_id, 'pl_parent_id' => $parent_id, 'pl_level' => $level, - 'pl_place' => $request->get('new_place_name'), - 'pl_lati' => $request->get('lati_control') . $lat, - 'pl_long' => $request->get('long_control') . $lng, + 'pl_place' => $request->get('new_place_name', ''), + 'pl_lati' => $request->get('lati_control', '') . $lat, + 'pl_long' => $request->get('long_control', '') . $lng, 'pl_zoom' => $zoom, 'pl_icon' => $icon, ]); diff --git a/app/Location.php b/app/Location.php index a972a29478..55da3d916c 100644 --- a/app/Location.php +++ b/app/Location.php @@ -89,6 +89,10 @@ class Location 'pl_place' => $location, 'pl_parent_id' => $parent_location_id, 'pl_level' => $this->parts->count() - 1, + 'pl_lati' => '', + 'pl_long' => '', + 'pl_icon' => '', + 'pl_zoom' => 2, ]); } diff --git a/tests/app/Http/Controllers/Admin/LocationControllerTest.php b/tests/app/Http/Controllers/Admin/LocationControllerTest.php index 754b4254d8..d8de55ebaa 100644 --- a/tests/app/Http/Controllers/Admin/LocationControllerTest.php +++ b/tests/app/Http/Controllers/Admin/LocationControllerTest.php @@ -19,6 +19,7 @@ namespace Fisharebest\Webtrees\Http\Controllers\Admin; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Application; +use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Tree; use Symfony\Component\HttpFoundation\Request; @@ -61,10 +62,10 @@ class LocationControllerTest extends \Fisharebest\Webtrees\TestCase */ public function testMapDataSave(): void { - //$controller = app()->make(LocationController::class); - //$response = app()->dispatch($controller, 'mapDataSave'); + $controller = app()->make(LocationController::class); + $response = app()->dispatch($controller, 'mapDataSave'); - //$this->assertInstanceOf(Response::class, $response); + $this->assertInstanceOf(Response::class, $response); } /** |