From 33f8f205aba2adfc7f63e67ec0ddf39b0e48f20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hannes=20Birgir=20Jensson?= <joi@betra.is>
Date: Wed, 22 Apr 2015 19:41:44 +0000
Subject: [PATCH 1/3] Added farm as preset for Place

Place=farm has over 26 thousand entries so far
---
 data/presets.yaml                    |  3 +++
 data/presets/presets/place/farm.json | 11 +++++++++++
 data/taginfo.json                    |  4 ++++
 3 files changed, 18 insertions(+)
 create mode 100644 data/presets/presets/place/farm.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 08dbae3ec..e6fc11af8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1738,6 +1738,9 @@ en:
       place/city:
         name: City
         terms: "<translate with synonyms or related terms for 'City', separated by commas>"
+	  place/farm:
+        name: Farm
+        terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
       place/hamlet:
         name: Hamlet
         terms: "<translate with synonyms or related terms for 'Hamlet', separated by commas>"
diff --git a/data/presets/presets/place/farm.json b/data/presets/presets/place/farm.json
new file mode 100644
index 000000000..0a319a317
--- /dev/null
+++ b/data/presets/presets/place/farm.json
@@ -0,0 +1,11 @@
+{
+    "icon": "marker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "farm"
+    },
+    "name": "Farm"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 94dfb30e9..c8360e696 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1498,6 +1498,10 @@
         {
             "key": "place",
             "value": "city"
+        },
+		{
+            "key": "place",
+            "value": "farm"
         },
         {
             "key": "place",

From ede8d816bf01615e9d2064891076865d5bb1f9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hannes=20Birgir=20Jensson?= <joi@betra.is>
Date: Wed, 22 Apr 2015 19:46:25 +0000
Subject: [PATCH 2/3] fixed indent for farm

---
 data/presets.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index e6fc11af8..77d8414ce 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1738,7 +1738,7 @@ en:
       place/city:
         name: City
         terms: "<translate with synonyms or related terms for 'City', separated by commas>"
-	  place/farm:
+      place/farm:
         name: Farm
         terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
       place/hamlet:

From 498741fb9ce73af8308a02444ad35a02f4f84ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hannes=20Birgir=20Jensson?= <joi@betra.is>
Date: Wed, 22 Apr 2015 19:47:24 +0000
Subject: [PATCH 3/3] Fixed icon for farm

---
 data/presets/presets/place/farm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/presets/place/farm.json b/data/presets/presets/place/farm.json
index 0a319a317..7be3260ce 100644
--- a/data/presets/presets/place/farm.json
+++ b/data/presets/presets/place/farm.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker",
+    "icon": "farm",
     "geometry": [
         "point",
         "area"