limit sh/newc et al to 10 levels
authorDirk Koopman <djk@tobit.co.uk>
Fri, 28 Aug 2009 14:23:27 +0000 (15:23 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Fri, 28 Aug 2009 14:23:27 +0000 (15:23 +0100)
One can change this with a set/var $Route::maxlevel = 10

Changes
data/cty.dat
data/prefix_data.pl
perl/Route.pm
perl/Version.pm

diff --git a/Changes b/Changes
index 8978a6adb6706116d916d6a8f128189a7560cc47..92376c453c5b4211a8ca2c6d6e855a8ef722b760 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+27Aug09=======================================================================
+1. Add CTY-1913 prefixes
+2. Limit Route::config to 10 levels (as default)
 08Jul09=======================================================================
 1. Add CTY-1912 prefixes
 26Jun09=======================================================================
index 78b485066f8fd2ec94474dd60d2f75e93f1b5e99..50a4fcfdb7ebf81d69da18b378a7417cb99f850b 100644 (file)
@@ -17,7 +17,7 @@ Annobon:                  36:  52:  AF:   -1.50:    -5.60:    -1.0:  3C0:
 Fiji:                     32:  56:  OC:  -18.10:  -178.40:   -12.0:  3D2:
     3D2;
 Conway Reef:              32:  56:  OC:  -21.40:  -174.40:   -12.0:  3D2/c:
-    =3D2CI,=3D2CY;
+    =3D20CR,=3D2CI,=3D2CY;
 Rotuma:                   32:  56:  OC:  -12.30:  -177.70:   -12.0:  3D2/r:
     =3D2AG/P;
 Swaziland:                38:  57:  AF:  -26.30:   -31.10:    -2.0:  3DA:
@@ -106,7 +106,7 @@ Sierra Leone:             35:  46:  AF:    8.50:    13.20:     0.0:  9L:
 West Malaysia:            28:  54:  AS:    3.20:  -101.60:    -8.0:  9M2:
     9M1,9M2,9M4,9W2,9W4;
 East Malaysia:            28:  54:  OC:    5.80:  -118.10:    -8.0:  9M6:
-    9M6,9M8,9W6,9W8;
+    9M6,9M8,9W6,9W8,=9M4LHS;
 Nepal:                    22:  42:  AS:   27.70:   -85.30:   -5.75:  9N:
     9N;
 Rep. of Congo:            36:  52:  AF:   -4.30:   -15.30:    -1.0:  9Q:
@@ -267,26 +267,26 @@ Guadeloupe:               08:  11:  NA:   16.00:    61.70:     4.0:  FG:
     FG,=TO1T,=TO2ANT,=TO2FG,=TO2HI,=TO2T,=TO4T,=TO5C,=TO5G,=TO5S,=TO6T,=TO7T,
     =TO8S,=TO9T;
 Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:
-    FH,=TO7RJ;
+    FH,=TO2FH,=TO7RJ;
 St. Barthelemy:           08:  11:  NA:   17.90:    62.90:     4.0:  FJ:
     FJ,=TO8YY;
 New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
     FK,TX8,=TX1A;
 Chesterfield Islands:     30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:
-    =TX0AT,=TX0C,=TX0DX,=TX9;
+    =TX0AT,=TX0C,=TX0DX,=TX3A,=TX9;
 Martinique:               08:  11:  NA:   14.60:    61.00:     4.0:  FM:
     FM,=TO0O,=TO1A,=TO1C,=TO1YR,=TO3M,=TO3T,=TO3W,=TO4A,=TO5A,=TO5J,=TO5T,
     =TO5X,=TO6M,=TO7X,=TO8B,=TO8Z,=TO9A;
 French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:
     FO;
 Austral Islands:          32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:
-    =FO/G3BJ;
+    =FO/G3BJ,=TX5SPA;
 Clipperton Island:        07:  10:  NA:   10.30:   109.20:     8.0:  FO/c:
     =TX5C;
 Marquesas Islands:        31:  63:  OC:   -9.00:   139.50:     9.5:  FO/m:
-    =FO/DJ7RJ;
+    =FO/DJ7RJ,=TX5SPM;
 St. Pierre & Miquelon:    05:  09:  NA:   46.70:    56.00:     3.0:  FP:
-    FP;
+    FP,=TO2FP;
 Reunion:                  39:  53:  AF:  -21.10:   -55.60:    -4.0:  FR:
     FR,=TO3R;
 Glorioso:                 39:  53:  AF:  -11.50:   -47.30:    -4.0:  FR/g:
@@ -312,36 +312,36 @@ England:                  14:  27:  EU:   51.50:     0.10:     0.0:  G:
 Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:
     2D,2T,GD,GT,MD,MT,=GB0AOA,=GB0MST,=GB0WCY,=GB100MER,=GB100TT,=GB125SR,
     =GB2IOM,=GB2MAD,=GB2WB,=GB3GD,=GB4IOM,=GB4MNH,=GB4WXM/P,=GB50UN,=GB5LB,
-    =GB5MOB,=GB6SPC;
+    =GB5MOB,=GB5TD,=GB6SPC;
 Northern Ireland:         14:  27:  EU:   54.60:     5.90:     0.0:  GI:
-    2I,2N,GI,GN,MI,MN,=GB0BTC,=GB0BVC,=GB0CI,=GB0CSC,=GB0DDF,=GB0GPF,=GB0MFD,
-    =GB0PSM,=GB0REL,=GB0SHC,=GB0SIC,=GB0SPD,=GB0TCH,=GB0WOA,=GB1AFP,=GB1BPM,
-    =GB1SPD,=GB1SRI,=GB2IL,=GB2LL,=GB2MAC,=GB2MGY,=GB2MRI,=GB2NIC,=GB2NTU,
-    =GB2STI,=GB2TCA,=GB3MNI,=GB4CSC,=GB4ES,=GB4SPD,=GB50AAD,=GB5BIG,=GB5BL,
-    =GB5SPD,=GB90SOM;
+    2I,2N,GI,GN,MI,MN,=GB0BTC,=GB0BVC,=GB0CI,=GB0CSC,=GB0DDF,=GB0GPF,=GB0MAR,
+    =GB0MFD,=GB0PSM,=GB0REL,=GB0SHC,=GB0SIC,=GB0SPD,=GB0TCH,=GB0WOA,=GB1AFP,
+    =GB1BPM,=GB1SPD,=GB1SRI,=GB2IL,=GB2LL,=GB2MAC,=GB2MGY,=GB2MRI,=GB2NIC,
+    =GB2NTU,=GB2STI,=GB2TCA,=GB3MNI,=GB4CSC,=GB4ES,=GB4SPD,=GB50AAD,=GB5BIG,
+    =GB5BL,=GB5SPD,=GB90SOM;
 Jersey:                   14:  27:  EU:   49.30:     2.20:     0.0:  GJ:
     2H,2J,GH,GJ,MH,MJ,=GB0CLR,=GB0GUD,=GB0JSA,=GB0SHL,=GB2BYL,=GB2JSA,=GB4BHF,
     =GB50JSA,=GB8LMI;
 Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:
-    2A,2M,2S,GM,GS,MM,MS,=GB0AC,=GB0ATC,=GB0BNC,=GB0BWT,=GB0DGL,=GB0FFS,
+    2A,2M,2S,GA,GM,GS,MA,MM,MS,=GB0AC,=GB0ATC,=GB0BNC,=GB0BWT,=GB0DGL,=GB0FFS,
     =GB0FLA,=GB0GDS,=GB0GEI,=GB0GHD,=GB0GKR,=GB0GNE,=GB0HHW,=GB0KGS,=GB0KTC,
-    =GB0LCS,=GB0LTM,=GB0MFG,=GB0MLM,=GB0MOL,=GB0NHL,=GB0OS,=GB0OYT,=GB0PPE,
-    =GB0QWM,=GB0RBS,=GB0SHP,=GB0SI,=GB0SK,=GB0SKY,=GB0SS,=GB0SSF,=GB0TI,
-    =GB100MAS,=GB10SP,=GB125BRC,=GB150NRL,=GB1EPC,=GB1FS,=GB1FVT,=GB1GEO,
-    =GB1OL,=GB250RB,=GB2AGG,=GB2AST,=GB2AYR,=GB2CHG,=GB2DHS,=GB2DTM,=GB2FBM,
-    =GB2FIO,=GB2FSM,=GB2GEO,=GB2GNL,=GB2GTM,=GB2HI,=GB2HLB,=GB2HRH,=GB2HST,
-    =GB2HSW,=GB2IAS,=GB2IGB,=GB2IGS,=GB2IMM,=GB2IOC,=GB2IOG,=GB2IOT,=GB2JUNO,
-    =GB2KDS,=GB2KHL,=GB2LAY,=GB2LBN,=GB2LCL,=GB2LCP,=GB2LGB,=GB2LHI,=GB2LMG,
-    =GB2LNM,=GB2LO,=GB2LP,=GB2LS,=GB2LSS,=GB2LT,=GB2LTH,=GB2LTN,=GB2MAS,
-    =GB2MDG,=GB2MOD,=GB2MOF,=GB2MSL,=GB2MUL,=GB2NAG,=GB2NBC,=GB2NCL,=GB2NEF,
-    =GB2NL,=GB2NTS,=GB2OWM,=GB2OYC,=GB2PBF,=GB2PS,=GB2RB,=GB2RRL,=GB2SKG,
-    =GB2SLH,=GB2SPD,=GB2SSF,=GB2STB,=GB2TDS,=GB2TI,=GB2WBB,=GB3GM,=GB400CA,
-    =GB4AAS,=GB4CGW,=GB4DAS,=GB4GM,=GB4LNM,=GB4NFE,=GB4PMS,=GB4RAF,=GB4SLH,
-    =GB4TSR,=GB4ZBS,=GB50ATC,=GB50JS,=GB50SWL,=GB5AST,=GB5BBS,=GB5CO,=GB5FHC,
-    =GB5JS,=GB5OL,=GB5RO,=GB5SI,=GB5TI,=GB60BBC,=GB60CRB,=GB60NTS,=GB6MI,
-    =GB6SA,=GB6SM,=GB6TAA,=GB6WW,=GB700BSB,=GB75GD,=GB75SCP,=GB75STT,=GB8AYR,
-    =GB8CA,=GB8CF,=GB8CI,=GB8CM,=GB8CN,=GB8CO,=GB8CSL,=GB8CY,=GB8FF,=GB8OO,
-    =GB8RU,=GB93AM;
+    =GB0LCS,=GB0LTM,=GB0MFG,=GB0MLM,=GB0MOG,=GB0MOL,=GB0NHL,=GB0OS,=GB0OYT,
+    =GB0PPE,=GB0QWM,=GB0RBS,=GB0SHP,=GB0SI,=GB0SK,=GB0SKY,=GB0SS,=GB0SSF,
+    =GB0TI,=GB100MAS,=GB10SP,=GB125BRC,=GB150NRL,=GB1EPC,=GB1FS,=GB1FVT,
+    =GB1GEO,=GB1OL,=GB250RB,=GB2AGG,=GB2AST,=GB2AYR,=GB2CHG,=GB2DHS,=GB2DTM,
+    =GB2FBM,=GB2FIO,=GB2FSM,=GB2GEO,=GB2GNL,=GB2GTM,=GB2HI,=GB2HLB,=GB2HRH,
+    =GB2HST,=GB2HSW,=GB2IAS,=GB2IGB,=GB2IGS,=GB2IMM,=GB2IOC,=GB2IOG,=GB2IOT,
+    =GB2JUNO,=GB2KDS,=GB2KHL,=GB2LAY,=GB2LBN,=GB2LCL,=GB2LCP,=GB2LGB,=GB2LHI,
+    =GB2LMG,=GB2LNM,=GB2LO,=GB2LP,=GB2LS,=GB2LSS,=GB2LT,=GB2LTH,=GB2LTN,
+    =GB2MAS,=GB2MDG,=GB2MOD,=GB2MOF,=GB2MSL,=GB2MUL,=GB2NAG,=GB2NBC,=GB2NCL,
+    =GB2NEF,=GB2NL,=GB2NTS,=GB2OWM,=GB2OYC,=GB2PBF,=GB2PS,=GB2RB,=GB2RRL,
+    =GB2SKG,=GB2SLH,=GB2SPD,=GB2SSF,=GB2STB,=GB2TDS,=GB2TI,=GB2WBB,=GB3GM,
+    =GB400CA,=GB4AAS,=GB4CGW,=GB4DAS,=GB4GM,=GB4LNM,=GB4NFE,=GB4PMS,=GB4RAF,
+    =GB4SLH,=GB4TSR,=GB4ZBS,=GB50ATC,=GB50JS,=GB50SWL,=GB5AST,=GB5BBS,=GB5CO,
+    =GB5FHC,=GB5JS,=GB5OL,=GB5RO,=GB5SI,=GB5TI,=GB60BBC,=GB60CRB,=GB60NTS,
+    =GB6MI,=GB6SA,=GB6SM,=GB6TAA,=GB6WW,=GB700BSB,=GB75GD,=GB75SCP,=GB75STT,
+    =GB8AYR,=GB8CA,=GB8CF,=GB8CI,=GB8CM,=GB8CN,=GB8CO,=GB8CSL,=GB8CY,=GB8FF,
+    =GB8OO,=GB8RU,=GB93AM;
 Shetland and Fair Isle:   14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:
     GZ,MZ,=2M0BDR,=2M0BDT,=2M0ZET,=GB2ELH,=GM0AVR,=GM0CXQ,=GM0CYJ,=GM0DJI,
     =GM0EKM,=GM0ILB,=GM0ULK,=GM1KKI,=GM1ZNR,=GM3KLA,=GM3WHT,=GM3ZET,=GM3ZNM,
@@ -358,13 +358,13 @@ Wales:                    14:  27:  EU:   51.50:     3.20:     0.0:  GW:
     =GB0RSC,=GB0SDD,=GB0SH,=GB0SOA,=GB0SPS,=GB0SRH,=GB0TD,=GB0TTT,=GB0VK,
     =GB0WRC,=GB0YG,=GB100BD,=GB100BP,=GB100FI,=GB100LP,=GB1CCC,=GB1LSG,=GB1SL,
     =GB1SSL,=GB1TDS,=GB2000SET,=GB200A,=GB200HNT,=GB2ADU,=GB2ANG,=GB2CI,
-    =GB2CPC,=GB2GGM,=GB2GLS,=GB2GOL,=GB2GSG,=GB2GSS,=GB2HDG,=GB2IMD,=GB2LNP,
-    =GB2LSA,=GB2MHL,=GB2MIL,=GB2MLM,=GB2MOP,=GB2RFS,=GB2RSC,=GB2RTB,=GB2SAC,
-    =GB2SDD,=GB2SIP,=GB2TD,=GB2TTA,=GB2VK,=GB2WDS,=GB2WFF,=GB2WHO,=GB2WSF,
-    =GB4BPL,=GB4CI,=GB4DPS,=GB4HMD,=GB4HMM,=GB4LRG,=GB4LSG,=GB4MD,=GB4MDI,
-    =GB4MUU,=GB4NDG,=GB4SA,=GB4SDD,=GB4SMM,=GB4SNF,=GB4TMS,=GB4XXX,=GB5BS/J,
-    =GB5FI,=GB5GEO,=GB5ONG,=GB5SIP,=GB60BTF,=GB60VLY,=GB6AR,=GB6GW,=GB6OQA,
-    =GB750CC,=GB8OQE;
+    =GB2CPC,=GB2EI,=GB2GGM,=GB2GLS,=GB2GOL,=GB2GSG,=GB2GSS,=GB2HDG,=GB2IMD,
+    =GB2LNP,=GB2LSA,=GB2MHL,=GB2MIL,=GB2MLM,=GB2MOP,=GB2RFS,=GB2RSC,=GB2RTB,
+    =GB2SAC,=GB2SDD,=GB2SIP,=GB2TD,=GB2TTA,=GB2VK,=GB2WDS,=GB2WFF,=GB2WHO,
+    =GB2WSF,=GB4BPL,=GB4CI,=GB4DPS,=GB4HMD,=GB4HMM,=GB4LRG,=GB4LSG,=GB4MD,
+    =GB4MDI,=GB4MUU,=GB4NDG,=GB4SA,=GB4SDD,=GB4SMM,=GB4SNF,=GB4TMS,=GB4XXX,
+    =GB5BS/J,=GB5FI,=GB5GEO,=GB5ONG,=GB5SIP,=GB60BTF,=GB60VLY,=GB65BTF,=GB6AR,
+    =GB6GW,=GB6OQA,=GB750CC,=GB8OQE;
 Solomon Islands:          28:  51:  OC:   -9.40:  -160.00:   -11.0:  H4:
     H4;
 Temotu:                   32:  51:  OC:  -10.70:  -165.80:   -11.0:  H40:
@@ -485,35 +485,35 @@ United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:
     =N8RR(5),=N8WXQ(5),=N9ADG(3)[6],=N9JRZ(5),=NA4C(4),=NA4K(4),=NA4M(4)[7],
     =NB7V(4)[6],=ND2T(3)[6],=NE4M(4),=NE8J(5),=NH0Y(3)[6],=NH6CN(4)[8],
     =NH7FL(4)[7],=NI9K(5),=NJ2P(3)[6],=NJ4I(4),=NL7FK(4)[8],=NL7XM(5)[8],
-    =NN7A(4)[7],=NO9E(5),=NP2CB(5)[8],=NP3D(5)[8],=NQ4U(4),=NS0I(5)[8],
-    =NS2X(4),=NT4TT(3)[6],=NU4B(4),=NU4N(4),=NV4B(4),=NW7O(4)[6],=NW8U(5),
-    =NX9T(5),=NY4N(4),=W0AH(5)[8],=W0BR(5)[8],=W0ID(5)[8],=W0JLC(5)[8],
-    =W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],=W0YR(5)[8],=W1ESE(3)[6],=W1NN(4),
-    =W1RET(4),=W1RH(3)[6],=W1SKU(4),=W1YY(3)[6],=W2OO(4),=W2PK(3)[6],
-    =W2VJN(3)[6],=W2WB(3)[6],=W3CP(3)[6],=W3FAF(4)[7],=W3HDH(4),=W3HKK(4),
-    =W3IQ(4),=W4BCG(4),=W4CID(4),=W4CKD(4),=W4DAN(4),=W4DEC(4),=W4DIM(4),
-    =W4DVG(4),=W4EEH(4),=W4FIN(4),=W4GHD(4),=W4GKM(4),=W4HRC(4),=W4JSI(4),
-    =W4KW(4),=W4LC(4),=W4LSC(3)[6],=W4NBS(4),=W4NI(4),=W4NJK(3)[6],=W4NL(4),
-    =W4NTI(4),=W4NZ(4),=W4PA(4),=W4PV(4),=W4RJ(4),=W4RK(4)[7],=W4RYW(4),
-    =W4SK(4),=W4UAT(3)[6],=W4UDX(4),=W4UHF(4),=W4UR(4),=W4WL(4),=W4YOK(4)[7],
-    =W5JBV(5)[8],=W5JR(3)[6],=W5REA(5)[8],=W6AAN(5)[8],=W6IHG(5)[8],
-    =W6IZT(5)[8],=W6LFB(4)[7],=W6NRJ(5)[8],=W6NWS(5)[8],=W6PU(4)[7],
-    =W6TER(4)[7],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7ED(4)[6],=W7FG(4)[7],
-    =W7HJ(5)[8],=W7IMP(5)[8],=W7IY(5)[8],=W7IZL(4)[7],=W7JI(4)[7],=W7JW(4)[8],
-    =W7KF(4)[7],=W7KZO(4)[6],=W7LPF(5)[8],=W7LR(4)[6],=W7OT(5)[8],=W7QF(5)[8],
-    =W7ZQ(4)[7],=W8AEF(3)[6],=W8AKS(5),=W8FJ(5),=W8HC(5),=W8HGH(5),=W8JA(5),
-    =W8JI(5),=W8KJP(5),=W8OHT(5),=W8OP(5),=W8PC(5),=W8RJL(5),=W8UDX(3)[6],
-    =W8WEJ(5),=W8WVM(5),=W8ZA(5),=W9CF(3)[6],=W9GE(5),=W9MAK(3)[6],
-    =W9NGA(3)[6],=W9PL(3)[6],=W9RUK(5),=W9UAL(5),=WA0KDS(3)[6],=WA0WWW(3)[6],
-    =WA1FCN(4),=WA1PMA(3)[6],=WA1UJU(4),=WA2MNO(4)[7],=WA3C(4),=WA3JAT(4),
-    =WA4JA(4),=WA4OSD(4),=WA4SM(4),=WA5VGI(3)[6],=WA8CNN(5),=WA8KAN(5),
-    =WA8WV(5),=WB4FWQ(4),=WB4YDL(4),=WB4ZBI(4),=WB8YYY(5),=WC4D(4),=WC4V(4),
-    =WC7WB(4)[7],=WD4KTF(4),=WG7Y(4)[7],=WJ9B(5),=WK5X(5)[8],=WO4O(4),
-    =WO5D(5)[8],=WP4AQK(5)[8],=WP4JBG(4)[7],=WP4O(5)[8],=WR4F(4),=WR5G(3)[6],
-    =WS4Y(4)[7],=WT5L(5)[8],=WU9B(3)[6],=WV8AA(5),=WW2Y(4)[7],=WX4TM(4),
-    =WY7I(4)[7],=WY7LL(4)[7];
+    =NN7A(4)[7],=NO9E(5),=NP2CB(5)[8],=NP2F(4)[7],=NP3D(5)[8],=NQ4U(4),
+    =NS0I(5)[8],=NS2X(4),=NT4TT(3)[6],=NU4B(4),=NU4N(4),=NV4B(4),=NW7O(4)[6],
+    =NW8U(5),=NX9T(5),=NY4N(4),=W0AH(5)[8],=W0BR(5)[8],=W0ID(5)[8],
+    =W0JLC(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],=W0YR(5)[8],
+    =W1ESE(3)[6],=W1NN(4),=W1RET(4),=W1RH(3)[6],=W1SKU(4),=W1YY(3)[6],
+    =W2OO(4),=W2PK(3)[6],=W2VJN(3)[6],=W2WB(3)[6],=W3CP(3)[6],=W3FAF(4)[7],
+    =W3HDH(4),=W3HKK(4),=W3IQ(4),=W4BCG(4),=W4CID(4),=W4CKD(4),=W4DAN(4),
+    =W4DEC(4),=W4DIM(4),=W4DVG(4),=W4EEH(4),=W4FIN(4),=W4GHD(4),=W4GKM(4),
+    =W4HRC(4),=W4JSI(4),=W4KW(4),=W4LC(4),=W4LSC(3)[6],=W4NBS(4),=W4NI(4),
+    =W4NJK(3)[6],=W4NL(4),=W4NTI(4),=W4NZ(4),=W4PA(4),=W4PV(4),=W4RJ(4),
+    =W4RK(4)[7],=W4RYW(4),=W4SK(4),=W4UAT(3)[6],=W4UDX(4),=W4UHF(4),=W4UR(4),
+    =W4WL(4),=W4YOK(4)[7],=W5JBV(5)[8],=W5JR(3)[6],=W5REA(5)[8],=W6AAN(5)[8],
+    =W6IHG(5)[8],=W6IZT(5)[8],=W6LFB(4)[7],=W6NRJ(5)[8],=W6NWS(5)[8],
+    =W6PU(4)[7],=W6TER(4)[7],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7ED(4)[6],
+    =W7FG(4)[7],=W7HJ(5)[8],=W7IMP(5)[8],=W7IY(5)[8],=W7IZL(4)[7],=W7JI(4)[7],
+    =W7JW(4)[8],=W7KF(4)[7],=W7KZO(4)[6],=W7LPF(5)[8],=W7LR(4)[6],=W7OT(5)[8],
+    =W7QF(5)[8],=W7ZQ(4)[7],=W8AEF(3)[6],=W8AKS(5),=W8FJ(5),=W8HC(5),
+    =W8HGH(5),=W8JA(5),=W8JI(5),=W8KJP(5),=W8OHT(5),=W8OP(5),=W8PC(5),
+    =W8RJL(5),=W8UDX(3)[6],=W8WEJ(5),=W8WVM(5),=W8ZA(5),=W9CF(3)[6],=W9GE(5),
+    =W9MAK(3)[6],=W9NGA(3)[6],=W9PL(3)[6],=W9RUK(5),=W9UAL(5),=WA0KDS(3)[6],
+    =WA0WWW(3)[6],=WA1FCN(4),=WA1PMA(3)[6],=WA1UJU(4),=WA2MNO(4)[7],=WA3C(4),
+    =WA3JAT(4),=WA4JA(4),=WA4OSD(4),=WA4SM(4),=WA5VGI(3)[6],=WA8CNN(5),
+    =WA8KAN(5),=WA8WV(5),=WB4FWQ(4),=WB4YDL(4),=WB4ZBI(4),=WB8YYY(5),=WC4D(4),
+    =WC4V(4),=WC7WB(4)[7],=WD4KTF(4),=WG7Y(4)[7],=WJ9B(5),=WK5X(5)[8],
+    =WL7LZ(4)[7],=WO4O(4),=WO5D(5)[8],=WP4AQK(5)[8],=WP4JBG(4)[7],=WP4O(5)[8],
+    =WR4F(4),=WR5G(3)[6],=WS4Y(4)[7],=WT5L(5)[8],=WU9B(3)[6],=WV8AA(5),
+    =WW2Y(4)[7],=WX4TM(4),=WY7I(4)[7],=WY7LL(4)[7];
 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:
-    KG4;
+    KG4,=VERSION;
 Mariana Islands:          27:  64:  OC:   15.20:  -145.80:   -10.0:  KH0:
     AH0,KH0,NH0,WH0,=KG6SL;
 Baker & Howland Islands:  31:  61:  OC:    0.50:   176.00:    12.0:  KH1:
@@ -557,41 +557,41 @@ Argentina:                13:  14:  SA:  -34.60:    58.40:     3.0:  LU:
     =LO7E/D,=LU/DH4PB/R,=LU/DH4PB/S,=LU1AEE/D,=LU1AF/D,=LU1CDP/D,=LU1DHO/D,
     =LU1DK/D,=LU1DMA/E,=LU1DZ/E,=LU1DZ/P,=LU1DZ/Q,=LU1DZ/R,=LU1DZ/S,=LU1DZ/X,
     =LU1EEZ/D,=LU1EJ/W,=LU1EQ/D,=LU1EUU/W,=LU1EYW/D,=LU1OFN/I,=LU1VOF/D,
-    =LU1VZ/V,=LU1WCR/W,=LU1WF/W,=LU1WP/W,=LU1XAW/X,=LU1XWC/E,=LU1XY/X,
-    =LU1XZ/H,=LU1YU/D,=LU1YY/Y,=LU2AGQ/D,=LU2CRM/XA,=LU2DT/D,=LU2DT/LH,
-    =LU2DVI/H,=LU2EE/D,=LU2EE/E,=LU2EJB/X,=LU2VC/D,=LU2VCD/V,=LU2VDV/D,
-    =LU2WV/O,=LU2XBI/XA,=LU2XX/X,=LU3CQ/D,=LU3DC/D,=LU3DJI/D,=LU3DJI/W,
-    =LU3DOC/D,=LU3DR/D,=LU3DR/V,=LU3DR/W,=LU3DXG/D,=LU3DXG/W,=LU3DZO/D,
-    =LU3EOU/D,=LU3ES/D,=LU3ES/V,=LU3ES/W,=LU3HKA/D,=LU3HKA/H,=LU4AAO/D,
-    =LU4DA/D,=LU4DBP/D,=LU4DBT/D,=LU4DDL/V,=LU4DQ/D,=LU4DRC/Y,=LU4DRH/D,
-    =LU4DRH/E,=LU4EHP/V,=LU4EJ/D,=LU4ELE/D,=LU4ESP/D,=LU4ETN/D,=LU4ETN/W,
-    =LU4EV/Q,=LU4UWZ/D,=LU4UZW/D,=LU4WG/W,=LU5BE/D,=LU5BE/XA,=LU5BOJ/O,
-    =LU5DEM/D,=LU5DEM/V,=LU5DEM/W,=LU5DIT/D,=LU5DIT/V,=LU5DIT/W,=LU5DRV/D,
-    =LU5DRV/V,=LU5DT/D,=LU5DV/D,=LU5DWS/D,=LU5EAO/D,=LU5EFX/Y,=LU5EJL/D,
-    =LU5EWO/D,=LU5FZ/D,=LU5VAS/D,=LU5VAT/D,=LU5XC/X,=LU6CN/D,=LU6DBL/D,
-    =LU6DBL/W,=LU6DDC/D,=LU6DG/D,=LU6DKT/D,=LU6DRD/D,=LU6DRD/E,=LU6DRN/D,
-    =LU6DRR/D,=LU6DTB/D,=LU6EC/W,=LU6EJJ/D,=LU6EPE/D,=LU6EPR/D,=LU6EPR/E,
-    =LU6EU/D,=LU6EYK/X,=LU6JJ/D,=LU6UAL/D,=LU6UO/D,=LU6UO/P,=LU6UO/Q,=LU6UO/R,
-    =LU6UO/S,=LU6UO/X,=LU6WG/W,=LU6XAH/X,=LU7AC/D,=LU7BTO/D,=LU7DBL/D,
-    =LU7DID/V,=LU7DID/Y,=LU7DIR/D,=LU7DJJ/W,=LU7DP/D,=LU7DR/D,=LU7DSY/D,
-    =LU7DSY/V,=LU7DSY/W,=LU7DW/D,=LU7DZL/D,=LU7DZL/E,=LU7EGH/V,=LU7EGY/D,
-    =LU7EHL/D,=LU7EO/D,=LU7EPC/D,=LU7EPC/W,=LU7FJ/F,=LU7HW/D,=LU7VCH/D,
-    =LU7WFM/W,=LU7WW/W,=LU8ADX/D,=LU8DCH/D,=LU8DCH/Q,=LU8DIP/D,=LU8DR/D,
-    =LU8DRA/W,=LU8DRH/D,=LU8DSJ/D,=LU8DWR/D,=LU8DWR/V,=LU8EBJ/D,=LU8EBJ/E,
-    =LU8EBK/D,=LU8EBK/E,=LU8ECF/D,=LU8ECF/E,=LU8EEM/D,=LU8EFF/D,=LU8EGS/D,
-    =LU8EHQ/D,=LU8EHQ/E,=LU8EHQ/W,=LU8EHV/D,=LU8EKB/W,=LU8EKC/D,=LU8EOT/X,
-    =LU8EOT/Y,=LU8ERH/D,=LU8EXJ/D,=LU8EXN/D,=LU8FOZ/V,=LU8VCC/D,=LU8WFT/Q,
-    =LU8XC/X,=LU8XW/X,=LU8XW/XD,=LU9ARB/D,=LU9AUC/D,=LU9DBK/X,=LU9DF/D,
-    =LU9DKX/X,=LU9DO/D,=LU9DPD/XA,=LU9EI/D,=LU9EI/F,=LU9EJS/E,=LU9ESD/D,
-    =LU9ESD/F,=LU9ESD/V,=LU9ESD/W,=LU9ESD/Y,=LU9EV/D,=LU9EV/LH,=LU9HVR/D,
-    =LU9JMG/J,=LW1DAL/D,=LW1DE/D,=LW1EXU/D,=LW1EXU/Y,=LW2DX/E,=LW2DX/P,
-    =LW2DX/Q,=LW2DX/R,=LW2DX/S,=LW2DX/Y,=LW2EFS/D,=LW2ENB/D,=LW3DKC/D,
-    =LW3DKC/E,=LW3DKO/D,=LW3DKO/E,=LW3HAQ/D,=LW4DRH/D,=LW4DRH/E,=LW4DRV/D,
-    =LW4ECV/D,=LW4EIN/D,=LW4EM/E,=LW4EM/LH,=LW5DR/LH,=LW5DWX/D,=LW5EE/D,
-    =LW5EE/V,=LW5EOL/D,=LW6DTM/D,=LW7DAF/D,=LW7DAF/W,=LW7DLY/D,=LW7DNS/E,
-    =LW7EDH/D,=LW7EJV/D,=LW7WFM/W,=LW8DMK/D,=LW8DMK/W,=LW8EAG/D,=LW8ECQ/D,
-    =LW8EU/D,=LW8EXF/D,=LW9DAE/W,=LW9DCF/Y,=LW9DX/D,=LW9EAG/D,=LW9EAG/V,
-    =LW9EAG/W,=LW9EVA/D,=LW9EVA/E;
+    =LU1VZ/V,=LU1WCR/W,=LU1WF/W,=LU1WJF/W,=LU1WP/W,=LU1XAW/X,=LU1XWC/E,
+    =LU1XY/X,=LU1XZ/H,=LU1YU/D,=LU1YY/Y,=LU2AGQ/D,=LU2CRM/XA,=LU2DT/D,
+    =LU2DT/LH,=LU2DVI/H,=LU2EE/D,=LU2EE/E,=LU2EJB/X,=LU2VC/D,=LU2VCD/V,
+    =LU2VDV/D,=LU2WV/O,=LU2XBI/XA,=LU2XX/X,=LU3CQ/D,=LU3DC/D,=LU3DJI/D,
+    =LU3DJI/W,=LU3DOC/D,=LU3DR/D,=LU3DR/V,=LU3DR/W,=LU3DXG/D,=LU3DXG/W,
+    =LU3DZO/D,=LU3EOU/D,=LU3ES/D,=LU3ES/V,=LU3ES/W,=LU3HKA/D,=LU3HKA/H,
+    =LU4AAO/D,=LU4DA/D,=LU4DBP/D,=LU4DBT/D,=LU4DDL/V,=LU4DQ/D,=LU4DRC/Y,
+    =LU4DRH/D,=LU4DRH/E,=LU4EHP/V,=LU4EJ/D,=LU4ELE/D,=LU4ESP/D,=LU4ETN/D,
+    =LU4ETN/W,=LU4EV/Q,=LU4HMA/W,=LU4UWZ/D,=LU4UZW/D,=LU4WG/W,=LU5BE/D,
+    =LU5BE/XA,=LU5BOJ/O,=LU5DEM/D,=LU5DEM/V,=LU5DEM/W,=LU5DIT/D,=LU5DIT/V,
+    =LU5DIT/W,=LU5DRV/D,=LU5DRV/V,=LU5DT/D,=LU5DV/D,=LU5DWS/D,=LU5EAO/D,
+    =LU5EFX/Y,=LU5EJL/D,=LU5EWO/D,=LU5FZ/D,=LU5VAS/D,=LU5VAT/D,=LU5XC/X,
+    =LU6CN/D,=LU6DBL/D,=LU6DBL/W,=LU6DDC/D,=LU6DG/D,=LU6DKT/D,=LU6DRD/D,
+    =LU6DRD/E,=LU6DRN/D,=LU6DRR/D,=LU6DTB/D,=LU6EC/W,=LU6EE/D,=LU6EJJ/D,
+    =LU6EPE/D,=LU6EPR/D,=LU6EPR/E,=LU6EU/D,=LU6EYK/X,=LU6JJ/D,=LU6UAL/D,
+    =LU6UO/D,=LU6UO/P,=LU6UO/Q,=LU6UO/R,=LU6UO/S,=LU6UO/X,=LU6WG/W,=LU6XAH/X,
+    =LU7AC/D,=LU7BTO/D,=LU7DBL/D,=LU7DID/V,=LU7DID/Y,=LU7DIR/D,=LU7DJJ/W,
+    =LU7DP/D,=LU7DR/D,=LU7DSY/D,=LU7DSY/V,=LU7DSY/W,=LU7DW/D,=LU7DZL/D,
+    =LU7DZL/E,=LU7EGH/V,=LU7EGY/D,=LU7EHL/D,=LU7EO/D,=LU7EPC/D,=LU7EPC/W,
+    =LU7FJ/F,=LU7HW/D,=LU7VCH/D,=LU7WFM/W,=LU7WW/W,=LU8ADX/D,=LU8DCH/D,
+    =LU8DCH/Q,=LU8DIP/D,=LU8DR/D,=LU8DRA/W,=LU8DRH/D,=LU8DSJ/D,=LU8DWR/D,
+    =LU8DWR/V,=LU8EBJ/D,=LU8EBJ/E,=LU8EBK/D,=LU8EBK/E,=LU8ECF/D,=LU8ECF/E,
+    =LU8EEM/D,=LU8EFF/D,=LU8EGS/D,=LU8EHQ/D,=LU8EHQ/E,=LU8EHQ/W,=LU8EHV/D,
+    =LU8EKB/W,=LU8EKC/D,=LU8EOT/X,=LU8EOT/Y,=LU8ERH/D,=LU8EXJ/D,=LU8EXN/D,
+    =LU8FOZ/V,=LU8VCC/D,=LU8WFT/Q,=LU8XC/X,=LU8XW/X,=LU8XW/XD,=LU9ARB/D,
+    =LU9AUC/D,=LU9DA/D,=LU9DBK/X,=LU9DF/D,=LU9DKX/X,=LU9DO/D,=LU9DPD/D,
+    =LU9DPD/XA,=LU9EI/D,=LU9EI/F,=LU9EJS/E,=LU9ESD/D,=LU9ESD/F,=LU9ESD/V,
+    =LU9ESD/W,=LU9ESD/Y,=LU9EV/D,=LU9EV/LH,=LU9HVR/D,=LU9JMG/J,=LW1DAL/D,
+    =LW1DE/D,=LW1EXU/D,=LW1EXU/Y,=LW2DX/E,=LW2DX/P,=LW2DX/Q,=LW2DX/R,=LW2DX/S,
+    =LW2DX/Y,=LW2EFS/D,=LW2ENB/D,=LW3DKC/D,=LW3DKC/E,=LW3DKO/D,=LW3DKO/E,
+    =LW3HAQ/D,=LW4DRH/D,=LW4DRH/E,=LW4DRV/D,=LW4ECV/D,=LW4EIN/D,=LW4EM/E,
+    =LW4EM/LH,=LW5DR/LH,=LW5DWX/D,=LW5EE/D,=LW5EE/V,=LW5EOL/D,=LW6DTM/D,
+    =LW7DAF/D,=LW7DAF/W,=LW7DLY/D,=LW7DNS/E,=LW7EDH/D,=LW7EJV/D,=LW7WFM/W,
+    =LW8DMK/D,=LW8DMK/W,=LW8EAG/D,=LW8ECQ/D,=LW8EU/D,=LW8EXF/D,=LW9DAE/W,
+    =LW9DCF/Y,=LW9DX/D,=LW9EAG/D,=LW9EAG/V,=LW9EAG/W,=LW9EVA/D,=LW9EVA/E;
 Luxembourg:               14:  27:  EU:   49.60:    -6.20:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   54.50:   -25.50:    -2.0:  LY:
