uNav

Merge lp:~costales/unav/0.59-several-fixes into lp:unav

  1. 0.59-several-fixes
  2. Merge into trunk
Proposed by costales
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 58
Merged at revision: 49
Proposed branch: lp:~costales/unav/0.59-several-fixes
Merge into: lp:unav
Diff against target: 1063 lines (+238/-180)
15 files modified
nav/class/UI.js (+6/-17)
nav/img/pages/share/destination.svg (+40/-18)
nav/index.html (+39/-13)
nav/locales/unav.pot (+133/-99)
qml/FavoritesPage.qml (+1/-3)
qml/Main.qml (+15/-15)
qml/Nearby.qml (+1/-2)
qml/PoiDetailsPage.qml (+0/-1)
qml/PoiListPage.qml (+1/-2)
qml/PoiPage.qml (+0/-1)
qml/RouteInfoListPage.qml (+0/-1)
qml/RoutePage.qml (+1/-2)
qml/SettingsPage.qml (+0/-1)
qml/Share.qml (+0/-2)
qml/SharePage.qml (+1/-3)
To merge this branch: bzr merge lp:~costales/unav/0.59-several-fixes
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan Approve
Review via email: mp+292015@code.launchpad.net

Commit message

Minor fixes for uNav 0.59 which includes,
- Used consistent destination icons
- Improved the clarity of the "Nearby & Share from Map" options
- White screen issues have also been fixed
- Improved denied popup behavior

To post a comment you must log in.
lp:~costales/unav/0.59-several-fixes updated
55. By costales

i18n

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Few fixes required,

1. Please do not remove console.log("Error reverse geocoding the location!") ... I added that to help us debug issues if users have trouble reverse geocoding. It only appears if there is an error, so it will not spam console.log unnecessarily.

2. The Destination icon in the Share and Nearby page is white color in a white page and is not visible.

3. I don't understand Bug #1569516: Improve denied popup behavior .. can you add more description to that bug report so that it makes clear on how to test it.

review: Needs Fixing
lp:~costales/unav/0.59-several-fixes updated
56. By costales

Destination icon color + revert msg error reverse geolocation

Revision history for this message
costales (costales) wrote :

Sure :)

Fixed 1 & 2.

3: When the GPS is denied, the GPS stopped, but the current Center on position icon is as in route. The change will revert the complete UI and internal status to GPS off.

A hug :)

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

I was able to test the following bugs,

Bug #1569838: Nearby->From Map is not clear to the user
Bug #1569853: Destination is shown using 4 different icons depending on where it is shown
Bug #1570545: If the route is simulate set message in route: "Cancel Simulation"

However I couldn't test Bug #1569516: Improve denied popup behavior because truth to be told, I still don't understand the issue or what I should be expected to see different in this branch :/

So for the above 3 bugs, I approve this MP.

review: Approve
lp:~costales/unav/0.59-several-fixes updated
57. By costales

Fixed white map

58. By costales

Fixed set POI

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Please add more description to the bug reports so that me and joerg can really check if this MP fixes those bugs are not. Until then, this is blocked.

review: Needs Fixing
Revision history for this message
costales (costales) wrote :

