From bbdde5174a68207e481a3fb557c5a2a6e0b59937 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sun, 1 Jan 2023 15:00:53 -0500
Subject: [PATCH 1/2] fix route exporting page

- Make it work lol
- use convert api to handle most of it
- fix up client side routes a bit
- more separation when converting multiple geos to text
- logout button and functionality
- separate login route
- make sure to fetch config for all routes
---
 client/src/App.tsx                            |  41 +++++-
 client/src/components/Loading.tsx             |  16 ++-
 client/src/components/dialogs/ExportRoute.tsx | 127 ++++++++++++------
 client/src/components/dialogs/Polygon.tsx     |   2 +-
 client/src/components/drawer/manage/index.tsx |   2 +-
 .../src/components/drawer/settings/index.tsx  |   3 +-
 client/src/hooks/usePersist.ts                |   2 +
 client/src/hooks/useStatic.ts                 |   4 +-
 .../src/pages/{home/Splash.tsx => Home.tsx}   |  18 ++-
 client/src/pages/{home => }/Login.tsx         |   9 +-
 client/src/pages/home/index.tsx               |  37 -----
 client/src/services/fetches.ts                |  12 +-
 client/vite.config.ts                         |   5 -
 server/app/src/lib.rs                         |   8 +-
 server/app/src/routes/misc.rs                 |  11 +-
 server/model/src/multi_vec.rs                 |  15 ++-
 server/model/src/point_array.rs               |   2 +-
 server/model/src/point_struct.rs              |   2 +-
 18 files changed, 200 insertions(+), 116 deletions(-)
 rename client/src/pages/{home/Splash.tsx => Home.tsx} (82%)
 rename client/src/pages/{home => }/Login.tsx (94%)
 delete mode 100644 client/src/pages/home/index.tsx

diff --git a/client/src/App.tsx b/client/src/App.tsx
index 7ccdea33..73b26d15 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -3,12 +3,16 @@ import { CssBaseline, ThemeProvider } from '@mui/material'
 import { createBrowserRouter, RouterProvider } from 'react-router-dom'
 
 import createTheme from '@assets/theme'
+import { Config } from '@assets/types'
 import { usePersist } from '@hooks/usePersist'
+import { useStatic } from '@hooks/useStatic'
+import { getData } from '@services/fetches'
 
-import Home from '@pages/home'
+import Home from '@pages/Home'
 import Map from '@pages/map'
 import AdminPanel from '@pages/admin'
 import ErrorPage from '@pages/Error'
