take out vpsearch

Author: Tony Crisci

Cargo.toml

@@ -4,7 +4,6 @@ version = "0.1.0"
 authors = ["Tony Crisci <tony@dubstepdish.com>"]
 
 [dependencies]
-vpsearch = "1.3.4"
 lazy_static = "1.0"
 bitflags = "1.0"
 

src/color.rs

@@ -1,5 +1,3 @@
-extern crate vpsearch;
-
 use std::collections::HashMap;
 
 #[derive(Copy, Clone, Debug)]
@@ -82,15 +80,12 @@ pub fn color_from_triplet(name: &'static str, t: (u8, u8, u8)) -> Color {
     }
 }
 
-impl vpsearch::MetricSpace for Color {
-    type UserData = ();
-    type Distance = f32;
-
-    fn distance(&self, other: &Self, _: &Self::UserData) -> Self::Distance {
-        let dr = self.r - other.r;
-        let dg = self.g - other.g;
-        let db = self.b - other.b;
+impl Color {
+	pub fn distance(&self, other: &Self) -> f32 {
+		let dr = self.r - other.r;
+		let dg = self.g - other.g;
+		let db = self.b - other.b;
 
-        (dr*dr + dg*dg + db*db).sqrt()
-    }
+		dr*dr + dg*dg + db*db
+	}
 }

src/lib.rs

@@ -3,8 +3,6 @@ extern crate lazy_static;
 #[macro_use]
 extern crate bitflags;
 
-extern crate vpsearch;
-
 mod color;
 mod color_names;
 mod colors;
@@ -69,9 +67,17 @@ impl ColorNamer {
     pub fn name_hex_color(&self, hex: &str) -> Result<String, ColorError> {
         let color = color::color_from_hex("", &hex)?;
 
-        let vp = vpsearch::Tree::new(&self.colors);
-        let (index, _) = vp.find_nearest(&color);
+        let mut min_distance: f32 = std::f32::MAX;
+        let mut closest_color = color;
+
+        for c in &self.colors {
+            let distance = color.distance(c);
+            if distance < min_distance {
+                min_distance = distance;
+                closest_color = *c;
+            }
+        }
 
-        Ok(String::from(self.colors[index].name))
+        Ok(closest_color.name.to_string())
     }
 }