Interactive tour general

src/config/interactiveTour.json

@@ -33,115 +33,121 @@
         }
       },
       {
-        "element": "igo-actionbar-item:nth-child(2) mat-list-item",
-        "title": "interactiveTour.global.context-title",
-        "text": "interactiveTour.global.context",
+        "element": "igo-actionbar-item:nth-child(1) mat-list-item",
+        "title": "interactiveTour.global.search-tool-title",
+        "text": "interactiveTour.global.search-tool",
         "disableInteraction": true,
         "beforeShow": {
           "element": "#homeButton",
           "action": "click"
-        },
-        "beforeChange": {
-          "action": "click",
-          "waitFor": ".igo-tool-container"
         }
       },
       {
-        "element": ".igo-tool-container",
+        "element": "igo-actionbar-item:nth-child(2) mat-list-item",
         "title": "interactiveTour.global.context-title",
-        "text": "interactiveTour.global.context-list",
+        "text": "interactiveTour.global.context",
         "disableInteraction": true
       },
       {
-        "element": "igo-context-item",
-        "title": "interactiveTour.global.context-title",
-        "text": "interactiveTour.global.context-item"
+        "element": "igo-actionbar-item:nth-child(3) mat-list-item",
+        "title": "interactiveTour.global.map-tool-title",
+        "text": "interactiveTour.global.map-tool",
+        "disableInteraction": true
       },
       {
-        "element": "igo-context-item:nth-of-type(3)",
-        "title": "interactiveTour.global.context-title",
-        "text": "interactiveTour.global.context-filter"
+        "element": "igo-actionbar-item:nth-child(4) mat-list-item",
+        "title": "interactiveTour.global.spatial-filter-title",
+        "text": "interactiveTour.global.spatial-filter",
+        "disableInteraction": true
       },
       {
-        "element": "igo-context-item:nth-of-type(3)",
-        "title": "interactiveTour.global.context-title",
-        "text": "interactiveTour.global.context-filter-click",
-        "beforeChange": {
-          "action": "click",
-          "waitFor": "igo-list"
-        }
+        "element": "igo-actionbar-item:nth-child(5) mat-list-item",
+        "title": "interactiveTour.global.measurer-tool-title",
+        "text": "interactiveTour.global.measurer-tool",
+        "disableInteraction": true
       },
       {
-        "element": "igo-list",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.layers",
-        "noBackButton": true,
-        "beforeShow": {
-          "action": "click",
-          "element": "igo-actionbar-item:nth-child(3) mat-list-item"
-        }
+        "element": "igo-actionbar-item:nth-child(6) mat-list-item",
+        "title": "interactiveTour.global.directions-tool-title",
+        "text": "interactiveTour.global.directions-tool",
+        "disableInteraction": true
       },
       {
-        "element": "igo-list",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.layers-visible"
+        "element": "igo-actionbar-item:nth-child(7) mat-list-item",
+        "title": "interactiveTour.global.catalog-tool-title",
+        "text": "interactiveTour.global.catalog-tool",
+        "disableInteraction": true
       },
       {
-        "element": "igo-layer-item:nth-of-type(2)",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.layer-embacle"
+        "element": "igo-actionbar-item:nth-child(8) mat-list-item",
+        "title": "interactiveTour.global.import-export-title",
+        "text": "interactiveTour.global.import-export",
+        "disableInteraction": true
       },
       {
-        "element": "igo-layer-item:nth-of-type(2) h4",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.legend",
-        "onShow": {
-          "action": "click"
-        }
+        "element": "igo-actionbar-item:nth-child(9) mat-list-item",
+        "title": "interactiveTour.global.print-tool-title",
+        "text": "interactiveTour.global.print-tool",
+        "disableInteraction": true
       },
       {
-        "element": "igo-layer-item:nth-child(2) button",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.layer-eye",
-        "onShow": {
-          "action": "click"
-        }
+        "element": "igo-actionbar-item:nth-child(10) mat-list-item",
+        "title": "interactiveTour.global.share-map-title",
+        "text": "interactiveTour.global.share-map",
+        "disableInteraction": true
       },
       {
-        "element": "igo-layer-item:nth-child(2) button:nth-of-type(2)",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.layer-tool-btn",
-        "beforeChange": {
+        "element": "igo-actionbar-item:nth-child(11) mat-list-item",
+        "title": "interactiveTour.global.about-title",
+        "text": "interactiveTour.global.about",
+        "disableInteraction": true,
+        "beforeShow": {
           "action": "click",
-          "waitFor": ".igo-layer-actions-container",
-          "condition": "!.igo-layer-actions-container"
+          "element": "#homeButton",
+          "condition": "#homeButton"
         }
       },
       {
-        "element": ".igo-layer-actions-container",
-        "title": "interactiveTour.global.layers-title",
-        "text": "interactiveTour.global.layer-tool"
+        "element": "igo-actionbar-item:nth-child(3) mat-list-item button",
+        "title": "interactiveTour.global.context-title",
+        "text": "interactiveTour.global.tool-choose",
+        "disableInteraction": true,
+        "beforeShow": {
+          "action": "click",
+          "element": "igo-actionbar-item:nth-child(3) mat-list-item"
+        }
       },
       {
         "element": "#homeButton",
         "title": "interactiveTour.global.menu-button-title",
         "text": "interactiveTour.global.home-button",
-        "onHide": {
+        "beforeChange": {
           "action": "click"
         }
       },
       {
         "element": "#menu-button",
         "title": "interactiveTour.global.menu-button-title",
         "text": "interactiveTour.global.menu-button-close",
-        "onHide": {
-          "action": "click"
+        "beforeShow": {
+          "action": "click",
+          "condition": "mat-sidenav:not(.mat-drawer-opened)"
+        },
+        "beforeChange": {
+          "action": "click",
+          "element": "igo-actionbar-item:nth-child(3) mat-list-item",
+          "waitFor": "igo-actionbar-item"
         }
       },
       {
         "element": "igo-geolocate-button",
         "title": "interactiveTour.global.geolocate-title",
-        "text": "interactiveTour.global.geolocate"
+        "text": "interactiveTour.global.geolocate",
+        "beforeShow": {
+          "action": "click",
+          "element": "#menu-button",
+          "condition": "mat-sidenav.mat-drawer-opened"
+        }
       },
       {
         "element": "igo-baselayers-switcher",

src/contexts/_base.json

@@ -73,8 +73,8 @@
     "searchResults",
     "contextManager",
     "mapTools",
-    "measurer",
     "spatialFilter",
+    "measurer",
     "directions",
     "catalog",
     "importExport",

src/locale/en.json

@@ -48,21 +48,40 @@
       "search-settings": "Allows you to configure: the type of result, the number of desired results, etc.",
       "toolbox-title": "TOOLBOX",
       "toolbox": "On selection of the tool, the application switches inside and displays its content",
+      "search-tool-title": "SEARCH RESULTS TOOL",
+      "search-tool": "Search results tool allow to display the results that come from the search bar input",
       "context-title": "CONTEXTS",
       "context": "A context is a predefined map made up of several layers grouped together according to a theme",
+      "map-tool-title": "MAP",
+      "map-tool": "All layers are display in this tool. Some manipulations can also be done on these",
+      "spatial-filter-title": "SPATIAL FILTER",
+      "spatial-filter": "Spatial filter allow to extract entities by predefined or drawn zone",
+      "measurer-tool-title": "MEASURER TOOL",
+      "measurer-tool": "For distance, perimeter and ground area calculation",
+      "directions-tool-title": "DIRECTIONS",
+      "directions-tool": "Allow route creation based on departure, arrival and intermediate stop",
+      "catalog-tool-title": "DATA CATALOG",
+      "catalog-tool": "Catalogs contain all the available layers in IGO. These are classified by general topic (catalog) and sub-categories",
+      "import-export-title": "IMPORT-EXPORT",
+      "import-export": "Import-export tool allow layers importation and exportation",
+      "print-tool-title": "PRINT",
+      "print-tool": "Print the active map according to certain format",
+      "share-map-title": "SHARE-MAP TOOL",
+      "share-map": "Share a map by his URL link",
+      "about-title": "À PROPOS",
+      "about": "About IGO and his features!",
+      "tool-choose": "When we select a tool and get inside his container",
       "context-list": "Inside CONTEXTS, the tool displays the list of predefined thematic maps",
-      "context-item": "The SIMPLE context which represents a theme and contains certain layers",
-      "context-filter": "The 'FILTRE TEMPOREL' context contains another grouping",
-      "context-filter-click": "Let's select the 'FILTRE TEMPOREL' context",
+      "context-item": "This is a context which represents a theme and contains certain layers",
+      "context-item2": "This is another context which we will select to see what it represents",
       "layers-title": "MAP",
       "layers": "The application switches inside and displays the layers that make up THE MAP of this context",
-      "layers-visible": "Note that some layers are active and visible in the map. Non-active / visible layers are indicated by the crossed out black eye",
-      "layer-embacle": "Layer of ice jams during flooding",
-      "legend": "By clicking on the title the legend opens",
-      "layer-eye": "Click on the eye to allow layer's to be display on the map",
-      "layer-tool-btn": "A click on eye, activates or deactivates the display of the layer",
+      "layer-name": "Layer displayed on the map",
+      "legend": "By clicking on the title the legend opens and closes",
+      "layer-eye": "Click on the eye to allow and disallow layer's to be display on the map",
+      "layer-tool-btn": "Activate or deactivate tools panel on this layer",
       "layer-tool": "Tools panel available for this layer",
-      "home-button": "Back to main menu",
+      "home-button": "This button can be used to get back to main menu",
       "menu-button-close": "Click to close menu",
       "geolocate-title": "GEOLOCATE",
       "geolocate": "To zoom the map to your location",

src/locale/fr.json

@@ -47,22 +47,41 @@
       "search-settings": "Permet de configurer: le type de résultat, le nombre de résultats souhaités, etc.",
       "toolbox-title": "LES OUTILS",
       "toolbox": "Sur sélection de l'outil, l'application bascule à l'intérieur et affiche son contenu",
+      "search-tool-title": "OUTIL DE RECHERCHE",
+      "search-tool": "L'outil de recherche permet d'afficher les résultats provenant de l'entrée de la barre de recherche",
       "context-title": "LES CONTEXTES",
       "context": "Un contexte est une carte prédéfinie constituée de plusieurs couches regroupées selon une thématique",
+      "map-tool-title": "CARTE",
+      "map-tool": "L'ensemble des couches présentes sur la carte seront affichés dans cet outil. Plusieurs manipulations peuvent également être réalisées sur celles-ci",
+      "spatial-filter-title": "FILTRE SPATIAL",
+      "spatial-filter": "Le filtre spatial permet l'extraction d'entités par des zones prédéfinies ou dessinées à la main",
+      "measurer-tool-title": "OUTIL DE MESURE",
+      "measurer-tool": "Pour le calcul de distances, de périmètre et de superficie terrain",
+      "directions-tool-title": "ITINÉRAIRE",
+      "directions-tool": "Permet la création d'itinéraire à partir d'un départ, d'une arrivée et de points intermédiaires",
+      "catalog-tool-title": "CATALOGUE DE DONNÉES",
+      "catalog-tool": "Les catalogues contiennent l'ensemble des couches disponibles dans IGO. Celles-ci sont classifiés par thème (catalogue), puis par sous-thème",
+      "import-export-title": "IMPORT-EXPORT",
+      "import-export": "L'outil d'import-export permet l'importation et l'exportation de couches de données selon des formats préçis",
+      "print-tool-title": "OUTIL D'IMPRESSION",
+      "print-tool": "Permet d'imprimer la carte active en format image ou PDF",
+      "share-map-title": "PARTAGE DE CARTE",
+      "share-map": "Partager une carte à partir d'un URL",
+      "about-title": "À PROPOS",
+      "about": "À propos de IGO et de ses fonctionnalités!",
+      "tool-choose": "Lorsque nous sélectionnons un outil et entrons dans son contenu",
       "context-list": "À l'intérieur des CONTEXTES, l'outil affiche la liste des cartes thématiques prédéfinies",
-      "context-item": "Ici le contexte SIMPLE qui représente une thématique et contient certaines couches",
-      "context-filter": "Ici le contexte FILTRE TEMPOREL contient un autre regroupement",
-      "context-filter-click": "Sélectionnons le contexte FILTRE TEMPOREL",
+      "context-item": "Ce contexte représente une thématique et contient certaines couches",
+      "context-item2": "Sélectionnons celui-ci afin d'y voir le contenu",
       "layers-title": "LA CARTE",
       "layers": "L'application bascule à l'intérieur et affiche les couches qui constituent LA CARTE de ce contexte",
-      "layers-visible": "On remarque que certaines couches sont actives et visibles dans la carte. Les couches non actives/visibles sont indiquées par l'oeil noir barré",
-      "layer-embacle": "Couche des embâcles lors d'inondation",
-      "legend": "En cliquant sur le titre la légende ouvre",
-      "layer-eye": "Un clique sur oeil, active ou désactive l'affichage de la couche",
+      "layer-name": "Couche présente sur la carte",
+      "legend": "En cliquant sur le titre la légende s'ouvre et se referme",
+      "layer-eye": "Un clique sur oeil, il est possible d'activer ou de désactiver l'affichage de la couche",
       "layer-tool-btn": "Activer les outils disponibles sur CETTE couche",
       "layer-tool": "Panneau des outils disponibles pour cette couche",
-      "home-button": "Retour au menu principal",
-      "menu-button-close": "Cliquer pour fermer le menu",
+      "home-button": "Ce bouton permet le retour au menu principal",
+      "menu-button-close": "Cliquer pour ouvrir et fermer le menu",
       "geolocate-title": "GEOLOCALISATION",
       "geolocate": "Pour zoomer la carte sur votre position",
       "baselayers-title": "FONDS DE CARTE",