diff --git a/tileManager.py b/tileManager.py index 78f65f6..78cc293 100644 --- a/tileManager.py +++ b/tileManager.py @@ -33,7 +33,7 @@ class TileManager: async with session.get(url, ssl=False, headers=self.generateHeaders()) as resp: # Read the entire response body as bytes img = await resp.read() - logger.info(url, resp.status) + #logger.info(url, resp.status) if resp.status == 200: query['ts'] = time() query['img'] = img @@ -41,4 +41,4 @@ class TileManager: await collection.insert_one(query) return img else: - raise Exception("cannot get img") \ No newline at end of file + raise Exception("cannot get img, code: " + str(resp.status)) \ No newline at end of file diff --git a/ui/src/app/components/nodes/nodes-map.component.ts b/ui/src/app/components/nodes/nodes-map.component.ts index c4dffeb..6115605 100644 --- a/ui/src/app/components/nodes/nodes-map.component.ts +++ b/ui/src/app/components/nodes/nodes-map.component.ts @@ -3,6 +3,7 @@ import * as L from 'leaflet'; import {HttpClient} from "@angular/common/http"; import {NodeDTO} from "../../entities/NodeDTO"; import {Subscription} from "rxjs"; +import {DatePipe} from "@angular/common"; @Component({ selector: "app-nodes-map", @@ -19,9 +20,14 @@ import {Subscription} from "rxjs"; }) export class NodesMapComponent implements OnInit { map!: L.Map; + logo: any = new L.Icon({ + iconUrl: '../../../assets/meshtastic-logo.svg', + iconSize: [32, 32] + }) nodes: NodeDTO[] = [] - constructor(private http: HttpClient) { + constructor(private http: HttpClient, + private datepipe: DatePipe) { } ngOnInit(): void { @@ -36,7 +42,7 @@ export class NodesMapComponent implements OnInit { () => { this.nodes.filter((node) => node.havePosition).forEach( (node) => { - L.marker(this.convertPosition(node)).addTo(this.map) + L.marker(this.convertPosition(node), {icon: this.logo}).bindPopup(`${node.long_name} (${node.short_name})
snr: ${node.snr} hops: ${node.hops_away}
Изменена: ${this.datepipe.transform(node.position.time*1000, 'HH:mm dd.MM.yyyy')}
`).addTo(this.map) } ) } diff --git a/ui/src/assets/meshtastic-logo.svg b/ui/src/assets/meshtastic-logo.svg new file mode 100644 index 0000000..26607b8 --- /dev/null +++ b/ui/src/assets/meshtastic-logo.svg @@ -0,0 +1,15 @@ + + diff --git a/webExtensions/publicEndpoints.py b/webExtensions/publicEndpoints.py index 52fb301..7f7ddd8 100644 --- a/webExtensions/publicEndpoints.py +++ b/webExtensions/publicEndpoints.py @@ -67,8 +67,6 @@ class WebExtension: async def grabTile(request:Request, z:int, x:int, y:int): try: img = await self.core.tileManager.grabTile(z, x, y) - print(type(img)) - #return StreamingResponse(img, media_type="image/png") return Response(content=img, media_type="image/png") except: traceback.print_exc()