Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localize numbers, units in scale, info panels #4672

Merged
merged 7 commits into from
Jan 23, 2018
Merged

Localize numbers, units in scale, info panels #4672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d8d7a7
Made scale legend localizable
1ec5 Jan 9, 2018
bc5cbc7
Generalized unit keys
1ec5 Jan 9, 2018
d75aa7d
Internationalized measurement panel
1ec5 Jan 9, 2018
a1e0d4f
Consolidated unit formatting into util module
1ec5 Jan 9, 2018
fe8c218
Localized geocoded coordinate formatting
1ec5 Jan 9, 2018
702e3d2
DMS coordinates
1ec5 Jan 9, 2018
ea7339f
Fixed geometry type word order
1ec5 Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion data/core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ en:
title: Measurement
selected: "{n} selected"
geometry: Geometry
closed: closed
closed_line: closed line
closed_area: closed area
center: Center
perimeter: Perimeter
length: Length
Expand Down Expand Up @@ -1055,3 +1056,24 @@ en:
history: "Toggle history panel"
location: "Toggle location panel"
measurement: "Toggle measurement panel"
units:
feet: "{quantity} ft"
miles: "{quantity} mi"
square_feet: "{quantity} sq ft"
square_miles: "{quantity} sq mi"
acres: "{quantity} ac"
meters: "{quantity} m"
kilometers: "{quantity} km"
square_meters: "{quantity} m²"
square_kilometers: "{quantity} km²"
hectares: "{quantity} ha"
area_pair: "{area1} ({area2})"
arcdegrees: "{quantity}°"
arcminutes: "{quantity}′"
arcseconds: "{quantity}″"
north: "N"
south: "S"
east: "E"
west: "W"
coordinate: "{coordinate}{direction}"
coordinate_pair: "{latitude}, {longitude}"
25 changes: 24 additions & 1 deletion dist/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@
"title": "Measurement",
"selected": "{n} selected",
"geometry": "Geometry",
"closed": "closed",
"closed_line": "closed line",
"closed_area": "closed area",
"center": "Center",
"perimeter": "Perimeter",
"length": "Length",
Expand Down Expand Up @@ -1221,6 +1222,28 @@
}
}
},
"units": {
"feet": "{quantity} ft",
"miles": "{quantity} mi",
"square_feet": "{quantity} sq ft",
"square_miles": "{quantity} sq mi",
"acres": "{quantity} ac",
"meters": "{quantity} m",
"kilometers": "{quantity} km",
"square_meters": "{quantity} m²",
"square_kilometers": "{quantity} km²",
"hectares": "{quantity} ha",
"area_pair": "{area1} ({area2})",
"arcdegrees": "{quantity}°",
"arcminutes": "{quantity}′",
"arcseconds": "{quantity}″",
"north": "N",
"south": "S",
"east": "E",
"west": "W",
"coordinate": "{coordinate}{direction}",
"coordinate_pair": "{latitude}, {longitude}"
},
"presets": {
"categories": {
"category-barrier": {
Expand Down
3 changes: 2 additions & 1 deletion modules/ui/feature_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js';

import * as sexagesimal from '@mapbox/sexagesimal';
import { t } from '../util/locale';
import { dmsCoordinatePair } from '../util/units';
import { geoExtent, geoChooseEdge } from '../geo';
import { modeSelect } from '../modes';
import { osmEntity } from '../osm';
Expand Down Expand Up @@ -143,7 +144,7 @@ export function uiFeatureList(context) {
id: -1,
geometry: 'point',
type: t('inspector.location'),
name: loc[0].toFixed(6) + ', ' + loc[1].toFixed(6),
name: dmsCoordinatePair([loc[1], loc[0]]),
location: loc
});
}
Expand Down
21 changes: 4 additions & 17 deletions modules/ui/panels/location.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
import _debounce from 'lodash-es/debounce';

import { decimalCoordinatePair, dmsCoordinatePair } from '../../util/units';
import { t } from '../../util/locale';
import { services } from '../../services';


export function uiPanelLocation(context) {
var currLocation = '';
var OSM_PRECISION = 7;


function wrap(x, min, max) {
var d = max - min;
return ((x - min) % d + d) % d + min;
}


function clamp(x, min, max) {
return Math.max(min, Math.min(x, max));
}


function redraw(selection) {
Expand All @@ -32,13 +21,11 @@ export function uiPanelLocation(context) {
coord = context.map().center();
}

var coordStr =
clamp(coord[1], -90, 90).toFixed(OSM_PRECISION) + ', ' +
wrap(coord[0], -180, 180).toFixed(OSM_PRECISION);

list
.append('li')
.text(coordStr);
.text(dmsCoordinatePair(coord))
.append('li')
.text(decimalCoordinatePair(coord));

// Location Info
selection
Expand Down
122 changes: 27 additions & 95 deletions modules/ui/panels/measurement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import {
} from 'd3-geo';

import { t } from '../../util/locale';
import { displayArea, displayLength, decimalCoordinatePair, dmsCoordinatePair } from '../../util/units';
import { geoExtent } from '../../geo';
import { utilDetect } from '../../util/detect';



export function uiPanelMeasurement(context) {
var isImperial = (utilDetect().locale.toLowerCase() === 'en-us');
var OSM_PRECISION = 7;
var locale = utilDetect().locale,
isImperial = (locale.toLowerCase() === 'en-us');


function radiansToMeters(r) {
Expand Down Expand Up @@ -51,75 +52,6 @@ export function uiPanelMeasurement(context) {
}


function displayLength(m) {
var d = m * (isImperial ? 3.28084 : 1),
p, unit;

if (isImperial) {
if (d >= 5280) {
d /= 5280;
unit = 'mi';
} else {
unit = 'ft';
}
} else {
if (d >= 1000) {
d /= 1000;
unit = 'km';
} else {
unit = 'm';
}
}

// drop unnecessary precision
p = d > 1000 ? 0 : d > 100 ? 1 : 2;

return String(d.toFixed(p)) + ' ' + unit;
}


function displayArea(m2) {
var d = m2 * (isImperial ? 10.7639111056 : 1),
d1, d2, p1, p2, unit1, unit2;

if (isImperial) {
if (d >= 6969600) { // > 0.25mi² show mi²
d1 = d / 27878400;
unit1 = 'mi²';
} else {
d1 = d;
unit1 = 'ft²';
}

if (d > 4356 && d < 43560000) { // 0.1 - 1000 acres
d2 = d / 43560;
unit2 = 'ac';
}

} else {
if (d >= 250000) { // > 0.25km² show km²
d1 = d / 1000000;
unit1 = 'km²';
} else {
d1 = d;
unit1 = 'm²';
}

if (d > 1000 && d < 10000000) { // 0.1 - 1000 hectares
d2 = d / 10000;
unit2 = 'ha';
}
}

// drop unnecessary precision
p1 = d1 > 1000 ? 0 : d1 > 100 ? 1 : 2;
p2 = d2 > 1000 ? 0 : d2 > 100 ? 1 : 2;

return String(d1.toFixed(p1)) + ' ' + unit1 +
(d2 ? ' (' + String(d2.toFixed(p2)) + ' ' + unit2 + ')' : '');
}


function redraw(selection) {
var resolver = context.graph();
var selected = _filter(context.selectedIDs(), function(e) { return context.hasEntity(e); });
Expand All @@ -132,7 +64,7 @@ export function uiPanelMeasurement(context) {
selection
.append('h4')
.attr('class', 'measurement-heading')
.text(singular || t('info_panels.measurement.selected', { n: selected.length }));
.text(singular || t('info_panels.measurement.selected', { n: selected.length.toLocaleString(locale) }));

if (!selected.length) return;

Expand All @@ -146,16 +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(
center[1].toFixed(OSM_PRECISION) + ', ' + center[0].toFixed(OSM_PRECISION)
);
.text(t('info_panels.measurement.center') + ':');
coordItem.append('span')
.text(dmsCoordinatePair(center));
coordItem.append('span')
.text(decimalCoordinatePair(center));
return;
}

Expand All @@ -175,16 +108,15 @@ export function uiPanelMeasurement(context) {
.text(t('info_panels.measurement.geometry') + ':')
.append('span')
.text(
(closed ? t('info_panels.measurement.closed') + ' ' : '') + t('geometry.' + geometry)
closed ? t('info_panels.measurement.closed_' + geometry) : t('geometry.' + geometry)
);

if (entity.type !== 'relation') {
list
.append('li')
.text(t('info_panels.measurement.node_count') + ':')
.append('span')
.text(nodeCount(feature)
);
.text(nodeCount(feature).toLocaleString(locale));
}

if (closed) {
Expand All @@ -193,23 +125,23 @@ export function uiPanelMeasurement(context) {
.append('li')
.text(t('info_panels.measurement.area') + ':')
.append('span')
.text(displayArea(area));
.text(displayArea(area, isImperial));
}


list
.append('li')
.text(lengthLabel + ':')
.append('span')
.text(displayLength(length));
.text(displayLength(length, isImperial));

list
coordItem = list
.append('li')
.text(t('info_panels.measurement.centroid') + ':')
.append('span')
.text(
centroid[1].toFixed(OSM_PRECISION) + ', ' + centroid[0].toFixed(OSM_PRECISION)
);
.text(t('info_panels.measurement.centroid') + ':');
coordItem.append('span')
.text(dmsCoordinatePair(centroid));
coordItem.append('span')
.text(decimalCoordinatePair(centroid));

var toggle = isImperial ? 'imperial' : 'metric';

Expand All @@ -233,13 +165,13 @@ export function uiPanelMeasurement(context) {
.append('span')
.text(t('geometry.' + geometry));

list
coordItem = list
.append('li')
.text(centerLabel + ':')
.append('span')
.text(
center[1].toFixed(OSM_PRECISION) + ', ' + center[0].toFixed(OSM_PRECISION)
);
.text(centerLabel + ':');
coordItem.append('span')
.text(dmsCoordinatePair(center));
coordItem.append('span')
.text(decimalCoordinatePair(center));
}
}

Expand Down
17 changes: 2 additions & 15 deletions modules/ui/scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { displayLength } from '../util/units';
import { geoLonToMeters, geoMetersToLon } from '../geo';
import { utilDetect } from '../util/detect';

Expand Down Expand Up @@ -36,21 +37,7 @@ export function uiScale(context) {
dLon = geoMetersToLon(scale.dist / conversion, lat);
scale.px = Math.round(projection([loc1[0] + dLon, loc1[1]])[0]);

if (isImperial) {
if (scale.dist >= 5280) {
scale.dist /= 5280;
scale.text = String(scale.dist) + ' mi';
} else {
scale.text = String(scale.dist) + ' ft';
}
} else {
if (scale.dist >= 1000) {
scale.dist /= 1000;
scale.text = String(scale.dist) + ' km';
} else {
scale.text = String(scale.dist) + ' m';
}
}
scale.text = displayLength(scale.dist / conversion, isImperial);

return scale;
}
Expand Down
Loading