Add jq and less to docker

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index fcf2319b9367617479bb7d06ecbdede54754cd3e..94daf1ce2ac993736e85d634ffc6626c8af7293a 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -6,7 +6,7 @@ moscow:
   statuscake:
     - 2217257
     - 2217258
-  colour: "#412c84"
+  colour: "#8dd3c7"
   bandwidth: 200
   ipv4: 5.45.248.21
   ipv6: 2a0206b8b0105065000000000000a001
@@ -37,7 +37,7 @@ amsterdam:
   statuscake:
     - 2217259
     - 2217260
-  colour: "#a1b92e"
+  colour: "#bebada"
   bandwidth: 100
   ipv4: 134.90.146.26
 
@@ -49,8 +49,8 @@ oslo:
   statuscake:
     - 2217261
     - 2217262
-  colour: "#7c1f7c"
-  bandwidth: 50
+  colour: "#ffffb3"
+  bandwidth: 30
   ipv4: 31.169.50.10
   default: "xx"
 
@@ -62,7 +62,7 @@ sanfrancisco:
   statuscake:
     - 2217263
     - 2217264
-  colour: "#25567b"
+  colour: "#e31a1c"
   bandwidth: 60
   ipv4: 71.19.155.177
   ipv6: 2605270000000017a80000fffe3ecdca
@@ -78,7 +78,7 @@ sanfrancisco:
 france:
   lat: 46.603354
   lon: 1.8883335
-  colour: "#bf6530"
+  colour: "#fccde5"
   servers:
     - statuscake:
         - 2217265
@@ -104,6 +104,11 @@ france:
       bandwidth: 100
       ipv4: 80.67.167.77
       ipv6: 2a0bcbc0110d0001000000000000001c
+    - statuscake:
+        - 3794330
+        - 3794331
+      bandwidth: 100
+      ipv4: 185.216.27.232
   preferred:
     countries:
       - FR
@@ -118,7 +123,7 @@ france:
 germany:
   lat: 51.0834196
   lon: 10.4234469
-  colour: "#562781"
+  colour: "#b2df8a"
   servers:
     - statuscake:
         - 2217269
@@ -145,15 +150,15 @@ germany:
       ipv4: 195.201.226.63
       ipv6: 2a0104f81c1cbc540000000000000001
   allowed:
-    continents:
-      - EU
+    countries:
+      - DE
 
 # Baku, AZ
 # BW Limit: 1000Mb/s
 baku:
   lat: 40.395278
   lon: 49.882222
-  colour: "#bfb830"
+  colour: "#1f78b4"
   statuscake:
     - 2217267
     - 2217268
@@ -178,7 +183,7 @@ baku:
 hsinchu:
   lat: 24.78268
   lon: 120.99563
-  colour: "#bf3030"
+  colour: "#33a02c"
   statuscake:
     - 2217277
     - 2217278
@@ -192,9 +197,6 @@ hsinchu:
     countries:
       - TW
       - JP
-  denied:
-    countries:
-      - ID
 
 # Pula, HR
 pula:
@@ -203,8 +205,8 @@ pula:
   statuscake:
     - 2217279
     - 2217280
-  colour: "#bf9430"
-  bandwidth: 80
+  colour: "#a6cee3"
+  bandwidth: 120
   ipv4: 193.198.233.211
   ipv6: 20010b684cff00030000000000000003
   default: "xx"
@@ -216,7 +218,7 @@ osijek:
   statuscake:
     - 2217281
     - 2217282
-  colour: "#269926"
+  colour: "#fb8072"
   bandwidth: 120
   ipv4: 161.53.30.107
   ipv6: 20010b68c0ff000002215efffe40c7c4
@@ -230,10 +232,15 @@ london:
   statuscake:
    - 2214077
    - 2217246
-  colour: "#7ab02c"
+  colour: "#ffed6f"
   bandwidth: 200
   ipv4: 185.73.44.30
   ipv6: 20010ba800002c1e0000000000000000
+  preferred:
+    countries:
+      - GB
+      - IE
+      - IM
 
 # Corvallis, US
 corvallis:
@@ -242,7 +249,7 @@ corvallis:
   statuscake:
     - 2217287
     - 2217288
-  colour: "#a1285f"
+  colour: "#6a3d9a"
   bandwidth: 200
   ipv4: 140.211.167.105
   ipv6: 2605bc8030100700000000008cdea769
@@ -257,7 +264,7 @@ budapest:
   statuscake:
     - 2217283
     - 2217284
-  colour: "#2c3d82"
+  colour: "#fdbf6f"
   bandwidth: 80
   ipv4: 37.17.173.8
   ipv6: 20014c480002bf04025056fffe8f5c81
@@ -269,7 +276,7 @@ minsk:
   statuscake:
     - 2217285
     - 2217286
