From d1f9c88f04e8bf12128f4d1870bb2127c2b44ca1 Mon Sep 17 00:00:00 2001 From: Kushan Joshi <0o3ko0@gmail.com> Date: Fri, 12 Feb 2016 23:49:17 +0530 Subject: [PATCH] =?UTF-8?q?Adding=20=E2=96=B6/=E2=96=BC=20to=20category=20?= =?UTF-8?q?presets=20to=20make=20it=20more=20clear?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (closes #2972) --- data/presets.yaml | 20 ++++++++++---------- data/presets/categories.json | 20 ++++++++++---------- data/presets/categories/building.json | 4 ++-- data/presets/categories/golf.json | 4 ++-- data/presets/categories/landuse.json | 2 +- data/presets/categories/path.json | 2 +- data/presets/categories/rail.json | 2 +- data/presets/categories/restriction.json | 2 +- data/presets/categories/road.json | 4 ++-- data/presets/categories/route.json | 2 +- data/presets/categories/water-area.json | 4 ++-- data/presets/categories/water-line.json | 2 +- dist/locales/en.json | 20 ++++++++++---------- js/id/ui/preset_list.js | 13 +++++++++++-- 14 files changed, 55 insertions(+), 46 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index aab2d7815..341b1e0b2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2,25 +2,25 @@ en: presets: categories: category-building: - name: Building + name: Building Features category-golf: - name: Golf + name: Golf Features category-landuse: - name: Land Use + name: Land Use Features category-path: - name: Path + name: Path Features category-rail: - name: Rail + name: Rail Features category-restriction: - name: Restriction + name: Restriction Features category-road: - name: Road + name: Road Features category-route: - name: Route + name: Route Features category-water-area: - name: Water + name: Water Features category-water-line: - name: Water + name: Water Features fields: access: # 'access=*, foot=*, motor_vehicle=*, bicycle=*, horse=*' diff --git a/data/presets/categories.json b/data/presets/categories.json index 84954b11f..fcec664a9 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -1,7 +1,7 @@ { "category-building": { "geometry": "area", - "name": "Building", + "name": "Building Features", "icon": "building", "members": [ "building/house", @@ -14,7 +14,7 @@ }, "category-golf": { "geometry": "area", - "name": "Golf", + "name": "Golf Features", "icon": "golf", "members": [ "golf/fairway", @@ -28,7 +28,7 @@ }, "category-landuse": { "geometry": "area", - "name": "Land Use", + "name": "Land Use Features", "icon": "land-use", "members": [ "landuse/residential", @@ -45,7 +45,7 @@ }, "category-path": { "geometry": "line", - "name": "Path", + "name": "Path Features", "icon": "category-path", "members": [ "highway/pedestrian", @@ -58,7 +58,7 @@ }, "category-rail": { "geometry": "line", - "name": "Rail", + "name": "Rail Features", "icon": "category-rail", "members": [ "railway/rail", @@ -71,7 +71,7 @@ }, "category-restriction": { "geometry": "relation", - "name": "Restriction", + "name": "Restriction Features", "icon": "restriction", "members": [ "type/restriction/no_left_turn", @@ -86,7 +86,7 @@ }, "category-road": { "geometry": "line", - "name": "Road", + "name": "Road Features", "icon": "category-roads", "members": [ "highway/residential", @@ -108,7 +108,7 @@ }, "category-route": { "geometry": "relation", - "name": "Route", + "name": "Route Features", "icon": "route", "members": [ "type/route/road", @@ -128,7 +128,7 @@ }, "category-water-area": { "geometry": "area", - "name": "Water", + "name": "Water Features", "icon": "water", "members": [ "natural/water/lake", @@ -139,7 +139,7 @@ }, "category-water-line": { "geometry": "line", - "name": "Water", + "name": "Water Features", "icon": "category-water", "members": [ "waterway/river", diff --git a/data/presets/categories/building.json b/data/presets/categories/building.json index fb479521b..c153dbb27 100644 --- a/data/presets/categories/building.json +++ b/data/presets/categories/building.json @@ -1,6 +1,6 @@ { "geometry": "area", - "name": "Building", + "name": "Building Features", "icon": "building", "members": [ "building/house", @@ -10,4 +10,4 @@ "building/residential", "building" ] -} \ No newline at end of file +} diff --git a/data/presets/categories/golf.json b/data/presets/categories/golf.json index 0e5a8f25a..1077ac42b 100644 --- a/data/presets/categories/golf.json +++ b/data/presets/categories/golf.json @@ -1,6 +1,6 @@ { "geometry": "area", - "name": "Golf", + "name": "Golf Features", "icon": "golf", "members": [ "golf/fairway", @@ -11,4 +11,4 @@ "golf/tee", "golf/water_hazard" ] -} \ No newline at end of file +} diff --git a/data/presets/categories/landuse.json b/data/presets/categories/landuse.json index 667975dec..e7d1c2ece 100644 --- a/data/presets/categories/landuse.json +++ b/data/presets/categories/landuse.json @@ -1,6 +1,6 @@ { "geometry": "area", - "name": "Land Use", + "name": "Land Use Features", "icon": "land-use", "members": [ "landuse/residential", diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json index a1b30297d..88a8576e1 100644 --- a/data/presets/categories/path.json +++ b/data/presets/categories/path.json @@ -1,6 +1,6 @@ { "geometry": "line", - "name": "Path", + "name": "Path Features", "icon": "category-path", "members": [ "highway/pedestrian", diff --git a/data/presets/categories/rail.json b/data/presets/categories/rail.json index 106844a2a..e414c41bd 100644 --- a/data/presets/categories/rail.json +++ b/data/presets/categories/rail.json @@ -1,6 +1,6 @@ { "geometry": "line", - "name": "Rail", + "name": "Rail Features", "icon": "category-rail", "members": [ "railway/rail", diff --git a/data/presets/categories/restriction.json b/data/presets/categories/restriction.json index fdb3c5fa6..006b980cd 100644 --- a/data/presets/categories/restriction.json +++ b/data/presets/categories/restriction.json @@ -1,6 +1,6 @@ { "geometry": "relation", - "name": "Restriction", + "name": "Restriction Features", "icon": "restriction", "members": [ "type/restriction/no_left_turn", diff --git a/data/presets/categories/road.json b/data/presets/categories/road.json index 5021f7e3a..e75df54d3 100644 --- a/data/presets/categories/road.json +++ b/data/presets/categories/road.json @@ -1,6 +1,6 @@ { "geometry": "line", - "name": "Road", + "name": "Road Features", "icon": "category-roads", "members": [ "highway/residential", @@ -19,4 +19,4 @@ "highway/track", "highway/road" ] -} \ No newline at end of file +} diff --git a/data/presets/categories/route.json b/data/presets/categories/route.json index f01a216dd..ed15e114c 100644 --- a/data/presets/categories/route.json +++ b/data/presets/categories/route.json @@ -1,6 +1,6 @@ { "geometry": "relation", - "name": "Route", + "name": "Route Features", "icon": "route", "members": [ "type/route/road", diff --git a/data/presets/categories/water-area.json b/data/presets/categories/water-area.json index 2b787a4a1..4b8531726 100644 --- a/data/presets/categories/water-area.json +++ b/data/presets/categories/water-area.json @@ -1,6 +1,6 @@ { "geometry": "area", - "name": "Water", + "name": "Water Features", "icon": "water", "members": [ "natural/water/lake", @@ -8,4 +8,4 @@ "natural/water/reservoir", "natural/water" ] -} \ No newline at end of file +} diff --git a/data/presets/categories/water-line.json b/data/presets/categories/water-line.json index 04dad07e8..9db7fa99b 100644 --- a/data/presets/categories/water-line.json +++ b/data/presets/categories/water-line.json @@ -1,6 +1,6 @@ { "geometry": "line", - "name": "Water", + "name": "Water Features", "icon": "category-water", "members": [ "waterway/river", diff --git a/dist/locales/en.json b/dist/locales/en.json index ad4ddff19..28c8bb7ee 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -602,34 +602,34 @@ "presets": { "categories": { "category-building": { - "name": "Building" + "name": "Building Features" }, "category-golf": { - "name": "Golf" + "name": "Golf Features" }, "category-landuse": { - "name": "Land Use" + "name": "Land Use Features" }, "category-path": { - "name": "Path" + "name": "Path Features" }, "category-rail": { - "name": "Rail" + "name": "Rail Features" }, "category-restriction": { - "name": "Restriction" + "name": "Restriction Features" }, "category-road": { - "name": "Road" + "name": "Road Features" }, "category-route": { - "name": "Route" + "name": "Route Features" }, "category-water-area": { - "name": "Water" + "name": "Water Features" }, "category-water-line": { - "name": "Water" + "name": "Water Features" } }, "fields": { diff --git a/js/id/ui/preset_list.js b/js/id/ui/preset_list.js index d244a0530..bef5f215a 100644 --- a/js/id/ui/preset_list.js +++ b/js/id/ui/preset_list.js @@ -133,13 +133,22 @@ iD.ui.PresetList = function(context) { wrap.append('button') .attr('class', 'preset-list-button') + .classed('expanded', false) .call(iD.ui.PresetIcon() .geometry(context.geometry(id)) .preset(preset)) - .on('click', item.choose) + .on('click', function() { + var isExpanded = d3.select(this).classed('expanded'); + var triangle = isExpanded ? '▶ ' : '▼ '; + d3.select(this).classed('expanded', !isExpanded); + d3.select(this).selectAll('.label').text(triangle + preset.name()); + item.choose(); + }) .append('div') .attr('class', 'label') - .text(preset.name()); + .text(function() { + return '▶ ' + preset.name(); + }); box = selection.append('div') .attr('class', 'subgrid col12')