From 117fd17ef103bb32940433955eba22f7fa457b99 Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Fri, 6 May 2022 00:34:13 +0200 Subject: [PATCH] Show coordinates on the map --- gps303/mock.py | 11 +++--- gps303/wsgateway.py | 6 +++- gps303/zmsg.py | 2 +- webdemo/index.html | 82 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/gps303/mock.py b/gps303/mock.py index 9652fc1..058c749 100644 --- a/gps303/mock.py +++ b/gps303/mock.py @@ -3,7 +3,8 @@ from datetime import datetime, timezone from logging import getLogger from os import umask -from sys import argv, stdin +import readline +from sys import argv import zmq from . import common @@ -20,11 +21,11 @@ def main(conf): umask(oldmask) while True: - line = stdin.readline() - line = line.rstrip("\r\n") - if not line: + try: + line = input("> ") + except EOFError: break - print(line.encode()) + line = line.rstrip("\r\n") args = line.split(" ") imei = args[0] kwargs = dict([arg.split("=") for arg in args[1:]]) diff --git a/gps303/wsgateway.py b/gps303/wsgateway.py index 674a075..a4a0b6d 100644 --- a/gps303/wsgateway.py +++ b/gps303/wsgateway.py @@ -37,6 +37,11 @@ def try_http(data, fd, e): fd, headers, ) + try: + pos = resource.index("?") + resource = resource[:pos] + except ValueError: + pass if op == "GET": if htmldata is None: return ( @@ -212,7 +217,6 @@ def runserver(conf): topoll = [] tostop = [] events = poller.poll(5000) - log.debug("got events: %s", events) for sk, fl in events: if sk is zsub: while True: diff --git a/gps303/zmsg.py b/gps303/zmsg.py index 0ccef00..28c233a 100644 --- a/gps303/zmsg.py +++ b/gps303/zmsg.py @@ -145,7 +145,7 @@ class LocEvt(_Zmsg): @property def packed(self): return ( - self.imei.encode() + ("0000000000000000" + self.imei)[-16:].encode() + dumps( { "devtime": str(self.devtime), diff --git a/webdemo/index.html b/webdemo/index.html index 5567eed..ad1152c 100644 --- a/webdemo/index.html +++ b/webdemo/index.html @@ -1,22 +1,84 @@ - Location + +