From 8d532b94d29453ee340bab09cf48397b2a9c162f Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Wed, 7 Dec 2022 17:39:21 +0100
Subject: [PATCH] add map

---
 .gitignore                             |  4 +-
 src/components/LeafletComponent.vue    | 85 +++++++++++++++++++++-----
 src/components/RelayTableComponent.vue | 11 ++++
 3 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6923136..75b4e6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@ node_modules
 *.wasm
 public/main.js
 lib/nostr-relay-inspector
-geo.yaml #generated by prebuild
+geo.yaml
+geo.yml
+dist
diff --git a/src/components/LeafletComponent.vue b/src/components/LeafletComponent.vue
index bb21b86..16b3c3d 100644
--- a/src/components/LeafletComponent.vue
+++ b/src/components/LeafletComponent.vue
@@ -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,
+  },
+  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 {
-      markers: {
-        type: Object,
-        default(){
-          return {}
-        }
-      }
+      zoom: 2
+
+
     };
   },
 };
 </script>
 
-<style></style>
+<style scoped>
+.leaflet-container {
+  height:250px !important;
+}
+</style>
diff --git a/src/components/RelayTableComponent.vue b/src/components/RelayTableComponent.vue
index 832aaa9..2ce0563 100644
--- a/src/components/RelayTableComponent.vue
+++ b/src/components/RelayTableComponent.vue
@@ -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
   },