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

Upgrade temaki icons to 1.1.0, add icons for wall, railing, guard_rail

Browse Source
This commit is contained in:
Bryan Housel
2019-01-21 11:41:37 -05:00
parent 898b2e3d0a
commit 263ecbf0c0
8 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets/presets.json
+5 -5
View File
@@ -231,23 +231,23 @@
"barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
"barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
"barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"},
"barrier/city_wall": {"icon": "maki-barrier", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"},
"barrier/city_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"},
"barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"},
"barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25},
"barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height", "material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
"barrier/fence/railing": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "name": "Railing", "terms": ["railing", "handrail", "guard rail"], "matchScore": 0.5},
"barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["railing", "handrail", "guard rail"], "name": "Railing", "matchScore": 0.5},
"barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
"barrier/guard_rail": {"icon": "maki-barrier", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
"barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
"barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
"barrier/kerb": {"fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
"barrier/kerb/flush": {"icon": "maki-wheelchair", "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"},
"barrier/kerb/lowered": {"icon": "maki-wheelchair", "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
"barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
"barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
"barrier/retaining_wall": {"fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
"barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
"barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
"barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
"barrier/wall": {"icon": "maki-barrier", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
"barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
"boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]},
"bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
"bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
data/presets/presets/barrier/city_wall.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-barrier",
"icon": "temaki-wall",
"fields": [
"height",
"material"
data/presets/presets/barrier/fence/railing.json
+2 -2
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-barrier",
"icon": "temaki-railing",
"geometry": [
"line"
],
@@ -7,11 +7,11 @@
"barrier": "fence",
"fence_type": "railing"
},
"name": "Railing",
"terms": [
"railing",
"handrail",
"guard rail"
],
"name": "Railing",
"matchScore": 0.5
}
data/presets/presets/barrier/guard_rail.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-barrier",
"icon": "temaki-guard_rail",
"fields": [
"material"
],
data/presets/presets/barrier/retaining_wall.json
+1
View File
@@ -1,4 +1,5 @@
{
"icon": "temaki-wall",
"fields": [
"height",
"material"
data/presets/presets/barrier/wall.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "maki-barrier",
"icon": "temaki-wall",
"fields": [
"wall",
"height",
data/taginfo.json
+5 -5
View File
@@ -232,23 +232,23 @@
{"key": "barrier", "value": "bollard", "description": "🄿 Bollard", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "barrier", "value": "city_wall", "description": "🄿 City Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "barrier", "value": "city_wall", "description": "🄿 City Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"},
{"key": "barrier", "value": "cycle_barrier", "description": "🄿 Cycle Barrier", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "ditch", "description": "🄿 Trench", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "fence", "description": "🄿 Fence", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fence-15.svg?sanitize=true"},
{"key": "fence_type", "value": "railing", "description": "🄿 Railing", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "fence_type", "value": "railing", "description": "🄿 Railing", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/railing.svg?sanitize=true"},
{"key": "barrier", "value": "gate", "description": "🄿 Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "barrier", "value": "guard_rail", "description": "🄿 Guard Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "barrier", "value": "guard_rail", "description": "🄿 Guard Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/guard_rail.svg?sanitize=true"},
{"key": "barrier", "value": "hedge", "description": "🄿 Hedge", "object_types": ["way", "area"]},
{"key": "barrier", "value": "kerb", "description": "🄿 Curb", "object_types": ["node", "way"]},
{"key": "kerb", "value": "flush", "description": "🄿 Flush Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"},
{"key": "kerb", "value": "lowered", "description": "🄿 Lowered Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"},
{"key": "barrier", "value": "kissing_gate", "description": "🄿 Kissing Gate", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"]},
{"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"},
{"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"},
{"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"},
{"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"},
{"key": "boundary", "value": "administrative", "description": "🄿 Administrative Boundary", "object_types": ["way"]},
{"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true"},
{"key": "bridge:support", "value": "pier", "description": "🄿 Bridge Pier", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true"},
package.json
+1 -1
View File
@@ -89,7 +89,7 @@
"sinon-chai": "^3.1.0",
"smash": "0.0",
"svg-sprite": "1.5.0",
"temaki": "1.0.0",
"temaki": "1.1.0",
"uglify-js": "~3.4.0",
"xml2js": "^0.4.17",
"xmlbuilder": "^10.0.0"