Update spn main intel for new Hub format

spn/main-intel.yaml

@@ -4,7 +4,128 @@ BootstrapHubs:
 - tcp://[2a01:4f9:2a:d48::2]:17#Zwkwujs345P4ZygNZcEafawTqfZieCBVogQZ3xZPWiu7BU # heleus [FI]
 - tcp://138.201.140.70:17#Zwtb8EKMatnMRkW1VaLh8CPV3QswD9iuRU4Sda8uLezUkC # fogos [DE]
 - tcp://95.216.13.61:17#Zwkwujs345P4ZygNZcEafawTqfZieCBVogQZ3xZPWiu7BU # heleus [FI]
-TrustedHubs:
+Hubs:
+  ZwhpYS1jWzXvPYKFhJqh1ZD3bKquLLoSoJ6RjeshmcXoFx: # voria [US]
+    Trusted: true
+    VerifiedOwner: Safing
+    Override:
+      CountryCode: US
+      Coordinates: # Ashburn, VA
+        Latitude: 39.04
+        Longitude: -77.48
+        AccuracyRadius: 20
+  ZwkAKBoyEd3PkE5RGDNmghahzHiBiTZA7Mg3XH7X3HjS39: # noru [US]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwkapJz5HFWpgd9PHsZLVueBu9PDmTJHKp382Wm9MB2EB7: # lovas [US]
+    Trusted: true
+    VerifiedOwner: Safing
+    Override:
+      CountryCode: US
+      Coordinates: # Los Angeles, CA
+        Latitude: 34.03
+        Longitude: -118.15
+        AccuracyRadius: 20
+  ZwkLShvVYvQFGmpY1MNhSSPXCktojywMVtv2N86mFbNH4w: # tooina [CA]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwkwujs345P4ZygNZcEafawTqfZieCBVogQZ3xZPWiu7BU: # heleus [FI]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwm72XieV6aeNKbwtJW8JdPUwT1hopQaLanLXjxcTfV3B9: # mergan [US]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwmp5SgUK9FidWBSCDK4d6dyRp3vhz3dQdwma1E4TMfiRw: # grenenia [FR]
+    Trusted: true
+    VerifiedOwner: Safing
+    Override:
+      CountryCode: FR
+      Coordinates: # Gravelines
+        Latitude: 50.59
+        Longitude: 2.07
+        AccuracyRadius: 20
+  ZwnFd1bSQrBegPZqFkS7DZU29x4PbojpFmTQFUnzQoicKp: # telos [IL]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwpg5FoXYVYidzgbdvDyvBBcrArmmHvK9nH3v7KDHiywtt: # melcor [PL]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwpsJpwngWyba54AbVkCawcRQ2HP37RRQAgj5LHNR2svRf: # soalis [AU]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwpy5hbrQkKznJwbUmn9WpJwGkpWD9VqE2pi9yfMDQM7PK: # rin9 [FR]
+    Trusted: true
+    VerifiedOwner: Safing
+    Trusted: true
+    VerifiedOwner: Safing
+    Override:
+      CountryCode: FR
+      Coordinates: # Strasbourg
+        Latitude: 48.35
+        Longitude: 7.45
+        AccuracyRadius: 20
+  ZwqANMrhcyJZb8cRMEd3FdPcXY7ZbvviPPfTUQpLNau12J: # sulkam [GB]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwqDPp57NwZQqYLVTE3xKPUzJZjdwVYnig8a9YnaRPCQGC: # surn [US]
+    Trusted: true
+    VerifiedOwner: Safing
+    Override:
+      CountryCode: US
+      Coordinates: # Seattle, WA
+        Latitude: 47.36
+        Longitude: -122.19
+        AccuracyRadius: 20
+  ZwsvsES3SHz1VLnwFPxDbW6DC8Esp1PiEtUHxGnm4BTYHt: # fungvis [DE]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwtb8EKMatnMRkW1VaLh8CPV3QswD9iuRU4Sda8uLezUkC: # fogos [DS]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwtfvBuq5wkKYRth8rGCuGyp42nMe4doASUDJiDHJ8iucn: # vamalla [AT]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwtjwvdPxG4u7oB2zmNJFvsDy5VDLT9UArDkYDGfC9bkDt: # carros [US]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwvMZt6RcrrRuCdufjApnosxWbzsP8rTPRuHGeHu5KU241: # syniru [SG]
+    Trusted: true
+    VerifiedOwner: Safing
+    Override:
+      CountryCode: SG
+      Coordinates: # Singapore
+        Latitude: 1.18
+        Longitude: 103.50
+        AccuracyRadius: 20
+  ZwvyDLz8221fcSBw6GKZNDnwEn4YmE9m7JPieLUVe7iGR9: # calla [CA]
+    Trusted: true
+    VerifiedOwner: Safing
+  Zwvz9S6uyxn4ww1JGqJiisGMDmH2hz6mhwutmJXvTtwQww: # cidai [US]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwxJvZDZH18RUEQ3oFcR5uCqeXJaqkoi9P5Sj1aZ62HPin: # nutis [DE]
+    Trusted: true
+    VerifiedOwner: Safing
+  ZwjdCfo2efukhayuRkDLGFZWECSSuAaq85A85YKHZnFDu7: # sane
+    Discontinued: true
+  ZwnVWRdEqhwt8jAGTPzj5gVtdkRnZzHt5uKAjvm9BDUxXd: # bacri
+    Discontinued: true
+  ZwpKzLDESbzYszvGdKVaDA8Pp4NkRa4VGNchDEdNYaH7WD: # domgra
+    Discontinued: true
+  ZwqcLRbp8Ek8n9qa3GeVUf7Voarzyjd7VKtsb42TjEUgmq: # crait
+    Discontinued: true
+  ZwqVRUxTriN6LZ1cDaRBGSMZKrEJ2HF1TERRQ91h1QMRyY: # krothi
+    Discontinued: true
+  ZwrNGbpviRdm4ZKLrYWuC2j97CtH3aSt9zefy5Xq9rUsqD: # eadu
+    Discontinued: true
+  ZwtVCqAxPzDaW8P8gGp9wKnGREV4WKKumnBYjGDAhXpyy2: # hela
+    Discontinued: true
+  ZwubcqhMUyBgv2gKcvUfsfFMDcjejDQF5762Ju5ofPxKJN: # cantonica
+    Discontinued: true
+  ZwvLgTnCrut3eEMzyymRQdp8XEQuBZyqbFe2zurvNmGxk2: # muune
+    Discontinued: true
+  ZwvTyGpjEELMCWMgyt8GELiBGP4vRyZ56mKy3XMmLGfYCo: # ronbar
+TrustedHubs: # Deprecated.
 - ZwhpYS1jWzXvPYKFhJqh1ZD3bKquLLoSoJ6RjeshmcXoFx # voria [US]
 - ZwkAKBoyEd3PkE5RGDNmghahzHiBiTZA7Mg3XH7X3HjS39 # noru [US]
 - ZwkapJz5HFWpgd9PHsZLVueBu9PDmTJHKp382Wm9MB2EB7 # lovas [US]