Done Nekhelesh.

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Nice work Marcos. I did testing of the above bugs and can see that they have been fixed. The code changes (except for the ones in index.html) look good. I am not familiar with index.html file to make a comment on it. I spot no regressions with respect to the POI features that your code improves. Approving!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nav/class/UI.js'
2--- nav/class/UI.js 2016-04-12 18:38:54 +0000
3+++ nav/class/UI.js 2016-04-15 21:19:21 +0000
4@@ -35,7 +35,7 @@
5 });
6 this.map.addOverlay(this.marker_pos);
7 $('#marker_pos').click(function () {
8- window.location = 'http://clicked_on_map?' + nav.get_pos_data()['now_lat'] + '/' + nav.get_pos_data()['now_lng'] + '/' + t("Current Position") + '/none/none/none/none/follow';
9+ window.location = 'http://clicked_on_map?' + nav.get_pos_data()['now_lat'] + '/' + nav.get_pos_data()['now_lng'] + '/none/none/' + t("Current Position") + '/none/follow';
10 });
11
12 this.marker_start = new ol.Overlay({
13@@ -44,7 +44,7 @@
14 });
15 this.map.addOverlay(this.marker_start);
16 $('#marker_pos_start').click(function () {
17- window.location = 'http://clicked_on_map?' + nav.get_pos_data()['start_lat'] + '/' + nav.get_pos_data()['start_lng'] + '/' + t("Current Start") + '/none/none/none/none/nofollow';
18+ window.location = 'http://clicked_on_map?' + nav.get_pos_data()['start_lat'] + '/' + nav.get_pos_data()['start_lng'] + '/none/none/' + t("Current Start") + '/none/nofollow';
19 });
20
21 this.marker_end = new ol.Overlay({
22@@ -53,7 +53,7 @@
23 });
24 this.map.addOverlay(this.marker_end);
25 $('#marker_pos_end').click(function () {
26- window.location = 'http://clicked_on_map?' + nav.get_pos_data()['end_lat'] + '/' + nav.get_pos_data()['end_lng'] + '/' + t("Current End") + '/none/none/none/none/nofollow';
27+ window.location = 'http://clicked_on_map?' + nav.get_pos_data()['end_lat'] + '/' + nav.get_pos_data()['end_lng'] + '/none/none/' + t("Current End") + '/none/nofollow';
28 });
29
30 this.markers_POI = [];
31@@ -272,7 +272,6 @@
32 UI.prototype.markers_POI_set = function(pois) {
33 var osm_type = '';
34 var osm_id = '';
35- var website = '';
36 var phone = '';
37
38 // Map
39@@ -297,12 +296,7 @@
40 // POI Click
41 osm_type = 'none';
42 osm_id = 'none';
43- website = 'none';
44 phone = 'none';
45- if (typeof pois[i].website !== 'undefined') {
46- website = pois[i].website.replace(/\//g, ' ');
47- website = website.replace(/\?/g, 'ç');
48- }
49 if (typeof pois[i].phone !== 'undefined')
50 phone = pois[i].phone;
51 if (typeof pois[i].osm_type !== 'undefined')
52@@ -310,7 +304,7 @@
53 if (typeof pois[i].osm_id !== 'undefined')
54 osm_id = pois[i].osm_id;
55
56- $('#POI'+i).bind('click', {title: pois[i].title, lat: pois[i].lat, lng: pois[i].lng, osm_type: osm_type, osm_id: osm_id, website: website, phone: phone}, function(event) {
57+ $('#POI'+i).bind('click', {title: pois[i].title, lat: pois[i].lat, lng: pois[i].lng, osm_type: osm_type, osm_id: osm_id, phone: phone}, function(event) {
58 ui.set_center_onpos(false);
59 ui.set_center_1st_pos(false);
60
61@@ -320,7 +314,7 @@
62 }));
63 map.getView().setCenter(ol.proj.transform([event.data.lng, event.data.lat], 'EPSG:4326', 'EPSG:3857'));
64
65- window.location = 'http://clicked_on_map?' + event.data.lat + '/' + event.data.lng + '/' + event.data.osm_type + '/' + event.data.osm_id + '/' + event.data.title + '/' + event.data.website + '/' + event.data.phone + '/nofollow';
66+ window.location = 'http://clicked_on_map?' + event.data.lat + '/' + event.data.lng + '/' + event.data.osm_type + '/' + event.data.osm_id + '/' + event.data.title + '/' + event.data.phone + '/nofollow';
67 });
68
69 // For fit map
70@@ -340,12 +334,7 @@
71
72 osm_type = 'none';
73 osm_id = 'none';
74- website = 'none';
75 phone = 'none';
76- if (typeof pois[0].website !== 'undefined') {
77- website = pois[0].website.replace(/\//g, ' ');
78- website = website.replace(/\?/g, 'ç');
79- }
80 if (typeof pois[0].phone !== 'undefined')
81 phone = pois[0].phone;
82 if (typeof pois[0].osm_type !== 'undefined')
83@@ -353,7 +342,7 @@
84 if (typeof pois[0].osm_id !== 'undefined')
85 osm_id = pois[0].osm_id;
86
87- window.location = 'http://clicked_on_map?' + pois[0].lat + '/' + pois[0].lng + '/' + osm_type + '/' + osm_id + '/' + pois[0].title + '/' + website + '/' + phone + '/nofollow';
88+ window.location = 'http://clicked_on_map?' + pois[0].lat + '/' + pois[0].lng + '/' + osm_type + '/' + osm_id + '/' + pois[0].title + '/' + phone + '/nofollow';
89 }
90 else { // Fit
91 var aux_height = 0;
92
93=== modified file 'nav/img/pages/share/destination.svg'
94--- nav/img/pages/share/destination.svg 2016-03-26 18:53:17 +0000
95+++ nav/img/pages/share/destination.svg 2016-04-15 21:19:21 +0000
96@@ -10,16 +10,18 @@
97 version="1.1"
98 x="0px"
99 y="0px"
100- viewBox="-0.5 0.722 100 94.445"
101- enable-background="new -0.5 0.722 100 94.445"
102+ viewBox="0 0 100 100"
103+ enable-background="new 0 0 100 100"
104 xml:space="preserve"
105 id="svg2"
106 inkscape:version="0.91 r13725"
107- sodipodi:docname="destination.svg"><metadata
108- id="metadata14"><rdf:RDF><cc:Work
109+ sodipodi:docname="4.svg"
110+ width="100"
111+ height="100"><metadata
112+ id="metadata28"><rdf:RDF><cc:Work
113 rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
114- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
115- id="defs12" /><sodipodi:namedview
116+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
117+ id="defs26" /><sodipodi:namedview
118 pagecolor="#ffffff"
119 bordercolor="#666666"
120 borderopacity="1"
121@@ -29,23 +31,43 @@
122 inkscape:pageopacity="0"
123 inkscape:pageshadow="2"
124 inkscape:window-width="1680"
125- inkscape:window-height="964"
126- id="namedview10"
127+ inkscape:window-height="965"
128+ id="namedview24"
129 showgrid="false"
130- inkscape:zoom="7.0676987"
131- inkscape:cx="0.78567825"
132- inkscape:cy="50.031318"
133+ inkscape:zoom="3.776"
134+ inkscape:cx="14.008616"
135+ inkscape:cy="43.948489"
136 inkscape:window-x="0"
137 inkscape:window-y="24"
138 inkscape:window-maximized="1"
139 inkscape:current-layer="svg2" /><g
140 id="g4"
141- transform="translate(1.9996419,0.33105523)"><path
142- d="m 3.365,7.673 c 2.783,-0.754 5.653,0.9 6.405,3.72 L 30.049,87.82 c 0.746,2.817 -0.895,5.714 -3.691,6.466 -2.776,0.756 -5.652,-0.916 -6.404,-3.732 L -0.318,14.13 c -0.751,-2.828 0.9,-5.706 3.683,-6.457 z"
143+ transform="matrix(-1,0,0,1,100.175,0.429)"><path
144+ d="m 80.789,38.64 c 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.244,-1.359 -6.669,-2.174 -10.184,-2.718 -1.106,3.328 -2.213,6.656 -3.319,9.984 3.515,0.544 6.94,1.36 10.184,2.718 z"
145 id="path6"
146- style="clip-rule:evenodd;fill:#7f7f7f;fill-rule:evenodd"
147- inkscape:connector-curvature="0" /><path
148- d="m 14.5,13.722 c 1.356,-2.345 14,-21.829 35.71,-8.11 21.752,13.714 35.906,23.515 45.29,7.11 0,0 -2.344,13.28 -6.371,20.319 C 85.108,40.081 72.5,49.722 56.89,45.616 42.449,41.817 31.825,47.674 27.5,60.722 c 0,0 -11.97,-43.334 -13,-47 z"
149+ inkscape:connector-curvature="0"
150+ style="fill:#808080" /><path
151+ d="m 59.879,34.834 c 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.605,-0.272 -7.211,-0.545 -10.726,-1.088 -1.106,3.328 -2.213,6.656 -3.319,9.984 3.515,0.543 7.121,0.816 10.726,1.088 z"
152 id="path8"
153- style="clip-rule:evenodd;fill:#7f7f7f;fill-rule:evenodd"
154- inkscape:connector-curvature="0" /></g></svg>
155\ No newline at end of file
156+ inkscape:connector-curvature="0"
157+ style="fill:#808080" /><path
158+ d="m 45.834,43.73 c 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.515,-0.544 -6.94,-1.359 -10.184,-2.718 -1.106,3.328 -2.213,6.656 -3.319,9.984 3.244,1.359 6.669,2.174 10.184,2.718 z"
159+ id="path10"
160+ inkscape:connector-curvature="0"
161+ style="fill:#808080" /><path
162+ d="m 59.879,34.834 c -1.106,3.328 -2.213,6.656 -3.319,9.984 3.605,0.272 7.211,0.545 10.726,1.088 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.515,-0.544 -7.121,-0.816 -10.726,-1.088 z"
163+ id="path12"
164+ inkscape:connector-curvature="0"
165+ style="fill:#808080" /><path
166+ d="m 74.151,58.609 c 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.244,-1.359 -6.669,-2.174 -10.184,-2.718 -1.106,3.328 -2.213,6.656 -3.319,9.984 3.515,0.544 6.94,1.359 10.184,2.718 z"
167+ id="path14"
168+ inkscape:connector-curvature="0"
169+ style="fill:#808080" /><path
170+ d="m 45.834,43.73 c -1.106,3.328 -2.213,6.656 -3.319,9.984 3.515,0.544 7.12,0.816 10.726,1.088 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.605,-0.272 -7.211,-0.544 -10.726,-1.088 z"
171+ id="path16"
172+ inkscape:connector-curvature="0"
173+ style="fill:#808080" /><path
174+ d="M 96.786,24.382 C 93.536,21.221 89.714,18.939 85.102,17.406 79.226,15.453 72.779,14.966 66.545,14.495 60.355,14.027 53.955,13.544 48.166,11.62 43.841,10.182 40.231,8.07 37.146,5.176 L 38.25,1.855 35.432,0.918 3.398,97.287 6.216,98.224 20.293,55.874 c 3.11,2.85 6.731,4.939 11.044,6.372 5.876,1.953 12.323,2.44 18.557,2.911 6.19,0.468 12.59,0.951 18.379,2.875 4.503,1.497 8.233,3.722 11.401,6.804 l 0.424,0.413 16.854,-50.705 -0.166,-0.162 z m -36.02,41.14 c 1.067,-3.21 2.134,-6.421 3.201,-9.631 -3.515,-0.544 -7.12,-0.816 -10.726,-1.088 -1.066,3.207 -2.132,6.414 -3.198,9.621 -0.031,-0.002 -0.062,-0.005 -0.093,-0.007 -3.527,-0.266 -7.122,-0.539 -10.634,-1.079 1.066,-3.208 2.133,-6.416 3.199,-9.623 -3.515,-0.544 -6.94,-1.359 -10.184,-2.718 -1.067,3.21 -2.134,6.42 -3.201,9.63 -3.267,-1.372 -6.093,-3.197 -8.579,-5.529 l 3.192,-9.603 c 2.655,2.461 5.54,4.226 8.588,5.502 1.106,-3.328 2.213,-6.656 3.319,-9.984 -3.048,-1.276 -5.934,-3.042 -8.588,-5.502 l 3.319,-9.984 c 2.655,2.461 5.54,4.226 8.588,5.502 1.106,-3.328 2.213,-6.656 3.319,-9.984 C 39.24,19.769 36.354,18.003 33.7,15.543 l 3.188,-9.591 c 2.504,2.295 5.34,4.098 8.602,5.461 -1.067,3.211 -2.134,6.421 -3.202,9.632 3.244,1.359 6.669,2.174 10.184,2.718 1.067,-3.21 2.134,-6.421 3.201,-9.631 3.545,0.552 7.167,0.83 10.723,1.098 -1.066,3.207 -2.132,6.414 -3.198,9.621 3.605,0.272 7.211,0.545 10.726,1.088 1.066,-3.208 2.133,-6.416 3.199,-9.623 2.651,0.408 5.255,0.968 7.745,1.796 0.84,0.279 1.653,0.584 2.441,0.915 -1.067,3.21 -2.134,6.42 -3.201,9.63 3.13,1.311 6.089,3.134 8.802,5.7 l -3.319,9.984 c -2.713,-2.565 -5.672,-4.389 -8.802,-5.7 -1.106,3.328 -2.213,6.656 -3.319,9.984 3.13,1.311 6.089,3.134 8.802,5.7 l -3.319,9.984 c -2.713,-2.565 -5.672,-4.389 -8.802,-5.7 -1.067,3.211 -2.134,6.421 -3.202,9.632 -0.789,-0.33 -1.602,-0.634 -2.442,-0.913 -2.497,-0.83 -5.098,-1.394 -7.741,-1.806 z"
175+ id="path18"
176+ inkscape:connector-curvature="0"
177+ style="fill:#808080" /></g></svg>
178
179=== modified file 'nav/index.html'
180--- nav/index.html 2016-04-14 17:45:04 +0000
181+++ nav/index.html 2016-04-15 21:19:21 +0000
182@@ -259,7 +259,6 @@
183 var id_auto_accept = 0;
184 var id_gps_died = 0;
185 var times_without_accuracy = -1; // Control 1st time
186- var show_gps_denied = true;
187
188 function center_pos() {
189 ui.set_center_1st_pos(true);
190@@ -271,7 +270,6 @@
191 }
192 }
193
194-
195 // Dragons here! The 'status' is critical in the app, it will pass for states that will determine how to work the app
196 function gps_loop(status) {
197
198@@ -338,6 +336,9 @@
199 console.log('Starting GPS...');
200
201 if (!navigator.geolocation) {
202+ clearTimeout(id_gps_died);
203+ id_gps_died = 0;
204+ qml_set_center_onpos(0);
205 $('#gps_denied').show();
206 return;
207 }
208@@ -352,6 +353,24 @@
209 clearTimeout(id_gps_died);
210 id_gps_died = 0;
211 }
212+ if (z1 == 5) {
213+ clearInterval(id_gps);
214+ id_gps = 0;
215+ if (id_auto_accept > 0) {
216+ clearTimeout(id_auto_accept);
217+ id_auto_accept = 0;
218+ }
219+ if (id_gps > 0) {
220+ clearTimeout(id_gps);
221+ id_gps = 0;
222+ }
223+ nav.set_route_status('no');
224+ ui.update();
225+ ui.markers_radar_clear();
226+ ui.route(false);
227+ qml_set_center_onpos(0);
228+ $('#gps_denied').show();
229+ }
230 accuracy = 300;
231 speed = 2;
232 z1++;
233@@ -365,7 +384,7 @@
234 if (times_without_accuracy != 1)
235 gps_loop(nav.get_route_status());
236 console.log('~~~~~ '+nav.get_route_status() + ' ' + times_without_accuracy);
237- },3000);
238+ },1000);
239 return;
240 TESTING END **/
241
242@@ -392,14 +411,19 @@
243 }
244 },
245 function (error) {
246- if (error.code == 1) { // Denied? > Reset watch (clear + watch). With a deny code, watchPosition stops
247+ if (error.code == 1) { // Denied?
248 navigator.geolocation.clearWatch(id_gps);
249 id_gps = 0;
250- setTimeout('center_pos()', 6000);
251- if (show_gps_denied) {
252- show_gps_denied = false;
253- $('#gps_denied').show();
254+ if (id_auto_accept > 0) {
255+ clearTimeout(id_auto_accept);
256+ id_auto_accept = 0;
257 }
258+ nav.set_route_status('no');
259+ ui.update();
260+ ui.markers_radar_clear();
261+ ui.route(false);
262+ qml_set_center_onpos(0);
263+ $('#gps_denied').show();
264 }
265 },
266 {
267@@ -423,7 +447,7 @@
268
269 ui.markers_POI_set([{title: '', lat: coord[1], lng: coord[0]}]);
270
271- window.location = 'http://clicked_on_map?' + coord[1] + '/' + coord[0] + '/none/none/none/none/none/nofollow'; // Show popup
272+ window.location = 'http://clicked_on_map?' + coord[1] + '/' + coord[0] + '/none/none/none/none/nofollow'; // Show popup
273 }
274 else {
275 window.location = 'http://hide_popup?';
276@@ -565,10 +589,6 @@
277 ui.update();
278 qml_set_center_onpos(2);
279 }
280-
281- function force_show_map() { // Hack bug #1566476
282- map.updateSize();
283- }
284 </script>
285
286
287@@ -644,6 +664,12 @@
288 console.log("Loaded voices: " + lang);
289 }
290 });
291+
292+
293+ $(document).on('visibilitychange', function() { // Hack white map
294+ if(document.visibilityState !== 'hidden')
295+ map.updateSize();
296+ });
297 </script>
298 </body>
299 </html>
300
301=== modified file 'nav/locales/unav.pot'
302--- nav/locales/unav.pot 2016-04-06 21:37:45 +0000
303+++ nav/locales/unav.pot 2016-04-15 21:19:21 +0000
304@@ -8,7 +8,7 @@
305 msgstr ""
306 "Project-Id-Version: PACKAGE VERSION\n"
307 "Report-Msgid-Bugs-To: \n"
308-"POT-Creation-Date: 2016-04-06 23:37+0200\n"
309+"POT-Creation-Date: 2016-04-15 17:43+0200\n"
310 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
311 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
312 "Language-Team: LANGUAGE <LL@li.org>\n"
313@@ -89,150 +89,148 @@
314 msgid "Buy Donate Version"
315 msgstr ""
316
317-#: qml/Coordinate.qml:25 qml/RoutePage.qml:60
318+#: qml/Coordinate.qml:26 qml/RoutePage.qml:60
319 msgid "Coordinates"
320 msgstr ""
321
322-#: qml/Coordinate.qml:33
323+#: qml/Coordinate.qml:34
324 msgid "Decimal"
325 msgstr ""
326
327-#: qml/Coordinate.qml:33
328+#: qml/Coordinate.qml:34
329 msgid "Sexagesimal"
330 msgstr ""
331
332-#: qml/Coordinate.qml:53 qml/Coordinate.qml:149
333+#: qml/Coordinate.qml:60 qml/Coordinate.qml:152
334 msgid "Lat:"
335 msgstr ""
336
337-#: qml/Coordinate.qml:71 qml/Coordinate.qml:209
338+#: qml/Coordinate.qml:77 qml/Coordinate.qml:207
339 msgid "Long:"
340 msgstr ""
341
342-#: qml/Coordinate.qml:87 qml/Coordinate.qml:268
343+#: qml/Coordinate.qml:92 qml/Coordinate.qml:261
344 msgid "Show on Map"
345 msgstr ""
346
347-#: qml/Coordinate.qml:125 qml/Coordinate.qml:333
348+#: qml/Coordinate.qml:130 qml/Coordinate.qml:326
349 msgid "Coordinates are not valid"
350 msgstr ""
351
352-#: qml/Coordinate.qml:126
353+#: qml/Coordinate.qml:131
354 msgid ""
355 "Enter valid decimal coordinates\n"
356 "\n"
357 "Expected format is:"
358 msgstr ""
359
360-#: qml/Coordinate.qml:128 qml/Coordinate.qml:336
361+#: qml/Coordinate.qml:133 qml/Coordinate.qml:329
362 msgid "Close"
363 msgstr ""
364
365-#: qml/Coordinate.qml:334
366+#: qml/Coordinate.qml:327
367 msgid ""
368 "Enter valid sexagesimal coordinates\n"
369 "\n"
370 "Expected format is:"
371 msgstr ""
372
373-#: qml/FavoritesPage.qml:58 qml/RoutePage.qml:58
374+#: qml/FavoritesPage.qml:64 qml/RoutePage.qml:58
375 msgid "Favorites"
376 msgstr ""
377
378-#: qml/FavoritesPage.qml:68 qml/Nearby.qml:34 qml/PoiPage.qml:59
379-#: qml/PoiPage.qml:99 qml/RouteInfoListPage.qml:36 qml/RoutePage.qml:34
380-#: qml/SearchPage.qml:39 qml/SettingsPage.qml:37 qml/SharePage.qml:35
381+#: qml/FavoritesPage.qml:73 qml/Nearby.qml:34 qml/PoiDetailsPage.qml:38
382+#: qml/PoiPage.qml:58 qml/PoiPage.qml:98 qml/RouteInfoListPage.qml:37
383+#: qml/RoutePage.qml:34 qml/SearchPage.qml:43 qml/SettingsPage.qml:37
384+#: qml/SharePage.qml:35
385 msgid "Back"
386 msgstr ""
387
388-#: qml/FavoritesPage.qml:80 qml/FavoritesPage.qml:238
389+#: qml/FavoritesPage.qml:84 qml/FavoritesPage.qml:246
390 msgid "Add Favorite"
391 msgstr ""
392
393-#: qml/FavoritesPage.qml:91
394+#: qml/FavoritesPage.qml:95
395 msgid "No favorites yet"
396 msgstr ""
397
398-#: qml/FavoritesPage.qml:200
399+#: qml/FavoritesPage.qml:208
400 msgid "Add Current Position"
401 msgstr ""
402
403-#: qml/FavoritesPage.qml:210
404+#: qml/FavoritesPage.qml:218
405 msgid "Add Current Destination"
406 msgstr ""
407
408-#: qml/FavoritesPage.qml:221
409-msgid "Add From Map"
410+#: qml/FavoritesPage.qml:229
411+msgid "Add Clicking on Map"
412 msgstr ""
413
414-#: qml/FavoritesPage.qml:238
415+#: qml/FavoritesPage.qml:246
416 msgid "Edit Favorite"
417 msgstr ""
418
419-#: qml/FavoritesPage.qml:239
420+#: qml/FavoritesPage.qml:247
421 msgid ""
422 "There is already a favorite with that name. You can either overwrite it or "
423 "enter a different name."
424 msgstr ""
425
426-#: qml/FavoritesPage.qml:273
427+#: qml/FavoritesPage.qml:281
428 msgid "Insert a favorite name"
429 msgstr ""
430
431-#: qml/FavoritesPage.qml:274 qml/Main.qml:432 qml/Main.qml:508
432-#: nav/class/UI.js:38
433+#: qml/FavoritesPage.qml:282 qml/Main.qml:546 nav/class/UI.js:38
434 msgid "Current Position"
435 msgstr ""
436
437-#: qml/FavoritesPage.qml:289
438+#: qml/FavoritesPage.qml:297 qml/RoutePage.qml:62 qml/SearchPage.qml:106
439+#: qml/SettingsPage.qml:298
440+msgid "Cancel"
441+msgstr ""
442+
443+#: qml/FavoritesPage.qml:304
444 msgid "Overwrite"
445 msgstr ""
446
447-#: qml/FavoritesPage.qml:289
448+#: qml/FavoritesPage.qml:304
449 msgid "Add"
450 msgstr ""
451
452-#: qml/FavoritesPage.qml:289
453+#: qml/FavoritesPage.qml:304
454 msgid "Update"
455 msgstr ""
456
457-#: qml/FavoritesPage.qml:301 qml/SettingsPage.qml:298
458-msgid "Cancel"
459-msgstr ""
460-
461-#: qml/Main.qml:139 qml/SettingsPage.qml:29
462+#: qml/Main.qml:140 qml/SettingsPage.qml:29
463 msgid "Settings"
464 msgstr ""
465
466-#: qml/Main.qml:147
467+#: qml/Main.qml:148
468 msgid "Fullscreen"
469 msgstr ""
470
471-#: qml/Main.qml:157
472+#: qml/Main.qml:161
473 msgid "Center on Position"
474 msgstr ""
475
476-#: qml/Main.qml:169 qml/RoutePage.qml:26
477-msgid "Route"
478+#: qml/Main.qml:173 qml/RoutePage.qml:26
479+msgid "Menu"
480 msgstr ""
481
482-#: qml/Main.qml:224
483+#: qml/Main.qml:347 qml/Main.qml:373
484 msgid "Shared Position"
485 msgstr ""
486
487-#: qml/Main.qml:492
488-msgid "Coord:"
489-msgstr ""
490-
491-#: qml/Main.qml:580
492-msgid "Favorite name"
493-msgstr ""
494-
495-#: qml/Main.qml:603
496+#: qml/Main.qml:535
497+#, qt-format
498+msgid "Coord: %1, %2"
499+msgstr ""
500+
501+#: qml/Main.qml:675
502 msgid "AGPS is disabled"
503 msgstr ""
504
505-#: qml/Main.qml:604
506+#: qml/Main.qml:676
507 msgid ""
508 "Enabling WiFi (even not connected) in Meizu & bq devices will auto activate "
509 "the AGPS feature.\n"
510@@ -242,19 +240,19 @@
511 "take a while."
512 msgstr ""
513
514-#: qml/Main.qml:606 qml/tuto/components/Walkthrough.qml:93
515+#: qml/Main.qml:678 qml/tuto/components/Walkthrough.qml:89
516 msgid "Skip"
517 msgstr ""
518
519-#: qml/Main.qml:611
520+#: qml/Main.qml:683
521 msgid "WiFi Settings"
522 msgstr ""
523
524-#: qml/Main.qml:622
525+#: qml/Main.qml:694
526 msgid "Don't show this again"
527 msgstr ""
528
529-#: qml/Nearby.qml:26 qml/PoiPage.qml:52 qml/RoutePage.qml:59
530+#: qml/Nearby.qml:26 qml/PoiPage.qml:51 qml/RoutePage.qml:59
531 msgid "Nearby"
532 msgstr ""
533
534@@ -267,7 +265,39 @@
535 msgstr ""
536
537 #: qml/Nearby.qml:57 qml/SharePage.qml:59
538-msgid "From Map"
539+msgid "Click on Map"
540+msgstr ""
541+
542+#: qml/PoiDetailsPage.qml:76
543+msgid "Lat, Long:"
544+msgstr ""
545+
546+#: qml/PoiDetailsPage.qml:82 qml/PoiDetailsPage.qml:97
547+msgid "Available"
548+msgstr ""
549+
550+#: qml/PoiDetailsPage.qml:84 qml/PoiDetailsPage.qml:99
551+msgid "Not Available"
552+msgstr ""
553+
554+#: qml/PoiDetailsPage.qml:86
555+msgid "Wi-Fi Hotspot Available"
556+msgstr ""
557+
558+#: qml/PoiDetailsPage.qml:88
559+msgid "Wired Connection Available (ethernet connection)"
560+msgstr ""
561+
562+#: qml/PoiDetailsPage.qml:90
563+msgid "Computer Terminal Available"
564+msgstr ""
565+
566+#: qml/PoiDetailsPage.qml:102
567+msgid "Limited Availability"
568+msgstr ""
569+
570+#: qml/PoiDetailsPage.qml:155
571+msgid "Loading POI details..."
572 msgstr ""
573
574 #: qml/PoiListPage.qml:41
575@@ -282,7 +312,7 @@
576 msgid "Something was wrong. Please, try again…"
577 msgstr ""
578
579-#: qml/PoiListPage.qml:136 qml/SearchPage.qml:139
580+#: qml/PoiListPage.qml:136 qml/SearchPage.qml:192
581 msgid "Time out! Please try again"
582 msgstr ""
583
584@@ -291,27 +321,27 @@
585 msgid "Sorry, no %1 found nearby. Try again with another radius"
586 msgstr ""
587
588-#: qml/PoiListPage.qml:153 qml/SearchPage.qml:55
589+#: qml/PoiListPage.qml:153 qml/SearchPage.qml:80
590 msgid "Searching…"
591 msgstr ""
592
593-#: qml/PoiListPage.qml:313
594+#: qml/PoiListPage.qml:303
595 msgid "PH"
596 msgstr ""
597
598-#: qml/PoiListPage.qml:315
599+#: qml/PoiListPage.qml:305
600 msgid "off"
601 msgstr ""
602
603-#: qml/PoiPage.qml:69 qml/RoutePage.qml:57 qml/SearchPage.qml:31
604+#: qml/PoiPage.qml:68 qml/RoutePage.qml:57 qml/SearchPage.qml:35
605 msgid "Search"
606 msgstr ""
607
608-#: qml/PoiPage.qml:128
609+#: qml/PoiPage.qml:127
610 msgid "Most recent"
611 msgstr ""
612
613-#: qml/RouteInfoListPage.qml:28
614+#: qml/RouteInfoListPage.qml:29
615 msgid "Route Info"
616 msgstr ""
617
618@@ -319,37 +349,37 @@
619 msgid "Share"
620 msgstr ""
621
622-#: qml/RoutePage.qml:62
623-msgid "Cancel Route"
624-msgstr ""
625-
626 #: qml/SearchPage.qml:51
627+msgid "Find location"
628+msgstr ""
629+
630+#: qml/SearchPage.qml:76
631 msgid "Where do we go?"
632 msgstr ""
633
634-#: qml/SearchPage.qml:73
635+#: qml/SearchPage.qml:126
636 msgid "No history yet…"
637 msgstr ""
638
639-#: qml/SearchPage.qml:73
640+#: qml/SearchPage.qml:126
641 msgid "History is disabled"
642 msgstr ""
643
644-#: qml/SearchPage.qml:103 qml/SearchPage.qml:246
645+#: qml/SearchPage.qml:156 qml/SearchPage.qml:302 qml/SearchPage.qml:363
646 msgid "Search history"
647 msgstr ""
648
649-#: qml/SearchPage.qml:113 qml/SearchPage.qml:252
650+#: qml/SearchPage.qml:166 qml/SearchPage.qml:308 qml/SearchPage.qml:365
651 msgid "Favorite history"
652 msgstr ""
653
654-#: qml/SearchPage.qml:123 qml/SearchPage.qml:249 qml/SearchPage.qml:265
655-#: qml/SearchPage.qml:275 qml/SearchPage.qml:289 qml/SearchPage.qml:295
656-#: qml/SearchPage.qml:302
657+#: qml/SearchPage.qml:176 qml/SearchPage.qml:305 qml/SearchPage.qml:321
658+#: qml/SearchPage.qml:331 qml/SearchPage.qml:346 qml/SearchPage.qml:353
659+#: qml/SearchPage.qml:384 qml/SearchPage.qml:390
660 msgid "Nearby history"
661 msgstr ""
662
663-#: qml/SearchPage.qml:147
664+#: qml/SearchPage.qml:199
665 #, qt-format
666 msgid "Sorry, no result for %1"
667 msgstr ""
668@@ -439,20 +469,21 @@
669 msgstr ""
670
671 #: qml/SettingsPage.qml:309
672-#, qt-format
673 msgid ""
674 "uNav is only reading the OpenStreetMap database.\n"
675 "uNav will show a max speed notification and a Speed Camera marker (marker "
676 "hidden for French users because of law).\n"
677 "\n"
678 "In a few countries Speed Camera alerts are illegal, then enable this option "
679-"only if it's legal in the country.\n"
680-"\n"
681-"Read more about it here:\n"
682-"%1"
683-msgstr ""
684-
685-#: qml/SettingsPage.qml:311
686+"only if it's legal in the country."
687+msgstr ""
688+
689+#: qml/SettingsPage.qml:315
690+#, qt-format
691+msgid "Read more about it %1."
692+msgstr ""
693+
694+#: qml/SettingsPage.qml:319
695 msgid "OK"
696 msgstr ""
697
698@@ -460,6 +491,16 @@
699 msgid "Share Position"
700 msgstr ""
701
702+#: qml/Share.qml:29
703+msgid "Share location to"
704+msgstr ""
705+
706+msgid "Cancel Route"
707+msgstr ""
708+
709+msgid "From Map"
710+msgstr ""
711+
712 msgid "Start"
713 msgstr ""
714
715@@ -472,9 +513,6 @@
716 msgid "More than 1000km could affect the performance"
717 msgstr ""
718
719-msgid "In these long routes the speed camera alerts are disabled"
720-msgstr ""
721-
722 msgid "We recommend you a waypoint in the middle as destination"
723 msgstr ""
724
725@@ -988,7 +1026,7 @@
726 msgid "Go to your left"
727 msgstr ""
728
729-#: nav/class/Navigator.js:288 nav/class/UI.js:427
730+#: nav/class/Navigator.js:288 nav/class/UI.js:431
731 msgid "You have arrived at your destination"
732 msgstr ""
733
734@@ -1136,46 +1174,42 @@
735 msgid "Current End"
736 msgstr ""
737
738-#: nav/class/UI.js:365
739+#: nav/class/UI.js:369
740 msgid "Waiting for a GPS signal…"
741 msgstr ""
742
743-#: nav/class/UI.js:370
744+#: nav/class/UI.js:374
745 msgid "Searching for a route…"
746 msgstr ""
747
748-#: nav/class/UI.js:374
749+#: nav/class/UI.js:378
750 msgid "Drawing route…"
751 msgstr ""
752
753-#: nav/class/UI.js:378
754+#: nav/class/UI.js:382
755 msgid "Error finding route between points. Check the connection and try again"
756 msgstr ""
757
758-#: nav/class/UI.js:382
759+#: nav/class/UI.js:386
760 msgid "Recalculating route…"
761 msgstr ""
762
763-#: nav/class/UI.js:403
764+#: nav/class/UI.js:407
765 msgid "Navigation will start soon"
766 msgstr ""
767
768-#: nav/class/UI.js:434
769+#: nav/class/UI.js:438
770 msgid "Simulating route…"
771 msgstr ""
772
773-#: nav/class/UI.js:438
774+#: nav/class/UI.js:442
775 msgid "Error simulating route. Try different points"
776 msgstr ""
777
778-#: nav/class/UI.js:459
779+#: nav/class/UI.js:463
780 msgid "Click onto the icon for reviewing the route"
781 msgstr ""
782
783-#: nav/class/WebAPI.js:204
784-msgid "Analyzing speed cameras… This could take a while"
785-msgstr ""
786-
787 #: qml/tuto/Slide1.qml:40
788 msgid "Welcome to uNav"
789 msgstr ""
790@@ -1198,7 +1232,7 @@
791 msgstr ""
792
793 #: qml/tuto/Slide3.qml:43
794-msgid "Flick Results"
795+msgid "Swipe Results"
796 msgstr ""
797
798 #: qml/tuto/Slide3.qml:60
799
800=== modified file 'qml/FavoritesPage.qml'
801--- qml/FavoritesPage.qml 2016-04-13 13:31:58 +0000
802+++ qml/FavoritesPage.qml 2016-04-15 21:19:21 +0000
803@@ -74,7 +74,6 @@
804 shortcut: "Escape"
805 onTriggered: {
806 mainPageStack.pop();
807- mainPageStack.executeJavaScript("force_show_map()");
808 }
809 }
810 trailingActionBar.actions: Action {
811@@ -226,10 +225,9 @@
812
813 }
814 Action {
815- text: i18n.tr("Add From Map")
816+ text: i18n.tr("Add Clicking on Map")
817 onTriggered: {
818 mainPageStack.clear();
819- mainPageStack.executeJavaScript("force_show_map()");
820 }
821 }
822 }
823
824=== modified file 'qml/Main.qml'
825--- qml/Main.qml 2016-04-14 20:10:22 +0000
826+++ qml/Main.qml 2016-04-15 21:19:21 +0000
827@@ -220,7 +220,6 @@
828 // We could start to clean this up a bit by writing functions on that...
829 var url = request.url.toString().split("?");
830 var params = url[1].split("/");
831-
832 switch (url[0]) {
833 case "http://go/":
834 Qt.openUrlExternally(url[1]);
835@@ -243,7 +242,6 @@
836 case "http://clicked_on_map/":
837 goThereActionPopover.osm_type = 'none';
838 goThereActionPopover.osm_id = 'none';
839- goThereActionPopover.website = '';
840 goThereActionPopover.phone = '';
841 mainPageStack.clickedLat = params[0];
842 mainPageStack.clickedLng = params[1];
843@@ -255,18 +253,14 @@
844 goThereActionPopover.osm_id = params[3];
845
846 if (params[4] !== "none")
847- goThereActionPopover.poiName = decodeURI(params[4]);
848+ goThereActionPopover.poiName = params[4];
849 else
850 goThereActionPopover.poiName = "";
851
852- if (params[5] !== 'none') {
853- goThereActionPopover.website = params[5].replace(/ /g, '/');
854- goThereActionPopover.website = goThereActionPopover.website.replace(/ç/g, '?');
855- }
856- if (params[6] !== 'none')
857+ if (params[5] !== 'none')
858 goThereActionPopover.phone = params[6];
859
860- if (params[7] === 'nofollow' && mainPageStack.center_onpos === 2)
861+ if (params[6] === 'nofollow' && mainPageStack.center_onpos === 2)
862 mainPageStack.center_onpos = 1;
863 mainPageStack.favPopup = false;
864 goThereActionPopover.show();
865@@ -282,10 +276,18 @@
866 break;
867
868 case "http://set_center_onpos/":
869- if (params[0] === '2')
870- mainPageStack.center_onpos = 2;
871- else
872- mainPageStack.center_onpos = 1;
873+ switch (params[0]) {
874+ case '0': // GPS Denied (special)
875+ mainPageStack.routeState = 'no';
876+ mainPageStack.center_onpos = 0;
877+ break;
878+ case '1':
879+ mainPageStack.center_onpos = 1;
880+ break;
881+ case '2':
882+ mainPageStack.center_onpos = 2;
883+ break;
884+ }
885 break;
886
887 case "http://set_ui_speed/":
888@@ -436,7 +438,6 @@
889
890 function reverseSearch(lat, lon) {
891 source = (baseUrl + "lat=" + lat + "&lon=" + lon) ;
892- console.log(source)
893 }
894
895 function clear() {
896@@ -504,7 +505,6 @@
897 property string poiName
898 property string osm_type
899 property string osm_id
900- property string website
901 property string phone
902
903 onIsShownChanged: {
904
905=== modified file 'qml/Nearby.qml'
906--- qml/Nearby.qml 2016-04-14 13:23:40 +0000
907+++ qml/Nearby.qml 2016-04-15 21:19:21 +0000
908@@ -54,7 +54,7 @@
909 function initialize() {
910 nearbyPageModel.append({mode: "CURRENT", text: i18n.tr("Current"), source: "../nav/img/pages/share/current.svg", visible: (mainPageStack.center_onpos !== 0 && mainPageStack.currentLat !== "null" && mainPageStack.currentLng !== "null") })
911 nearbyPageModel.append({mode: "DESTINATION", text: i18n.tr("Destination"), source: "../nav/img/pages/share/destination.svg", visible: (mainPageStack.routeState !== 'no' && mainPageStack.endLat !== "null" && mainPageStack.endLng !== "null") })
912- nearbyPageModel.append({mode: "MAP", text: i18n.tr("From Map"), source: "../nav/img/pages/share/fromMap.svg", visible: true })
913+ nearbyPageModel.append({mode: "MAP", text: i18n.tr("Click on Map"), source: "../nav/img/pages/share/fromMap.svg", visible: true })
914 }
915 }
916
917@@ -76,7 +76,6 @@
918 mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
919 } else if (model.mode === "MAP") {
920 mainPageStack.clear(); // Show map
921- mainPageStack.executeJavaScript("force_show_map()");
922 }
923 }
924 }
925
926=== modified file 'qml/PoiDetailsPage.qml'
927--- qml/PoiDetailsPage.qml 2016-04-11 19:40:32 +0000
928+++ qml/PoiDetailsPage.qml 2016-04-15 21:19:21 +0000
929@@ -39,7 +39,6 @@
930 shortcut: "Escape"
931 onTriggered: {
932 mainPageStack.pop()
933- mainPageStack.executeJavaScript("force_show_map()");
934 }
935 }
936 }
937
938=== modified file 'qml/PoiListPage.qml'
939--- qml/PoiListPage.qml 2016-04-14 13:23:40 +0000
940+++ qml/PoiListPage.qml 2016-04-15 21:19:21 +0000
941@@ -197,7 +197,6 @@
942 lng: parseFloat(sortedPoiModel.get(i).lng),
943 osm_id: sortedPoiModel.get(i).osm_id,
944 osm_type: sortedPoiModel.get(i).osm_type.charAt(0).toUpperCase(),
945- website: sortedPoiModel.get(i).website,
946 phone: sortedPoiModel.get(i).phone
947 });
948 }
949@@ -286,7 +285,7 @@
950
951 onClicked: {
952 mainPageStack.clear();
953- mainPageStack.executeJavaScript("ui.markers_POI_set([{title: \"" + model.name + "\", lat: " + model.lat + ", lng: " + model.lng + ", osm_type: '" + model.osm_type + "', osm_id: " + model.osm_id + ", website: \"" + model.website + "\", phone: \"" + model.phone + "\"}])");
954+ mainPageStack.executeJavaScript("ui.markers_POI_set([{title: \"" + model.name + "\", lat: " + model.lat + ", lng: " + model.lng + ", osm_type: '" + model.osm_type + "', osm_id: " + model.osm_id + ", phone: \"" + model.phone + "\"}])");
955 }
956
957 ListItemLayout {
958
959=== modified file 'qml/PoiPage.qml'
960--- qml/PoiPage.qml 2016-04-14 13:23:40 +0000
961+++ qml/PoiPage.qml 2016-04-15 21:19:21 +0000
962@@ -58,7 +58,6 @@
963 text: i18n.tr("Back")
964 onTriggered: {
965 mainPageStack.pop();
966- mainPageStack.executeJavaScript("force_show_map()");
967 }
968 }
969
970
971=== modified file 'qml/RouteInfoListPage.qml'
972--- qml/RouteInfoListPage.qml 2016-04-10 09:43:33 +0000
973+++ qml/RouteInfoListPage.qml 2016-04-15 21:19:21 +0000
974@@ -38,7 +38,6 @@
975 shortcut: "Escape"
976 onTriggered: {
977 mainPageStack.pop()
978- mainPageStack.executeJavaScript("force_show_map()");
979 }
980 }
981 }
982
983=== modified file 'qml/RoutePage.qml'
984--- qml/RoutePage.qml 2016-04-14 13:33:08 +0000
985+++ qml/RoutePage.qml 2016-04-15 21:19:21 +0000
986@@ -35,7 +35,6 @@
987 shortcut: "Escape"
988 onTriggered: {
989 mainPageStack.pop();
990- mainPageStack.executeJavaScript("force_show_map()");
991 }
992 }
993 }
994@@ -59,7 +58,7 @@
995 routePageModel.append({mode: "NEARBY", text: i18n.tr("Nearby"), iconName: "location", visible: true})
996 routePageModel.append({mode: "COORDINATES", text: i18n.tr("Coordinates"), iconName: "webbrowser-app-symbolic", visible: true})
997 routePageModel.append({mode: "SHARE", text: i18n.tr("Share"), iconName: "share", visible: true})
998- routePageModel.append({mode: "CANCEL", text: i18n.tr("Cancel Route"), iconName: "dialog-error-symbolic", visible: mainPageStack.routeState !== 'no'})
999+ routePageModel.append({mode: "CANCEL", text: i18n.tr("Cancel"), iconName: "dialog-error-symbolic", visible: mainPageStack.routeState !== 'no'})
1000 }
1001 }
1002
1003
1004=== modified file 'qml/SettingsPage.qml'
1005--- qml/SettingsPage.qml 2016-04-14 16:55:36 +0000
1006+++ qml/SettingsPage.qml 2016-04-15 21:19:21 +0000
1007@@ -38,7 +38,6 @@
1008 shortcut: "Escape"
1009 onTriggered: {
1010 mainPageStack.pop()
1011- mainPageStack.executeJavaScript("force_show_map()");
1012 }
1013 }
1014
1015
1016=== modified file 'qml/Share.qml'
1017--- qml/Share.qml 2016-04-11 17:39:58 +0000
1018+++ qml/Share.qml 2016-04-15 21:19:21 +0000
1019@@ -45,7 +45,6 @@
1020
1021 onCancelPressed: {
1022 mainPageStack.pop()
1023- mainPageStack.executeJavaScript("force_show_map()");
1024 }
1025
1026 onPeerSelected: {
1027@@ -54,7 +53,6 @@
1028 request.items = [ resultComponent.createObject(navApp.mainPageStack, {"url": url2shared}) ];
1029 request.state = ContentTransfer.Charged;
1030 mainPageStack.pop()
1031- mainPageStack.executeJavaScript("force_show_map()");
1032 }
1033 }
1034 }
1035
1036=== modified file 'qml/SharePage.qml'
1037--- qml/SharePage.qml 2016-04-10 15:45:29 +0000
1038+++ qml/SharePage.qml 2016-04-15 21:19:21 +0000
1039@@ -36,7 +36,6 @@
1040 shortcut: "Escape"
1041 onTriggered: {
1042 mainPageStack.pop();
1043- mainPageStack.executeJavaScript("force_show_map()");
1044 }
1045 }
1046 }
1047@@ -56,7 +55,7 @@
1048 function initialize() {
1049 sharePageModel.append({mode: "CURRENT", text: i18n.tr("Current"), source: "../nav/img/pages/share/current.svg", visible: (mainPageStack.center_onpos !== 0 && mainPageStack.currentLat !== "null" && mainPageStack.currentLng !== "null") })
1050 sharePageModel.append({mode: "DESTINATION", text: i18n.tr("Destination"), source: "../nav/img/pages/share/destination.svg", visible: (mainPageStack.routeState !== 'no' && mainPageStack.endLat !== "null" && mainPageStack.endLng !== "null") })
1051- sharePageModel.append({mode: "MAP", text: i18n.tr("From Map"), source: "../nav/img/pages/share/fromMap.svg", visible: true })
1052+ sharePageModel.append({mode: "MAP", text: i18n.tr("Click on Map"), source: "../nav/img/pages/share/fromMap.svg", visible: true })
1053 }
1054 }
1055
1056@@ -78,7 +77,6 @@
1057 mainPageStack.push(Qt.resolvedUrl("Share.qml"), {"lat": mainPageStack.endLat, "lon": mainPageStack.endLng})
1058 } else if (model.mode === "MAP") {
1059 mainPageStack.clear(); // Show map
1060- mainPageStack.executeJavaScript("force_show_map()");
1061 }
1062 }
1063 }

Subscribers

People subscribed via source and target branches