@@ -694,7 +694,7 @@ Banaba:                   31:  65:  OC:   -0.90:  -169.50:   -12.0:  T33:
 Somalia:                  37:  48:  AF:    2.10:   -45.40:    -3.0:  T5:
     6O,T5;
 San Marino:               15:  28:  EU:   43.90:   -12.30:    -1.0:  T7:
-    T7,=VERSION;
+    T7;
 Palau:                    27:  64:  OC:    9.50:  -138.20:    -9.0:  T8:
     T8;
 Turkey:                   20:  39:  AS:   40.00:   -33.00:    -2.0:  TA:
@@ -829,7 +829,7 @@ Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:
     =VE2PR(2),=VE2QRZ(2),=VE2RB(2),=VE2TVU(2),=VE2UA(2),=VE2VH(2),=VE2WDX(2),
     =VE2WT(2),=VE2XAA/2(2),=VE2XY(2),=VE2YM(2),=VE2Z(2),=VE2ZC(5),=VE2ZM(5),
     =VE2ZV(5),=VE3EY/2(2),=VE3NE/2(2),=VE3RHJ/2(2),=VE8AJ(2),=VE8PW(2),
-    =VE8RCS(2),=VER20090707,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4],
+    =VE8RCS(2),=VER20090811,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4],
     =XM3NE/2(2);
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ;
index 5afc1f3426404cc95a51143e2ed89cb3040380f1..d3737a366a0ea3dc2caab1588a5d292b84d24101 100644 (file)
   '=2M0BDR' => '379',
   '=2M0BDT' => '379',
   '=2M0ZET' => '379',
+  '=3D20CR' => '299',
   '=3D2AG/P' => '302',
   '=3D2CI' => '299',
   '=3D2CY' => '299',
   '=8J1RF' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411',
   '=8J1RL' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411',
   '=9H1VC/KHS' => '286',
+  '=9M4LHS' => '291,653',
   '=AA6DY' => '209',
   '=AA7CP' => '209',
   '=AA7JV' => '209',
   '=GB0KTC' => '64,379',
   '=GB0LCS' => '64,379',
   '=GB0LTM' => '64,379',
+  '=GB0MAR' => '62',
   '=GB0MFD' => '62',
   '=GB0MFG' => '64,379',
   '=GB0ML' => '66',
   '=GB0MLM' => '64,379',
+  '=GB0MOG' => '64,379',
   '=GB0MOL' => '64,379',
   '=GB0MPA' => '66',
   '=GB0MST' => '61',
   '=GB2DHS' => '64,379',
   '=GB2DTM' => '64,379',
   '=GB2ECG' => '65',
+  '=GB2EI' => '66',
   '=GB2ELH' => '379',
   '=GB2FBM' => '64,379',
   '=GB2FG' => '65',
   '=GB5SI' => '64,379',
   '=GB5SIP' => '66',
   '=GB5SPD' => '62',
+  '=GB5TD' => '61',
   '=GB5TI' => '64,379',
   '=GB60BBC' => '64,379',
   '=GB60BTF' => '66',
   '=GB60CRB' => '64,379',
   '=GB60NTS' => '64,379',
   '=GB60VLY' => '66',
+  '=GB65BTF' => '66',
   '=GB6AR' => '66',
   '=GB6GW' => '66',
   '=GB6MI' => '64,379',
   '=LU1VZ/V' => '117,425,426',
   '=LU1WCR/W' => '117,425,426',
   '=LU1WF/W' => '117,425,426',
+  '=LU1WJF/W' => '117,425,426',
   '=LU1WP/W' => '117,425,426',
   '=LU1XAW/X' => '117,425,426',
   '=LU1XWC/E' => '117,425,426',
   '=LU4ETN/D' => '117,425,426',
   '=LU4ETN/W' => '117,425,426',
   '=LU4EV/Q' => '117,425,426',
+  '=LU4HMA/W' => '117,425,426',
   '=LU4UWZ/D' => '117,425,426',
   '=LU4UZW/D' => '117,425,426',
   '=LU4WG/W' => '117,425,426',
   '=LU6DRR/D' => '117,425,426',
   '=LU6DTB/D' => '117,425,426',
   '=LU6EC/W' => '117,425,426',
+  '=LU6EE/D' => '117,425,426',
   '=LU6EJJ/D' => '117,425,426',
   '=LU6EPE/D' => '117,425,426',
   '=LU6EPR/D' => '117,425,426',
   '=LU8XW/XD' => '117,425,426',
   '=LU9ARB/D' => '117,425,426',
   '=LU9AUC/D' => '117,425,426',
+  '=LU9DA/D' => '117,425,426',
   '=LU9DBK/X' => '117,425,426',
   '=LU9DF/D' => '117,425,426',
   '=LU9DKX/X' => '117,425,426',
   '=LU9DO/D' => '117,425,426',
+  '=LU9DPD/D' => '117,425,426',
   '=LU9DPD/XA' => '117,425,426',
   '=LU9EI/D' => '117,425,426',
   '=LU9EI/F' => '117,425,426',
   '=NN7A' => '209',
   '=NO9E' => '209',
   '=NP2CB' => '209',
+  '=NP2F' => '209',
   '=NP3D' => '209',
   '=NQ4U' => '209',
   '=NS0I' => '209',
   '=TO1YR' => '46',
   '=TO2ANT' => '43',
   '=TO2FG' => '43',
+  '=TO2FH' => '44',
+  '=TO2FP' => '49',
   '=TO2HI' => '43',
   '=TO2T' => '43',
   '=TO3M' => '46',
   '=TX0C' => '318',
   '=TX0DX' => '318',
   '=TX1A' => '45,318',
+  '=TX3A' => '318',
   '=TX5C' => '48',
+  '=TX5SPA' => '315',
+  '=TX5SPM' => '316',
   '=TX9' => '318',
   '=UR2XO/WAP' => '175',
   '=UR5KCC/WAP' => '175',
   '=VE8AJ' => '189,545,546,547,548,549,550,551,552,553',
   '=VE8PW' => '189,545,546,547,548,549,550,551,552,553',
   '=VE8RCS' => '189,545,546,547,548,549,550,551,552,553',
-  '=VER20090707' => '189,545,546,547,548,549,550,551,552,553',
-  '=VERSION' => '156',
+  '=VER20090811' => '189,545,546,547,548,549,550,551,552,553',
+  '=VERSION' => '581,592,593,599,609,622,624,627,329',
   '=VK0HI' => '192',
   '=VK0IR' => '192',
   '=VK3TKB/9' => '330',
   '=WG7Y' => '209',
   '=WJ9B' => '209',
   '=WK5X' => '209',
+  '=WL7LZ' => '209',
   '=WO4O' => '209',
   '=WO5D' => '209',
   '=WP4AQK' => '209',
   'FW' => '58',
   'FY' => '59',
   'G' => '60',
+  'GA' => '64,379',
   'GC' => '66',
   'GD' => '61',
   'GH' => '63',
   'LY' => '186',
   'LZ' => '119',
   'M' => '60',
