Better Clustering Algorithm for Spawnpoints

.vscode/settings.json

@@ -7,5 +7,6 @@
     "editor.autoClosingBrackets": "always",
     "editor.defaultFormatter": "esbenp.prettier-vscode",
   },
-  "editor.formatOnSave": true
-}
+  "editor.formatOnSave": true,
+  "rust-analyzer.showUnlinkedFileNotification": false
+}

client/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "koji",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Tool to make RDM routes",
   "main": "server/dist/index.js",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",

client/src/components/drawer/Routing.tsx

@@ -22,7 +22,7 @@ import Toggle from './inputs/Toggle'
 export default function RoutingTab() {
   const mode = usePersist((s) => s.mode)
   const category = usePersist((s) => s.category)
-  const fast = usePersist((s) => s.fast)
+  const cluster_mode = usePersist((s) => s.cluster_mode)
   const calculation_mode = usePersist((s) => s.calculation_mode)
 
   const [updateButton, scannerType, isEditing] = useStatic((s) => [
@@ -93,12 +93,20 @@ export default function RoutingTab() {
         <Divider sx={{ my: 2 }} />
         <ListSubheader>Clustering</ListSubheader>
         <NumInput field="min_points" />
-        <Toggle field="fast" />
-        <Collapse in={!fast}>
+        <MultiOptionList
+          field="cluster_mode"
+          hideLabel
+          buttons={['Fast', 'Balanced', 'BruteForce']}
+          type="select"
+        />
+        <Collapse in={cluster_mode === 'BruteForce'}>
+          <NumInput field="cluster_split_level" min={1} max={30} />
+        </Collapse>
+        <Collapse in={cluster_mode === 'Balanced'}>
           <Toggle field="only_unique" />
         </Collapse>
       </Collapse>
-      <Collapse in={mode === 'cluster' && !fast}>
+      <Collapse in={mode === 'cluster' && cluster_mode === 'Balanced'}>
         <MultiOptionList
           field="sort_by"
           buttons={['GeoHash', 'ClusterCount', 'Random']}

client/src/hooks/usePersist.ts

@@ -45,6 +45,7 @@ export interface UsePersist {
 
   // Clustering
   category: Category | 'fort'
+  cluster_mode: 'Fast' | 'Balanced' | 'BruteForce'
   tth: 'All' | 'Known' | 'Unknown'
   lineColorRules: { distance: number; color: string }[]
   mode: 'bootstrap' | 'route' | 'cluster'
@@ -53,6 +54,7 @@ export interface UsePersist {
   min_points: number | ''
   only_unique: boolean
   route_split_level: number | ''
+  cluster_split_level: number | ''
   save_to_db: boolean
   save_to_scanner: boolean
   skipRendering: boolean
@@ -82,6 +84,7 @@ export const usePersist = create(
       location: [0, 0],
       zoom: 18,
       category: 'pokestop',
+      cluster_mode: 'Fast',
       lineColorRules: [
         { distance: 500, color: '#197E13' },
         { distance: 1000, color: '#FFFF0C' },
@@ -103,7 +106,8 @@ export const usePersist = create(
       s2FillMode: 'simple',
       radius: 70,
       route_split_level: 1,
-      routing_chunk_size: 0,
+      cluster_split_level: 10,
+      // routing_chunk_size: 0,
       calculation_mode: 'Radius',
       s2_level: 15,
       s2_size: 9,

client/src/pages/map/popups/Polygon.tsx

@@ -26,7 +26,7 @@ import type {
 import { useShapes } from '@hooks/useShapes'
 import { useStatic } from '@hooks/useStatic'
 import { useDbCache } from '@hooks/useDbCache'
-import { fetchWrapper } from '@services/fetches'
+import { clusteringRouting, fetchWrapper } from '@services/fetches'
 import {
   removeAllOthers,
   removeThisPolygon,
@@ -191,6 +191,9 @@ export function PolygonPopup({
           </Typography>
         </Grid2>
         <Divider flexItem sx={{ my: 1, color: 'black', width: '90%' }} />
+        <Grid2 xs={12}>
+          <Button onClick={() => clusteringRouting(feature)}>Recluster</Button>
+        </Grid2>
         <Grid2 xs={12}>
           <ButtonGroup>
             <Button

client/src/services/fetches.ts

@@ -107,14 +107,18 @@ export async function getFullCache() {
   )
 }
 
-export async function clusteringRouting(): Promise<FeatureCollection> {
+export async function clusteringRouting(
+  feature?: Feature,
+): Promise<FeatureCollection> {
   const {
     mode,
     radius,
+    cluster_mode,
     category: rawCategory,
     min_points,
     fast,
     route_split_level,
+    cluster_split_level,
     only_unique,
     save_to_db,
     save_to_scanner,
@@ -130,7 +134,7 @@ export async function clusteringRouting(): Promise<FeatureCollection> {
   const { add, activeRoute } = useShapes.getState().setters
   const { getFromKojiKey, getRouteByCategory } = useDbCache.getState()
 
-  const areas = (geojson?.features || []).filter((x) =>
+  const areas = ((feature ? [feature] : geojson?.features) || []).filter((x) =>
     x.geometry.type.includes('Polygon'),
   )
   const last_seen = typeof raw === 'string' ? new Date(raw) : raw
@@ -216,11 +220,13 @@ export async function clusteringRouting(): Promise<FeatureCollection> {
             last_seen: Math.floor((last_seen?.getTime?.() || 0) / 1000),
             radius,
             min_points,
+            cluster_mode,
             fast,
             only_unique,
             save_to_db,
             save_to_scanner,
             route_split_level,
+            cluster_split_level,
             sort_by,
             tth,
             calculation_mode,

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "koji"
-version = "1.0.0"
+version = "1.1.0"
 edition = "2021"
 
 [workspace]

server/algorithms/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "algorithms"
-version = "1.0.0"
+version = "1.1.0"
 edition = "2021"
 publish = false
 
@@ -16,6 +16,7 @@ log = "0.4.17"
 map_3d = "0.1.5"
 model = { path = "../model" }
 rand = "0.8.5"
+rayon = "1.7.0"
 rstar = "0.10.0"
 s2 = "0.0.12"
 serde = { version = "1.0.136", features = ["derive"] }

server/algorithms/src/clustering/brute/leftovers.rs → server/algorithms/src/clustering/balanced/leftovers.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-use crate::clustering::brute::helpers::Helpers;
+use crate::clustering::balanced::helpers::Helpers;
 
 pub fn run(
     point_map: &HashMap<String, PointInfo>,

server/algorithms/src/clustering/brute/maps.rs → server/algorithms/src/clustering/balanced/maps.rs

@@ -1,4 +1,4 @@
-use crate::{clustering::brute::helpers::Helpers, utils};
+use crate::{clustering::balanced::helpers::Helpers, utils};
 
 use super::*;
 

server/algorithms/src/clustering/brute/unique.rs → server/algorithms/src/clustering/balanced/unique.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-use crate::clustering::brute::helpers::Helpers;
+use crate::clustering::balanced::helpers::Helpers;
 
 pub fn run(
     point_map: &mut HashMap<String, PointInfo>,

server/algorithms/src/clustering/brute/wiggle.rs → server/algorithms/src/clustering/balanced/wiggle.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-use crate::clustering::brute::helpers::Helpers;
+use crate::clustering::balanced::helpers::Helpers;
 
 pub fn run(
     circle_map: &mut HashMap<String, CircleInfo>,