kopia lustrzana https://github.com/projecthorus/chasemapper
Update to latest socketio
rodzic
d5c7aaffb7
commit
7dc1713bfc
|
@ -26,7 +26,7 @@ RUN apt-get update && \
|
|||
|
||||
# Install additional Python packages that aren't available through apt-get.
|
||||
RUN pip3 --no-cache-dir install \
|
||||
flask-socketio==4.3.2 \
|
||||
flask-socketio \
|
||||
pytz
|
||||
|
||||
# Download and install cusf_predictor_wrapper, and build predictor binary.
|
||||
|
|
|
@ -19,17 +19,21 @@ Currently Chasemapper is a bit mandrolic to set up, and this could be improved c
|
|||
|
||||
## Dependencies
|
||||
|
||||
**Note: ChaseMapper requires Python 3.6 or newer.**
|
||||
|
||||
On a Raspbian/Ubuntu/Debian system, you can get most of the required dependencies using:
|
||||
```
|
||||
$ sudo apt-get install git python3-numpy python3-requests python3-serial python3-dateutil python3-flask python3-pip
|
||||
```
|
||||
On other OSes the required packages should be named something similar.
|
||||
|
||||
You also need flask-socketio and pytz, which can be installed using pip:
|
||||
You also need flask-socketio (>=5.0.0) and pytz, which can be installed using pip:
|
||||
```
|
||||
$ sudo pip3 install flask-socketio==4.3.2 pytz
|
||||
$ sudo pip3 install flask-socketio pytz
|
||||
```
|
||||
|
||||
**Note: If you have previously had chasemapper or auto_rx installed, you may need to update flask-socketio to the most recent version. You can do this by running `sudo pip3 install -U flask-socketio`**
|
||||
|
||||
You can then clone this repository with:
|
||||
```
|
||||
$ git clone https://github.com/projecthorus/chasemapper.git
|
||||
|
|
|
@ -8,4 +8,4 @@
|
|||
|
||||
# Now using Semantic Versioning (https://semver.org/) MAJOR.MINOR.PATCH
|
||||
|
||||
__version__ = "1.0.1"
|
||||
__version__ = "1.1.0"
|
|
@ -5,13 +5,18 @@
|
|||
# Copyright (C) 2018 Mark Jessop <vk5qi@rfhead.net>
|
||||
# Released under GNU GPL v3 or later
|
||||
#
|
||||
import sys
|
||||
# Version check.
|
||||
if sys.version_info < (3, 6):
|
||||
print("CRITICAL - chasemapper requires Python 3.6 or newer!")
|
||||
sys.exit(1)
|
||||
|
||||
import json
|
||||
import logging
|
||||
import flask
|
||||
from flask_socketio import SocketIO
|
||||
import os.path
|
||||
import pytz
|
||||
import sys
|
||||
import time
|
||||
import traceback
|
||||
from threading import Thread
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -19,7 +19,7 @@
|
|||
<!-- I should probably feel bad for using so many libraries, but apparently this is the way thing are done :-/ -->
|
||||
<script src="{{ url_for('static', filename='js/jquery-3.3.1.min.js')}}"></script>
|
||||
<script src="{{ url_for('static', filename='js/jquery-ui.min.js')}}"></script>
|
||||
<script src="{{ url_for('static', filename='js/socket.io-1.4.5.js') }}"></script>
|
||||
<script src="{{ url_for('static', filename='js/socket.io.min.js') }}"></script>
|
||||
<script src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
|
||||
<!-- Leaflet plugins... -->
|
||||
<script src="{{ url_for('static', filename='js/leaflet.rotatedMarker.js') }}"></script>
|
||||
|
@ -234,8 +234,13 @@
|
|||
attribution: '© '+esrimapLink+', '+esriwholink,
|
||||
maxZoom: 18,
|
||||
});
|
||||
var dark_matter_map = L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/dark_all/{z}/{x}/{y}.png', {
|
||||
attribution: '© <a href="https://carto.com/help/building-maps/basemap-list/">Carto</a>'
|
||||
});
|
||||
|
||||
var map_layers = {'OSM':osm_map, 'OpenTopo':osm_topo_map, 'ESRI Satellite':esri_sat_map};
|
||||
|
||||
|
||||
var map_layers = {'OSM':osm_map, 'OpenTopo':osm_topo_map, 'ESRI Satellite':esri_sat_map, 'Dark Matter':dark_matter_map};
|
||||
|
||||
// Add ThunderForest layers, if we have a key provided.
|
||||
if (chase_config.thunderforest_api_key !== 'none'){
|
||||
|
|
Ładowanie…
Reference in New Issue