From 07f41b0444e6ac548053803ab7cb8514e9abc43e Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sat, 9 Jun 2018 10:46:12 +0200
Subject: [PATCH] chg: EPSG and spacial-reference add fix #102

Following feedback during the last ENISA Cyber Europe 2018, we updated
the geolocation object to the following:

 - Fixing ui-priority to ensure lat,long in order
 - Adding the ability to specify an EPSG value instead of coordinates
 (handy if you want to quickly express a known location/area)
 - Set a default spacial-reference to avoid confusion between reported
 value from GPS versus values projected into a specific spacial
 projection. default is WGS-84.
---
 objects/geolocation/definition.json | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/objects/geolocation/definition.json b/objects/geolocation/definition.json
index 7a4902b..3fb7544 100644
--- a/objects/geolocation/definition.json
+++ b/objects/geolocation/definition.json
@@ -4,7 +4,8 @@
     "longitude",
     "city",
     "region",
-    "country"
+    "country",
+    "epsg"
   ],
   "attributes": {
     "first-seen": {
@@ -28,13 +29,13 @@
     "latitude": {
       "description": "The latitude is the decimal value of the latitude in the World Geodetic System 84 (WGS84) reference.",
       "disable_correlation": true,
-      "ui-priority": 1,
+      "ui-priority": 90,
       "misp-attribute": "float"
     },
     "longitude": {
       "description": "The longitude is the decimal value of the longitude in the World Geodetic System 84 (WGS84) reference",
       "disable_correlation": true,
-      "ui-priority": 1,
+      "ui-priority": 89,
       "misp-attribute": "float"
     },
     "altitude": {
@@ -66,9 +67,23 @@
       "description": "Country.",
       "misp-attribute": "text",
       "ui-priority": 1
+    },
+    "epsg": {
+      "description": "EPSG Geodetic Parameter value. This is an integer value of the EPSG.",
+      "misp-attribute": "text",
+      "ui-priority": 70
+    },
+    "spacial-reference": {
+      "description": "Default spacial or projection refence for this object.",
+      "misp-attribute": "text",
+      "disable_correlation": true,
+      "values_list": [
+        "WGS84 EPSG:4326",
+        "Mercator EPSG:3857"
+      ]
     }
   },
-  "version": 2,
+  "version": 3,
   "description": "An object to describe a geographic location.",
   "meta-category": "misc",
   "uuid": "fdd30d5f-6752-45ed-bef2-25e8ce4d8a3",