Rework mkgeo to use bandwidth constraints

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 25c90d3fd76c918253ed6873f193da839db29a27..b71d1f60b3c0798ff2cdae22a1bd41575212b430 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -5,14 +5,6 @@ london:
   pingdom: 546503
   bandwidth: 100
   default: true
   pingdom: 546503
   bandwidth: 100
   default: true

-  preferred:
-    continents:
-      - EU
-      - NA
-      - OC
-      - AF
-    countries:
-      - GB

 
 # Sjöbo, SE
 sjobo:
 
 # Sjöbo, SE
 sjobo:


@@ -20,23 +12,6 @@ sjobo:
   lon: 13.70273
   pingdom: 546505
   bandwidth: 80
   lon: 13.70273
   pingdom: 546505
   bandwidth: 80

-  allowed:
-    continents:
-      - EU
-      - AS
-  preferred:
-    countries:
-      - DK
-      - FI
-      - AX
-      - SJ
-      - SE
-      - GL
-      - FO
-      - PL
-      - DE
-      - CH
-      - LI

 
 # Moscow, RU
 moscow:
 
 # Moscow, RU
 moscow:


@@ -44,26 +19,9 @@ moscow:
   lon: 37.617
   pingdom: 659912
   bandwidth: 60
   lon: 37.617
   pingdom: 659912
   bandwidth: 60

-  allowed:
-    countries:
-      - RU
-      - UA
-      - BY
-      - MD
-      - KZ
-      - AM
-      - AZ
-      - GE

   preferred:
     countries:
       - RU
   preferred:
     countries:
       - RU

-      - UA
-      - BY
-      - MD
-      - KZ
-      - AM
-      - AZ
-      - GE

 
 # Brisbane, AU
 brisbane:
 
 # Brisbane, AU
 brisbane:


@@ -74,15 +32,6 @@ brisbane:
   allowed:
     continents:
       - OC
   allowed:
     continents:
       - OC

-    countries:
-      - AU
-      - NZ
-  preferred:
-    continents:
-      - OC
-    countries:
-      - AU
-      - NZ

 
 # Pau, FR
 pau:
 
 # Pau, FR
 pau:


@@ -93,18 +42,6 @@ pau:
   allowed:
     continents:
       - EU
   allowed:
     continents:
       - EU

-    countries:
-  preferred:
-    countries:
-      - FR
-      - ES
-      - PT
-      - AD
-      - GI
-      - IT
-      - MC
-      - SM
-      - VA

 
 # Amsterdam, NL
 amsterdam:
 
 # Amsterdam, NL
 amsterdam:


@@ -112,31 +49,13 @@ amsterdam:
   lon: 4.89222
   pingdom: 766251
   bandwidth: 30
   lon: 4.89222
   pingdom: 766251
   bandwidth: 30

-  allowed:
-    continents:
-      - EU
-    countries:
-      - IS
-  preferred:
-    countries:
-      - NL
-      - BE
-      - LU
-      - IS
-      - EE
-      - LV
-      - LT
-      - CZ

 
 # Oslo, NO
 oslo:
   lat: 59.94944
   lon: 10.75639
   pingdom: 769267
 
 # Oslo, NO
 oslo:
   lat: 59.94944
   lon: 10.75639
   pingdom: 769267

+  bandwidth: 20

   allowed:
     continents:
       - EU
   allowed:
     continents:
       - EU

-    countries:
-  preferred:
-    countries:
-      - NO