From 2f945df8109faad971a65c9b8bfd912e0cce5bb9 Mon Sep 17 00:00:00 2001
From: tyr <tyr.asd@gmail.com>
Date: Fri, 1 Nov 2013 13:12:33 +0100
Subject: [PATCH] improve natural=tree preset

adds field type (broad_leaved, conifer, palm)

See:
https://wiki.openstreetmap.org/wiki/Tree
http://taginfo.openstreetmap.org/tags/natural=tree#combinations
---
 data/imagery.json                      | 771 +++++++++++++++++++++++++
 data/presets.yaml                      |   2 +
 data/presets/fields.json               |  10 +
 data/presets/fields/tree_type.json     |  10 +
 data/presets/presets.json              |   3 +-
 data/presets/presets/natural/tree.json |   5 +-
 dist/locales/en.json                   |   3 +
 7 files changed, 801 insertions(+), 3 deletions(-)
 create mode 100644 data/presets/fields/tree_type.json

diff --git a/data/imagery.json b/data/imagery.json
index 5a931e80d..6566e4e12 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -2747,6 +2747,777 @@
         "terms_url": "http://wiki.openstreetmap.org/wiki/Fugro",
         "terms_text": "Fugro Aerial Mapping"
     },
+    {
+        "name": "Geoimage.at MaxRes",
+        "type": "tms",
+        "template": "http://geoimage.openstreetmap.at/4d80de696cd562a63ce463a58a61488d/{zoom}/{x}/{y}.jpg",
+        "polygon": [
+            [
+                [
+                    16.5073284,
+                    46.9929304
+                ],
+                [
+                    16.283417,
+                    46.9929304
+                ],
+                [
+                    16.135839,
+                    46.8713046
+                ],
+                [
+                    15.9831722,
+                    46.8190947
+                ],
+                [
+                    16.0493278,
+                    46.655175
+                ],
+                [
+                    15.8610387,
+                    46.7180116
+                ],
+                [
+                    15.7592608,
+                    46.6900933
+                ],
+                [
+                    15.5607938,
+                    46.6796202
+                ],
+                [
+                    15.5760605,
+                    46.6342132
+                ],
+                [
+                    15.4793715,
+                    46.6027553
+                ],
+                [
+                    15.4335715,
+                    46.6516819
+                ],
+                [
+                    15.2249267,
+                    46.6342132
+                ],
+                [
+                    15.0468154,
+                    46.6481886
+                ],
+                [
+                    14.9908376,
+                    46.5887681
+                ],
+                [
+                    14.9603042,
+                    46.6237293
+                ],
+                [
+                    14.8534374,
+                    46.6027553
+                ],
+                [
+                    14.8330818,
+                    46.5012666
+                ],
+                [
+                    14.7516595,
+                    46.4977636
+                ],
+                [
+                    14.6804149,
+                    46.4381781
+                ],
+                [
+                    14.6142593,
+                    46.4381781
+                ],
+                [
+                    14.578637,
+                    46.3785275
+                ],
+                [
+                    14.4412369,
+                    46.4311638
+                ],
+                [
+                    14.1613476,
+                    46.4276563
+                ],
+                [
+                    14.1257253,
+                    46.4767409
+                ],
+                [
+                    14.0188585,
+                    46.4767409
+                ],
+                [
+                    13.9119917,
+                    46.5257813
+                ],
+                [
+                    13.8254805,
+                    46.5047694
+                ],
+                [
+                    13.4438134,
+                    46.560783
+                ],
+                [
+                    13.3064132,
+                    46.5502848
+                ],
+                [
+                    13.1283019,
+                    46.5887681
+                ],
+                [
+                    12.8433237,
+                    46.6132433
+                ],
+                [
+                    12.7262791,
+                    46.6412014
+                ],
+                [
+                    12.5125455,
+                    46.6656529
+                ],
+                [
+                    12.3598787,
+                    46.7040543
+                ],
+                [
+                    12.3649676,
+                    46.7703197
+                ],
+                [
+                    12.2886341,
+                    46.7772902
+                ],
+                [
+                    12.2733674,
+                    46.8852187
+                ],
+                [
+                    12.2072118,
+                    46.8747835
+                ],
+                [
+                    12.1308784,
+                    46.9026062
+                ],
+                [
+                    12.1156117,
+                    46.9998721
+                ],
+                [
+                    12.2530119,
+                    47.0657733
+                ],
+                [
+                    12.2123007,
+                    47.0934969
+                ],
+                [
+                    11.9833004,
+                    47.0449712
+                ],
+                [
+                    11.7339445,
+                    46.9616816
+                ],
+                [
+                    11.6321666,
+                    47.010283
+                ],
+                [
+                    11.5405665,
+                    46.9755722
+                ],
+                [
+                    11.4998553,
+                    47.0068129
+                ],
+                [
+                    11.418433,
+                    46.9651546
+                ],
+                [
+                    11.2555884,
+                    46.9755722
+                ],
+                [
+                    11.1130993,
+                    46.913036
+                ],
+                [
+                    11.0418548,
+                    46.7633482
+                ],
+                [
+                    10.8891879,
+                    46.7598621
+                ],
+                [
+                    10.7416099,
+                    46.7842599
+                ],
+                [
+                    10.7059877,
+                    46.8643462
+                ],
+                [
+                    10.5787653,
+                    46.8399847
+                ],
+                [
+                    10.4566318,
+                    46.8504267
+                ],
+                [
+                    10.4769874,
+                    46.9269392
+                ],
+                [
+                    10.3853873,
+                    46.9894592
+                ],
+                [
+                    10.2327204,
+                    46.8643462
+                ],
+                [
+                    10.1207647,
+                    46.8330223
+                ],
+                [
+                    9.8663199,
+                    46.9408389
+                ],
+                [
+                    9.9019422,
+                    47.0033426
+                ],
+                [
+                    9.6831197,
+                    47.0588402
+                ],
+                [
+                    9.6118752,
+                    47.0380354
+                ],
+                [
+                    9.6322307,
+                    47.128131
+                ],
+                [
+                    9.5813418,
+                    47.1662025
+                ],
+                [
+                    9.5406306,
+                    47.2664422
+                ],
+                [
+                    9.6067863,
+                    47.3492559
+                ],
+                [
+                    9.6729419,
+                    47.369939
+                ],
+                [
+                    9.6424085,
+                    47.4457079
+                ],
+                [
+                    9.5660751,
+                    47.4801122
+                ],
+                [
+                    9.7136531,
+                    47.5282405
+                ],
+                [
+                    9.7848976,
+                    47.5969187
+                ],
+                [
+                    9.8357866,
+                    47.5454185
+                ],
+                [
+                    9.9477423,
+                    47.538548
+                ],
+                [
+                    10.0902313,
+                    47.4491493
+                ],
+                [
+                    10.1105869,
+                    47.3664924
+                ],
+                [
+                    10.2428982,
+                    47.3871688
+                ],
+                [
+                    10.1869203,
+                    47.2698953
+                ],
+                [
+                    10.3243205,
+                    47.2975125
+                ],
+                [
+                    10.4820763,
+                    47.4491493
+                ],
+                [
+                    10.4311873,
+                    47.4869904
+                ],
+                [
+                    10.4413651,
+                    47.5900549
+                ],
+                [
+                    10.4871652,
+                    47.5522881
+                ],
+                [
+                    10.5482319,
+                    47.5351124
+                ],
+                [
+                    10.5991209,
+                    47.5660246
+                ],
+                [
+                    10.7568766,
+                    47.5316766
+                ],
+                [
+                    10.8891879,
+                    47.5454185
+                ],
+                [
+                    10.9400769,
+                    47.4869904
+                ],
+                [
+                    10.9960547,
+                    47.3906141
+                ],
+                [
+                    11.2352328,
+                    47.4422662
+                ],
+                [
+                    11.2810328,
+                    47.3975039
+                ],
+                [
+                    11.4235219,
+                    47.5144941
+                ],
+                [
+                    11.5761888,
+                    47.5076195
+                ],
+                [
+                    11.6067221,
+                    47.5900549
+                ],
+                [
+                    11.8357224,
+                    47.5866227
+                ],
+                [
+                    12.003656,
+                    47.6243647
+                ],
+                [
+                    12.2072118,
+                    47.6037815
+                ],
+                [
+                    12.1614117,
+                    47.6963421
+                ],
+                [
+                    12.2581008,
+                    47.7442718
+                ],
+                [
+                    12.2530119,
+                    47.6792136
+                ],
+                [
+                    12.4311232,
+                    47.7100408
+                ],
+                [
+                    12.4921899,
+                    47.631224
+                ],
+                [
+                    12.5685234,
+                    47.6277944
+                ],
+                [
+                    12.6295901,
+                    47.6894913
+                ],
+                [
+                    12.7720792,
+                    47.6689338
+                ],
+                [
+                    12.8331459,
+                    47.5419833
+                ],
+                [
+                    12.975635,
+                    47.4732332
+                ],
+                [
+                    13.0417906,
+                    47.4938677
+                ],
+                [
+                    13.0367017,
+                    47.5557226
+                ],
+                [
+                    13.0977685,
+                    47.6415112
+                ],
+                [
+                    13.0316128,
+                    47.7100408
+                ],
+                [
+                    12.9043905,
+                    47.7203125
+                ],
+                [
+                    13.0061684,
+                    47.84683
+                ],
+                [
+                    12.9451016,
+                    47.9355501
+                ],
+                [
+                    12.8636793,
+                    47.9594103
+                ],
+                [
+                    12.8636793,
+                    48.0036929
+                ],
+                [
+                    12.7517236,
+                    48.0989418
+                ],
+                [
+                    12.8738571,
+                    48.2109733
+                ],
+                [
+                    12.9603683,
+                    48.2109733
+                ],
+                [
+                    13.0417906,
+                    48.2652035
+                ],
+                [
+                    13.1842797,
+                    48.2990682
+                ],
+                [
+                    13.2606131,
+                    48.2922971
+                ],
+                [
+                    13.3980133,
+                    48.3565867
+                ],
+                [
+                    13.4438134,
+                    48.417418
+                ],
+                [
+                    13.4387245,
+                    48.5523383
+                ],
+                [
+                    13.509969,
+                    48.5860123
+                ],
+                [
+                    13.6117469,
+                    48.5725454
+                ],
+                [
+                    13.7287915,
+                    48.5118999
+                ],
+                [
+                    13.7847694,
+                    48.5725454
+                ],
+                [
+                    13.8203916,
+                    48.6263915
+                ],
+                [
+                    13.7949471,
+                    48.7171267
+                ],
+                [
+                    13.850925,
+                    48.7741724
+                ],
+                [
+                    14.0595697,
+                    48.6633774
+                ],
+                [
+                    14.0137696,
+                    48.6331182
+                ],
+                [
+                    14.0748364,
+                    48.5927444
+                ],
+                [
+                    14.2173255,
+                    48.5961101
+                ],
+                [
+                    14.3649034,
+                    48.5489696
+                ],
+                [
+                    14.4666813,
+                    48.6499311
+                ],
+                [
+                    14.5582815,
+                    48.5961101
+                ],
+                [
+                    14.5989926,
+                    48.6263915
+                ],
+                [
+                    14.7211261,
+                    48.5759124
+                ],
+                [
+                    14.7211261,
+                    48.6868997
+                ],
+                [
+                    14.822904,
+                    48.7271983
+                ],
+                [
+                    14.8178151,
+                    48.777526
+                ],
+                [
+                    14.9647227,
+                    48.7851754
+                ],
+                [
+                    14.9893637,
+                    49.0126611
+                ],
+                [
+                    15.1485933,
+                    48.9950306
+                ],
+                [
+                    15.1943934,
+                    48.9315502
+                ],
+                [
+                    15.3063491,
+                    48.9850128
+                ],
+                [
+                    15.3928603,
+                    48.9850128
+                ],
+                [
+                    15.4844604,
+                    48.9282069
+                ],
+                [
+                    15.749083,
+                    48.8545973
+                ],
+                [
+                    15.8406831,
+                    48.8880697
+                ],
+                [
+                    16.0086166,
+                    48.7808794
+                ],
+                [
+                    16.2070835,
+                    48.7339115
+                ],
+                [
+                    16.3953727,
+                    48.7372678
+                ],
+                [
+                    16.4920617,
+                    48.8110498
+                ],
+                [
+                    16.6905286,
+                    48.7741724
+                ],
+                [
+                    16.7057953,
+                    48.7339115
+                ],
+                [
+                    16.8991733,
+                    48.713769
+                ],
+                [
+                    16.9755067,
+                    48.515271
+                ],
+                [
+                    16.8482844,
+                    48.4511817
+                ],
+                [
+                    16.8533733,
+                    48.3464411
+                ],
+                [
+                    16.9551512,
+                    48.2516513
+                ],
+                [
+                    16.9907734,
+                    48.1498955
+                ],
+                [
+                    17.0925513,
+                    48.1397088
+                ],
+                [
+                    17.0823736,
+                    48.0241182
+                ],
+                [
+                    17.1739737,
+                    48.0207146
+                ],
+                [
+                    17.0823736,
+                    47.8741447
+                ],
+                [
+                    16.9856845,
+                    47.8673174
+                ],
+                [
+                    17.0823736,
+                    47.8092489
+                ],
+                [
+                    17.0925513,
+                    47.7031919
+                ],
+                [
+                    16.7414176,
+                    47.6792136
+                ],
+                [
+                    16.7057953,
+                    47.7511153
+                ],
+                [
+                    16.5378617,
+                    47.7545368
+                ],
+                [
+                    16.5480395,
+                    47.7066164
+                ],
+                [
+                    16.4208172,
+                    47.6689338
+                ],
+                [
+                    16.573484,
+                    47.6175045
+                ],
+                [
+                    16.670173,
+                    47.631224
+                ],
+                [
+                    16.7108842,
+                    47.538548
+                ],
+                [
+                    16.6599952,
+                    47.4491493
+                ],
+                [
+                    16.5429506,
+                    47.3940591
+                ],
+                [
+                    16.4615283,
+                    47.3940591
+                ],
+                [
+                    16.4920617,
+                    47.276801
+                ],
+                [
+                    16.425906,
+                    47.1973317
+                ],
+                [
+                    16.4717061,
+                    47.1489007
+                ],
+                [
+                    16.5480395,
+                    47.1489007
+                ],
+                [
+                    16.476795,
+                    47.0796369
+                ],
+                [
+                    16.527684,
+                    47.0588402
+                ]
+            ]
+        ],
+        "terms_text": "geoimage.at",
+        "id": "geoimage.at"
+    },
     {
         "name": "Imagerie Drone (Haiti)",
         "type": "tms",
diff --git a/data/presets.yaml b/data/presets.yaml
index d6dc3a04b..ab71d09cb 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -250,6 +250,8 @@ en:
         label: Type
       trail_visibility: 
         label: Trail Visibility
+      tree_type: 
+        label: Type of tree
       vending: 
         label: Type of Goods
       water: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ab59805d6..6bb6c3999 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -618,6 +618,16 @@
         "type": "combo",
         "label": "Trail Visibility"
     },
