added stuff
This commit is contained in:
parent
1f337ae12e
commit
90cf89aed1
61
html/engine.js
Normal file
61
html/engine.js
Normal file
@ -0,0 +1,61 @@
|
||||
/*
|
||||
*/
|
||||
|
||||
let map;
|
||||
let point;
|
||||
|
||||
const arrows = ["↑", "↗", "→", "↘", "↓", "↙", "←", "↖"];
|
||||
|
||||
const socket = new WebSocket("wss://geo.paulbsd.com/ws");
|
||||
|
||||
function create_location(coords,text) {
|
||||
point = L.marker(coords, {
|
||||
color: 'red',
|
||||
fillColor: '#f03',
|
||||
fillOpacity: 0.5,
|
||||
radius: 50
|
||||
}).addTo(map).bindPopup(text);
|
||||
point.getPopup().autoPan=false;
|
||||
point.openPopup();
|
||||
}
|
||||
|
||||
function create_map(coords) {
|
||||
map = L.map('map', {
|
||||
center: coords,
|
||||
zoom: 15
|
||||
});
|
||||
L.tileLayer(`https://tile.openstreetmap.org/{z}/{x}/{y}.png`, {
|
||||
maxZoom: 19,
|
||||
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> / <a href="https://www.paulbsd.com">PaulBSD</a>'
|
||||
}).addTo(map);
|
||||
}
|
||||
|
||||
function update(data) {
|
||||
const coords = [data.latitude,data.longitude];
|
||||
const speed = data.speed/10;
|
||||
let section = parseInt(data.direction/45 + 0.5);
|
||||
section = section % 8;
|
||||
console.log(arrows[section]);
|
||||
const text = `${data.time}<br/>height: ${data.height}<br/>speed: ${speed}<br/>direction: ${arrows[section]} ${data.direction}`;
|
||||
if (!map) {
|
||||
create_map(coords);
|
||||
} else {
|
||||
map.setView(coords);
|
||||
map.flyTo(coords);
|
||||
}
|
||||
if (!point) {
|
||||
create_location(coords, text);
|
||||
} else {
|
||||
point.setLatLng(coords);
|
||||
point.setPopupContent(text);
|
||||
}
|
||||
}
|
||||
|
||||
socket.addEventListener("message", (event) => {
|
||||
const data = JSON.parse(event.data);
|
||||
update(data);
|
||||
});
|
||||
|
||||
socket.addEventListener("open", (event) => {
|
||||
socket.send("ping");
|
||||
});
|
||||
15
html/index.html
Normal file
15
html/index.html
Normal file
@ -0,0 +1,15 @@
|
||||
<html>
|
||||
<title>PaulBSD geo</title>
|
||||
<link rel="icon" href="https://paulbsd.com/favicon.ico" type="image/x-icon">
|
||||
<link rel="stylesheet" href="leaflet/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin=""/>
|
||||
<link rel="stylesheet" href="style.css" crossorigin=""/>
|
||||
<script src="leaflet/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin="">
|
||||
</script>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
|
||||
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black"/>
|
||||
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#0313fc"/>
|
||||
<body>
|
||||
<div id="map" style="height: 100%;"></div>
|
||||
<script src="engine.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
28
html/lastloc.lua
Normal file
28
html/lastloc.lua
Normal file
@ -0,0 +1,28 @@
|
||||
#!/usr/bin/lua
|
||||
--ngx.say(_VERSION)
|
||||
|
||||
local sqlite = require("lsqlite3")
|
||||
local basepath = "/home/paul/git/micodus_server"
|
||||
local dbfile = string.format("%s/data/tracker.db",basepath)
|
||||
--local output = string.format("%s/html/lastloc.json",basepath)
|
||||
local query = [[
|
||||
SELECT latitude,longitude
|
||||
FROM log
|
||||
ORDER BY time DESC
|
||||
LIMIT 1;
|
||||
]]
|
||||
|
||||
function main()
|
||||
local db = sqlite.open(dbfile,sqlite3.OPEN_READONLY)
|
||||
|
||||
local res, vm = db:nrows(query)
|
||||
for row in res, vm do
|
||||
local locstr = string.format("{\"latitude\": %s, \"longitude\": %s}", row.latitude, row.longitude)
|
||||
--f = io.open(output, "w")
|
||||
--f:write(locstr)
|
||||
ngx.say(locstr)
|
||||
end
|
||||
db:close()
|
||||
end
|
||||
|
||||
main()
|
||||
BIN
html/leaflet/images/layers-2x.png
Normal file
BIN
html/leaflet/images/layers-2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
html/leaflet/images/layers.png
Normal file
BIN
html/leaflet/images/layers.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 696 B |
BIN
html/leaflet/images/marker-icon-2x.png
Normal file
BIN
html/leaflet/images/marker-icon-2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
html/leaflet/images/marker-icon.png
Normal file
BIN
html/leaflet/images/marker-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
html/leaflet/images/marker-shadow.png
Normal file
BIN
html/leaflet/images/marker-shadow.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 618 B |
14419
html/leaflet/leaflet-src.esm.js
Normal file
14419
html/leaflet/leaflet-src.esm.js
Normal file
File diff suppressed because it is too large
Load Diff
1
html/leaflet/leaflet-src.esm.js.map
Normal file
1
html/leaflet/leaflet-src.esm.js.map
Normal file
File diff suppressed because one or more lines are too long
14512
html/leaflet/leaflet-src.js
Normal file
14512
html/leaflet/leaflet-src.js
Normal file
File diff suppressed because it is too large
Load Diff
1
html/leaflet/leaflet-src.js.map
Normal file
1
html/leaflet/leaflet-src.js.map
Normal file
File diff suppressed because one or more lines are too long
661
html/leaflet/leaflet.css
Normal file
661
html/leaflet/leaflet.css
Normal file
@ -0,0 +1,661 @@
|
||||
/* required styles */
|
||||
|
||||
.leaflet-pane,
|
||||
.leaflet-tile,
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow,
|
||||
.leaflet-tile-container,
|
||||
.leaflet-pane > svg,
|
||||
.leaflet-pane > canvas,
|
||||
.leaflet-zoom-box,
|
||||
.leaflet-image-layer,
|
||||
.leaflet-layer {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
}
|
||||
.leaflet-container {
|
||||
overflow: hidden;
|
||||
}
|
||||
.leaflet-tile,
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
user-select: none;
|
||||
-webkit-user-drag: none;
|
||||
}
|
||||
/* Prevents IE11 from highlighting tiles in blue */
|
||||
.leaflet-tile::selection {
|
||||
background: transparent;
|
||||
}
|
||||
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
|
||||
.leaflet-safari .leaflet-tile {
|
||||
image-rendering: -webkit-optimize-contrast;
|
||||
}
|
||||
/* hack that prevents hw layers "stretching" when loading new tiles */
|
||||
.leaflet-safari .leaflet-tile-container {
|
||||
width: 1600px;
|
||||
height: 1600px;
|
||||
-webkit-transform-origin: 0 0;
|
||||
}
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow {
|
||||
display: block;
|
||||
}
|
||||
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
|
||||
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
|
||||
.leaflet-container .leaflet-overlay-pane svg {
|
||||
max-width: none !important;
|
||||
max-height: none !important;
|
||||
}
|
||||
.leaflet-container .leaflet-marker-pane img,
|
||||
.leaflet-container .leaflet-shadow-pane img,
|
||||
.leaflet-container .leaflet-tile-pane img,
|
||||
.leaflet-container img.leaflet-image-layer,
|
||||
.leaflet-container .leaflet-tile {
|
||||
max-width: none !important;
|
||||
max-height: none !important;
|
||||
width: auto;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.leaflet-container img.leaflet-tile {
|
||||
/* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
|
||||
mix-blend-mode: plus-lighter;
|
||||
}
|
||||
|
||||
.leaflet-container.leaflet-touch-zoom {
|
||||
-ms-touch-action: pan-x pan-y;
|
||||
touch-action: pan-x pan-y;
|
||||
}
|
||||
.leaflet-container.leaflet-touch-drag {
|
||||
-ms-touch-action: pinch-zoom;
|
||||
/* Fallback for FF which doesn't support pinch-zoom */
|
||||
touch-action: none;
|
||||
touch-action: pinch-zoom;
|
||||
}
|
||||
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
|
||||
-ms-touch-action: none;
|
||||
touch-action: none;
|
||||
}
|
||||
.leaflet-container {
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
.leaflet-container a {
|
||||
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
|
||||
}
|
||||
.leaflet-tile {
|
||||
filter: inherit;
|
||||
visibility: hidden;
|
||||
}
|
||||
.leaflet-tile-loaded {
|
||||
visibility: inherit;
|
||||
}
|
||||
.leaflet-zoom-box {
|
||||
width: 0;
|
||||
height: 0;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
z-index: 800;
|
||||
}
|
||||
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
|
||||
.leaflet-overlay-pane svg {
|
||||
-moz-user-select: none;
|
||||
}
|
||||
|
||||
.leaflet-pane { z-index: 400; }
|
||||
|
||||
.leaflet-tile-pane { z-index: 200; }
|
||||
.leaflet-overlay-pane { z-index: 400; }
|
||||
.leaflet-shadow-pane { z-index: 500; }
|
||||
.leaflet-marker-pane { z-index: 600; }
|
||||
.leaflet-tooltip-pane { z-index: 650; }
|
||||
.leaflet-popup-pane { z-index: 700; }
|
||||
|
||||
.leaflet-map-pane canvas { z-index: 100; }
|
||||
.leaflet-map-pane svg { z-index: 200; }
|
||||
|
||||
.leaflet-vml-shape {
|
||||
width: 1px;
|
||||
height: 1px;
|
||||
}
|
||||
.lvml {
|
||||
behavior: url(#default#VML);
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
||||
/* control positioning */
|
||||
|
||||
.leaflet-control {
|
||||
position: relative;
|
||||
z-index: 800;
|
||||
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
|
||||
pointer-events: auto;
|
||||
}
|
||||
.leaflet-top,
|
||||
.leaflet-bottom {
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
pointer-events: none;
|
||||
}
|
||||
.leaflet-top {
|
||||
top: 0;
|
||||
}
|
||||
.leaflet-right {
|
||||
right: 0;
|
||||
}
|
||||
.leaflet-bottom {
|
||||
bottom: 0;
|
||||
}
|
||||
.leaflet-left {
|
||||
left: 0;
|
||||
}
|
||||
.leaflet-control {
|
||||
float: left;
|
||||
clear: both;
|
||||
}
|
||||
.leaflet-right .leaflet-control {
|
||||
float: right;
|
||||
}
|
||||
.leaflet-top .leaflet-control {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.leaflet-bottom .leaflet-control {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.leaflet-left .leaflet-control {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.leaflet-right .leaflet-control {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
|
||||
/* zoom and fade animations */
|
||||
|
||||
.leaflet-fade-anim .leaflet-popup {
|
||||
opacity: 0;
|
||||
-webkit-transition: opacity 0.2s linear;
|
||||
-moz-transition: opacity 0.2s linear;
|
||||
transition: opacity 0.2s linear;
|
||||
}
|
||||
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
|
||||
opacity: 1;
|
||||
}
|
||||
.leaflet-zoom-animated {
|
||||
-webkit-transform-origin: 0 0;
|
||||
-ms-transform-origin: 0 0;
|
||||
transform-origin: 0 0;
|
||||
}
|
||||
svg.leaflet-zoom-animated {
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
.leaflet-zoom-anim .leaflet-zoom-animated {
|
||||
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||
}
|
||||
.leaflet-zoom-anim .leaflet-tile,
|
||||
.leaflet-pan-anim .leaflet-tile {
|
||||
-webkit-transition: none;
|
||||
-moz-transition: none;
|
||||
transition: none;
|
||||
}
|
||||
|
||||
.leaflet-zoom-anim .leaflet-zoom-hide {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
|
||||
/* cursors */
|
||||
|
||||
.leaflet-interactive {
|
||||
cursor: pointer;
|
||||
}
|
||||
.leaflet-grab {
|
||||
cursor: -webkit-grab;
|
||||
cursor: -moz-grab;
|
||||
cursor: grab;
|
||||
}
|
||||
.leaflet-crosshair,
|
||||
.leaflet-crosshair .leaflet-interactive {
|
||||
cursor: crosshair;
|
||||
}
|
||||
.leaflet-popup-pane,
|
||||
.leaflet-control {
|
||||
cursor: auto;
|
||||
}
|
||||
.leaflet-dragging .leaflet-grab,
|
||||
.leaflet-dragging .leaflet-grab .leaflet-interactive,
|
||||
.leaflet-dragging .leaflet-marker-draggable {
|
||||
cursor: move;
|
||||
cursor: -webkit-grabbing;
|
||||
cursor: -moz-grabbing;
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
/* marker & overlays interactivity */
|
||||
.leaflet-marker-icon,
|
||||
.leaflet-marker-shadow,
|
||||
.leaflet-image-layer,
|
||||
.leaflet-pane > svg path,
|
||||
.leaflet-tile-container {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.leaflet-marker-icon.leaflet-interactive,
|
||||
.leaflet-image-layer.leaflet-interactive,
|
||||
.leaflet-pane > svg path.leaflet-interactive,
|
||||
svg.leaflet-image-layer.leaflet-interactive path {
|
||||
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
||||
/* visual tweaks */
|
||||
|
||||
.leaflet-container {
|
||||
background: #ddd;
|
||||
outline-offset: 1px;
|
||||
}
|
||||
.leaflet-container a {
|
||||
color: #0078A8;
|
||||
}
|
||||
.leaflet-zoom-box {
|
||||
border: 2px dotted #38f;
|
||||
background: rgba(255,255,255,0.5);
|
||||
}
|
||||
|
||||
|
||||
/* general typography */
|
||||
.leaflet-container {
|
||||
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||
font-size: 12px;
|
||||
font-size: 0.75rem;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
|
||||
/* general toolbar styles */
|
||||
|
||||
.leaflet-bar {
|
||||
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
|
||||
border-radius: 4px;
|
||||
}
|
||||
.leaflet-bar a {
|
||||
background-color: #fff;
|
||||
border-bottom: 1px solid #ccc;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
line-height: 26px;
|
||||
display: block;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
color: black;
|
||||
}
|
||||
.leaflet-bar a,
|
||||
.leaflet-control-layers-toggle {
|
||||
background-position: 50% 50%;
|
||||
background-repeat: no-repeat;
|
||||
display: block;
|
||||
}
|
||||
.leaflet-bar a:hover,
|
||||
.leaflet-bar a:focus {
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
.leaflet-bar a:first-child {
|
||||
border-top-left-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
}
|
||||
.leaflet-bar a:last-child {
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
border-bottom: none;
|
||||
}
|
||||
.leaflet-bar a.leaflet-disabled {
|
||||
cursor: default;
|
||||
background-color: #f4f4f4;
|
||||
color: #bbb;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-bar a {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.leaflet-touch .leaflet-bar a:first-child {
|
||||
border-top-left-radius: 2px;
|
||||
border-top-right-radius: 2px;
|
||||
}
|
||||
.leaflet-touch .leaflet-bar a:last-child {
|
||||
border-bottom-left-radius: 2px;
|
||||
border-bottom-right-radius: 2px;
|
||||
}
|
||||
|
||||
/* zoom control */
|
||||
|
||||
.leaflet-control-zoom-in,
|
||||
.leaflet-control-zoom-out {
|
||||
font: bold 18px 'Lucida Console', Monaco, monospace;
|
||||
text-indent: 1px;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
|
||||
/* layers control */
|
||||
|
||||
.leaflet-control-layers {
|
||||
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
|
||||
background: #fff;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.leaflet-control-layers-toggle {
|
||||
background-image: url(images/layers.png);
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
.leaflet-retina .leaflet-control-layers-toggle {
|
||||
background-image: url(images/layers-2x.png);
|
||||
background-size: 26px 26px;
|
||||
}
|
||||
.leaflet-touch .leaflet-control-layers-toggle {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
}
|
||||
.leaflet-control-layers .leaflet-control-layers-list,
|
||||
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
|
||||
display: none;
|
||||
}
|
||||
.leaflet-control-layers-expanded .leaflet-control-layers-list {
|
||||
display: block;
|
||||
position: relative;
|
||||
}
|
||||
.leaflet-control-layers-expanded {
|
||||
padding: 6px 10px 6px 6px;
|
||||
color: #333;
|
||||
background: #fff;
|
||||
}
|
||||
.leaflet-control-layers-scrollbar {
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
padding-right: 5px;
|
||||
}
|
||||
.leaflet-control-layers-selector {
|
||||
margin-top: 2px;
|
||||
position: relative;
|
||||
top: 1px;
|
||||
}
|
||||
.leaflet-control-layers label {
|
||||
display: block;
|
||||
font-size: 13px;
|
||||
font-size: 1.08333em;
|
||||
}
|
||||
.leaflet-control-layers-separator {
|
||||
height: 0;
|
||||
border-top: 1px solid #ddd;
|
||||
margin: 5px -10px 5px -6px;
|
||||
}
|
||||
|
||||
/* Default icon URLs */
|
||||
.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
|
||||
background-image: url(images/marker-icon.png);
|
||||
}
|
||||
|
||||
|
||||
/* attribution and scale controls */
|
||||
|
||||
.leaflet-container .leaflet-control-attribution {
|
||||
background: #fff;
|
||||
background: rgba(255, 255, 255, 0.8);
|
||||
margin: 0;
|
||||
}
|
||||
.leaflet-control-attribution,
|
||||
.leaflet-control-scale-line {
|
||||
padding: 0 5px;
|
||||
color: #333;
|
||||
line-height: 1.4;
|
||||
}
|
||||
.leaflet-control-attribution a {
|
||||
text-decoration: none;
|
||||
}
|
||||
.leaflet-control-attribution a:hover,
|
||||
.leaflet-control-attribution a:focus {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.leaflet-attribution-flag {
|
||||
display: inline !important;
|
||||
vertical-align: baseline !important;
|
||||
width: 1em;
|
||||
height: 0.6669em;
|
||||
}
|
||||
.leaflet-left .leaflet-control-scale {
|
||||
margin-left: 5px;
|
||||
}
|
||||
.leaflet-bottom .leaflet-control-scale {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.leaflet-control-scale-line {
|
||||
border: 2px solid #777;
|
||||
border-top: none;
|
||||
line-height: 1.1;
|
||||
padding: 2px 5px 1px;
|
||||
white-space: nowrap;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
background: rgba(255, 255, 255, 0.8);
|
||||
text-shadow: 1px 1px #fff;
|
||||
}
|
||||
.leaflet-control-scale-line:not(:first-child) {
|
||||
border-top: 2px solid #777;
|
||||
border-bottom: none;
|
||||
margin-top: -2px;
|
||||
}
|
||||
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
|
||||
border-bottom: 2px solid #777;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-control-attribution,
|
||||
.leaflet-touch .leaflet-control-layers,
|
||||
.leaflet-touch .leaflet-bar {
|
||||
box-shadow: none;
|
||||
}
|
||||
.leaflet-touch .leaflet-control-layers,
|
||||
.leaflet-touch .leaflet-bar {
|
||||
border: 2px solid rgba(0,0,0,0.2);
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
|
||||
/* popup */
|
||||
|
||||
.leaflet-popup {
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.leaflet-popup-content-wrapper {
|
||||
padding: 1px;
|
||||
text-align: left;
|
||||
border-radius: 12px;
|
||||
}
|
||||
.leaflet-popup-content {
|
||||
margin: 13px 24px 13px 20px;
|
||||
line-height: 1.3;
|
||||
font-size: 13px;
|
||||
font-size: 1.08333em;
|
||||
min-height: 1px;
|
||||
}
|
||||
.leaflet-popup-content p {
|
||||
margin: 17px 0;
|
||||
margin: 1.3em 0;
|
||||
}
|
||||
.leaflet-popup-tip-container {
|
||||
width: 40px;
|
||||
height: 20px;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
margin-top: -1px;
|
||||
margin-left: -20px;
|
||||
overflow: hidden;
|
||||
pointer-events: none;
|
||||
}
|
||||
.leaflet-popup-tip {
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
padding: 1px;
|
||||
|
||||
margin: -10px auto 0;
|
||||
pointer-events: auto;
|
||||
|
||||
-webkit-transform: rotate(45deg);
|
||||
-moz-transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg);
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
.leaflet-popup-content-wrapper,
|
||||
.leaflet-popup-tip {
|
||||
background: white;
|
||||
color: #333;
|
||||
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
|
||||
}
|
||||
.leaflet-container a.leaflet-popup-close-button {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
border: none;
|
||||
text-align: center;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
font: 16px/24px Tahoma, Verdana, sans-serif;
|
||||
color: #757575;
|
||||
text-decoration: none;
|
||||
background: transparent;
|
||||
}
|
||||
.leaflet-container a.leaflet-popup-close-button:hover,
|
||||
.leaflet-container a.leaflet-popup-close-button:focus {
|
||||
color: #585858;
|
||||
}
|
||||
.leaflet-popup-scrolled {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.leaflet-oldie .leaflet-popup-content-wrapper {
|
||||
-ms-zoom: 1;
|
||||
}
|
||||
.leaflet-oldie .leaflet-popup-tip {
|
||||
width: 24px;
|
||||
margin: 0 auto;
|
||||
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
|
||||
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
|
||||
}
|
||||
|
||||
.leaflet-oldie .leaflet-control-zoom,
|
||||
.leaflet-oldie .leaflet-control-layers,
|
||||
.leaflet-oldie .leaflet-popup-content-wrapper,
|
||||
.leaflet-oldie .leaflet-popup-tip {
|
||||
border: 1px solid #999;
|
||||
}
|
||||
|
||||
|
||||
/* div icon */
|
||||
|
||||
.leaflet-div-icon {
|
||||
background: #fff;
|
||||
border: 1px solid #666;
|
||||
}
|
||||
|
||||
|
||||
/* Tooltip */
|
||||
/* Base styles for the element that has a tooltip */
|
||||
.leaflet-tooltip {
|
||||
position: absolute;
|
||||
padding: 6px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #fff;
|
||||
border-radius: 3px;
|
||||
color: #222;
|
||||
white-space: nowrap;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
pointer-events: none;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
|
||||
}
|
||||
.leaflet-tooltip.leaflet-interactive {
|
||||
cursor: pointer;
|
||||
pointer-events: auto;
|
||||
}
|
||||
.leaflet-tooltip-top:before,
|
||||
.leaflet-tooltip-bottom:before,
|
||||
.leaflet-tooltip-left:before,
|
||||
.leaflet-tooltip-right:before {
|
||||
position: absolute;
|
||||
pointer-events: none;
|
||||
border: 6px solid transparent;
|
||||
background: transparent;
|
||||
content: "";
|
||||
}
|
||||
|
||||
/* Directions */
|
||||
|
||||
.leaflet-tooltip-bottom {
|
||||
margin-top: 6px;
|
||||
}
|
||||
.leaflet-tooltip-top {
|
||||
margin-top: -6px;
|
||||
}
|
||||
.leaflet-tooltip-bottom:before,
|
||||
.leaflet-tooltip-top:before {
|
||||
left: 50%;
|
||||
margin-left: -6px;
|
||||
}
|
||||
.leaflet-tooltip-top:before {
|
||||
bottom: 0;
|
||||
margin-bottom: -12px;
|
||||
border-top-color: #fff;
|
||||
}
|
||||
.leaflet-tooltip-bottom:before {
|
||||
top: 0;
|
||||
margin-top: -12px;
|
||||
margin-left: -6px;
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
.leaflet-tooltip-left {
|
||||
margin-left: -6px;
|
||||
}
|
||||
.leaflet-tooltip-right {
|
||||
margin-left: 6px;
|
||||
}
|
||||
.leaflet-tooltip-left:before,
|
||||
.leaflet-tooltip-right:before {
|
||||
top: 50%;
|
||||
margin-top: -6px;
|
||||
}
|
||||
.leaflet-tooltip-left:before {
|
||||
right: 0;
|
||||
margin-right: -12px;
|
||||
border-left-color: #fff;
|
||||
}
|
||||
.leaflet-tooltip-right:before {
|
||||
left: 0;
|
||||
margin-left: -12px;
|
||||
border-right-color: #fff;
|
||||
}
|
||||
|
||||
/* Printing */
|
||||
|
||||
@media print {
|
||||
/* Prevent printers from removing background-images of controls. */
|
||||
.leaflet-control {
|
||||
-webkit-print-color-adjust: exact;
|
||||
print-color-adjust: exact;
|
||||
}
|
||||
}
|
||||
6
html/leaflet/leaflet.js
Normal file
6
html/leaflet/leaflet.js
Normal file
File diff suppressed because one or more lines are too long
1
html/leaflet/leaflet.js.map
Normal file
1
html/leaflet/leaflet.js.map
Normal file
File diff suppressed because one or more lines are too long
3
html/style.css
Normal file
3
html/style.css
Normal file
@ -0,0 +1,3 @@
|
||||
.leaflet-popup-content {
|
||||
/*font-size: 13pt;*/
|
||||
}
|
||||
12
html/ws.js
Normal file
12
html/ws.js
Normal file
@ -0,0 +1,12 @@
|
||||
// Create WebSocket connection.
|
||||
const socket = new WebSocket("wss://geo.paulbsd.com/ws");
|
||||
|
||||
// Connection opened
|
||||
socket.addEventListener("open", (event) => {
|
||||
socket.send("Hello Server!");
|
||||
});
|
||||
|
||||
// Listen for messages
|
||||
socket.addEventListener("message", (event) => {
|
||||
console.log("Message from server ", event.data);
|
||||
});
|
||||
65
html/ws.lua
Normal file
65
html/ws.lua
Normal file
@ -0,0 +1,65 @@
|
||||
#!/usr/bin/lua
|
||||
|
||||
local json = require("json")
|
||||
local server = require("nginx.websocket.server")
|
||||
local sqlite = require("lsqlite3")
|
||||
|
||||
local basepath = "/home/paul/git/micodus_server"
|
||||
local dbfile = string.format("%s/data/tracker.db",basepath)
|
||||
local query = [[
|
||||
SELECT time,latitude,longitude,height,speed,direction,serial
|
||||
FROM log
|
||||
ORDER BY time DESC
|
||||
LIMIT 1;
|
||||
]]
|
||||
|
||||
--ngx.shared.geo:set("last_time","")
|
||||
|
||||
function getdata()
|
||||
local db = sqlite.open(dbfile,sqlite3.OPEN_READONLY)
|
||||
local res, vm = db:nrows(query)
|
||||
local data
|
||||
for row in res, vm do
|
||||
data = {
|
||||
["time"]=row.time,
|
||||
["latitude"]=row.latitude,
|
||||
["longitude"]=row.longitude,
|
||||
["height"]=row.height,
|
||||
["speed"]=row.speed,
|
||||
["direction"]=row.direction,
|
||||
["serial"]=row.serial,
|
||||
}
|
||||
end
|
||||
db:close()
|
||||
return data
|
||||
end
|
||||
|
||||
function geows()
|
||||
local locstr = nil
|
||||
local wb, err = server:new {
|
||||
timeout = 5000,
|
||||
max_payload_len = 65535
|
||||
}
|
||||
if not wb then
|
||||
ngx.log(ngx.ERR, "failed to new websocket: ", err)
|
||||
return ngx.exit(444)
|
||||
end
|
||||
local last_time = nil
|
||||
|
||||
while true do
|
||||
local data = getdata()
|
||||
if data.time ~= last_time then
|
||||
local locstr = json.encode(data)
|
||||
local bytes, err = wb:send_text(locstr)
|
||||
if not bytes then
|
||||
ngx.log(ngx.ERR, "failed to send text: ", err)
|
||||
return ngx.exit(444)
|
||||
end
|
||||
last_time = data.time
|
||||
end
|
||||
ngx.sleep(1)
|
||||
end
|
||||
wb:send_close()
|
||||
end
|
||||
|
||||
geows()
|
||||
66
src/db.rs
66
src/db.rs
@ -1,4 +1,4 @@
|
||||
use rusqlite::*;
|
||||
use rusqlite::{types::*, *};
|
||||
|
||||
const DBPATH: &'static str = "data/tracker.db";
|
||||
const STATEMENTS: [&str; 2] = [
|
||||
@ -49,7 +49,7 @@ pub fn initdb(conn: &Connection) -> Result<()> {
|
||||
|
||||
fn create_tables(conn: &Connection) -> Result<()> {
|
||||
for s in STATEMENTS {
|
||||
match conn.execute(s, params![]) {
|
||||
match conn.execute(s, ()) {
|
||||
Ok(_) => {}
|
||||
Err(err) => println!("update failed: {}", err),
|
||||
}
|
||||
@ -62,22 +62,54 @@ fn set_pragmas(conn: &Connection) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn insert(
|
||||
conn: &Connection,
|
||||
serial: &u16,
|
||||
time: &String,
|
||||
latitude: &f64,
|
||||
longitude: &f64,
|
||||
speed: &u16,
|
||||
height: &u16,
|
||||
direction: &u16,
|
||||
) -> Result<()> {
|
||||
match conn.execute(
|
||||
QUERY_INSERT,
|
||||
params![time, serial, latitude, longitude, speed, height, direction],
|
||||
) {
|
||||
Ok(inserted) => println!("{} rows were inserted", inserted),
|
||||
pub fn prepare_insert(conn: &Connection) -> Statement {
|
||||
conn.prepare(QUERY_INSERT).unwrap()
|
||||
}
|
||||
|
||||
pub fn insert(conn: &Connection, dblog: &DbLog) -> Result<()> {
|
||||
let mut stmt = prepare_insert(&conn);
|
||||
match stmt.execute(params![
|
||||
dblog.serial,
|
||||
dblog.time,
|
||||
dblog.latitude,
|
||||
dblog.longitude,
|
||||
dblog.speed,
|
||||
dblog.height,
|
||||
dblog.direction,
|
||||
]) {
|
||||
Ok(i) => println!("{} rows were inserted", i),
|
||||
Err(err) => println!("insert failed: {}", err),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
struct DbLog {
|
||||
serial: u16,
|
||||
time: String,
|
||||
latitude: f64,
|
||||
longitude: f64,
|
||||
speed: u16,
|
||||
height: u16,
|
||||
direction: u16,
|
||||
}
|
||||
|
||||
impl ToSql for DbLog {
|
||||
fn to_sql(&self) -> Result<ToSqlOutput<'_>> {
|
||||
Ok(self.time.to_sql().unwrap())
|
||||
}
|
||||
}
|
||||
|
||||
impl DbLog {
|
||||
fn to_params(&self) -> &[&dyn ToSql; 7] {
|
||||
let res = params![
|
||||
self.time,
|
||||
self.serial,
|
||||
self.latitude,
|
||||
self.longitude,
|
||||
self.speed,
|
||||
self.height,
|
||||
self.direction
|
||||
];
|
||||
res
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,7 +43,8 @@ async fn apiserver() -> io::Result<()> {
|
||||
tokio::spawn(async move {
|
||||
let mut buf = vec![0; BUFSIZE];
|
||||
loop {
|
||||
let mut terminal_id = 0;
|
||||
#[allow(unused_variables)]
|
||||
let terminal_id = 0;
|
||||
match socket.readable().await {
|
||||
Ok(_) => {
|
||||
match socket.try_read(&mut buf) {
|
||||
@ -76,9 +77,7 @@ async fn apiserver() -> io::Result<()> {
|
||||
}
|
||||
}
|
||||
match socket.writable().await {
|
||||
Ok(_) => {
|
||||
let msg = Message::default();
|
||||
}
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
println!("error socket writable: {e}")
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#![allow(unused_variables)]
|
||||
use bcd_convert::BcdNumber;
|
||||
use bitvec::prelude::*;
|
||||
use chrono::prelude::*;
|
||||
@ -363,7 +364,7 @@ pub struct LocationInformationReport {
|
||||
|
||||
impl LocationInformationReport {
|
||||
pub const ID: u16 = 0x0200;
|
||||
pub const TABLE: &'static str = "LocationInformationReport";
|
||||
//pub const TABLE: &'static str = "LocationInformationReport";
|
||||
|
||||
pub fn generate_reply(&self, answer_id: u16, serial: u16) -> PlatformUniversalResponse {
|
||||
let mut res = PlatformUniversalResponse::default();
|
||||
@ -375,6 +376,7 @@ impl LocationInformationReport {
|
||||
|
||||
fn parse_time(&mut self, timeslice: [u8; 6]) {
|
||||
let code = BcdNumber::try_from(×lice as &[u8]).unwrap();
|
||||
println!("{}", code);
|
||||
let time = format!("{}", code.to_u64().unwrap());
|
||||
match NaiveDateTime::parse_from_str(time.as_str(), "%y%m%d%H%M%S") {
|
||||
Ok(o) => {
|
||||
@ -469,7 +471,6 @@ impl BodyMessage for LocationInformationReport {
|
||||
tmptime[i] = *bd.next().unwrap();
|
||||
}
|
||||
self.parse_time(tmptime);
|
||||
res = true;
|
||||
()
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#![allow(unused_variables)]
|
||||
pub struct MessageError;
|
||||
|
||||
impl std::fmt::Debug for MessageError {
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#![allow(unused_variables)]
|
||||
use bcd_convert::BcdNumber;
|
||||
use rand::prelude::*;
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#![allow(unused_variables)]
|
||||
mod body;
|
||||
mod error;
|
||||
mod header;
|
||||
@ -110,7 +111,6 @@ pub struct Message {
|
||||
pub body: Vec<u8>,
|
||||
pub checksum: u8,
|
||||
valid: bool,
|
||||
pub status: bool,
|
||||
}
|
||||
|
||||
impl Message {
|
||||
@ -334,8 +334,6 @@ impl Message {
|
||||
&t.direction,
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
println!("{:?}", t);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user