add deprecation and new tag for (naval) military bases, closes #510

Author: tyrasd

data/fields/military_service.json

@@ -0,0 +1,5 @@
+{
+    "key": "military_service",
+    "type": "combo",
+    "label": "Military Service"
+}

data/presets/landuse/military/base.json

@@ -0,0 +1,31 @@
+{
+    "icon": "temaki-anchor_medal",
+    "fields": [
+        "name",
+        "military_service"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "military": "base"
+    },
+    "addTags": {
+        "landuse": "military",
+        "military": "base"
+    },
+    "terms": [
+        "air force",
+        "army",
+        "base",
+        "border guard",
+        "coast guard",
+        "fight",
+        "force",
+        "guard",
+        "troop",
+        "war"
+    ],
+    "name": "Military Base"
+}

…presets/landuse/military/naval_base.json …/presets/landuse/military/base/navy.jsondata/presets/landuse/military/naval_base.json renamed to data/presets/landuse/military/base/navy.json data/presets/landuse/military/naval_base.json renamed to data/presets/landuse/military/base/navy.json

@@ -8,11 +8,13 @@
         "area"
     ],
     "tags": {
-        "military": "naval_base"
+        "military": "base",
+        "military_service": "navy"
     },
     "addTags": {
         "landuse": "military",
-        "military": "naval_base"
+        "military": "base",
+        "military_service": "navy"
     },
     "terms": [
         "base",

interim/source_strings.yaml

@@ -1804,6 +1804,9 @@ en:
         label: Microbrewery
         # 'terms: brewpub,craft beer'
         terms: '[translate with synonyms or related terms for ''Microbrewery'', separated by commas]'
+      military_service:
+        # military_service=*
+        label: Military Service
       mimics:
         # mimics=*
         label: Mimics
@@ -6658,16 +6661,21 @@ 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/base:
+        # military=base | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Military Base
+        # 'terms: air force,army,base,border guard,coast guard,fight,force,guard,troop,war'
+        terms: <translate with synonyms or related terms for 'Military Base', separated by commas>
+      landuse/military/base/navy:
+        # military=base + military_service=navy | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        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/danger_area:
         # military=danger_area | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Danger Area
         # 'terms: air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war'
         terms: <translate with synonyms or related terms for 'Danger Area', separated by commas>
-      landuse/military/naval_base:
-        # military=naval_base | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        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/obstacle_course:
         # military=obstacle_course | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Military Obstacle Course