1 files changed, 40 insertions, 3 deletions
diff --git a/src/map_node5_net.py b/src/map_node5_net.py
index 5bc31c3..aba576e 100644
--- a/src/map_node5_net.py
+++ b/src/map_node5_net.py
@@ -5,9 +5,44 @@ import flask
 
 import db_handler
 
-app = flask.Flask(__name__, template_folder='templates', static_folder='static', static_url_path='')
+import logging
+
+
+class ColorFormatter(logging.Formatter):
+    grey = "\x1b[90;20m"
+    cyan = "\x1b[96;20m"
+    yellow = "\x1b[33;20m"
+    red = "\x1b[31;20m"
+    bold_red = "\x1b[31;1m"
+    reset = "\x1b[0m"
+    format = "%(asctime)s,%(msecs)03d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s"
+
+    FORMATS = {
+        logging.DEBUG: grey + format + reset,
+        logging.INFO: cyan + format + reset,
+        logging.WARNING: yellow + format + reset,
+        logging.ERROR: red + format + reset,
+        logging.CRITICAL: bold_red + format + reset
+    }
+
+    def format(self, record):
+        log_fmt = self.FORMATS.get(record.levelno)
+        formatter = logging.Formatter(log_fmt)
+        return formatter.format(record)
 
 
+logger = logging.getLogger(__name__)  # Instantiate a logger to be used in this module
+
+# Display every message Change this to INFO to see INFO and above (filter out DEBUG)
+# See: https://docs.python.org/3/howto/logging.html#logging-levels
+logger.root.setLevel(logging.DEBUG)
+
+stream_handler = logging.StreamHandler()  # This catches and handles log messages on the root handler
+stream_handler.setFormatter(ColorFormatter())
+logger.root.addHandler(stream_handler)
+
+app = flask.Flask(__name__, template_folder='templates', static_folder='static', static_url_path='')
+
 @app.route("/")
 def index():
     return flask.render_template('/index.html')
@@ -34,8 +69,10 @@ def categories():
 
 @app.route("/all.json")
 def all():
-    category_RADIOACTIVE = flask.request.args.get('Category')  # User input is RADIOACTIVE
-    rows = db_handler.get_all(category_RADIOACTIVE)
+    category_RADIOACTIVE = flask.request.args.get('category')  # User input is RADIOACTIVE
+    country_RADIOACTIVE = flask.request.args.get('country')  # User input is RADIOACTIVE
+    #logger.debug(f'/all.json requested, input params: category: {category_RADIOACTIVE} country: {country_RADIOACTIVE}')
+    rows = db_handler.get_all(country_RADIOACTIVE, category_RADIOACTIVE)
     for row in rows:
         coordinates = []
         for coordinate in json.loads(row['polygon'])['coordinates'][0]: