From 6605bb0d68567ed4986cb688d5df78137573c174 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 4 Nov 2013 14:30:34 -0800
Subject: [PATCH] Follow existing convention for "Type" fields

---
 data/presets.yaml                      | 2 +-
 data/presets/fields.json               | 2 +-
 data/presets/fields/tree_type.json     | 2 +-
 data/presets/presets.json              | 4 ++--
 data/presets/presets/natural/tree.json | 4 ++--
 dist/locales/en.json                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index ab71d09cb..73c6eead2 100644
--- a/data/presets.yaml
+++ b/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: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 6bb6c3999..069f8d927 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -626,7 +626,7 @@
             "conifer",
             "palm"
         ],
-        "label": "Type of tree"
+        "label": "Type"
     },
     "vending": {
         "key": "vending",
diff --git a/data/presets/fields/tree_type.json b/data/presets/fields/tree_type.json
index 2f7b97047..3e668def3 100644
--- a/data/presets/fields/tree_type.json
+++ b/data/presets/fields/tree_type.json
@@ -6,5 +6,5 @@
         "conifer",
         "palm"
     ],
-    "label": "Type of tree"
+    "label": "Type"
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9e6ca7b0a..981eab62d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3270,8 +3270,8 @@
     },
     "natural/tree": {
         "fields": [
-            "denotation",
-            "tree_type"
+            "tree_type",
+            "denotation"
         ],
         "icon": "park",
         "geometry": [
diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json
index 2064aea63..29337059b 100644
--- a/data/presets/presets/natural/tree.json
+++ b/data/presets/presets/natural/tree.json
@@ -1,7 +1,7 @@
 {
     "fields": [
-        "denotation",
-        "tree_type"
+        "tree_type",
+        "denotation"
     ],
     "icon": "park",
     "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f9a184def..2eea4bf74 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -749,7 +749,7 @@
                 "label": "Trail Visibility"
             },
             "tree_type": {
-                "label": "Type of tree"
+                "label": "Type"
             },
             "vending": {
                 "label": "Type of Goods"