Ubuntu Clock App

Merge lp:~rpadovani/ubuntu-clock-app/1203649 into lp:ubuntu-clock-app/saucy

  1. 1203649
  2. Merge into saucy
Proposed by Riccardo Padovani
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 331
Merged at revision: 334
Proposed branch: lp:~rpadovani/ubuntu-clock-app/1203649
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 1538 lines (+1146/-6)
3 files modified
clock/common-cities.xml (+1140/-0)
debian/copyright (+4/-4)
tests/autopilot/ubuntu_clock_app/tests/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-clock-app/1203649
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+205387@code.launchpad.net

Commit message

Updated list of cities available offline.

Description of the change

Updated list of cities available offline.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:329
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/211/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1169
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/211
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/211
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/129

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/211/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Hey can you add Beirut to the list since it is in CM 11 and is also an important city.

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

> Hey can you add Beirut to the list since it is in CM 11 and is also an
> important city.

Mhh, probabily I didn't see it, done :-)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:330
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/216/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1193
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/216
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/216
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/134

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/216/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm! Thanks for the patch.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/116/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/52

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/117/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1195
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/117
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/117
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/53

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

hmm, the tests pass on my laptop. I am really getting why it fails on jenkins. Approving one last time before talking to balloons and elopio about this.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/118/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1196
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/118
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/118
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/54

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/119/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1198
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/119
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/119
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/55

review: Needs Fixing (continuous-integration)
lp:~rpadovani/ubuntu-clock-app/1203649 updated
331. By Riccardo Padovani

