Merge pull request #21722 from osmandapp/rzr-import-colors

Fix default color after track import / fix wrong color in db/ext (use null instead of 0)
osmandapp · Jan 14, 2025 · 6c6489e · 6c6489e
2 parents 10c5230 + 13e70fe
commit 6c6489e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt
@@ -96,7 +96,7 @@ class GpxDataItem(
 
 	fun readGpxAppearanceParameter(gpxFile: GpxFile, parameter: GpxParameter) {
 		when (parameter) {
-			GpxParameter.COLOR -> setParameter(GpxParameter.COLOR, gpxFile.getColor(0))
+			GpxParameter.COLOR -> setParameter(GpxParameter.COLOR, gpxFile.getColor(null))
 			GpxParameter.WIDTH -> setParameter(GpxParameter.WIDTH, gpxFile.getWidth(null))
 			GpxParameter.SHOW_ARROWS ->
 				setParameter(

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxFile.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxFile.kt
@@ -476,7 +476,7 @@ class GpxFile : GpxExtensions {
 		val tpoints = mutableListOf<TrkSegment>()
 		if (routes.isNotEmpty()) {
 			for (route in routes) {
-				val routeColor = route.getColor(getColor(0))
+				val routeColor = route.getColor(getColor(null))
 				if (route.points.isNotEmpty()) {
 					val ts = TrkSegment()
 					tpoints.add(ts)
@@ -491,7 +491,7 @@ class GpxFile : GpxExtensions {
 	fun processPoints(): List<TrkSegment> {
 		val tpoints = mutableListOf<TrkSegment>()
 		for (track in tracks) {
-			val trackColor = track.getColor(getColor(0))
+			val trackColor = track.getColor(getColor(null))
 			for (segment in track.segments) {
 				val segmentColor = segment.getColor(trackColor)
 				if (!segment.generalSegment && segment.points.isNotEmpty()) {

diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java b/OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java
@@ -21,7 +21,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import net.osmand.IndexConstants;
 import net.osmand.NativeLibrary.RenderedObject;
 import net.osmand.PlatformUtil;
 import net.osmand.RenderingContext;
@@ -80,7 +79,6 @@
 
 import org.apache.commons.logging.Log;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;