From ce89d7359bc94ac50404196b787c121b2eecf88c Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 12 Apr 2019 14:26:05 -0400
Subject: [PATCH] Sort issues list by dist from the map center, cutoff at 1000
 items

---
 modules/core/validator.js |  8 +++++---
 modules/ui/issues.js      | 35 +++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/modules/core/validator.js b/modules/core/validator.js
index 9926cc86b..c16b03414 100644
--- a/modules/core/validator.js
+++ b/modules/core/validator.js
@@ -368,13 +368,15 @@ export function validationIssue(attrs) {
         return parts.join(':');
     }
 
-
+    var _extent;
     this.extent = function(resolver) {
+        if (_extent) return _extent;
+
         if (this.loc) {
-            return geoExtent(this.loc);
+            return _extent = geoExtent(this.loc);
         }
         if (this.entities && this.entities.length) {
-            return this.entities.reduce(function(extent, entity) {
+            return _extent = this.entities.reduce(function(extent, entity) {
                 return extent.extend(entity.extent(resolver));
             }, geoExtent());
         }
diff --git a/modules/ui/issues.js b/modules/ui/issues.js
index e39767e0d..d24ee6ebe 100644
--- a/modules/ui/issues.js
+++ b/modules/ui/issues.js
@@ -2,10 +2,11 @@ import _debounce from 'lodash-es/debounce';
 
 import { event as d3_event, select as d3_select } from 'd3-selection';
 
-import { svgIcon } from '../svg';
 import { t, textDirection } from '../util/locale';
 import { tooltip } from '../util/tooltip';
+import { geoSphericalDistance } from '../geo';
 import { modeSelect } from '../modes';
+import { svgIcon } from '../svg';
 import { uiBackground } from './background';
 import { uiDisclosure } from './disclosure';
 import { uiHelp } from './help';
@@ -145,7 +146,8 @@ export function uiIssues(context) {
 
         // Update
         items = items
-            .merge(itemsEnter);
+            .merge(itemsEnter)
+            .order();
 
         items.select('.issue-icon svg use')     // propagate bound data
             .attr('href', function(d) {
@@ -265,8 +267,18 @@ export function uiIssues(context) {
 
     function update() {
         var issuesBySeverity = context.validator().getIssuesBySeverity(_options);
-        _errors = issuesBySeverity.error;
-        _warnings = issuesBySeverity.warning;
+
+        // sort issues by distance away from the center of the map
+        var center = context.map().center();
+        var graph = context.graph();
+        _errors = issuesBySeverity.error.map(withDistance).sort(byDistance);
+        _warnings = issuesBySeverity.warning.map(withDistance).sort(byDistance);
+
+        // cut off at 1000
+        var errorCount = _errors.length > 1000 ? '1000+' : String(_errors.length);
+        var warningCount = _warnings.length > 1000 ? '1000+' : String(_warnings.length);
+        _errors = _errors.slice(0, 1000);
+        _warnings = _warnings.slice(0, 1000);
 
 
         _toggleButton.selectAll('.icon-badge')
@@ -279,7 +291,7 @@ export function uiIssues(context) {
 
         if (_errors.length > 0) {
             _pane.select('.hide-toggle-issues_errors .hide-toggle-text')
-                .text(t('issues.errors.list_title', { count: _errors.length }));
+                .text(t('issues.errors.list_title', { count: errorCount }));
             if (!_pane.select('.disclosure-wrap-issues_errors').classed('hide')) {
                 _errorsList
                     .call(drawIssuesList, _errors);
@@ -291,7 +303,7 @@ export function uiIssues(context) {
 
         if (_warnings.length > 0) {
             _pane.select('.hide-toggle-issues_warnings .hide-toggle-text')
-                .text(t('issues.warnings.list_title', { count: _warnings.length }));
+                .text(t('issues.warnings.list_title', { count: warningCount }));
             if (!_pane.select('.disclosure-wrap-issues_warnings').classed('hide')) {
                 _warningsList
                     .call(drawIssuesList, _warnings);
@@ -304,6 +316,17 @@ export function uiIssues(context) {
         if (!_pane.select('.disclosure-wrap-issues_rules').classed('hide')) {
             updateRulesList();
         }
+
+
+        function byDistance(a, b) {
+            return a.dist - b.dist;
+        }
+
+        function withDistance(issue) {
+            var extent = issue.extent(graph);
+            var dist = extent ? geoSphericalDistance(center, extent.center()) : 0;
+            return Object.assign(issue, { dist: dist });
+        }
     }