Skip to content

measure tool support config decimalPlaces #1910

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

Merged
merged 2 commits into from
Mar 15, 2023
Merged

measure tool support config decimalPlaces #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6bcfe
measure tool support config The length of the decimal
deyihu Mar 15, 2023
2376cb4
update
deyihu Mar 15, 2023
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
5 changes: 3 additions & 2 deletions src/map/tool/AreaTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,17 @@ class AreaTool extends DistanceTool {
units = [' sq.m', ' sq.km', ' sq.ft', ' sq.mi'];
}
let content = '';
const decimals = this.options['decimalPlaces'];
if (this.options['metric']) {
content += area < 1E6 ? area.toFixed(0) + units[0] : (area / 1E6).toFixed(2) + units[1];
content += area < 1E6 ? area.toFixed(decimals) + units[0] : (area / 1E6).toFixed(decimals) + units[1];
}
if (this.options['imperial']) {
area *= 3.2808399;
if (content.length > 0) {
content += '\n';
}
const sqmi = 5280 * 5280;
content += area < sqmi ? area.toFixed(0) + units[2] : (area / sqmi).toFixed(2) + units[3];
content += area < sqmi ? area.toFixed(decimals) + units[2] : (area / sqmi).toFixed(decimals) + units[3];
}
return content;
}
Expand Down
31 changes: 17 additions & 14 deletions src/map/tool/DistanceTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ import DrawTool from './DrawTool';
* @property {Object} options.symbol - symbol of the line
* @property {Object} options.vertexSymbol - symbol of the vertice
* @property {Object} options.labelOptions - construct options of the vertice labels.
* @property {Number} options.decimalPlaces - The decimal places of the measured value
* @memberOf DistanceTool
* @instance
*/
const options = {
'decimalPlaces': 2,
'mode': 'LineString',
'language': 'zh-CN', //'en-US'
'metric': true,
Expand All @@ -43,17 +45,17 @@ const options = {
'textHorizontalAlignment': 'right',
'textDx': 15
},
'boxStyle' : {
'padding' : [6, 2],
'symbol' : {
'markerType' : 'square',
'markerFill' : '#fff',
'markerFillOpacity' : 0.9,
'markerLineColor' : '#b4b3b3',
'boxStyle': {
'padding': [6, 2],
'symbol': {
'markerType': 'square',
'markerFill': '#fff',
'markerFillOpacity': 0.9,
'markerLineColor': '#b4b3b3',
}
}
},
'clearButtonSymbol' :[{
'clearButtonSymbol': [{
'markerType': 'square',
'markerFill': '#fff',
'markerLineColor': '#b4b3b3',
Expand Down Expand Up @@ -190,15 +192,16 @@ class DistanceTool extends DrawTool {
units = [' m', ' km', ' feet', ' mile'];
}
let content = '';
const decimals = this.options['decimalPlaces'];
if (this.options['metric']) {
content += length < 1000 ? length.toFixed(0) + units[0] : (length / 1000).toFixed(2) + units[1];
content += length < 1000 ? length.toFixed(decimals) + units[0] : (length / 1000).toFixed(decimals) + units[1];
}
if (this.options['imperial']) {
length *= 3.2808399;
if (content.length > 0) {
content += '\n';
}
content += length < 5280 ? length.toFixed(0) + units[2] : (length / 5280).toFixed(2) + units[3];
content += length < 5280 ? length.toFixed(decimals) + units[2] : (length / 5280).toFixed(decimals) + units[3];
}
return content;
}
Expand Down Expand Up @@ -326,15 +329,15 @@ class DistanceTool extends DrawTool {
_addClearMarker(coordinates, prjCoord, dx) {
let symbol = this.options['clearButtonSymbol'];
let dxSymbol = {
'markerDx' : (symbol['markerDx'] || 0) + dx,
'textDx' : (symbol['textDx'] || 0) + dx
'markerDx': (symbol['markerDx'] || 0) + dx,
'textDx': (symbol['textDx'] || 0) + dx
};
if (Array.isArray(symbol)) {
dxSymbol = symbol.map(s => {
if (s) {
return {
'markerDx' : (s['markerDx'] || 0) + dx,
'textDx' : (s['textDx'] || 0) + dx
'markerDx': (s['markerDx'] || 0) + dx,
'textDx': (s['textDx'] || 0) + dx
};
}
return null;
Expand Down