+    "tree_type": {
+        "key": "type",
+        "type": "combo",
+        "options": [
+            "broad_leaved",
+            "conifer",
+            "palm"
+        ],
+        "label": "Type of tree"
+    },
     "vending": {
         "key": "vending",
         "type": "combo",
diff --git a/data/presets/fields/tree_type.json b/data/presets/fields/tree_type.json
new file mode 100644
index 000000000..2f7b97047
--- /dev/null
+++ b/data/presets/fields/tree_type.json
@@ -0,0 +1,10 @@
+{
+    "key": "type",
+    "type": "combo",
+    "options": [
+        "broad_leaved",
+        "conifer",
+        "palm"
+    ],
+    "label": "Type of tree"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 150108c0a..9e6ca7b0a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3270,7 +3270,8 @@
     },
     "natural/tree": {
         "fields": [
-            "denotation"
+            "denotation",
+            "tree_type"
         ],
         "icon": "park",
         "geometry": [
diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json
index e54a49c4b..2064aea63 100644
--- a/data/presets/presets/natural/tree.json
+++ b/data/presets/presets/natural/tree.json
@@ -1,6 +1,7 @@
 {
     "fields": [
-        "denotation"
+        "denotation",
+        "tree_type"
     ],
     "icon": "park",
     "geometry": [
@@ -12,4 +13,4 @@
         "natural": "tree"
     },
     "name": "Tree"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4f85d74dd..f9a184def 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -748,6 +748,9 @@
             "trail_visibility": {
                 "label": "Trail Visibility"
             },
+            "tree_type": {
+                "label": "Type of tree"
+            },
             "vending": {
                 "label": "Type of Goods"
             },