Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add apartment complex preset #5594

Merged
merged 2 commits into from
Dec 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3179,8 +3179,8 @@ en:
terms: '<translate with synonyms or related terms for ''Building'', separated by commas>'
building/apartments:
# building=apartments
name: Apartments
terms: '<translate with synonyms or related terms for ''Apartments'', separated by commas>'
name: Apartment Building
terms: '<translate with synonyms or related terms for ''Apartment Building'', separated by commas>'
building/barn:
# building=barn
name: Barn
Expand Down Expand Up @@ -4347,6 +4347,11 @@ en:
# landuse=residential
name: Residential Area
terms: '<translate with synonyms or related terms for ''Residential Area'', separated by commas>'
landuse/residential/apartments:
# residential=apartments
name: Apartment Complex
# 'terms: flat,residence,tenement'
terms: '<translate with synonyms or related terms for ''Apartment Complex'', separated by commas>'
landuse/retail:
# landuse=retail
name: Retail Area
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
"building/bunker": {"fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
"building/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
"building/train_station": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station", "searchable": false},
"building/apartments": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartments"},
"building/apartments": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
"building/barn": {"icon": "maki-farm", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
"building/boathouse": {"icon": "maki-harbor", "fields": ["name", "levels", "height", "address"], "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
"building/bungalow": {"icon": "maki-home", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
Expand Down Expand Up @@ -513,6 +513,7 @@
"landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
"landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
"landuse/residential": {"icon": "maki-building", "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
"landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "removeTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
"landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
"landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
"leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "*"}, "name": "Leisure"},
Expand Down
2 changes: 1 addition & 1 deletion data/presets/presets/building/apartments.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"building": "apartments"
},
"matchScore": 0.5,
"name": "Apartments"
"name": "Apartment Building"
}
33 changes: 33 additions & 0 deletions data/presets/presets/landuse/residential/apartments.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"icon": "maki-building",
"fields": [
"name",
"operator",
"address"
],
"geometry": [
"point",
"area"
],
"tags": {
"residential": "apartments"
},
"addTags": {
"landuse": "residential",
"residential": "apartments"
},
"removeTags": {
"landuse": "residential",
"residential": "apartments"
},
"reference": {
"key": "residential",
"value": "apartments"
},
"terms": [
"flat",
"residence",
"tenement"
],
"name": "Apartment Complex"
}
9 changes: 8 additions & 1 deletion data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,7 @@
{
"key": "building",
"value": "apartments",
"description": "🄿 Apartments",
"description": "🄿 Apartment Building",
"object_types": ["area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"
},
Expand Down Expand Up @@ -3424,6 +3424,13 @@
"object_types": ["area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"
},
{
"key": "residential",
"value": "apartments",
"description": "🄿 Apartment Complex",
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"
},
{
"key": "landuse",
"value": "retail",
Expand Down
6 changes: 5 additions & 1 deletion dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -4213,7 +4213,7 @@
"terms": ""
},
"building/apartments": {
"name": "Apartments",
"name": "Apartment Building",
"terms": ""
},
"building/barn": {
Expand Down Expand Up @@ -5248,6 +5248,10 @@
"name": "Residential Area",
"terms": ""
},
"landuse/residential/apartments": {
"name": "Apartment Complex",
"terms": "flat,residence,tenement"
},
"landuse/retail": {
"name": "Retail Area",
"terms": ""
Expand Down