💄 Only show checkbox for polygon sharing when needed and remove hint

ENT8R · Feb 26, 2024 · 990f9bc · 990f9bc
1 parent 22cbef1
commit 990f9bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/app/js/modals/share.js b/app/js/modals/share.js
@@ -1,5 +1,6 @@
 import * as Localizer from '../localizer.js';
 import Modal from './modal.js';
+import { AREA } from '../query.js';
 import Toast from '../toast.js';
 
 export default class Share extends Modal {
@@ -21,6 +22,11 @@ export default class Share extends Modal {
         type: 'application/json',
       }));
       document.getElementById('download').download = `NotesReview-${query.history[query.history.length - 1].time.toISOString()}.json`;
+
+      // Only show the checkbox for adding the polygon shape if it would have an effect
+      // (i.e. a custom area is used, no countries are selected but something was drawn on the map)
+      document.getElementById('share-polygon-checkbox').style.display =
+        (query.data.area === AREA.CUSTOM && query.data.countries === null && query.data.polygon !== null) ? 'block' : 'none';
     });
 
     // Update links if a parameter changed

diff --git a/app/js/query.js b/app/js/query.js
@@ -25,7 +25,7 @@ const COMMENTED = {
   ONLY: 'only'
 };
 
-const AREA = {
+export const AREA = {
   GLOBAL: 'global',
   VIEW: 'view',
   CUSTOM: 'custom'

diff --git a/app/locales/en.json b/app/locales/en.json
@@ -117,7 +117,7 @@
         "author": "The author is the user who created the note",
         "user": "A user is any user who left a comment on the note\n(including the author)",
         "customArea": "Select countries by clicking on them or draw a custom shape using the toolbar on the left",
-        "sharePolygon": "Share shape for custom area selection (may be unreadable)"
+        "sharePolygon": "Share shape for custom area selection"
     },
     "settings": {
         "choose": "Choose an option",

diff --git a/app/templates/modals/share.hbs b/app/templates/modals/share.hbs
@@ -22,10 +22,10 @@
       <span data-i18n="description.shareView">Share current view of the map</span>
     </label>
 
-    <label class="form-checkbox">
-      <input type="checkbox" class="update-permalink" id="share-polygon">
+    <label class="form-checkbox" id="share-polygon-checkbox">
+      <input type="checkbox" class="update-permalink" id="share-polygon" checked=>
       <i class="form-icon"></i>
-      <span data-i18n="description.sharePolygon">Share shape for custom area selection (may be unreadable)</span>
+      <span data-i18n="description.sharePolygon">Share shape for custom area selection</span>
     </label>
   </div>
 </div>