@@ -26,7 +147,7 @@ TrustedHubs:
 - ZwvyDLz8221fcSBw6GKZNDnwEn4YmE9m7JPieLUVe7iGR9 # calla [CA]
 - Zwvz9S6uyxn4ww1JGqJiisGMDmH2hz6mhwutmJXvTtwQww # cidai [US]
 - ZwxJvZDZH18RUEQ3oFcR5uCqeXJaqkoi9P5Sj1aZ62HPin # nutis [DE]
-DiscontinuedHubs:
+DiscontinuedHubs: # Deprecated.
 - ZwjdCfo2efukhayuRkDLGFZWECSSuAaq85A85YKHZnFDu7 # sane
 - ZwnVWRdEqhwt8jAGTPzj5gVtdkRnZzHt5uKAjvm9BDUxXd # bacri
 - ZwpKzLDESbzYszvGdKVaDA8Pp4NkRa4VGNchDEdNYaH7WD # domgra
@@ -40,7 +161,7 @@ DiscontinuedHubs:
 AdviseOnlyTrustedHubs: false
 AdviseOnlyTrustedHomeHubs: true
 AdviseOnlyTrustedDestinationHubs: true
-InfoOverrides:
+InfoOverrides: # Deprecated.
   ZwhpYS1jWzXvPYKFhJqh1ZD3bKquLLoSoJ6RjeshmcXoFx: # voria
     CountryCode: US
     Coordinates: # Ashburn, VA
@@ -156,3 +277,4 @@ Regions:
   - "+ PM"
   - "+ SV"
   - "+ US"
+