Skip to content
Snippets Groups Projects
Commit 661b559d authored by Sara Savanovic Djordjevic's avatar Sara Savanovic Djordjevic
Browse files

fix: url param handling

parent a9c1170b
No related branches found
No related tags found
1 merge request!10Clhp map
......@@ -23,7 +23,9 @@ Future<FetchResult> fetchMeasurements() async {
(X509Certificate cert, String host, int port) => true;
// Request markers from server
var request = await client.getUrl(Uri.parse(serverURI + mapEndpoint));
var parameterValue = 'Mjosa'; // NB temp hardcoded, should use selectedLake directly in url param
var request = await client.getUrl(Uri.parse('$serverURI$mapEndpoint?lake='
'${Uri.encodeComponent(parameterValue)}'));
var response = await request.close(); // Close response body at end of function
// Parse body to JSON if request is ok
......
......@@ -15,7 +15,11 @@ Future<Uint8List> fetchRelation() async {
(X509Certificate cert, String host, int port) => true;
// Execute request to to get_relation endpoint
var request = await client.getUrl(Uri.parse('${serverURI}get_relation'));
var parameterValue = 'Mjosa'; // NB temp hardcoded, should use selectedLake directly in url param
//var request = await client.getUrl(Uri.parse('${serverURI}get_relation'));
var request = await client.getUrl(Uri.parse('${serverURI}get_relation?lake='
'${Uri.encodeComponent(parameterValue)}'));
var response = await request.close(); // Close response body at end of function
// Try to parse body to JSON if request is ok
......
......@@ -24,11 +24,13 @@ class IceHTTPServer(HTTPServer):
# Custom HTTP class
class IceHTTP(BaseHTTPRequestHandler):
def __init__(self, request, client_address, server):
self.cursor = server.cursor
super().__init__(request, client_address, server)
def do_GET(self):
# Root path
if self.path == '/': # NB: temporary root path behavior
self.send_response(200)
......@@ -37,12 +39,12 @@ class IceHTTP(BaseHTTPRequestHandler):
self.wfile.write(b"Root path hit!")
elif self.path == '/update_map': # NB: should be POST?
elif self.path.startswith('/update_map'): # NB: should be POST?
parsed_path = urlparse(self.path)
query_params = parse_qs(parsed_path.query)
get_all_markers(self, self.cursor, 'mjosa') # Get all markers
# NB: temporary hardcoded waterBodyName
elif self.path == '/get_relation':
elif self.path.startswith('/get_relation'):
parsed_path = urlparse(self.path)
query_params = parse_qs(parsed_path.query)
fetch_divided_map(self, 'Mjosa') # NB temp hardcoded value
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment