From db300d107129259fcbe45f72e9254bae46cf7d5b Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Thu, 5 Dec 2019 11:52:12 -0500
Subject: [PATCH] Add tooltips to mapillary map features layer icons (close
 #7079)

---
 data/core.yaml                        | 32 ++++++++++++++++++++
 dist/locales/en.json                  | 42 ++++++++++++++++++++++++++-
 modules/services/mapillary.js         | 20 ++++++-------
 modules/svg/mapillary_map_features.js |  6 +++-
 4 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 3cc4503e7..b21e24183 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1073,6 +1073,38 @@ en:
     title: "Map Features"
     tooltip: "Map features from Mapillary"
     request_data: "Request Data"
+    construction:
+      flat:
+        crosswalk_plain: plain crosswalk
+    marking:
+      discrete:
+        crosswalk_zebra: zebra crosswalk
+    object:
+      banner: banner
+      bench: bench
+      bike_rack: bike rack
+      catch_basin: catch basin
+      cctv_camera: CCTV camera
+      fire_hydrant: fire hydrant
+      mailbox: mailbox
+      manhole: manhole
+      phone_booth: phone booth
+      sign:
+        advertisement: advertisement
+        information: information sign
+        store: shop sign
+      street_light: street light
+      support:
+        utility_pole: utility pole
+      traffic_cone: traffic cone
+      traffic_light:
+        cyclists: cyclist traffic light
+        general_horizontal: horizontal traffic light
+        general_single: single traffic light
+        general_upright: vertical traffic light
+        other: traffic light
+        pedestrians: pedestrian traffic light
+      trash_can: trash can
   mapillary:
     title: Mapillary
     signs:
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ca7fe691f..23ee0fdcf 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1344,7 +1344,47 @@
         "mapillary_map_features": {
             "title": "Map Features",
             "tooltip": "Map features from Mapillary",
-            "request_data": "Request Data"
+            "request_data": "Request Data",
+            "construction": {
+                "flat": {
+                    "crosswalk_plain": "plain crosswalk"
+                }
+            },
+            "marking": {
+                "discrete": {
+                    "crosswalk_zebra": "zebra crosswalk"
+                }
+            },
+            "object": {
+                "banner": "banner",
+                "bench": "bench",
+                "bike_rack": "bike rack",
+                "catch_basin": "catch basin",
+                "cctv_camera": "CCTV camera",
+                "fire_hydrant": "fire hydrant",
+                "mailbox": "mailbox",
+                "manhole": "manhole",
+                "phone_booth": "phone booth",
+                "sign": {
+                    "advertisement": "advertisement",
+                    "information": "information sign",
+                    "store": "shop sign"
+                },
+                "street_light": "street light",
+                "support": {
+                    "utility_pole": "utility pole"
+                },
+                "traffic_cone": "traffic cone",
+                "traffic_light": {
+                    "cyclists": "cyclist traffic light",
+                    "general_horizontal": "horizontal traffic light",
+                    "general_single": "single traffic light",
+                    "general_upright": "vertical traffic light",
+                    "other": "traffic light",
+                    "pedestrians": "pedestrian traffic light"
+                },
+                "trash_can": "trash can"
+            }
         },
         "mapillary": {
             "title": "Mapillary",
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
index 40ff7c457..d162130db 100644
--- a/modules/services/mapillary.js
+++ b/modules/services/mapillary.js
@@ -16,26 +16,26 @@ var clientId = 'NzNRM2otQkR2SHJzaXJmNmdQWVQ0dzo1ZWYyMmYwNjdmNDdlNmVi';
 var mapFeatureConfig = {
     organizationKey: 'FI3NAFfzQQgdF081TRdgTy',
     values: [
+        'construction--flat--crosswalk-plain',
+        'marking--discrete--crosswalk-zebra',
+        'object--banner',
         'object--bench',
         'object--bike-rack',
         'object--billboard',
+        'object--catch-basin',
+        'object--cctv-camera',
         'object--fire-hydrant',
         'object--mailbox',
-        'object--phone-booth',
-        'object--street-light',
-        'object--support--utility-pole',
-        'object--traffic-light--pedestrians',
-        'object--trash-can',
-        'construction--flat--crosswalk-plain',
-        'object--cctv-camera',
-        'object--banner',
-        'object--catch-basin',
         'object--manhole',
+        'object--phone-booth',
         'object--sign--advertisement',
         'object--sign--information',
         'object--sign--store',
+        'object--street-light',
+        'object--support--utility-pole',
         'object--traffic-light--*',
-        'marking--discrete--crosswalk-zebra'
+        'object--traffic-light--pedestrians',
+        'object--trash-can'
     ].join(',')
 };
 var maxResults = 1000;
diff --git a/modules/svg/mapillary_map_features.js b/modules/svg/mapillary_map_features.js
index 0cf21546d..2ee611370 100644
--- a/modules/svg/mapillary_map_features.js
+++ b/modules/svg/mapillary_map_features.js
@@ -2,7 +2,7 @@ import _throttle from 'lodash-es/throttle';
 import { select as d3_select } from 'd3-selection';
 import { svgPointTransform } from './helpers';
 import { services } from '../services';
-
+import { t } from '../util/locale';
 
 export function svgMapillaryMapFeatures(projection, context, dispatch) {
     var throttledRedraw = _throttle(function () { dispatch.call('change'); }, 1000);
@@ -103,6 +103,10 @@ export function svgMapillaryMapFeatures(projection, context, dispatch) {
             .attr('x', '-12px')
             .attr('y', '-12px')
             .attr('xlink:href', function(d) { return '#' + d.value; })
+            .attr('title', function(d) {
+                var id = d.value.replace(/--/g, '.').replace(/-/g, '_');
+                return t('mapillary_map_features.' + id);
+            })
             .classed('currentView', function(d) {
                 return d.detections.some(function(detection) {
                     return detection.image_key === selectedImageKey;