upgrade to python3

mapserver/mapper.py

@@ -1,48 +1,61 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
-    #-*-coding:utf-8-*-
+
+from http.server import SimpleHTTPRequestHandler, HTTPServer
+from urllib.parse import parse_qs
 import socket
 import struct
 import time
-import web
+import os
+
 HOST = 'localhost'
 PORT = 5678
-BUFFSIZE = 1024          
-ADDR = ( HOST, PORT )   
 
-sock = socket.socket( socket.AF_INET, socket.SOCK_DGRAM )
+sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
 
+class MapHandler(SimpleHTTPRequestHandler):
+    def __init__(self, *args, **kwargs):
+        directory = os.path.dirname(__file__)
+        super().__init__(*args, directory=directory, **kwargs)
 
-urls = (
+    def do_GET(self):
-	'/','index',
+        if self.path == '/':
-	'/post','post',
+            self.send_response(301)
-	'/static/*','static',
+            self.send_header('Location', '/static/baidumap.html')
-)
+            self.end_headers()
-app = web.application(urls, globals())
+        else:
+            super(MapHandler, self).do_GET()
 
-class index:
+    def do_POST(self):
-	def GET(self):
+        if self.path == '/post':
-		return ""
+            urlencoded = self.rfile.read(int(self.headers['Content-Length']))
-
+            parsed = parse_qs(urlencoded)
-class post:
+            pos = [float(parsed.get(k)[0]) for k in [b'lon', b'lat', b'hgt']]
-	def POST(self):
+            data = struct.pack('ddd', *pos)
-		inn=web.input()
+            sock.sendto(data, (HOST, PORT))
-		lon=float(inn.get('lon'))
+            print(*pos)
-		lat=float(inn.get('lat'))
+            self.send_response(200)
-		h=float(inn.get('hgt'))
+            self.send_header('Content-Type', 'text/plain')
-		data=struct.pack("ddd",lat,lon,h)
+        else:
-		sock.sendto(data,ADDR)
+            self.send_response(404)
-		print lon,lat,h
+        self.end_headers()
-
-class static:
-    def GET(self, media, file):
-        try:
-            f = open(media+'/'+file, 'r')
-            return f.read()
-        except:
-            return '404'
-		
-if __name__ == "__main__": app.run()
 
 
+if __name__ == "__main__":
+    from argparse import ArgumentParser
+    argp = ArgumentParser(description='GPS-SDR-SIM realtime map server.')
+    argp.add_argument('port',
+                      type=int,
+                      default=8080,
+                      nargs='?',
+                      help='specify port for map server [default: 8080]')
+    argp.add_argument(
+        '--host',
+        type=str,
+        default='0.0.0.0',
+        help='specify host map server to bind [default: 0.0.0.0]')
+    args = argp.parse_args()
 
+    httpd = HTTPServer((args.host, args.port), MapHandler)
+    print('Serving at http://{}:{}'.format(args.host, args.port))
+    httpd.serve_forever()