Skip to content

Commit 84c9b0d

Browse files
ea4kea4k
authored
Merge pull request #728 from ea5wa/master
Working on Subdivions
2 parents 527eb86 + 5cd6bcb commit 84c9b0d

File tree

2 files changed

+247
-3
lines changed

2 files changed

+247
-3
lines changed

‎src/database/db_adif_primary_subdvisions_data.cpp

+239-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DB_ADIF_Primary_Subdvisions_data::DB_ADIF_Primary_Subdvisions_data(const QString &_parentClass)
44
{
55
Q_UNUSED(_parentClass);
6-
qDebug() << Q_FUNC_INFO << _parentClass ;
6+
//qDebug() << Q_FUNC_INFO << _parentClass ;
77
}
88

99
bool DB_ADIF_Primary_Subdvisions_data::addData()
@@ -60,6 +60,20 @@ bool DB_ADIF_Primary_Subdvisions_data::addValues(const QString &rows, const QStr
6060
return true;
6161
}
6262

63+
bool DB_ADIF_Primary_Subdvisions_data::add_USA_6()
64+
{
65+
// This function contains the Primary Subdivision data for Alaska
66+
// Source of data is https://www.adif.org (version 3.1.4)
67+
// Last modification 20240620
68+
69+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
70+
QStringList values;
71+
values.clear();
72+
values << "'6', 'Alaska', 'AK', '', '1', '1', '', '-1', '', '', 'N'";
73+
74+
return addValues(rows, values);
75+
}
76+
6377
bool DB_ADIF_Primary_Subdvisions_data::add_EA6_21()
6478
{
6579
// This function contains the Primary Subdivision data for Balearic is
@@ -74,6 +88,119 @@ bool DB_ADIF_Primary_Subdvisions_data::add_EA6_21()
7488
return addValues(rows, values);
7589
}
7690

