Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Measurer tour fix #501

Merged
merged 2 commits into from
Sep 10, 2020
Merged

Measurer tour fix #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dbb8ef
fix(measurer-tool): fix interactive tour
PhilippeLafreniere18 Sep 10, 2020
ff06018
wip
PhilippeLafreniere18 Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 21 additions & 40 deletions src/config/interactiveTour.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,47 +179,36 @@
},
{
"element": "div.measure-type-toggle",
"text": "interactiveTour.measurer.type",
"title": "interactiveTour.measurer.type-title"
"text": "interactiveTour.measurer.type"
},
{
"element": "div.measure-options",
"text": "interactiveTour.measurer.options",
"title": "interactiveTour.measurer.options-title"
"text": "interactiveTour.measurer.options"
},
{
"element": "div.measure-options mat-slide-toggle:first-child",
"text": "interactiveTour.measurer.toggle-2",
"title": "interactiveTour.measurer.toggle-2-title"
"text": "interactiveTour.measurer.toggle-2"
},
{
"element": "div.measure-options mat-slide-toggle:nth-child(2)",
"text": "interactiveTour.measurer.toggle-3",
"title": "interactiveTour.measurer.toggle-3-title"
"text": "interactiveTour.measurer.toggle-3"
},
{
"element": "div.measure-options mat-slide-toggle:last-child",
"text": "interactiveTour.measurer.toggle-4",
"title": "interactiveTour.measurer.toggle-4-title"
"text": "interactiveTour.measurer.toggle-4"
},
{
"element": "mat-sidenav-content",
"element": "app-map-overlay",
"text": "interactiveTour.measurer.map",
"title": "interactiveTour.measurer.map-title",
"position": "",
"beforeChange": {
"action": "click"
}
"position": ""
},
{
"element": "igo-measurer-item[ng-reflect-measure-type=length] mat-form-field.measure-field",
"text": "interactiveTour.measurer.measure-field",
"title": "interactiveTour.measurer.measure-field-title"
"element": "igo-measurer-item:first-of-type mat-form-field.measure-field",
"text": "interactiveTour.measurer.measure-field"
},
{
"element": "igo-measurer-item[ng-reflect-measure-type=length] mat-form-field.unit-field",
"text": "interactiveTour.measurer.measure-unit",
"title": "interactiveTour.measurer.measure-unit-title"
"element": "igo-measurer-item:first-of-type mat-form-field.unit-field",
"text": "interactiveTour.measurer.measure-unit"
},
{
"element": "mat-button-toggle[ng-reflect-value=area] button",
Expand All @@ -229,24 +218,20 @@
}
},
{
"element": "igo-measurer-item[ng-reflect-measure-type=length] mat-form-field.measure-field",
"text": "interactiveTour.measurer.perimeter",
"title": "interactiveTour.measurer.perimeter-title"
"element": "igo-measurer-item:first-of-type mat-form-field.measure-field",
"text": "interactiveTour.measurer.perimeter"
},
{
"element": "igo-measurer-item[ng-reflect-measure-type=area] mat-form-field.measure-field",
"text": "interactiveTour.measurer.area-field",
"title": "interactiveTour.measurer.area-field-title"
"element": "igo-measurer-item:last-of-type mat-form-field.measure-field",
"text": "interactiveTour.measurer.area-field"
},
{
"element": "igo-measurer-item[ng-reflect-measure-type=area] mat-form-field.unit-field",
"text": "interactiveTour.measurer.area-unit",
"title": "interactiveTour.measurer.area-unit-title"
"element": "igo-measurer-item:last-of-type mat-form-field.unit-field",
"text": "interactiveTour.measurer.area-unit"
},
{
"element": "mat-sidenav-content",
"element": "app-map-overlay",
"text": "interactiveTour.measurer.map-2",
"title": "interactiveTour.measurer.map-title",
"position": "",
"onHide": {
"action": "click",
Expand All @@ -256,27 +241,23 @@
},
{
"element": "igo-entity-table.table-compact",
"text": "interactiveTour.measurer.results",
"title": "interactiveTour.measurer.results-title"
"text": "interactiveTour.measurer.results"
},
{
"element": "div.measure-store-buttons",
"text": "interactiveTour.measurer.results-buttons",
"title": "interactiveTour.measurer.results-buttons-title"
"text": "interactiveTour.measurer.results-buttons"
},
{
"element": "div.mat-checkbox-inner-container",
"text": "interactiveTour.measurer.check-measure",
"title": "interactiveTour.measurer.check-measure-title",
"onShow": {
"action": "click",
"condition": "div.measure-store-buttons .mat-focus-indicator:disabled"
}
},
{
"element": "div.measure-store-buttons",
"text": "interactiveTour.measurer.active-results-buttons",
"title": "interactiveTour.measurer.active-results-buttons-title"
"text": "interactiveTour.measurer.active-results-buttons"
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions src/locale/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"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": "Un clique sur oeil, active ou désactive l'affichage de la couche",
"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-tool": "Tools panel available for this layer",
"home-button": "Back to main menu",
Expand All @@ -77,7 +77,7 @@
"end": "Applies only to certain layers where the filter can be applied and which are present in the map"
},
"measurer": {
"title": "MEASURER",
"title": "MEASURER TOOL",
"start": "Guided tour of the measuring tool",
"type-title": "Measure type",
"type": "Choose the desired measure",
Expand All @@ -86,7 +86,7 @@
"toggle-2": "Activate and deactivate to allow drawing on the map",
"toggle-2-title": "Activation / Deactivation",
"toggle-3": "Activate and deactivate to allow measure display on the map",
"toggle-3-title": "Affichage des mesures",
"toggle-3-title": "Measure's display",
"toggle-4": "Automatic units allow to use and calculate with predefined measure units",
"toggle-4-title": "Automatic units",
"map": "To use this tool, one click allow to start drawing and two clicks allow to finish it",
Expand All @@ -109,7 +109,7 @@
"results-buttons-title": "Calculation buttons",
"check-measure": "To activate table's buttons, select one or more results",
"check-measure-title": "Measure selection",
"active-results-buttons": "Button's are now active!",
"active-results-buttons": "If so measure are selected, button's are now active!",
"active-results-buttons-title": "Results table buttons"
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/locale/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"end": "S'applique uniquement sur certaine couches ou le filtre peut s'appliquer et qui sont présentes dans la carte"
},
"measurer": {
"title": "MESURE",
"title": "OUTIL DE MESURE",
"start": "Tour guidé de l'outil de mesure",
"type-title": "Type de mesure",
"type": "Choisir le type de mesure souhaité",
Expand Down Expand Up @@ -108,7 +108,7 @@
"results-buttons-title": "Boutons de la table des résultats",
"check-measure": "Pour activer les boutons de la table, sélectionner une ou plusieurs mesures",
"check-measure-title": "Sélection des mesures",
"active-results-buttons": "Les boutons sont maintenant actifs!",
"active-results-buttons": "Si des mesures sont sélectionnées, les boutons seront maintenant activés!",
"active-results-buttons-title": "Boutons de la table des résultats"
}
}
Expand Down