From dfc5472b07ef6dea3a0705e25811617002105973 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Mon, 10 Jun 2019 21:45:25 +0200 Subject: [PATCH] fix unnecessary landuse=military fixes #6509 --- data/presets.yaml | 40 +++++++------- data/presets/presets.json | 8 +-- .../{landuse => }/military/bunker.json | 1 - .../{landuse => }/military/checkpoint.json | 4 -- .../military/nuclear_explosion_site.json | 4 -- .../{landuse => }/military/office.json | 4 -- data/taginfo.json | 8 +-- dist/locales/en.json | 53 +++++++++++++------ svg/fontawesome/fas-chess-knight.svg | 2 +- svg/fontawesome/fas-chess-pawn.svg | 2 +- 10 files changed, 67 insertions(+), 59 deletions(-) rename data/presets/presets/{landuse => }/military/bunker.json (94%) rename data/presets/presets/{landuse => }/military/checkpoint.json (81%) rename data/presets/presets/{landuse => }/military/nuclear_explosion_site.json (79%) rename data/presets/presets/{landuse => }/military/office.json (84%) diff --git a/data/presets.yaml b/data/presets.yaml index 5f5be5dd9..b7e96cd47 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4835,16 +4835,6 @@ en: name: Barracks # 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war' terms: '' - landuse/military/bunker: - # military=bunker - name: Military Bunker - # 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war' - terms: '' - landuse/military/checkpoint: - # military=checkpoint - name: Checkpoint - # 'terms: air force,army,base,force,guard,marine,navy,troop,war' - terms: '' landuse/military/danger_area: # military=danger_area name: Danger Area @@ -4855,21 +4845,11 @@ en: name: Naval Base # 'terms: base,fight,force,guard,marine,navy,ship,sub,troop,war' terms: '' - landuse/military/nuclear_explosion_site: - # military=nuclear_explosion_site - name: Nuclear Explosion Site - # 'terms: atom,blast,bomb,detonat*,nuke,site,test' - terms: '' landuse/military/obstacle_course: # military=obstacle_course name: Obstacle Course # 'terms: army,base,force,guard,marine,navy,troop,war' terms: '' - landuse/military/office: - # military=office - name: Military Office - # 'terms: air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war' - terms: '' landuse/military/range: # military=range name: Military Range @@ -5613,6 +5593,26 @@ en: name: Telecom Manhole # 'terms: cover,phone,hole,telecom,telephone,bt' terms: '' + military/bunker: + # military=bunker + name: Military Bunker + # 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war' + terms: '' + military/checkpoint: + # military=checkpoint + name: Checkpoint + # 'terms: air force,army,base,force,guard,marine,navy,troop,war' + terms: '' + military/nuclear_explosion_site: + # military=nuclear_explosion_site + name: Nuclear Explosion Site + # 'terms: atom,blast,bomb,detonat*,nuke,site,test' + terms: '' + military/office: + # military=office + name: Military Office + # 'terms: air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war' + terms: '' military/trench: # military=trench name: Military Trench diff --git a/data/presets/presets.json b/data/presets/presets.json index e070611f7..b310fa837 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -576,13 +576,9 @@ "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"}, "landuse/military/airfield": {"icon": "tnp-2009265", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"}, "landuse/military/barracks": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"}, - "landuse/military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "landuse": "military", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"}, - "landuse/military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "addTags": {"landuse": "military", "military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"}, "landuse/military/danger_area": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "danger_area"}, "addTags": {"landuse": "military", "military": "danger_area"}, "terms": ["air force", "army", "base", "blast", "bomb", "explo*", "force", "guard", "mine", "marine", "navy", "troop", "war"], "name": "Danger Area"}, "landuse/military/naval_base": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "naval_base"}, "addTags": {"landuse": "military", "military": "naval_base"}, "terms": ["base", "fight", "force", "guard", "marine", "navy", "ship", "sub", "troop", "war"], "name": "Naval Base"}, - "landuse/military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "addTags": {"landuse": "military", "military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"}, "landuse/military/obstacle_course": {"icon": "temaki-military", "geometry": ["point", "area"], "tags": {"military": "obstacle_course"}, "addTags": {"landuse": "military", "military": "obstacle_course"}, "terms": ["army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Obstacle Course"}, - "landuse/military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "office"}, "addTags": {"landuse": "military", "military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"}, "landuse/military/range": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "range"}, "addTags": {"landuse": "military", "military": "range"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Range"}, "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Training Area"}, "landuse/orchard": {"icon": "maki-park", "fields": ["name", "operator", "trees"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"}, @@ -737,6 +733,10 @@ "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"}, "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"}, "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"}, + "military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"}, + "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"}, + "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"}, + "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"}, "military/trench": {"icon": "temaki-military", "fields": ["name", "trench"], "geometry": ["point", "line"], "tags": {"military": "trench"}, "terms": ["dugout", "firestep", "fox hole", "infantry trench", "war trench"], "name": "Military Trench"}, "natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"}, "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"}, diff --git a/data/presets/presets/landuse/military/bunker.json b/data/presets/presets/military/bunker.json similarity index 94% rename from data/presets/presets/landuse/military/bunker.json rename to data/presets/presets/military/bunker.json index 7747f4f3d..df152d281 100644 --- a/data/presets/presets/landuse/military/bunker.json +++ b/data/presets/presets/military/bunker.json @@ -14,7 +14,6 @@ }, "addTags": { "building": "bunker", - "landuse": "military", "military": "bunker" }, "terms": [ diff --git a/data/presets/presets/landuse/military/checkpoint.json b/data/presets/presets/military/checkpoint.json similarity index 81% rename from data/presets/presets/landuse/military/checkpoint.json rename to data/presets/presets/military/checkpoint.json index a8c08d3e3..0aebb96fd 100644 --- a/data/presets/presets/landuse/military/checkpoint.json +++ b/data/presets/presets/military/checkpoint.json @@ -11,10 +11,6 @@ "tags": { "military": "checkpoint" }, - "addTags": { - "landuse": "military", - "military": "checkpoint" - }, "terms": [ "air force", "army", diff --git a/data/presets/presets/landuse/military/nuclear_explosion_site.json b/data/presets/presets/military/nuclear_explosion_site.json similarity index 79% rename from data/presets/presets/landuse/military/nuclear_explosion_site.json rename to data/presets/presets/military/nuclear_explosion_site.json index 7af4e8e11..accb74cce 100644 --- a/data/presets/presets/landuse/military/nuclear_explosion_site.json +++ b/data/presets/presets/military/nuclear_explosion_site.json @@ -11,10 +11,6 @@ "tags": { "military": "nuclear_explosion_site" }, - "addTags": { - "landuse": "military", - "military": "nuclear_explosion_site" - }, "terms": [ "atom", "blast", diff --git a/data/presets/presets/landuse/military/office.json b/data/presets/presets/military/office.json similarity index 84% rename from data/presets/presets/landuse/military/office.json rename to data/presets/presets/military/office.json index ff45d61fc..8b8cad122 100644 --- a/data/presets/presets/landuse/military/office.json +++ b/data/presets/presets/military/office.json @@ -11,10 +11,6 @@ "tags": { "military": "office" }, - "addTags": { - "landuse": "military", - "military": "office" - }, "terms": [ "air force", "army", diff --git a/data/taginfo.json b/data/taginfo.json index c6295e735..4d7df7d40 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -554,13 +554,9 @@ {"key": "landuse", "value": "military", "description": "๐Ÿ„ฟ Military Area", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "military", "value": "airfield", "description": "๐Ÿ„ฟ Military Airfield", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/the-noun-project/2009265.svg?sanitize=true"}, {"key": "military", "value": "barracks", "description": "๐Ÿ„ฟ Barracks", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, - {"key": "military", "value": "bunker", "description": "๐Ÿ„ฟ Military Bunker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, - {"key": "military", "value": "checkpoint", "description": "๐Ÿ„ฟ Checkpoint", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, {"key": "military", "value": "danger_area", "description": "๐Ÿ„ฟ Danger Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/danger-15.svg?sanitize=true"}, {"key": "military", "value": "naval_base", "description": "๐Ÿ„ฟ Naval Base", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, - {"key": "military", "value": "nuclear_explosion_site", "description": "๐Ÿ„ฟ Nuclear Explosion Site", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/danger-15.svg?sanitize=true"}, {"key": "military", "value": "obstacle_course", "description": "๐Ÿ„ฟ Obstacle Course", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, - {"key": "military", "value": "office", "description": "๐Ÿ„ฟ Military Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "military", "value": "range", "description": "๐Ÿ„ฟ Military Range", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "military", "value": "training_area", "description": "๐Ÿ„ฟ Training Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "landuse", "value": "orchard", "description": "๐Ÿ„ฟ Orchard", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"}, @@ -709,6 +705,10 @@ {"key": "manhole", "description": "๐Ÿ„ฟ Manhole, ๐Ÿ„ต Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/circle-stroked-15.svg?sanitize=true"}, {"key": "manhole", "value": "drain", "description": "๐Ÿ„ฟ Storm Drain", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "manhole", "value": "telecom", "description": "๐Ÿ„ฟ Telecom Manhole", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/circle-stroked-15.svg?sanitize=true"}, + {"key": "military", "value": "bunker", "description": "๐Ÿ„ฟ Military Bunker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, + {"key": "military", "value": "checkpoint", "description": "๐Ÿ„ฟ Checkpoint", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, + {"key": "military", "value": "nuclear_explosion_site", "description": "๐Ÿ„ฟ Nuclear Explosion Site", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/danger-15.svg?sanitize=true"}, + {"key": "military", "value": "office", "description": "๐Ÿ„ฟ Military Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "military", "value": "trench", "description": "๐Ÿ„ฟ Military Trench", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "natural", "value": "bare_rock", "description": "๐Ÿ„ฟ Bare Rock", "object_types": ["area"]}, {"key": "natural", "value": "bay", "description": "๐Ÿ„ฟ Bay", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 14df92e52..6ecf0e716 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6635,14 +6635,6 @@ "name": "Barracks", "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war" }, - "landuse/military/bunker": { - "name": "Military Bunker", - "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war" - }, - "landuse/military/checkpoint": { - "name": "Checkpoint", - "terms": "air force,army,base,force,guard,marine,navy,troop,war" - }, "landuse/military/danger_area": { "name": "Danger Area", "terms": "air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war" @@ -6651,18 +6643,10 @@ "name": "Naval Base", "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war" }, - "landuse/military/nuclear_explosion_site": { - "name": "Nuclear Explosion Site", - "terms": "atom,blast,bomb,detonat*,nuke,site,test" - }, "landuse/military/obstacle_course": { "name": "Obstacle Course", "terms": "army,base,force,guard,marine,navy,troop,war" }, - "landuse/military/office": { - "name": "Military Office", - "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war" - }, "landuse/military/range": { "name": "Military Range", "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war" @@ -7279,6 +7263,22 @@ "name": "Telecom Manhole", "terms": "cover,phone,hole,telecom,telephone,bt" }, + "military/bunker": { + "name": "Military Bunker", + "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war" + }, + "military/checkpoint": { + "name": "Checkpoint", + "terms": "air force,army,base,force,guard,marine,navy,troop,war" + }, + "military/nuclear_explosion_site": { + "name": "Nuclear Explosion Site", + "terms": "atom,blast,bomb,detonat*,nuke,site,test" + }, + "military/office": { + "name": "Military Office", + "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war" + }, "military/trench": { "name": "Military Trench", "terms": "dugout,firestep,fox hole,infantry trench,war trench" @@ -9427,6 +9427,27 @@ "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.", "name": "basemap.at Orthofoto" }, + "basemap.at-overlay": { + "attribution": { + "text": "basemap.at" + }, + "description": "Annotation overlay provided by basemap.at.", + "name": "basemap.at Overlay" + }, + "basemap.at-surface": { + "attribution": { + "text": "basemap.at" + }, + "description": "Surface layer provided by basemap.at.", + "name": "basemap.at Surface" + }, + "basemap.at-terrain": { + "attribution": { + "text": "basemap.at" + }, + "description": "Terrain layer provided by basemap.at.", + "name": "basemap.at Terrain" + }, "eufar-balaton": { "attribution": { "text": "EUFAR Balaton ortofotรณ 2010" diff --git a/svg/fontawesome/fas-chess-knight.svg b/svg/fontawesome/fas-chess-knight.svg index 12d41b828..87f45be78 100644 --- a/svg/fontawesome/fas-chess-knight.svg +++ b/svg/fontawesome/fas-chess-knight.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/svg/fontawesome/fas-chess-pawn.svg b/svg/fontawesome/fas-chess-pawn.svg index cb6492d33..838668316 100644 --- a/svg/fontawesome/fas-chess-pawn.svg +++ b/svg/fontawesome/fas-chess-pawn.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file