CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 13:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use simple tag deprecation instead of specific replacements for two outdated presets

Browse Source
This commit is contained in:
Quincy Morgan
2019-11-11 13:50:47 +01:00
parent 40edee1275
commit 138a0bab94
7 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/deprecated.json
+10 -2
View File
@@ -236,13 +236,21 @@
"old": {"company": "consulting"},
"replace": {"office": "consulting"}
},
{
"old": {"craft": "catering"},
"replace": {"craft": "caterer"}
},
{
"old": {"craft": "glass"},
"replace": {"craft": "glaziery"}
},
{
"old": {"craft": "catering"},
"replace": {"craft": "caterer"}
"old": {"craft": "jeweler"},
"replace": {"shop": "jewelry"}
},
{
"old": {"craft": "optician"},
"replace": {"shop": "optician"}
},
{
"old": {"craft": "sculpter"},
data/presets.yaml
-6
View File
@@ -4363,9 +4363,6 @@ en:
# craft=insulation
name: Insulator
terms: '<translate with synonyms or related terms for ''Insulator'', separated by commas>'
craft/jeweler:
# craft=jeweler
name: Jeweler
craft/joiner:
# craft=joiner
name: Joiner
@@ -4382,9 +4379,6 @@ en:
# craft=metal_construction
name: Metal Construction
terms: '<translate with synonyms or related terms for ''Metal Construction'', separated by commas>'
craft/optician:
# craft=optician
name: Optician
craft/painter:
# craft=painter
name: Painter
data/presets/presets.json
-2
View File
@@ -379,9 +379,7 @@
"club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
"club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
"craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
"craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false, "replacement": "shop/jewelry"},
"craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
"craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false, "replacement": "shop/optician"},
"craft/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false},
"craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "name": "Argricultural Engines Mechanic"},
"craft/basket_maker": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "tags": {"craft": "basket_maker"}, "name": "Basket Maker"},
data/presets/presets/craft/_jeweler.json
-17
View File
@@ -1,17 +0,0 @@
{
"icon": "maki-marker-stroked",
"geometry": [
"point",
"area"
],
"tags": {
"craft": "jeweler"
},
"reference": {
"key": "shop",
"value": "jewelry"
},
"name": "Jeweler",
"searchable": false,
"replacement": "shop/jewelry"
}
data/presets/presets/craft/_optician.json
-17
View File
@@ -1,17 +0,0 @@
{
"icon": "maki-marker-stroked",
"geometry": [
"point",
"area"
],
"tags": {
"craft": "optician"
},
"reference": {
"key": "shop",
"value": "optician"
},
"name": "Optician",
"searchable": false,
"replacement": "shop/optician"
}
data/taginfo.json
-2
View File
@@ -374,9 +374,7 @@
{"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
{"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
{"key": "craft", "description": "🄿 Craft, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
{"key": "craft", "value": "jeweler", "description": "🄿 Jeweler (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
{"key": "craft", "value": "locksmith", "description": "🄿 Locksmith (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
{"key": "craft", "value": "optician", "description": "🄿 Optician (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
{"key": "craft", "value": "tailor", "description": "🄿 Tailor (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
{"key": "craft", "value": "agricultural_engines", "description": "🄿 Argricultural Engines Mechanic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
{"key": "craft", "value": "basket_maker", "description": "🄿 Basket Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
dist/locales/en.json
Vendored
-6
View File
@@ -6133,15 +6133,9 @@
"name": "Craft",
"terms": ""
},
"craft/jeweler": {
"name": "Jeweler"
},
"craft/locksmith": {
"name": "Locksmith"
},
"craft/optician": {
"name": "Optician"
},
"craft/tailor": {
"name": "Tailor"
},