Merge pull request #468 from WatWowMap/fix-device-paths

Fix Device Paths

Author: TurtIeSocks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "React based frontend map.",
   "main": "ReactMap.mjs",
   "author": "TurtIeSocks <[email protected]>",

server/src/graphql/scannerTypes.js

@@ -10,6 +10,7 @@ module.exports = gql`
     type: String
     isMad: Boolean
     route: JSON
+    radius: Int
   }
 
   type Gym {

server/src/models/Device.js

@@ -36,6 +36,8 @@ module.exports = class Device extends Model {
           'instance_name',
           raw('json_extract(data, "$.area")')
             .as('route'),
+          raw('json_extract(data, "$.radius")')
+            .as('radius'),
         )
     }
     if (areaRestrictions.length) {

src/components/popups/DevicePoly.jsx

@@ -1,14 +1,31 @@
 /* eslint-disable react/no-array-index-key */
 import React, { memo } from 'react'
-import { Polyline, Polygon } from 'react-leaflet'
+import { Polyline, Polygon, Circle } from 'react-leaflet'
 
 const DevicePoly = ({ device, color }) => {
+  if (!device.route) return null
+
   if (typeof device.route === 'string') {
     device.route = JSON.parse(device.route)
   }
+  if (device.type === 'leveling') {
+    return (
+      <>
+        <Circle
+          center={device.route}
+          pathOptions={{ color }}
+        />
+        <Circle
+          center={device.route}
+          radius={device.radius}
+          pathOptions={{ color }}
+        />
+      </>
+    )
+  }
   const arrayRoute = device.route[0].lat ? [device.route] : device.route
   if (Array.isArray(arrayRoute)) {
-    return device.type === 'circle_pokemon'
+    return device?.type?.includes('circle')
       ? arrayRoute.map((polygon, i) => (
         <Polyline
           key={i}

src/services/queries/device.js

@@ -11,6 +11,7 @@ const getAllDevices = gql`
       route
       type
       isMad
+      radius
     }
   }
 `