Compare commits

..

No commits in common. "main" and "map-1" have entirely different histories.
main ... map-1

3 changed files with 5 additions and 10 deletions

View File

@ -80,7 +80,7 @@ def select_frames(conn, n, url_params):
cur = conn.cursor()
# Workaround to deal with missing value in WHERE
field_where_query = "" if field_where_str == "" else "WHERE "+field_where_str
sql = 'SELECT * FROM frames {field_where_query} ORDER BY id DESC LIMIT {n}'.format(field_where_query=field_where_query, n=n)
sql = 'SELECT * FROM frames {field_where_query} ORDER BY created DESC LIMIT {n}'.format(field_where_query=field_where_query, n=n)
print(sql)
cur.execute(sql)
rows = cur.fetchall()
@ -102,8 +102,6 @@ def select_stations(conn, n):
@api_app.route('/')
def index():
path = config['Settings']['base_url']
# Get list of recent packets using API
# TODO use relative path
#frames = json.loads(requests.get(url_for("packets", _external=True)).text)['data']
@ -152,8 +150,7 @@ def index():
station_lon = config['Settings']['station_lon'],
frames = frames,
stations = stations,
geojs = geojs,
path = path)
geojs = geojs)
@api_app.route('/map')
def map():
@ -212,7 +209,7 @@ class Packets(Resource):
try:
n = int(request.args.get('n'))
except:
n = 20
n = 10
conn = get_db_connection()
# Limit to number of records requested
@ -227,7 +224,7 @@ class Stations(Resource):
try:
n = int(request.args.get('n'))
except:
n = 20
n = 10
conn = get_db_connection()
# Limit to number of records requested

View File

@ -11,7 +11,7 @@ base_url = https://digi.w1cdn.net/aprs_api
keep_time = "2 days"
# KISS settings
kiss_host = 192.168.0.100
kiss_host = 192.168.0.30
kiss_port = 8001
# Development settings (not operational yet)

View File

@ -79,7 +79,6 @@
</div>
<h2> Recent RF Packets </h2>
Query <a href="{{path}}/packets?n=10">10</a> | <a href="{{path}}/packets?n=50">50</a> | <a href="{{path}}/packets?n=100">100</a>
<table>
<tr>
<th> from </th>
@ -105,7 +104,6 @@ Query <a href="{{path}}/packets?n=10">10</a> | <a href="{{path}}/packets?n=50">5
<h2> Recent Stations </h2>
Query <a href="{{path}}/stations?n=10">10</a> | <a href="{{path}}/stations?n=50">50</a> | <a href="{{path}}/stations?n=100">100</a>
<table>
<tr>
<th> from </th>