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

Jump to bottom

Normalize surface and smoothness variants #460

Merged
merged 2 commits into from
Nov 22, 2021
Merged

Normalize surface and smoothness variants #460

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca93e4
Normalize `surface` and `smoothness` variants
mjaschen Nov 20, 2021
d969912
Highlight route segments for parts with normalized `surface` and `smo…
mjaschen Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 50 additions & 15 deletions js/control/TrackAnalysis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ BR.TrackAnalysis = L.Class.extend({
var wayTags = segments[segmentIndex].feature.properties.messages[messageIndex][9].split(' ');
for (var wayTagIndex = 0; wayTagIndex < wayTags.length; wayTagIndex++) {
var wayTagParts = wayTags[wayTagIndex].split('=');
switch (wayTagParts[0]) {
var tagName = this.normalizeTagName(wayTagParts[0]);
switch (tagName) {
case 'highway':
var highwayType = wayTagParts[1];
var trackType = '';
Expand All @@ -167,18 +168,18 @@ BR.TrackAnalysis = L.Class.extend({
break;
case 'surface':
case 'smoothness':
if (typeof analysis[wayTagParts[0]][wayTagParts[1]] === 'undefined') {
analysis[wayTagParts[0]][wayTagParts[1]] = {
if (typeof analysis[tagName][wayTagParts[1]] === 'undefined') {
analysis[tagName][wayTagParts[1]] = {
formatted_name: i18next.t(
'sidebar.analysis.data.' + wayTagParts[0] + '.' + wayTagParts[1],
'sidebar.analysis.data.' + tagName + '.' + wayTagParts[1],
wayTagParts[1]
),
name: wayTagParts[1],
subtype: '',
distance: 0.0,
};
}
analysis[wayTagParts[0]][wayTagParts[1]].distance += parseFloat(
analysis[tagName][wayTagParts[1]].distance += parseFloat(
segments[segmentIndex].feature.properties.messages[messageIndex][3]
);
break;
Expand All @@ -190,6 +191,31 @@ BR.TrackAnalysis = L.Class.extend({
return this.sortAnalysisData(analysis);
},

/**
* Normalize the tag name.
*
* Motivation: The `surface` tag comes in different variations,
* e.g. `surface`, `cycleway:surface` etc. We're only interested
* in the main tag so all other variations are normalized.
*
* @param {string} tagName
* @returns {string}
*/
normalizeTagName: function (tagName) {
// we assume that a tag belongs to the category `surface`,
// if that string is contained anywhere in the tag name:
if (tagName.indexOf('surface') !== -1) {
return 'surface';
}

// the same applies to `smoothness`
if (tagName.indexOf('smoothness') !== -1) {
return 'smoothness';
}

return tagName;
},

/**
* Transform analysis data for each type into an array, sort it
* by distance descending and convert it back to an object.
Expand Down Expand Up @@ -474,22 +500,31 @@ BR.TrackAnalysis = L.Class.extend({

return parsed.highway === dataName;
case 'surface':
if (dataName === 'internal-unknown' && typeof parsed.surface !== 'string') {
return true;
}

return typeof parsed.surface === 'string' && parsed.surface === dataName;
return this.singleWayTagMatchesData('surface', parsed, dataName);
case 'smoothness':
if (dataName === 'internal-unknown' && typeof parsed.smoothness !== 'string') {
return true;
}

return typeof parsed.smoothness === 'string' && parsed.smoothness === dataName;
return this.singleWayTagMatchesData('smoothness', parsed, dataName);
}

return false;
},

singleWayTagMatchesData: function (category, parsedData, lookupValue) {
var foundValue = null;

for (var iterationKey in parsedData) {
if (iterationKey.indexOf(category) !== -1) {
foundValue = parsedData[iterationKey];
break;
}
}

if (lookupValue === 'internal-unknown' && foundValue === null) {
return true;
}

return foundValue === lookupValue;
},

/**
* Transform a way tags string into an object, for example:
*
Expand Down