Compare commits

...

3 Commits
map-1 ... main

Author SHA1 Message Date
W1CDN
eb10695873 Add some query links. 2024-11-20 19:56:21 -06:00
W1CDN
a5978c2289 Order frames by id to make things go faster. 2024-11-20 19:27:51 -06:00
a1b9fc7ac4 Merge pull request 'Add simple map of stations' (#57) from map-1 into main
Reviewed-on: #57
2024-11-20 10:54:30 -06:00
3 changed files with 10 additions and 5 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 created DESC LIMIT {n}'.format(field_where_query=field_where_query, n=n)
sql = 'SELECT * FROM frames {field_where_query} ORDER BY id DESC LIMIT {n}'.format(field_where_query=field_where_query, n=n)
print(sql)
cur.execute(sql)
rows = cur.fetchall()
@ -102,6 +102,8 @@ 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']
@ -150,7 +152,8 @@ def index():
station_lon = config['Settings']['station_lon'],
frames = frames,
stations = stations,
geojs = geojs)
geojs = geojs,
path = path)
@api_app.route('/map')
def map():
@ -209,7 +212,7 @@ class Packets(Resource):
try:
n = int(request.args.get('n'))
except:
n = 10
n = 20
conn = get_db_connection()
# Limit to number of records requested
@ -224,7 +227,7 @@ class Stations(Resource):
try:
n = int(request.args.get('n'))
except:
n = 10
n = 20
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.30
kiss_host = 192.168.0.100
kiss_port = 8001
# Development settings (not operational yet)

View File

@ -79,6 +79,7 @@
</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>
@ -104,6 +105,7 @@
<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>