From 3b775930f67b8877379e3e689e820dbdb24e77aa Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 20 Nov 2017 17:20:54 -0500
Subject: [PATCH] 4 space tabwidth, no trailing spaces

---
 data/core.yaml       |  22 ++++----
 dist/locales/en.json |  14 +++++
 modules/ui/help.js   | 131 ++++++++++++++++++++++---------------------
 3 files changed, 92 insertions(+), 75 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index e663673ee..dd2be9118 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -558,14 +558,14 @@ en:
       intro: |
         # Help
 
-        With this [OpenStreetMap](https://www.openstreetmap.org/) editor you can 
+        With this [OpenStreetMap](https://www.openstreetmap.org/) editor you can
         add and update the free and editable map of the world online with your browser.
 
       opendata: |
         ### Open Data
 
         Edits that you make on this map will be freely available to everyone who uses
-        OpenStreetMap. They can be visible on every map based on OpenStreetMap. 
+        OpenStreetMap. They can be visible on every map based on OpenStreetMap.
         Your edits can be based on personal knowledge, on-the-ground survey, or
         background imagery.
         [Copying from commercial sources](https://www.openstreetmap.org/copyright)
@@ -615,7 +615,7 @@ en:
         ### Navigation
 
         You can drag the map by pressing and holding the left mouse button
-        while moving the mouse around. This is also called panning. 
+        while moving the mouse around. This is also called panning.
         You can also use the arrow keys on your keyboard, using the keys
         while holding 'Ctrl' will move the map for one screenful.
         You can zoom in or out by scrolling with the mouse wheel or trackpad,
@@ -627,7 +627,7 @@ en:
         # Editing & Saving
 
         To select a feature you want to edit, click on it on the map
-        or search for it by name in the feature editor. 
+        or search for it by name in the feature editor.
         Selected features are drawn with a pulsing glow and in the
         feature editor the feature's type and attributes are shown.
         If you right-click on it, the editing menu appears.
@@ -786,11 +786,11 @@ en:
         What you can do with buildings applies to most types of areas.
 
       select: |
-        ### Selecting 
+        ### Selecting
 
         You can select a building by clicking on its border. the pulsing glow will
         will become visible, all nodes will be shown as circles and the
-        feature editor on the left will show the type of the building and 
+        feature editor on the left will show the type of the building and
         attributes like name, levels, and address.
 
       modify: |
@@ -883,7 +883,7 @@ en:
         is, like whether it's a highway or residential road, supermarket or cafe.
         The feature editor will display buttons for common feature types, and you can
         find others by typing what you're looking for in the search box.
- 
+
         Click the 'i' in the top-right-hand corner of a feature type button to
         learn more about it. Click a button to choose that type.
 
@@ -892,7 +892,7 @@ en:
 
         After you choose a feature type, or when you select a feature that already
         has a type assigned, the feature editor will display fields with details about
-        the feature like its name or speed limit for a road or levels and address for a building. 
+        the feature like its name or speed limit for a road or levels and address for a building.
 
         Below the fields you see, you can click the `Add field` dropdown to add
         other details, like a Wikipedia link, wheelchair access, and more.
@@ -905,7 +905,7 @@ en:
         cannot add required fields, then you can add additional tags with the `+` button.
         [Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more
         about popular tag combinations.
-  
+
       undo: |
         ### Undo & Redo
 
@@ -1040,7 +1040,7 @@ en:
         ### Multipolygons
 
         Draw two or more areas and select them. Then press either press
-        the `C` shortcut key or right-click one of the selected areas and 
+        the `C` shortcut key or right-click one of the selected areas and
         select the {merge} 'Merge' tool.  This will create a new multipolygon
         relation with all selected areas as members. The areas will have the role
         outer except When an area is inside another area it will have the role inner
@@ -1073,7 +1073,7 @@ en:
         To create a new relation, select the first feature that should be a member,
         click the `+` button in the 'All relations' section, and select 'New relation...'.
 
-        To remove a feature from a relation, select the feature and click the {delete} 
+        To remove a feature from a relation, select the feature and click the {delete}
         'Delete' button next to the relation you want to remove it from.
 
   intro:
diff --git a/dist/locales/en.json b/dist/locales/en.json
index bd579943a..f0c1fa3de 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5949,6 +5949,13 @@
                 "description": "Premium DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Premium Imagery"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Premium Imagery Vintage"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Terms & Feedback"
@@ -5956,6 +5963,13 @@
                 "description": "Standard DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Standard Imagery"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Standard Imagery Vintage"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Terms & Feedback"
diff --git a/modules/ui/help.js b/modules/ui/help.js
index 97429edf9..364e74427 100644
--- a/modules/ui/help.js
+++ b/modules/ui/help.js
@@ -19,80 +19,83 @@ export function uiHelp(context) {
     var key = t('help.key');
 
     var docKeys = [
-          ['help.help.',['intro','opendata','beforestart','opensource']],
-          ['help.overview.',['intro','features','screen','navigation']],
-          ['help.editing.',['intro','multiselect','edit','save','upload','comeback']],
-          ['help.roads.',['intro','move','connect','attributes','delete','create']],
-          ['help.gps.',['intro','using']],
-          ['help.buildings.',['intro','select','modify','create','delete']],
-          ['help.addresses.',['intro','nodup','recommendation','points']],
-          ['help.feature_editor.',['intro','select','fields','tags','undo']],
-          ['help.imagery.',['intro','background','offset']],
-          ['help.iconstools.',['icons','tools']],
-          ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']]
-        ];
+        ['help.help.',['intro','opendata','beforestart','opensource']],
+        ['help.overview.',['intro','features','screen','navigation']],
+        ['help.editing.',['intro','multiselect','edit','save','upload','comeback']],
+        ['help.roads.',['intro','move','connect','attributes','delete','create']],
+        ['help.gps.',['intro','using']],
+        ['help.buildings.',['intro','select','modify','create','delete']],
+        ['help.addresses.',['intro','nodup','recommendation','points']],
+        ['help.feature_editor.',['intro','select','fields','tags','undo']],
+        ['help.imagery.',['intro','background','offset']],
+        ['help.iconstools.',['icons','tools']],
+        ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']]
+    ];
 
     var icont = {
-          more: icon('#icon-more', 'pre-text'),
-          apply: icon('#icon-apply', 'pre-text'),
-          alert: icon('#icon-alert', 'pre-text'),
-          avatar: icon('#icon-avatar', 'pre-text'),
-          forward: icon('#icon-forward', 'pre-text'),
-          backward: icon('#icon-backward', 'pre-text'),
-          fullscreen: icon('#icon-full-screen', 'pre-text'),
-          collapsescreen: icon('#icon-collapse-screen', 'pre-text'),
-          geolocate: icon('#icon-geolocate', 'pre-text'),
-          load: icon('#icon-load', 'pre-text'),
-          search: icon('#icon-search', 'pre-text'),
-          bug: icon('#icon-bug', 'pre-text'),
-          point: icon('#icon-point', 'pre-text'),
-          line: icon('#icon-line', 'pre-text'),
-          area: icon('#icon-area', 'pre-text'),
-          help: icon('#icon-help', 'pre-text'),
-          plus: icon('#icon-plus', 'pre-text'),
-          minus: icon('#icon-minus', 'pre-text'),
-          nearby: icon('#icon-nearby', 'pre-text'),
-          outlink: icon('#icon-out-link', 'pre-text'),
-          relation: icon('#icon-relation', 'pre-text'),
-          translate: icon('#icon-translate', 'pre-text'),
-          circularize: icon('#operation-circularize', 'pre-text'),
-          orthogonalize: icon('#operation-orthogonalize', 'pre-text'),
-          split: icon('#operation-split', 'pre-text'),
-          reflect_long: icon('#operation-reflect-long', 'pre-text'),
-          reflect_short: icon('#operation-reflect-short', 'pre-text'),
-          simplify: icon('#operation-simplify', 'pre-text'),
-          smooth: icon('#operation-smooth', 'pre-text'),
-          straighten: icon('#operation-straighten', 'pre-text'),
-          rotate: icon('#operation-rotate', 'pre-text'),
-          reverse: icon('#operation-reverse', 'pre-text'),
-          continue: icon('#operation-continue', 'pre-text'),
-          disconnect: icon('#operation-disconnect', 'pre-text'),
-          layers: icon('#icon-layers', 'pre-text'),
-          vertex: icon('#icon-vertex', 'pre-text'),
-          data: icon('#icon-data', 'pre-text'),
-          down: icon('#icon-down', 'pre-text'),
-          up: icon('#icon-up', 'pre-text'),
-          inspect: icon('#icon-inspect', 'pre-text'),
-          move: icon('#operation-move', 'pre-text'),
-          merge: icon('#operation-merge', 'pre-text'),
-          copy: icon('#operation-copy', 'pre-text'),
-          paste: icon('#operation-paste', 'pre-text'),
-          delete: icon('#operation-delete', 'pre-text'),
-          close: icon('#icon-close', 'pre-text'),
-          undo: icon('#icon-undo', 'pre-text'),
-          redo: icon('#icon-redo', 'pre-text'),
-          save: icon('#icon-save', 'pre-text'),
-          version: context.version
-        };
+        more: icon('#icon-more', 'pre-text'),
+        apply: icon('#icon-apply', 'pre-text'),
+        alert: icon('#icon-alert', 'pre-text'),
+        avatar: icon('#icon-avatar', 'pre-text'),
+        forward: icon('#icon-forward', 'pre-text'),
+        backward: icon('#icon-backward', 'pre-text'),
+        fullscreen: icon('#icon-full-screen', 'pre-text'),
+        collapsescreen: icon('#icon-collapse-screen', 'pre-text'),
+        geolocate: icon('#icon-geolocate', 'pre-text'),
+        load: icon('#icon-load', 'pre-text'),
+        search: icon('#icon-search', 'pre-text'),
+        bug: icon('#icon-bug', 'pre-text'),
+        point: icon('#icon-point', 'pre-text'),
+        line: icon('#icon-line', 'pre-text'),
+        area: icon('#icon-area', 'pre-text'),
+        help: icon('#icon-help', 'pre-text'),
+        plus: icon('#icon-plus', 'pre-text'),
+        minus: icon('#icon-minus', 'pre-text'),
+        nearby: icon('#icon-nearby', 'pre-text'),
+        outlink: icon('#icon-out-link', 'pre-text'),
+        relation: icon('#icon-relation', 'pre-text'),
+        translate: icon('#icon-translate', 'pre-text'),
+        circularize: icon('#operation-circularize', 'pre-text'),
+        orthogonalize: icon('#operation-orthogonalize', 'pre-text'),
+        split: icon('#operation-split', 'pre-text'),
+        reflect_long: icon('#operation-reflect-long', 'pre-text'),
+        reflect_short: icon('#operation-reflect-short', 'pre-text'),
+        simplify: icon('#operation-simplify', 'pre-text'),
+        smooth: icon('#operation-smooth', 'pre-text'),
+        straighten: icon('#operation-straighten', 'pre-text'),
+        rotate: icon('#operation-rotate', 'pre-text'),
+        reverse: icon('#operation-reverse', 'pre-text'),
+        continue: icon('#operation-continue', 'pre-text'),
+        disconnect: icon('#operation-disconnect', 'pre-text'),
+        layers: icon('#icon-layers', 'pre-text'),
+        vertex: icon('#icon-vertex', 'pre-text'),
+        data: icon('#icon-data', 'pre-text'),
+        down: icon('#icon-down', 'pre-text'),
+        up: icon('#icon-up', 'pre-text'),
+        inspect: icon('#icon-inspect', 'pre-text'),
+        move: icon('#operation-move', 'pre-text'),
+        merge: icon('#operation-merge', 'pre-text'),
+        copy: icon('#operation-copy', 'pre-text'),
+        paste: icon('#operation-paste', 'pre-text'),
+        delete: icon('#operation-delete', 'pre-text'),
+        close: icon('#icon-close', 'pre-text'),
+        undo: icon('#icon-undo', 'pre-text'),
+        redo: icon('#icon-redo', 'pre-text'),
+        save: icon('#icon-save', 'pre-text'),
+        version: context.version
+    };
 
     var docs = docKeys.map(function(key) {
-        var text = key[1].reduce(function(all,part) { return all + t(key[0].concat(part),icont); }, '');
+        var text = key[1].reduce(function(all, part) {
+            return all + t(key[0].concat(part), icont);
+        }, '');
         return {
             title: text.split('\n')[0].replace('#', '').trim(),
             html: marked(text.split('\n').slice(1).join('\n'))
         };
     });
 
+
     function help(selection) {
 
         function hide() {