uNav

Merge lp:~costales/unav/0.60-stamen-tiles into lp:unav

  1. 0.60-stamen-tiles
  2. Merge into trunk
Proposed by costales
Status: Merged
Merged at revision: 76
Proposed branch: lp:~costales/unav/0.60-stamen-tiles
Merge into: lp:unav
Diff against target: 351 lines (+61/-62)
5 files modified
manifest.json (+1/-1)
nav/class/UI.js (+1/-1)
nav/index.html (+2/-3)
nav/locales/unav.pot (+55/-55)
qml/AboutPage.qml (+2/-2)
To merge this branch: bzr merge lp:~costales/unav/0.60-stamen-tiles
Reviewer Review Type Date Requested Status
uNav developers Pending
Review via email: mp+297615@code.launchpad.net

Description of the change

Stamen tiles

To post a comment you must log in.
lp:~costales/unav/0.60-stamen-tiles updated
78. By costales

Set current version

79. By costales

i18n

80. By costales

Clear blue line

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json'
2--- manifest.json 2016-04-24 16:31:47 +0000
3+++ manifest.json 2016-06-16 15:39:31 +0000
4@@ -12,5 +12,5 @@
5 "maintainer": "Marcos Costales <costales.marcos@gmail.com>",
6 "name": "navigator.costales",
7 "title": "uNav",
8- "version": "0.59"
9+ "version": "0.60"
10 }
11
12=== modified file 'nav/class/UI.js'
13--- nav/class/UI.js 2016-06-15 17:26:44 +0000
14+++ nav/class/UI.js 2016-06-16 15:39:31 +0000
15@@ -85,7 +85,7 @@
16 style: [
17 new ol.style.Style({
18 stroke: new ol.style.Stroke({
19- color: '#A6BCFF',
20+ color: '#D2DDFF',
21 width: 5
22 })
23 }),
24
25=== modified file 'nav/index.html'
26--- nav/index.html 2016-06-15 17:26:44 +0000
27+++ nav/index.html 2016-06-16 15:39:31 +0000
28@@ -95,7 +95,7 @@
29 </div>
30
31 <!-- Map attribution -->
32- <div id="map_attribution" style="display:none;"><span onclick="qml_go_url('https://mapzen.com/projects/valhalla')">© Mapzen</span> <span onclick="qml_go_url('http://open.mapquest.com/')">© MapQuest</span> <span onclick="qml_go_url('http://www.openstreetmap.org/copyright')">© OpenStreetMap contributors</span></div>
33+ <div id="map_attribution" style="display:none;"><span onclick="qml_go_url('https://mapzen.com')">© Mapzen</span> <span onclick="qml_go_url('http://stamen.com')">© Stamen</span> <span onclick="qml_go_url('http://www.openstreetmap.org/copyright')">© OpenStreetMap contributors</span></div>
34
35 <!-- Max speed radar alert -->
36 <div id="max_speed_alert" style="display:none;">
37@@ -199,7 +199,7 @@
38 <script src="libraries/ol.js"></script>
39 <script>
40 var online_layer = new ol.layer.Tile({
41- source: new ol.source.MapQuest({layer: 'osm'}),
42+ source: new ol.source.Stamen({layer: 'toner-lite'}),
43 visible: false
44 });
45 var offline_layer = new ol.layer.Tile({
46@@ -304,7 +304,6 @@
47 },
48 {
49 enableHighAccuracy: true
50- // maximumAge: 0 TODO 0.60: Uncomment, this could stops uNav (?)
51 }
52 );
53 }
54
55=== modified file 'nav/locales/unav.pot'
56--- nav/locales/unav.pot 2016-06-06 17:37:20 +0000
57+++ nav/locales/unav.pot 2016-06-16 15:39:31 +0000
58@@ -8,7 +8,7 @@
59 msgstr ""
60 "Project-Id-Version: PACKAGE VERSION\n"
61 "Report-Msgid-Bugs-To: \n"
62-"POT-Creation-Date: 2016-06-06 19:37+0200\n"
63+"POT-Creation-Date: 2016-06-16 17:30+0200\n"
64 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
65 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
66 "Language-Team: LANGUAGE <LL@li.org>\n"
67@@ -82,14 +82,6 @@
68 msgid "Version %1. Under License %2"
69 msgstr ""
70
71-#: qml/AboutPage.qml:146
72-msgid "Support its future development"
73-msgstr ""
74-
75-#: qml/AboutPage.qml:155
76-msgid "Buy Donate Version"
77-msgstr ""
78-
79 #: qml/Coordinate.qml:35
80 msgid "Decimal"
81 msgstr ""
82@@ -136,45 +128,45 @@
83 msgid "No favorites yet"
84 msgstr ""
85
86-#: qml/Favorites.qml:175 qml/SearchPage.qml:83
87+#: qml/Favorites.qml:178 qml/SearchPage.qml:83
88 msgid "Add Favorite"
89 msgstr ""
90
91-#: qml/Favorites.qml:175
92+#: qml/Favorites.qml:178
93 msgid "Edit Favorite"
94 msgstr ""
95
96-#: qml/Favorites.qml:176
97+#: qml/Favorites.qml:179
98 msgid ""
99 "There is already a favorite with that name. You can either overwrite it or "
100 "enter a different name."
101 msgstr ""
102
103-#: qml/Favorites.qml:210
104+#: qml/Favorites.qml:213
105 msgid "Insert a favorite name"
106 msgstr ""
107
108-#: qml/Favorites.qml:211 qml/Main.qml:740 nav/class/UI.js:40
109+#: qml/Favorites.qml:214 qml/Main.qml:748 nav/class/UI.js:40
110 msgid "Current Position"
111 msgstr ""
112
113-#: qml/Favorites.qml:226 qml/SettingsPage.qml:367
114+#: qml/Favorites.qml:229 qml/SettingsPage.qml:367
115 msgid "Cancel"
116 msgstr ""
117
118-#: qml/Favorites.qml:233
119+#: qml/Favorites.qml:236
120 msgid "Overwrite"
121 msgstr ""
122
123-#: qml/Favorites.qml:233
124+#: qml/Favorites.qml:236
125 msgid "Add"
126 msgstr ""
127
128-#: qml/Favorites.qml:233
129+#: qml/Favorites.qml:236
130 msgid "Update"
131 msgstr ""
132
133-#: qml/Location.qml:40 qml/PoiListPage.qml:142
134+#: qml/Location.qml:40 qml/PoiListPage.qml:143
135 msgid "Time out! Please try again"
136 msgstr ""
137
138@@ -213,97 +205,105 @@
139 msgid "Searching…"
140 msgstr ""
141
142-#: qml/Main.qml:190 qml/SettingsPage.qml:35
143+#: qml/Main.qml:192 qml/SettingsPage.qml:35
144 msgid "Settings"
145 msgstr ""
146
147-#: qml/Main.qml:202
148+#: qml/Main.qml:204
149 msgid "Center on Position"
150 msgstr ""
151
152-#: qml/Main.qml:206 qml/Main.qml:502
153+#: qml/Main.qml:208 qml/Main.qml:513
154 msgid "Searching your position… This could take a while"
155 msgstr ""
156
157-#: qml/Main.qml:220 qml/PoiPage.qml:83 qml/SearchPage.qml:69
158+#: qml/Main.qml:222 qml/PoiPage.qml:83 qml/SearchPage.qml:69
159 msgid "Search"
160 msgstr ""
161
162-#: qml/Main.qml:232
163+#: qml/Main.qml:234
164 msgid "Destination"
165 msgstr ""
166
167-#: qml/Main.qml:377
168+#: qml/Main.qml:391
169 msgid "Error getting speed cameras!"
170 msgstr ""
171
172-#: qml/Main.qml:429 qml/Main.qml:455
173+#: qml/Main.qml:394
174+msgid "Error finding route! Retrying again in 1 minute…"
175+msgstr ""
176+
177+#: qml/Main.qml:397
178+msgid "Error finding route! Trying again…"
179+msgstr ""
180+
181+#: qml/Main.qml:440 qml/Main.qml:466
182 msgid "Shared Position"
183 msgstr ""
184
185-#: qml/Main.qml:684
186+#: qml/Main.qml:691
187 msgid "NearBy Destination"
188 msgstr ""
189
190-#: qml/Main.qml:685
191+#: qml/Main.qml:692
192 msgid "Cancel Route"
193 msgstr ""
194
195-#: qml/Main.qml:729
196+#: qml/Main.qml:737
197 #, qt-format
198 msgid "Coord: %1, %2"
199 msgstr ""
200
201-#: qml/Main.qml:796
202+#: qml/Main.qml:807
203 msgid "Simulate from here! Now click on destination"
204 msgstr ""
205
206-#: qml/Main.qml:813
207+#: qml/Main.qml:824
208 msgid "Set a different coordinates for simulating"
209 msgstr ""
210
211-#: qml/PoiDetailsPage.qml:77
212+#: qml/PoiDetailsPage.qml:79
213 msgid "Lat, Long:"
214 msgstr ""
215
216-#: qml/PoiDetailsPage.qml:83 qml/PoiDetailsPage.qml:98
217+#: qml/PoiDetailsPage.qml:85 qml/PoiDetailsPage.qml:100
218 msgid "Available"
219 msgstr ""
220
221-#: qml/PoiDetailsPage.qml:85 qml/PoiDetailsPage.qml:100
222+#: qml/PoiDetailsPage.qml:87 qml/PoiDetailsPage.qml:102
223 msgid "Not Available"
224 msgstr ""
225
226-#: qml/PoiDetailsPage.qml:87
227+#: qml/PoiDetailsPage.qml:89
228 msgid "Wi-Fi Hotspot Available"
229 msgstr ""
230
231-#: qml/PoiDetailsPage.qml:89
232+#: qml/PoiDetailsPage.qml:91
233 msgid "Wired Connection Available (ethernet connection)"
234 msgstr ""
235
236-#: qml/PoiDetailsPage.qml:91
237+#: qml/PoiDetailsPage.qml:93
238 msgid "Computer Terminal Available"
239 msgstr ""
240
241-#: qml/PoiDetailsPage.qml:103
242+#: qml/PoiDetailsPage.qml:105
243 msgid "Limited Availability"
244 msgstr ""
245
246-#: qml/PoiDetailsPage.qml:154
247+#: qml/PoiDetailsPage.qml:156
248 msgid "Loading POI details..."
249 msgstr ""
250
251-#: qml/PoiListPage.qml:42
252+#: qml/PoiListPage.qml:44
253 msgid "Show POIs on map"
254 msgstr ""
255
256-#: qml/PoiListPage.qml:63
257+#: qml/PoiListPage.qml:65
258 msgid "Unknown current position"
259 msgstr ""
260
261-#: qml/PoiListPage.qml:79
262-msgid "Something was wrong. Please, try again…"
263+#: qml/PoiListPage.qml:81
264+msgid "Something went wrong. Please, try again…"
265 msgstr ""
266
267 #. TRANSLATORS: This string is search shown when no POIs are found with the chosen search radius. %1 is the POI type eg..Pub, Airport
268@@ -315,12 +315,12 @@
269
270 #. TRANSLATORS: Abbreviation for Public Holiday. This string is used while showing the opening hours
271 #. of a place which might be closed during public holidays.
272-#: qml/PoiListPage.qml:316
273+#: qml/PoiListPage.qml:320
274 msgid "PH"
275 msgstr ""
276
277 #. TRANSLATORS: This string indicates that a place is closed.
278-#: qml/PoiListPage.qml:318
279+#: qml/PoiListPage.qml:322
280 msgid "Closed"
281 msgstr ""
282
283@@ -1024,7 +1024,7 @@
284 msgid "Go to your left"
285 msgstr ""
286
287-#: nav/class/Navigator.js:288 nav/class/UI.js:436
288+#: nav/class/Navigator.js:288 nav/class/UI.js:437
289 msgid "You have arrived at your destination"
290 msgstr ""
291
292@@ -1176,35 +1176,35 @@
293 msgid "Waiting for a GPS signal…"
294 msgstr ""
295
296-#: nav/class/UI.js:379
297+#: nav/class/UI.js:380
298 msgid "Searching for a route…"
299 msgstr ""
300
301-#: nav/class/UI.js:383
302+#: nav/class/UI.js:384
303 msgid "Drawing route…"
304 msgstr ""
305
306-#: nav/class/UI.js:387
307-msgid "Error finding route between points. Check the connection and try again"
308+#: nav/class/UI.js:388
309+msgid "Trying search again soon…"
310 msgstr ""
311
312-#: nav/class/UI.js:391
313+#: nav/class/UI.js:392
314 msgid "Recalculating route…"
315 msgstr ""
316
317-#: nav/class/UI.js:412
318+#: nav/class/UI.js:413
319 msgid "Navigation will start soon"
320 msgstr ""
321
322-#: nav/class/UI.js:443
323+#: nav/class/UI.js:444
324 msgid "Simulating route…"
325 msgstr ""
326
327-#: nav/class/UI.js:447
328+#: nav/class/UI.js:448
329 msgid "Error simulating route. Try different points"
330 msgstr ""
331
332-#: nav/class/UI.js:468
333+#: nav/class/UI.js:469
334 msgid "Click onto the icon for reviewing the route"
335 msgstr ""
336
337
338=== modified file 'qml/AboutPage.qml'
339--- qml/AboutPage.qml 2016-06-07 17:19:43 +0000
340+++ qml/AboutPage.qml 2016-06-16 15:39:31 +0000
341@@ -78,8 +78,8 @@
342
343 // Powered By
344 creditsModel.append({ category: i18n.tr("Powered by"), name: "OpenStreetMap & Contributors", link: "http://www.openstreetmap.org" })
345- creditsModel.append({ category: i18n.tr("Powered by"), name: "Mapzen", link: "https://mapzen.com/projects/valhalla" })
346- creditsModel.append({ category: i18n.tr("Powered by"), name: "MapQuest", link: "http://open.mapquest.com/" })
347+ creditsModel.append({ category: i18n.tr("Powered by"), name: "Mapzen", link: "https://mapzen.com" })
348+ creditsModel.append({ category: i18n.tr("Powered by"), name: "Stamen", link: "http://stamen.com" })
349 creditsModel.append({ category: i18n.tr("Powered by"), name: "OpenStreetMap Nominatin", link: "http://open.mapquestapi.com/nominatim" })
350 creditsModel.append({ category: i18n.tr("Powered by"), name: "Overpass API", link: "http://wiki.openstreetmap.org/wiki/Overpass_API/XAPI_Compatibility_Layer" })
351 creditsModel.append({ category: i18n.tr("Powered by"), name: "OpenLayers", link: "http://openlayers.org" })

Subscribers

People subscribed via source and target branches