From 44d6adfd3e9746220d0d0c28fa3f8ae6db0ee769 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Thu, 15 Mar 2018 05:03:58 +0530
Subject: [PATCH 1/2] Added preset for man_made=observatory.

---
 data/presets.yaml                              |  4 ++++
 data/presets/presets.json                      | 15 +++++++++++++++
 data/presets/presets/man_made/observatory.json | 15 +++++++++++++++
 data/taginfo.json                              |  4 ++++
 dist/locales/en.json                           |  4 ++++
 5 files changed, 42 insertions(+)
 create mode 100644 data/presets/presets/man_made/observatory.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 5ffdf4ea2..ea57cdc46 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3942,6 +3942,10 @@ en:
         name: Observation Tower
         # 'terms: lookout tower,fire tower'
         terms: '<translate with synonyms or related terms for ''Observation Tower'', separated by commas>'
+      man_made/observatory:
+        # 'man_made=observatory
+        name: Observatory
+        terms: '<translate with synonyms or related terms for ''Observatory'', separated by commas>'
       man_made/petroleum_well:
         # man_made=petroleum_well
         name: Oil Well
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5eb7fe335..36a71680c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11056,6 +11056,21 @@
             },
             "name": "Observation Tower"
         },
+        "man_made/observatory": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "type": [
+                "astronomical",
+                "meteorological",
+                "espionage"
+            ],
+            "tags": {
+                "man_made": "observatory"
+            },
+            "name": "Observatory"
+        },
         "man_made/petroleum_well": {
             "icon": "poi-storage-tank",
             "geometry": [
diff --git a/data/presets/presets/man_made/observatory.json b/data/presets/presets/man_made/observatory.json
new file mode 100644
index 000000000..48d5a982a
--- /dev/null
+++ b/data/presets/presets/man_made/observatory.json
@@ -0,0 +1,15 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "type": [
+        "astronomical",
+        "meteorological",
+        "espionage"
+    ],
+    "tags": {
+        "man_made": "observatory"
+    },
+    "name": "Observatory"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index e8655875d..15b48e1ef 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2056,6 +2056,10 @@
             "key": "tower:type",
             "value": "observation"
         },
+        {
+            "key": "man_made",
+            "value": "observatory"
+        },
         {
             "key": "man_made",
             "value": "petroleum_well"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8f0102fce..8f7302bbd 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4808,6 +4808,10 @@
                     "name": "Observation Tower",
                     "terms": "lookout tower,fire tower"
                 },
+                "man_made/observatory": {
+                    "name": "Observatory",
+                    "terms": ""
+                },
                 "man_made/petroleum_well": {
                     "name": "Oil Well",
                     "terms": "drilling rig,oil derrick,oil drill,oil horse,oil rig,oil pump,petroleum well,pumpjack"

From 9677b3d0aa8fd783cef8572f47b8e8ca72339f54 Mon Sep 17 00:00:00 2001
From: vershwal <vershwal.princi@gmail.com>
Date: Thu, 15 Mar 2018 10:55:46 +0530
Subject: [PATCH 2/2] fixed review comments

---
 data/presets.yaml                              | 3 ++-
 data/presets/presets.json                      | 5 ++---
 data/presets/presets/man_made/observatory.json | 5 ++---
 dist/locales/en.json                           | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index ea57cdc46..c088ec1a4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3943,8 +3943,9 @@ en:
         # 'terms: lookout tower,fire tower'
         terms: '<translate with synonyms or related terms for ''Observation Tower'', separated by commas>'
       man_made/observatory:
-        # 'man_made=observatory
+        # man_made=observatory
         name: Observatory
+        # 'terms: astronomical,meteorological'
         terms: '<translate with synonyms or related terms for ''Observatory'', separated by commas>'
       man_made/petroleum_well:
         # man_made=petroleum_well
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 36a71680c..c91953e4a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11061,10 +11061,9 @@
                 "point",
                 "area"
             ],
-            "type": [
+            "terms": [
                 "astronomical",
-                "meteorological",
-                "espionage"
+                "meteorological"
             ],
             "tags": {
                 "man_made": "observatory"
diff --git a/data/presets/presets/man_made/observatory.json b/data/presets/presets/man_made/observatory.json
index 48d5a982a..f6d879152 100644
--- a/data/presets/presets/man_made/observatory.json
+++ b/data/presets/presets/man_made/observatory.json
@@ -3,10 +3,9 @@
         "point",
         "area"
     ],
-    "type": [
+    "terms": [
         "astronomical",
-        "meteorological",
-        "espionage"
+        "meteorological"
     ],
     "tags": {
         "man_made": "observatory"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8f7302bbd..a122edd8f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4810,7 +4810,7 @@
                 },
                 "man_made/observatory": {
                     "name": "Observatory",
-                    "terms": ""
+                    "terms": "astronomical,meteorological"
                 },
                 "man_made/petroleum_well": {
                     "name": "Oil Well",