Follow existing convention for "Type" fields

data/presets.yaml

@@ -251,7 +251,7 @@ en:
       trail_visibility: 
         label: Trail Visibility
       tree_type: 
-        label: Type of tree
+        label: Type
       vending: 
         label: Type of Goods
       water: 

data/presets/fields.json

@@ -626,7 +626,7 @@
             "conifer",
             "palm"
         ],
-        "label": "Type of tree"
+        "label": "Type"
     },
     "vending": {
         "key": "vending",

data/presets/fields/tree_type.json

@@ -6,5 +6,5 @@
         "conifer",
         "palm"
     ],
-    "label": "Type of tree"
+    "label": "Type"
 }

data/presets/presets.json

@@ -3270,8 +3270,8 @@
     },
     "natural/tree": {
         "fields": [
-            "denotation",
-            "tree_type"
+            "tree_type",
+            "denotation"
         ],
         "icon": "park",
         "geometry": [

data/presets/presets/natural/tree.json

@@ -1,7 +1,7 @@
 {
     "fields": [
-        "denotation",
-        "tree_type"
+        "tree_type",
+        "denotation"
     ],
     "icon": "park",
     "geometry": [

dist/locales/en.json

@@ -749,7 +749,7 @@
                 "label": "Trail Visibility"
             },
             "tree_type": {
-                "label": "Type of tree"
+                "label": "Type"
             },
             "vending": {
                 "label": "Type of Goods"