Skip to content

Commit 0e489ef

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #5962 from nextcloud/feat/noid/migrateToMapLibre
⚒️🎨 Migrate to MapLibre
2 parents 3145e6d + e844f5b commit 0e489ef

19 files changed

Lines changed: 1841 additions & 376 deletions

‎app/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ android {
151151
listOf(
152152
"GradleDependency",
153153
"InvalidPackage",
154+
"LogNotTimber",
154155
"MissingTranslation",
155156
"PrivateResource",
156157
"UnusedQuantity",
@@ -301,7 +302,8 @@ dependencies {
301302
implementation("com.github.yalantis:ucrop:2.2.11")
302303

303304
implementation("io.github.elye:loaderviewlibrary:3.0.0")
304-
implementation("org.osmdroid:osmdroid-android:6.1.20")
305+
implementation("org.maplibre.compose:maplibre-compose:0.12.1")
306+
implementation("org.maplibre.compose:maplibre-compose-material3:0.12.1")
305307
implementation("fr.dudie:nominatim-api:3.4") {
306308
//noinspection DuplicatePlatformClasses
307309
exclude(group = "org.apache.httpcomponents", module = "httpclient")

‎app/src/main/assets/map_style_dark.json‎

Lines changed: 379 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,379 @@
1+
{
2+
"version": 8,
3+
"name": "Talk Night",
4+
"sources": {
5+
"openmaptiles": {
6+
"type": "vector",
7+
"url": "https://tiles.openfreemap.org/planet",
8+
"attribution": "© OpenFreeMap and OpenStreetMap contributors"
9+
}
10+
},
11+
"glyphs": "https://tiles.openfreemap.org/fonts/{fontstack}/{range}.pbf",
12+
"layers": [
13+
{
14+
"id": "background",
15+
"type": "background",
16+
"paint": { "background-color": "#111c2a" }
17+
},
18+
{
19+
"id": "water",
20+
"type": "fill",
21+
"source": "openmaptiles",
22+
"source-layer": "water",
23+
"paint": { "fill-color": "#071018" }
24+
},
25+
{
26+
"id": "waterway",
27+
"type": "line",
28+
"source": "openmaptiles",
29+
"source-layer": "waterway",
30+
"minzoom": 8,
31+
"paint": {
32+
"line-color": "#071018",
33+
"line-width": ["interpolate", ["linear"], ["zoom"], 8, 0.5, 12, 1.5, 16, 3]
34+
}
35+
},
36+
{
37+
"id": "landcover-wood",
38+
"type": "fill",
39+
"source": "openmaptiles",
40+
"source-layer": "landcover",
41+
"filter": ["==", "class", "wood"],
42+
"paint": { "fill-color": "#0c2016" }
43+
},
44+
{
45+
"id": "landcover-grass",
46+
"type": "fill",
47+
"source": "openmaptiles",
48+
"source-layer": "landcover",
49+
"filter": ["in", "class", "grass", "scrub", "crop"],
50+
"paint": { "fill-color": "#102219" }
51+
},
52+
{
53+
"id": "landuse-residential",
54+
"type": "fill",
55+
"source": "openmaptiles",
56+
"source-layer": "landuse",
57+
"filter": ["in", "class", "residential", "suburb", "neighbourhood"],
58+
"paint": { "fill-color": "#131f2c" }
59+
},
60+
{
61+
"id": "landuse-commercial",
62+
"type": "fill",
63+
"source": "openmaptiles",
64+
"source-layer": "landuse",
65+
"filter": ["in", "class", "commercial", "retail", "industrial"],
66+
"paint": { "fill-color": "#14202e" }
67+
},
68+
{
69+
"id": "landuse-park",
70+
"type": "fill",
71+
"source": "openmaptiles",
72+
"source-layer": "landuse",
73+
"filter": ["in", "class", "park", "pitch", "playground", "golf", "cemetery"],
74+
"paint": { "fill-color": "#102219" }
75+
},
76+
{
77+
"id": "park",
78+
"type": "fill",
79+
"source": "openmaptiles",
80+
"source-layer": "park",
81+
"paint": { "fill-color": "#102219", "fill-opacity": 0.8 }
82+
},
83+
{
84+
"id": "building",
85+
"type": "fill",
86+
"source": "openmaptiles",
87+
"source-layer": "building",
88+
"minzoom": 13,
89+
"paint": {
90+
"fill-color": "#14202e",
91+
"fill-outline-color": "#1c2a3c"
92+
}
93+
},
94+
{
95+
"id": "road-path",
96+
"type": "line",
97+
"source": "openmaptiles",
98+
"source-layer": "transportation",
99+
"filter": ["in", "class", "path", "track"],
100+
"minzoom": 14,
101+
"layout": { "line-cap": "round", "line-join": "round" },
102+
"paint": {
103+
"line-color": "#142434",
104+
"line-width": 1,
105+
"line-dasharray": [2, 2]
106+
}
107+
},
108+
{
109+
"id": "road-service-casing",
110+
"type": "line",
111+
"source": "openmaptiles",
112+
"source-layer": "transportation",
113+
"filter": ["==", "class", "service"],
114+
"minzoom": 14,
115+
"layout": { "line-cap": "round", "line-join": "round" },
116+
"paint": { "line-color": "#0c1620", "line-width": 3 }
117+
},
118+
{
119+
"id": "road-service",
120+
"type": "line",
121+
"source": "openmaptiles",
122+
"source-layer": "transportation",
123+
"filter": ["==", "class", "service"],
124+
"minzoom": 13,
125+
"layout": { "line-cap": "round", "line-join": "round" },
126+
"paint": { "line-color": "#243348", "line-width": 1.5 }
127+
},
128+
{
129+
"id": "road-minor-casing",
130+
"type": "line",
131+
"source": "openmaptiles",
132+
"source-layer": "transportation",
133+
"filter": ["in", "class", "minor", "tertiary"],
134+
"minzoom": 12,
135+
"layout": { "line-cap": "round", "line-join": "round" },
136+
"paint": {
137+
"line-color": "#0c1620",
138+
"line-width": ["interpolate", ["linear"], ["zoom"], 12, 2, 16, 5]
139+
}
140+
},
141+
{
142+
"id": "road-minor",
143+
"type": "line",
144+
"source": "openmaptiles",
145+
"source-layer": "transportation",
146+
"filter": ["in", "class", "minor", "tertiary"],
147+
"minzoom": 11,
148+
"layout": { "line-cap": "round", "line-join": "round" },
149+
"paint": {
150+
"line-color": "#263548",
151+
"line-width": ["interpolate", ["linear"], ["zoom"], 11, 0.5, 14, 2, 16, 4]
152+
}
153+
},
154+
{
155+
"id": "road-secondary-casing",
156+
"type": "line",
157+
"source": "openmaptiles",
158+
"source-layer": "transportation",
159+
"filter": ["==", "class", "secondary"],
160+
"layout": { "line-cap": "round", "line-join": "round" },
161+
"paint": {
162+
"line-color": "#0c1620",
163+
"line-width": ["interpolate", ["linear"], ["zoom"], 8, 2, 14, 7]
164+
}
165+
},
166+
{
167+
"id": "road-secondary",
168+
"type": "line",
169+
"source": "openmaptiles",
170+
"source-layer": "transportation",
171+
"filter": ["==", "class", "secondary"],
172+
"layout": { "line-cap": "round", "line-join": "round" },
173+
"paint": {
174+
"line-color": "#2e3e54",
175+
"line-width": ["interpolate", ["linear"], ["zoom"], 8, 1, 14, 5]
176+
}
177+
},
178+
{
179+
"id": "road-primary-casing",
180+
"type": "line",
181+
"source": "openmaptiles",
182+
"source-layer": "transportation",
183+
"filter": ["in", "class", "primary", "trunk"],
184+
"layout": { "line-cap": "round", "line-join": "round" },
185+
"paint": {
186+
"line-color": "#0c1620",
187+
"line-width": ["interpolate", ["linear"], ["zoom"], 6, 2, 14, 9]
188+
}
189+
},
190+
{
191+
"id": "road-primary",
192+
"type": "line",
193+
"source": "openmaptiles",
194+
"source-layer": "transportation",
195+
"filter": ["in", "class", "primary", "trunk"],
196+
"layout": { "line-cap": "round", "line-join": "round" },
197+
"paint": {
198+
"line-color": "#344e68",
199+
"line-width": ["interpolate", ["linear"], ["zoom"], 6, 1, 14, 7]
200+
}
201+
},
202+
{
203+
"id": "road-motorway-casing",
204+
"type": "line",
205+
"source": "openmaptiles",
206+
"source-layer": "transportation",
207+
"filter": ["==", "class", "motorway"],
208+
"layout": { "line-cap": "round", "line-join": "round" },
209+
"paint": {
210+
"line-color": "#0e1e30",
211+
"line-width": ["interpolate", ["linear"], ["zoom"], 4, 2, 14, 12]
212+
}
213+
},
214+
{
215+
"id": "road-motorway",
216+
"type": "line",
217+
"source": "openmaptiles",
218+
"source-layer": "transportation",
219+
"filter": ["==", "class", "motorway"],
220+
"layout": { "line-cap": "round", "line-join": "round" },
221+
"paint": {
222+
"line-color": "#385068",
223+
"line-width": ["interpolate", ["linear"], ["zoom"], 4, 1, 14, 10]
224+
}
225+
},
226+
{
227+
"id": "rail",
228+
"type": "line",
229+
"source": "openmaptiles",
230+
"source-layer": "transportation",
231+
"filter": ["in", "class", "rail", "transit"],
232+
"minzoom": 10,
233+
"paint": {
234+
"line-color": "#1c2836",
235+
"line-width": 1.5,
236+
"line-dasharray": [4, 3]
237+
}
238+
},
239+
{
240+
"id": "boundary-country",
241+
"type": "line",
242+
"source": "openmaptiles",
243+
"source-layer": "boundary",
244+
"filter": ["==", "admin_level", 2],
245+
"paint": {
246+
"line-color": "#44607e",
247+
"line-width": 1.5,
248+
"line-dasharray": [4, 3]
249+
}
250+
},
251+
{
252+
"id": "boundary-state",
253+
"type": "line",
254+
"source": "openmaptiles",
255+
"source-layer": "boundary",
256+
"filter": ["==", "admin_level", 4],
257+
"minzoom": 4,
258+
"paint": {
259+
"line-color": "#385068",
260+
"line-width": 1,
261+
"line-dasharray": [3, 4]
262+
}
263+
},
264+
{
265+
"id": "place-country",
266+
"type": "symbol",
267+
"source": "openmaptiles",
268+
"source-layer": "place",
269+
"filter": ["==", "class", "country"],
270+
"layout": {
271+
"text-field": ["get", "name"],
272+
"text-font": ["Noto Sans Bold"],
273+
"text-size": ["interpolate", ["linear"], ["zoom"], 2, 11, 6, 15],
274+
"text-max-width": 8
275+
},
276+
"paint": {
277+
"text-color": "#dce8f6",
278+
"text-halo-color": "#111c2a",
279+
"text-halo-width": 1.5
280+
}
281+
},
282+
{
283+
"id": "place-city",
284+
"type": "symbol",
285+
"source": "openmaptiles",
286+
"source-layer": "place",
287+
"filter": ["==", "class", "city"],
288+
"layout": {
289+
"text-field": ["get", "name"],
290+
"text-font": ["Noto Sans Bold"],
291+
"text-size": ["interpolate", ["linear"], ["zoom"], 4, 10, 10, 14],
292+
"text-max-width": 10
293+
},
294+
"paint": {
295+
"text-color": "#eef4fc",
296+
"text-halo-color": "#111c2a",
297+
"text-halo-width": 1.5
298+
}
299+
},
300+
{
301+
"id": "place-town",
302+
"type": "symbol",
303+
"source": "openmaptiles",
304+
"source-layer": "place",
305+
"filter": ["in", "class", "town", "state"],
306+
"minzoom": 6,
307+
"layout": {
308+
"text-field": ["get", "name"],
309+
"text-font": ["Noto Sans Regular"],
310+
"text-size": ["interpolate", ["linear"], ["zoom"], 6, 9, 12, 13],
311+
"text-max-width": 8
312+
},
313+
"paint": {
314+
"text-color": "#c6d5e4",
315+
"text-halo-color": "#111c2a",
316+
"text-halo-width": 1.5
317+
}
318+
},
319+
{
320+
"id": "place-village",
321+
"type": "symbol",
322+
"source": "openmaptiles",
323+
"source-layer": "place",
324+
"filter": ["in", "class", "village", "hamlet"],
325+
"minzoom": 9,
326+
"layout": {
327+
"text-field": ["get", "name"],
328+
"text-font": ["Noto Sans Regular"],
329+
"text-size": 11,
330+
"text-max-width": 8
331+
},
332+
"paint": {
333+
"text-color": "#a8b8cc",
334+
"text-halo-color": "#111c2a",
335+
"text-halo-width": 1
336+
}
337+
},
338+
{
339+
"id": "place-suburb",
340+
"type": "symbol",
341+
"source": "openmaptiles",
342+
"source-layer": "place",
343+
"filter": ["in", "class", "suburb", "neighbourhood"],
344+
"minzoom": 11,
345+
"layout": {
346+
"text-field": ["get", "name"],
347+
"text-font": ["Noto Sans Regular"],
348+
"text-size": 10,
349+
"text-transform": "uppercase",
350+
"text-max-width": 8,
351+
"text-letter-spacing": 0.1
352+
},
353+
"paint": {
354+
"text-color": "#94a8c0",
355+
"text-halo-color": "#111c2a",
356+
"text-halo-width": 1
357+
}
358+
},
359+
{
360+
"id": "road-label",
361+
"type": "symbol",
362+
"source": "openmaptiles",
363+
"source-layer": "transportation_name",
364+
"minzoom": 12,
365+
"layout": {
366+
"text-field": ["get", "name"],
367+
"text-font": ["Noto Sans Regular"],
368+
"text-size": 10,
369+
"symbol-placement": "line",
370+
"text-max-angle": 30
371+
},
372+
"paint": {
373+
"text-color": "#94a8c0",
374+
"text-halo-color": "#111c2a",
375+
"text-halo-width": 1
376+
}
377+
}
378+
]
379+
}

0 commit comments

Comments
 (0)