From c52a8fe637c09e57fcd3f3e10c6fd89e3fc622ec Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 13 Dec 2012 13:55:43 -0500
Subject: [PATCH] Simplify opacity data

---
 js/id/ui/layerswitcher.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index 266106d3d..5f40b3fff 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -13,16 +13,7 @@ iD.layerswitcher = function(map) {
             source: iD.BackgroundSource.OSM,
             description: 'The default OpenStreetMap layer.'
         }],
-        opacities = [{
-            level: 1,
-            label: "0%"
-        }, {
-            level: 0.5,
-            label: "50%"
-        }, {
-            level: 0,
-            label: "100%"
-        }];
+        opacities = [1, 0.5, 0];
 
     function layerswitcher(selection) {
 
@@ -70,13 +61,13 @@ iD.layerswitcher = function(map) {
                 .enter()
                 .append('li')
                     .attr('data-original-title', function(d) {
-                        return d.label + " opacity";
+                        return (d * 100) + "% opacity";
                     })
                     .on('click.set-opacity', function(d) {
                         d3.select('#tile-g')
                             .transition()
-                            .style('opacity', d.level)
-                            .attr('data-opacity', d.level);
+                            .style('opacity', d)
+                            .attr('data-opacity', d);
                         d3.selectAll('.opacity-options li')
                             .classed('selected', false);
                         d3.select(this)
@@ -87,7 +78,7 @@ iD.layerswitcher = function(map) {
                     .append('div')
                         .attr('class', 'opacity')
                         .style('opacity', function(d) {
-                            return d.level;
+                            return d;
                         });
         // Make sure there is an active selection by default
         d3.select('.opacity-options li').classed('selected', true);