disambiguate lat & lon

windytan · Dec 11, 2016 · 9137b32 · 9137b32
1 parent 4bae8a0
commit 9137b32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/schema.json b/schema.json
@@ -212,11 +212,20 @@
               "type": "string"
             },
             "coordinates": {
-              "type": "array",
-              "items": {
-                "type": "array",
-                "items": {
-                  "type": "number"
+              "description": "Affected point or route",
+              "type": "object",
+              "properties": {
+                "lat": {
+                  "description": "Degrees North",
+                  "type": "number",
+                  "minimum": -90,
+                  "maximum": 90
+                },
+                "lon": {
+                  "description": "Degrees East",
+                  "type": "number",
+                  "minimum": -180,
+                  "maximum": 180
                 }
               }
             },

diff --git a/src/tmc/tmc.cc b/src/tmc/tmc.cc
@@ -376,8 +376,8 @@ void decodeLocation(const LocationDatabase& db, uint16_t ltn,
 
     for (int i=0; i < static_cast<int>(pts.size()); i++) {
 //        (*jsroot)["tmc"]["message"]["locations"].append(pts[i].lcd);
-      (*jsroot)["tmc"]["message"]["coordinates"][i].append(pts[i].lat);
-      (*jsroot)["tmc"]["message"]["coordinates"][i].append(pts[i].lon);
+      (*jsroot)["tmc"]["message"]["coordinates"][i]["lat"] = pts[i].lat;
+      (*jsroot)["tmc"]["message"]["coordinates"][i]["lon"] = pts[i].lon;
     }
 
     if (pts.size() > 1 && pts.at(0).name1.length() > 0 &&