Merge pull request #42 from metallicgloss/validation-improvement

Validation improvements.

Author: metallicgloss

underground_route_planner/models/route_planner.py

@@ -81,7 +81,15 @@ def check_route_speed_factor_should_apply(current_time_in_minutes: int, train_li
         remaining_stations = self._station_handler.get_all_station_names()
 
         # Move the starting station to the front of the list
-        remaining_stations.remove(starting_station_name)
+        try:
+            # If error occurs when attempting to remove the starting station, invalid station name passed
+            # Likely manual request or bypassing attempt of frontend validation.
+            remaining_stations.remove(starting_station_name)
+        except:
+            return {
+                "response": "Invalid Start Station"
+            }
+
         remaining_stations.insert(0, starting_station_name)
 
         # Set starting point time to 0
@@ -187,7 +195,14 @@ def check_route_speed_factor_should_apply(current_time_in_minutes: int, train_li
         # Set end time for route calculation
         calculation_end_time = time.time()
 
-        return self._generate_route_structure(starting_station_name, destination_station_name, calculation_end_time - calculation_start_time)
+        try:
+            # If error occurs when generating route structure, most common problem caused by invalid destination station name.
+            # Likely manual request or bypassing attempt of frontend validation.
+            return self._generate_route_structure(starting_station_name, destination_station_name, calculation_end_time - calculation_start_time)
+        except:
+            return {
+                "response": "Invalid Route Request"
+            }
 
     # ----------------------------------------------------------------------- #
     #                        1.4 Generate Route Structure                     #

underground_route_planner/static/css/styles.css

@@ -209,6 +209,12 @@ footer {
     background: var(--secondary-blue);
 }
 
+.homepage-selection .selection-box .search-train-graphic-box {
+    overflow: hidden;
+    margin-top: -25px;
+    padding-top: 28px;
+}
+
 /* 
 -------------------------------------------------
 -------------    Typeahead Styles   -------------

underground_route_planner/static/js/route-planner.js

@@ -132,8 +132,8 @@ $('#selection-submit-button').click(function () {
                         // Create styled map with center in the middle of London
                         const map = new google.maps.Map(document.getElementById("map-object"), {
                             center: {
-                                lat: 51.5074,
-                                lng: -0.1278
+                                lat: response['raw_data']['route_locations'][0]['latitude'],
+                                lng: response['raw_data']['route_locations'][0]['longitude']
                             },
                             zoom: 12,
                             disableDefaultUI: true,

underground_route_planner/templates/licences.html

@@ -13,6 +13,14 @@ <h2 class="subpage-block-subheading">Licences of Open Source software used for t
 
 <div class="container">
     <div class="license-list">
+        <div class="row">
+            <div class="col-lg-12">
+                <h2>Django</h2>
+                Version: 1.0<br>
+                URL: https://github.com/django/django/<br>
+                Copyright: &copy; 2013-2020 Django Software Foundation and other contributors. (https://github.com/django/django/graphs/contributors)</p>
+            </div>
+        </div>
         <div class="row">
             <div class="col-lg-12">
                 <h2>Bootstrap</h2>

underground_route_planner/views.py

@@ -1,3 +1,4 @@
+import re
 from django.shortcuts import render
 from django.http import JsonResponse
 from django.apps import apps
@@ -36,13 +37,33 @@ def station_search(request):
 
 
 def route_search(request):
+    if any(key not in request.GET for key in ("origin_location", "destination_location", "start_time")):
+        # Return invalid message
+        return JsonResponse(
+            {
+                'response': 'Missing Required Parameter.'
+            },
+            safe=True
+        )
+
     for value in request.GET.items():
+        # If time input, check formatting.
+        if(value[0] == "start_time"):
+            if(not re.search("^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$", value[1])):
+                # Return invalid message
+                return JsonResponse(
+                    {
+                        'response': 'Invalid Time Format'
+                    },
+                    safe=True
+                )
+
         # Simple check to ensure parameter is string and within length limits.
-        if((not isinstance(value[0], str)) and (3 < len(value[0]) < 25)):
+        if((not isinstance(value[1], str)) or (3 > len(value[1])) or (25 < len(value[1])) or (value[1] is None) or (value[1] == "")):
             # Return invalid message
             return JsonResponse(
                 {
-                    'response': 'invalid'
+                    'response': 'Invalid or Missing Data'
                 },
                 safe=True
             )
@@ -57,16 +78,24 @@ def route_search(request):
         (int(start_time[0]) * 60) + int(start_time[1])
     )
 
-    # Generate html formatted data.
-    html_data = HTMLFormatter(route_data).format_route()
-
-    # Return formatted data to the frontend.
-    return JsonResponse(
-        {
-            'raw_data': route_data,
-            'route_table': html_data['route_table'],
-            'route_summary': html_data['route_summary'],
-            'route_travel_time': html_data['route_travel_time']
-        },
-        safe=True
-    )
+    if('response' not in route_data):
+        # Generate html formatted data.
+        html_data = HTMLFormatter(route_data).format_route()
+
+        # Return formatted data to the frontend.
+        return JsonResponse(
+            {
+                'raw_data': route_data,
+                'route_table': html_data['route_table'],
+                'route_summary': html_data['route_summary'],
+                'route_travel_time': html_data['route_travel_time']
+            },
+            safe=True
+        )
+
+    else:
+        # Return formatted data to the frontend.
+        return JsonResponse(
+            route_data,
+            safe=True
+        )