Merge branch 'osmandapp:master' into hardy_Afa

OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java

@@ -973,7 +973,7 @@ private boolean checkCategories(SearchRequest<Amenity> req, PoiRegion region) th
 					}
 				}
 				subtype = poiTypes.replaceDeprecatedSubtype(type, subtype);
-				if (req.poiTypeFilter.accept(type, subtype)) {
+				if (req.poiTypeFilter != null && req.poiTypeFilter.accept(type, subtype)) {
 					codedIS.skipRawBytes(codedIS.getBytesUntilLimit());
 					return true;
 				}

OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java

@@ -1230,7 +1230,7 @@ public boolean search(final SearchPhrase phrase, final SearchResultMatcher resul
 				} else if (obj instanceof SearchPoiTypeFilter) {
 					poiTypeFilter = (SearchPoiTypeFilter) obj;
 				} else if (obj instanceof SearchPoiAdditionalFilter) {
-					poiTypeFilter = ACCEPT_ALL_POI_TYPE_FILTER;
+					poiTypeFilter = null;
 					poiAdditionalFilter = (SearchPoiAdditionalFilter) obj;
 				} else {
 					throw new UnsupportedOperationException();
@@ -1273,9 +1273,9 @@ public boolean search(final SearchPhrase phrase, final SearchResultMatcher resul
 				}
 			}
 			this.nameFilter = nameFilter;
-			if (poiTypeFilter != null) {
+			if (poiTypeFilter != null || poiAdditionalFilter != null) {
 				int radius = BBOX_RADIUS;
-				if (phrase.getRadiusLevel() == 1 && poiTypeFilter instanceof CustomSearchPoiFilter) {
+				if (poiTypeFilter != null && phrase.getRadiusLevel() == 1 && poiTypeFilter instanceof CustomSearchPoiFilter) {
 					String name = ((CustomSearchPoiFilter) poiTypeFilter).getFilterId();
 					if ("std_null".equals(name)) {
 						radius = BBOX_RADIUS_NEAREST;

OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxFile.kt

@@ -755,27 +755,27 @@ class GpxFile : GpxExtensions {
 		val dest = GpxFile(this.author)
 		dest.metadata = Metadata(this.metadata)
 		val tracks = dest.tracks
-		for (track in this.tracks) {
+		for (track in this.tracks.toList()) {
 			tracks.add(cloneTrack(track))
 		}
 		val routes = dest.routes
-		for (route in this.routes) {
+		for (route in this.routes.toList()) {
 			routes.add(cloneRoute(route))
 		}
 		val points = mutableListOf<WptPt>()
-		for (point in this.points) {
+		for (point in this.points.toList()) {
 			points.add(WptPt(point))
 		}
 		dest.setPointsList(points)
 
 		dest.pointsGroups = LinkedHashMap()
 		val pointsGroups = dest.pointsGroups
-		for ((key, value) in this.pointsGroups.entries) {
+		for ((key, value) in this.pointsGroups.toMap().entries) {
 			pointsGroups[key] = clonePointsGroup(value)
 		}
 		dest.pointsGroups = pointsGroups
 
-		dest.addRouteKeyTags(this.getRouteKeyTags())
+		dest.addRouteKeyTags(this.getRouteKeyTags().toMap())
 
 		dest.path = this.path
 		dest.showCurrentTrack = this.showCurrentTrack
@@ -793,7 +793,7 @@ class GpxFile : GpxExtensions {
 		dest.desc = source.desc
 		dest.generalTrack = source.generalTrack
 		val trkSegments = mutableListOf<TrkSegment>()
-		for (segment in source.segments) {
+		for (segment in source.segments.toList()) {
 			trkSegments.add(cloneTrkSegment(segment))
 		}
 		dest.segments = trkSegments
@@ -806,7 +806,7 @@ class GpxFile : GpxExtensions {
 		dest.name = source.name
 		dest.desc = source.desc
 		val points = mutableListOf<WptPt>()
-		for (point in source.points) {
+		for (point in source.points.toList()) {
 			points.add(WptPt(point))
 		}
 		dest.points = points
@@ -818,7 +818,7 @@ class GpxFile : GpxExtensions {
 		val dest = PointsGroup(source.name, source.iconName, source.backgroundType, source.color)
 		dest.hidden = source.hidden
 		val points = mutableListOf<WptPt>()
-		for (point in source.points) {
+		for (point in source.points.toList()) {
 			points.add(WptPt(point))
 		}
 		dest.points = points
@@ -830,17 +830,17 @@ class GpxFile : GpxExtensions {
 		dest.name = source.name
 		dest.generalSegment = source.generalSegment
 		val kPoints = mutableListOf<WptPt>()
-		for (point in source.points) {
+		for (point in source.points.toList()) {
 			kPoints.add(WptPt(point))
 		}
 		dest.points = kPoints
 		val routeSegments = mutableListOf<RouteSegment>()
-		for (rs in source.routeSegments) {
+		for (rs in source.routeSegments.toList()) {
 			routeSegments.add(cloneRouteSegment(rs))
 		}
 		dest.routeSegments = routeSegments
 		val routeTypes = mutableListOf<RouteType>()
-		for (rt in source.routeTypes) {
+		for (rt in source.routeTypes.toList()) {
 			routeTypes.add(cloneRouteType(rt))
 		}
 		dest.routeTypes = routeTypes

OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/GpxExtensions.kt

@@ -50,7 +50,7 @@ open class GpxExtensions {
 	}
 
 	fun copyExtensions(e: GpxExtensions) {
-		val extensionsToRead = e.getExtensionsToRead()
+		val extensionsToRead = e.getExtensionsToRead().toMap()
 		if (extensionsToRead.isNotEmpty()) {
 			getExtensionsToWrite().putAll(extensionsToRead)
 		}

OsmAnd/res/values-es-rAR/phrases.xml

@@ -4899,4 +4899,9 @@
     <string name="poi_name_left">Nombre del lado izquierdo</string>
     <string name="poi_name_right">Nombre del lado derecho</string>
     <string name="poi_climbing_boulder">Roca de escalada</string>
+    <string name="poi_camp_site_basic">Básico</string>
+    <string name="poi_camp_site_standard">Estándar</string>
+    <string name="poi_camp_site_serviced">Con servicios</string>
+    <string name="poi_camp_site_type">Tipo de campamento</string>
+    <string name="poi_camp_site_deluxe">De lujo</string>
 </resources>