Merged ~nik90/ubuntu-clock-app/fix-autopilot-environment-cleanup

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:331
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/218/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1200
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/218
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/218
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/136

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/218/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Awesome the add local city test passes. The only test that is failing is the alarms test which is by default flaky and is being fixed in another MP. So let's first wait for the other MP (autopilot environment cleanup) to be merged first.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clock/common-cities.xml'
2--- clock/common-cities.xml 2013-06-16 10:39:41 +0000
3+++ clock/common-cities.xml 2014-02-09 17:25:55 +0000
4@@ -1,12 +1,30 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <geonames style="MEDIUM">
7 <geoname>
8+ <toponymName>Abidjan</toponymName>
9+ <lat>5.30966</lat>
10+ <lng>-4.01266</lng>
11+ <countryName>Ivory Coast</countryName>
12+ </geoname>
13+ <geoname>
14 <toponymName>Abu Dhabi</toponymName>
15 <lat>24.46667</lat>
16 <lng>54.36667</lng>
17 <countryName>United Arab Emirates</countryName>
18 </geoname>
19 <geoname>
20+ <toponymName>Accra</toponymName>
21+ <lat>5.55602</lat>
22+ <lng>-0.1969</lng>
23+ <countryName>Ghana</countryName>
24+ </geoname>
25+ <geoname>
26+ <toponymName>Addis Ababa</toponymName>
27+ <lat>9.02497</lat>
28+ <lng>38.74689</lng>
29+ <countryName>Ethiopia</countryName>
30+ </geoname>
31+ <geoname>
32 <toponymName>Adelaide</toponymName>
33 <lat>-34.92866</lat>
34 <lng>138.59863</lng>
35@@ -19,6 +37,24 @@
36 <countryName>United States</countryName>
37 </geoname>
38 <geoname>
39+ <toponymName>Albuquerque</toponymName>
40+ <lat>35.08449</lat>
41+ <lng>-106.65114</lng>
42+ <countryName>United States</countryName>
43+ </geoname>
44+ <geoname>
45+ <toponymName>Algiers</toponymName>
46+ <lat>36.7525</lat>
47+ <lng>3.04197</lng>
48+ <countryName>Algeria</countryName>
49+ </geoname>
50+ <geoname>
51+ <toponymName>Almaty</toponymName>
52+ <lat>43.25654</lat>
53+ <lng>76.92848</lng>
54+ <countryName>Kazakhstan</countryName>
55+ </geoname>
56+ <geoname>
57 <toponymName>Amman</toponymName>
58 <lat>31.95522</lat>
59 <lng>35.94503</lng>
60@@ -37,18 +73,60 @@
61 <countryName>Russia</countryName>
62 </geoname>
63 <geoname>
64+ <toponymName>Anchorage</toponymName>
65+ <lat>61.21806</lat>
66+ <lng>-149.90028</lng>
67+ <countryName>United States</countryName>
68+ </geoname>
69+ <geoname>
70+ <toponymName>Andorra la Vella</toponymName>
71+ <lat>42.50779</lat>
72+ <lng>1.52109</lng>
73+ <countryName>Andorra</countryName>
74+ </geoname>
75+ <geoname>
76 <toponymName>Ankara</toponymName>
77 <lat>39.91987</lat>
78 <lng>32.85427</lng>
79 <countryName>Turkey</countryName>
80 </geoname>
81 <geoname>
82+ <toponymName>Ann Arbor</toponymName>
83+ <lat>42.27756</lat>
84+ <lng>-83.74088</lng>
85+ <countryName>United States</countryName>
86+ </geoname>
87+ <geoname>
88 <toponymName>Antananarivo</toponymName>
89 <lat>-18.91368</lat>
90 <lng>47.53613</lng>
91 <countryName>Madagascar</countryName>
92 </geoname>
93 <geoname>
94+ <toponymName>Antigua</toponymName>
95+ <lat>28.42307</lat>
96+ <lng>-14.01379</lng>
97+ <countryName>Spain</countryName>
98+ </geoname>
99+ <geoname>
100+ <toponymName>Aktau</toponymName>
101+ <lat>43.64806</lat>
102+ <lng>51.17222</lng>
103+ <countryName>Kazakhstan</countryName>
104+ </geoname>
105+ <geoname>
106+ <toponymName>Aruba</toponymName>
107+ <lat>-3.1</lat>
108+ <lng>133.78333</lng>
109+ <countryName>Indonesia</countryName>
110+ </geoname>
111+ <geoname>
112+ <toponymName>Asunción</toponymName>
113+ <lat>-25.30066</lat>
114+ <lng>-57.63591</lng>
115+ <countryName>Paraguay</countryName>
116+ </geoname>
117+ <geoname>
118 <toponymName>Athens</toponymName>
119 <lat>37.97945</lat>
120 <lng>23.71622</lng>
121@@ -85,6 +163,18 @@
122 <countryName>Iraq</countryName>
123 </geoname>
124 <geoname>
125+ <toponymName>Baku</toponymName>
126+ <lat>40.37767</lat>
127+ <lng>49.89201</lng>
128+ <countryName>Azerbaijan</countryName>
129+ </geoname>
130+ <geoname>
131+ <toponymName>Baltimore</toponymName>
132+ <lat>39.29038</lat>
133+ <lng>-76.61219</lng>
134+ <countryName>United States</countryName>
135+ </geoname>
136+ <geoname>
137 <toponymName>Bangalore</toponymName>
138 <lat>12.97194</lat>
139 <lng>77.59369</lng>
140@@ -109,6 +199,36 @@
141 <countryName>China</countryName>
142 </geoname>
143 <geoname>
144+ <toponymName>Beirut</toponymName>
145+ <lat>33.88894</lat>
146+ <lng>35.49442</lng>
147+ <countryName>Lebanon</countryName>
148+ </geoname>
149+ <geoname>
150+ <toponymName>Belfast</toponymName>
151+ <lat>54.58333</lat>
152+ <lng>-5.93333</lng>
153+ <countryName>United Kingdom</countryName>
154+ </geoname>
155+ <geoname>
156+ <toponymName>Belgrade</toponymName>
157+ <lat>44.80401</lat>
158+ <lng>20.46513</lng>
159+ <countryName>Serbia</countryName>
160+ </geoname>
161+ <geoname>
162+ <toponymName>Belize City</toponymName>
163+ <lat>17.49952</lat>
164+ <lng>-88.19756</lng>
165+ <countryName>Belize</countryName>
166+ </geoname>
167+ <geoname>
168+ <toponymName>Belo Horizonte</toponymName>
169+ <lat>-19.92083</lat>
170+ <lng>-43.93778</lng>
171+ <countryName>Brazil</countryName>
172+ </geoname>
173+ <geoname>
174 <toponymName>Berlin</toponymName>
175 <lat>52.52437</lat>
176 <lng>13.41053</lng>
177@@ -121,42 +241,228 @@
178 <countryName>Switzerland</countryName>
179 </geoname>
180 <geoname>
181+ <toponymName>Beulah</toponymName>
182+ <lat>47.26334</lat>
183+ <lng>-101.77795</lng>
184+ <countryName>United States</countryName>
185+ </geoname>
186+ <geoname>
187+ <toponymName>Black Rock City</toponymName>
188+ <lat>40.76923</lat>
189+ <lng>-119.22006</lng>
190+ <countryName>United States</countryName>
191+ </geoname>
192+ <geoname>
193+ <toponymName>Blantyre</toponymName>
194+ <lat>-15.78499</lat>
195+ <lng>35.00854</lng>
196+ <countryName>Malawi</countryName>
197+ </geoname>
198+ <geoname>
199+ <toponymName>Bogotá</toponymName>
200+ <lat>4.60971</lat>
201+ <lng>-74.08175</lng>
202+ <countryName>Colombia</countryName>
203+ </geoname>
204+ <geoname>
205+ <toponymName>Boston</toponymName>
206+ <lat>42.35843</lat>
207+ <lng>-71.05977</lng>
208+ <countryName>United States</countryName>
209+ </geoname>
210+ <geoname>
211+ <toponymName>Boulder</toponymName>
212+ <lat>40.01499</lat>
213+ <lng>-105.27055</lng>
214+ <countryName>United States</countryName>
215+ </geoname>
216+ <geoname>
217+ <toponymName>Brasília</toponymName>
218+ <lat>-15.77972</lat>
219+ <lng>-47.92972</lng>
220+ <countryName>Brazil</countryName>
221+ </geoname>
222+ <geoname>
223+ <toponymName>Bratislava</toponymName>
224+ <lat>48.14816</lat>
225+ <lng>17.10674</lng>
226+ <countryName>Slovakia</countryName>
227+ </geoname>
228+ <geoname>
229+ <toponymName>Brazzaville</toponymName>
230+ <lat>-4.26613</lat>
231+ <lng>15.28318</lng>
232+ <countryName>Republic of the Congo</countryName>
233+ </geoname>
234+ <geoname>
235+ <toponymName>Brisbane</toponymName>
236+ <lat>-27.46794</lat>
237+ <lng>153.02809</lng>
238+ <countryName>Australia</countryName>
239+ </geoname>
240+ <geoname>
241 <toponymName>Brussels</toponymName>
242 <lat>50.85045</lat>
243 <lng>4.34878</lng>
244 <countryName>Belgium</countryName>
245 </geoname>
246 <geoname>
247+ <toponymName>Bucharest</toponymName>
248+ <lat>44.43225</lat>
249+ <lng>26.10626</lng>
250+ <countryName>Romania</countryName>
251+ </geoname>
252+ <geoname>
253+ <toponymName>Budapest</toponymName>
254+ <lat>47.49801</lat>
255+ <lng>19.03991</lng>
256+ <countryName>Hungary</countryName>
257+ </geoname>
258+ <geoname>
259+ <toponymName>Buenos Aires</toponymName>
260+ <lat>-34.61315</lat>
261+ <lng>-58.37723</lng>
262+ <countryName>Argentina</countryName>
263+ </geoname>
264+ <geoname>
265 <toponymName>Cairo</toponymName>
266 <lat>30.06263</lat>
267 <lng>31.24967</lng>
268 <countryName>Egypt</countryName>
269 </geoname>
270 <geoname>
271+ <toponymName>Calcutta</toponymName>
272+ <lat>22.56263</lat>
273+ <lng>88.36304</lng>
274+ <countryName>India</countryName>
275+ </geoname>
276+ <geoname>
277+ <toponymName>Calgary</toponymName>
278+ <lat>51.05011</lat>
279+ <lng>-114.08529</lng>
280+ <countryName>Canada</countryName>
281+ </geoname>
282+ <geoname>
283+ <toponymName>Cambridge</toponymName>
284+ <lat>52.2</lat>
285+ <lng>0.11667</lng>
286+ <countryName>United Kingdom</countryName>
287+ </geoname>
288+ <geoname>
289+ <toponymName>Canary</toponymName>
290+ <lat>-23.24174</lat>
291+ <lng>140.35708</lng>
292+ <countryName>Australia</countryName>
293+ </geoname>
294+ <geoname>
295+ <toponymName>Canberra</toponymName>
296+ <lat>-35.28346</lat>
297+ <lng>149.12807</lng>
298+ <countryName>Australia</countryName>
299+ </geoname>
300+ <geoname>
301+ <toponymName>Cancún</toponymName>
302+ <lat>21.17429</lat>
303+ <lng>-86.84656</lng>
304+ <countryName>Mexico</countryName>
305+ </geoname>
306+ <geoname>
307 <toponymName>Cape Town</toponymName>
308 <lat>-33.92584</lat>
309 <lng>18.42322</lng>
310 <countryName>South Africa</countryName>
311 </geoname>
312 <geoname>
313+ <toponymName>Caracas</toponymName>
314+ <lat>10.48801</lat>
315+ <lng>-66.87919</lng>
316+ <countryName>Venezuela</countryName>
317+ </geoname>
318+ <geoname>
319+ <toponymName>Casablanca</toponymName>
320+ <lat>33.58831</lat>
321+ <lng>-7.61138</lng>
322+ <countryName>Morocco</countryName>
323+ </geoname>
324+ <geoname>
325+ <toponymName>Cayman Palms</toponymName>
326+ <lat>19.26667</lat>
327+ <lng>-81.26667</lng>
328+ <countryName>Cayman Islands</countryName>
329+ </geoname>
330+ <geoname>
331+ <toponymName>Center</toponymName>
332+ <lat>37.75306</lat>
333+ <lng>-106.10864</lng>
334+ <countryName>United States</countryName>
335+ </geoname>
336+ <geoname>
337 <toponymName>Chicago</toponymName>
338 <lat>41.85003</lat>
339 <lng>-87.65005</lng>
340 <countryName>United States</countryName>
341 </geoname>
342 <geoname>
343+ <toponymName>Chihuahua</toponymName>
344+ <lat>28.63528</lat>
345+ <lng>-106.08889</lng>
346+ <countryName>Mexico</countryName>
347+ </geoname>
348+ <geoname>
349+ <toponymName>Chişinău</toponymName>
350+ <lat>47.00556</lat>
351+ <lng>28.8575</lng>
352+ <countryName>Moldova</countryName>
353+ </geoname>
354+ <geoname>
355+ <toponymName>Cincinnati</toponymName>
356+ <lat>39.162</lat>
357+ <lng>-84.45689</lng>
358+ <countryName>United States</countryName>
359+ </geoname>
360+ <geoname>
361+ <toponymName>Cleveland</toponymName>
362+ <lat>41.4995</lat>
363+ <lng>-81.69541</lng>
364+ <countryName>United States</countryName>
365+ </geoname>
366+ <geoname>
367 <toponymName>Colombo</toponymName>
368 <lat>6.93194</lat>
369 <lng>79.84778</lng>
370 <countryName>Sri Lanka</countryName>
371 </geoname>
372 <geoname>
373+ <toponymName>Columbus</toponymName>
374+ <lat>39.96118</lat>
375+ <lng>-82.99879</lng>
376+ <countryName>United States</countryName>
377+ </geoname>
378+ <geoname>
379+ <toponymName>Conakry</toponymName>
380+ <lat>9.53795</lat>
381+ <lng>-13.67729</lng>
382+ <countryName>Guinea</countryName>
383+ </geoname>
384+ <geoname>
385 <toponymName>Copenhagen</toponymName>
386 <lat>55.67594</lat>
387 <lng>12.56553</lng>
388 <countryName>Denmark</countryName>
389 </geoname>
390 <geoname>
391+ <toponymName>Dakar</toponymName>
392+ <lat>14.6937</lat>
393+ <lng>-17.44406</lng>
394+ <countryName>Senegal</countryName>
395+ </geoname>
396+ <geoname>
397+ <toponymName>Dallas</toponymName>
398+ <lat>32.78306</lat>
399+ <lng>-96.80667</lng>
400+ <countryName>United States</countryName>
401+ </geoname>
402+ <geoname>
403 <toponymName>Damascus</toponymName>
404 <lat>33.5102</lat>
405 <lng>36.29128</lng>
406@@ -169,12 +475,60 @@
407 <countryName>Tanzania</countryName>
408 </geoname>
409 <geoname>
410+ <toponymName>Darwin</toponymName>
411+ <lat>-12.46113</lat>
412+ <lng>130.84185</lng>
413+ <countryName>Australia</countryName>
414+ </geoname>
415+ <geoname>
416+ <toponymName>Dawson Creek</toponymName>
417+ <lat>55.7666</lat>
418+ <lng>-120.23616</lng>
419+ <countryName>Canada</countryName>
420+ </geoname>
421+ <geoname>
422+ <toponymName>Delhi</toponymName>
423+ <lat>28.65381</lat>
424+ <lng>77.22897</lng>
425+ <countryName>India</countryName>
426+ </geoname>
427+ <geoname>
428+ <toponymName>Denver</toponymName>
429+ <lat>39.73915</lat>
430+ <lng>-104.9847</lng>
431+ <countryName>United States</countryName>
432+ </geoname>
433+ <geoname>
434 <toponymName>Detroit</toponymName>
435 <lat>42.33143</lat>
436 <lng>-83.04575</lng>
437 <countryName>United States</countryName>
438 </geoname>
439 <geoname>
440+ <toponymName>Dhaka</toponymName>
441+ <lat>23.7104</lat>
442+ <lng>90.40744</lng>
443+ <countryName>Bangladesh</countryName>
444+ </geoname>
445+ <geoname>
446+ <toponymName>Djibouti</toponymName>
447+ <lat>11.58901</lat>
448+ <lng>43.14503</lng>
449+ <countryName>Djibouti</countryName>
450+ </geoname>
451+ <geoname>
452+ <toponymName>Doha</toponymName>
453+ <lat>25.27932</lat>
454+ <lng>51.52245</lng>
455+ <countryName>Qatar</countryName>
456+ </geoname>
457+ <geoname>
458+ <toponymName>Dubai</toponymName>
459+ <lat>25.25817</lat>
460+ <lng>55.30472</lng>
461+ <countryName>United Arab Emirates</countryName>
462+ </geoname>
463+ <geoname>
464 <toponymName>Dublin</toponymName>
465 <lat>53.33306</lat>
466 <lng>-6.24889</lng>
467@@ -187,54 +541,168 @@
468 <countryName>Scotland</countryName>
469 </geoname>
470 <geoname>
471+ <toponymName>Edmonton</toponymName>
472+ <lat>53.55014</lat>
473+ <lng>-113.46871</lng>
474+ <countryName>Canada</countryName>
475+ </geoname>
476+ <geoname>
477 <toponymName>Florence</toponymName>
478 <lat>43.76667</lat>
479 <lng>11.25</lng>
480 <countryName>Italy</countryName>
481 </geoname>
482 <geoname>
483+ <toponymName>Fortaleza</toponymName>
484+ <lat>-3.71722</lat>
485+ <lng>-38.54306</lng>
486+ <countryName>Brazil</countryName>
487+ </geoname>
488+ <geoname>
489+ <toponymName>Frankfurt</toponymName>
490+ <lat>50.11552</lat>
491+ <lng>8.68417</lng>
492+ <countryName>Germany</countryName>
493+ </geoname>
494+ <geoname>
495+ <toponymName>Free Town</toponymName>
496+ <lat>6.78028</lat>
497+ <lng>-8.69361</lng>
498+ <countryName>Liberia</countryName>
499+ </geoname>
500+ <geoname>
501+ <toponymName>Gaborone</toponymName>
502+ <lat>-24.65451</lat>
503+ <lng>25.90859</lng>
504+ <countryName>Botswana</countryName>
505+ </geoname>
506+ <geoname>
507+ <toponymName>Gaza</toponymName>
508+ <lat>31.5</lat>
509+ <lng>34.46667</lng>
510+ <countryName>Palestine</countryName>
511+ </geoname>
512+ <geoname>
513 <toponymName>Geneva</toponymName>
514 <lat>46.20222</lat>
515 <lng>6.14569</lng>
516 <countryName>Switzerland</countryName>
517 </geoname>
518 <geoname>
519+ <toponymName>Gibraltar</toponymName>
520+ <lat>36.14474</lat>
521+ <lng>-5.35257</lng>
522+ <countryName>Gibraltar</countryName>
523+ </geoname>
524+ <geoname>
525+ <toponymName>Grenada</toponymName>
526+ <lat>37.18817</lat>
527+ <lng>-3.60667</lng>
528+ <countryName>Spain</countryName>
529+ </geoname>
530+ <geoname>
531+ <toponymName>Guam</toponymName>
532+ <lat>36.902</lat>
533+ <lng>-89.8237</lng>
534+ <countryName>United States</countryName>
535+ </geoname>
536+ <geoname>
537 <toponymName>Guangzhou</toponymName>
538 <lat>23.11667</lat>
539 <lng>113.25</lng>
540 <countryName>China</countryName>
541 </geoname>
542 <geoname>
543+ <toponymName>Gurgaon</toponymName>
544+ <lat>28.4601</lat>
545+ <lng>77.02635</lng>
546+ <countryName>India</countryName>
547+ </geoname>
548+ <geoname>
549+ <toponymName>Haifa</toponymName>
550+ <lat>32.81841</lat>
551+ <lng>34.9885</lng>
552+ <countryName>Israel</countryName>
553+ </geoname>
554+ <geoname>
555+ <toponymName>Halifax</toponymName>
556+ <lat>44.64533</lat>
557+ <lng>-63.57239</lng>
558+ <countryName>Canada</countryName>
559+ </geoname>
560+ <geoname>
561 <toponymName>Hamburg</toponymName>
562 <lat>53.57532</lat>
563 <lng>10.01534</lng>
564 <countryName>Germany</countryName>
565 </geoname>
566 <geoname>
567+ <toponymName>Hanoi</toponymName>
568+ <lat>21.0245</lat>
569+ <lng>105.84117</lng>
570+ <countryName>Vietnam</countryName>
571+ </geoname>
572+ <geoname>
573+ <toponymName>Harare</toponymName>
574+ <lat>-17.82772</lat>
575+ <lng>31.05337</lng>
576+ <countryName>Zimbabwe</countryName>
577+ </geoname>
578+ <geoname>
579 <toponymName>Havana</toponymName>
580 <lat>23.13302</lat>
581 <lng>-82.38304</lng>
582 <countryName>Cuba</countryName>
583 </geoname>
584 <geoname>
585+ <toponymName>Hebron</toponymName>
586+ <lat>31.52935</lat>
587+ <lng>35.0938</lng>
588+ <countryName>Palestine</countryName>
589+ </geoname>
590+ <geoname>
591 <toponymName>Helsinki</toponymName>
592 <lat>60.16952</lat>
593 <lng>24.93545</lng>
594 <countryName>Finland</countryName>
595 </geoname>
596 <geoname>
597+ <toponymName>Ho Chi Minh City</toponymName>
598+ <lat>10.82302</lat>
599+ <lng>106.62965</lng>
600+ <countryName>Vietnam</countryName>
601+ </geoname>
602+ <geoname>
603 <toponymName>Hong Kong</toponymName>
604 <lat>22.28552</lat>
605 <lng>114.15769</lng>
606 <countryName>Hong Kong</countryName>
607 </geoname>
608 <geoname>
609+ <toponymName>Honolulu</toponymName>
610+ <lat>21.30694</lat>
611+ <lng>-157.85833</lng>
612+ <countryName>United States</countryName>
613+ </geoname>
614+ <geoname>
615 <toponymName>Houston</toponymName>
616 <lat>29.76328</lat>
617 <lng>-95.36327</lng>
618 <countryName>United States</countryName>
619 </geoname>
620 <geoname>
621+ <toponymName>Hyderabad</toponymName>
622+ <lat>17.38405</lat>
623+ <lng>78.45636</lng>
624+ <countryName>India</countryName>
625+ </geoname>
626+ <geoname>
627+ <toponymName>Indianapolis</toponymName>
628+ <lat>39.76838</lat>
629+ <lng>-86.15804</lng>
630+ <countryName>United States</countryName>
631+ </geoname>
632+ <geoname>
633 <toponymName>Islamabad</toponymName>
634 <lat>33.72148</lat>
635 <lng>73.04329</lng>
636@@ -247,6 +715,18 @@
637 <countryName>Turkey</countryName>
638 </geoname>
639 <geoname>
640+ <toponymName>Jacksonville</toponymName>
641+ <lat>30.33218</lat>
642+ <lng>-81.65565</lng>
643+ <countryName>United States</countryName>
644+ </geoname>
645+ <geoname>
646+ <toponymName>Jakarta</toponymName>
647+ <lat>-6.21462</lat>
648+ <lng>106.84513</lng>
649+ <countryName>Indonesia</countryName>
650+ </geoname>
651+ <geoname>
652 <toponymName>Jerusalem</toponymName>
653 <lat>31.78199</lat>
654 <lng>35.21961</lng>
655@@ -265,30 +745,96 @@
656 <countryName>Afghanistan</countryName>
657 </geoname>
658 <geoname>
659+ <toponymName>Kampala</toponymName>
660+ <lat>0.31628</lat>
661+ <lng>32.58219</lng>
662+ <countryName>Uganda</countryName>
663+ </geoname>
664+ <geoname>
665+ <toponymName>Karachi</toponymName>
666+ <lat>24.9056</lat>
667+ <lng>67.0822</lng>
668+ <countryName>Pakistan</countryName>
669+ </geoname>
670+ <geoname>
671+ <toponymName>Khartoum</toponymName>
672+ <lat>15.55177</lat>
673+ <lng>32.53241</lng>
674+ <countryName>Sudan</countryName>
675+ </geoname>
676+ <geoname>
677 <toponymName>Kiev</toponymName>
678 <lat>50.45466</lat>
679 <lng>30.5238</lng>
680 <countryName>Ukraine</countryName>
681 </geoname>
682 <geoname>
683+ <toponymName>Kigali</toponymName>
684+ <lat>-1.94995</lat>
685+ <lng>30.05885</lng>
686+ <countryName>Rwanda</countryName>
687+ </geoname>
688+ <geoname>
689 <toponymName>Kingston</toponymName>
690 <lat>17.99702</lat>
691 <lng>-76.79358</lng>
692 <countryName>Canada</countryName>
693 </geoname>
694 <geoname>
695+ <toponymName>Knoxville</toponymName>
696+ <lat>35.96064</lat>
697+ <lng>-83.92074</lng>
698+ <countryName>United States</countryName>
699+ </geoname>
700+ <geoname>
701+ <toponymName>Kraków</toponymName>
702+ <lat>50.06143</lat>
703+ <lng>19.93658</lng>
704+ <countryName>Poland</countryName>
705+ </geoname>
706+ <geoname>
707 <toponymName>Kuala Lumpur</toponymName>
708 <lat>3.1412</lat>
709 <lng>101.68653</lng>
710 <countryName>Malaysia</countryName>
711 </geoname>
712 <geoname>
713+ <toponymName>Kuwait City</toponymName>
714+ <lat>29.36972</lat>
715+ <lng>47.97833</lng>
716+ <countryName>Kuwait</countryName>
717+ </geoname>
718+ <geoname>
719+ <toponymName>Kiev</toponymName>
720+ <lat>50.45466</lat>
721+ <lng>30.5238</lng>
722+ <countryName>Ukraine</countryName>
723+ </geoname>
724+ <geoname>
725+ <toponymName>Lagos</toponymName>
726+ <lat>6.45306</lat>
727+ <lng>3.39583</lng>
728+ <countryName>Nigeria</countryName>
729+ </geoname>
730+ <geoname>
731+ <toponymName>Lahore</toponymName>
732+ <lat>31.54972</lat>
733+ <lng>74.34361</lng>
734+ <countryName>Pakistan</countryName>
735+ </geoname>
736+ <geoname>
737 <toponymName>Las Vegas</toponymName>
738 <lat>36.17497</lat>
739 <lng>-115.13722</lng>
740 <countryName>United States</countryName>
741 </geoname>
742 <geoname>
743+ <toponymName>Lima</toponymName>
744+ <lat>-12.04318</lat>
745+ <lng>-77.02824</lng>
746+ <countryName>Peru</countryName>
747+ </geoname>
748+ <geoname>
749 <toponymName>Lisbon</toponymName>
750 <lat>38.71667</lat>
751 <lng>-9.13333</lng>
752@@ -301,60 +847,300 @@
753 <countryName>United Kingdom</countryName>
754 </geoname>
755 <geoname>
756+ <toponymName>Longyearbyen</toponymName>
757+ <lat>78.22</lat>
758+ <lng>15.65</lng>
759+ <countryName>Svalbard and Jan Mayen</countryName>
760+ </geoname>
761+ <geoname>
762+ <toponymName>Los Angeles</toponymName>
763+ <lat>34.05223</lat>
764+ <lng>-118.24368</lng>
765+ <countryName>United States</countryName>
766+ </geoname>
767+ <geoname>
768+ <toponymName>Louisville</toponymName>
769+ <lat>38.25424</lat>
770+ <lng>-85.75941</lng>
771+ <countryName>United States</countryName>
772+ </geoname>
773+ <geoname>
774 <toponymName>Luxembourg</toponymName>
775 <lat>49.61167</lat>
776 <lng>6.13</lng>
777 <countryName>Luxembourg</countryName>
778 </geoname>
779 <geoname>
780+ <toponymName>Macau</toponymName>
781+ <lat>22.20056</lat>
782+ <lng>113.54611</lng>
783+ <countryName>Macao</countryName>
784+ </geoname>
785+ <geoname>
786+ <toponymName>Madison</toponymName>
787+ <lat>43.07305</lat>
788+ <lng>-89.40123</lng>
789+ <countryName>United States</countryName>
790+ </geoname>
791+ <geoname>
792 <toponymName>Madrid</toponymName>
793 <lat>40.4165</lat>
794 <lng>-3.70256</lng>
795 <countryName>Spain</countryName>
796 </geoname>
797 <geoname>
798+ <toponymName>Managua</toponymName>
799+ <lat>12.13282</lat>
800+ <lng>-86.2504</lng>
801+ <countryName>Nicaragua</countryName>
802+ </geoname>
803+ <geoname>
804 <toponymName>Manama</toponymName>
805 <lat>26.21536</lat>
806 <lng>50.5832</lng>
807 <countryName>Bahrain</countryName>
808 </geoname>
809 <geoname>
810+ <toponymName>Manchester</toponymName>
811+ <lat>53.48095</lat>
812+ <lng>-2.23743</lng>
813+ <countryName>United Kingdom</countryName>
814+ </geoname>
815+ <geoname>
816+ <toponymName>Manila</toponymName>
817+ <lat>14.6042</lat>
818+ <lng>120.9822</lng>
819+ <countryName>Philippines</countryName>
820+ </geoname>
821+ <geoname>
822+ <toponymName>Marengo</toponymName>
823+ <lat>42.24863</lat>
824+ <lng>-88.60843</lng>
825+ <countryName>United States</countryName>
826+ </geoname>
827+ <geoname>
828+ <toponymName>Martinique</toponymName>
829+ <lat>45.58242</lat>
830+ <lng>-61.05041</lng>
831+ <countryName>Canada</countryName>
832+ </geoname>
833+ <geoname>
834+ <toponymName>Maseru</toponymName>
835+ <lat>-29.31667</lat>
836+ <lng>27.48333</lng>
837+ <countryName>Lesotho</countryName>
838+ </geoname>
839+ <geoname>
840+ <toponymName>Melbourne</toponymName>
841+ <lat>-37.814</lat>
842+ <lng>144.96332</lng>
843+ <countryName>Australia</countryName>
844+ </geoname>
845+ <geoname>
846+ <toponymName>Memphis</toponymName>
847+ <lat>35.14953</lat>
848+ <lng>-90.04898</lng>
849+ <countryName>United States</countryName>
850+ </geoname>
851+ <geoname>
852+ <toponymName>Mendoza</toponymName>
853+ <lat>-32.89084</lat>
854+ <lng>-68.82717</lng>
855+ <countryName>Argentina</countryName>
856+ </geoname>
857+ <geoname>
858+ <toponymName>Metlakatla</toponymName>
859+ <lat>55.12917</lat>
860+ <lng>-131.57222</lng>
861+ <countryName>United States</countryName>
862+ </geoname>
863+ <geoname>
864+ <toponymName>Mexico City</toponymName>
865+ <lat>19.42847</lat>
866+ <lng>-99.12766</lng>
867+ <countryName>Mexico</countryName>
868+ </geoname>
869+ <geoname>
870+ <toponymName>Miami</toponymName>
871+ <lat>25.77427</lat>
872+ <lng>-80.19366</lng>
873+ <countryName>United States</countryName>
874+ </geoname>
875+ <geoname>
876+ <toponymName>Milan</toponymName>
877+ <lat>45.46427</lat>
878+ <lng>9.18951</lng>
879+ <countryName>Italy</countryName>
880+ </geoname>
881+ <geoname>
882+ <toponymName>Milwaukee</toponymName>
883+ <lat>43.0389</lat>
884+ <lng>-87.90647</lng>
885+ <countryName>United States</countryName>
886+ </geoname>
887+ <geoname>
888+ <toponymName>Minneapolis</toponymName>
889+ <lat>44.97997</lat>
890+ <lng>-93.26384</lng>
891+ <countryName>United States</countryName>
892+ </geoname>
893+ <geoname>
894+ <toponymName>Minsk</toponymName>
895+ <lat>53.9</lat>
896+ <lng>27.56667</lng>
897+ <countryName>Belarus</countryName>
898+ </geoname>
899+ <geoname>
900+ <toponymName>Mogadishu</toponymName>
901+ <lat>2.03711</lat>
902+ <lng>45.34375</lng>
903+ <countryName>Somalia</countryName>
904+ </geoname>
905+ <geoname>
906+ <toponymName>Monrovia</toponymName>
907+ <lat>6.30054</lat>
908+ <lng>-10.7969</lng>
909+ <countryName>Liberia</countryName>
910+ </geoname>
911+ <geoname>
912+ <toponymName>Monterrey</toponymName>
913+ <lat>25.67506</lat>
914+ <lng>-100.31846</lng>
915+ <countryName>Mexico</countryName>
916+ </geoname>
917+ <geoname>
918+ <toponymName>Montevideo</toponymName>
919+ <lat>-34.90328</lat>
920+ <lng>-56.18816</lng>
921+ <countryName>Uruguay</countryName>
922+ </geoname>
923+ <geoname>
924 <toponymName>Montreal</toponymName>
925 <lat>45.50884</lat>
926 <lng>-73.58781</lng>
927 <countryName>Canada</countryName>
928 </geoname>
929 <geoname>
930+ <toponymName>Moscow</toponymName>
931+ <lat>55.75222</lat>
932+ <lng>37.61556</lng>
933+ <countryName>Russia</countryName>
934+ </geoname>
935+ <geoname>
936+ <toponymName>Mountain View</toponymName>
937+ <lat>37.38605</lat>
938+ <lng>-122.08385</lng>
939+ <countryName>United States</countryName>
940+ </geoname>
941+ <geoname>
942+ <toponymName>Mumbai</toponymName>
943+ <lat>19.07283</lat>
944+ <lng>72.88261</lng>
945+ <countryName>India</countryName>
946+ </geoname>
947+ <geoname>
948 <toponymName>Munich</toponymName>
949 <lat>48.13743</lat>
950 <lng>11.57549</lng>
951 <countryName>Germany</countryName>
952 </geoname>
953 <geoname>
954+ <toponymName>Nairobi</toponymName>
955+ <lat>-1.28333</lat>
956+ <lng>36.81667</lng>
957+ <countryName>Kenya</countryName>
958+ </geoname>
959+ <geoname>
960 <toponymName>Naples</toponymName>
961 <lat>40.83333</lat>
962 <lng>14.25</lng>
963 <countryName>Italy</countryName>
964 </geoname>
965 <geoname>
966+ <toponymName>Nashville</toponymName>
967+ <lat>36.16589</lat>
968+ <lng>-86.78444</lng>
969+ <countryName>United States</countryName>
970+ </geoname>
971+ <geoname>
972+ <toponymName>Nassau</toponymName>
973+ <lat>25.05823</lat>
974+ <lng>-77.34306</lng>
975+ <countryName>Bahamas</countryName>
976+ </geoname>
977+ <geoname>
978+ <toponymName>New Orleans</toponymName>
979+ <lat>29.95465</lat>
980+ <lng>-90.07507</lng>
981+ <countryName>United States</countryName>
982+ </geoname>
983+ <geoname>
984+ <toponymName>New Salem</toponymName>
985+ <lat>46.845</lat>
986+ <lng>-101.41125</lng>
987+ <countryName>United States</countryName>
988+ </geoname>
989+ <geoname>
990 <toponymName>New York</toponymName>
991 <lat>40.71427</lat>
992 <lng>-74.00597</lng>
993 <countryName>United States</countryName>
994 </geoname>
995 <geoname>
996+ <toponymName>Newfoundland</toponymName>
997+ <lat>38.13147</lat>
998+ <lng>-83.09934</lng>
999+ <countryName>United States</countryName>
1000+ </geoname>
1001+ <geoname>
1002+ <toponymName>Nouméa</toponymName>
1003+ <lat>-22.27631</lat>
1004+ <lng>166.4572</lng>
1005+ <countryName>New Caledonia</countryName>
1006+ </geoname>
1007+ <geoname>
1008+ <toponymName>Oklahoma City</toponymName>
1009+ <lat>35.46756</lat>
1010+ <lng>-97.51643</lng>
1011+ <countryName>United States</countryName>
1012+ </geoname>
1013+ <geoname>
1014 <toponymName>Osaka</toponymName>
1015 <lat>34.69374</lat>
1016 <lng>135.50218</lng>
1017 <countryName>Japan</countryName>
1018 </geoname>
1019 <geoname>
1020+ <toponymName>Oslo</toponymName>
1021+ <lat>59.91273</lat>
1022+ <lng>10.74609</lng>
1023+ <countryName>Norway</countryName>
1024+ </geoname>
1025+ <geoname>
1026 <toponymName>Ottawa</toponymName>
1027 <lat>45.41117</lat>
1028 <lng>-75.69812</lng>
1029 <countryName>Canada</countryName>
1030 </geoname>
1031 <geoname>
1032+ <toponymName>Oulu</toponymName>
1033+ <lat>65.01236</lat>
1034+ <lng>25.46816</lng>
1035+ <countryName>Finland</countryName>
1036+ </geoname>
1037+ <geoname>
1038+ <toponymName>Panamá</toponymName>
1039+ <lat>8.9936</lat>
1040+ <lng>-79.51973</lng>
1041+ <countryName>Panama</countryName>
1042+ </geoname>
1043+ <geoname>
1044+ <toponymName>Paramaribo</toponymName>
1045+ <lat>5.86638</lat>
1046+ <lng>-55.16682</lng>
1047+ <countryName>Suriname</countryName>
1048+ </geoname>
1049+ <geoname>
1050 <toponymName>Paris</toponymName>
1051 <lat>48.85341</lat>
1052 <lng>2.3488</lng>
1053@@ -367,30 +1153,246 @@
1054 <countryName>Australia</countryName>
1055 </geoname>
1056 <geoname>
1057+ <toponymName>Petersburg</toponymName>
1058+ <lat>59.93863</lat>
1059+ <lng>30.31413</lng>
1060+ <countryName>Russia</countryName>
1061+ </geoname>
1062+ <geoname>
1063+ <toponymName>Philadelphia</toponymName>
1064+ <lat>39.95234</lat>
1065+ <lng>-75.16379</lng>
1066+ <countryName>United States</countryName>
1067+ </geoname>
1068+ <geoname>
1069+ <toponymName>Phnom Penh</toponymName>
1070+ <lat>11.56245</lat>
1071+ <lng>104.91601</lng>
1072+ <countryName>Cambodia</countryName>
1073+ </geoname>
1074+ <geoname>
1075+ <toponymName>Phoenix</toponymName>
1076+ <lat>33.44838</lat>
1077+ <lng>-112.07404</lng>
1078+ <countryName>United States</countryName>
1079+ </geoname>
1080+ <geoname>
1081+ <toponymName>Pittsburgh</toponymName>
1082+ <lat>40.44062</lat>
1083+ <lng>-79.99589</lng>
1084+ <countryName>United States</countryName>
1085+ </geoname>
1086+ <geoname>
1087+ <toponymName>Port of Spain</toponymName>
1088+ <lat>10.66668</lat>
1089+ <lng>-61.51889</lng>
1090+ <countryName>Trinidad and Tobago</countryName>
1091+ </geoname>
1092+ <geoname>
1093+ <toponymName>Port au Prince</toponymName>
1094+ <lat>18.53917</lat>
1095+ <lng>-72.335</lng>
1096+ <countryName>Haiti</countryName>
1097+ </geoname>
1098+ <geoname>
1099+ <toponymName>Portland</toponymName>
1100+ <lat>45.52345</lat>
1101+ <lng>-122.67621</lng>
1102+ <countryName>United States</countryName>
1103+ </geoname>
1104+ <geoname>
1105 <toponymName>Prague</toponymName>
1106 <lat>50.08804</lat>
1107 <lng>14.42076</lng>
1108 <countryName>Czech</countryName>
1109 </geoname>
1110 <geoname>
1111+ <toponymName>Pyongyang</toponymName>
1112+ <lat>39.03385</lat>
1113+ <lng>125.75432</lng>
1114+ <countryName>North Korea</countryName>
1115+ </geoname>
1116+ <geoname>
1117+ <toponymName>Queensland</toponymName>
1118+ <lat>31.79907</lat>
1119+ <lng>-83.23627</lng>
1120+ <countryName>United States</countryName>
1121+ </geoname>
1122+ <geoname>
1123 <toponymName>Quito</toponymName>
1124 <lat>-0.22985</lat>
1125 <lng>-78.52495</lng>
1126 <countryName>Ecuador</countryName>
1127 </geoname>
1128 <geoname>
1129+ <toponymName>Rangoon</toponymName>
1130+ <lat>16.80528</lat>
1131+ <lng>96.15611</lng>
1132+ <countryName>Myanmar</countryName>
1133+ </geoname>
1134+ <geoname>
1135+ <toponymName>Reno</toponymName>
1136+ <lat>39.52963</lat>
1137+ <lng>-119.8138</lng>
1138+ <countryName>United States</countryName>
1139+ </geoname>
1140+ <geoname>
1141+ <toponymName>Reston</toponymName>
1142+ <lat>38.96872</lat>
1143+ <lng>-77.3411</lng>
1144+ <countryName>United States</countryName>
1145+ </geoname>
1146+ <geoname>
1147+ <toponymName>Reykjavík</toponymName>
1148+ <lat>64.13548</lat>
1149+ <lng>-21.89541</lng>
1150+ <countryName>Iceland</countryName>
1151+ </geoname>
1152+ <geoname>
1153+ <toponymName>Riga</toponymName>
1154+ <lat>56.946</lat>
1155+ <lng>24.10589</lng>
1156+ <countryName>Latvia</countryName>
1157+ </geoname>
1158+ <geoname>
1159 <toponymName>Rio de Janeiro</toponymName>
1160 <lat>-22.90278</lat>
1161 <lng>-43.2075</lng>
1162 <countryName>Brazil</countryName>
1163 </geoname>
1164 <geoname>
1165+ <toponymName>Riyadh</toponymName>
1166+ <lat>24.68773</lat>
1167+ <lng>46.72185</lng>
1168+ <countryName>Saudi Arabia</countryName>
1169+ </geoname>
1170+ <geoname>
1171 <toponymName>Rome</toponymName>
1172 <lat>41.89474</lat>
1173 <lng>12.4839</lng>
1174 <countryName>Italy</countryName>
1175 </geoname>
1176 <geoname>
1177+ <toponymName>Riyadh</toponymName>
1178+ <lat>24.68773</lat>
1179+ <lng>46.72185</lng>
1180+ <countryName>Saudi Arabia</countryName>
1181+ </geoname>
1182+ <geoname>
1183+ <toponymName>Sacramento</toponymName>
1184+ <lat>38.58157</lat>
1185+ <lng>-121.4944</lng>
1186+ <countryName>United States</countryName>
1187+ </geoname>
1188+ <geoname>
1189+ <toponymName>Saigon</toponymName>
1190+ <lat>14.26667</lat>
1191+ <lng>21.13333</lng>
1192+ <countryName>Chad</countryName>
1193+ </geoname>
1194+ <geoname>
1195+ <toponymName>Salt Lake City</toponymName>
1196+ <lat>40.76078</lat>
1197+ <lng>-111.89105</lng>
1198+ <countryName>United States</countryName>
1199+ </geoname>
1200+ <geoname>
1201+ <toponymName>Samoa</toponymName>
1202+ <lat>40.81874</lat>
1203+ <lng>-124.18645</lng>
1204+ <countryName>United States</countryName>
1205+ </geoname>
1206+ <geoname>
1207+ <toponymName>San Antonio</toponymName>
1208+ <lat>29.42412</lat>
1209+ <lng>-98.49363</lng>
1210+ <countryName>United States</countryName>
1211+ </geoname>
1212+ <geoname>
1213+ <toponymName>San Diego</toponymName>
1214+ <lat>32.71533</lat>
1215+ <lng>-117.15726</lng>
1216+ <countryName>United States</countryName>
1217+ </geoname>
1218+ <geoname>
1219+ <toponymName>San Francisco</toponymName>
1220+ <lat>37.77493</lat>
1221+ <lng>-122.41942</lng>
1222+ <countryName>United States</countryName>
1223+ </geoname>
1224+ <geoname>
1225+ <toponymName>San José</toponymName>
1226+ <lat>9.93333</lat>
1227+ <lng>-84.08333</lng>
1228+ <countryName>Costa Rica</countryName>
1229+ </geoname>
1230+ <geoname>
1231+ <toponymName>San Juan</toponymName>
1232+ <lat>18.46633</lat>
1233+ <lng>-66.10572</lng>
1234+ <countryName>Puerto Rico</countryName>
1235+ </geoname>
1236+ <geoname>
1237+ <toponymName>San Marino</toponymName>
1238+ <lat>43.93667</lat>
1239+ <lng>12.44639</lng>
1240+ <countryName>San Marino</countryName>
1241+ </geoname>
1242+ <geoname>
1243+ <toponymName>San Salvador</toponymName>
1244+ <lat>13.68935</lat>
1245+ <lng>-89.18718</lng>
1246+ <countryName>El Salvador</countryName>
1247+ </geoname>
1248+ <geoname>
1249+ <toponymName>Sanaa</toponymName>
1250+ <lat>15.35472</lat>
1251+ <lng>44.20667</lng>
1252+ <countryName>Yemen</countryName>
1253+ </geoname>
1254+ <geoname>
1255+ <toponymName>Santiago</toponymName>
1256+ <lat>-33.45694</lat>
1257+ <lng>-70.64827</lng>
1258+ <countryName>Chile</countryName>
1259+ </geoname>
1260+ <geoname>
1261+ <toponymName>Santo Domingo</toponymName>
1262+ <lat>18.50012</lat>
1263+ <lng>-69.98857</lng>
1264+ <countryName>Dominican Republic</countryName>
1265+ </geoname>
1266+ <geoname>
1267+ <toponymName>São Paulo</toponymName>
1268+ <lat>-23.5475</lat>
1269+ <lng>-46.63611</lng>
1270+ <countryName>Brazil</countryName>
1271+ </geoname>
1272+ <geoname>
1273+ <toponymName>São Tomé</toponymName>
1274+ <lat>0.33654</lat>
1275+ <lng>6.72732</lng>
1276+ <countryName>São Tomé and Príncipe</countryName>
1277+ </geoname>
1278+ <geoname>
1279+ <toponymName>Sarajevo</toponymName>
1280+ <lat>43.84864</lat>
1281+ <lng>18.35644</lng>
1282+ <countryName>Bosnia and Herzegovina</countryName>
1283+ </geoname>
1284+ <geoname>
1285+ <toponymName>Saskatchewan Beach</toponymName>
1286+ <lat>50.80008</lat>
1287+ <lng>-104.93442</lng>
1288+ <countryName>Canada</countryName>
1289+ </geoname>
1290+ <geoname>
1291+ <toponymName>Seattle</toponymName>
1292+ <lat>47.60621</lat>
1293+ <lng>-122.33207</lng>
1294+ <countryName>United States</countryName>
1295+ </geoname>
1296+ <geoname>
1297 <toponymName>Seoul</toponymName>
1298 <lat>37.56826</lat>
1299 <lng>126.97783</lng>
1300@@ -409,6 +1411,42 @@
1301 <countryName>Singapore</countryName>
1302 </geoname>
1303 <geoname>
1304+ <toponymName>Simferopol’</toponymName>
1305+ <lat>44.95719</lat>
1306+ <lng>34.11079</lng>
1307+ <countryName>Ukraine</countryName>
1308+ </geoname>
1309+ <geoname>
1310+ <toponymName>Skopje</toponymName>
1311+ <lat>41.99646</lat>
1312+ <lng>21.43141</lng>
1313+ <countryName>Macedonia</countryName>
1314+ </geoname>
1315+ <geoname>
1316+ <toponymName>Sofia</toponymName>
1317+ <lat>42.69751</lat>
1318+ <lng>23.32415</lng>
1319+ <countryName>Bulgaria</countryName>
1320+ </geoname>
1321+ <geoname>
1322+ <toponymName>St. John's</toponymName>
1323+ <lat>47.56494</lat>
1324+ <lng>-52.70931</lng>
1325+ <countryName>Canada</countryName>
1326+ </geoname>
1327+ <geoname>
1328+ <toponymName>St. Louis</toponymName>
1329+ <lat>38.62727</lat>
1330+ <lng>-90.19789</lng>
1331+ <countryName>United States</countryName>
1332+ </geoname>
1333+ <geoname>
1334+ <toponymName>Stanley</toponymName>
1335+ <lat>-51.7</lat>
1336+ <lng>-57.85</lng>
1337+ <countryName>Falkland Islands</countryName>
1338+ </geoname>
1339+ <geoname>
1340 <toponymName>Stockholm</toponymName>
1341 <lat>59.33258</lat>
1342 <lng>18.0649</lng>
1343@@ -433,24 +1471,84 @@
1344 <countryName>Taiwan</countryName>
1345 </geoname>
1346 <geoname>
1347+ <toponymName>Tallinn</toponymName>
1348+ <lat>59.43696</lat>
1349+ <lng>24.75353</lng>
1350+ <countryName>Estonia</countryName>
1351+ </geoname>
1352+ <geoname>
1353+ <toponymName>Tampa</toponymName>
1354+ <lat>27.94752</lat>
1355+ <lng>-82.45843</lng>
1356+ <countryName>United States</countryName>
1357+ </geoname>
1358+ <geoname>
1359 <toponymName>Tbilisi</toponymName>
1360 <lat>41.69411</lat>
1361 <lng>44.83368</lng>
1362 <countryName>Georgia</countryName>
1363 </geoname>
1364 <geoname>
1365+ <toponymName>Tegucigalpa</toponymName>
1366+ <lat>14.0818</lat>
1367+ <lng>-87.20681</lng>
1368+ <countryName>Honduras</countryName>
1369+ </geoname>
1370+ <geoname>
1371 <toponymName>Tehran</toponymName>
1372 <lat>35.69439</lat>
1373 <lng>51.42151</lng>
1374 <countryName>Iran</countryName>
1375 </geoname>
1376 <geoname>
1377+ <toponymName>Tel Aviv</toponymName>
1378+ <lat>32.08088</lat>
1379+ <lng>34.78057</lng>
1380+ <countryName>Israel</countryName>
1381+ </geoname>
1382+ <geoname>
1383+ <toponymName>Tell City</toponymName>
1384+ <lat>37.95144</lat>
1385+ <lng>-86.76777</lng>
1386+ <countryName>United States</countryName>
1387+ </geoname>
1388+ <geoname>
1389+ <toponymName>Tijuana</toponymName>
1390+ <lat>32.5027</lat>
1391+ <lng>-117.00371</lng>
1392+ <countryName>Mexico</countryName>
1393+ </geoname>
1394+ <geoname>
1395+ <toponymName>Timbuktu</toponymName>
1396+ <lat>16.77348</lat>
1397+ <lng>-3.00742</lng>
1398+ <countryName>Mali</countryName>
1399+ </geoname>
1400+ <geoname>
1401 <toponymName>Tokyo</toponymName>
1402 <lat>35.6895</lat>
1403 <lng>139.69171</lng>
1404 <countryName>Japan</countryName>
1405 </geoname>
1406 <geoname>
1407+ <toponymName>Toronto</toponymName>
1408+ <lat>43.70011</lat>
1409+ <lng>-79.4163</lng>
1410+ <countryName>Canada</countryName>
1411+ </geoname>
1412+ <geoname>
1413+ <toponymName>Tripoli</toponymName>
1414+ <lat>32.87519</lat>
1415+ <lng>13.18746</lng>
1416+ <countryName>Libya</countryName>
1417+ </geoname>
1418+ <geoname>
1419+ <toponymName>Tucson</toponymName>
1420+ <lat>32.22174</lat>
1421+ <lng>-110.92648</lng>
1422+ <countryName>United States</countryName>
1423+ </geoname>
1424+ <geoname>
1425 <toponymName>Tunis</toponymName>
1426 <lat>36.81897</lat>
1427 <lng>10.16579</lng>
1428@@ -469,12 +1567,36 @@
1429 <countryName>Canada</countryName>
1430 </geoname>
1431 <geoname>
1432+ <toponymName>Vatican City</toponymName>
1433+ <lat>41.90236</lat>
1434+ <lng>12.45332</lng>
1435+ <countryName>Vatican City</countryName>
1436+ </geoname>
1437+ <geoname>
1438+ <toponymName>Vevay</toponymName>
1439+ <lat>38.74784</lat>
1440+ <lng>-85.06717</lng>
1441+ <countryName>United States</countryName>
1442+ </geoname>
1443+ <geoname>
1444 <toponymName>Vienna</toponymName>
1445 <lat>48.20849</lat>
1446 <lng>16.37208</lng>
1447 <countryName>Austria</countryName>
1448 </geoname>
1449 <geoname>
1450+ <toponymName>Vilnius</toponymName>
1451+ <lat>54.68916</lat>
1452+ <lng>25.2798</lng>
1453+ <countryName>Lithuania</countryName>
1454+ </geoname>
1455+ <geoname>
1456+ <toponymName>Vincennes</toponymName>
1457+ <lat>48.8486</lat>
1458+ <lng>2.43769</lng>
1459+ <countryName>France</countryName>
1460+ </geoname>
1461+ <geoname>
1462 <toponymName>Warsaw</toponymName>
1463 <lat>52.22977</lat>
1464 <lng>21.01178</lng>
1465@@ -493,6 +1615,24 @@
1466 <countryName>New Zealand</countryName>
1467 </geoname>
1468 <geoname>
1469+ <toponymName>Winamac</toponymName>
1470+ <lat>41.05143</lat>
1471+ <lng>-86.60306</lng>
1472+ <countryName>United States</countryName>
1473+ </geoname>
1474+ <geoname>
1475+ <toponymName>Winnipeg</toponymName>
1476+ <lat>49.8844</lat>
1477+ <lng>-97.14704</lng>
1478+ <countryName>Canada</countryName>
1479+ </geoname>
1480+ <geoname>
1481+ <toponymName>Wrocław</toponymName>
1482+ <lat>51.1</lat>
1483+ <lng>17.03333</lng>
1484+ <countryName>Poland</countryName>
1485+ </geoname>
1486+ <geoname>
1487 <toponymName>Yakutsk</toponymName>
1488 <lat>62.03389</lat>
1489 <lng>129.73306</lng>
1490
1491=== modified file 'debian/copyright'
1492--- debian/copyright 2013-07-24 21:30:26 +0000
1493+++ debian/copyright 2014-02-09 17:25:55 +0000
1494@@ -3,19 +3,19 @@
1495 Source: https://launchpad.net/ubuntu-clock-app
1496
1497 Files: *
1498-Copyright: 2013 Canonical Ltd.
1499+Copyright: 2013, 2014 Canonical Ltd.
1500 2013 Alessandro Pozzi <signor.hyde@gmail.com>
1501 2013 Juha Ristolainen <juha.ristolainen@codemancers.fi>
1502 2013 Marco Biscaro <marcobiscaro2112@gmail.com>
1503- 2013 Nekhelesh Ramananthan <krnekhelesh@gmail.com>
1504+ 2013, 2014 Nekhelesh Ramananthan <krnekhelesh@gmail.com>
1505 2013 Nick Leppänen Larsson <frals@frals.se>
1506 2013 Omer Akram <om26er@ubuntu.com>
1507 2013 Paolo Rotolo <paolorotolo@ubuntu.com>
1508- 2013 Riccardo Padovani <rpadovani@ubuntu-it.org>
1509+ 2013, 2014 Riccardo Padovani <rpadovani@ubuntu.com>
1510 License: GPL-3
1511
1512 Files: debian/*
1513-Copyright: 2013 Canonical Ltd.
1514+Copyright: 2013, 2014 Canonical Ltd.
1515 License: LGPL-3
1516
1517 License: GPL-3
1518
1519=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
1520--- tests/autopilot/ubuntu_clock_app/tests/__init__.py 2013-11-04 20:40:16 +0000
1521+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py 2014-02-09 17:25:55 +0000
1522@@ -1,6 +1,6 @@
1523 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1524 #
1525-# Copyright (C) 2013 Canonical Ltd
1526+# Copyright (C) 2013, 2014 Canonical Ltd
1527 #
1528 # This program is free software: you can redistribute it and/or modify
1529 # it under the terms of the GNU General Public License version 3 as
1530@@ -45,7 +45,7 @@
1531 local_location = "../../ubuntu-clock-app.qml"
1532 installed_location = "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml"
1533 sqlite_dir = os.path.expanduser(
1534- "~/.local/share/com.ubuntu.clock/Databases")
1535+ "~/.local/share/com.ubuntu.clock")
1536 backup_dir = sqlite_dir + ".backup"
1537
1538 def setUp(self):

Subscribers

People subscribed via source and target branches