This commit is contained in:
dskvr
2022-12-07 17:39:21 +01:00
parent 20e31671d1
commit 8d532b94d2
3 changed files with 83 additions and 17 deletions

4
.gitignore vendored
View File

@@ -3,4 +3,6 @@ node_modules
*.wasm
public/main.js
lib/nostr-relay-inspector
geo.yaml #generated by prebuild
geo.yaml
geo.yml
dist

View File

@@ -1,39 +1,92 @@
<template>
<l-map ref="map" v-model:zoom="zoom" :center="[47.41322, -1.219482]">
<l-map ref="map" v-model:zoom="zoom" :center="[47.41322, -1.219482]" style="height:50vh">
<l-tile-layer
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
url="http://{s}.tile.osm.org/{z}/{x}/{y}.png"
layer-type="base"
name="OpenStreetMap"
></l-tile-layer>
/>
<l-marker v-for="([relay, result]) in Object.entries(results)" :lat-lng="result.geo.latlng" draggable>
<!-- <l-marker v-for="([relay, result]) in Object.entries(geo)" :lat-lng="getLatLng(result)" :key="relay">
<l-popup>
{{ result.uri }}
{{ relay }}
</l-popup>
</l-marker>
</l-marker> -->
<l-circle-marker
v-for="([relay, entry]) in Object.entries(geo)"
:lat-lng="getLatLng(entry)"
:key="relay"
:radius="4"
:color="getCircleColor(relay)"
:fillOpacity="1"
>
<l-popup>
{{ relay }}
meopw
</l-popup>
</l-circle-marker>
</l-map>
</template>
<script>
import "leaflet/dist/leaflet.css"
import { LMap, LTileLayer, LMarker } from "@vue-leaflet/vue-leaflet";
import { LMap, LTileLayer, LCircleMarker } from "@vue-leaflet/vue-leaflet";
export default {
components: {
LMap,
LTileLayer,
LMarker,
LPopup,
LCircleMarker,
},
data() {
return {
markers: {
methods: {
getLatLng(geo){
console.log('meow', [geo.lat, geo.lon])
return [geo.lat, geo.lon]
},
getCircleColor(relay){
if(this.result[relay]?.aggregate == 'public') {
console.log('woof', relay, this.result[relay]?.aggregate)
return '#00AA00'
}
else if(this.result[relay]?.aggregate == 'restricted') {
console.log('woof', relay, this.result[relay]?.aggregate)
return '#FFA500'
}
else if(this.result[relay]?.aggregate == 'offline') {
console.log('woof', relay, this.result[relay]?.aggregate)
return '#FF0000'
}
return '#A0A0A0'
}
},
async mounted() {
console.log('GEO', Object.entries(this.geo))
},
props: {
geo: {
type: Object,
default(){
return {}
}
},
result: {
type: Object,
default(){
return {}
}
},
},
data() {
return {
zoom: 2
};
},
};
</script>
<style></style>
<style scoped>
.leaflet-container {
height:250px !important;
}
</style>

View File

@@ -8,6 +8,15 @@
</column>
</row>
<row container :gutter="12">
<column :xs="12" :md="12" :lg="12">
<LeafletComponent
:geo="geo"
:result="result"
/>
</column>
</row>
<row container :gutter="12">
<column :xs="12" :md="12" :lg="12">
<div class="block">
@@ -72,6 +81,7 @@
<script>
import { defineComponent} from 'vue'
import RelayListComponent from './RelayListComponent.vue'
import LeafletComponent from './LeafletComponent.vue'
// import NavComponent from './NavComponent.vue'
import { Row, Column } from 'vue-grid-responsive';
@@ -94,6 +104,7 @@ export default defineComponent({
Row,
Column,
RelayListComponent,
LeafletComponent
// NavComponent
},