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

Make categories not geometry-specific

Browse Source
This commit is contained in:
Quincy Morgan
2019-03-04 13:39:30 -05:00
parent 0aa95bf8b0
commit 734731bfda
23 changed files with 63 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/80_app.css
+3
View File
@@ -1194,6 +1194,9 @@ a.hide-toggle {
.preset-icon-iD {
transform: scale(1);
}
.preset-icon-iD.framed {
transform: scale(0.74);
}
.preset-icon-iD.framed.line-geom {
transform: translateY(-30%) scale(0.74);
}
data/presets.yaml
+3 -11
View File
@@ -5,17 +5,11 @@ en:
name: Barrier Features
category-building:
name: Building Features
category-golf-area:
name: Golf Features
category-golf-line:
category-golf:
name: Golf Features
category-landuse:
name: Land Use Features
category-natural-area:
name: Natural Features
category-natural-line:
name: Natural Features
category-natural-point:
category-natural:
name: Natural Features
category-path:
name: Path Features
@@ -29,9 +23,7 @@ en:
name: Route Features
category-utility:
name: Utility Features
category-water-area:
name: Water Features
category-water-line:
category-water:
name: Water Features
fields:
access:
data/presets/categories.json
+13 -47
View File
@@ -2,7 +2,6 @@
"categories": {
"category-barrier": {
"icon": "maki-roadblock",
"geometry": "line",
"name": "Barrier Features",
"members": [
"barrier/fence",
@@ -16,7 +15,6 @@
},
"category-building": {
"icon": "maki-building",
"geometry": "area",
"name": "Building Features",
"members": [
"building",
@@ -29,9 +27,8 @@
"building/residential"
]
},
"category-golf-area": {
"category-golf": {
"icon": "maki-golf",
"geometry": "area",
"name": "Golf Features",
"members": [
"golf/fairway",
@@ -41,14 +38,7 @@
"golf/bunker",
"golf/tee",
"golf/water_hazard",
"golf/driving_range"
]
},
"category-golf-line": {
"icon": "maki-golf",
"geometry": "line",
"name": "Golf Features",
"members": [
"golf/driving_range",
"golf/hole",
"golf/cartpath",
"golf/cartpath_service",
@@ -57,7 +47,6 @@
},
"category-landuse": {
"icon": "maki-landuse",
"geometry": "area",
"name": "Land Use Features",
"members": [
"landuse/residential",
@@ -74,9 +63,8 @@
"landuse/religious"
]
},
"category-natural-area": {
"category-natural": {
"icon": "maki-natural",
"geometry": "area",
"name": "Natural Features",
"members": [
"natural/water",
@@ -88,20 +76,9 @@
"natural/bare_rock",
"natural/beach",
"natural/cave_entrance",
"natural/glacier"
]
},
"category-natural-line": {
"icon": "maki-natural",
"geometry": "line",
"name": "Natural Features",
"members": ["natural/coastline", "natural/tree_row"]
},
"category-natural-point": {
"icon": "maki-natural",
"geometry": "point",
"name": "Natural Features",
"members": [
"natural/glacier",
"natural/coastline",
"natural/tree_row",
"natural/peak",
"natural/cliff",
"natural/beach",
@@ -110,7 +87,6 @@
},
"category-path": {
"icon": "iD-category-path",
"geometry": "line",
"name": "Path Features",
"members": [
"highway/footway/marked",
@@ -125,20 +101,21 @@
},
"category-rail": {
"icon": "iD-category-rail",
"geometry": "line",
"name": "Rail Features",
"members": [
"railway/rail",
"railway/subway",
"railway/tram",
"railway/monorail",
"railway/disused",
"railway/abandoned"
"railway/level_crossing",
"railway/crossing",
"railway/switch",
"railway/buffer_stop",
"railway/signal"
]
},
"category-restriction": {
"icon": "iD-restriction",
"geometry": "relation",
"name": "Restriction Features",
"members": [
"type/restriction/no_left_turn",
@@ -154,7 +131,6 @@
},
"category-road": {
"icon": "iD-category-roads",
"geometry": "line",
"name": "Road Features",
"members": [
"highway/residential",
@@ -177,7 +153,6 @@
},
"category-route": {
"icon": "iD-route",
"geometry": "relation",
"name": "Route Features",
"members": [
"type/route/road",
@@ -201,7 +176,6 @@
},
"category-utility": {
"icon": "iD-category-utility",
"geometry": "line",
"name": "Utility Features",
"members": [
"power/line",
@@ -210,22 +184,14 @@
"power/cable/underground"
]
},
"category-water-area": {
"category-water": {
"icon": "maki-water",
"geometry": "area",
"name": "Water Features",
"members": [
"natural/water/lake",
"natural/water/pond",
"natural/water/reservoir",
"natural/water"
]
},
"category-water-line": {
"icon": "iD-category-water",
"geometry": "line",
"name": "Water Features",
"members": [
"natural/water",
"waterway/river",
"waterway/stream",
"waterway/canal",
data/presets/categories/barrier.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "maki-roadblock",
"geometry": "line",
"name": "Barrier Features",
"members": [
"barrier/fence",
data/presets/categories/building.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "maki-building",
"geometry": "area",
"name": "Building Features",
"members": [
"building",
data/presets/categories/golf-line.json
-11
View File
@@ -1,11 +0,0 @@
{
"icon": "maki-golf",
"geometry": "line",
"name": "Golf Features",
"members": [
"golf/hole",
"golf/cartpath",
"golf/cartpath_service",
"golf/path"
]
}
data/presets/categories/golf-area.json → data/presets/categories/golf.json
+5 -2
View File
@@ -1,6 +1,5 @@
{
"icon": "maki-golf",
"geometry": "area",
"name": "Golf Features",
"members": [
"golf/fairway",
@@ -10,6 +9,10 @@
"golf/bunker",
"golf/tee",
"golf/water_hazard",
"golf/driving_range"
"golf/driving_range",
"golf/hole",
"golf/cartpath",
"golf/cartpath_service",
"golf/path"
]
}
data/presets/categories/landuse.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "maki-landuse",
"geometry": "area",
"name": "Land Use Features",
"members": [
"landuse/residential",
data/presets/categories/natural-line.json
-9
View File
@@ -1,9 +0,0 @@
{
"icon": "maki-natural",
"geometry": "line",
"name": "Natural Features",
"members": [
"natural/coastline",
"natural/tree_row"
]
}
data/presets/categories/natural-point.json
-11
View File
@@ -1,11 +0,0 @@
{
"icon": "maki-natural",
"geometry": "point",
"name": "Natural Features",
"members": [
"natural/peak",
"natural/cliff",
"natural/beach",
"natural/cave_entrance"
]
}
data/presets/categories/natural-area.json → data/presets/categories/natural.json
+7 -2
View File
@@ -1,6 +1,5 @@
{
"icon": "maki-natural",
"geometry": "area",
"name": "Natural Features",
"members": [
"natural/water",
@@ -12,6 +11,12 @@
"natural/bare_rock",
"natural/beach",
"natural/cave_entrance",
"natural/glacier"
"natural/glacier",
"natural/coastline",
"natural/tree_row",
"natural/peak",
"natural/cliff",
"natural/beach",
"natural/cave_entrance"
]
}
data/presets/categories/path.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "iD-category-path",
"geometry": "line",
"name": "Path Features",
"members": [
"highway/footway/marked",
data/presets/categories/rail.json
+5 -3
View File
@@ -1,13 +1,15 @@
{
"icon": "iD-category-rail",
"geometry": "line",
"name": "Rail Features",
"members": [
"railway/rail",
"railway/subway",
"railway/tram",
"railway/monorail",
"railway/disused",
"railway/abandoned"
"railway/level_crossing",
"railway/crossing",
"railway/switch",
"railway/buffer_stop",
"railway/signal"
]
}
data/presets/categories/restriction.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "iD-restriction",
"geometry": "relation",
"name": "Restriction Features",
"members": [
"type/restriction/no_left_turn",
data/presets/categories/road.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "iD-category-roads",
"geometry": "line",
"name": "Road Features",
"members": [
"highway/residential",
data/presets/categories/route.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "iD-route",
"geometry": "relation",
"name": "Route Features",
"members": [
"type/route/road",
data/presets/categories/utility.json
-1
View File
@@ -1,6 +1,5 @@
{
"icon": "iD-category-utility",
"geometry": "line",
"name": "Utility Features",
"members": [
"power/line",
data/presets/categories/water-area.json
-11
View File
@@ -1,11 +0,0 @@
{
"icon": "maki-water",
"geometry": "area",
"name": "Water Features",
"members": [
"natural/water/lake",
"natural/water/pond",
"natural/water/reservoir",
"natural/water"
]
}
data/presets/categories/water-line.json → data/presets/categories/water.json
+5 -2
View File
@@ -1,8 +1,11 @@
{
"icon": "iD-category-water",
"geometry": "line",
"icon": "maki-water",
"name": "Water Features",
"members": [
"natural/water/lake",
"natural/water/pond",
"natural/water/reservoir",
"natural/water",
"waterway/river",
"waterway/stream",
"waterway/canal",
data/presets/defaults.json
+5 -5
View File
@@ -3,8 +3,8 @@
"area": [
"category-landuse",
"category-building",
"category-water-area",
"category-natural-area",
"category-water",
"category-natural",
"leisure/park",
"amenity/hospital",
"amenity/place_of_worship",
@@ -16,14 +16,14 @@
"category-road",
"category-rail",
"category-path",
"category-water-line",
"category-water",
"category-barrier",
"category-natural-line",
"category-natural",
"category-utility",
"line"
],
"point": [
"category-natural-point",
"category-natural",
"leisure/park",
"amenity/hospital",
"amenity/place_of_worship",
dist/locales/en.json
Vendored
+3 -15
View File
@@ -2065,22 +2065,13 @@
"category-building": {
"name": "Building Features"
},
"category-golf-area": {
"name": "Golf Features"
},
"category-golf-line": {
"category-golf": {
"name": "Golf Features"
},
"category-landuse": {
"name": "Land Use Features"
},
"category-natural-area": {
"name": "Natural Features"
},
"category-natural-line": {
"name": "Natural Features"
},
"category-natural-point": {
"category-natural": {
"name": "Natural Features"
},
"category-path": {
@@ -2101,10 +2092,7 @@
"category-utility": {
"name": "Utility Features"
},
"category-water-area": {
"name": "Water Features"
},
"category-water-line": {
"category-water": {
"name": "Water Features"
}
},
modules/presets/category.js
+11
View File
@@ -14,6 +14,17 @@ export function presetCategory(id, category, all) {
}));
category.geometry = category.members.collection.reduce(function(geometries, preset) {
for (var index in preset.geometry) {
var geometry = preset.geometry[index];
if (geometries.indexOf(geometry) === -1) {
geometries.push(geometry);
}
}
return geometries;
}, []);
category.matchGeometry = function(geometry) {
return category.geometry.indexOf(geometry) >= 0;
};
modules/ui/preset_list.js
+3 -2
View File
@@ -339,11 +339,12 @@ export function uiPresetList(context) {
.style('padding-bottom', '0px');
} else {
shown = true;
sublist.call(drawList, preset.members);
var members = preset.members.matchGeometry(context.geometry(_entityID));
sublist.call(drawList, members);
box.transition()
.duration(200)
.style('opacity', '1')
.style('max-height', 200 + preset.members.collection.length * 190 + 'px')
.style('max-height', 200 + members.collection.length * 190 + 'px')
.style('padding-bottom', '10px');
}
};