91+
bool DB_ADIF_Primary_Subdvisions_data::add_EA6_29()
92+
{
93+
// This function contains the Primary Subdivision data for Canary island
94+
// Source of data is https://www.adif.org (version 3.1.4)
95+
// Last modification 20240620
96+
97+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
98+
QStringList values;
99+
values.clear();
100+
values
101+
<< "'29', 'Las Palmas', 'GC', 'EA8', '33', '36', 'Islas Canarias', '-1', '', '', 'N'"
102+
<< "'29', 'Tenerife', 'TF', 'EA8', '33', '36', 'Islas Canarias', '-1', '', '', 'N'"
103+
;
104+
105+
return addValues(rows, values);
106+
}
107+
108+
bool DB_ADIF_Primary_Subdvisions_data::add_EA6_32()
109+
{
110+
// This function contains the Primary Subdivision data for Ceuta & Melilla
111+
// Source of data is https://www.adif.org (version 3.1.4)
112+
// Last modification 20240620
113+
114+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
115+
QStringList values;
116+
values.clear();
117+
values
118+
<< "'32', 'Ceuta', 'CE', 'EA9', '33', '37', 'Ceuta Y Melilla', '-1', '', '', 'N'"
119+
<< "'32', 'Melilla', 'ML', 'EA9', '33', '37', 'Ceuta y Melilla', '-1', '', '', 'N'"
120+
;
121+
122+
return addValues(rows, values);
123+
}
124+
125+
bool DB_ADIF_Primary_Subdvisions_data::add_USA_110()
126+
{
127+
// This function contains the Primary Subdivision data for Hawaii
128+
// Source of data is https://www.adif.org (version 3.1.4)
129+
// Last modification 20240620
130+
131+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
132+
QStringList values;
133+
values.clear();
134+
values << "'110', 'Hawaii', 'HI', '', '31', '61', '', '-1', '', '', 'N'";
135+
136+
return addValues(rows, values);
137+
}
138+
139+
bool DB_ADIF_Primary_Subdvisions_data::add_CT_149()
140+
{
141+
// This function contains the Primary Subdivision data for Azores Is.
142+
// Source of data is https://www.adif.org (version 3.1.4)
143+
// Last modification 20240620
144+
145+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
146+
QStringList values;
147+
values.clear();
148+
values
149+
<< "'149', 'Açores', 'AC', 'CU', '14', '36', '', '-1', '', '', 'N'"
150+
;
151+
152+
return addValues(rows, values);
153+
}
154+
155+
bool DB_ADIF_Primary_Subdvisions_data::add_CT_256()
156+
{
157+
// This function contains the Primary Subdivision data for Madeira Is.
158+
// Source of data is https://www.adif.org (version 3.1.4)
159+
// Last modification 20240620
160+
161+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
162+
QStringList values;
163+
values.clear();
164+
values
165+
<< "'256', 'Madeira', 'MD', 'CT9', '33', '36', '', '-1', '', '', 'N'"
166+
;
167+
168+
return addValues(rows, values);
169+
}
170+
171+
bool DB_ADIF_Primary_Subdvisions_data::add_CT_272()
172+
{
173+
// This function contains the Primary Subdivision data for Portugal
174+
// Source of data is https://www.adif.org (version 3.1.4)
175+
// Last modification 20240620
176+
177+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
178+
QStringList values;
179+
values.clear();
180+
values
181+
<< "'272', 'Aveiro', 'AV', 'CT', '14', '37', '', '-1', '', '', 'N'"
182+
<< "'272', 'Beja', 'BJ', 'CT', '14', '37', '', '-1', '', '', 'N'"
183+
<< "'272', 'Braga', 'BR', 'CT', '14', '37', '', '-1', '', '', 'N'"
184+
<< "'272', 'Bragança', 'BG', 'CT', '14', '37', '', '-1', '', '', 'N'"
185+
<< "'272', 'Castelo Branco', 'CB', 'CT', '14', '37', '', '-1', '', '', 'N'"
186+
<< "'272', 'Coimbra', 'CO', 'CT', '14', '37', '', '-1', '', '', 'N'"
187+
<< "'272', 'Evora', 'EV', 'CT', '14', '37', '', '-1', '', '', 'N'"
188+
<< "'272', 'Faro', 'FR', 'CT', '14', '37', '', '-1', '', '', 'N'"
189+
<< "'272', 'Guarda', 'GD', 'CT', '14', '37', '', '-1', '', '', 'N'"
190+
<< "'272', 'Leiria', 'LR', 'CT', '14', '37', '', '-1', '', '', 'N'"
191+
<< "'272', 'Lisboa', 'LX', 'CT', '14', '37', '', '-1', '', '', 'N'"
192+
<< "'272', 'Portoalegre', 'PG', 'CT', '14', '37', '', '-1', '', '', 'N'"
193+
<< "'272', 'Porto', 'PT', 'CT', '14', '37', '', '-1', '', '', 'N'"
194+
<< "'272', 'Santarem', 'SR', 'CT', '14', '37', '', '-1', '', '', 'N'"
195+
<< "'272', 'Setubal', 'ST', 'CT', '14', '37', '', '-1', '', '', 'N'"
196+
<< "'272', 'Viana do Castelo', 'VC', 'CT', '14', '37', '', '-1', '', '', 'N'"
197+
<< "'272', 'Vila Real', 'VR', 'CT', '14', '37', '', '-1', '', '', 'N'"
198+
<< "'272', 'Viseu', 'VS', 'CT', '14', '37', '', '-1', '', '', 'N'"
199+
;
200+
201+
return addValues(rows, values);
202+
}
203+
77204

78205
bool DB_ADIF_Primary_Subdvisions_data::add_EA_281()
79206
{
@@ -84,10 +211,119 @@ bool DB_ADIF_Primary_Subdvisions_data::add_EA_281()
84211
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
85212
QStringList values;
86213
values.clear();
87-
values << "'281', 'Madrid', 'M', 'EA4', '14', '37', 'Madrid', '-1', '', '', 'N'"
214+
values
215+
<< "'281', 'Avila', 'AV', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
216+
<< "'281', 'Burgos', 'BU', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
217+
<< "'281', 'A Coruña', 'C', 'EA1', '14', '37', 'Galicia', '-1', '', '', 'N'"
218+
<< "'281', 'Leon', 'LE', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
219+
<< "'281', 'La Rioja', 'LO', 'EA1', '14', '37', 'La Rioja', '-1', '', '', 'N'"
220+
<< "'281', 'Lugo', LU', 'EA1', '14', '37', 'Galicia', '-1', '', '', 'N'"
88221
<< "'281', 'Asturias', 'O', 'EA1', '14', '37', 'Asturias', '-1', '', '', 'N'"
89-
<< "'281', 'Avila', 'AV', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'";
222+
<< "'281', 'Ourense', 'OU', 'EA1', '14', '37', 'Galicia', '-1', '', '', 'N'"
223+
<< "'281', 'Palencia', 'P', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
224+
<< "'281', 'Pontevedra', 'PO', 'EA1', '14', '37', 'Galicia', '-1', '', '', 'N'"
225+
<< "'281', 'Cantabria', 'S', 'EA1', '14', '37', 'Cantabria', '-1', '', '', 'N'"
226+
<< "'281', 'Salamanca', 'SA', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
227+
<< "'281', 'Segovia', 'SG', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
228+
<< "'281', 'Soria', 'SO', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
229+
<< "'281', 'Valladolid', 'VA', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
230+
<< "'281', 'Zamora', 'ZA', 'EA1', '14', '37', 'Castilla y León', '-1', '', '', 'N'"
231+
<< "'281', 'Vizcaya', 'BI', 'EA2', '14', '37', 'Pais Vasco', '-1', '', '', 'N'"
232+
<< "'281', 'Huesca', 'HU', 'EA2', '14', '37', 'Aragon', '-1', '', '', 'N'"
233+
<< "'281', 'Navarra', 'NA', 'EA2', '14', '37', 'Navarra', '-1', '', '', 'N'"
234+
<< "'281', 'Guipuzcoa', 'SS', 'EA2', '14', '37', 'Pais Vasco', '-1', '', '', 'N'"
235+
<< "'281', 'Teruel', 'TE', 'EA2', '14', '37', 'Aragon', '-1', '', '', 'N'"
236+
<< "'281', 'Alava', 'VI', 'EA2', '14', '37', 'Pais Vasco', '-1', '', '', 'N'"
237+
<< "'281', 'Zaragoza', 'Z', 'EA2', '14', '37', 'Aragon', '-1', '', '', 'N'"
238+
<< "'281', 'Barcelona', 'B', 'EA3', '14', '37', 'Cataluña', '-1', '', '', 'N'"
239+
<< "'281', 'Girona', 'GI', 'EA3', '14', '37', 'Cataluña', '-1', '', '', 'N'"
240+
<< "'281', 'Lleida', 'L', 'EA3', '14', '37', 'Cataluña', '-1', '', '', 'N'"
241+
<< "'281', 'Tarragona', 'T', 'EA3', '14', '37', 'Cataluña', '-1', '', '', 'N'"
242+
<< "'281', 'Badajoz', 'BA', 'EA4', '14', '37', 'Extremadura', '-1', '', '', 'N'"
243+
<< "'281', 'Caceres', 'CC', 'EA4', '14', '37', 'Extremadura', '-1', '', '', 'N'"
244+
<< "'281', 'Ciudad Real', 'CR', 'EA4', '14', '37', 'Castilla La Mancha', '-1', '', '', 'N'"
245+
<< "'281', 'Cuenca', 'CU', 'EA4', '14', '37', 'Castilla La Mancha', '-1', '', '', 'N'"
246+
<< "'281', 'Guadalajara', 'GU', 'EA4', '14', '37', 'Castilla La Mancha', '-1', '', '', 'N'"
247+
<< "'281', 'Madrid', 'M', 'EA4', '14', '37', 'Madrid', '-1', '', '', 'N'"
248+
<< "'281', 'Toledo', 'TO', 'EA4', '14', '37', 'Castilla La Mancha', '-1', '', '', 'N'"
249+
<< "'281', 'Alicante', 'A', 'EA5', '14', '37', 'Comunidad Valenciana', '-1', '', '', 'N'"
250+
<< "'281', 'Albacete', 'AB', 'EA5', '14', '37', 'Castilla La Mancha', '-1', '', '', 'N'"
251+
<< "'281', 'Castellon', 'CS', 'EA5', '14', '37', 'Comunidad Valenciana', '-1', '', '', 'N'"
252+
<< "'281', 'Valencia', 'V', 'EA5', '14', '37', 'Comunidad Valenciana', '-1', '', '', 'N'"
253+
<< "'281', 'Murcia', 'MU', 'EA5', '14', '37', 'Region de Murcia ', '-1', '', '', 'N'"
254+
<< "'281', 'Almeria', 'AL', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
255+
<< "'281', 'Cadiz', 'CA', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
256+
<< "'281', 'Cordoba', 'CO', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
257+
<< "'281', 'Granada', 'GR', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
258+
<< "'281', 'Huelva', 'H', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
259+
<< "'281', 'Jaen', 'J', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
260+
<< "'281', 'Malaga', 'MA', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
261+
<< "'281', 'Sevilla', 'SE', 'EA7', '14', '37', 'Andalucia', '-1', '', '', 'N'"
262+
;
90263

91264
return addValues(rows, values);
92265
}
93266

