Merge branch 'dev' into fix/small-fixes

CHANGELOG.md

@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
 # 0.26.1 - 2025-05-12
 
 ## Fixed
 
 - Fixed a bug with an attempt to write points with same lonlat and timestamp from iOS app. #1170
-
+- Importing GeoJSON files now saves velocity if it was stored in either `velocity` or `speed` property.
 
 
 # 0.26.0 - 2025-05-08
@@ -27,7 +28,6 @@ If you have encountered problems with moving to a PostGIS image while still on P
 - Dawarich now uses PostgreSQL 17 with PostGIS 3.5 by default.
 
 
-
 # 0.25.10 - 2025-05-08
 
 ## Added

Gemfile.lock

@@ -105,7 +105,7 @@ GEM
       racc
     builder (3.3.0)
     byebug (12.0.0)
-    chartkick (5.1.4)
+    chartkick (5.1.5)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
@@ -395,7 +395,7 @@ GEM
     sentry-ruby (5.23.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    shoulda-matchers (6.4.0)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     sidekiq (7.3.9)
       base64

app/services/geojson/params.rb

@@ -95,7 +95,9 @@ class Geojson::Params
   end
 
   def speed(feature)
-    feature.dig(:properties, :speed).to_f.round(1)
+    value = feature.dig(:properties, :speed) || feature.dig(:properties, :velocity)
+
+    value.to_f.round(1)
   end
 
   def accuracy(feature)

spec/fixtures/files/geojson/export.json

@@ -12,7 +12,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.1",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -41,7 +41,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.2",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -70,7 +70,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.3",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -99,7 +99,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.4",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -128,7 +128,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.5",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -157,7 +157,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.6",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -186,7 +186,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.7",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -215,7 +215,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.8",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -244,7 +244,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "0.9",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",
@@ -273,7 +273,7 @@
         "topic": "MyString",
         "altitude": 1,
         "longitude": "1.0",
-        "velocity": "MyString",
+        "velocity": 1.5,
         "trigger": "background_event",
         "bssid": "MyString",
         "ssid": "MyString",

spec/services/geojson/params_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Geojson::Params do
         battery: nil,
         timestamp: Time.zone.at(1_609_459_201),
         altitude: 1,
-        velocity: 0,
+        velocity: 1.5,
         tracker_id: nil,
         ssid: nil,
         accuracy: 1,
@@ -45,7 +45,7 @@ RSpec.describe Geojson::Params do
             'topic' => 'MyString',
             'altitude' => 1,
             'longitude' => '0.1',
-            'velocity' => 'MyString',
+            'velocity' => 1.5,
             'trigger' => 'background_event',
             'bssid' => 'MyString',
             'ssid' => 'MyString',