diff options
author | Bastien Nocera <hadess@hadess.net> | 2018-03-07 18:17:36 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2018-03-09 12:10:37 +0100 |
commit | e3a12774d8a6f4e4d8b21afbb6e52af37951aa49 (patch) | |
tree | 89d8a088fad50b4a16c92fe6cbd03c0fa18e6fe4 | |
parent | 37d1ea3c5d4abb01f27dea4c5e2c7771eafa3d27 (diff) | |
download | libgweather-e3a12774d8a6f4e4d8b21afbb6e52af37951aa49.tar.gz |
locations: Remove <province> sub-division
It's only used in the Italy, and matches to the description of a
"state" and the GWEATHER_LOCATION_ADM1 level:
@GWEATHER_LOCATION_ADM1: A location representing a "first-level
administrative division"; ie, a state, province, or similar
division.
The only difference between ADM1 and ADM2 levels were that ADM1 levels
are shown in the location entry, whereas ADM2 levels are not.
https://bugzilla.gnome.org/show_bug.cgi?id=792328
-rw-r--r-- | data/Locations.xml | 1628 | ||||
-rw-r--r-- | data/locations.dtd | 3 | ||||
-rw-r--r-- | libgweather/gweather-location.c | 8 |
3 files changed, 781 insertions, 858 deletions
diff --git a/data/Locations.xml b/data/Locations.xml index 0fa0641..d8ebbc1 100644 --- a/data/Locations.xml +++ b/data/Locations.xml @@ -16031,859 +16031,787 @@ <timezone id="Europe/Rome" /> </timezones> <tz-hint>Europe/Rome</tz-hint> - <province> - <!-- An administrative division of Italy --> - <_name>Liguria</_name> - <city> - <!-- A city in Italy --> - <_name>Albenga</_name> - <coordinates>44.050000 8.216667</coordinates> - <location> - <name>Albenga</name> - <code>LIMG</code> - <coordinates>44.050000 8.116667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy. - "Genoa" is the traditional English name. - The local name in Italian is "Genova". - --> - <_name>Genoa</_name> - <coordinates>44.416667 8.950000</coordinates> - <location> - <name>Sestri Airport</name> - <code>LIMJ</code> - <coordinates>44.416667 8.850000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Isola del Cantone</_name> - <coordinates>44.650000 8.950000</coordinates> - <location> - <name>Passo Dei Giovi</name> - <code>LIMV</code> - <coordinates>44.633333 8.933333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Laigueglia</_name> - <coordinates>43.966667 8.150000</coordinates> - <location> - <name>Capo Mele</name> - <code>LIMU</code> - <coordinates>43.950000 8.166667</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Sardinia</_name> - <city> - <!-- A city in Italy --> - <_name>Alghero</_name> - <coordinates>40.558889 8.318056</coordinates> - <location> - <name>Alghero</name> - <code>LIEA</code> - <coordinates>40.633333 8.283333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Cagliari</_name> - <coordinates>39.216667 9.116667</coordinates> - <location> - <name>Elmas Airport</name> - <code>LIEE</code> - <coordinates>39.250000 9.066667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Decimomannu</_name> - <coordinates>39.312500 8.969444</coordinates> - <location> - <name>Decimomannu</name> - <code>LIED</code> - <coordinates>39.350000 8.966667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Olbia</_name> - <coordinates>40.916667 9.516667</coordinates> - <location> - <name>Costa Smeralda Airport</name> - <code>LIEO</code> - <coordinates>40.900000 9.516667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>San Stèfano</_name> - <coordinates>39.107500 9.506111</coordinates> - <location> - <name>Capo Carbonara</name> - <code>LIEC</code> - <coordinates>39.100000 9.516667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Àrbatax</_name> - <coordinates>39.934444 9.705556</coordinates> - <location> - <name>Capo Bellavista</name> - <code>LIEB</code> - <coordinates>39.933333 9.716667</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Friuli-Venezia Giulia</_name> - <city> - <!-- A city in Italy --> - <_name>Aviano</_name> - <coordinates>46.070556 12.594722</coordinates> - <location> - <name>Aviano</name> - <code>LIPA</code> - <coordinates>46.033333 12.600000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Ronchi dei Legionari</_name> - <coordinates>45.823611 13.509722</coordinates> - <location> - <name>Ronchi dei Legionari</name> - <code>LIPQ</code> - <coordinates>45.816667 13.483333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Tarvisio</_name> - <coordinates>46.510833 13.594167</coordinates> - <location> - <name>Tarvisio</name> - <code>LIVO</code> - <coordinates>46.500000 13.583333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Trieste</_name> - <coordinates>45.648611 13.780000</coordinates> - <location> - <name>Trieste</name> - <code>LIVT</code> - <coordinates>45.650000 13.750000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Puglia</_name> - <city> - <!-- A city in Italy --> - <_name>Bari</_name> - <coordinates>41.133333 16.850000</coordinates> - <location> - <name>Palese Macchie Airport</name> - <code>LIBD</code> - <coordinates>41.133333 16.783333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Brindisi</_name> - <coordinates>40.633333 17.933333</coordinates> - <location> - <name>Brindisi</name> - <code>LIBR</code> - <coordinates>40.650000 17.950000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Ginosa Marina</_name> + <city> + <!-- A city in Italy --> + <_name>Albenga</_name> + <coordinates>44.050000 8.216667</coordinates> + <location> + <name>Albenga</name> + <code>LIMG</code> + <coordinates>44.050000 8.116667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy. + "Genoa" is the traditional English name. + The local name in Italian is "Genova". + --> + <_name>Genoa</_name> + <coordinates>44.416667 8.950000</coordinates> + <location> + <name>Sestri Airport</name> + <code>LIMJ</code> + <coordinates>44.416667 8.850000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Isola del Cantone</_name> + <coordinates>44.650000 8.950000</coordinates> + <location> + <name>Passo Dei Giovi</name> + <code>LIMV</code> + <coordinates>44.633333 8.933333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Laigueglia</_name> + <coordinates>43.966667 8.150000</coordinates> + <location> + <name>Capo Mele</name> + <code>LIMU</code> + <coordinates>43.950000 8.166667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Alghero</_name> + <coordinates>40.558889 8.318056</coordinates> + <location> + <name>Alghero</name> + <code>LIEA</code> + <coordinates>40.633333 8.283333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Cagliari</_name> + <coordinates>39.216667 9.116667</coordinates> + <location> + <name>Elmas Airport</name> + <code>LIEE</code> + <coordinates>39.250000 9.066667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Decimomannu</_name> + <coordinates>39.312500 8.969444</coordinates> + <location> + <name>Decimomannu</name> + <code>LIED</code> + <coordinates>39.350000 8.966667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Olbia</_name> + <coordinates>40.916667 9.516667</coordinates> + <location> + <name>Costa Smeralda Airport</name> + <code>LIEO</code> + <coordinates>40.900000 9.516667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>San Stèfano</_name> + <coordinates>39.107500 9.506111</coordinates> + <location> + <name>Capo Carbonara</name> + <code>LIEC</code> + <coordinates>39.100000 9.516667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Àrbatax</_name> + <coordinates>39.934444 9.705556</coordinates> + <location> + <name>Capo Bellavista</name> + <code>LIEB</code> + <coordinates>39.933333 9.716667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Aviano</_name> + <coordinates>46.070556 12.594722</coordinates> + <location> + <name>Aviano</name> + <code>LIPA</code> + <coordinates>46.033333 12.600000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Ronchi dei Legionari</_name> + <coordinates>45.823611 13.509722</coordinates> + <location> + <name>Ronchi dei Legionari</name> + <code>LIPQ</code> + <coordinates>45.816667 13.483333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Tarvisio</_name> + <coordinates>46.510833 13.594167</coordinates> + <location> + <name>Tarvisio</name> + <code>LIVO</code> + <coordinates>46.500000 13.583333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Trieste</_name> + <coordinates>45.648611 13.780000</coordinates> + <location> + <name>Trieste</name> + <code>LIVT</code> + <coordinates>45.650000 13.750000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Bari</_name> + <coordinates>41.133333 16.850000</coordinates> + <location> + <name>Palese Macchie Airport</name> + <code>LIBD</code> + <coordinates>41.133333 16.783333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Brindisi</_name> + <coordinates>40.633333 17.933333</coordinates> + <location> + <name>Brindisi</name> + <code>LIBR</code> + <coordinates>40.650000 17.950000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Ginosa Marina</_name> + <coordinates>40.433333 16.883333</coordinates> + <location> + <name>Ginosa Marina</name> + <code>LIBH</code> <coordinates>40.433333 16.883333</coordinates> - <location> - <name>Ginosa Marina</name> - <code>LIBH</code> - <coordinates>40.433333 16.883333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Gioia del Colle</_name> - <coordinates>40.800000 16.916667</coordinates> - <location> - <name>Gioia del Colle</name> - <code>LIBV</code> - <coordinates>40.766667 16.933333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Grottaglie</_name> - <coordinates>40.533333 17.433333</coordinates> - <location> - <name>Grottaglie</name> - <code>LIBG</code> - <coordinates>40.516667 17.400000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Lecce</_name> - <coordinates>40.383333 18.183333</coordinates> - <location> - <name>Lecce</name> - <code>LIBN</code> - <coordinates>40.233333 18.150000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Tamaricciola</_name> - <coordinates>41.416667 15.733333</coordinates> - <location> - <name>Amendola</name> - <code>LIBA</code> - <coordinates>41.533333 15.716667</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Lombardy</_name> - <city> - <!-- A city in Italy --> - <_name>Bergamo</_name> - <coordinates>45.683333 9.716667</coordinates> - <location> - <name>Orio Al Serio Airport</name> - <code>LIME</code> - <coordinates>45.666667 9.700000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Brescia</_name> - <coordinates>45.550000 10.250000</coordinates> - <location> - <name>Ghedi Airport</name> - <code>LIPL</code> - <coordinates>45.416667 10.283333</coordinates> - </location> - <location> - <name>Montichiari Airport</name> - <code>LIPO</code> - <coordinates>45.400556 10.316389</coordinates> - </location> - </city> - <city> - <!-- A city in Italy. - "Milan" is the traditional English name. - The local name in Italian is "Milano". - --> - <_name>Milan</_name> - <coordinates>45.466667 9.200000</coordinates> - <location> - <name>Linate Airport</name> - <code>LIML</code> - <coordinates>45.433333 9.283333</coordinates> - </location> - <location> - <name>Malpensa Airport</name> - <code>LIMC</code> - <coordinates>45.616667 8.733333</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Emilia-Romagna</_name> - <city> - <!-- A city in Italy --> - <_name>Bologna</_name> - <coordinates>44.493850 11.342400</coordinates> - <location> - <name>Borgo Panigale Airport</name> - <code>LIPE</code> - <coordinates>44.527800 11.294370</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Cervia</_name> - <coordinates>44.261667 12.358889</coordinates> - <location> - <name>Cervia</name> - <code>LIPC</code> - <coordinates>44.216667 12.300000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Ferrara</_name> - <coordinates>44.833333 11.583333</coordinates> - <location> - <name>Ferrara</name> - <code>LIPF</code> - <coordinates>44.833333 11.616667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Forlì</_name> - <coordinates>44.223611 12.052778</coordinates> - <location> - <name>Forlì</name> - <code>LIPK</code> - <coordinates>44.200000 12.066667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Parma</_name> - <coordinates>44.800000 10.333333</coordinates> - <location> - <name>Parma</name> - <code>LIMP</code> - <coordinates>44.821389 10.294722</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Piacenza</_name> - <coordinates>45.016667 9.666667</coordinates> - <location> - <name>Piacenza</name> - <code>LIMS</code> - <coordinates>44.916667 9.733333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Rimini</_name> - <coordinates>44.063333 12.580833</coordinates> - <location> - <name>Rimini</name> - <code>LIPR</code> - <coordinates>44.033333 12.616667</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Trentino-Alto Adige</_name> - <city> - <!-- A city in Italy --> - <_name>Bolzano</_name> - <coordinates>46.516667 11.366667</coordinates> - <location> - <name>Bolzano</name> - <code>LIPB</code> - <coordinates>46.466667 11.333333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Dobbiaco</_name> - <coordinates>46.742500 12.231389</coordinates> - <location> - <name>Dobbiaco</name> - <code>LIVD</code> - <coordinates>46.733333 12.216667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Paneveggio</_name> - <coordinates>46.300000 11.733333</coordinates> - <location> - <name>Passo Rolle</name> - <code>LIVR</code> - <coordinates>46.300000 11.783333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Resia</_name> - <coordinates>46.833333 10.516667</coordinates> - <location> - <name>Resia Pass</name> - <code>LIVE</code> - <coordinates>46.833333 10.500000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Sporminore</_name> - <coordinates>46.166667 11.033333</coordinates> - <location> - <name>Paganella</name> - <code>LIVP</code> - <coordinates>46.150000 11.033333</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Val d'Aosta</_name> - <city> - <!-- A city in Italy --> - <_name>Breuil-Cervinia</_name> - <coordinates>45.933333 7.633333</coordinates> - <location> - <name>Pian Rosa</name> - <code>LIMH</code> - <coordinates>45.933333 7.700000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Campania</_name> - <city> - <!-- A city in Italy --> - <_name>Capri</_name> - <coordinates>40.550000 14.233333</coordinates> - <location> - <name>Capri</name> - <code>LIQC</code> - <coordinates>40.550000 14.200000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Grazzanise</_name> - <coordinates>41.083333 14.100000</coordinates> - <location> - <name>Grazzanise</name> - <code>LIRM</code> - <coordinates>41.050000 14.066667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy. - "Naples" is the traditional English name. - The local name in Italian is "Napoli". - --> - <_name msgctxt="City in Italy">Naples</_name> - <coordinates>40.833333 14.250000</coordinates> - <location> - <name>Capodichino Airport</name> - <code>LIRN</code> - <coordinates>40.850000 14.300000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Pontecagnano</_name> - <coordinates>40.633333 14.883333</coordinates> - <location> - <name>Pontecagnano Air Force Base</name> - <code>LIRI</code> - <coordinates>40.616667 14.916667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Trevico</_name> - <coordinates>41.050000 15.216667</coordinates> - <location> - <name>Trevico</name> - <code>LIRT</code> - <coordinates>41.050000 15.233333</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Piedmont</_name> - <city> - <!-- A city in Italy --> - <_name>Case Arfel</_name> - <coordinates>44.250000 7.783333</coordinates> - <location> - <name>Monte Malanotte</name> - <code>LIMY</code> - <coordinates>44.250000 7.800000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Cuneo</_name> - <coordinates>44.383333 7.533333</coordinates> - <location> - <name>Levaldigi Airport</name> - <code>LIMZ</code> - <coordinates>44.546389 7.622222</coordinates> - </location> - </city> - <city> - <!-- A city in Italy. - "Turin" is the traditional English name. - The local name is "Torino". - --> - <_name>Turin</_name> - <coordinates>45.050000 7.666667</coordinates> - <location> - <name>Caselle Airport</name> - <code>LIMF</code> - <coordinates>45.216667 7.650000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Sicily</_name> - <city> - <!-- A city in Italy --> - <_name>Catania</_name> - <coordinates>37.500000 15.100000</coordinates> - <location> - <name>Fontanarossa Airport</name> - <code>LICC</code> - <coordinates>37.466667 15.050000</coordinates> - </location> - <location> - <name>Sigonella Airport</name> - <code>LICZ</code> - <coordinates>37.400000 14.916667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Lampedusa</_name> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Gioia del Colle</_name> + <coordinates>40.800000 16.916667</coordinates> + <location> + <name>Gioia del Colle</name> + <code>LIBV</code> + <coordinates>40.766667 16.933333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Grottaglie</_name> + <coordinates>40.533333 17.433333</coordinates> + <location> + <name>Grottaglie</name> + <code>LIBG</code> + <coordinates>40.516667 17.400000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Lecce</_name> + <coordinates>40.383333 18.183333</coordinates> + <location> + <name>Lecce</name> + <code>LIBN</code> + <coordinates>40.233333 18.150000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Tamaricciola</_name> + <coordinates>41.416667 15.733333</coordinates> + <location> + <name>Amendola</name> + <code>LIBA</code> + <coordinates>41.533333 15.716667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Bergamo</_name> + <coordinates>45.683333 9.716667</coordinates> + <location> + <name>Orio Al Serio Airport</name> + <code>LIME</code> + <coordinates>45.666667 9.700000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Brescia</_name> + <coordinates>45.550000 10.250000</coordinates> + <location> + <name>Ghedi Airport</name> + <code>LIPL</code> + <coordinates>45.416667 10.283333</coordinates> + </location> + <location> + <name>Montichiari Airport</name> + <code>LIPO</code> + <coordinates>45.400556 10.316389</coordinates> + </location> + </city> + <city> + <!-- A city in Italy. + "Milan" is the traditional English name. + The local name in Italian is "Milano". + --> + <_name>Milan</_name> + <coordinates>45.466667 9.200000</coordinates> + <location> + <name>Linate Airport</name> + <code>LIML</code> + <coordinates>45.433333 9.283333</coordinates> + </location> + <location> + <name>Malpensa Airport</name> + <code>LIMC</code> + <coordinates>45.616667 8.733333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Bologna</_name> + <coordinates>44.493850 11.342400</coordinates> + <location> + <name>Borgo Panigale Airport</name> + <code>LIPE</code> + <coordinates>44.527800 11.294370</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Cervia</_name> + <coordinates>44.261667 12.358889</coordinates> + <location> + <name>Cervia</name> + <code>LIPC</code> + <coordinates>44.216667 12.300000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Ferrara</_name> + <coordinates>44.833333 11.583333</coordinates> + <location> + <name>Ferrara</name> + <code>LIPF</code> + <coordinates>44.833333 11.616667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Forlì</_name> + <coordinates>44.223611 12.052778</coordinates> + <location> + <name>Forlì</name> + <code>LIPK</code> + <coordinates>44.200000 12.066667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Parma</_name> + <coordinates>44.800000 10.333333</coordinates> + <location> + <name>Parma</name> + <code>LIMP</code> + <coordinates>44.821389 10.294722</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Piacenza</_name> + <coordinates>45.016667 9.666667</coordinates> + <location> + <name>Piacenza</name> + <code>LIMS</code> + <coordinates>44.916667 9.733333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Rimini</_name> + <coordinates>44.063333 12.580833</coordinates> + <location> + <name>Rimini</name> + <code>LIPR</code> + <coordinates>44.033333 12.616667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Bolzano</_name> + <coordinates>46.516667 11.366667</coordinates> + <location> + <name>Bolzano</name> + <code>LIPB</code> + <coordinates>46.466667 11.333333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Dobbiaco</_name> + <coordinates>46.742500 12.231389</coordinates> + <location> + <name>Dobbiaco</name> + <code>LIVD</code> + <coordinates>46.733333 12.216667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Paneveggio</_name> + <coordinates>46.300000 11.733333</coordinates> + <location> + <name>Passo Rolle</name> + <code>LIVR</code> + <coordinates>46.300000 11.783333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Resia</_name> + <coordinates>46.833333 10.516667</coordinates> + <location> + <name>Resia Pass</name> + <code>LIVE</code> + <coordinates>46.833333 10.500000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Sporminore</_name> + <coordinates>46.166667 11.033333</coordinates> + <location> + <name>Paganella</name> + <code>LIVP</code> + <coordinates>46.150000 11.033333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Breuil-Cervinia</_name> + <coordinates>45.933333 7.633333</coordinates> + <location> + <name>Pian Rosa</name> + <code>LIMH</code> + <coordinates>45.933333 7.700000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Capri</_name> + <coordinates>40.550000 14.233333</coordinates> + <location> + <name>Capri</name> + <code>LIQC</code> + <coordinates>40.550000 14.200000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Grazzanise</_name> + <coordinates>41.083333 14.100000</coordinates> + <location> + <name>Grazzanise</name> + <code>LIRM</code> + <coordinates>41.050000 14.066667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy. + "Naples" is the traditional English name. + The local name in Italian is "Napoli". + --> + <_name msgctxt="City in Italy">Naples</_name> + <coordinates>40.833333 14.250000</coordinates> + <location> + <name>Capodichino Airport</name> + <code>LIRN</code> + <coordinates>40.850000 14.300000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Pontecagnano</_name> + <coordinates>40.633333 14.883333</coordinates> + <location> + <name>Pontecagnano Air Force Base</name> + <code>LIRI</code> + <coordinates>40.616667 14.916667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Trevico</_name> + <coordinates>41.050000 15.216667</coordinates> + <location> + <name>Trevico</name> + <code>LIRT</code> + <coordinates>41.050000 15.233333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Case Arfel</_name> + <coordinates>44.250000 7.783333</coordinates> + <location> + <name>Monte Malanotte</name> + <code>LIMY</code> + <coordinates>44.250000 7.800000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Cuneo</_name> + <coordinates>44.383333 7.533333</coordinates> + <location> + <name>Levaldigi Airport</name> + <code>LIMZ</code> + <coordinates>44.546389 7.622222</coordinates> + </location> + </city> + <city> + <!-- A city in Italy. + "Turin" is the traditional English name. + The local name is "Torino". + --> + <_name>Turin</_name> + <coordinates>45.050000 7.666667</coordinates> + <location> + <name>Caselle Airport</name> + <code>LIMF</code> + <coordinates>45.216667 7.650000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Catania</_name> + <coordinates>37.500000 15.100000</coordinates> + <location> + <name>Fontanarossa Airport</name> + <code>LICC</code> + <coordinates>37.466667 15.050000</coordinates> + </location> + <location> + <name>Sigonella Airport</name> + <code>LICZ</code> + <coordinates>37.400000 14.916667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Lampedusa</_name> + <coordinates>35.500000 12.600000</coordinates> + <location> + <name>Lampedusa</name> + <code>LICD</code> <coordinates>35.500000 12.600000</coordinates> - <location> - <name>Lampedusa</name> - <code>LICD</code> - <coordinates>35.500000 12.600000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Messina</_name> - <coordinates>38.183333 15.566667</coordinates> - <location> - <name>Messina</name> - <code>LICF</code> - <coordinates>38.200000 15.550000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Palermo</_name> - <coordinates>38.116667 13.366667</coordinates> - <location> - <name>Punta Raisi Airport</name> - <code>LICJ</code> - <coordinates>38.183333 13.100000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Pantelleria</_name> - <coordinates>36.833333 11.950000</coordinates> - <location> - <name>Pantelleria</name> - <code>LICG</code> - <coordinates>36.816667 11.966667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Trapani</_name> - <coordinates>38.016667 12.483333</coordinates> - <location> - <name>Birgi Airport</name> - <code>LICT</code> - <coordinates>37.916667 12.500000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Calabria</_name> - <city> - <!-- A city in Italy --> - <_name>Crotone</_name> - <coordinates>39.083333 17.133333</coordinates> - <location> - <name>Crotone</name> - <code>LIBC</code> - <coordinates>39.000000 17.066667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Reggio di Calabria</_name> - <coordinates>38.100000 15.650000</coordinates> - <location> - <name>Reggio di Calabria</name> - <code>LICR</code> - <coordinates>38.066667 15.650000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Sant'Eufemia Lamezia</_name> - <coordinates>38.916667 16.250000</coordinates> - <location> - <name>Lamezia Terme</name> - <code>LICA</code> - <coordinates>38.900000 16.250000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Tuscany</_name> - <city> - <!-- A city in Italy. - "Florence" is the traditional English name. - The local name in Italian is "Firenze". - --> - <_name msgctxt="City in Italy">Florence</_name> - <coordinates>43.766667 11.250000</coordinates> - <location> - <name>Peretola Airport</name> - <code>LIRQ</code> - <coordinates>43.800000 11.200000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Grosseto</_name> - <coordinates>42.766667 11.133333</coordinates> - <location> - <name>Grosseto</name> - <code>LIRS</code> - <coordinates>42.750000 11.066667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Lucca</_name> - <coordinates>43.825555 10.579156</coordinates> - </city> - <city> - <!-- A city in Italy --> - <_name>Palazzo</_name> - <coordinates>42.716667 10.383333</coordinates> - <location> - <name>M. Calamita</name> - <code>LIRX</code> - <coordinates>42.733333 10.400000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Pisa</_name> - <coordinates>43.716667 10.383333</coordinates> - <location> - <name>S. Giusto Airport</name> - <code>LIRP</code> - <coordinates>43.683333 10.383333</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Lazio</_name> - <city> - <!-- A city in Italy --> - <_name>Frosinone</_name> - <coordinates>41.633333 13.316667</coordinates> - <location> - <name>Frosinone</name> - <code>LIRH</code> - <coordinates>41.633333 13.300000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Latina</_name> - <coordinates>41.466667 12.866667</coordinates> - <location> - <name>Latina</name> - <code>LIRL</code> - <coordinates>41.550000 12.900000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Pratica di Mare</_name> - <coordinates>41.666667 12.483333</coordinates> - <location> - <name>Pratica di Mare</name> - <code>LIRE</code> - <coordinates>41.650000 12.450000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Rieti</_name> - <coordinates>42.400000 12.850000</coordinates> - <location> - <name>Rieti</name> - <code>LIQN</code> - <coordinates>42.416667 12.850000</coordinates> - </location> - </city> - <city> - <!-- The capital of Italy. - "Rome" is the traditional English name. - The local name in Italian is "Roma". - --> - <_name msgctxt="City in Italy">Rome</_name> - <coordinates>41.900000 12.483333</coordinates> - <location> - <name>Urbe Airport</name> - <code>LIRU</code> - <coordinates>41.950000 12.500000</coordinates> - </location> - <location> - <name>Ciampino Airport</name> - <code>LIRA</code> - <coordinates>41.783333 12.583333</coordinates> - </location> - <location> - <name>Roma Fiumicino</name> - <code>LIRF</code> - <coordinates>41.800000 12.233333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Viterbo</_name> - <coordinates>42.416667 12.100000</coordinates> - <location> - <name>Viterbo</name> - <code>LIRV</code> - <coordinates>42.433333 12.050000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Marche</_name> - <city> - <!-- A city in Italy --> - <_name>Ancona</_name> - <coordinates>43.616530 13.518780</coordinates> - <location> - <name>Falconara Airport</name> - <code>LIPY</code> - <coordinates>43.605950 13.354360</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Umbria</_name> - <city> - <!-- A city in Italy --> - <_name>Perugia</_name> - <coordinates>43.133333 12.366667</coordinates> - <location> - <name>Perugia</name> - <code>LIRZ</code> - <coordinates>43.083333 12.500000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Salignano</_name> - <coordinates>39.833333 18.350000</coordinates> - <location> - <name>S. Maria di Leuca</name> - <code>LIBY</code> - <coordinates>39.816667 18.350000</coordinates> - </location> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Abruzzo</_name> - <city> - <!-- A city in Italy --> - <_name>Pescara</_name> - <coordinates>42.466667 14.216667</coordinates> - <location> - <name>Abruzzo International Airport</name> - <code>LIBP</code> - <coordinates>42.433333 14.200000</coordinates> - </location> - </city> - <city> + </location> + </city> + <city> <!-- A city in Italy --> - <_name>L'Aquila</_name> - <coordinates>42.349838 13.399456</coordinates> - </city> - </province> - <province> - <!-- An administrative division of Italy --> - <_name>Veneto</_name> - <city> - <!-- A city in Italy --> - <_name>Treviso</_name> - <coordinates>45.666667 12.245000</coordinates> - <location> - <name>S. Angelo Airport</name> - <code>LIPH</code> - <coordinates>45.650000 12.183333</coordinates> - </location> - <location> - <name>Istrana Airport</name> - <code>LIPS</code> - <coordinates>45.683333 12.100000</coordinates> - </location> - </city> - <city> - <!-- A city in Italy. - "Venice" is the traditional English name. - The local name in Italian is "Venezia". - --> - <_name>Venice</_name> - <coordinates>45.438611 12.326667</coordinates> - <location> - <name>Tessera Airport</name> - <code>LIPZ</code> - <coordinates>45.500000 12.333333</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Verona</_name> - <coordinates>45.450000 11.000000</coordinates> - <location> - <name>Villafranca Airport</name> - <code>LIPX</code> - <coordinates>45.383333 10.866667</coordinates> - </location> - </city> - <city> - <!-- A city in Italy --> - <_name>Vicenza</_name> - <coordinates>45.54765 11.54537</coordinates> - <location> - <name>Dal Molin Military Airport</name> - <code>LIPT</code> - <coordinates>45.566667 11.516667</coordinates> - </location> - </city> - </province> + <_name>Messina</_name> + <coordinates>38.183333 15.566667</coordinates> + <location> + <name>Messina</name> + <code>LICF</code> + <coordinates>38.200000 15.550000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Palermo</_name> + <coordinates>38.116667 13.366667</coordinates> + <location> + <name>Punta Raisi Airport</name> + <code>LICJ</code> + <coordinates>38.183333 13.100000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Pantelleria</_name> + <coordinates>36.833333 11.950000</coordinates> + <location> + <name>Pantelleria</name> + <code>LICG</code> + <coordinates>36.816667 11.966667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Trapani</_name> + <coordinates>38.016667 12.483333</coordinates> + <location> + <name>Birgi Airport</name> + <code>LICT</code> + <coordinates>37.916667 12.500000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Crotone</_name> + <coordinates>39.083333 17.133333</coordinates> + <location> + <name>Crotone</name> + <code>LIBC</code> + <coordinates>39.000000 17.066667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Reggio di Calabria</_name> + <coordinates>38.100000 15.650000</coordinates> + <location> + <name>Reggio di Calabria</name> + <code>LICR</code> + <coordinates>38.066667 15.650000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Sant'Eufemia Lamezia</_name> + <coordinates>38.916667 16.250000</coordinates> + <location> + <name>Lamezia Terme</name> + <code>LICA</code> + <coordinates>38.900000 16.250000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy. + "Florence" is the traditional English name. + The local name in Italian is "Firenze". + --> + <_name msgctxt="City in Italy">Florence</_name> + <coordinates>43.766667 11.250000</coordinates> + <location> + <name>Peretola Airport</name> + <code>LIRQ</code> + <coordinates>43.800000 11.200000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Grosseto</_name> + <coordinates>42.766667 11.133333</coordinates> + <location> + <name>Grosseto</name> + <code>LIRS</code> + <coordinates>42.750000 11.066667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Lucca</_name> + <coordinates>43.825555 10.579156</coordinates> + </city> + <city> + <!-- A city in Italy --> + <_name>Palazzo</_name> + <coordinates>42.716667 10.383333</coordinates> + <location> + <name>M. Calamita</name> + <code>LIRX</code> + <coordinates>42.733333 10.400000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Pisa</_name> + <coordinates>43.716667 10.383333</coordinates> + <location> + <name>S. Giusto Airport</name> + <code>LIRP</code> + <coordinates>43.683333 10.383333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Frosinone</_name> + <coordinates>41.633333 13.316667</coordinates> + <location> + <name>Frosinone</name> + <code>LIRH</code> + <coordinates>41.633333 13.300000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Latina</_name> + <coordinates>41.466667 12.866667</coordinates> + <location> + <name>Latina</name> + <code>LIRL</code> + <coordinates>41.550000 12.900000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Pratica di Mare</_name> + <coordinates>41.666667 12.483333</coordinates> + <location> + <name>Pratica di Mare</name> + <code>LIRE</code> + <coordinates>41.650000 12.450000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Rieti</_name> + <coordinates>42.400000 12.850000</coordinates> + <location> + <name>Rieti</name> + <code>LIQN</code> + <coordinates>42.416667 12.850000</coordinates> + </location> + </city> + <city> + <!-- The capital of Italy. + "Rome" is the traditional English name. + The local name in Italian is "Roma". + --> + <_name msgctxt="City in Italy">Rome</_name> + <coordinates>41.900000 12.483333</coordinates> + <location> + <name>Urbe Airport</name> + <code>LIRU</code> + <coordinates>41.950000 12.500000</coordinates> + </location> + <location> + <name>Ciampino Airport</name> + <code>LIRA</code> + <coordinates>41.783333 12.583333</coordinates> + </location> + <location> + <name>Roma Fiumicino</name> + <code>LIRF</code> + <coordinates>41.800000 12.233333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Viterbo</_name> + <coordinates>42.416667 12.100000</coordinates> + <location> + <name>Viterbo</name> + <code>LIRV</code> + <coordinates>42.433333 12.050000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Ancona</_name> + <coordinates>43.616530 13.518780</coordinates> + <location> + <name>Falconara Airport</name> + <code>LIPY</code> + <coordinates>43.605950 13.354360</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Perugia</_name> + <coordinates>43.133333 12.366667</coordinates> + <location> + <name>Perugia</name> + <code>LIRZ</code> + <coordinates>43.083333 12.500000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Salignano</_name> + <coordinates>39.833333 18.350000</coordinates> + <location> + <name>S. Maria di Leuca</name> + <code>LIBY</code> + <coordinates>39.816667 18.350000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Pescara</_name> + <coordinates>42.466667 14.216667</coordinates> + <location> + <name>Abruzzo International Airport</name> + <code>LIBP</code> + <coordinates>42.433333 14.200000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>L'Aquila</_name> + <coordinates>42.349838 13.399456</coordinates> + </city> + <city> + <!-- A city in Italy --> + <_name>Treviso</_name> + <coordinates>45.666667 12.245000</coordinates> + <location> + <name>S. Angelo Airport</name> + <code>LIPH</code> + <coordinates>45.650000 12.183333</coordinates> + </location> + <location> + <name>Istrana Airport</name> + <code>LIPS</code> + <coordinates>45.683333 12.100000</coordinates> + </location> + </city> + <city> + <!-- A city in Italy. + "Venice" is the traditional English name. + The local name in Italian is "Venezia". + --> + <_name>Venice</_name> + <coordinates>45.438611 12.326667</coordinates> + <location> + <name>Tessera Airport</name> + <code>LIPZ</code> + <coordinates>45.500000 12.333333</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Verona</_name> + <coordinates>45.450000 11.000000</coordinates> + <location> + <name>Villafranca Airport</name> + <code>LIPX</code> + <coordinates>45.383333 10.866667</coordinates> + </location> + </city> + <city> + <!-- A city in Italy --> + <_name>Vicenza</_name> + <coordinates>45.54765 11.54537</coordinates> + <location> + <name>Dal Molin Military Airport</name> + <code>LIPT</code> + <coordinates>45.566667 11.516667</coordinates> + </location> + </city> </country> <country> <!-- JE - The Bailiwick of Jersey, a British Crown dependency --> diff --git a/data/locations.dtd b/data/locations.dtd index 8e25504..1ba2d11 100644 --- a/data/locations.dtd +++ b/data/locations.dtd @@ -5,9 +5,8 @@ <!ENTITY % name '(_name|name+)' > <!ELEMENT region (%name;, country+) > -<!ELEMENT country (%name;, iso-code, fips-code+, pref-lang?, timezones, tz-hint?, (location|state|province|city)*) > +<!ELEMENT country (%name;, iso-code, fips-code+, pref-lang?, timezones, tz-hint?, (location|state|city)*) > <!ELEMENT state (%name;, fips-code+, tz-hint?, (location|city)*) > -<!ELEMENT province (%name;, (location|city)*) > <!ELEMENT city (%name;, coordinates?, tz-hint?, location*) > <!ELEMENT location (name, code, zone?, radar?, coordinates?) > <!ELEMENT named-timezone (%name;, timezones, tz-hint, code)> diff --git a/libgweather/gweather-location.c b/libgweather/gweather-location.c index e68a737..7d6f922 100644 --- a/libgweather/gweather-location.c +++ b/libgweather/gweather-location.c @@ -60,7 +60,8 @@ * division. * @GWEATHER_LOCATION_ADM2: A location representing a subdivision of a * %GWEATHER_LOCATION_ADM1 location, or a direct subdivision of - * a country that is not represented in a #GWeatherLocationEntry. + * a country that is not represented in a #GWeatherLocationEntry. This + * is not used. * @GWEATHER_LOCATION_CITY: A location representing a city * @GWEATHER_LOCATION_WEATHER_STATION: A location representing a * weather station. @@ -300,11 +301,6 @@ location_new_from_xml (GWeatherParser *parser, GWeatherLocationLevel level, if (!child) goto error_out; g_ptr_array_add (children, child); - } else if (!strcmp (tagname, "province")) { - child = location_new_from_xml (parser, GWEATHER_LOCATION_ADM2, loc); - if (!child) - goto error_out; - g_ptr_array_add (children, child); } else if (!strcmp (tagname, "city")) { child = location_new_from_xml (parser, GWEATHER_LOCATION_CITY, loc); if (!child) |