-  colour: "#bfa730"
+  colour: "#ffed6f"
   bandwidth: 80
   ipv4: 31.130.201.40
   ipv6: 2001067c22681005021e8cfffe8c8d3b
@@ -287,7 +294,7 @@ aalborg:
   statuscake:
     - 2217289
     - 2217290
-  colour: "#bf8230"
+  colour: "#80b1d3"
   bandwidth: 160
   ipv4: 130.225.254.109
   ipv6: 20010878034600000000000000000109
@@ -300,7 +307,7 @@ zaragoza:
   statuscake:
     - 2217291
     - 2217292
-  colour: "#bfa730"
+  colour: "#fdb462"
   bandwidth: 100
   ipv4: 155.210.4.103
 
@@ -311,7 +318,7 @@ athens:
   statuscake:
     - 2244901
     - 2244902
-  colour: "#bfa730"
+  colour: "#b3de69"
   bandwidth: 80
   ipv4: 83.212.2.116
   ipv6: 200106482ffe00040000000000000116
@@ -323,7 +330,7 @@ montreal:
   statuscake:
     - 3155163
     - 3155162
-  colour: "#bfa730"
+  colour: "#b15928"
   bandwidth: 100
   ipv4: 184.107.48.228
   preferred:
@@ -337,7 +344,7 @@ capetown:
   statuscake:
     - 2217295
     - 2217296
-  colour: "#bfa730"
+  colour: "#cab2d6"
   bandwidth: 10
   ipv4: 196.10.54.165
   ipv6: 200143f801f40b00b283fefffed8dd45
@@ -358,7 +365,7 @@ vinadelmar:
   statuscake:
     - 3499524
     - 3499526
-  colour: "#bfa730"
+  colour: "#ff7f00"
   bandwidth: 80
   ipv4: 200.91.44.37
   allowed:
@@ -373,7 +380,7 @@ zurich:
   statuscake:
     - 3743984
     - 3743985
-  colour: "#bfa730"
+  colour: "#ccebc5"
   bandwidth: 200
   ipv4: 217.71.244.22
   ipv6: 200108e0004020390000000000000010
@@ -384,5 +391,105 @@ zurich:
       - SM
       - VA
 
+# Kiev, UA
+kiev:
+  lat: 50.4020865
+  lon: 30.6146803128848
+  statuscake:
+    - 3890448
+    - 3890447
+  colour: "#fb9a99"
+  bandwidth: 70
+  ipv4: 176.122.99.101
+  ipv6: 2001067c2d4000000000000000000065
+
+# Wellington, NZ
+wellington:
+  lat: -41.288889
+  lon: 174.777222
+  statuscake:
+    - 3911508
+    - 3911509
+  colour: "#ffff99"
+  bandwidth: 80
+  ipv4: 114.23.141.203
+  allowed:
+    continents:
+      - OC
+    countries:
+      - CC
+  preferred:
+    continents:
+      - OC
+    countries:
+      - CC
+
+# Hamilton, NZ
+hamilton:
+  lat: -37.783333
+  lon: 175.283333
+  statuscake:
+    - 3931336
+    - 3931337
+  colour: "#999999"
+  bandwidth: 80
+  ipv4: 103.197.61.160
+  allowed:
+    continents:
+      - OC
+    countries:
+      - CC
+  preferred:
+    continents:
+      - OC
+    countries:
+      - CC
+
+# Linköping/Umeå, SE
+# Linköping @ 58.403261,15.623611189797
+# Umeå @ 63.82177625,20.3043163114932
+sweden:
+  lat: 61.1125186
+  lon: 17.9639637506451
+  colour: "#d9d9d9"
+  servers:
+    - statuscake:
+        - 3932686
+        - 3932688
+      bandwidth: 40
+      ipv4: 130.236.254.221
+      ipv6: 200106b00017f0a000000000000000dd
+    - statuscake:
+        - 3949588
+        - 3949589
+      bandwidth: 40
+      ipv4: 130.239.18.114
+      ipv6: 200106b0000e2a180000000000000114
+
+# Curitiba, BR
+curitiba:
+  lat: -25.41403745
+  lon: -49.252918753851
+  statuscake:
+    - 3945882
+    - 3945883
+  colour: "#d9d9d9"
+  bandwidth: 80
+  ipv4: 200.236.31.207
+  ipv6: 2801008280ff80020216ccfffeaa0021
+  allowed:
+    countries:
+      - BR
+
+# Pilsen, CZ
+pilsen:
+  lat: 49.723689
+  lon: 13.351542
+  statuscake:
+    - 4065539
+    - 4065540
+  colour: "#d9d9d9"
+  bandwidth: 30
+  ipv4: 147.228.60.16
+
 # Spare colours:
-#