Добавлена проверка на совпадение пунктов отправления и назначения.

lapkin25 · Sep 27, 2023 · c91f44c · c91f44c
1 parent 269f1fd
commit c91f44c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/VVSU/show_route.js b/VVSU/show_route.js
@@ -24,6 +24,10 @@ function showRoute()
                 case RouteFinderStatus.INVALID_DESTINATION:
                     errorText.innerHTML = `Пункт ${to_point} отсутствует`;
                     break;
+
+                case RouteFinderStatus.DEST_AND_SRC_EQUAL:
+                    errorText.innerHTML = "Пункты отправления и назначения совпадают";
+                    break;
             }
             errorText.hidden = false;
             return;

diff --git a/VVSU/styles.css b/VVSU/styles.css
@@ -22,7 +22,7 @@ body {
 }
 
 .container {
-    width: 310px;
+    width: 315px;
     /*background-color: #141718;*/
     background-color: transparent;
     margin: 0 auto;
@@ -75,7 +75,7 @@ body {
 .form {
     margin: 20px auto 0px auto;
     padding: 0 0 15px 0;
-    width: 300px;
+    width: 310px;
 }
 
 .form form {

diff --git a/find_route.js b/find_route.js
@@ -132,7 +132,7 @@ function get_route_text (route)
     return route_text;
 }
 
-const RouteFinderStatus = {SUCCESS:0, INVALID_SOURCE: 1, INVALID_DESTINATION: 2};
+const RouteFinderStatus = {SUCCESS:0, INVALID_SOURCE: 1, INVALID_DESTINATION: 2, DEST_AND_SRC_EQUAL: 3};
 
 function findRoute (point_from, point_to)
 {
@@ -144,6 +144,10 @@ function findRoute (point_from, point_to)
     let status = RouteFinderStatus.SUCCESS;
     let route_strs = [`Маршрут от ${point_from} до ${point_to}`];
 
+    if (point_from === point_to) {
+        status = RouteFinderStatus.DEST_AND_SRC_EQUAL
+    }
+
     if (!plan.point_by_id.has(point_from)) {
         //route_strs.push(`Пункт ${point_from} отсутствует`);
         status = RouteFinderStatus.INVALID_SOURCE;