diff --git a/index.html b/index.html
index 0e61eb136..77684f97c 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,6 @@
         <script src='js/id/renderer/background_source.js'></script>
         <script src='js/id/renderer/map.js'></script>
         <script src='js/id/renderer/hash.js'></script>
-        <script src='js/id/renderer/points.js'></script>
 
         <script src="js/id/svg.js"></script>
         <script src="js/id/svg/areas.js"></script>
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 29cf31669..6ba2a6551 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -16,13 +16,13 @@ iD.Map = function() {
         background = iD.Background()
             .projection(projection),
         transformProp = iD.util.prefixCSSProperty('Transform'),
-        supersurface, surface, defs, tilegroup, r, g;
+        surface, tilegroup;
 
-    function map() {
-        tilegroup = this.append('div')
+    function map(selection) {
+        tilegroup = selection.append('div')
             .attr('id', 'tile-g');
 
-        supersurface = this.append('div')
+        var supersurface = selection.append('div')
             .style('position', 'absolute')
             .call(zoom);
 
@@ -35,21 +35,23 @@ iD.Map = function() {
                 }
             });
 
-        defs = surface.append('defs');
-        defs.append('clipPath')
+        surface.append('defs')
+            .append('clipPath')
                 .attr('id', 'clip')
             .append('rect')
                 .attr('id', 'clip-rect')
                 .attr({ x: 0, y: 0 });
 
-        r = surface.append('g')
+        var clip = surface.append('g')
             .attr('clip-path', 'url(#clip)');
 
-        g = ['fill', 'casing', 'stroke', 'text', 'hit', 'temp'].reduce(function(mem, i) {
-            return (mem[i] = r.append('g').attr('class', 'layer-g layer-' + i)) && mem;
-        }, {});
+        var layers = clip.selectAll('.layer')
+            .data(['fill', 'casing', 'stroke', 'text', 'hit'])
 
-        map.size(this.size());
+        layers.enter().append('g')
+            .attr('class', function(d) { return 'class', 'layer layer-' + d; });
+
+        map.size(selection.size());
         map.surface = surface;
 
         d3.select(document).call(keybinding);
@@ -99,7 +101,7 @@ iD.Map = function() {
     }
 
     function editOff() {
-        surface.selectAll('.layer-g *').remove();
+        surface.selectAll('.layer *').remove();
     }
 
     function connectionLoad(err, result) {
diff --git a/js/id/renderer/points.js b/js/id/renderer/points.js
deleted file mode 100644
index 3526cf917..000000000
--- a/js/id/renderer/points.js
+++ /dev/null
@@ -1,566 +0,0 @@
-// an index of tag -> point image combinations, taken from
-// http://svn.openstreetmap.org/applications/rendering/mapnik/inc/layer-amenity-symbols.xml.inc
-iD._points = [
-    {
-        tags: { aeroway: 'helipad' },
-        icon: 'helipad'
-    },
-    {
-        tags: { aeroway: 'airport' },
-        icon: 'airport'
-    },
-    {
-        tags: { aeroway: 'aerodrome' },
-        icon: 'aerodrome'
-    },
-    {
-        tags: { railway: 'level_crossing' },
-        icon: 'level_crossing'
-    },
-    {
-        tags: { man_made: 'lighthouse' },
-        icon: 'lighthouselevel_crossing'
-    },
-    {
-        tags: { natural: 'peak' },
-        icon: 'peak'
-    },
-    {
-        tags: { natural: 'volcano' },
-        icon: 'volcano'
-    },
-    {
-        tags: { natural: 'cave_entrance' },
-        icon: 'poi_cave'
-    },
-    {
-        tags: { natural: 'spring' },
-        icon: 'spring'
-    },
-    {
-        tags: { natural: 'tree' },
-        icon: 'tree'
-    },
-    {
-        tags: {
-            power: 'generator',
-            'generator:source': 'wind'
-        },
-        icon: 'power_wind'
-    },
-    {
-        tags: {
-            power: 'generator',
-            power_source: 'wind'
-        },
-        icon: 'power_wind'
-    },
-    {
-        tags: {
-            man_made: 'power_wind'
-        },
-        icon: 'power_wind'
-    },
-    {
-        tags: {
-            man_made: 'windmill'
-        },
-        icon: 'windmill'
-    },
-    {
-        tags: {
-            man_made: 'mast'
-        },
-        icon: 'communications'
-    },
-    {
-        tags: {
-            highway: 'mini_roundabout'
-        },
-        icon: 'mini_roundabout'
-    },
-    {
-        tags: {
-            highway: 'gate'
-        },
-        icon: 'gate2'
-    },
-    {
-        tags: {
-            barrier: 'gate'
-        },
-        icon: 'gate2'
-    },
-    {
-        tags: {
-            barrier: 'lift_gate'
-        },
-        icon: 'liftgate'
-    },
-    {
-        tags: {
-            barrier: 'bollard'
-        },
-        icon: 'bollard'
-    },
-    {
-        tags: {
-            barrier: 'block'
-        },
-        icon: 'bollard'
-    },
-    {
-        "icon": "alpinehut",
-        "tags": {
-            "tourism": "alpine_hut"
-        }
-    },
-    {
-        "icon": "shelter2",
-        "tags": {
-            "amenity": "shelter"
-        }
-    },
-    {
-        "icon": "atm2",
-        "tags": {
-            "amenity": "atm"
-        }
-    },
-    {
-        "icon": "bank2",
-        "tags": {
-            "amenity": "bank"
-        }
-    },
-    {
-        "icon": "bar",
-        "tags": {
-            "amenity": "bar"
-        }
-    },
-    {
-        "icon": "rental_bicycle",
-        "tags": {
-            "amenity": "bicycle_rental"
-        }
-    },
-    {
-        "icon": "bus_stop_small",
-        "tags": {
-            "amenity": "bus_stop"
-        }
-    },
-    {
-        "icon": "bus_stop",
-        "tags": {
-            "amenity": "bus_stop"
-        }
-    },
-    {
-        "icon": "bus_station",
-        "tags": {
-            "amenity": "bus_station"
-        }
-    },
-    {
-        "icon": "traffic_light",
-        "tags": {
-            "highway": "traffic_signals"
-        }
-    },
-    {
-        "icon": "cafe",
-        "tags": {
-            "amenity": "cafe"
-        }
-    },
-    {
-        "icon": "camping",
-        "tags": {
-            "tourism": "camp_site"
-        }
-    },
-    {
-        "icon": "transport_ford",
-        "tags": {
-            "highway": "ford"
-        }
-    },
-    {
-        "icon": "caravan_park",
-        "tags": {
-            "tourism": "caravan_site"
-        }
-    },
-    {
-        "icon": "car_share",
-        "tags": {
-            "amenity": "car_sharing"
-        }
-    },
-    {
-        "icon": "chalet",
-        "tags": {
-            "tourism": "chalet"
-        }
-    },
-    {
-        "icon": "cinema",
-        "tags": {
-            "amenity": "cinema"
-        }
-    },
-    {
-        "icon": "firestation",
-        "tags": {
-            "amenity": "fire_station"
-        }
-    },
-    {
-        "icon": "fuel",
-        "tags": {
-            "amenity": "fuel"
-        }
-    },
-    {
-        "icon": "guest_house",
-        "tags": {
-            "tourism": "guest_house"
-        }
-    },
-    {
-        "icon": "bandb",
-        "tags": {
-            "tourism": "bed_and_breakfast"
-        }
-    },
-    {
-        "icon": "hospital",
-        "tags": {
-            "amenity": "hospital"
-        }
-    },
-    {
-        "icon": "hostel",
-        "tags": {
-            "tourism": "hostel"
-        }
-    },
-    {
-        "icon": "hotel2",
-        "tags": {
-            "tourism": "hotel"
-        }
-    },
-    {
-        "icon": "motel",
-        "tags": {
-            "tourism": "motel"
-        }
-    },
-    {
-        "icon": "information",
-        "tags": {
-            "tourism": "information"
-        }
-    },
-    {
-        "icon": "embassy",
-        "tags": {
-            "amenity": "embassy"
-        }
-    },
-    {
-        "icon": "library",
-        "tags": {
-            "amenity": "library"
-        }
-    },
-    {
-        "icon": "amenity_court",
-        "tags": {
-            "amenity": "courthouse"
-        }
-    },
-    {
-        "icon": "lock_gate",
-        "tags": {
-            "waterway": "lock"
-        }
-    },
-    {
-        "icon": "communications",
-        "tags": {
-            "man_made": "mast"
-        }
-    },
-    {
-        "icon": "museum",
-        "tags": {
-            "tourism": "museum"
-        }
-    },
-    {
-        "icon": "parking",
-        "tags": {
-            "amenity": "parking"
-        }
-    },
-    {
-        "icon": "parking_private",
-        "tags": {
-            "amenity": "parking"
-        }
-    },
-    {
-        "icon": "pharmacy",
-        "tags": {
-            "amenity": "pharmacy"
-        }
-    },
-    {
-        "icon": "christian3",
-        "tags": {
-            "amenity": "place_of_worship"
-        }
-    },
-    {
-        "icon": "islamic3",
-        "tags": {
-            "amenity": "place_of_worship"
-        }
-    },
-    {
-        "icon": "sikh3",
-        "tags": {
-            "amenity": "place_of_worship"
-        }
-    },
-    {
-        "icon": "jewish3",
-        "tags": {
-            "amenity": "place_of_worship"
-        }
-    },
-    {
-        "icon": "place_of_worship3",
-        "tags": {
-            "amenity": "place_of_worship"
-        }
-    },
-    {
-        "icon": "police",
-        "tags": {
-            "amenity": "police"
-        }
-    },
-    {
-        "icon": "post_box",
-        "tags": {
-            "amenity": "post_box"
-        }
-    },
-    {
-        "icon": "post_office",
-        "tags": {
-            "amenity": "post_office"
-        }
-    },
-    {
-        "icon": "pub",
-        "tags": {
-            "amenity": "pub"
-        }
-    },
-    {
-        "icon": "biergarten",
-        "tags": {
-            "amenity": "biergarten"
-        }
-    },
-    {
-        "icon": "recycling",
-        "tags": {
-            "amenity": "recycling"
-        }
-    },
-    {
-        "icon": "restaurant",
-        "tags": {
-            "amenity": "restaurant"
-        }
-    },
-    {
-        "icon": "fast_food",
-        "tags": {
-            "amenity": "fast_food"
-        }
-    },
-    {
-        "icon": "telephone",
-        "tags": {
-            "amenity": "telephone"
-        }
-    },
-    {
-        "icon": "sosphone",
-        "tags": {
-            "amenity": "emergency_phone"
-        }
-    },
-    {
-        "icon": "theatre",
-        "tags": {
-            "amenity": "theatre"
-        }
-    },
-    {
-        "icon": "toilets",
-        "tags": {
-            "amenity": "toilets"
-        }
-    },
-    {
-        "icon": "food_drinkingtap",
-        "tags": {
-            "amenity": "drinking_water"
-        }
-    },
-    {
-        "icon": "amenity_prison",
-        "tags": {
-            "amenity": "prison"
-        }
-    },
-    {
-        "icon": "view_point",
-        "tags": {
-            "tourism": "viewpoint"
-        }
-    },
-    {
-        "icon": "tower_water",
-        "tags": {
-            "man_made": "water_tower"
-        }
-    },
-    {
-        "icon": "tourist_memorial",
-        "tags": {
-            "historic": "memorial"
-        }
-    },
-    {
-        "icon": "tourist_archaeological2",
-        "tags": {
-            "historic": "archaeological_site"
-        }
-    },
-    {
-        "icon": "shop_supermarket",
-        "tags": {
-            "shop": "supermarket"
-        }
-    },
-    {
-        "icon": "shop_bakery",
-        "tags": {
-            "shop": "bakery"
-        }
-    },
-    {
-        "icon": "shop_butcher",
-        "tags": {
-            "shop": "butcher"
-        }
-    },
-    {
-        "icon": "shop_clothes",
-        "tags": {
-            "shop": "clothes"
-        }
-    },
-    {
-        "icon": "shop_convenience",
-        "tags": {
-            "shop": "convenience"
-        }
-    },
-    {
-        "icon": "department_store",
-        "tags": {
-            "shop": "department_store"
-        }
-    },
-    {
-        "icon": "shop_diy",
-        "tags": {
-            "shop": "doityourself"
-        }
-    },
-    {
-        "icon": "florist",
-        "tags": {
-            "shop": "florist"
-        }
-    },
-    {
-        "icon": "shop_hairdresser",
-        "tags": {
-            "shop": "hairdresser"
-        }
-    },
-    {
-        "icon": "shopping_car",
-        "tags": {
-            "shop": "car"
-        }
-    },
-    {
-        "icon": "shopping_car_repair",
-        "tags": {
-            "shop": "car_repair"
-        }
-    },
-    {
-        "icon": "shopping_bicycle",
-        "tags": {
-            "shop": "bicycle"
-        }
-    },
-    {
-        "icon": "playground",
-        "tags": {
-            "leisure": "playground"
-        }
-    },
-    {
-        "icon": "picnic",
-        "tags": {
-            "amenity": "picnic_site"
-        }
-    },
-    {
-        "icon": "transport_slipway",
-        "tags": {
-            "leisure": "slipway"
-        }
-    }
-];
-
-// generate a fast lookup table for point styling
-iD._pointTable = (function(points) {
-    var table = {};
-    for (var i = 0; i < points.length; i++) {
-        var point = points[i];
-        // single-tag matches, the easy case
-        if (Object.keys(point.tags).length === 1) {
-            for (var k in point.tags) {
-                var key = k + '=' + point.tags[k];
-                table[key] = point.icon;
-            }
-        }
-    }
-    return table;
-})(iD._points);
diff --git a/js/id/renderer/style.js b/js/id/renderer/style.js
index aac6c4863..ed61f44a8 100644
--- a/js/id/renderer/style.js
+++ b/js/id/renderer/style.js
@@ -37,17 +37,6 @@ iD.Style.waystack = function(a, b) {
     return as - bs;
 };
 
-iD.Style.pointImage = function(d) {
-    // TODO: optimize
-    for (var k in d.tags) {
-        var key = k + '=' + d.tags[k];
-        if (iD._pointTable[key]) {
-            return 'icons/' + iD._pointTable[key] + '.png';
-        }
-    }
-    return 'icons/unknown.png';
-};
-
 iD.Style.TAG_CLASSES = iD.util.trueObj([
     'highway', 'railway', 'motorway', 'amenity', 'natural',
     'landuse', 'building', 'oneway', 'bridge'
diff --git a/js/id/svg/points.js b/js/id/svg/points.js
index a92db711a..7a012cb56 100644
--- a/js/id/svg/points.js
+++ b/js/id/svg/points.js
@@ -1,4 +1,15 @@
 iD.svg.Points = function() {
+    function imageHref(d) {
+        // TODO: optimize
+        for (var k in d.tags) {
+            var key = k + '=' + d.tags[k];
+            if (iD.svg.Points.imageTable[key]) {
+                return 'icons/' + iD.svg.Points.imageTable[key] + '.png';
+            }
+        }
+        return 'icons/unknown.png';
+    };
+
     return function(surface, graph, entities, filter, projection) {
         var points = [];
 
@@ -34,9 +45,576 @@ iD.svg.Points = function() {
         // Selecting the following implicitly
         // sets the data (point entity) on the element
         groups.select('image')
-            .attr('xlink:href', iD.Style.pointImage);
+            .attr('xlink:href', imageHref);
 
         groups.exit()
             .remove();
     };
 };
+
+// an index of tag -> point image combinations, taken from
+// http://svn.openstreetmap.org/applications/rendering/mapnik/inc/layer-amenity-symbols.xml.inc
+iD.svg.Points.imageIndex = [
+    {
+        tags: { aeroway: 'helipad' },
+        icon: 'helipad'
+    },
+    {
+        tags: { aeroway: 'airport' },
+        icon: 'airport'
+    },
+    {
+        tags: { aeroway: 'aerodrome' },
+        icon: 'aerodrome'
+    },
+    {
+        tags: { railway: 'level_crossing' },
+        icon: 'level_crossing'
+    },
+    {
+        tags: { man_made: 'lighthouse' },
+        icon: 'lighthouselevel_crossing'
+    },
+    {
+        tags: { natural: 'peak' },
+        icon: 'peak'
+    },
+    {
+        tags: { natural: 'volcano' },
+        icon: 'volcano'
+    },
+    {
+        tags: { natural: 'cave_entrance' },
+        icon: 'poi_cave'
+    },
+    {
+        tags: { natural: 'spring' },
+        icon: 'spring'
+    },
+    {
+        tags: { natural: 'tree' },
+        icon: 'tree'
+    },
+    {
+        tags: {
+            power: 'generator',
+            'generator:source': 'wind'
+        },
+        icon: 'power_wind'
+    },
+    {
+        tags: {
+            power: 'generator',
+            power_source: 'wind'
+        },
+        icon: 'power_wind'
+    },
+    {
+        tags: {
+            man_made: 'power_wind'
+        },
+        icon: 'power_wind'
+    },
+    {
+        tags: {
+            man_made: 'windmill'
+        },
+        icon: 'windmill'
+    },
+    {
+        tags: {
+            man_made: 'mast'
+        },
+        icon: 'communications'
+    },
+    {
+        tags: {
+            highway: 'mini_roundabout'
+        },
+        icon: 'mini_roundabout'
+    },
+    {
+        tags: {
+            highway: 'gate'
+        },
+        icon: 'gate2'
+    },
+    {
+        tags: {
+            barrier: 'gate'
+        },
+        icon: 'gate2'
+    },
+    {
+        tags: {
+            barrier: 'lift_gate'
+        },
+        icon: 'liftgate'
+    },
+    {
+        tags: {
+            barrier: 'bollard'
+        },
+        icon: 'bollard'
+    },
+    {
+        tags: {
+            barrier: 'block'
+        },
+        icon: 'bollard'
+    },
+    {
+        "icon": "alpinehut",
+        "tags": {
+            "tourism": "alpine_hut"
+        }
+    },
+    {
+        "icon": "shelter2",
+        "tags": {
+            "amenity": "shelter"
+        }
+    },
+    {
+        "icon": "atm2",
+        "tags": {
+            "amenity": "atm"
+        }
+    },
+    {
+        "icon": "bank2",
+        "tags": {
+            "amenity": "bank"
+        }
+    },
+    {
+        "icon": "bar",
+        "tags": {
+            "amenity": "bar"
+        }
+    },
+    {
+        "icon": "rental_bicycle",
+        "tags": {
+            "amenity": "bicycle_rental"
+        }
+    },
+    {
+        "icon": "bus_stop_small",
+        "tags": {
+            "amenity": "bus_stop"
+        }
+    },
+    {
+        "icon": "bus_stop",
+        "tags": {
+            "amenity": "bus_stop"
+        }
+    },
+    {
+        "icon": "bus_station",
+        "tags": {
+            "amenity": "bus_station"
+        }
+    },
+    {
+        "icon": "traffic_light",
+        "tags": {
+            "highway": "traffic_signals"
+        }
+    },
+    {
+        "icon": "cafe",
+        "tags": {
+            "amenity": "cafe"
+        }
+    },
+    {
+        "icon": "camping",
+        "tags": {
+            "tourism": "camp_site"
+        }
+    },
+    {
+        "icon": "transport_ford",
+        "tags": {
+            "highway": "ford"
+        }
+    },
+    {
+        "icon": "caravan_park",
+        "tags": {
+            "tourism": "caravan_site"
+        }
+    },
+    {
+        "icon": "car_share",
+        "tags": {
+            "amenity": "car_sharing"
+        }
+    },
+    {
+        "icon": "chalet",
+        "tags": {
+            "tourism": "chalet"
+        }
+    },
+    {
+        "icon": "cinema",
+        "tags": {
+            "amenity": "cinema"
+        }
+    },
+    {
+        "icon": "firestation",
+        "tags": {
+            "amenity": "fire_station"
+        }
+    },
+    {
+        "icon": "fuel",
+        "tags": {
+            "amenity": "fuel"
+        }
+    },
+    {
+        "icon": "guest_house",
+        "tags": {
+            "tourism": "guest_house"
+        }
+    },
+    {
+        "icon": "bandb",
+        "tags": {
+            "tourism": "bed_and_breakfast"
+        }
+    },
+    {
+        "icon": "hospital",
+        "tags": {
+            "amenity": "hospital"
+        }
+    },
+    {
+        "icon": "hostel",
+        "tags": {
+            "tourism": "hostel"
+        }
+    },
+    {
+        "icon": "hotel2",
+        "tags": {
+            "tourism": "hotel"
+        }
+    },
+    {
+        "icon": "motel",
+        "tags": {
+            "tourism": "motel"
+        }
+    },
+    {
+        "icon": "information",
+        "tags": {
+            "tourism": "information"
+        }
+    },
+    {
+        "icon": "embassy",
+        "tags": {
+            "amenity": "embassy"
+        }
+    },
+    {
+        "icon": "library",
+        "tags": {
+            "amenity": "library"
+        }
+    },
+    {
+        "icon": "amenity_court",
+        "tags": {
+            "amenity": "courthouse"
+        }
+    },
+    {
+        "icon": "lock_gate",
+        "tags": {
+            "waterway": "lock"
+        }
+    },
+    {
+        "icon": "communications",
+        "tags": {
+            "man_made": "mast"
+        }
+    },
+    {
+        "icon": "museum",
+        "tags": {
+            "tourism": "museum"
+        }
+    },
+    {
+        "icon": "parking",
+        "tags": {
+            "amenity": "parking"
+        }
+    },
+    {
+        "icon": "parking_private",
+        "tags": {
+            "amenity": "parking"
+        }
+    },
+    {
+        "icon": "pharmacy",
+        "tags": {
+            "amenity": "pharmacy"
+        }
+    },
+    {
+        "icon": "christian3",
+        "tags": {
+            "amenity": "place_of_worship"
+        }
+    },
+    {
+        "icon": "islamic3",
+        "tags": {
+            "amenity": "place_of_worship"
+        }
+    },
+    {
+        "icon": "sikh3",
+        "tags": {
+            "amenity": "place_of_worship"
+        }
+    },
+    {
+        "icon": "jewish3",
+        "tags": {
+            "amenity": "place_of_worship"
+        }
+    },
+    {
+        "icon": "place_of_worship3",
+        "tags": {
+            "amenity": "place_of_worship"
+        }
+    },
+    {
+        "icon": "police",
+        "tags": {
+            "amenity": "police"
+        }
+    },
+    {
+        "icon": "post_box",
+        "tags": {
+            "amenity": "post_box"
+        }
+    },
+    {
+        "icon": "post_office",
+        "tags": {
+            "amenity": "post_office"
+        }
+    },
+    {
+        "icon": "pub",
+        "tags": {
+            "amenity": "pub"
+        }
+    },
+    {
+        "icon": "biergarten",
+        "tags": {
+            "amenity": "biergarten"
+        }
+    },
+    {
+        "icon": "recycling",
+        "tags": {
+            "amenity": "recycling"
+        }
+    },
+    {
+        "icon": "restaurant",
+        "tags": {
+            "amenity": "restaurant"
+        }
+    },
+    {
+        "icon": "fast_food",
+        "tags": {
+            "amenity": "fast_food"
+        }
+    },
+    {
+        "icon": "telephone",
+        "tags": {
+            "amenity": "telephone"
+        }
+    },
+    {
+        "icon": "sosphone",
+        "tags": {
+            "amenity": "emergency_phone"
+        }
+    },
+    {
+        "icon": "theatre",
+        "tags": {
+            "amenity": "theatre"
+        }
+    },
+    {
+        "icon": "toilets",
+        "tags": {
+            "amenity": "toilets"
+        }
+    },
+    {
+        "icon": "food_drinkingtap",
+        "tags": {
+            "amenity": "drinking_water"
+        }
+    },
+    {
+        "icon": "amenity_prison",
+        "tags": {
+            "amenity": "prison"
+        }
+    },
+    {
+        "icon": "view_point",
+        "tags": {
+            "tourism": "viewpoint"
+        }
+    },
+    {
+        "icon": "tower_water",
+        "tags": {
+            "man_made": "water_tower"
+        }
+    },
+    {
+        "icon": "tourist_memorial",
+        "tags": {
+            "historic": "memorial"
+        }
+    },
+    {
+        "icon": "tourist_archaeological2",
+        "tags": {
+            "historic": "archaeological_site"
+        }
+    },
+    {
+        "icon": "shop_supermarket",
+        "tags": {
+            "shop": "supermarket"
+        }
+    },
+    {
+        "icon": "shop_bakery",
+        "tags": {
+            "shop": "bakery"
+        }
+    },
+    {
+        "icon": "shop_butcher",
+        "tags": {
+            "shop": "butcher"
+        }
+    },
+    {
+        "icon": "shop_clothes",
+        "tags": {
+            "shop": "clothes"
+        }
+    },
+    {
+        "icon": "shop_convenience",
+        "tags": {
+            "shop": "convenience"
+        }
+    },
+    {
+        "icon": "department_store",
+        "tags": {
+            "shop": "department_store"
+        }
+    },
+    {
+        "icon": "shop_diy",
+        "tags": {
+            "shop": "doityourself"
+        }
+    },
+    {
+        "icon": "florist",
+        "tags": {
+            "shop": "florist"
+        }
+    },
+    {
+        "icon": "shop_hairdresser",
+        "tags": {
+            "shop": "hairdresser"
+        }
+    },
+    {
+        "icon": "shopping_car",
+        "tags": {
+            "shop": "car"
+        }
+    },
+    {
+        "icon": "shopping_car_repair",
+        "tags": {
+            "shop": "car_repair"
+        }
+    },
+    {
+        "icon": "shopping_bicycle",
+        "tags": {
+            "shop": "bicycle"
+        }
+    },
+    {
+        "icon": "playground",
+        "tags": {
+            "leisure": "playground"
+        }
+    },
+    {
+        "icon": "picnic",
+        "tags": {
+            "amenity": "picnic_site"
+        }
+    },
+    {
+        "icon": "transport_slipway",
+        "tags": {
+            "leisure": "slipway"
+        }
+    }
+];
+
+// generate a fast lookup table for point styling
+iD.svg.Points.imageTable = (function(points) {
+    var table = {};
+    for (var i = 0; i < points.length; i++) {
+        var point = points[i];
+        // single-tag matches, the easy case
+        if (Object.keys(point.tags).length === 1) {
+            for (var k in point.tags) {
+                var key = k + '=' + point.tags[k];
+                table[key] = point.icon;
+            }
+        }
+    }
+    return table;
+})(iD.svg.Points.imageIndex);
diff --git a/test/index.html b/test/index.html
index be9c16b04..03b4b9d1a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -37,7 +37,6 @@
     <script src='../js/id/renderer/background_source.js'></script>
     <script src='../js/id/renderer/map.js'></script>
     <script src='../js/id/renderer/hash.js'></script>
-    <script src='../js/id/renderer/points.js'></script>
     <script src='../js/id/renderer/style.js'></script>
 
     <script src="../js/id/svg.js"></script>