Remove conflicts

Author: Freika

CHANGELOG.md

@@ -22,19 +22,8 @@ This release adds a dedicated `motion_data` column for transportation-relevant f
 
 ### Changed
 
-<<<<<<< HEAD
-<<<<<<< feature/timeline
-- **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.
-- Transportation-relevant fields (motion, activity, action) are now stored in a dedicated `motion_data` column, keeping transportation mode detection working while dropping redundant data.
-- Google imports continue storing full `raw_data` (rich metadata) and additionally write to `motion_data`.
-=======
 - Transportation-relevant fields (motion, activity, action) are now stored in a dedicated `motion_data` column alongside `raw_data`, enabling efficient transportation mode detection.
 - All import sources now write both `raw_data` (full original payload) and `motion_data` (transportation-relevant fields).
->>>>>>> dev
-=======
-- Transportation-relevant fields (motion, activity, action) are now stored in a dedicated `motion_data` column alongside `raw_data`, enabling efficient transportation mode detection.
-- All import sources now write both `raw_data` (full original payload) and `motion_data` (transportation-relevant fields).
->>>>>>> c9591e73 (Fix specs)
 - The `STORE_GEODATA` setting now correctly controls whether geodata is written during reverse geocoding.
 - 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.
 - 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

@@ -30,7 +30,6 @@
         ssid: nil,
         accuracy: 1,
         vertical_accuracy: 1,
-<<<<<<< HEAD
         motion_data: {},
         raw_data: {
           'type' => 'Feature',
@@ -64,9 +63,6 @@
             'geodata' => {}
           }
         }
-=======
-        motion_data: {}
->>>>>>> c9591e73 (Fix specs)
       )
       expect(first[:raw_data]).to be_a(Hash)
       expect(first[:raw_data]['type']).to eq('Feature')
@@ -89,7 +85,6 @@
           ssid: nil,
           accuracy: 4.7551565,
           vertical_accuracy: nil,
-<<<<<<< HEAD
           motion_data: {},
           raw_data: {
             'geometry' => {
@@ -106,9 +101,6 @@
             },
             'type' => 'Feature'
           }
-=======
-          motion_data: {}
->>>>>>> c9591e73 (Fix specs)
         )
         expect(first[:raw_data]).to be_a(Hash)
         expect(first[:raw_data]['type']).to eq('Feature')
@@ -132,7 +124,6 @@
           ssid: nil,
           accuracy: nil,
           vertical_accuracy: nil,
-<<<<<<< HEAD
           motion_data: {},
           raw_data: {
             'geometry' => {
@@ -144,9 +135,6 @@
             },
             'type' => 'Feature'
           }
-=======
-          motion_data: {}
->>>>>>> c9591e73 (Fix specs)
         )
         expect(first[:raw_data]).to be_a(Hash)
         expect(first[:raw_data]['type']).to eq('Feature')

spec/services/own_tracks/importer_spec.rb

@@ -48,7 +48,6 @@
           'country' => nil,
           'motion_data' => { 'm' => 1, '_type' => 'location' },
           'raw_data' => {
-<<<<<<< HEAD
             'm' => 1,
             'p' => 100.266,
             't' => 'p',
@@ -70,15 +69,6 @@
             'topic' => 'owntracks/test/iPhone 12 Pro',
             'inrids' => ['5f1d1b'],
             'inregions' => ['home']
-=======
-            'm' => 1, 'p' => 100.266, 't' => 'p', 'bs' => 2,
-            'acc' => 10, 'alt' => 36, 'lat' => 52.225, 'lon' => 13.332,
-            'tid' => 'RO', 'tst' => 1_709_283_789, 'vac' => 4, 'vel' => 5,
-            'SSID' => 'Home Wifi', 'batt' => 94, 'conn' => 'w',
-            'BSSID' => 'b0:f2:8:45:94:33', '_http' => true,
-            '_type' => 'location', 'topic' => 'owntracks/test/iPhone 12 Pro',
-            'inrids' => ['5f1d1b'], 'inregions' => ['home']
->>>>>>> c9591e73 (Fix specs)
           }
         )
       end

spec/services/own_tracks/params_spec.rb

@@ -32,7 +32,6 @@
         trigger: 'background_event',
         motion_data: { 'm' => 1, '_type' => 'location' },
         raw_data:   {
-<<<<<<< HEAD
           'bs' => 2,
           'p' => 100.266,
           'batt' => 94,
@@ -54,15 +53,6 @@
           'inrids' => ['5f1d1b'],
           'inregions' => ['home'],
           '_http' => true
-=======
-          'bs' => 2, 'p' => 100.266, 'batt' => 94, '_type' => 'location',
-          'tid' => 'RO', 'topic' => 'owntracks/test/iPhone 12 Pro',
-          'alt' => 36, 'lon' => 13.332, 'vel' => 5, 't' => 'p',
-          'BSSID' => 'b0:f2:8:45:94:33', 'SSID' => 'Home Wifi',
-          'conn' => 'w', 'vac' => 4, 'acc' => 10, 'tst' => 1_709_283_789,
-          'lat' => 52.225, 'm' => 1, 'inrids' => ['5f1d1b'],
-          'inregions' => ['home'], '_http' => true
->>>>>>> c9591e73 (Fix specs)
         }
       }
     end