From 6202d01bf3f3a1a6ddcd7b298e94980651c359f1 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Tue, 29 Apr 2014 22:22:17 -0400
Subject: [PATCH] Add population field for various place presets

---
 data/presets.yaml                             |  2 ++
 data/presets/fields.json                      |  5 +++++
 data/presets/fields/population.json           |  5 +++++
 data/presets/presets.json                     | 21 +++++++++++++++++++
 data/presets/presets/place/city.json          |  5 ++++-
 data/presets/presets/place/hamlet.json        |  5 ++++-
 data/presets/presets/place/locality.json      |  5 ++++-
 data/presets/presets/place/neighbourhood.json |  3 +++
 data/presets/presets/place/suburb.json        |  3 +++
 data/presets/presets/place/town.json          |  5 ++++-
 data/presets/presets/place/village.json       |  5 ++++-
 dist/locales/en.json                          |  3 +++
 12 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 data/presets/fields/population.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 4e76e33e9..db7399027 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -244,6 +244,8 @@ en:
         label: Type
       place: 
         label: Type
+      population: 
+        label: Population
       power: 
         label: Type
       railway: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 7156b0098..7994917de 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -585,6 +585,11 @@
         "type": "typeCombo",
         "label": "Type"
     },
+    "population": {
+        "key": "population",
+        "type": "text",
+        "label": "Population"
+    },
     "power": {
         "key": "power",
         "type": "typeCombo",
diff --git a/data/presets/fields/population.json b/data/presets/fields/population.json
new file mode 100644
index 000000000..9279162ac
--- /dev/null
+++ b/data/presets/fields/population.json
@@ -0,0 +1,5 @@
+{
+    "key": "population",
+    "type": "text",
+    "label": "Population"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2dd85d32d..d3ca7b763 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5937,6 +5937,9 @@
     },
     "place/city": {
         "icon": "city",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5948,6 +5951,9 @@
     },
     "place/hamlet": {
         "icon": "triangle-stroked",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
@@ -5989,6 +5995,9 @@
     },
     "place/locality": {
         "icon": "marker",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
@@ -6000,6 +6009,9 @@
     },
     "place/neighbourhood": {
         "icon": "triangle-stroked",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
@@ -6014,6 +6026,9 @@
     },
     "place/suburb": {
         "icon": "triangle-stroked",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
@@ -6029,6 +6044,9 @@
     },
     "place/town": {
         "icon": "town",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
@@ -6040,6 +6058,9 @@
     },
     "place/village": {
         "icon": "village",
+        "fields": [
+            "population"
+        ],
         "geometry": [
             "point",
             "area"
diff --git a/data/presets/presets/place/city.json b/data/presets/presets/place/city.json
index 0ddbd6e7e..074ac9ec2 100644
--- a/data/presets/presets/place/city.json
+++ b/data/presets/presets/place/city.json
@@ -1,5 +1,8 @@
 {
     "icon": "city",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +11,4 @@
         "place": "city"
     },
     "name": "City"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place/hamlet.json b/data/presets/presets/place/hamlet.json
index ee1090551..8768ff0db 100644
--- a/data/presets/presets/place/hamlet.json
+++ b/data/presets/presets/place/hamlet.json
@@ -1,5 +1,8 @@
 {
     "icon": "triangle-stroked",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +11,4 @@
         "place": "hamlet"
     },
     "name": "Hamlet"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place/locality.json b/data/presets/presets/place/locality.json
index e958a552d..04daf3804 100644
--- a/data/presets/presets/place/locality.json
+++ b/data/presets/presets/place/locality.json
@@ -1,5 +1,8 @@
 {
     "icon": "marker",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +11,4 @@
         "place": "locality"
     },
     "name": "Locality"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place/neighbourhood.json b/data/presets/presets/place/neighbourhood.json
index 5d9cd13d3..c557e3f35 100644
--- a/data/presets/presets/place/neighbourhood.json
+++ b/data/presets/presets/place/neighbourhood.json
@@ -1,5 +1,8 @@
 {
     "icon": "triangle-stroked",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/place/suburb.json b/data/presets/presets/place/suburb.json
index fe31e3a9a..b1384e801 100644
--- a/data/presets/presets/place/suburb.json
+++ b/data/presets/presets/place/suburb.json
@@ -1,5 +1,8 @@
 {
     "icon": "triangle-stroked",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/place/town.json b/data/presets/presets/place/town.json
index f742e6631..cf51bf847 100644
--- a/data/presets/presets/place/town.json
+++ b/data/presets/presets/place/town.json
@@ -1,5 +1,8 @@
 {
     "icon": "town",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +11,4 @@
         "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 5657ca919..c28e40903 100644
--- a/data/presets/presets/place/village.json
+++ b/data/presets/presets/place/village.json
@@ -1,5 +1,8 @@
 {
     "icon": "village",
+    "fields": [
+        "population"
+    ],
     "geometry": [
         "point",
         "area"
@@ -8,4 +11,4 @@
         "place": "village"
     },
     "name": "Village"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7052c2f90..683ca453b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -750,6 +750,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },