Skip to content

Commit 4c343ce

Browse files
committed
Remove conflicts
1 parent 971fa6f commit 4c343ce

File tree

4 files changed

+0
-43
lines changed

4 files changed

+0
-43
lines changed

CHANGELOG.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,8 @@ This release adds a dedicated `motion_data` column for transportation-relevant f
2222

2323
### Changed
2424

25-
<<<<<<< HEAD
26-
<<<<<<< feature/timeline
27-
- **Breaking (non-Google imports):** New points from OwnTracks, Overland, GPX, GeoJSON, Photos, and KML sources no longer store full `raw_data`, significantly reducing per-point storage (~500 bytes saved per point). Existing raw data is preserved; only new imports are affected. If you rely on custom fields from `raw_data` for non-Google sources, those fields will no longer be available on newly imported points.
28-
- Transportation-relevant fields (motion, activity, action) are now stored in a dedicated `motion_data` column, keeping transportation mode detection working while dropping redundant data.
29-
- Google imports continue storing full `raw_data` (rich metadata) and additionally write to `motion_data`.
30-
=======
3125
- Transportation-relevant fields (motion, activity, action) are now stored in a dedicated `motion_data` column alongside `raw_data`, enabling efficient transportation mode detection.
3226
- All import sources now write both `raw_data` (full original payload) and `motion_data` (transportation-relevant fields).
33-
>>>>>>> dev
34-
=======
35-
- Transportation-relevant fields (motion, activity, action) are now stored in a dedicated `motion_data` column alongside `raw_data`, enabling efficient transportation mode detection.
36-
- All import sources now write both `raw_data` (full original payload) and `motion_data` (transportation-relevant fields).
37-
>>>>>>> c9591e73 (Fix specs)
3827
- The `STORE_GEODATA` setting now correctly controls whether geodata is written during reverse geocoding.
3928
- Dropped unused `idx_points_user_city` database index (304 MB) and replaced the full `reverse_geocoded_at` index (1,149 MB) with a smaller partial index covering only un-geocoded rows.
4029
- Selecting a track on Map v2 now always dims other tracks, regardless of whether the track has transportation mode segments.

spec/services/geojson/params_spec.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
ssid: nil,
3131
accuracy: 1,
3232
vertical_accuracy: 1,
33-
<<<<<<< HEAD
3433
motion_data: {},
3534
raw_data: {
3635
'type' => 'Feature',
@@ -64,9 +63,6 @@
6463
'geodata' => {}
6564
}
6665
}
67-
=======
68-
motion_data: {}
69-
>>>>>>> c9591e73 (Fix specs)
7066
)
7167
expect(first[:raw_data]).to be_a(Hash)
7268
expect(first[:raw_data]['type']).to eq('Feature')
@@ -89,7 +85,6 @@
8985
ssid: nil,
9086
accuracy: 4.7551565,
9187
vertical_accuracy: nil,
92-
<<<<<<< HEAD
9388
motion_data: {},
9489
raw_data: {
9590
'geometry' => {
@@ -106,9 +101,6 @@
106101
},
107102
'type' => 'Feature'
108103
}
109-
=======
110-
motion_data: {}
111-
>>>>>>> c9591e73 (Fix specs)
112104
)
113105
expect(first[:raw_data]).to be_a(Hash)
114106
expect(first[:raw_data]['type']).to eq('Feature')
@@ -132,7 +124,6 @@
132124
ssid: nil,
133125
accuracy: nil,
134126
vertical_accuracy: nil,
135-
<<<<<<< HEAD
136127
motion_data: {},
137128
raw_data: {
138129
'geometry' => {
@@ -144,9 +135,6 @@
144135
},
145136
'type' => 'Feature'
146137
}
147-
=======
148-
motion_data: {}
149-
>>>>>>> c9591e73 (Fix specs)
150138
)
151139
expect(first[:raw_data]).to be_a(Hash)
152140
expect(first[:raw_data]['type']).to eq('Feature')

spec/services/own_tracks/importer_spec.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
'country' => nil,
4949
'motion_data' => { 'm' => 1, '_type' => 'location' },
5050
'raw_data' => {
51-
<<<<<<< HEAD
5251
'm' => 1,
5352
'p' => 100.266,
5453
't' => 'p',
@@ -70,15 +69,6 @@
7069
'topic' => 'owntracks/test/iPhone 12 Pro',
7170
'inrids' => ['5f1d1b'],
7271
'inregions' => ['home']
73-
=======
74-
'm' => 1, 'p' => 100.266, 't' => 'p', 'bs' => 2,
75-
'acc' => 10, 'alt' => 36, 'lat' => 52.225, 'lon' => 13.332,
76-
'tid' => 'RO', 'tst' => 1_709_283_789, 'vac' => 4, 'vel' => 5,
77-
'SSID' => 'Home Wifi', 'batt' => 94, 'conn' => 'w',
78-
'BSSID' => 'b0:f2:8:45:94:33', '_http' => true,
79-
'_type' => 'location', 'topic' => 'owntracks/test/iPhone 12 Pro',
80-
'inrids' => ['5f1d1b'], 'inregions' => ['home']
81-
>>>>>>> c9591e73 (Fix specs)
8272
}
8373
)
8474
end

spec/services/own_tracks/params_spec.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
trigger: 'background_event',
3333
motion_data: { 'm' => 1, '_type' => 'location' },
3434
raw_data: {
35-
<<<<<<< HEAD
3635
'bs' => 2,
3736
'p' => 100.266,
3837
'batt' => 94,
@@ -54,15 +53,6 @@
5453
'inrids' => ['5f1d1b'],
5554
'inregions' => ['home'],
5655
'_http' => true
57-
=======
58-
'bs' => 2, 'p' => 100.266, 'batt' => 94, '_type' => 'location',
59-
'tid' => 'RO', 'topic' => 'owntracks/test/iPhone 12 Pro',
60-
'alt' => 36, 'lon' => 13.332, 'vel' => 5, 't' => 'p',
61-
'BSSID' => 'b0:f2:8:45:94:33', 'SSID' => 'Home Wifi',
62-
'conn' => 'w', 'vac' => 4, 'acc' => 10, 'tst' => 1_709_283_789,
63-
'lat' => 52.225, 'm' => 1, 'inrids' => ['5f1d1b'],
64-
'inregions' => ['home'], '_http' => true
65-
>>>>>>> c9591e73 (Fix specs)
6656
}
6757
}
6858
end

0 commit comments

Comments
 (0)