+import Login from '@pages/Login'
 
 const router = createBrowserRouter([
   {
@@ -16,6 +20,11 @@ const router = createBrowserRouter([
     element: <Home />,
     errorElement: <ErrorPage error="500" />,
   },
+  {
+    path: '/login',
+    element: <Login />,
+    errorElement: <ErrorPage error="500" />,
+  },
   {
     path: '/map',
     element: <Map />,
@@ -42,10 +51,40 @@ export default function App() {
     return newTheme
   }, [darkMode])
 
+  const { location, setStore } = usePersist.getState()
+  const { setStatic } = useStatic.getState()
+
+  const [fetched, setFetched] = React.useState<boolean>(false)
+  const [error, setError] = React.useState<string>('')
+
+  React.useEffect(() => {
+    getData<Config>('/config/').then((res) => {
+      if (res) {
+        if (res.logged_in) {
+          if (location[0] === 0 && location[1] === 0) {
+            setStore('location', [res.start_lat, res.start_lon])
+          }
+          setStatic('scannerType', res.scanner_type)
+          if (res.tile_server) {
+            setStatic('tileServer', res.tile_server)
+          }
+        } else {
+          router.navigate('/login')
+        }
+        setFetched(true)
+      } else {
+        setError('Unable to fetch config, try again later')
+      }
+    })
+  }, [])
+
+  if (!fetched) return null
+
   return (
     <ThemeProvider theme={theme}>
       <CssBaseline />
       <RouterProvider router={router} />
+      {error && <ErrorPage error={error} />}
     </ThemeProvider>
   )
 }
diff --git a/client/src/components/Loading.tsx b/client/src/components/Loading.tsx
index 792c8632..be7b65d5 100644
--- a/client/src/components/Loading.tsx
+++ b/client/src/components/Loading.tsx
@@ -189,9 +189,19 @@ export default function Loading() {
             </Grid2>
           ) : (
             <Grid2 xs={6}>
-              <CircularProgress
-                size={`calc(100vh / ${Object.keys(loading).length * 3})`}
-              />
+              {typeof value === 'boolean' ? (
+                <>
+                  <Typography color="error">Failed</Typography>
+                  <Typography>
+                    Press F12 to open the browser console to see the logged
+                    error
+                  </Typography>
+                </>
+              ) : (
+                <CircularProgress
+                  size={`calc(100vh / ${Object.keys(loading).length * 3})`}
+                />
+              )}
             </Grid2>
           )}
           <Divider
diff --git a/client/src/components/dialogs/ExportRoute.tsx b/client/src/components/dialogs/ExportRoute.tsx
index 0d25e0e4..86e79417 100644
--- a/client/src/components/dialogs/ExportRoute.tsx
+++ b/client/src/components/dialogs/ExportRoute.tsx
@@ -13,20 +13,57 @@ import {
 } from '@mui/material'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
 import ContentCopy from '@mui/icons-material/ContentCopy'
+import type { FeatureCollection } from 'geojson'
+import useDeepCompareEffect from 'use-deep-compare-effect'
+import distance from '@turf/distance'
+
+import { useStatic } from '@hooks/useStatic'
+import { convert } from '@services/fetches'
 
-import { usePersist } from '@hooks/usePersist'
 import DialogHeader from './Header'
 
 interface Props {
   open: string
   setOpen: (open: string) => void
+  geojson: FeatureCollection
 }
 
-export default function ExportRoute({ open, setOpen }: Props) {
-  const exportSettings = usePersist((s) => s.export)
-  const mode = usePersist((s) => s.mode)
+export default function ExportRoute({ open, setOpen, geojson }: Props) {
+  const scannerType = useStatic((s) => s.scannerType)
+  const [route, setRoute] = React.useState<number[][][]>([])
+  const [stats, setStats] = React.useState<{
+    max: number
+    total: number
+    count: number
+  }>({ max: 0, total: 0, count: 0 })
 
-  const total = exportSettings.route.flatMap((route) => route).length
+  useDeepCompareEffect(() => {
+    if (open === 'route') {
+      convert<number[][][]>(geojson, 'multiArray', false).then((newCode) => {
+        let max = 0
+        let total = 0
+        let count = 0
+        const newRoute = newCode.map((eachRoute) => {
+          return eachRoute.map((point, j) => {
+            const next = j ? eachRoute[j + 1] : eachRoute.at(-1)
+            if (next) {
+              const dis = distance(point, next, { units: 'meters' })
+              if (dis > max) max = dis
+              total += dis
+            }
+            count++
+            return [+point[0].toFixed(6), +point[1].toFixed(6)]
+          })
+        })
+        setStats({
+          max,
+          total,
+          count,
+        })
+        setRoute(newRoute)
+      })
+    }
+  }, [geojson, open])
 
   return (
     <Dialog open={open === 'route'} maxWidth="xl" onClose={() => setOpen('')}>
@@ -45,36 +82,40 @@ export default function ExportRoute({ open, setOpen }: Props) {
             justifyContent="center"
           >
             <List sx={{ width: '90%', mx: 'auto' }}>
-              {exportSettings.route.map((route, i) => (
-                <React.Fragment key={i}>
-                  <ListSubheader>
-                    <Grid2 container justifyContent="space-around">
-                      <Grid2 xs={3}>
-                        <IconButton
-                          onClick={() =>
-                            navigator.clipboard.writeText(
-                              route.map((p) => p.join(',')).join('\n'),
-                            )
-                          }
-                        >
-                          <ContentCopy />
-                        </IconButton>
-                      </Grid2>
-                      <Grid2 xs={9}>
-                        {mode === 'cluster' ? 'Area' : 'Device'} {i + 1}
+              {route.map((feat, i) => {
+                return (
+                  <React.Fragment key={i}>
+                    <ListSubheader>
+                      <Grid2 container justifyContent="space-around">
+                        <Grid2 xs={3}>
+                          <IconButton
+                            onClick={async () =>
+                              navigator.clipboard.writeText(
+                                await convert<string>(
+                                  feat,
+                                  scannerType === 'rdm' ? 'text' : 'altText',
+                                  false,
+                                ),
+                              )
+                            }
+                          >
+                            <ContentCopy />
+                          </IconButton>
+                        </Grid2>
+                        <Grid2 xs={9}>[Geofence {i + 1}]</Grid2>
                       </Grid2>
-                    </Grid2>
-                  </ListSubheader>
-                  {route.map((point, j) => (
-                    <ListItemText
-                      key={`${i}-${j}-${point.join('')}`}
-                      primary={`${point[0]}, ${point[1]}`}
-                      primaryTypographyProps={{ variant: 'caption' }}
-                      sx={{ w: '100%', mx: 'auto' }}
-                    />
-                  ))}
-                </React.Fragment>
-              ))}
+                    </ListSubheader>
+                    {feat.map((point, j) => (
+                      <ListItemText
+                        key={`${i}-${j}-${point.join('')}`}
+                        primary={`${point[0]}, ${point[1]}`}
+                        primaryTypographyProps={{ variant: 'caption' }}
+                        sx={{ w: '100%', mx: 'auto' }}
+                      />
+                    ))}
+                  </React.Fragment>
+                )
+              })}
             </List>
           </Grid2>
           <Grid2
@@ -87,7 +128,7 @@ export default function ExportRoute({ open, setOpen }: Props) {
           >
             <Grid2>
               <TextField
-                value={total || 0}
+                value={route.reduce((acc, cur) => acc + cur.length, 0)}
                 label="Count"
                 type="number"
                 fullWidth
@@ -96,7 +137,7 @@ export default function ExportRoute({ open, setOpen }: Props) {
             </Grid2>
             <Grid2>
               <TextField
-                value={exportSettings.max?.toFixed(2) || 0}
+                value={stats.max?.toFixed(2) || 0}
                 label="Max"
                 type="number"
                 fullWidth
@@ -106,7 +147,7 @@ export default function ExportRoute({ open, setOpen }: Props) {
             </Grid2>
             <Grid2>
               <TextField
-                value={(exportSettings.total / total)?.toFixed(2) || 0}
+                value={(stats.total / (stats.count || 1))?.toFixed(2) || 0}
                 label="Average"
                 type="number"
                 fullWidth
@@ -116,7 +157,7 @@ export default function ExportRoute({ open, setOpen }: Props) {
             </Grid2>
             <Grid2>
               <TextField
-                value={exportSettings.total?.toFixed(2) || 0}
+                value={stats.total?.toFixed(2) || 0}
                 label="Total"
                 type="number"
                 fullWidth
@@ -129,11 +170,13 @@ export default function ExportRoute({ open, setOpen }: Props) {
       </DialogContent>
       <DialogActions>
         <Button
-          onClick={() =>
+          onClick={async () =>
             navigator.clipboard.writeText(
-              exportSettings.route
-                .map((r) => r.map((p) => p.join(',')).join('\n'))
-                .join('\n\n'),
+              await convert<string>(
+                geojson,
+                scannerType === 'rdm' ? 'text' : 'altText',
+                false,
+              ),
             )
           }
         >
diff --git a/client/src/components/dialogs/Polygon.tsx b/client/src/components/dialogs/Polygon.tsx
index 193d3701..aae4f797 100644
--- a/client/src/components/dialogs/Polygon.tsx
+++ b/client/src/components/dialogs/Polygon.tsx
@@ -73,7 +73,7 @@ export default function ExportPolygon({
         }
       })
     }
-  }, [polygonExportMode])
+  }, [polygonExportMode, open])
 
   React.useEffect(() => {
     if (mode === 'import' && code) {
diff --git a/client/src/components/drawer/manage/index.tsx b/client/src/components/drawer/manage/index.tsx
index 08c5b1d0..f88951c0 100644
--- a/client/src/components/drawer/manage/index.tsx
+++ b/client/src/components/drawer/manage/index.tsx
@@ -77,7 +77,7 @@ export default function ImportExport() {
         setOpen={setOpen}
         feature={geojson}
       />
-      <ExportRoute open={open} setOpen={setOpen} />
+      <ExportRoute open={open} setOpen={setOpen} geojson={geojson} />
       <RawManager open={open} setOpen={setOpen} geojson={geojson} />
     </List>
   )
diff --git a/client/src/components/drawer/settings/index.tsx b/client/src/components/drawer/settings/index.tsx
index b63f5a4b..e4490797 100644
--- a/client/src/components/drawer/settings/index.tsx
+++ b/client/src/components/drawer/settings/index.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { List, ListItem, ListSubheader } from '@mui/material'
+import { List, ListItem, ListItemButton, ListSubheader } from '@mui/material'
 
 import { usePersist } from '@hooks/usePersist'
 
@@ -40,6 +40,7 @@ export default function Settings() {
           buttons={['all', 'bound', 'area']}
         />
       </ListItem>
+      <ListItemButton href="/config/logout">Logout</ListItemButton>
     </List>
   )
 }
diff --git a/client/src/hooks/usePersist.ts b/client/src/hooks/usePersist.ts
index 6b1f63ae..4642954c 100644
--- a/client/src/hooks/usePersist.ts
+++ b/client/src/hooks/usePersist.ts
@@ -32,7 +32,9 @@ export interface UsePersist {
     | 'featureCollection'
     | 'featureVec'
     | 'array'
+    | 'multiArray'
     | 'struct'
+    | 'multiStruct'
     | 'text'
     | 'altText'
     | 'poracle'
diff --git a/client/src/hooks/useStatic.ts b/client/src/hooks/useStatic.ts
index bcfa07b2..dcc0397c 100644
--- a/client/src/hooks/useStatic.ts
+++ b/client/src/hooks/useStatic.ts
@@ -5,9 +5,8 @@ import type { KojiStats, PixiMarker } from '@assets/types'
 import { collectionToObject } from '@services/utils'
 
 export interface UseStatic {
-  loading: Record<string, KojiStats | null>
+  loading: Record<string, KojiStats | null | false>
   totalLoadingTime: number
-  loggedIn: boolean
   pokestops: PixiMarker[]
   gyms: PixiMarker[]
   spawnpoints: PixiMarker[]
@@ -50,7 +49,6 @@ export interface UseStatic {
 export const useStatic = create<UseStatic>((set, get) => ({
   loading: {},
   totalLoadingTime: 0,
-  loggedIn: false,
   pokestops: [],
   gyms: [],
   spawnpoints: [],
diff --git a/client/src/pages/home/Splash.tsx b/client/src/pages/Home.tsx
similarity index 82%
rename from client/src/pages/home/Splash.tsx
rename to client/src/pages/Home.tsx
index 4e0b6ef1..1288938c 100644
--- a/client/src/pages/home/Splash.tsx
+++ b/client/src/pages/Home.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react'
-import { Link } from 'react-router-dom'
 import Paper from '@mui/material/Paper'
-import Grid from '@mui/material/Grid' // https://github.com/mui/material-ui/issues/35643
+import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
 import GradientText from '@components/GradientText'
 import { Box } from '@mui/material'
 import ThemeToggle from '@components/ThemeToggle'
@@ -15,15 +14,14 @@ interface Props {
 
 function GridLink({ darkMode, to, children }: Props) {
   return (
-    <Grid
+    <Grid2
       container
-      item
       xs={12}
       sm={6}
-      component={Link}
+      component="a"
+      href={to}
       justifyContent="center"
       alignItems="center"
-      to={to}
       sx={{
         height: { xs: '50vh', sm: '100vh' },
         transition: '0.5s ease',
@@ -39,14 +37,14 @@ function GridLink({ darkMode, to, children }: Props) {
       }}
     >
       {children}
-    </Grid>
+    </Grid2>
   )
 }
-export default function Splash() {
+export default function Home() {
   const darkMode = usePersist((s) => s.darkMode)
 
   return (
-    <Grid container component={Paper} height="100vh" square>
+    <Grid2 container component={Paper} height="100vh" square>
       <GridLink darkMode={darkMode} to="/map">
         <GradientText className="map" variant="h1">
           Map
@@ -60,6 +58,6 @@ export default function Splash() {
       <Box sx={{ position: 'absolute', top: 10, right: 10 }}>
         <ThemeToggle />
       </Box>
-    </Grid>
+    </Grid2>
   )
 }
diff --git a/client/src/pages/home/Login.tsx b/client/src/pages/Login.tsx
similarity index 94%
rename from client/src/pages/home/Login.tsx
rename to client/src/pages/Login.tsx
index a5fc25d9..8c9a8bda 100644
--- a/client/src/pages/home/Login.tsx
+++ b/client/src/pages/Login.tsx
@@ -13,20 +13,19 @@ import Visibility from '@mui/icons-material/Visibility'
 import VisibilityOff from '@mui/icons-material/VisibilityOff'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
 
-import { useStatic } from '@hooks/useStatic'
 import ThemeToggle from '@components/ThemeToggle'
 import GradientText from '@components/GradientText'
+import { useNavigate } from 'react-router'
 
 export default function Login() {
   const [password, setPassword] = React.useState<string>('')
   const [error, setError] = React.useState<string>('')
   const [show, setShow] = React.useState<boolean>(false)
-
-  const setStatic = useStatic((s) => s.setStatic)
+  const navigate = useNavigate()
 
   const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault()
-    const res = await fetch('/login', {
+    const res = await fetch('/config/login', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -34,7 +33,7 @@ export default function Login() {
       body: JSON.stringify({ password }),
     })
     if (res.status === 200) {
-      setStatic('loggedIn', true)
+      navigate('/')
     } else {
       setError('Wrong Password')
     }
diff --git a/client/src/pages/home/index.tsx b/client/src/pages/home/index.tsx
deleted file mode 100644
index 151b4f40..00000000
--- a/client/src/pages/home/index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from 'react'
-
-import { Config } from '@assets/types'
-import { useStatic } from '@hooks/useStatic'
-import { usePersist } from '@hooks/usePersist'
-import { getData } from '@services/fetches'
-
-import Login from '@pages/home/Login'
-import Splash from './Splash'
-
-export default function Home() {
-  const { location, setStore } = usePersist.getState()
-  const { setStatic } = useStatic.getState()
-  const loggedIn = useStatic((s) => s.loggedIn)
-
-  const [fetched, setFetched] = React.useState<boolean>(false)
-
-  React.useEffect(() => {
-    getData<Config>('/config').then((res) => {
-      if (res) {
-        if (location[0] === 0 && location[1] === 0) {
-          setStore('location', [res.start_lat, res.start_lon])
-        }
-        setStatic('scannerType', res.scanner_type)
-        setStatic('loggedIn', res.logged_in)
-        if (res.tile_server) {
-          setStatic('tileServer', res.tile_server)
-        }
-      }
-      setFetched(true)
-    })
-  }, [])
-
-  if (!fetched) return null
-
-  return loggedIn ? <Splash /> : <Login />
-}
diff --git a/client/src/services/fetches.ts b/client/src/services/fetches.ts
index 1f9ae4a8..bc93041b 100644
--- a/client/src/services/fetches.ts
+++ b/client/src/services/fetches.ts
@@ -87,13 +87,20 @@ export async function getLotsOfData(
             console.log('-----------------')
             return r.data
           })
+          .catch(() => {
+            setStatic('loading', (prev) => ({
+              ...prev,
+              [area.properties?.name ||
+              `${area.geometry.type}${area.id ? `-${area.id}` : ''}`]: false,
+            }))
+          })
       }),
   )
   setStatic('totalLoadingTime', Date.now() - totalStartTime)
   return {
     type: 'FeatureCollection',
     features: features.flatMap((r) =>
-      r.status === 'fulfilled' ? r.value : [],
+      r.status === 'fulfilled' && r.value ? r.value : [],
     ),
   }
 }
@@ -170,6 +177,9 @@ export async function convert<T = Array<object> | object | string>(
         simplify,
       }),
     })
+    if (!data.ok) {
+      throw new Error('Unable to convert')
+    }
     return await data.json().then((r) => r.data)
   } catch (e) {
     console.error(e)
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 7c6a903d..288e0d24 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -67,11 +67,6 @@ export default defineConfig(({ mode }) => ({
         changeOrigin: true,
         secure: false,
       },
-      '/login': {
-        target: `http://0.0.0.0:8080`,
-        changeOrigin: true,
-        secure: false,
-      },
     },
   },
 }))
diff --git a/server/app/src/lib.rs b/server/app/src/lib.rs
index 95dc3a39..4fa2658c 100644
--- a/server/app/src/lib.rs
+++ b/server/app/src/lib.rs
@@ -112,9 +112,13 @@ pub async fn main() -> io::Result<()> {
                     .cookie_secure(false)
                     .build(),
             )
-            .service(routes::misc::config)
-            .service(routes::misc::login)
             // private api
+            .service(
+                web::scope("/config")
+                    .service(routes::misc::config)
+                    .service(routes::misc::login)
+                    .service(routes::misc::logout),
+            )
             .service(
                 web::scope("/internal")
                     .wrap(HttpAuthentication::with_fn(auth::pri_validator))
diff --git a/server/app/src/routes/misc.rs b/server/app/src/routes/misc.rs
index b870cb53..e52ce986 100644
--- a/server/app/src/routes/misc.rs
+++ b/server/app/src/routes/misc.rs
@@ -1,8 +1,9 @@
 use super::*;
 use actix_session::Session;
+use actix_web::http::header;
 use models::api::{Auth, ConfigResponse};
 
-#[get("/config")]
+#[get("/")]
 async fn config(scanner_type: web::Data<String>, session: Session) -> Result<HttpResponse, Error> {
     let scanner_type = scanner_type.as_ref().to_string();
     let start_lat: f64 = std::env::var("START_LAT")
@@ -40,3 +41,11 @@ async fn login(payload: web::Json<Auth>, session: Session) -> Result<HttpRespons
     }
     Ok(HttpResponse::Unauthorized().finish())
 }
+
+#[get("/logout")]
+async fn logout(session: Session) -> Result<HttpResponse, Error> {
+    session.clear();
+    Ok(HttpResponse::Found()
+        .append_header((header::LOCATION, "/"))
+        .finish())
+}
diff --git a/server/model/src/multi_vec.rs b/server/model/src/multi_vec.rs
index 31063797..710eef50 100644
--- a/server/model/src/multi_vec.rs
+++ b/server/model/src/multi_vec.rs
@@ -122,8 +122,21 @@ impl ToCollection for MultiVec {
 
 impl ToText for MultiVec {
     fn to_text(self, sep_1: &str, sep_2: &str) -> String {
+        let more_than_1 = self.len() > 1;
         self.into_iter()
-            .map(|each| each.to_text(sep_1, sep_2))
+            .enumerate()
+            .map(|(i, each)| {
+                format!(
+                    "{}{}{}",
+                    if i == 0 { "" } else { "\n" },
+                    if more_than_1 {
+                        format!("[Geofence {}]\n", i + 1)
+                    } else {
+                        "".to_string()
+                    },
+                    each.to_text(sep_1, sep_2),
+                )
+            })
             .collect()
     }
 }
diff --git a/server/model/src/point_array.rs b/server/model/src/point_array.rs
index 4dcfc950..1d1fe1ec 100644
--- a/server/model/src/point_array.rs
+++ b/server/model/src/point_array.rs
@@ -74,7 +74,7 @@ impl ToCollection for PointArray {
 
 impl ToText for PointArray {
     fn to_text(self, sep_1: &str, sep_2: &str) -> String {
-        format!("{}{}{}{}", self[0], sep_1, self[1], sep_2)
+        format!("{}{}{}{}", self[0] as f32, sep_1, self[1] as f32, sep_2)
     }
 }
 
diff --git a/server/model/src/point_struct.rs b/server/model/src/point_struct.rs
index 1d8b1d56..94ea7448 100644
--- a/server/model/src/point_struct.rs
+++ b/server/model/src/point_struct.rs
@@ -80,7 +80,7 @@ impl ToCollection for PointStruct {
 
 impl ToText for PointStruct {
     fn to_text(self, sep_1: &str, sep_2: &str) -> String {
-        format!("{}{}{}{}", self.lat, sep_1, self.lon, sep_2)
+        format!("{}{}{}{}", self.lat as f32, sep_1, self.lon as f32, sep_2)
     }
 }
 

From bb289299aeaf607ea436dcbb29c72bff61744207 Mon Sep 17 00:00:00 2001
From: Derick M <58572875+TurtIeSocks@users.noreply.github.com>
Date: Sun, 1 Jan 2023 15:40:47 -0500
Subject: [PATCH 2/2] export route from popup

- export a singular route straight from the popup
- endpoint for merging points into a multipoint
---
 client/src/components/dialogs/ExportRoute.tsx | 66 ++++++++++++-------
 client/src/components/drawer/manage/index.tsx | 22 ++++++-
 client/src/pages/map/popups/Point.tsx         | 41 ++++++++++--
 client/src/services/fetches.ts                |  3 +-
 server/app/src/lib.rs                         |  1 +
 server/app/src/routes/convert.rs              | 36 +++++++++-
 6 files changed, 137 insertions(+), 32 deletions(-)

diff --git a/client/src/components/dialogs/ExportRoute.tsx b/client/src/components/dialogs/ExportRoute.tsx
index 86e79417..5a4a5d59 100644
--- a/client/src/components/dialogs/ExportRoute.tsx
+++ b/client/src/components/dialogs/ExportRoute.tsx
@@ -13,7 +13,7 @@ import {
 } from '@mui/material'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
 import ContentCopy from '@mui/icons-material/ContentCopy'
-import type { FeatureCollection } from 'geojson'
+import type { Feature, FeatureCollection } from 'geojson'
 import useDeepCompareEffect from 'use-deep-compare-effect'
 import distance from '@turf/distance'
 
@@ -37,31 +37,49 @@ export default function ExportRoute({ open, setOpen, geojson }: Props) {
     count: number
   }>({ max: 0, total: 0, count: 0 })
 
+  const getRoutes = async () => {
+    const points = geojson.features.filter((f) => f.geometry?.type === 'Point')
+    const mergedPoints = points.length
+      ? await convert<Feature[]>(
+          points,
+          'featureVec',
+          false,
+          '/api/v1/convert/merge_points',
+        )
+      : []
+    const newGeojson = {
+      ...geojson,
+      features: [
+        ...mergedPoints,
+        ...geojson.features.filter((f) => f.geometry?.type !== 'Point'),
+      ],
+    }
+    const newCode = await convert<number[][][]>(newGeojson, 'multiArray', false)
+    let max = 0
+    let total = 0
+    let count = 0
+    const newRoute = newCode.map((eachRoute) => {
+      return eachRoute.map((point, j) => {
+        const next = j ? eachRoute[j + 1] : eachRoute.at(-1)
+        if (next) {
+          const dis = distance(point, next, { units: 'meters' })
+          if (dis > max) max = dis
+          total += dis
+        }
+        count++
+        return [+point[0].toFixed(6), +point[1].toFixed(6)]
+      })
+    })
+    setStats({
+      max,
+      total,
+      count,
+    })
+    setRoute(newRoute)
+  }
   useDeepCompareEffect(() => {
     if (open === 'route') {
-      convert<number[][][]>(geojson, 'multiArray', false).then((newCode) => {
-        let max = 0
-        let total = 0
-        let count = 0
-        const newRoute = newCode.map((eachRoute) => {
-          return eachRoute.map((point, j) => {
-            const next = j ? eachRoute[j + 1] : eachRoute.at(-1)
-            if (next) {
-              const dis = distance(point, next, { units: 'meters' })
-              if (dis > max) max = dis
-              total += dis
-            }
-            count++
-            return [+point[0].toFixed(6), +point[1].toFixed(6)]
-          })
-        })
-        setStats({
-          max,
-          total,
-          count,
-        })
-        setRoute(newRoute)
-      })
+      getRoutes()
     }
   }, [geojson, open])
 
diff --git a/client/src/components/drawer/manage/index.tsx b/client/src/components/drawer/manage/index.tsx
index f88951c0..c6899139 100644
--- a/client/src/components/drawer/manage/index.tsx
+++ b/client/src/components/drawer/manage/index.tsx
@@ -75,9 +75,27 @@ export default function ImportExport() {
         mode={exportAll ? 'exportAll' : 'import'}
         open={open}
         setOpen={setOpen}
-        feature={geojson}
+        feature={{
+          ...geojson,
+          features: geojson.features.filter(
+            (feat) =>
+              feat.geometry.type === 'Polygon' ||
+              feat.geometry.type === 'MultiPolygon',
+          ),
+        }}
+      />
+      <ExportRoute
+        open={open}
+        setOpen={setOpen}
+        geojson={{
+          ...geojson,
+          features: geojson.features.filter(
+            (feat) =>
+              feat.geometry.type === 'Point' ||
+              feat.geometry.type === 'MultiPoint',
+          ),
+        }}
       />
-      <ExportRoute open={open} setOpen={setOpen} geojson={geojson} />
       <RawManager open={open} setOpen={setOpen} geojson={geojson} />
     </List>
   )
diff --git a/client/src/pages/map/popups/Point.tsx b/client/src/pages/map/popups/Point.tsx
index b7afb9b1..1428f582 100644
--- a/client/src/pages/map/popups/Point.tsx
+++ b/client/src/pages/map/popups/Point.tsx
@@ -1,22 +1,55 @@
 import * as React from 'react'
 import geohash from 'ngeohash'
 import { PopupProps } from '@assets/types'
+import { Button } from '@mui/material'
+import ExportRoute from '@components/dialogs/ExportRoute'
+import type { Feature } from 'geojson'
+import { useShapes } from '@hooks/useShapes'
 
 interface Props extends PopupProps {
+  id: Feature['id']
   lat: number
   lon: number
+  properties: Feature['properties']
 }
 
-export function PointPopup({ lat, lon }: Props) {
+export function PointPopup({ id, lat, lon, properties }: Props) {
+  const [open, setOpen] = React.useState('')
+
   return (
     <div>
+      {properties?.name && (
+        <>
+          Name: {properties.name}
+          <br />
+        </>
+      )}
       Lat: {lat.toFixed(6)}
       <br />
       Lng: {lon.toFixed(6)}
       <br />
-      Hash: {geohash.encode(lat, lon, 9)}
-      <br />
-      Hash: {geohash.encode(lat, lon, 12)}
+      {process.env.NODE_ENV === 'development' && (
+        <>
+          Hash: {geohash.encode(lat, lon, 9)}
+          <br />
+          Hash: {geohash.encode(lat, lon, 12)}
+          <br />
+        </>
+      )}
+      <Button onClick={() => setOpen('route')}>Export Route</Button>
+      {open && (
+        <ExportRoute
+          open={open}
+          setOpen={setOpen}
+          geojson={{
+            type: 'FeatureCollection',
+            features:
+              typeof id === 'string'
+                ? [useShapes.getState().MultiPoint[id?.split('___')[0]]]
+                : Object.values(useShapes.getState().Point),
+          }}
+        />
+      )}
     </div>
   )
 }
diff --git a/client/src/services/fetches.ts b/client/src/services/fetches.ts
index bc93041b..a4207c0e 100644
--- a/client/src/services/fetches.ts
+++ b/client/src/services/fetches.ts
@@ -164,9 +164,10 @@ export async function convert<T = Array<object> | object | string>(
   area: ToConvert,
   return_type: UsePersist['polygonExportMode'],
   simplify: UsePersist['simplifyPolygons'],
+  url = '/api/v1/convert/data',
 ): Promise<T> {
   try {
-    const data = await fetch('/api/v1/convert/data', {
+    const data = await fetch(url, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
diff --git a/server/app/src/lib.rs b/server/app/src/lib.rs
index 4fa2658c..0e16078e 100644
--- a/server/app/src/lib.rs
+++ b/server/app/src/lib.rs
@@ -169,6 +169,7 @@ pub async fn main() -> io::Result<()> {
                         .service(
                             web::scope("/convert")
                                 .service(routes::convert::convert_data)
+                                .service(routes::convert::merge_points)
                                 .service(routes::convert::simplify),
                         )
                         .service(
diff --git a/server/app/src/routes/convert.rs b/server/app/src/routes/convert.rs
index 8df18d0a..c71b897d 100644
--- a/server/app/src/routes/convert.rs
+++ b/server/app/src/routes/convert.rs
@@ -1,4 +1,6 @@
-use models::GeometryHelpers;
+use entity::sea_orm_active_enums::Type;
+use geojson::{Geometry, Value};
+use models::{GeometryHelpers, ToCollection, ToFeature};
 
 use super::*;
 
@@ -42,3 +44,35 @@ async fn simplify(payload: web::Json<Args>) -> Result<HttpResponse, Error> {
         None,
     ))
 }
+
+#[post("/merge_points")]
+async fn merge_points(payload: web::Json<Args>) -> Result<HttpResponse, Error> {
+    let ArgsUnwrapped {
+        area, return_type, ..
+    } = payload.into_inner().init(Some("simplify"));
+
+    let mut new_multi_point: Vec<Vec<f64>> = vec![];
+
+    area.into_iter().for_each(|feat| {
+        if let Some(geometry) = feat.geometry {
+            match geometry.value {
+                Value::Point(point) => new_multi_point.push(point),
+                _ => {}
+            }
+        }
+    });
+
+    Ok(response::send(
+        Geometry {
+            bbox: None,
+            foreign_members: None,
+            value: Value::MultiPoint(new_multi_point),
+        }
+        .to_feature(Some(&Type::CirclePokemon))
+        .to_collection(None, None),
+        return_type,
+        None,
+        false,
+        None,
+    ))
+}