Commit 162330b
committed
feat: add Trails sample with polyline rendering
This commit introduces a new "Trails" sample to the AdvancedMaps3DSamples app.
Key features and changes:
- **Trails Data Model:** Defines data classes (`Trail`, `TrailType`, `DifficultyLevel`, `DogRegulation`, `TrailStatus`) to represent trail information.
- **GeoJSON Parsing:** Implements `TrailsRepository` to read and parse GeoJSON data containing trail information. Includes logic for:
- Reading from an asset file.
- Parsing GeoJSON features, properties (including specific OSMP attributes), and LineString geometries.
- Simplifying trail coordinates using `simplify()` from `com.google.maps.android.ktx.utils`.
- Calculating the `LatLngBounds` of all trails.
- **Polyline Rendering:**
- Adds `Mappers.kt` with a `toPolylineOptions()` extension function to convert `Trail` objects into `PolylineOptions`.
- Colors polylines based on trail difficulty (Easy: Green, Moderate: Blue, Difficult: Red).
- Sets `altitudeMode` to `CLAMP_TO_GROUND` and `drawsOccludedSegments` to true.
- **Trails UI:**
- Creates `TrailsActivity`, `TrailsViewModel`, and associated composables (`MapScreen`, `LoadingScreen`).
- The `TrailsViewModel` loads trail data, creates `Map3DOptions` centered on the trails' boundary, and adds polylines to the map.
- Displays a loading indicator while data is being fetched.
- Integrates the `ThreeDMap` composable for displaying the map.
- **Common Map Composable:** Refactors `ThreeDMap.kt` from the `scenarios` package to the `common` package to be reused.
- **ViewModel Enhancements:**
- Modifies `Map3dViewModel` to use `MutableSharedFlow` with replay for `currentCamera` to ensure observers get the latest value upon subscription.
- Makes `activeMapObjects` in `Map3dViewModel` internal for access within the module.
- **MainActivity Update:** Adds the "OSMP Trails -- polyline demo" sample to the main list.
- **Manifest and Resources:** Updates `AndroidManifest.xml` to include `TrailsActivity` and adds a new string resource for the sample title.1 parent 8ba1c03 commit 162330b
16 files changed
Lines changed: 1341 additions & 7 deletions
File tree
- Maps3DSamples/advanced/app/src/main
- assets
- java/com/example/advancedmaps3dsamples
- common
- scenarios
- trails
- res/values
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
54 | 60 | | |
55 | 61 | | |
56 | 62 | | |
Lines changed: 597 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 20 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| 52 | + | |
51 | 53 | | |
52 | 54 | | |
53 | 55 | | |
| |||
Lines changed: 12 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
| |||
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
76 | | - | |
77 | | - | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
78 | 83 | | |
79 | 84 | | |
80 | 85 | | |
| |||
96 | 101 | | |
97 | 102 | | |
98 | 103 | | |
99 | | - | |
| 104 | + | |
100 | 105 | | |
101 | 106 | | |
102 | 107 | | |
| |||
108 | 113 | | |
109 | 114 | | |
110 | 115 | | |
111 | | - | |
| 116 | + | |
112 | 117 | | |
113 | 118 | | |
114 | 119 | | |
| |||
163 | 168 | | |
164 | 169 | | |
165 | 170 | | |
166 | | - | |
| 171 | + | |
167 | 172 | | |
168 | 173 | | |
169 | 174 | | |
| |||
175 | 180 | | |
176 | 181 | | |
177 | 182 | | |
178 | | - | |
| 183 | + | |
| 184 | + | |
179 | 185 | | |
180 | 186 | | |
181 | 187 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
25 | 37 | | |
26 | 38 | | |
27 | 39 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
Lines changed: 46 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
0 commit comments