267+
bool DB_ADIF_Primary_Subdvisions_data::add_USA_291()
268+
{
269+
// This function contains the Primary Subdivision data for United States of America
270+
// Source of data is https://www.adif.org (version 3.1.4)
271+
// Last modification 20240620
272+
273+
QString rows = QString("dxcc, name, shortname, prefix, cqz, ituz, regionalgroup, regionalid, start_date, end_date, deleted");
274+
QStringList values;
275+
values.clear();
276+
values
277+
<< "'291', 'Connecticut', 'CT', '', '05', '08', '', '-1', '', '', 'N'"
278+
<< "'291', 'Maine', 'ME', '', '05', '08', '', '-1', '', '', 'N'"
279+
<< "'291', 'Massachusetts', 'MA', '', '05', '08', '', '-1', '', '', 'N'"
280+
<< "'291', 'New Hampshire', 'NH', '', '05', '08', '', '-1', '', '', 'N'"
281+
<< "'291', 'Rhode Island', 'RI', '', '05', '08', '', '-1', '', '', 'N'"
282+
<< "'291', 'Vermont', 'VT', '', '05', '08', '', '-1', '', '', 'N'"
283+
<< "'291', 'New Jersey', 'NJ', '', '05', '08', '', '-1', '', '', 'N'"
284+
<< "'291', 'New York', 'NY', '', '05', '08', '', '-1', '', '', 'N'"
285+
<< "'291', 'Delaware', 'DE', '', '05', '08', '', '-1', '', '', 'N'"
286+
<< "'291', 'District of Columbia', 'DC', '', '05', '08', '', '-1', '', '', 'N'"
287+
<< "'291', 'Maryland', 'MD', '', '05', '08', '', '-1', '', '', 'N'"
288+
<< "'291', 'Pennsylvania', 'PA', '', '05', '08', '', '-1', '', '', 'N'"
289+
<< "'291', 'Alabama', 'AL', '', '04', '08', '', '-1', '', '', 'N'"
290+
<< "'291', 'Florida', 'FL', '', '05', '08', '', '-1', '', '', 'N'"
291+
<< "'291', 'Georgia', 'GA', '', '05', '08', '', '-1', '', '', 'N'"
292+
<< "'291', 'Kentucky', 'KY', '', '04', '08', '', '-1', '', '', 'N'"
293+
<< "'291', 'North Carolina', 'NC', '', '04', '08', '', '-1', '', '', 'N'"
294+
<< "'291', 'South Carolina', 'SC', '', '05', '08', '', '-1', '', '', 'N'"
295+
<< "'291', 'Tennessee', 'TN', '', '04', '08', '', '-1', '', '', 'N'"
296+
<< "'291', 'Virginia', 'VA', '', '05', '08', '', '-1', '', '', 'N'"
297+
<< "'291', 'Arkansas', 'AR', '', '04', '08', '', '-1', '', '', 'N'"
298+
<< "'291', 'Lousiana', 'LA', '', '04', '08', '', '-1', '', '', 'N'"
299+
<< "'291', 'Mississippi', 'MS', '', '04', '08', '', '-1', '', '', 'N'"
300+
<< "'291', 'New Mexico', 'NM', '', '04', '07', '', '-1', '', '', 'N'"
301+
<< "'291', 'Oklahoma', 'OK', '', '04', '07', '', '-1', '', '', 'N'"
302+
<< "'291', 'Texas', 'TX', '', '04', '07', '', '-1', '', '', 'N'"
303+
<< "'291', 'California', 'CA', '', '03', '06', '', '-1', '', '', 'N'"
304+
<< "'291', 'Arizona', 'AZ', '', '03', '06', '', '-1', '', '', 'N'"
305+
<< "'291', 'Idaho', 'ID', '', '03', '06', '', '-1', '', '', 'N'"
306+
<< "'291', 'Montana', 'MT', '', '04', '06', '', '-1', '', '', 'N'"
307+
<< "'291', 'Nevada', 'NV', '', '03', '06', '', '-1', '', '', 'N'"
308+
<< "'291', 'Oregon', 'OR', '', '03', '06', '', '-1', '', '', 'N'"
309+
<< "'291', 'Utah', 'UT', '', '03', '06', '', '-1', '', '', 'N'"
310+
<< "'291', 'Washington', 'WA', '', '03', '06', '', '-1', '', '', 'N'"
311+
<< "'291', 'Wyoming', 'WY', '', '04', '07', '', '-1', '', '', 'N'"
312+
<< "'291', 'Michigan', 'MI', '', '04', '07', '', '-1', '', '', 'N'"
313+
<< "'291', 'Ohio', 'OH', '', '04', '08', '', '-1', '', '', 'N'"
314+
<< "'291', 'West Virginia', 'WV', '', '05', '08', '', '-1', '', '', 'N'"
315+
<< "'291', 'Illinois', 'IL', '', '04', '07', '', '-1', '', '', 'N'"
316+
<< "'291', 'Indiana', 'IN', '', '04', '08', '', '-1', '', '', 'N'"
317+
<< "'291', 'Wisconsin', 'WI', '', '04', '08', '', '-1', '', '', 'N'"
318+
<< "'291', 'Colorado', 'CO', '', '04', '07', '', '-1', '', '', 'N'"
319+
<< "'291', 'Iowa', 'IA', '', '04', '07', '', '-1', '', '', 'N'"
320+
<< "'291', 'Kansas', 'KS', '', '04', '07', '', '-1', '', '', 'N'"
321+
<< "'291', 'Minnesota', 'MN', '', '04', '07', '', '-1', '', '', 'N'"
322+
<< "'291', 'Missouri', 'MO', '', '04', '07', '', '-1', '', '', 'N'"
323+
<< "'291', 'Nebraska', 'NE', '', '04', '07', '', '-1', '', '', 'N'"
324+
<< "'291', 'North dakota', 'ND', '', '04', '07', '', '-1', '', '', 'N'"
325+
<< "'291', 'South Dakota', 'SD', '', '04', '07', '', '-1', '', '', 'N'"
326+
;
327+
328+
return addValues(rows, values);
329+
}

‎src/database/db_adif_primary_subdvisions_data.h

+8
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,16 @@ class DB_ADIF_Primary_Subdvisions_data : public QObject
5252
QueryExecutor *exe;
5353
bool isDBCreated(); // This function checks if the DB is created.
5454
bool addValues(const QString &rows, const QStringList &values);
55+
bool add_USA_6(); // Adds the data for Alaska
5556
bool add_EA6_21(); // Adds the data for Balearic Is
57+
bool add_EA6_29(); // Adds the data for Canary Is
58+
bool add_EA6_32(); // Adds the data for Ceuta y Melilla
5659
bool add_EA_281(); // Adds the data for Spain
60+
bool add_USA_110(); // Adds the data for Hawaii
61+
bool add_CT_149(); // Adds the data for Azores
62+
bool add_CT_256(); // Adds the data for Madeira
63+
bool add_CT_272(); // Adds the data for Portugal
64+
bool add_USA_291(); // Adds the data for United States of America
5765

5866

5967
};

0 commit comments

Comments
 (0)