DMS coordinates

This commit is contained in:
Minh Nguyễn
2018-01-09 03:25:55 -08:00
parent fe8c218fb3
commit 702e3d2a90
6 changed files with 88 additions and 22 deletions
+2 -2
View File
@@ -7,7 +7,7 @@ import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js';
import * as sexagesimal from '@mapbox/sexagesimal';
import { t } from '../util/locale';
import { displayCoordinatePair } from '../util/units';
import { dmsCoordinatePair } from '../util/units';
import { geoExtent, geoChooseEdge } from '../geo';
import { modeSelect } from '../modes';
import { osmEntity } from '../osm';
@@ -144,7 +144,7 @@ export function uiFeatureList(context) {
id: -1,
geometry: 'point',
type: t('inspector.location'),
name: displayCoordinatePair([loc[1], loc[0]]),
name: dmsCoordinatePair([loc[1], loc[0]]),
location: loc
});
}
+4 -4
View File
@@ -1,6 +1,6 @@
import _debounce from 'lodash-es/debounce';
import { displayCoordinatePair } from '../../util/units';
import { decimalCoordinatePair, dmsCoordinatePair } from '../../util/units';
import { t } from '../../util/locale';
import { services } from '../../services';
@@ -21,11 +21,11 @@ export function uiPanelLocation(context) {
coord = context.map().center();
}
var coordStr = displayCoordinatePair(coord);
list
.append('li')
.text(coordStr);
.text(dmsCoordinatePair(coord))
.append('li')
.text(decimalCoordinatePair(coord));
// Location Info
selection
+20 -13
View File
@@ -8,7 +8,7 @@ import {
} from 'd3-geo';
import { t } from '../../util/locale';
import { displayArea, displayLength, displayCoordinatePair } from '../../util/units';
import { displayArea, displayLength, decimalCoordinatePair, dmsCoordinatePair } from '../../util/units';
import { geoExtent } from '../../geo';
import { utilDetect } from '../../util/detect';
@@ -78,14 +78,17 @@ export function uiPanelMeasurement(context) {
var list = selection
.append('ul');
var coordItem;
// multiple features, just display extent center..
if (!singular) {
list
coordItem = list
.append('li')
.text(t('info_panels.measurement.center') + ':')
.append('span')
.text(displayCoordinatePair(center));
.text(t('info_panels.measurement.center') + ':');
coordItem.append('span')
.text(dmsCoordinatePair(center));
coordItem.append('span')
.text(decimalCoordinatePair(center));
return;
}
@@ -132,11 +135,13 @@ export function uiPanelMeasurement(context) {
.append('span')
.text(displayLength(length, isImperial));
list
coordItem = list
.append('li')
.text(t('info_panels.measurement.centroid') + ':')
.append('span')
.text(displayCoordinatePair(centroid));
.text(t('info_panels.measurement.centroid') + ':');
coordItem.append('span')
.text(dmsCoordinatePair(centroid));
coordItem.append('span')
.text(decimalCoordinatePair(centroid));
var toggle = isImperial ? 'imperial' : 'metric';
@@ -160,11 +165,13 @@ export function uiPanelMeasurement(context) {
.append('span')
.text(t('geometry.' + geometry));
list
coordItem = list
.append('li')
.text(centerLabel + ':')
.append('span')
.text(displayCoordinatePair(center));
.text(centerLabel + ':');
coordItem.append('span')
.text(dmsCoordinatePair(center));
coordItem.append('span')
.text(decimalCoordinatePair(center));
}
}