-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Add road height field with unit dropdowns #8075
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| import { dispatch as d3_dispatch } from 'd3-dispatch'; | ||
| import { select as d3_select } from 'd3-selection'; | ||
| import * as countryCoder from '@ideditor/country-coder'; | ||
|
|
||
| import { uiCombobox } from '../combobox'; | ||
| import { t } from '../../core/localizer'; | ||
| import { utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent } from '../../util'; | ||
|
|
||
|
|
||
| export function uiFieldRoadheight(field, context) { | ||
| var dispatch = d3_dispatch('change'); | ||
| var primaryUnitInput = d3_select(null); | ||
| var primaryInput = d3_select(null); | ||
| var secondaryInput = d3_select(null); | ||
| var secondaryUnitInput = d3_select(null); | ||
| var _entityIDs = []; | ||
| var _tags; | ||
| var _isImperial; | ||
|
|
||
| var primaryUnits = [ | ||
| { | ||
| value: 'm', | ||
| title: t('inspector.roadheight.meter'), | ||
| }, | ||
| { | ||
| value: 'ft', | ||
| title: t('inspector.roadheight.foot'), | ||
| }, | ||
| ]; | ||
|
|
||
| var unitCombo = uiCombobox(context, 'roadheight-unit') | ||
| .data(primaryUnits); | ||
|
|
||
| function roadheight(selection) { | ||
|
|
||
| var wrap = selection.selectAll('.form-field-input-wrap') | ||
| .data([0]); | ||
|
|
||
| wrap = wrap.enter() | ||
| .append('div') | ||
| .attr('class', 'form-field-input-wrap form-field-input-' + field.type) | ||
| .merge(wrap); | ||
|
|
||
|
|
||
| primaryInput = wrap.selectAll('input.roadheight-number') | ||
| .data([0]); | ||
|
|
||
| primaryInput = primaryInput.enter() | ||
| .append('input') | ||
| .attr('type', 'text') | ||
| .attr('class', 'roadheight-number') | ||
| .attr('id', field.domId) | ||
| .call(utilNoAuto) | ||
| .merge(primaryInput); | ||
|
|
||
| primaryInput | ||
| .on('change', change) | ||
| .on('blur', change); | ||
|
|
||
| var loc = combinedEntityExtent().center(); | ||
| _isImperial = countryCoder.roadHeightUnit(loc) === 'ft'; | ||
|
|
||
| primaryUnitInput = wrap.selectAll('input.roadheight-unit') | ||
| .data([0]); | ||
|
|
||
| primaryUnitInput = primaryUnitInput.enter() | ||
| .append('input') | ||
| .attr('type', 'text') | ||
| .attr('class', 'roadheight-unit') | ||
| .call(unitCombo) | ||
| .merge(primaryUnitInput); | ||
|
|
||
| primaryUnitInput | ||
| .on('blur', changeUnits) | ||
| .on('change', changeUnits); | ||
|
|
||
| secondaryInput = wrap.selectAll('input.roadheight-secondary-number') | ||
| .data([0]); | ||
|
|
||
| secondaryInput = secondaryInput.enter() | ||
| .append('input') | ||
| .attr('type', 'text') | ||
| .attr('class', 'roadheight-secondary-number') | ||
| .call(utilNoAuto) | ||
| .merge(secondaryInput); | ||
|
|
||
| secondaryInput | ||
| .on('change', change) | ||
| .on('blur', change); | ||
|
|
||
| secondaryUnitInput = wrap.selectAll('input.roadheight-secondary-unit') | ||
| .data([0]); | ||
| secondaryUnitInput = secondaryUnitInput.enter() | ||
| .append('input') | ||
| .attr('type', 'text') | ||
| .call(utilNoAuto) | ||
| .classed('disabled', true) | ||
| .classed('roadheight-secondary-unit', true) | ||
| .attr('readonly', 'readonly') | ||
| .merge(secondaryUnitInput); | ||
|
|
||
|
|
||
| function changeUnits() { | ||
| _isImperial = utilGetSetValue(primaryUnitInput) === 'ft'; | ||
| utilGetSetValue(primaryUnitInput, _isImperial ? 'ft' : 'm'); | ||
| setUnitSuggestions(); | ||
| change(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| function setUnitSuggestions() { | ||
| utilGetSetValue(primaryUnitInput, _isImperial ? 'ft' : 'm'); | ||
| } | ||
|
|
||
|
|
||
| function change() { | ||
| var tag = {}; | ||
| var primaryValue = utilGetSetValue(primaryInput).trim(); | ||
| var secondaryValue = utilGetSetValue(secondaryInput).trim(); | ||
|
|
||
| // don't override multiple values with blank string | ||
| if (!primaryValue && !secondaryValue && Array.isArray(_tags[field.key])) return; | ||
|
|
||
| if (!primaryValue && !secondaryValue) { | ||
| tag[field.key] = undefined; | ||
| } else if (isNaN(primaryValue) || isNaN(secondaryValue) || !_isImperial) { | ||
| tag[field.key] = context.cleanTagValue(primaryValue); | ||
| } else { | ||
| if (primaryValue !== '') { | ||
| primaryValue = context.cleanTagValue(primaryValue + '\''); | ||
| } | ||
| if (secondaryValue !== '') { | ||
| secondaryValue = context.cleanTagValue(secondaryValue + '"'); | ||
| } | ||
| tag[field.key] = primaryValue + secondaryValue; | ||
| } | ||
|
|
||
| dispatch.call('change', this, tag); | ||
| } | ||
|
|
||
|
|
||
| roadheight.tags = function(tags) { | ||
| _tags = tags; | ||
|
|
||
| var primaryValue = tags[field.key]; | ||
| var secondaryValue; | ||
| var isMixed = Array.isArray(primaryValue); | ||
|
|
||
| if (!isMixed) { | ||
| if (primaryValue && (primaryValue.indexOf('\'') >= 0 || primaryValue.indexOf('"') >= 0)) { | ||
| secondaryValue = primaryValue.match(/(-?[\d.]+)"/); | ||
| if (secondaryValue !== null) { | ||
| secondaryValue = secondaryValue[1]; | ||
| } | ||
| primaryValue = primaryValue.match(/(-?[\d.]+)'/); | ||
| if (primaryValue !== null) { | ||
| primaryValue = primaryValue[1]; | ||
| } | ||
| _isImperial = true; | ||
| } else if (primaryValue) { | ||
| _isImperial = false; | ||
| } | ||
| } | ||
|
|
||
| setUnitSuggestions(); | ||
|
|
||
| utilGetSetValue(primaryInput, typeof primaryValue === 'string' ? primaryValue : '') | ||
| .attr('title', isMixed ? primaryValue.filter(Boolean).join('\n') : null) | ||
| .attr('placeholder', isMixed ? t('inspector.multiple_values') : field.placeholder()) | ||
| .classed('mixed', isMixed); | ||
| utilGetSetValue(secondaryInput, typeof secondaryValue === 'string' ? secondaryValue : '') | ||
| .attr('placeholder', isMixed ? t('inspector.multiple_values') : (_isImperial ? field.placeholder() : null)) | ||
| .classed('mixed', isMixed) | ||
| .classed('disabled', !_isImperial) | ||
| .attr('readonly', _isImperial ? null : 'readonly'); | ||
| secondaryUnitInput.attr('value', _isImperial ? t('inspector.roadheight.inch') : null); | ||
| }; | ||
|
|
||
|
|
||
| roadheight.focus = function() { | ||
| primaryInput.node().focus(); | ||
| }; | ||
|
|
||
|
|
||
| roadheight.entityIDs = function(val) { | ||
| _entityIDs = val; | ||
| }; | ||
|
|
||
|
|
||
| function combinedEntityExtent() { | ||
| return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph()); | ||
| } | ||
|
|
||
|
|
||
| return utilRebind(roadheight, dispatch, 'on'); | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These abbreviations are already present in the YAML file, but only as part of format strings:
iD/data/core.yaml
Line 2278 in bb56584
In theory, we could reuse those strings to decide whether to display the unit dropdown to the left or right of the input box, but I don’t know if any language needs that extra complexity.