Search adjustments

webgis/index.html

@@ -63,12 +63,13 @@
                 </span>
                 Catasto storico
             </button>
-            <button class="button is-white mr-2 mt-1" title="Cerca"
+            <button class="button is-white mr-1 is-size-5 pl-1" title="Ricerca"
                 data-id="search"
                 data-action="menu#toggleMenu">
-                <span class="icon" data-id="search" data-action="menu#toggleMenu">
+                <span class="icon mr-2" data-id="search" data-action="menu#toggleMenu">
                     <i data-id="search" class="fa fa-search"></i>
                 </span>
+                Ricerca
             </button>
         </div>
     </nav>
@@ -93,18 +94,6 @@
                         <input class="input" type="text" minlength="3" name="text" placeholder="Inserire parole chiave" />
                     </div>
                 </div>
-                    <div class="field">
-                        <label class="label">Categoria sito</label>
-                        <div class="control">
-                            <div class="select">
-                                <select name="category">
-                                    <option default value="">-- Scegliere la categoria del sito --</option>
-                                    <option value="site">Sito conservato</option>
-                                    <!--<option value="not_conserved">Sito non conservato</option>-->
-                                </select>
-                            </div>
-                        </div>
-                    </div>
                     <div class="field">
                         <label class="label">Tecnica muraria</label>
                         <div class="control">

webgis/js/controllers/search_controller.js

@@ -1,6 +1,7 @@
 import { Controller } from "@hotwired/stimulus";
 import { GisState } from "../state.js";
 import UI from "../ui.js";
+import { INIT_ZOOM } from "../gis.js";
 
 const html = String.raw;
 
@@ -41,6 +42,8 @@ export default class extends Controller {
         this.containerTarget.classList.remove('is-hidden');
         this.#injectResults(results);
         if (results.length) {
+            // Reset zoom level after successful search
+            map.setZoom(INIT_ZOOM);
             this.#filterMap(results);
             // Should technique always be shown after a search?
             for (const key of Object.keys(techsMarkers)) {
@@ -61,6 +64,8 @@ export default class extends Controller {
         // Empty result set
         this.resultsTarget.innerHTML = '';
         this.containerTarget.classList.add('is-hidden');
+        // Reset map zoom
+        map.setZoom(INIT_ZOOM);
     }
 
     #injectResults(results) {
@@ -98,7 +103,7 @@ export default class extends Controller {
                             data-action="marker#go"
                             data-marker-coords-value="${coordinates}"
                             data-marker-group-value="sites">
-                            Vai al sito
+                            Vai
                             <span class="ml-1 icon">
                                 <i class="fa fa-chevron-right"></i>
                             </span>

webgis/js/gis.js

@@ -29,6 +29,9 @@ GIS.INIT_ZOOM = 14;
 GIS.MIN_ZOOM = 11;
 GIS.MAX_ZOOM = 24;
 
+// Terrible... fix it!
+export const INIT_ZOOM = 14;
+
 /**
  * Capitalize a text string
  * @todo Move to utils

webgis/js/icons.js

@@ -59,6 +59,6 @@ Icons.reuse = L.icon(
 
 Icons.camera = L.divIcon({className: 'fa fa-camera'});
 
-Icons.techs = L.divIcon({className: 'fa fa-circle has-text-primary-25'});
+Icons.techs = L.divIcon({className: 'fa fa-circle has-text-link-45'});
 
 export default Icons;