Add "de_" variants of grid/lat/lon #42

webassets/apidocs/openapi.yml

@@ -461,10 +461,6 @@ components:
           type: string
           description: Callsign of the operator that has been spotted
           example: M0TRT
-        de_call:
-          type: string
-          description: Callsign of the operator that has spotted them
-          example: M0TEST
         dx_name:
           type: string
           description: Name of the operator that has been spotted
@@ -473,18 +469,10 @@ components:
           type: string
           description: Country of the DX operator
           example: United Kingdom
-        de_country:
-          type: string
-          description: Country of the spotter
-          example: United Kingdom
         dx_flag:
           type: string
           description: Country flag of the DX operator
           example: ""
-        de_flag:
-          type: string
-          description: Country flag of the spotter
-          example: ""
         dx_continent:
           type: string
           description: Continent of the DX operator
@@ -497,26 +485,10 @@ components:
             - OC
             - AN
           example: EU
-        de_continent:
-          type: string
-          enum:
-            - EU
-            - NA
-            - SA
-            - AS
-            - AF
-            - OC
-            - AN
-          description: Continent of the spotter
-          example: EU
         dx_dxcc_id:
           type: integer
           description: DXCC ID of the DX operator
           example: 235
-        de_dxcc_id:
-          type: integer
-          description: DXCC ID of the spotter
-          example: 235
         dx_cq_zone:
           type: integer
           description: CQ zone of the DX operator
@@ -529,6 +501,71 @@ components:
           type: string
           description: If this is an APRS spot, what SSID was the DX operator using?
           example: ""
+        dx_grid:
+          type: string
+          description: Maidenhead grid locator for the DX spot.  This could be from a geographical reference e.g. POTA, or just from the country
+          example: IO91aa
+        dx_latitude:
+          type: number
+          description: Latitude of the DX spot, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ lookup
+          example: 51.2345
+        dx_longitude:
+          type: number
+          description: Longitude of the DX spot, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ lookup
+          example: -1.2345
+        dx_location_source:
+          type: string
+          description: Where we got the DX location (grid/latitude/longitude) from. If this was from the spot itself, it's likely quite accurate, but if we had to fall back to QRZ lookup, or even a location based on the DXCC itself, it will be a lot less accurate.
+          enum:
+            - SPOT
+            - QRZ
+            - DXCC
+            - NONE
+          example: SPOT
+        dx_location_good:
+          type: boolean
+          description: Does the software think the location is good enough to put a marker on a map? This is true if the source is "SPOT", or alternatively if the source is "QRZ" and the callsign doesn't have a slash in it (i.e. operator likely at home).
+          example: true
+        de_call:
+          type: string
+          description: Callsign of the operator that has spotted them
+          example: M0TEST
+        de_country:
+          type: string
+          description: Country of the spotter
+          example: United Kingdom
+        de_flag:
+          type: string
+          description: Country flag of the spotter
+          example: ""
+        de_continent:
+          type: string
+          enum:
+            - EU
+            - NA
+            - SA
+            - AS
+            - AF
+            - OC
+            - AN
+          description: Continent of the spotter
+          example: EU
+        de_dxcc_id:
+          type: integer
+          description: DXCC ID of the spotter
+          example: 235
+        de_grid:
+          type: string
+          description: Maidenhead grid locator for the spotter. This is not going to be from a xOTA reference so it will likely just be a QRZ or DXCC lookup. If the spotter is also portable, this is probably wrong, but it's good enough for some simple mapping.
+          example: IO91aa
+        de_latitude:
+          type: number
+          description: Latitude of the spotter, in degrees. This is not going to be from a xOTA reference so it will likely just be a QRZ or DXCC lookup. If the spotter is also portable, this is probably wrong, but it's good enough for some simple mapping.
+          example: 51.2345
+        de_longitude:
+          type: number
+          description: Longitude of the DX spotspotter, in degrees. This is not going to be from a xOTA reference so it will likely just be a QRZ or DXCC lookup. If the spotter is also portable, this is probably wrong, but it's good enough for some simple mapping.
+          example: -1.2345
         mode:
           type: string
           description: Reported mode.
@@ -651,31 +688,6 @@ components:
           type: string
           descripton: Icon, from the Font Awesome set. This is fairly opinionated but is here to help the Spothole web UI and Field Spotter. Does not include the "fa-" prefix.
           example: tree
-        grid:
-          type: string
-          description: Maidenhead grid locator for the spot.  This could be from a geographical reference e.g. POTA, or just from the country
-          example: IO91aa
-        latitude:
-          type: number
-          description: Latitude, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ lookup
-          example: 51.2345
-        longitude:
-          type: number
-          description: Latitude, in degrees. This could be from a geographical reference e.g. POTA, or from a QRZ lookup
-          example: -1.2345
-        location_source:
-          type: string
-          description: Where we got the location (grid/latitude/longitude) from. If this was from the spot itself, it's likely quite accurate, but if we had to fall back to QRZ lookup, or even a location based on the DXCC itself, it will be a lot less accurate.
-          enum:
-            - SPOT
-            - QRZ
-            - DXCC
-            - NONE
-          example: SPOT
-        location_good:
-          type: boolean
-          description: Does the software think the location is good enough to put a marker on a map? This is true if the source is "SPOT", or alternatively if the source is "QRZ" and the callsign doesn't have a slash in it (i.e. operator likely at home).
-          example: true
         qrt:
           type: boolean
           description: QRT state. Some APIs return spots marked as QRT. Otherwise we can check the comments.

webassets/js/spots.js

@@ -134,11 +134,11 @@ function updateTable() {
 
         // Format bearing text
         var bearingText = "---<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service, and we could not determine one. A bearing to this DX is not available.'></i></span>";
-        if (userPos != null && s["latitude"] != null && s["longitude"] != null) {
-            var bearing = calcBearing(userPos[0], userPos[1], s["latitude"], s["longitude"]);
+        if (userPos != null && s["dx_latitude"] != null && s["dx_longitude"] != null) {
+            var bearing = calcBearing(userPos[0], userPos[1], s["dx_latitude"], s["dx_longitude"]);
             bearingText = bearing.toFixed(0).padStart(3, '0') + "°";
-            if (s["location_good"] == null || s["location_good"] == false) {
-                if (s["location_source"] == "QRZ") {
+            if (s["dx_location_good"] == null || s["dx_location_good"] == false) {
+                if (s["dx_location_source"] == "QRZ") {
                     bearingText = bearingText + "<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service. We had to fall back to a QRZ \"home\" location for a portable/mobile/alternative spot, so this bearing may not be accurate if the DX is close to you..'></i></span>";
                 } else {
                     bearingText = bearingText + "<span class='bearing-q hideonmobile'><i class='fa-solid fa-circle-question' title='The position was not reported via the spotting service. We had to fall back to just using the centre of a DXCC entity, so this bearing may not be accurate if the DX is close to you.'></i></span>";