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

Deprecate amenity=scrapyard, in favor of industrial=scrap_yard

Browse Source 
(re: #3387 / https://github.com/openstreetmap/iD/issues/4466#issuecomment-339187977)
This commit is contained in:
Bryan Housel
2017-10-24 23:02:04 -04:00
parent 2ed84c00ac
commit 9c5a79a714
7 changed files with 128 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+5 -2
View File
@@ -2098,8 +2098,6 @@ en:
amenity/scrapyard:
# amenity=scrapyard
name: Scrap Yard
# 'terms: car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard'
terms: '<translate with synonyms or related terms for ''Scrap Yard'', separated by commas>'
amenity/shelter:
# amenity=shelter
name: Shelter
@@ -3310,6 +3308,11 @@ en:
# landuse=industrial
name: Industrial Area
terms: '<translate with synonyms or related terms for ''Industrial Area'', separated by commas>'
landuse/industrial/scrap_yard:
# industrial=scrap_yard
name: Scrap Yard
# 'terms: car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard'
terms: '<translate with synonyms or related terms for ''Scrap Yard'', separated by commas>'
landuse/industrial/slaughterhouse:
# industrial=slaughterhouse
name: Slaughterhouse
data/presets/presets.json
+66 -32
View File
@@ -590,6 +590,28 @@
"name": "Register Office",
"searchable": false
},
"amenity/scrapyard": {
"icon": "car",
"fields": [
"name",
"operator",
"address",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "scrapyard"
},
"reference": {
"key": "industrial",
"value": "scrap_yard"
},
"name": "Scrap Yard",
"searchable": false
},
"amenity/swimming_pool": {
"icon": "swimming",
"geometry": [
@@ -2640,38 +2662,6 @@
},
"name": "School Grounds"
},
"amenity/scrapyard": {
"icon": "car",
"fields": [
"name",
"operator",
"address",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"car",
"junk",
"metal",
"salvage",
"scrap",
"u-pull-it",
"vehicle",
"wreck",
"yard"
],
"tags": {
"amenity": "scrapyard"
},
"reference": {
"key": "industrial",
"value": "scrap_yard"
},
"name": "Scrap Yard"
},
"amenity/shelter": {
"icon": "shelter",
"fields": [
@@ -8157,6 +8147,46 @@
"matchScore": 0.9,
"name": "Industrial Area"
},
"landuse/industrial/scrap_yard": {
"icon": "car",
"fields": [
"name",
"operator",
"address",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"tags": {
"industrial": "scrap_yard"
},
"addTags": {
"landuse": "industrial",
"industrial": "scrap_yard"
},
"removeTags": {
"landuse": "industrial",
"industrial": "scrap_yard"
},
"reference": {
"key": "industrial",
"value": "scrap_yard"
},
"terms": [
"car",
"junk",
"metal",
"salvage",
"scrap",
"u-pull-it",
"vehicle",
"wreck",
"yard"
],
"name": "Scrap Yard"
},
"landuse/industrial/slaughterhouse": {
"icon": "slaughterhouse",
"fields": [
@@ -8181,6 +8211,10 @@
"landuse": "industrial",
"industrial": "slaughterhouse"
},
"reference": {
"key": "industrial",
"value": "slaughterhouse"
},
"terms": [
"abattoir",
"beef",
data/presets/presets/amenity/_scrapyard.json
+22
View File
@@ -0,0 +1,22 @@
{
"icon": "car",
"fields": [
"name",
"operator",
"address",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "scrapyard"
},
"reference": {
"key": "industrial",
"value": "scrap_yard"
},
"name": "Scrap Yard",
"searchable": false
}
data/presets/presets/amenity/scrapyard.json → data/presets/presets/landuse/industrial/scrap_yard.json
+15 -7
View File
@@ -10,6 +10,21 @@
"point",
"area"
],
"tags": {
"industrial": "scrap_yard"
},
"addTags": {
"landuse": "industrial",
"industrial": "scrap_yard"
},
"removeTags": {
"landuse": "industrial",
"industrial": "scrap_yard"
},
"reference": {
"key": "industrial",
"value": "scrap_yard"
},
"terms": [
"car",
"junk",
@@ -21,12 +36,5 @@
"wreck",
"yard"
],
"tags": {
"amenity": "scrapyard"
},
"reference": {
"key": "industrial",
"value": "scrap_yard"
},
"name": "Scrap Yard"
}
data/presets/presets/landuse/industrial/slaughterhouse.json
+4
View File
@@ -22,6 +22,10 @@
"landuse": "industrial",
"industrial": "slaughterhouse"
},
"reference": {
"key": "industrial",
"value": "slaughterhouse"
},
"terms": [
"abattoir",
"beef",
data/taginfo.json
+8 -4
View File
@@ -139,6 +139,10 @@
"key": "amenity",
"value": "register_office"
},
{
"key": "amenity",
"value": "scrapyard"
},
{
"key": "amenity",
"value": "swimming_pool"
@@ -479,10 +483,6 @@
"key": "amenity",
"value": "school"
},
{
"key": "amenity",
"value": "scrapyard"
},
{
"key": "amenity",
"value": "shelter"
@@ -1570,6 +1570,10 @@
"key": "landuse",
"value": "industrial"
},
{
"key": "industrial",
"value": "scrap_yard"
},
{
"key": "industrial",
"value": "slaughterhouse"
dist/locales/en.json
Vendored
+8 -4
View File
@@ -2551,6 +2551,10 @@
"name": "Register Office",
"terms": ""
},
"amenity/scrapyard": {
"name": "Scrap Yard",
"terms": ""
},
"amenity/swimming_pool": {
"name": "Swimming Pool",
"terms": ""
@@ -2891,10 +2895,6 @@
"name": "School Grounds",
"terms": "academy,elementary school,middle school,high school"
},
"amenity/scrapyard": {
"name": "Scrap Yard",
"terms": "car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard"
},
"amenity/shelter": {
"name": "Shelter",
"terms": "lean-to,gazebo,picnic"
@@ -3991,6 +3991,10 @@
"name": "Industrial Area",
"terms": ""
},
"landuse/industrial/scrap_yard": {
"name": "Scrap Yard",
"terms": "car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard"
},
"landuse/industrial/slaughterhouse": {
"name": "Slaughterhouse",
"terms": "abattoir,beef,butchery,calf,chicken,cow,killing house,meat,pig,pork,poultry,shambles,stockyard"