refactor: move rotating code to its own fn

server/Cargo.toml

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

server/algorithms/src/routing/mod.rs

@@ -1,8 +1,8 @@
-use std::{collections::VecDeque, time::Instant};
+use std::time::Instant;
 
-use model::api::{args::SortBy, point_array::PointArray, single_vec::SingleVec};
+use model::api::{args::SortBy, single_vec::SingleVec};
 
-use crate::stats::Stats;
+use crate::{stats::Stats, utils::rotate_to_best};
 
 pub mod basic;
 pub mod tsp;
@@ -18,26 +18,12 @@ pub fn main(
 ) -> SingleVec {
     let route_time = Instant::now();
     let clusters = if sort_by == &SortBy::TSP && !clusters.is_empty() {
-        let tour = tsp::run(clusters, route_split_level);
-        let mut final_clusters = VecDeque::<PointArray>::new();
-
-        let mut rotate_count = 0;
-        for (i, [lat, lon]) in tour.into_iter().enumerate() {
-            if stats.best_clusters.len() > 0
-                && lat == stats.best_clusters[0][0]
-                && lon == stats.best_clusters[0][1]
-            {
-                rotate_count = i;
-                log::debug!("Found Best! {}, {} - {}", lat, lon, i);
-            }
-            final_clusters.push_back([lat, lon]);
-        }
-        final_clusters.rotate_left(rotate_count);
-
-        final_clusters.into()
+        tsp::run(clusters, route_split_level)
     } else {
         basic::sort(&data_points, clusters, radius, sort_by)
     };
+    let clusters = rotate_to_best(clusters, stats);
+
     stats.set_route_time(route_time);
     stats.distance_stats(&clusters);
 

server/algorithms/src/utils.rs

@@ -1,13 +1,16 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, VecDeque};
 use std::fmt::Debug;
 use std::fs::{create_dir_all, File};
 use std::io::{Result, Write};
 
 use colored::Colorize;
+use geo::Coord;
+use geohash::encode;
 use hashbrown::HashSet;
 use model::api::{point_array::PointArray, single_vec::SingleVec};
 
 use crate::rtree::cluster::Cluster;
+use crate::stats::Stats;
 
 pub fn debug_hashmap<T, U>(file_name: &str, input: &T) -> Result<()>
 where
@@ -116,3 +119,24 @@ pub fn _debug_clusters(clusters: &HashSet<Cluster>, file_suffix: &str) {
     debug_hashmap(&format!("{}_cluster.txt", file_suffix), &cluster_map).unwrap();
     debug_hashmap(&format!("{}_unique.txt", file_suffix), &unique_map).unwrap();
 }
+
+pub fn rotate_to_best(clusters: SingleVec, stats: &Stats) -> SingleVec {
+    let mut final_clusters = VecDeque::<PointArray>::new();
+
+    let best_cluster_set = stats
+        .best_clusters
+        .iter()
+        .map(|x| encode(Coord { x: x[1], y: x[0] }, 12).unwrap())
+        .collect::<HashSet<String>>();
+    let mut rotate_count = 0;
+    for (i, [lat, lon]) in clusters.into_iter().enumerate() {
+        if best_cluster_set.contains(&encode(Coord { x: lon, y: lat }, 12).unwrap()) {
+            rotate_count = i;
+            log::debug!("Found Best! {}, {} - {}", lat, lon, i);
+        }
+        final_clusters.push_back([lat, lon]);
+    }
+    final_clusters.rotate_left(rotate_count);
+
+    final_clusters.into()
+}