From 4234b864fde5ee03632d5466d51beb45f9f88489 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sat, 6 Apr 2013 11:01:35 -0700
Subject: [PATCH] Add place presets (fixes #1265)

---
 data/locales.js                               | 12 +++++++
 data/presets.yaml                             |  9 +++++
 data/presets/presets.json                     | 34 ++++++++++++++++++-
 data/presets/presets/place/city.json          | 11 ++++++
 .../presets/place/isolated_dwelling.json      | 10 ++++++
 data/presets/presets/place/town.json          | 11 ++++++
 data/presets/presets/place/village.json       |  2 +-
 7 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/presets/place/city.json
 create mode 100644 data/presets/presets/place/isolated_dwelling.json
 create mode 100644 data/presets/presets/place/town.json

diff --git a/data/locales.js b/data/locales.js
index 9aef4af87..0d76a697e 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -1162,6 +1162,10 @@ locale.en = {
                 "name": "Place",
                 "terms": ""
             },
+            "place/city": {
+                "name": "City",
+                "terms": ""
+            },
             "place/hamlet": {
                 "name": "Hamlet",
                 "terms": ""
@@ -1170,10 +1174,18 @@ locale.en = {
                 "name": "Island",
                 "terms": "archipelago,atoll,bar,cay,isle,islet,key,reef"
             },
+            "place/isolated_dwelling": {
+                "name": "Isolated Dwelling",
+                "terms": ""
+            },
             "place/locality": {
                 "name": "Locality",
                 "terms": ""
             },
+            "place/town": {
+                "name": "Town",
+                "terms": ""
+            },
             "place/village": {
                 "name": "Village",
                 "terms": ""
diff --git a/data/presets.yaml b/data/presets.yaml
index f5b3c0937..e8bc48c76 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -619,15 +619,24 @@ en:
       place: 
         name: Place
         terms: ""
+      place/city: 
+        name: City
+        terms: ""
       place/hamlet: 
         name: Hamlet
         terms: ""
       place/island: 
         name: Island
         terms: "archipelago,atoll,bar,cay,isle,islet,key,reef"
+      place/isolated_dwelling: 
+        name: Isolated Dwelling
+        terms: ""
       place/locality: 
         name: Locality
         terms: ""
+      place/town: 
+        name: Town
+        terms: ""
       place/village: 
         name: Village
         terms: ""
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2edd45dda..150c44a5c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2483,6 +2483,17 @@
         },
         "name": "Place"
     },
+    "place/city": {
+        "icon": "square",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "place": "city"
+        },
+        "name": "City"
+    },
     "place/hamlet": {
         "icon": "triangle-stroked",
         "geometry": [
@@ -2514,6 +2525,16 @@
         },
         "name": "Island"
     },
+    "place/isolated_dwelling": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "place": "isolated_dwelling"
+        },
+        "name": "Isolated Dwelling"
+    },
     "place/locality": {
         "icon": "marker",
         "geometry": [
@@ -2525,12 +2546,23 @@
         },
         "name": "Locality"
     },
-    "place/village": {
+    "place/town": {
         "icon": "square-stroked",
         "geometry": [
             "point",
             "area"
         ],
+        "tags": {
+            "place": "town"
+        },
+        "name": "Town"
+    },
+    "place/village": {
+        "icon": "triangle",
+        "geometry": [
+            "point",
+            "area"
+        ],
         "tags": {
             "place": "village"
         },
diff --git a/data/presets/presets/place/city.json b/data/presets/presets/place/city.json
new file mode 100644
index 000000000..3c9684620
--- /dev/null
+++ b/data/presets/presets/place/city.json
@@ -0,0 +1,11 @@
+{
+    "icon": "square",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "city"
+    },
+    "name": "City"
+}
\ No newline at end of file
diff --git a/data/presets/presets/place/isolated_dwelling.json b/data/presets/presets/place/isolated_dwelling.json
new file mode 100644
index 000000000..91ce14d76
--- /dev/null
+++ b/data/presets/presets/place/isolated_dwelling.json
@@ -0,0 +1,10 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "isolated_dwelling"
+    },
+    "name": "Isolated Dwelling"
+}
\ No newline at end of file
diff --git a/data/presets/presets/place/town.json b/data/presets/presets/place/town.json
new file mode 100644
index 000000000..66ad69a44
--- /dev/null
+++ b/data/presets/presets/place/town.json
@@ -0,0 +1,11 @@
+{
+    "icon": "square-stroked",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "town"
+    },
+    "name": "Town"
+}
\ No newline at end of file
diff --git a/data/presets/presets/place/village.json b/data/presets/presets/place/village.json
index 4a87d4f46..14e3c635c 100644
--- a/data/presets/presets/place/village.json
+++ b/data/presets/presets/place/village.json
@@ -1,5 +1,5 @@
 {
-    "icon": "square-stroked",
+    "icon": "triangle",
     "geometry": [
         "point",
         "area"