fix unnecessary landuse=military

fixes #6509
This commit is contained in:
Mateusz Konieczny
2019-06-10 21:45:25 +02:00
committed by Quincy Morgan
parent e4907bdc8c
commit dfc5472b07
10 changed files with 67 additions and 59 deletions
+20 -20
View File
@@ -4835,16 +4835,6 @@ en:
name: Barracks
# 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Barracks'', separated by commas>'
landuse/military/bunker:
# military=bunker
name: Military Bunker
# 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Military Bunker'', separated by commas>'
landuse/military/checkpoint:
# military=checkpoint
name: Checkpoint
# 'terms: air force,army,base,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Checkpoint'', separated by commas>'
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: '<translate with synonyms or related terms for ''Naval Base'', separated by commas>'
landuse/military/nuclear_explosion_site:
# military=nuclear_explosion_site
name: Nuclear Explosion Site
# 'terms: atom,blast,bomb,detonat*,nuke,site,test'
terms: '<translate with synonyms or related terms for ''Nuclear Explosion Site'', separated by commas>'
landuse/military/obstacle_course:
# military=obstacle_course
name: Obstacle Course
# 'terms: army,base,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Obstacle Course'', separated by commas>'
landuse/military/office:
# military=office
name: Military Office
# 'terms: air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war'
terms: '<translate with synonyms or related terms for ''Military Office'', separated by commas>'
landuse/military/range:
# military=range
name: Military Range
@@ -5613,6 +5593,26 @@ en:
name: Telecom Manhole
# 'terms: cover,phone,hole,telecom,telephone,bt'
terms: '<translate with synonyms or related terms for ''Telecom Manhole'', separated by commas>'
military/bunker:
# military=bunker
name: Military Bunker
# 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Military Bunker'', separated by commas>'
military/checkpoint:
# military=checkpoint
name: Checkpoint
# 'terms: air force,army,base,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Checkpoint'', separated by commas>'
military/nuclear_explosion_site:
# military=nuclear_explosion_site
name: Nuclear Explosion Site
# 'terms: atom,blast,bomb,detonat*,nuke,site,test'
terms: '<translate with synonyms or related terms for ''Nuclear Explosion Site'', separated by commas>'
military/office:
# military=office
name: Military Office
# 'terms: air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war'
terms: '<translate with synonyms or related terms for ''Military Office'', separated by commas>'
military/trench:
# military=trench
name: Military Trench
+4 -4
View File
@@ -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"},
@@ -14,7 +14,6 @@
},
"addTags": {
"building": "bunker",
"landuse": "military",
"military": "bunker"
},
"terms": [
@@ -11,10 +11,6 @@
"tags": {
"military": "checkpoint"
},
"addTags": {
"landuse": "military",
"military": "checkpoint"
},
"terms": [
"air force",
"army",
@@ -11,10 +11,6 @@
"tags": {
"military": "nuclear_explosion_site"
},
"addTags": {
"landuse": "military",
"military": "nuclear_explosion_site"
},
"terms": [
"atom",
"blast",
@@ -11,10 +11,6 @@
"tags": {
"military": "office"
},
"addTags": {
"landuse": "military",
"military": "office"
},
"terms": [
"air force",
"army",
+4 -4
View File
@@ -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"},
+37 -16
View File
@@ -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"
+1 -1
View File
@@ -1 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chess-knight" class="svg-inline--fa fa-chess-knight fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M352 224v224H32v-46.557c0-30.302 17.12-58.003 44.223-71.554l57.243-28.622A48 48 0 0 0 160 258.334V208l-22.127 11.063a23.996 23.996 0 0 0-12.55 15.645l-11.835 47.338a12 12 0 0 1-7.185 8.231l-29.601 11.84a11.998 11.998 0 0 1-9.33-.176L7.126 275.167A12 12 0 0 1 0 264.201v-158.26c0-6.365 2.529-12.47 7.03-16.971L16 80 1.789 51.578A16.937 16.937 0 0 1 0 44c0-6.627 5.373-12 12-12h148c106.039 0 192 85.961 192 192zm20 240H12c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h360c6.627 0 12-5.373 12-12v-24c0-6.627-5.373-12-12-12zM52 128c-11.046 0-20 8.954-20 20s8.954 20 20 20 20-8.954 20-20-8.954-20-20-20z"></path></svg>
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chess-knight" class="svg-inline--fa fa-chess-knight fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M19 272.47l40.63 18.06a32 32 0 0 0 24.88.47l12.78-5.12a32 32 0 0 0 18.76-20.5l9.22-30.65a24 24 0 0 1 12.55-15.65L159.94 208v50.33a48 48 0 0 1-26.53 42.94l-57.22 28.65A80 80 0 0 0 32 401.48V416h319.86V224c0-106-85.92-192-191.92-192H12A12 12 0 0 0 0 44a16.9 16.9 0 0 0 1.79 7.58L16 80l-9 9a24 24 0 0 0-7 17v137.21a32 32 0 0 0 19 29.26zM52 128a20 20 0 1 1-20 20 20 20 0 0 1 20-20zm316 320H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h352a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 716 B

+1 -1
View File
@@ -1 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chess-pawn" class="svg-inline--fa fa-chess-pawn fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M264 448H56s60-42.743 60-176H84c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h40.209C95.721 210.56 76 181.588 76 148c0-46.392 37.608-84 84-84s84 37.608 84 84c0 33.588-19.721 62.56-48.209 76H236c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12h-32c0 133.257 60 176 60 176zm28 16H28c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h264c6.627 0 12-5.373 12-12v-24c0-6.627-5.373-12-12-12z"></path></svg>
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chess-pawn" class="svg-inline--fa fa-chess-pawn fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M105.1 224H80a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h16v5.49c0 44-4.14 86.6-24 122.51h176c-19.89-35.91-24-78.51-24-122.51V288h16a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-25.1c29.39-18.38 49.1-50.78 49.1-88a104 104 0 0 0-208 0c0 37.22 19.71 69.62 49.1 88zM304 448H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h288a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>

Before

Width:  |  Height:  |  Size: 630 B

After

Width:  |  Height:  |  Size: 589 B