Merge pull request #211 from TurtIeSocks/route-export-fixes

fix: route export dialog
TurtIeSocks · Dec 4, 2023 · 50c5561 · 50c5561 · vercel · Dec 4, 2023
2 parents 44b15dd + 7b9c617
commit 50c5561
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/client/src/components/dialogs/ImportExport.tsx b/client/src/components/dialogs/ImportExport.tsx
@@ -61,9 +61,7 @@ export function ImportExportDialog({
       <DialogHeader action={reset}>
         {mode} {shape}
       </DialogHeader>
-      <DialogContent
-        sx={{ width: '90vw', minHeight: '60vh', overflow: 'auto' }}
-      >
+      <DialogContent>
         <Grid2 container>
           <Grid2 xs={children ? 9 : 12} textAlign="left">
             <Code

diff --git a/client/src/components/dialogs/Route.tsx b/client/src/components/dialogs/Route.tsx
@@ -17,17 +17,25 @@ function BaseDialog({
 
   return (
     <ImportExportDialog mode={mode} shape="Route" open={open}>
-      <Grid2 xs={3} container justifyContent="flex-start">
+      <Grid2
+        xs={3}
+        container
+        justifyContent="flex-start"
+        maxHeight="70vh"
+        overflow="auto"
+      >
         {[
           { label: 'Count', value: stats.count },
-          { label: 'Max', value: stats.max?.toFixed(2) },
+          { label: 'Max', value: stats.max?.toFixed(2), endAdornment: 'm' },
           {
             label: 'Average',
             value: (stats.total / (stats.count || 1))?.toFixed(2),
+            endAdornment: 'm',
           },
           {
-            label: 'Total',
+            label: 'Total Distance',
             value: stats.total?.toFixed(2),
+            endAdornment: 'm',
           },
           {
             label: 'Covered',
@@ -37,16 +45,15 @@ function BaseDialog({
             label: 'Score',
             value: stats.score,
           },
-        ].map(({ label, value }) => (
+        ].map(({ label, value, endAdornment }) => (
           <Grid2 key={label} xs={12}>
             <TextField
+              size="small"
               value={value || 0}
               label={label}
-              sx={{ width: '90%', my: 2 }}
+              sx={{ width: '80%', my: 2 }}
               disabled
-              InputProps={{
-                endAdornment: label === 'Average' || label === 'Max' ? 'm' : '',
-              }}
+              InputProps={{ endAdornment }}
             />
           </Grid2>
         ))}

diff --git a/server/api/src/public/v1/calculate.rs b/server/api/src/public/v1/calculate.rs
@@ -353,14 +353,17 @@ async fn route_stats(payload: web::Json<Args>) -> Result<HttpResponse, Error> {
         ..
     } = payload.into_inner().init(Some("route-stats"));
 
-    if clusters.is_empty() || data_points.is_empty() {
+    if clusters.is_empty() && data_points.is_empty() {
         return Ok(HttpResponse::BadRequest()
             .json(Response::send_error("no_clusters_or_data_points_found")));
     }
     let mut stats = Stats::new(format!("Route Stats | {:?}", mode), min_points);
-    stats.cluster_stats(radius, &data_points, &clusters);
+
     stats.distance_stats(&clusters);
-    stats.set_score();
+    if !data_points.is_empty() {
+        stats.cluster_stats(radius, &data_points, &clusters);
+        stats.set_score();
+    }
 
     let feature = clusters.to_feature(Some(mode.clone())).remove_last_coord();
     let feature = feature.to_collection(Some(instance.clone()), Some(mode));
@@ -408,16 +411,18 @@ async fn route_stats_category(
             .to_single_vec()
     };
 
-    if clusters.is_empty() || data_points.is_empty() {
+    if clusters.is_empty() && data_points.is_empty() {
         return Ok(HttpResponse::BadRequest()
             .json(Response::send_error("no_clusters_or_data_points_found")));
     }
 
     let mut stats = Stats::new(format!("Route Stats | {:?}", mode), min_points);
 
-    stats.cluster_stats(radius, &data_points, &clusters);
     stats.distance_stats(&clusters);
-    stats.set_score();
+    if !data_points.is_empty() {
+        stats.cluster_stats(radius, &data_points, &clusters);
+        stats.set_score();
+    }
 
     let feature = clusters.to_feature(Some(mode.clone())).remove_last_coord();
     let feature = feature.to_collection(Some(instance.clone()), Some(mode));