Skip to content

Commit 57af4de

Browse files
authored
Merge pull request #162 from ngageoint/dms_fix
Observation Edit DMS location field input
2 parents 0614e5f + bd724e3 commit 57af4de

File tree

14 files changed

+1529
-883
lines changed

14 files changed

+1529
-883
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ MAGE adheres to [Semantic Versioning](http://semver.org/).
55
---
66
## Pending on [`develop`](https://github.com/ngageoint/mage-server/tree/develop)
77
##### Features
8-
##### Bug Fixes
8+
9+
## [6.2.4](https://github.com/ngageoint/mage-server/releases/tag/6.2.4)
10+
#### Features
11+
* The Degrees-Minutes-Seconds (DMS) location form fields on the Observation Edit view now use an input mask for more natural manual entry.
12+
#### Bug Fixes
13+
* The DMS location form allows typing leading zeros in akk the coordinate parts.
14+
* The DMS form parses both latitude and longitude from pasted text if available.
15+
* Eliminate inconsistencies between DMS parsing and validation.
916

1017
## [6.2.3](https://github.com/ngageoint/mage-server/releases/tag/6.2.3)
1118
##### Features

instance/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngageoint/mage.dev-instance",
3-
"version": "6.2.3",
3+
"version": "6.2.4",
44
"description": "Assemble a MAGE Server deployment from the core service, the web-app, and selected plugins. This is primarily a development tool because the dependencies point to relative directories instead of production packages. This can however serve as a starting point to create a production MAGE instance package.json.",
55
"scripts": {
66
"start": "npm run start:dev-env",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@ngageoint/mage.project",
33
"description": "This is the root package definition for the mage-server monorepo.",
44
"private": true,
5-
"version": "6.2.3",
5+
"version": "6.2.4",
66
"files": [],
77
"scripts": {
88
"postinstall": "npm-run-all service:ci web-app:ci image.service:ci nga-msi:ci",

service/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

service/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngageoint/mage.service",
3-
"version": "6.2.3",
3+
"version": "6.2.4",
44
"displayName": "MAGE Service",
55
"description": "MAGE is a geospatial situational awareness and data collection platform. The MAGE Service is the ReST service API that the MAGE client apps use to interact with MAGE data.",
66
"keywords": [

web-app/package-lock.json

Lines changed: 27 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web-app/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@ngageoint/mage.web-app",
4-
"version": "6.2.3",
4+
"version": "6.2.4",
55
"description": "The MAGE web-app is the UI for interacting with the MAGE service in a web browser.",
66
"keywords": [
77
"NGA",
@@ -63,6 +63,7 @@
6363
"@mat-datetimepicker/core": "3.0.1",
6464
"@mat-datetimepicker/moment": "3.0.1",
6565
"@ng-select/ng-select": "4.0.4",
66+
"@ngneat/input-mask": "^4.1.1",
6667
"@turf/center": "4.3.0",
6768
"@turf/helpers": "4.3.0",
6869
"@turf/kinks": "4.3.0",
@@ -81,6 +82,7 @@
8182
"exif-js": "2.1.1",
8283
"font-awesome": "4.7.0",
8384
"hammerjs": "^2.0.8",
85+
"inputmask": "^5.0.8",
8486
"jquery": "3.3.1",
8587
"jquery-file-download": "1.4.6",
8688
"jquery-minicolors": "2.1.10",
@@ -119,6 +121,7 @@
119121
"@types/angular": "^1.8.1",
120122
"@types/geojson": "7946.0.7",
121123
"@types/hammerjs": "^2.0.36",
124+
"@types/inputmask": "^5.0.3",
122125
"@types/jasmine": "~3.3.8",
123126
"@types/jasminewd2": "~2.0.3",
124127
"@types/leaflet": "1.5.4",

web-app/projects/core-lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngageoint/mage.web-core-lib",
3-
"version": "6.2.3",
3+
"version": "6.2.4",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/ngageoint/mage-server.git"

web-app/src/app/app.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import { MatStepperModule } from '@angular/material/stepper';
4747

4848
import { MatDatetimepickerModule } from '@mat-datetimepicker/core'
4949
import { MatMomentDatetimeModule } from '@mat-datetimepicker/moment'
50+
import { InputMaskModule } from '@ngneat/input-mask'
5051

5152
import { ZoomComponent } from './map/controls/zoom.component';
5253
import { AddObservationComponent } from './map/controls/add-observation.component';
@@ -333,7 +334,8 @@ import { AdminEventFormPreviewDialogComponent } from './admin/admin-event/admin-
333334
StaticIconModule,
334335
AdminBreadcrumbModule,
335336
MatSlideToggleModule,
336-
MatStepperModule
337+
MatStepperModule,
338+
InputMaskModule.forRoot()
337339
],
338340
providers: [
339341
mapServiceProvider,

0 commit comments

Comments
 (0)