#1829 Added custom controls on the left for showing multiple routes a…

…t the same time
RaiderIO · Jul 12, 2023 · 348f242 · 348f242
1 parent 802c488
commit 348f242
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/resources/views/common/maps/controls/compare.blade.php b/resources/views/common/maps/controls/compare.blade.php
@@ -0,0 +1,18 @@
+<?php
+/** @var \Illuminate\Support\Collection $floors */
+?>
+<nav class="route_manipulation_tools left h-100 row no-gutters map_fade_out">
+    <div class="bg-header">
+        <div id="view_route_map_actions_container" class="mb-2">
+            @include('common.maps.controls.elements.floorswitch', ['floors' => $floors, 'selectedFloorId' => $selectedFloorId])
+
+            @include('common.maps.controls.elements.enemyvisualtype')
+
+            @include('common.maps.controls.elements.mapobjectgroupvisibility', ['floors' => $floors])
+        </div>
+
+        <div id="view_route_misc_actions_container">
+            @include('common.maps.controls.elements.labeltoggle')
+        </div>
+    </div>
+</nav>
diff --git a/resources/views/common/maps/controls/draw.blade.php b/resources/views/common/maps/controls/draw.blade.php
@@ -2,6 +2,7 @@
 /** @var boolean $isAdmin */
 /** @var \Illuminate\Support\Collection $floors */
 /** @var \App\Models\DungeonRoute $dungeonroute */
+/** @var int $selectedFloorId */
 ?>
 <nav class="route_manipulation_tools left h-100 row no-gutters map_fade_out">
     <div class="bg-header" style="background-color: unset !important;">
@@ -35,7 +36,7 @@ class="btn btn-info">
         </div>
 
         <div id="edit_route_draw_map_actions_container" class="mb-2">
-            @include('common.maps.controls.elements.floorswitch', ['floors' => $floors])
+            @include('common.maps.controls.elements.floorswitch', ['floors' => $floors, 'selectedFloorId' => $selectedFloorId])
 
             @include('common.maps.controls.elements.enemyvisualtype')
 

diff --git a/resources/views/common/maps/controls/elements/floorswitch.blade.php b/resources/views/common/maps/controls/elements/floorswitch.blade.php
@@ -1,5 +1,6 @@
 <?php
 /** @var \Illuminate\Support\Collection $floors */
+/** @var int $selectedFloorId */
 ?>
 <div class="row no-gutters">
     <div class="col btn-group dropright">

diff --git a/resources/views/common/maps/controls/view.blade.php b/resources/views/common/maps/controls/view.blade.php
@@ -2,6 +2,7 @@
 /** @var boolean $isAdmin */
 /** @var \Illuminate\Support\Collection $floors */
 /** @var \App\Models\Dungeonroute|null $dungeonroute */
+/** @var int $selectedFloorId */
 ?>
 <nav class="route_manipulation_tools left h-100 row no-gutters map_fade_out">
     <div class="bg-header">
@@ -59,7 +60,7 @@ class="btn btn-info {{ isset($current_report) ? 'disabled' : '' }}">
         </div>
 
         <div id="view_route_map_actions_container" class="mb-2">
-            @include('common.maps.controls.elements.floorswitch', ['floors' => $floors])
+            @include('common.maps.controls.elements.floorswitch', ['floors' => $floors, 'selectedFloorId' => $selectedFloorId])
 
             @include('common.maps.controls.elements.enemyvisualtype')
 

diff --git a/resources/views/common/maps/mapcompare.blade.php b/resources/views/common/maps/mapcompare.blade.php
@@ -97,6 +97,10 @@
     @endif
 @endif
 
+@include('common.maps.controls.compare', [
+    'floors' => $dungeon->floors,
+    'selectedFloorId' => $floor->id,
+])
 
 <div id="map" class="virtual-tour-element {{$mapClasses}}" data-position="auto">