Skip to content

TagSpaces is an offline, open source, document manager with tagging support

TSN666 - Integrate MGRS geo coordinate system (#1436)

Stanimir29b83a31ffb9
diff --git a/app/components/CustomLogo.tsx b/app/components/CustomLogo.tsx
index ea5be282b..4a343c9c0 100644
--- a/app/components/CustomLogo.tsx
+++ b/app/components/CustomLogo.tsx
@@ -32,7 +32,7 @@ import AppConfig from '-/config';
const AppVersionBadge = withStyles(theme => ({
badge: {
top: '25%',
- right: -15,
+ right: -25,
color:
theme.palette.type === 'light'
? theme.palette.grey[900]
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index 5dee1000b..663ea8a8f 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -54,14 +54,13 @@ import {
TileLayer,
withLeaflet
} from 'react-leaflet';
-import OpenLocationCode from 'open-location-code-typescript';
import { IconButton } from '@material-ui/core';
import TagDropContainer from './TagDropContainer';
import ColorPickerDialog from './dialogs/ColorPickerDialog';
import MoveCopyFilesDialog from './dialogs/MoveCopyFilesDialog';
import i18n from '../services/i18n';
import { enhanceOpenedEntry } from '-/services/utils-io';
-import { formatFileSize, isPlusCode } from '-/utils/misc';
+import { formatFileSize, parseGeoLocation } from '-/utils/misc';
import {
extractContainingDirectoryPath,
getThumbFileLocationForFile,
@@ -592,11 +591,9 @@ const EntryProperties = (props: Props) => {
}
if (tags) {
for (let i = 0; i < tags.length; i += 1) {
- if (isPlusCode(tags[i].title)) {
- const coord = OpenLocationCode.decode(tags[i].title);
- const lat = Number(coord.latitudeCenter.toFixed(7));
- const lng = Number(coord.longitudeCenter.toFixed(7));
- return { lat, lng };
+ const location = parseGeoLocation(tags[i].title);
+ if (location !== undefined) {
+ return location;
}
}
}
diff --git a/app/components/Search.tsx b/app/components/Search.tsx
index 12e5c89eb..bc0a290fb 100644
--- a/app/components/Search.tsx
+++ b/app/components/Search.tsx
@@ -52,7 +52,6 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';
import ButtonGroup from '@material-ui/core/ButtonGroup';
import ToggleButton from '@material-ui/lab/ToggleButton';
import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup';
-import OpenLocationCode from 'open-location-code-typescript';
// import { FormControlLabel, Switch } from '@material-ui/core';
import TagsSelect from './TagsSelect';
import CustomLogo from './CustomLogo';
@@ -73,7 +72,7 @@ import { FileTypeGroups } from '-/services/search';
import { Pro } from '../pro';
import SearchMenu from './menus/SearchMenu';
import { formatDateTime, extractTimePeriod } from '-/utils/dates';
-import { isPlusCode, parseLatLon } from '-/utils/misc';
+import { parseGeoLocation, parseLatLon } from '-/utils/misc';
import { AppConfig } from '-/config';
import { actions as SearchActions, getSearches } from '-/reducers/searches';
import { TS } from '-/tagspaces.namespace';
@@ -377,28 +376,28 @@ const Search = (props: Props) => {
const { target } = event;
const { value } = target;
let lat = null;
- let lon = null;
+ let lng = null;
let tagPHelper;
- if (isPlusCode(value)) {
- const coord = OpenLocationCode.decode(value);
- lat = Number(coord.latitudeCenter.toFixed(7));
- lon = Number(coord.longitudeCenter.toFixed(7));
+ const location = parseGeoLocation(value);
+ if (location !== undefined) {
+ ({ lat, lng } = location);
} else {
const latLon = parseLatLon(value);
if (latLon) {
- ({ lat, lon } = latLon);
+ ({ lat } = latLon);
+ lng = latLon.lon;
}
}
- if (lat && lon) {
- tagPHelper = 'Place at lat: ' + lat + ' long: ' + lon;
+ if (lat && lng) {
+ tagPHelper = 'Place at lat: ' + lat + ' long: ' + lng;
} else {
tagPHelper = '';
}
setTagPlace(value);
setTagPlaceLat(lat);
- setTagPlaceLong(lon);
+ setTagPlaceLong(lng);
setTagPlaceHelper(tagPHelper);
};
diff --git a/app/components/TagContainer.tsx b/app/components/TagContainer.tsx
index 05af6f862..5d5c95587 100644
--- a/app/components/TagContainer.tsx
+++ b/app/components/TagContainer.tsx
@@ -26,7 +26,7 @@ import DateIcon from '@material-ui/icons/DateRange';
import RemoveTagIcon from '@material-ui/icons/Close';
import { getAllTags } from '-/reducers/taglibrary';
import { getTagColor, getTagTextColor } from '-/reducers/settings';
-import { isPlusCode } from '-/utils/misc';
+import { isGeoTag } from '-/utils/misc';
import { isDateTimeTag } from '-/utils/dates';
import { TS } from '-/tagspaces.namespace';
@@ -73,13 +73,13 @@ const TagContainer = (props: Props) => {
let { title } = tag;
// Check if tag is plus code
- let isGeoTag = false;
+ let isTagGeo = false;
let isTagDate = false;
let isDateSmartTag = false;
let isGeoSmartTag = false;
if (!tagGroup) {
- isGeoTag = isPlusCode(title); // || isLatLong
- isTagDate = !isGeoTag && isDateTimeTag(title);
+ isTagGeo = isGeoTag(title); // || isLatLong
+ isTagDate = !isTagGeo && isDateTimeTag(title);
}
if (isTagDate && title.length > 8) {
title = title.substr(0, 8) + '...';
@@ -207,7 +207,7 @@ const TagContainer = (props: Props) => {
}}
>
<span style={{ flexGrow: 1 }}>
- {(isGeoTag || isGeoSmartTag) && (
+ {(isTagGeo || isGeoSmartTag) && (
<PlaceIcon
style={{
color: tag.textcolor,
@@ -226,7 +226,7 @@ const TagContainer = (props: Props) => {
}}
/>
)}
- {!isGeoTag && title}
+ {!isTagGeo && title}
</span>
{getActionMenu()}
</Button>
diff --git a/app/components/TagContainerDnd.tsx b/app/components/TagContainerDnd.tsx
index 38f4fac30..585812df3 100644
--- a/app/components/TagContainerDnd.tsx
+++ b/app/components/TagContainerDnd.tsx
@@ -143,6 +143,10 @@ const boxTarget = {
if (dragItem.tag.type !== props.tag.type) {
return;
}
+ // Skip smart tags drop into another tag
+ if (dragItem.tag.functionality !== undefined) {
+ return;
+ }
dragItem.tag.position = hoverIndex;
props.editTagForEntry(props.entryPath, dragItem.tag);
diff --git a/app/components/dialogs/EditEntryTagDialog.tsx b/app/components/dialogs/EditEntryTagDialog.tsx
index e4fcb10d2..1499129bd 100644
--- a/app/components/dialogs/EditEntryTagDialog.tsx
+++ b/app/components/dialogs/EditEntryTagDialog.tsx
@@ -30,10 +30,10 @@ import FormControl from '@material-ui/core/FormControl';
import FormHelperText from '@material-ui/core/FormHelperText';
import Dialog from '@material-ui/core/Dialog';
import i18n from '-/services/i18n';
-import { isPlusCode } from '-/utils/misc';
+import { isGeoTag } from '-/utils/misc';
import { Pro } from '-/pro';
import { getSelectedEntries, getSelectedTag } from '-/reducers/app';
-import TaggingActions, { defaultTagLocation } from '-/reducers/tagging-actions';
+import TaggingActions from '-/reducers/tagging-actions';
import { isDateTimeTag } from '-/utils/dates';
import { AppConfig } from '-/config';
import { TS } from '-/tagspaces.namespace';
@@ -58,6 +58,7 @@ interface Props {
selectedEntries: Array<TS.FileSystemEntry>;
selectedTag: TS.Tag;
tileServer: TS.MapTileServer;
+ geoTaggingFormat: string;
}
const GeoTagEditor = Pro && Pro.UI ? Pro.UI.GeoTagEditor : React.Fragment;
@@ -124,7 +125,7 @@ const EditEntryTagDialog = (props: Props) => {
}
function renderContent() {
- const showGeoEditor = GeoTagEditor && isPlusCode(title);
+ const showGeoEditor = GeoTagEditor && isGeoTag(title);
return (
<DialogContent
@@ -155,8 +156,9 @@ const EditEntryTagDialog = (props: Props) => {
<GeoTagEditor
geoTag={title}
onChange={setTitle}
- zoom={title === defaultTagLocation ? 2 : undefined}
+ // zoom={title === defaultTagLocation ? 2 : undefined} TODO defaultTagLocation can be in MGRS format
showAdvancedMode={showAdvancedMode}
+ geoTaggingFormat={props.geoTaggingFormat}
haveError={haveError}
setError={setError}
tileServer={props.tileServer}
@@ -175,7 +177,7 @@ const EditEntryTagDialog = (props: Props) => {
function renderActions() {
return (
<DialogActions style={{ justifyContent: 'space-between' }}>
- {GeoTagEditor && isPlusCode(title) ? (
+ {GeoTagEditor && isGeoTag(title) ? (
<Button
data-tid="switchAdvancedModeTID"
onClick={() => setShowAdvancedMode(!showAdvancedMode)}
@@ -233,7 +235,8 @@ function mapStateToProps(state) {
? getSelectedTag(state).path
: undefined, */
selectedEntries: getSelectedEntries(state),
- tileServer: getMapTileServer(state)
+ tileServer: getMapTileServer(state),
+ geoTaggingFormat: state.settings.geoTaggingFormat
};
}
diff --git a/app/components/dialogs/settings/SettingsAdvanced.tsx b/app/components/dialogs/settings/SettingsAdvanced.tsx
index 2e54c870f..0962004d3 100644
--- a/app/components/dialogs/settings/SettingsAdvanced.tsx
+++ b/app/components/dialogs/settings/SettingsAdvanced.tsx
@@ -30,6 +30,9 @@ import EditIcon from '@material-ui/icons/Edit';
import IconButton from '@material-ui/core/IconButton';
import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
import Switch from '@material-ui/core/Switch';
+import Select from '@material-ui/core/Select';
+import Input from '@material-ui/core/Input';
+import MenuItem from '@material-ui/core/MenuItem';
import i18n from '-/services/i18n';
import {
actions as SettingsActions,
@@ -41,6 +44,7 @@ import MapTileServerDialog from '-/components/dialogs/settings/MapTileServerDial
import { Pro } from '-/pro';
import { ProLabel } from '-/components/HelperComponents';
import InfoIcon from '-/components/InfoIcon';
+import AppConfig from '-/config';
const styles: any = {
root: {
@@ -69,6 +73,7 @@ interface Props {
setSaveTagInLocation: (saveTagInLocation: boolean) => void;
showResetSettings: (showDialog: boolean) => void;
tileServers: Array<TS.MapTileServer>;
+ setGeoTaggingFormat: (geoTaggingFormat: string) => void;
}
const SettingsAdvanced = (props: Props) => {
@@ -86,6 +91,8 @@ const SettingsAdvanced = (props: Props) => {
const { classes } = props;
+ const geoTaggingFormatDisabled = AppConfig.geoTaggingFormat !== undefined;
+
return (
<div style={{ width: '100%' }}>
<List className={classes.root}>
@@ -149,6 +156,33 @@ const SettingsAdvanced = (props: Props) => {
checked={props.settings.saveTagInLocation}
/>
</ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:geoTaggingFormat')} />
+ <Select
+ disabled={geoTaggingFormatDisabled}
+ data-tid="geoTaggingFormatTID"
+ title={
+ geoTaggingFormatDisabled
+ ? i18n.t('core:settingExternallyConfigured')
+ : ''
+ }
+ value={
+ geoTaggingFormatDisabled
+ ? AppConfig.geoTaggingFormat
+ : props.settings.geoTaggingFormat
+ }
+ onChange={(event: any) =>
+ props.setGeoTaggingFormat(event.target.value)
+ }
+ input={<Input id="geoTaggingFormatSelector" />}
+ >
+ {props.settings.supportedGeoTagging.map(geoTagging => (
+ <MenuItem key={geoTagging} value={geoTagging}>
+ {geoTagging.toUpperCase()}
+ </MenuItem>
+ ))}
+ </Select>
+ </ListItem>
<ListItem className={classes.listItem}>
<ListItemText primary={i18n.t('core:tileServerTitle')} />
<ListItemSecondaryAction style={{ right: 0 }}>
@@ -234,7 +268,8 @@ function mapActionCreatorsToProps(dispatch) {
setWarningOpeningFilesExternally:
SettingsActions.setWarningOpeningFilesExternally,
setDesktopMode: SettingsActions.setDesktopMode,
- setSaveTagInLocation: SettingsActions.setSaveTagInLocation
+ setSaveTagInLocation: SettingsActions.setSaveTagInLocation,
+ setGeoTaggingFormat: SettingsActions.setGeoTaggingFormat
},
dispatch
);
diff --git a/app/config.ts b/app/config.ts
index fd6d1b7bd..cd5202ec6 100644
--- a/app/config.ts
+++ b/app/config.ts
@@ -72,6 +72,9 @@ export const AppConfig = {
useSidecarsForFileTaggingDisableSetting:
window.ExtUseSidecarsForFileTagging !== undefined,
useGenerateThumbnails: window.ExtUseGenerateThumbnails,
+ geoTaggingFormat:
+ window.ExtGeoTaggingFormat &&
+ window.ExtGeoTaggingFormat.toLocaleLowerCase(),
customLogo: window.ExtLogoURL || false,
showAdvancedSearch:
window.ExtShowAdvancedSearch !== undefined
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index 41557d318..8b6ce66c8 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -615,5 +615,6 @@
"searchTypeStrict": "Strict",
"searchTypeStrictTooltip": "Same as semi-strict but case sensitive",
"warningOpeningFilesExternally": "Show warning on opening files externally",
+ "geoTaggingFormat": "Geo Tagging Format",
"-": "-"
}
diff --git a/app/reducers/settings-default.ts b/app/reducers/settings-default.ts
index e44a0a3df..5d73557db 100644
--- a/app/reducers/settings-default.ts
+++ b/app/reducers/settings-default.ts
@@ -161,12 +161,14 @@ export default {
tagTextColor: 'white',
tagBackgroundColor: '#61DD61',
currentTheme: 'light',
+ geoTaggingFormat: 'pluscodes',
enableGlobalKeyboardShortcuts: true,
zoomFactor: 1,
lastPublishedVersion: '',
entryPropertiesSplitSize: 103,
leftVerticalSplitSize: 350,
mainVerticalSplitSize: '50%',
+ supportedGeoTagging: ['pluscodes', 'mgrs'],
supportedThemes: ['light', 'dark'],
supportedLanguages: [
{
diff --git a/app/reducers/settings.ts b/app/reducers/settings.ts
index fbf459ac2..6c444844a 100644
--- a/app/reducers/settings.ts
+++ b/app/reducers/settings.ts
@@ -57,6 +57,7 @@ export const types = {
SET_TAGCOLOR: 'SETTINGS/SET_TAGCOLOR',
SET_TAGTEXTCOLOR: 'SETTINGS/SET_TAGTEXTCOLOR',
SET_CURRENTTHEME: 'SETTINGS/SET_CURRENTTHEME',
+ SET_GEO_TAGGING_FORMAT: 'SETTINGS/SET_GEO_TAGGING_FORMAT',
SWITCH_THEME: 'SETTINGS/SWITCH_THEME',
SET_KEYBINDING: 'SETTINGS/SET_KEYBINDING',
SET_GLOBAL_KEYBINDING: 'SETTINGS/SET_GLOBAL_KEYBINDING',
@@ -228,6 +229,9 @@ export default (state: any = defaultSettings, action: any) => {
case types.SET_CURRENTTHEME: {
return { ...state, currentTheme: action.currentTheme };
}
+ case types.SET_GEO_TAGGING_FORMAT: {
+ return { ...state, geoTaggingFormat: action.geoTaggingFormat };
+ }
case types.SWITCH_THEME: {
let currentTheme = 'dark';
if (state.currentTheme === 'dark') {
@@ -515,6 +519,10 @@ export const actions = {
type: types.SET_CURRENTTHEME,
currentTheme
}),
+ setGeoTaggingFormat: (geoTaggingFormat: string) => ({
+ type: types.SET_GEO_TAGGING_FORMAT,
+ geoTaggingFormat
+ }),
switchTheme: () => ({ type: types.SWITCH_THEME }),
setKeyBinding: (keyBindingName: string, keyBindingCommand: string) => ({
type: types.SET_KEYBINDING,
diff --git a/app/reducers/tagging-actions.ts b/app/reducers/tagging-actions.ts
index 8723cb0b4..118997510 100644
--- a/app/reducers/tagging-actions.ts
+++ b/app/reducers/tagging-actions.ts
@@ -16,6 +16,7 @@
*
*/
import OpenLocationCode from 'open-location-code-typescript';
+import mgrs from 'mgrs';
import i18n from '../services/i18n';
import {
actions as AppActions,
@@ -34,14 +35,14 @@ import {
saveMetaDataPromise,
generateFileName
} from '-/services/utils-io';
-import { formatDateTime4Tag, isPlusCode } from '-/utils/misc';
+import { formatDateTime4Tag, isGeoTag } from '-/utils/misc';
import PlatformIO from '../services/platform-io';
import { Pro } from '../pro';
import GlobalSearch from '../services/search-index';
import { getPersistTagsInSidecarFile } from './settings';
import { TS } from '-/tagspaces.namespace';
-export const defaultTagLocation = OpenLocationCode.encode(51.48, 0, undefined); // default tag coordinate Greenwich
+// export const defaultTagLocation = OpenLocationCode.encode(51.48, 0, undefined); // default tag coordinate Greenwich
const persistTagsInSidecarFile = state => {
const locationPersistTagsInSidecarFile = getLocationPersistTagsInSidecarFile(
@@ -60,6 +61,12 @@ const actions = {
updateIndex: boolean = true
) => (dispatch: (actions: Object) => void, getState: () => any) => {
const { settings, taglibrary } = getState();
+ let defaultTagLocation;
+ if (settings.geoTaggingFormat === 'MGRS') {
+ defaultTagLocation = mgrs.forward([0, 51.48]);
+ } else {
+ defaultTagLocation = OpenLocationCode.encode(51.48, 0, undefined);
+ }
const processedTags = [];
tags.map(pTag => {
@@ -128,7 +135,7 @@ const actions = {
-1
) === -1 &&
!/^(?:\d+~\d+|\d+)$/.test(tag.title) && // skip adding of tag containing only digits
- !isPlusCode(tag.title) // skip adding of tag containing geo information
+ !isGeoTag(tag.title) // skip adding of tag containing geo information
) {
uniqueTags.push({
...tag,
@@ -494,7 +501,7 @@ const actions = {
tagGroup.children.findIndex(obj => obj.title === newTagTitle) !== -1
) === -1 &&
!/^(?:\d+~\d+|\d+)$/.test(newTagTitle) &&
- !isPlusCode(newTagTitle) // skip adding of tag containing only digits or geo tags
+ !isGeoTag(newTagTitle) // skip adding of tag containing only digits or geo tags
) {
uniqueTags.push({
...tag,
diff --git a/app/services/search.ts b/app/services/search.ts
index 1984572a3..d4e34282c 100644
--- a/app/services/search.ts
+++ b/app/services/search.ts
@@ -20,7 +20,7 @@
import Fuse from 'fuse.js';
import jmespath from 'jmespath';
import OpenLocationCode from 'open-location-code-typescript';
-import { isPlusCode } from '-/utils/misc';
+import { isGeoTag, parseGeoLocation } from '-/utils/misc';
import { extractTimePeriod } from '-/utils/dates';
import { Pro } from '../pro';
import { TS } from '-/tagspaces.namespace';
@@ -235,10 +235,9 @@ function prepareIndex(
...tag
};
try {
- if (isPlusCode(tag.title)) {
- const coord = OpenLocationCode.decode(tag.title);
- lat = Number(coord.latitudeCenter.toFixed(7));
- lon = Number(coord.longitudeCenter.toFixed(7));
+ const location = parseGeoLocation(tag.title);
+ if (location !== undefined) {
+ ({ lat, lon } = location);
}
const { fromDateTime, toDateTime } = extractTimePeriod(tag.title);
if (fromDateTime && toDateTime) {
diff --git a/app/tagspaces.d.ts b/app/tagspaces.d.ts
index 3f512ee13..7abcdebf8 100644
--- a/app/tagspaces.d.ts
+++ b/app/tagspaces.d.ts
@@ -51,6 +51,7 @@ declare interface Window {
ExtShowSmartTags?: string;
ExtShowAdvancedSearch?: string;
ExtUseGenerateThumbnails?: boolean;
+ ExtGeoTaggingFormat?: string;
__REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: any;
plugins?: any; // needed for Cordova
resolveLocalFileSystemURL?: any; // needed for Cordova
diff --git a/app/utils/misc.ts b/app/utils/misc.ts
index d2b8a73bf..b17e6b6e6 100644
--- a/app/utils/misc.ts
+++ b/app/utils/misc.ts
@@ -15,6 +15,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
+import mgrs from 'mgrs';
+import OpenLocationCode from 'open-location-code-typescript';
import { cleanFileName, getLocationPath } from '-/utils/paths';
import { TS } from '-/tagspaces.namespace';
@@ -75,6 +77,28 @@ export function prepareTagForExport(tag: TS.Tag): TS.Tag {
return preparedTag;
}
+export function parseGeoLocation(code: string): any {
+ if (isPlusCode(code)) {
+ const coord = OpenLocationCode.decode(code);
+ const lat = Number(coord.latitudeLo.toFixed(7)); // latitudeCenter.toFixed(7));
+ const lng = Number(coord.longitudeLo.toFixed(7));
+ return { lat, lng };
+ }
+ if (isMgrsString(code)) {
+ try {
+ const [lng, lat] = mgrs.toPoint(code);
+ return { lat, lng };
+ } catch (e) {
+ console.error('parseGeoLocation', e);
+ }
+ }
+ return undefined;
+}
+
+export function isGeoTag(code: string): boolean {
+ return isPlusCode(code) || isMgrsString(code);
+}
+
/** Returns true is a string is plus code e.g. 8FWH4HVG+3V 8FWH4HVG+ 8FWH4H+ */
export function isPlusCode(plusCode: string): boolean {
if (!plusCode) {
@@ -86,6 +110,20 @@ export function isPlusCode(plusCode: string): boolean {
);
}
+/** Returns true is a string is MGRS code e.g. 18SUJ7082315291 18SUJ70821529 18SUJ708152 */
+export function isMgrsString(c) {
+ if (!c) {
+ return false;
+ }
+ const coord = c.replace(/\s+/g, '');
+ const MGRS = /^(\d{1,2})([C-HJ-NP-X])\s*([A-HJ-NP-Z])([A-HJ-NP-V])\s*(\d{1,5}\s*\d{1,5})$/i;
+ return MGRS.test(coord);
+}
+
+/**
+ * @deprecated use coordinate-parser lib instead
+ * @param latLongInput
+ */
export function parseLatLon(
latLongInput: string
): { lat: number; lon: number } | false {
diff --git a/cordova/yarn.lock b/cordova/yarn.lock
index 9ea0d1b3a..b5153d517 100644
--- a/cordova/yarn.lock
+++ b/cordova/yarn.lock
@@ -127,7 +127,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-cordova-android@^9.0.0:
+cordova-android@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-9.1.0.tgz#d60335a2df1e95f83988145e1378a3a1936343ba"
integrity sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==
diff --git a/package.json b/package.json
index 8508c5462..8e2f43579 100644
--- a/package.json
+++ b/package.json
@@ -277,6 +277,7 @@
"jszip": "^3.1.5",
"leaflet": "^1.7.1",
"marked": "^2.0.1",
+ "mgrs": "^1.0.0",
"micromatch": "^4.0.4",
"open-location-code": "^1.0.3",
"open-location-code-typescript": "^1.5.0",
diff --git a/yarn.lock b/yarn.lock
index 7dd37e857..ffbf9e12f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8015,10 +8015,10 @@ electron-window-state@^5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"
- version "13.1.6"
- resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.6.tgz#6ecaf969255d62ce82cc0b5c948bf26e7dfb489b"
- integrity sha512-XiB55/JTaQpDFQrD9pulYnOGwaWeMyRIub5ispvoE2bWBvM5zVMLptwMLb0m3KTMrfSkzhedZvOu7fwYvR7L7Q==
+ version "13.2.2"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-13.2.2.tgz#332d91891d0db4f9a1d22d4d0bc3b500e59dc051"
+ integrity sha512-thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^14.6.2"
@@ -12770,6 +12770,11 @@ methods@~1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+mgrs@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829"
+ integrity sha1-+5FYjnjJACVnI5XLQLJffNatGCk=
+
micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
version "3.1.10"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"