+  'MA' => '64,379',
   'MAJ' => '340',
   'MC' => '66',
   'MD' => '61',
index 443b3ee9e037a4e2a19c0de5299ef5b11de5441c..c43fd34d7dc1cad6e93a0baec8504bedf0023de6 100644 (file)
@@ -22,7 +22,7 @@ use DXUtil;
 use strict;
 
 
-use vars qw(%list %valid $filterdef);
+use vars qw(%list %valid $filterdef $maxlevel);
 
 %valid = (
                  call => "0,Callsign",
@@ -53,6 +53,7 @@ $filterdef = bless ([
                          ['by_state', 'ns', 9],
                         ], 'Filter::Cmd');
 
+$maxlevel = 25;                 # maximum recursion level in Route::config
 
 sub new
 {
@@ -205,7 +206,7 @@ sub config
                $pcall = ' ' x length $pcall;
 
                # recursion detector
-               if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+               if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
                        $line .= ' ...';
                        push @out, $line;
                        return @out;
@@ -239,7 +240,7 @@ sub config
                push @out, $line if length $line;
        } else {
                # recursion detector
-               if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+               if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
                        return @out;
                }
                $seen->{$call}++;
index 21c512a1fe191531355504a80ba304d14c559535..4d2bd2a56130b173a6380c1a477c1a737326fb84 100644 (file)
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.55';
 $subversion = '0';
-$build = '48';
+$build = '49';
 
 1;