uNav

Merge lp:~costales/unav/removed_osm_tiles into lp:unav

  1. removed_osm_tiles
  2. Merge into trunk
Proposed by costales
Status: Merged
Merge reported by: costales
Merged at revision: not available
Proposed branch: lp:~costales/unav/removed_osm_tiles
Merge into: lp:unav
Diff against target: 146 lines (+21/-34)
5 files modified
manifest.json (+1/-1)
nav/class/UI.js (+13/-19)
nav/index.html (+0/-6)
qml/Main.qml (+1/-1)
qml/SettingsPage.qml (+6/-7)
To merge this branch: bzr merge lp:~costales/unav/removed_osm_tiles
Reviewer Review Type Date Requested Status
costales Pending
Review via email: mp+323710@code.launchpad.net

Description of the change

Removed OSM provider (down from several weeks)

To post a comment you must log in.

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 2017-03-17 22:38:32 +0000
3+++ manifest.json 2017-05-06 09:58:17 +0000
4@@ -12,5 +12,5 @@
5 "maintainer": "Marcos Costales <costales.marcos@gmail.com>",
6 "name": "navigator.costales",
7 "title": "uNav",
8- "version": "0.68"
9+ "version": "0.69"
10 }
11
12=== modified file 'nav/class/UI.js'
13--- nav/class/UI.js 2017-04-05 21:54:14 +0000
14+++ nav/class/UI.js 2017-05-06 09:58:17 +0000
15@@ -128,48 +128,42 @@
16
17 this.map_attributions = {
18 0: {
19- name: "OSM",
20- license: "<span onclick=\"qml_go_url('https://mapzen.com')\">© Mapzen</span> <span onclick=\"qml_go_url('http://www.openstreetmap.org/copyright')\">© OpenStreetMap contributors</span> <span onclick=\"qml_go_url('http://creativecommons.org/licenses/by-sa/2.0/')\">. CC-BY-SA</span>",
21+ name: "Terrain",
22+ license: "<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>",
23 width: "340px",
24 left: "-160px"
25 },
26 1: {
27- name: "Terrain",
28+ name: "Toner Lite",
29 license: "<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>",
30 width: "340px",
31 left: "-160px"
32 },
33 2: {
34- name: "Toner Lite",
35- license: "<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>",
36- width: "340px",
37- left: "-160px"
38- },
39- 3: {
40 name: "OpenTopoMap",
41 license: "<span onclick=\"qml_go_url('https://mapzen.com')\">© Mapzen</span> <span onclick=\"qml_go_url('http://opentopomap.org')\">© OpenTopoMap</span> <span onclick=\"qml_go_url('http://www.openstreetmap.org/copyright')\">© OpenStreetMap contributors</span>",
42 width: "380px",
43 left: "-180px"
44 },
45- 4: {
46+ 3: {
47 name: "Mapbox",
48 license: "<span onclick=\"qml_go_url('https://mapzen.com')\">© Mapzen</span> <span onclick=\"qml_go_url('https://www.mapbox.com')\">© Mapbox</span> <span onclick=\"qml_go_url('http://www.openstreetmap.org/copyright')\">© OpenStreetMap contributors</span>",
49 width: "340px",
50 left: "-160px"
51 },
52+ 4: {
53+ name: "Carto Positron",
54+ license: "<span onclick=\"qml_go_url('https://mapzen.com')\">© Mapzen</span> <span onclick=\"qml_go_url('https://carto.com')\">© Carto</span> <span onclick=\"qml_go_url('http://www.openstreetmap.org/copyright')\">© OpenStreetMap contributors</span>",
55+ width: "340px",
56+ left: "-160px"
57+ },
58 5: {
59- name: "Carto Positron",
60+ name: "Carto Dark Matter",
61 license: "<span onclick=\"qml_go_url('https://mapzen.com')\">© Mapzen</span> <span onclick=\"qml_go_url('https://carto.com')\">© Carto</span> <span onclick=\"qml_go_url('http://www.openstreetmap.org/copyright')\">© OpenStreetMap contributors</span>",
62 width: "340px",
63 left: "-160px"
64 },
65 6: {
66- name: "Carto Dark Matter",
67- license: "<span onclick=\"qml_go_url('https://mapzen.com')\">© Mapzen</span> <span onclick=\"qml_go_url('https://carto.com')\">© Carto</span> <span onclick=\"qml_go_url('http://www.openstreetmap.org/copyright')\">© OpenStreetMap contributors</span>",
68- width: "340px",
69- left: "-160px"
70- },
71- 7: {
72 name: "dummy",
73 license: "dummy",
74 width: "340px",
75@@ -266,7 +260,7 @@
76 UI.prototype.set_map_layer = function(layer) {
77 var aux_center = this.map.getView().getCenter();
78 var aux_zoom = this.map.getView().getZoom();
79- var layers_max_ind = this.map.getLayers().getArray().length - 3; // 8 tiles (0-7) + map + 2 line routes
80+ var layers_max_ind = this.map.getLayers().getArray().length - 3; // 3 Extra layers: map + 2 line routes
81
82 if (layer == 99) // Independent of number of layers
83 layer = layers_max_ind;
84@@ -274,7 +268,7 @@
85 layer = 0;
86 this.online_layer = layer;
87
88- // 0 OSM, 1 Terrain, 2 Toner, 3 OpenTopoMap, 4 Mapbox, 5 Carto Positron, 6 Carto Dark, 7 Last=Offline
89+ // 0 Terrain, 1 Toner, 2 OpenTopoMap, 3 Mapbox, 4 Carto Positron, 5 Carto Dark, 6 Last=Offline
90 for (i=0; i<=layers_max_ind; i++) {
91 if (i == layer) {
92 this.map.getLayers().getArray()[i].setVisible(true);
93
94=== modified file 'nav/index.html'
95--- nav/index.html 2017-04-04 18:33:15 +0000
96+++ nav/index.html 2017-05-06 09:58:17 +0000
97@@ -208,12 +208,6 @@
98 var map_layers = [];
99 map_layers.push(
100 new ol.layer.Tile({
101- source: new ol.source.OSM({url: 'http://{a-c}.osm.maptiles.xyz/{z}/{x}/{y}.png'}),
102- visible: false
103- })
104- );
105- map_layers.push(
106- new ol.layer.Tile({
107 source: new ol.source.Stamen({layer: 'terrain'}),
108 visible: false
109 })
110
111=== modified file 'qml/Main.qml'
112--- qml/Main.qml 2017-04-01 21:16:24 +0000
113+++ qml/Main.qml 2017-05-06 09:58:17 +0000
114@@ -61,7 +61,7 @@
115 width: unavWindow.width + units.gu(0.1) //TODO: Investigate why this is needed
116 height: unavWindow.height + units.gu(0.1) //TODO: Investigate why this is needed
117
118- property string applicationVersion: "0.68"
119+ property string applicationVersion: "0.69"
120 property string mapUrl: "../nav/index.html"
121 property string appUA: "Mozilla/5.0 (Linux; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36 Project uNav"
122
123
124=== modified file 'qml/SettingsPage.qml'
125--- qml/SettingsPage.qml 2017-04-03 19:08:45 +0000
126+++ qml/SettingsPage.qml 2017-05-06 09:58:17 +0000
127@@ -76,13 +76,12 @@
128 id: onlineLayerModel
129 Component.onCompleted: initialize()
130 function initialize() {
131- onlineLayerModel.append({ "onlineLayer": "OpenStreetMap", "index": 0 })
132- onlineLayerModel.append({ "onlineLayer": "Stamen Terrain", "index": 1 })
133- onlineLayerModel.append({ "onlineLayer": "Stamen Toner Lite", "index": 2 })
134- onlineLayerModel.append({ "onlineLayer": "OpenTopoMap", "index": 3 })
135- onlineLayerModel.append({ "onlineLayer": "Mapbox", "index": 4 })
136- onlineLayerModel.append({ "onlineLayer": "Carto Positron", "index": 5 })
137- onlineLayerModel.append({ "onlineLayer": "Carto Dark Matter", "index": 6 })
138+ onlineLayerModel.append({ "onlineLayer": "Stamen Terrain", "index": 0 })
139+ onlineLayerModel.append({ "onlineLayer": "Stamen Toner Lite", "index": 1 })
140+ onlineLayerModel.append({ "onlineLayer": "OpenTopoMap", "index": 2 })
141+ onlineLayerModel.append({ "onlineLayer": "Mapbox", "index": 3 })
142+ onlineLayerModel.append({ "onlineLayer": "Carto Positron", "index": 4 })
143+ onlineLayerModel.append({ "onlineLayer": "Carto Dark Matter", "index": 5 })
144
145 onlineLayerList.subText.text = onlineLayerModel.get(navApp.settings.onlineLayer).onlineLayer
146 }

Subscribers

People subscribed via source and target branches