diff --git a/data/presets.yaml b/data/presets.yaml index 8d99c5949..b3620ecc2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3179,8 +3179,8 @@ en: terms: '' building/apartments: # building=apartments - name: Apartments - terms: '' + name: Apartment Building + terms: '' building/barn: # building=barn name: Barn @@ -4347,6 +4347,11 @@ en: # landuse=residential name: Residential Area terms: '' + landuse/residential/apartments: + # residential=apartments + name: Apartment Complex + # 'terms: flat,residence,tenement' + terms: '' landuse/retail: # landuse=retail name: Retail Area diff --git a/data/presets/presets.json b/data/presets/presets.json index 67ffdc118..c905d2c10 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -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"}, @@ -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"}, diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json index 73d4a4b77..5bae1344d 100644 --- a/data/presets/presets/building/apartments.json +++ b/data/presets/presets/building/apartments.json @@ -13,5 +13,5 @@ "building": "apartments" }, "matchScore": 0.5, - "name": "Apartments" + "name": "Apartment Building" } diff --git a/data/presets/presets/landuse/residential/apartments.json b/data/presets/presets/landuse/residential/apartments.json new file mode 100644 index 000000000..ccfd80233 --- /dev/null +++ b/data/presets/presets/landuse/residential/apartments.json @@ -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" +} diff --git a/data/taginfo.json b/data/taginfo.json index 4ce316d80..c7e6f5aaf 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -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" }, @@ -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", diff --git a/dist/locales/en.json b/dist/locales/en.json index 3ae83718c..e1786907e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4213,7 +4213,7 @@ "terms": "" }, "building/apartments": { - "name": "Apartments", + "name": "Apartment Building", "terms": "" }, "building/barn": { @@ -5248,6 +5248,10 @@ "name": "Residential Area", "terms": "" }, + "landuse/residential/apartments": { + "name": "Apartment Complex", + "terms": "flat,residence,tenement" + }, "landuse/retail": { "name": "Retail Area", "terms": ""