18448-recolor-point-geometry-into-blue-for-selected-area (#734)

* Update FocusedGeometryRenderer.ts * Update common.json Fix the missed part of https://kontur.fibery.io/Tasks/Task/Sort-HOT-Projects-panel-by-project-number-by-default-18224 * Update common.json Removing the article 'the' for the button 'Set reference area' in user profile * Delete src/features/focused_geometry_layer/icons/marker_black.png * Update some labels and wordings * Update common.json Fixed some wordings * Update common.json * Update common.json * Update common.json * Update common.json * Update common.json * Update toolBarTexts.spec.ts * Update toolBarTextsWithUser.spec.ts * Update profilePage.ts * Update login.spec.ts * Update common.json * Update common.json * Update common.json * Update common.json
konturio · May 22, 2024 · 0d11600 · 0d11600
1 parent 9baec4b
commit 0d11600
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 67 deletions.
diff --git a/e2e/login.spec.ts b/e2e/login.spec.ts
@@ -5,7 +5,7 @@ const projects = getProjects();
 
 // Create a loop to loop over all the projects and create a test for everyone
 for (const project of projects) {
-  test(`As Guest, I can login to ${project.title}, check that this profile is mine, and log out`, async ({
+  test(`As Guest, I can log in to ${project.title}, check that this profile is mine, and log out`, async ({
     pageManager,
   }) => {
     await pageManager.atBrowser.openProject(project);

diff --git a/e2e/page-objects/profilePage.ts b/e2e/page-objects/profilePage.ts
@@ -3,14 +3,14 @@ import { HelperBase } from './helperBase';
 
 export class ProfilePage extends HelperBase {
   /**
-   * This method checks that at profile page there is a logout button. Also checks that at least one element with "Profile" text is present. After that it compares the email got with email passed to it.
+   * This method checks that at profile page there is a log out button. Also checks that at least one element with "Profile" text is present. After that it compares the email got with email passed to it.
    * @param email expected email to what value should be equal to
    */
 
   async checkLogoutBtnProfileTitleAndEmail(email: string) {
-    const logoutBtn = this.page.getByRole('button', { name: 'Logout' });
+    const logoutBtn = this.page.getByRole('button', { name: 'Log out' });
     const profileTextElements = this.page.getByText('Profile').nth(1);
-    // Check that logout button is present
+    // Check that log out button is present
     await expect(logoutBtn).toBeVisible();
     await expect(profileTextElements).toBeVisible();
     const actualEmail = await this.getEmailValueAndCheckThisFieldIsDisabled();
@@ -32,14 +32,14 @@ export class ProfilePage extends HelperBase {
    * This method clicks log out and waits a bit after that
    */
   async clickLogout() {
-    await this.page.getByRole('button', { name: 'Logout' }).click();
+    await this.page.getByRole('button', { name: 'Log out' }).click();
   }
 
   /**
-   * This method checks that page doesn't have any logout button or elements with Profile text
+   * This method checks that page doesn't have any log out button or elements with Profile text
    */
   async checkLogoutBtnAndProfileAbsence() {
-    const logoutBtn = this.page.getByRole('button', { name: 'Logout' });
+    const logoutBtn = this.page.getByRole('button', { name: 'Log out' });
     const profileTextElements = this.page.getByText('Profile').nth(1);
     await expect(logoutBtn).not.toBeVisible();
     await expect(profileTextElements).not.toBeVisible();

diff --git a/e2e/toolBarTexts.spec.ts b/e2e/toolBarTexts.spec.ts
@@ -17,8 +17,8 @@ const availableToolbarFeaturesGuestOAM = [
   'Edit map in OSM',
 ];
 const hiddenToolbarFeaturesGuest = [
-  'Bivariate Matrix',
-  'MCDA',
+  'Bivariate matrix',
+  'Create MCDA',
   'Upload MCDA',
   'Create layer',
   'Record sensors',

diff --git a/e2e/toolBarTextsWithUser.spec.ts b/e2e/toolBarTextsWithUser.spec.ts
@@ -16,8 +16,8 @@ const availableToolbarFeaturesOAMUserWithNoRights = [
   'Edit map in OSM',
 ];
 const hiddenToolbarFeaturesUserWithNoRights = [
-  'Bivariate Matrix',
-  'MCDA',
+  'Bivariate matrix',
+  'Create MCDA',
   'Upload MCDA',
   'Create layer',
   'Record sensors',

diff --git a/src/core/localization/translations/en/common.json b/src/core/localization/translations/en/common.json
@@ -2,13 +2,13 @@
   "km": "km",
   "m": "m",
   "to": "to",
-  "logout": "Logout",
+  "logout": "Log out",
   "save": "Save",
   "cancel": "Cancel",
   "create": "Create",
   "disasters": "Disasters",
   "loading": "Loading...",
-  "loading_events": "Loading events",
+  "loading_events": "Loading disasters",
   "legend": "Legend",
   "maps": "maps",
   "vertical_direction": "Vertical direction",
@@ -21,15 +21,15 @@
     "panel_title": "Toolbar",
     "download": "Download",
     "delete": "Delete",
-    "boundary_selector": "Select\nadmin unit",
-    "create_layer": "Create\nlayer",
-    "geometry_uploader": "Upload\nGeoJSON",
-    "focused_geometry_editor": "Draw or edit\ngeometry",
+    "boundary_selector": "Select admin unit",
+    "create_layer": "Create layer",
+    "geometry_uploader": "Upload GeoJSON",
+    "focused_geometry_editor": "Draw or edit geometry",
     "edit_in_osm": "Edit map in OSM",
     "record_sensors": "Record sensors",
     "tools_label": "Tools",
     "selected_area_label": "Selected area",
-    "upload_mcda": "Upload\nMCDA"
+    "upload_mcda": "Upload MCDA"
   },
   "feed": "Feed",
   "deselect": "Deselect",
@@ -44,27 +44,27 @@
     "Kontur_public_feed_description": "The feed contains real-time data about Cyclones, Droughts, Earthquakes, Floods, Volcanoes, Wildfires."
   },
   "errors": {
-    "default": "Sorry, we are having issues, which will be fixed soon",
-    "timeout": "Request Timeout",
+    "default": "Sorry, we are having issues which will be fixed soon",
+    "timeout": "Request timeout",
     "cannot_connect": "Can't connect to server",
     "forbidden": "Forbidden",
     "not_found": "Not found",
     "unknown": "Unknown",
-    "server_error": "Server Error"
+    "server_error": "Server error"
   },
   "categories": {
     "overlays": "Overlays",
     "basemap": "Basemap"
   },
   "groups": {
     "layers_in_selected_area": "Layers in selected area",
-    "your_layers": "Your Layers",
-    "kontur_analytics": "Kontur Analytics",
-    "qa": "QA",
-    "osmbasedmap": "OpenStreetMap Based",
+    "your_layers": "Your layers",
+    "kontur_analytics": "Kontur analytics",
+    "qa": "OpenStreetMap inspector",
+    "osmbasedmap": "OpenStreetMap based",
     "other": "Other",
     "elevation": "Elevation",
-    "photo": "Photo",
+    "photo": "Imagery",
     "map": "Map"
   },
   "advanced_analytics_data_list": {
@@ -82,11 +82,11 @@
   },
   "mcda": {
     "title": "Multi-criteria decision analysis",
-    "name": "MCDA",
-    "modal_title": "Customize analysis",
-    "modal_input_name": "Name",
-    "modal_input_name_placeholder": "Set layer name",
-    "modal_input_indicators": "List of layers",
+    "name": "Create MCDA",
+    "modal_title": "Multi-criteria decision analysis",
+    "modal_input_name": "Analysis name",
+    "modal_input_name_placeholder": "e.g., Climate change",
+    "modal_input_indicators": "Layer list",
     "modal_input_indicators_placeholder": "Select layers",
     "modal_input_indicators_no_options": "No options",
     "btn_cancel": "Cancel",
@@ -95,10 +95,10 @@
     "error_bad_layer_data": "Invalid MCDA layer data",
     "error_invalid_file": "Invalid MCDA file format",
     "legend_title": "Legend",
-    "legend_subtitle": "Hexagons are colored as weighted average of normalized and transformed layers values",
+    "legend_subtitle": "Hexagons are colored based on analysis layer settings. Click a hexagon to see its values.",
     "layer_editor": {
       "save_changes": "Save changes",
-      "range": "Range",
+      "range": "Value range",
       "outliers": "Outliers",
       "sentiment": "Sentiment",
       "weight": "Weight",
@@ -109,7 +109,7 @@
       "reset_limits_to_default": "Reset limits to default",
       "exclude": "Exclude",
       "as_values_on_limits": "As values on limits",
-      "natural_logarithm": "Natural logarithm",
+      "natural_logarithm": "Logarithm",
       "square_root": "Square root",
       "no": "No",
       "max_min": "Max-min",
@@ -125,18 +125,18 @@
     "good": "Good"
   },
   "event_list": {
-    "warning_title": "Can't use map as filter",
-    "warning_description": "Map not ready yet, try later",
-    "bbox_filter_button": "Use map view as filter",
+    "warning_title": "Cannot filter by map view",
+    "warning_description": "Map is not ready yet, try later",
+    "bbox_filter_button": "Filter by map view",
     "analytics": {
       "affected_people": {
-        "tooltip": "Affected People",
+        "tooltip": "Affected people",
         "value": "No humanitarian impact"
       },
-      "settled_area_tooltip": "Settled Area",
+      "settled_area_tooltip": "Settled area",
       "loss_tooltip": "Estimated loss"
     },
-    "no_event_in_feed": "Event not found in the current event feed",
+    "no_event_in_feed": "The disaster was not found in the current disaster feed",
     "no_selected_disaster": "No disaster selected",
     "chose_disaster": "Choose disaster",
     "no_historical_disasters": "No historical disasters in this area",
@@ -148,7 +148,7 @@
     "severity_moderate": "Moderate",
     "severity_severe": "Severe",
     "severity_extreme": "Extreme",
-    "open_timeline_button": "Open timeline"
+    "open_timeline_button": "Timeline"
   },
   "create_layer": {
     "edit_layer": "Edit Layer",
@@ -172,17 +172,17 @@
   },
   "analytics_panel": {
     "header_title": "Analytics",
-    "error_loading": "Error while fetching analytics data",
-    "info_short": "Calculations are made for the selected area."
+    "error_loading": "Failed receiving data about selected area. It may be too large.",
+    "info_short": "Calculations are made for selected area"
   },
   "advanced_analytics_panel": {
     "header_title": "Advanced analytics",
     "error": "Error while fetching advanced analytics data"
   },
   "advanced_analytics_empty": {
-    "not_found": "Sorry, requested event not found.",
-    "error": "An error occured!",
-    "analytics_for_selected": "Analytics for a selected area",
+    "not_found": "Sorry, the requested disaster was not found",
+    "error": "An error occured",
+    "analytics_for_selected": "Analytics for selected area",
     "will_be_provided": "will be provided here",
     "no_analytics": "No analytics for the selected area"
   },
@@ -212,20 +212,20 @@
   },
   "focus_geometry_layer": {
     "settings": {
-      "name": "Selected Area"
+      "name": "Selected area"
     }
   },
   "reference_area_layer": {
     "settings": {
-      "name": "Reference Area"
+      "name": "Reference area"
     }
   },
   "drawings": {
-    "self_directions_not_supported": "Self intersections are not supported!"
+    "self_directions_not_supported": "Self intersections are not supported"
   },
   "bivariate": {
     "panel": {
-      "header": "Bivariate Matrix"
+      "header": "Bivariate matrix"
     },
     "matrix": {
       "caption": {
@@ -291,10 +291,10 @@
     "log_in": "Log in",
     "description": "Please log in to change your settings",
     "error": {
-      "email_empty": "Email has not to be empty!",
-      "email_invalid": "Email has to be valid!",
-      "password": "Password has not to be empty!",
-      "connect": "Couldn't connect to authentication service"
+      "email_empty": "Email cannot be empty",
+      "email_invalid": "Email has to be valid",
+      "password": "Password cannot be empty",
+      "connect": "Could not connect to authentication service"
     }
   },
   "reports": {
@@ -335,7 +335,7 @@
     "interfaceTheme": "Theme",
     "interfaceLanguage": "Language",
     "units": "Units",
-    "fullName": "Full Name",
+    "fullName": "Full name",
     "email": "Email",
     "metric": "metric",
     "imperialBeta": "imperial (beta)",
@@ -362,21 +362,21 @@
       "freehand_geometry": "Freehand geometry",
       "to_replace_reference_area": "To replace reference area, select an area on the map and click \"Save as reference area\" on toolbar.",
       "select_are_on_the_map": "Select an area on the map and click \"Save as reference area\" on toolbar to use it in further analysis.",
-      "set_the_reference_area": "Set the reference area"
+      "set_the_reference_area": "Set reference area"
     }
   },
   "current_event": {
-    "not_found_request": "Sorry, requested event not found."
+    "not_found_request": "Sorry, the requested disaster was not found"
   },
   "locate_me": {
     "get_location_error": "Error while getting location",
     "feature_title": "Locate me"
   },
-  "episode": "Episode",
+  "episode": "Timeline",
   "loading_episodes": "Loading Episodes",
   "cookie_banner": {
     "header": "We value your privacy",
-    "body": "We use absolutely necessary cookies to provide you personalized services and optional cookies to improve {{appName}} and your experience. You can manage cookies settings or withdraw consent to optional cookies at any time.\nFor more information, please, check our [Privacy Policy](about/privacy)",
+    "body": "We use absolutely necessary cookies to provide you personalized services and optional cookies to improve {{appName}} and your experience. You can manage cookie settings or withdraw consent to optional cookies at any time.\nFor more information, please, check our [Privacy Policy](about/privacy)",
     "decline_all": "Decline optional cookies",
     "accept_all": "Accept optional cookies"
   },
@@ -385,17 +385,17 @@
     "finish": "Stop sensor recording",
     "finishMessage": "Recording has been finished",
     "startMessage": "Recording has been started",
-    "noSensorsError": "Your device desn't have the required sensors"
+    "noSensorsError": "Your device does not have the required sensors"
   },
   "layer_features_panel": {
-    "empty": "Layer features will be provided here",
-    "noFeatureSelected": "No feature selected",
-    "chooseFeature": "Choose feature",
-    "listInfo": "The list is filtered by selected area and sorted by priority and mapped percentage."
+    "empty": "Layer features within selected area will be provided here",
+    "noFeatureSelected": "No layer feature selected",
+    "chooseFeature": "Choose layer feature",
+    "listInfo": "The list is filtered by selected area and sorted by project number"
   },
   "reference_area": {
     "save_as_reference_area": "Save as reference area",
-    "error_couldnt_save": "Unfortunately, we couldn't save your reference area. Please try again.",
-    "selected_area_saved_as_reference_area": "Selected area has been saved as reference area. You can find it in profile."
+    "error_couldnt_save": "Unfortunately, we could not save your reference area. Please try again.",
+    "selected_area_saved_as_reference_area": "Selected area has been saved as reference area in your profile"
   }
 }
diff --git a/src/features/focused_geometry_layer/icons/marker_black.png b/src/features/focused_geometry_layer/icons/marker_black.png
diff --git a/src/features/focused_geometry_layer/renderers/FocusedGeometryRenderer.ts b/src/features/focused_geometry_layer/renderers/FocusedGeometryRenderer.ts
@@ -1,5 +1,5 @@
 import { UserGeometryRenderer } from '~core/logical_layers/renderers/UserGeometryRenderer';
-import Icon from '../icons/marker_black.png';
+import Icon from '../icons/marker_blue.png';
 import { FOCUSED_GEOMETRY_COLOR } from '../constants';
 
 const icons = {