CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 21:28:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2988 from kepta/2972

Browse Source 
Adding ▶/▼ to category presets to make it clearer
This commit is contained in:
Bryan Housel
2016-02-18 16:12:32 -05:00
parent 8b3954139a d1f9c88f04
commit c2760470b8
14 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+10 -10
View File
@@ -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=*'
data/presets/categories.json
+10 -10
View File
@@ -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",
data/presets/categories/building.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"geometry": "area",
"name": "Building",
"name": "Building Features",
"icon": "building",
"members": [
"building/house",
@@ -10,4 +10,4 @@
"building/residential",
"building"
]
}
}
data/presets/categories/golf.json
+2 -2
View File
@@ -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"
]
}
}
data/presets/categories/landuse.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"geometry": "area",
"name": "Land Use",
"name": "Land Use Features",
"icon": "land-use",
"members": [
"landuse/residential",
data/presets/categories/path.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"geometry": "line",
"name": "Path",
"name": "Path Features",
"icon": "category-path",
"members": [
"highway/pedestrian",
data/presets/categories/rail.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"geometry": "line",
"name": "Rail",
"name": "Rail Features",
"icon": "category-rail",
"members": [
"railway/rail",
data/presets/categories/restriction.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"geometry": "relation",
"name": "Restriction",
"name": "Restriction Features",
"icon": "restriction",
"members": [
"type/restriction/no_left_turn",
data/presets/categories/road.json
+2 -2
View File
@@ -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"
]
}
}
data/presets/categories/route.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"geometry": "relation",
"name": "Route",
"name": "Route Features",
"icon": "route",
"members": [
"type/route/road",
data/presets/categories/water-area.json
+2 -2
View File
@@ -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"
]
}
}
data/presets/categories/water-line.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"geometry": "line",
"name": "Water",
"name": "Water Features",
"icon": "category-water",
"members": [
"waterway/river",
dist/locales/en.json
Vendored
+10 -10
View File
@@ -608,34 +608,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": {
js/id/ui/preset_list.js
+11 -2
View File
@@ -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')