Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cnflt resolved

Browse source
This commit is contained in:
simon 2020-12-10 15:24:10 +02:00
commit 2231387ca6
184 changed files with 1278 additions and 955 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/main/java/net/osmand/IndexConstants.java
View file

@ -20,6 +20,8 @@ public class IndexConstants {
public static final String BINARY_MAP_INDEX_EXT_ZIP = ".obf.zip"; //$NON-NLS-1$
public static final String BINARY_WIKIVOYAGE_MAP_INDEX_EXT = ".sqlite"; //$NON-NLS-1$
public static final String BINARY_TRAVEL_GUIDE_MAP_INDEX_EXT = ".travel.obf"; //$NON-NLS-1$
public static final String BINARY_TRAVEL_GUIDE_MAP_INDEX_EXT_ZIP = ".travel.obf.zip"; //$NON-NLS-1$
public static final String BINARY_WIKI_MAP_INDEX_EXT = ".wiki.obf"; //$NON-NLS-1$
public static final String BINARY_WIKI_MAP_INDEX_EXT_ZIP = ".wiki.obf.zip"; //$NON-NLS-1$
public static final String BINARY_ROAD_MAP_INDEX_EXT = ".road.obf"; //$NON-NLS-1$

6
OsmAnd-telegram/res/values-da/strings.xml
View file

@ -20,7 +20,7 @@
<string name="add_device">Tilføj enhed</string>
<string name="share_location_as">Del placering som</string>
<string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
<string name="logout_from_osmand_telegram_descr">"Bekræft log af OsmAnd Tracker, der kan ikke deles placering eller se placering af andre\?"</string>
<string name="logout_from_osmand_telegram_descr">Bekræft log af OsmAnd Tracker, der kan ikke deles placering eller se placering af andre\?</string>
<string name="logout_from_osmand_telegram">Log ud af OsmAnd Tracker\?</string>
<string name="shared_string_name">Navn</string>
<string name="by_distance">Efter afstand</string>
@ -142,9 +142,7 @@
<string name="shared_string_hour_short">t</string>
<string name="shared_string_minute_short">min</string>
<string name="shared_string_second_short">sek</string>
<string name="welcome_descr">
<b>OsmAnd Tracker</b> giver mulighed for at dele placering og se placering af andre i OsmAnd.<br/>
<br/>Programmet bruger Telegram API, så der skal bruges en Telegram konto.</string>
<string name="welcome_descr"><b>OsmAnd Tracker</b> giver mulighed for at dele placering og se placering af andre i OsmAnd.<br/><br/>Programmet bruger Telegram API, så der skal bruges en Telegram konto.</string>
<string name="my_location">Placering</string>
<string name="last_updated_location">Sidste ajourførte placering:</string>
<string name="successfully_sent_and_updated">Sendt korrekt og opdateret</string>

2
OsmAnd-telegram/src/net/osmand/telegram/helpers/ShareLocationHelper.kt
View file

@ -386,7 +386,7 @@ class ShareLocationHelper(private val app: TelegramApplication) {
}
app.locationMessages.removeBufferedMessage(locationMessage)
if ((shareInfo.shouldSendViaBotTextMessage || shareInfo.shouldSendViaBotMapMessage) && osmandBotId != -1 && device != null) {
app.telegramHelper.sendViaBotLocationMessage(osmandBotId, shareInfo, TdApi.Location(locationMessage.lat, locationMessage.lon), device, shareType)
app.telegramHelper.sendViaBotLocationMessage(osmandBotId, shareInfo, TdApi.Location(locationMessage.lat, locationMessage.lon, locationMessage.hdop), device, shareType)
shareInfo.shouldSendViaBotTextMessage = false
shareInfo.shouldSendViaBotMapMessage = false
}

124
OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
View file

@ -443,7 +443,7 @@ class TelegramHelper private constructor() {
var offsetChatId: Long = 0
if (!chatList.isEmpty()) {
val last = chatList.last()
offsetOrder = last.order
offsetOrder = last.position.order
offsetChatId = last.chatId
}
client?.send(TdApi.GetChats(TdApi.ChatListMain(), offsetOrder, offsetChatId, CHATS_LIMIT - chatList.size)) { obj ->
@ -533,8 +533,8 @@ class TelegramHelper private constructor() {
}
resultArticles.forEach {
shareInfo.lastTextMessageHandled = false
val sendOptions = TdApi.SendMessageOptions(true, true, null)
client?.send(TdApi.SendInlineQueryResultMessage(shareInfo.chatId, 0, sendOptions,
val sendOptions = TdApi.MessageSendOptions(true, true, null)
client?.send(TdApi.SendInlineQueryResultMessage(shareInfo.chatId, 0, 0, sendOptions,
inlineQueryResults.inlineQueryId, it.id, false)) { obj ->
handleTextLocationMessageUpdate(obj, shareInfo, true)
}
@ -843,7 +843,12 @@ class TelegramHelper private constructor() {
if (!shareInfo.isMapMessageIdPresent() && shareInfo.chatId != -1L) {
shareInfo.lastSendMapMessageTime = (System.currentTimeMillis() / 1000).toInt()
client?.send(
TdApi.EditMessageLiveLocation(shareInfo.chatId, shareInfo.currentMapMessageId, null, null)) { obj ->
TdApi.EditMessageLiveLocation(
shareInfo.chatId, shareInfo.currentMapMessageId,
null, null, 0, 0
)
)
{ obj ->
handleMapLocationMessageUpdate(obj, shareInfo, false)
}
}
@ -863,8 +868,8 @@ class TelegramHelper private constructor() {
shareInfo.pendingTdLibText++
shareInfo.lastSendTextMessageTime = (System.currentTimeMillis() / 1000).toInt()
log.error("sendNewTextLocation ${shareInfo.pendingTdLibText}")
val sendOptions = TdApi.SendMessageOptions(false, true, null)
client?.send(TdApi.SendMessage(shareInfo.chatId, 0, sendOptions, null, content)) { obj ->
val sendOptions = TdApi.MessageSendOptions(false, true, null)
client?.send(TdApi.SendMessage(shareInfo.chatId, 0, 0, sendOptions, null, content)) { obj ->
handleTextLocationMessageUpdate(obj, shareInfo, false)
}
}
@ -883,21 +888,21 @@ class TelegramHelper private constructor() {
fun sendNewMapLocation(shareInfo: ShareChatInfo, locationMessage: LocationMessages.BufferMessage) {
needRefreshActiveLiveLocationMessages = true
val location = TdApi.Location(locationMessage.lat, locationMessage.lon)
val location = TdApi.Location(locationMessage.lat, locationMessage.lon, locationMessage.hdop)
val livePeriod =
if (shareInfo.currentMessageLimit > (shareInfo.start + MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC)) {
MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC
} else {
shareInfo.livePeriod.toInt()
}
val content = TdApi.InputMessageLocation(location, livePeriod)
val content = TdApi.InputMessageLocation(location, livePeriod, locationMessage.bearing.toInt(), 0)
if (!shareInfo.pendingMapMessage) {
shareInfo.pendingMapMessage = true
shareInfo.pendingTdLibMap++
shareInfo.lastSendMapMessageTime = (System.currentTimeMillis() / 1000).toInt()
log.error("sendNewMapLocation ${shareInfo.pendingTdLibMap}")
val sendOptions = TdApi.SendMessageOptions(false, true, null)
client?.send(TdApi.SendMessage(shareInfo.chatId, 0, sendOptions, null, content)) { obj ->
val sendOptions = TdApi.MessageSendOptions(false, true, null)
client?.send(TdApi.SendMessage(shareInfo.chatId, 0, 0, sendOptions, null, content)) { obj ->
handleMapLocationMessageUpdate(obj, shareInfo, false)
}
}
@ -905,12 +910,13 @@ class TelegramHelper private constructor() {
fun editMapLocation(shareInfo: ShareChatInfo, locationMessage: LocationMessages.BufferMessage) {
needRefreshActiveLiveLocationMessages = true
val location = TdApi.Location(locationMessage.lat, locationMessage.lon)
val location = TdApi.Location(locationMessage.lat, locationMessage.lon, locationMessage.hdop)
if (shareInfo.currentMapMessageId!=-1L) {
shareInfo.pendingTdLibMap++
shareInfo.lastSendMapMessageTime = (System.currentTimeMillis() / 1000).toInt()
log.info("editMapLocation ${shareInfo.currentMapMessageId} pendingTdLibMap: ${shareInfo.pendingTdLibMap}")
client?.send(TdApi.EditMessageLiveLocation(shareInfo.chatId, shareInfo.currentMapMessageId, null, location)) { obj ->
client?.send(TdApi.EditMessageLiveLocation(shareInfo.chatId, shareInfo.currentMapMessageId,
null, location, locationMessage.bearing.toInt(), 0)) { obj ->
handleMapLocationMessageUpdate(obj, shareInfo, false)
}
}
@ -1080,18 +1086,21 @@ class TelegramHelper private constructor() {
}
}
private fun setChatOrder(chat: TdApi.Chat, order: Long) {
private fun setChatPositions(chat: TdApi.Chat, positions: Array<TdApi.ChatPosition?>) {
synchronized(chatList) {
val isChannel = isChannel(chat)
if (chat.order != 0L) {
chatList.remove(OrderedChat(chat.order, chat.id, isChannel))
}
chat.order = order
if (chat.order != 0L) {
chatList.add(OrderedChat(chat.order, chat.id, isChannel))
synchronized(chat) {
val isChannel = isChannel(chat)
for (position in chat.positions) {
if (position.list.constructor == TdApi.ChatListMain.CONSTRUCTOR) {
chatList.remove(OrderedChat(chat.id, position, isChannel))
}
}
chat.positions = positions
for (position in chat.positions) {
if (position.list.constructor == TdApi.ChatListMain.CONSTRUCTOR) {
chatList.add(OrderedChat(chat.id, position, isChannel))
}
}
}
}
}
@ -1188,11 +1197,15 @@ class TelegramHelper private constructor() {
}
}
class OrderedChat internal constructor(internal val order: Long, internal val chatId: Long, internal val isChannel: Boolean) : Comparable<OrderedChat> {
class OrderedChat internal constructor(
internal val chatId: Long,
internal val position: TdApi.ChatPosition,
internal val isChannel: Boolean
) : Comparable<OrderedChat> {
override fun compareTo(other: OrderedChat): Int {
if (this.order != other.order) {
return if (other.order < this.order) -1 else 1
if (this.position.order != other.position.order) {
return if (other.position.order < this.position.order) -1 else 1
}
return if (this.chatId != other.chatId) {
if (other.chatId < this.chatId) -1 else 1
@ -1206,12 +1219,11 @@ class TelegramHelper private constructor() {
if (other !is OrderedChat) {
return false
}
val o = other as OrderedChat?
return this.order == o!!.order && this.chatId == o.chatId
return this.chatId == other.chatId && this.position.order == other.position.order;
}
override fun hashCode(): Int {
return (order + chatId).hashCode()
return (position.order + chatId).hashCode()
}
}
@ -1288,9 +1300,9 @@ class TelegramHelper private constructor() {
}
}
}
val order = chat.order
chat.order = 0
setChatOrder(chat, order)
val positions = chat.positions
chat.positions = arrayOfNulls(0)
setChatPositions(chat, positions)
}
listener?.onTelegramChatsChanged()
}
@ -1320,28 +1332,38 @@ class TelegramHelper private constructor() {
if (chat != null) {
synchronized(chat) {
chat.lastMessage = updateChat.lastMessage
setChatOrder(chat, updateChat.order)
setChatPositions(chat, updateChat.positions);
}
//listener?.onTelegramChatsChanged()
}
}
TdApi.UpdateChatOrder.CONSTRUCTOR -> {
val updateChat = obj as TdApi.UpdateChatOrder
val chat = chats[updateChat.chatId]
if (chat != null) {
synchronized(chat) {
setChatOrder(chat, updateChat.order)
}
listener?.onTelegramChatsChanged()
}
}
TdApi.UpdateChatIsPinned.CONSTRUCTOR -> {
val updateChat = obj as TdApi.UpdateChatIsPinned
val chat = chats[updateChat.chatId]
if (chat != null) {
synchronized(chat) {
chat.isPinned = updateChat.isPinned
setChatOrder(chat, updateChat.order)
TdApi.UpdateChatPosition.CONSTRUCTOR -> {
val updateChat = obj as TdApi.UpdateChatPosition
if (updateChat.position.list.constructor == TdApi.ChatListMain.CONSTRUCTOR) {
val chat = chats[updateChat.chatId]
if (chat != null) {
synchronized(chat) {
var index = 0
for (i in chat.positions.indices) {
if (chat.positions[i].list.constructor == TdApi.ChatListMain.CONSTRUCTOR) {
index = i
break
}
}
val length = chat.positions.size + (if (updateChat.position.order == 0L) 0 else 1) - if (index < chat.positions.size) 1 else 0
val newPositions = arrayOfNulls<TdApi.ChatPosition>(length)
var pos = 0
if (updateChat.position.order != 0L) {
newPositions[pos++] = updateChat.position
}
for (j in chat.positions.indices) {
if (j != index) {
newPositions[pos++] = chat.positions[j];
}
}
setChatPositions(chat, newPositions)
}
}
//listener?.onTelegramChatsChanged()
}
@ -1453,7 +1475,7 @@ class TelegramHelper private constructor() {
if (chat != null) {
synchronized(chat) {
chat.draftMessage = updateChat.draftMessage
setChatOrder(chat, updateChat.order)
setChatPositions(chat, updateChat.positions)
}
//listener?.onTelegramChatsChanged()
}

16
OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandLocationUtils.kt
View file

@ -99,15 +99,15 @@ object OsmandLocationUtils {
fun getSenderMessageId(message: TdApi.Message): Int {
val forwardInfo = message.forwardInfo
return if (forwardInfo != null) {
val origin: TdApi.MessageForwardOrigin? = forwardInfo.origin
if (origin != null && origin is TdApi.MessageForwardOriginUser) {
origin.senderUserId
} else {
message.senderUserId
}
return if (forwardInfo != null && forwardInfo.origin is TdApi.MessageForwardOriginUser) {
(forwardInfo.origin as TdApi.MessageForwardOriginUser).senderUserId
} else {
message.senderUserId
val sender = message.sender
if (sender is TdApi.MessageSenderUser) {
sender.userId
} else {
0
}
}
}

1
OsmAnd/AndroidManifest.xml
View file

@ -4,7 +4,6 @@
android:installLocation="auto"
package="net.osmand.plus">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />

BIN
OsmAnd/res/drawable-hdpi/warnings_border_control.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_hazard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_hazard_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_limit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_pedestrian.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_pedestrian_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_railways.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_railways_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_speed_camera.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_speed_limit_ca.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_stop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_traffic_calming.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_traffic_calming_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_tunnel.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OsmAnd/res/drawable-hdpi/warnings_tunnel_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OsmAnd/res/drawable-large-hdpi/warnings_hazard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.9 KiB

BIN
OsmAnd/res/drawable-large-hdpi/warnings_hazard_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
OsmAnd/res/drawable-large/warnings_border_control.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
OsmAnd/res/drawable-large/warnings_hazard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OsmAnd/res/drawable-large/warnings_hazard_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
OsmAnd/res/drawable-large/warnings_limit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.4 KiB

BIN
OsmAnd/res/drawable-large/warnings_pedestrian.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
OsmAnd/res/drawable-large/warnings_pedestrian_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
OsmAnd/res/drawable-large/warnings_railways.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
OsmAnd/res/drawable-large/warnings_railways_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
OsmAnd/res/drawable-large/warnings_speed_camera.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
OsmAnd/res/drawable-large/warnings_speed_limit_ca.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
OsmAnd/res/drawable-large/warnings_speed_limit_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OsmAnd/res/drawable-large/warnings_stop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OsmAnd/res/drawable-large/warnings_traffic_calming.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
OsmAnd/res/drawable-large/warnings_traffic_calming_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_border_control.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_hazard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_hazard_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_limit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_pedestrian.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_pedestrian_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_railways.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_railways_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_speed_camera.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_speed_limit_ca.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_speed_limit_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_stop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_traffic_calming.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_traffic_calming_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_tunnel.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-mdpi/warnings_tunnel_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_border_control.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.9 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_hazard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_hazard_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_limit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.4 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_pedestrian.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_pedestrian_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_railways.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_railways_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_speed_camera.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_speed_limit_ca.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_speed_limit_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_stop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_traffic_calming.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_traffic_calming_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_tunnel.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
OsmAnd/res/drawable-xhdpi/warnings_tunnel_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_border_control.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.4 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_hazard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_hazard_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_limit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_pedestrian.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_pedestrian_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.2 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_railways.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_railways_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_speed_camera.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_speed_limit_ca.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_speed_limit_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_stop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_traffic_calming.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_traffic_calming_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_tunnel.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
OsmAnd/res/drawable-xxhdpi/warnings_tunnel_us.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/warnings_speed_limit_ca.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 35 KiB

47
OsmAnd/res/drawable/ic_action_join_segments.xml
View file

@ -1,46 +1,29 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20,11H23C23.5523,11 24,11.4477 24,12C24,12.5523 23.5523,13 23,13H20V11Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="12"
android:startX="21"
android:endY="12"
android:endX="24"
android:type="linear">
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="1" android:color="#00FFFFFF"/>
</gradient>
</aapt:attr>
</path>
android:pathData="M4.1707,11C4.0602,11.3128 4,11.6494 4,12C4,12.3506 4.0602,12.6872 4.1707,13H3C2.4477,13 2,12.5523 2,12C2,11.4477 2.4477,11 3,11H4.1707Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M4,13H1C0.4477,13 0,12.5523 0,12C0,11.4477 0.4477,11 1,11H4V13Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="12"
android:startX="0"
android:endY="12"
android:endX="3"
android:type="linear">
<item android:offset="0" android:color="#00FFFFFF"/>
<item android:offset="1" android:color="#FFFFFFFF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M6,9C4.3432,9 3,10.3431 3,12C3,13.6569 4.3432,15 6,15C7.6568,15 9,13.6569 9,12C9,10.3431 7.6568,9 6,9ZM6,13C6.5523,13 7,12.5523 7,12C7,11.4477 6.5523,11 6,11C5.4477,11 5,11.4477 5,12C5,12.5523 5.4477,13 6,13Z"
android:pathData="M7,9C5.3432,9 4,10.3431 4,12C4,13.6569 5.3432,15 7,15C8.6568,15 10,13.6569 10,12C10,10.3431 8.6568,9 7,9ZM7,13C7.5523,13 8,12.5523 8,12C8,11.4477 7.5523,11 7,11C6.4477,11 6,11.4477 6,12C6,12.5523 6.4477,13 7,13Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M18,15C19.6569,15 21,13.6569 21,12C21,10.3431 19.6569,9 18,9C16.3431,9 15,10.3431 15,12C15,13.6569 16.3431,15 18,15ZM18,11C17.4477,11 17,11.4477 17,12C17,12.5523 17.4477,13 18,13C18.5523,13 19,12.5523 19,12C19,11.4477 18.5523,11 18,11Z"
android:pathData="M19.8293,11C19.9398,11.3128 20,11.6494 20,12C20,12.3506 19.9398,12.6872 19.8293,13H21C21.5523,13 22,12.5523 22,12C22,11.4477 21.5523,11 21,11H19.8293Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M17,9C18.6569,9 20,10.3431 20,12C20,13.6569 18.6569,15 17,15C15.3431,15 14,13.6569 14,12C14,10.3431 15.3431,9 17,9ZM17,13C16.4477,13 16,12.5523 16,12C16,11.4477 16.4477,11 17,11C17.5523,11 18,11.4477 18,12C18,12.5523 17.5523,13 17,13Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M11,11C10.4477,11 10,11.4477 10,12C10,12.5523 10.4477,13 11,13H13C13.5523,13 14,12.5523 14,12C14,11.4477 13.5523,11 13,11H11Z"
android:fillColor="#ffffff"/>
android:pathData="M9.8293,13H14.1707C14.0601,12.6872 14,12.3506 14,12C14,11.6494 14.0601,11.3128 14.1707,11H9.8293C9.9398,11.3128 10,11.6494 10,12C10,12.3506 9.9398,12.6872 9.8293,13Z"
android:strokeAlpha="0.8"
android:fillColor="#ffffff"
android:fillAlpha="0.8"/>
</vector>

4
OsmAnd/res/drawable/ic_action_plan_route.xml
View file

@ -31,10 +31,8 @@
<path
android:strokeWidth="1"
android:pathData="M4.5,10.5V7.5H5.5V10.5H4.5Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"
android:fillAlpha="0.5"/>
android:strokeColor="#ffffff"/>
<path
android:strokeWidth="1"
android:pathData="M4.5,7.5V4.5H6.7929L8.2929,6L6.7929,7.5H4.5Z"

19
OsmAnd/res/drawable/ic_action_split_after.xml Normal file
View file

@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19,9C20.6569,9 22,10.3431 22,12C22,13.6569 20.6569,15 19,15C17.3431,15 16,13.6569 16,12C16,10.3431 17.3431,9 19,9ZM19,13C18.4477,13 18,12.5523 18,12C18,11.4477 18.4477,11 19,11C19.5523,11 20,11.4477 20,12C20,12.5523 19.5523,13 19,13Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M3,13H6V11H3C2.4477,11 2,11.4477 2,12C2,12.5523 2.4477,13 3,13Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M8,9C6.3432,9 5,10.3431 5,12C5,13.6569 6.3432,15 8,15C9.6568,15 11,13.6569 11,12C11,10.3431 9.6568,9 8,9ZM8,13C8.5523,13 9,12.5523 9,12C9,11.4477 8.5523,11 8,11C7.4477,11 7,11.4477 7,12C7,12.5523 7.4477,13 8,13Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>

19
OsmAnd/res/drawable/ic_action_split_before.xml Normal file
View file

@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M5,9C3.3431,9 2,10.3431 2,12C2,13.6569 3.3431,15 5,15C6.6568,15 8,13.6569 8,12C8,10.3431 6.6568,9 5,9ZM5,13C5.5523,13 6,12.5523 6,12C6,11.4477 5.5523,11 5,11C4.4477,11 4,11.4477 4,12C4,12.5523 4.4477,13 5,13Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M21,13H18V11H21C21.5523,11 22,11.4477 22,12C22,12.5523 21.5523,13 21,13Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M16,9C17.6569,9 19,10.3431 19,12C19,13.6569 17.6569,15 16,15C14.3431,15 13,13.6569 13,12C13,10.3431 14.3431,9 16,9ZM16,13C15.4477,13 15,12.5523 15,12C15,11.4477 15.4477,11 16,11C16.5523,11 17,11.4477 17,12C17,12.5523 16.5523,13 16,13Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>

9
OsmAnd/res/drawable/warnings_border_control.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M51.087,6.0224C49.885,5.8787 48.7267,6.4348 48.0819,7.472C47.4496,8.4967 47.4871,9.8026 48.132,10.771C48.1633,10.821 48.1946,10.8273 48.2322,10.871L52,16H79.7611L80,10.5211C80,9.7026 79.3614,9.009 78.5475,8.9216L51.087,6.0224ZM29.0497,15.5697C28.8494,15.5697 28.649,15.6322 28.4487,15.6697C28.3485,15.6884 28.2421,15.6822 28.1482,15.7197L8.8155,23.6674C7.8013,23.8299 7.1752,24.3485 6.8121,24.7671C6.1422,25.5357 5.8668,26.5979 6.0608,27.9163L10.8189,51.4097C10.9504,52.197 11.5514,54.0089 14.1746,54.0089H29.4003C30.5397,54.0089 31.5352,53.6153 32.155,52.8593C32.7247,52.1657 32.9375,51.2597 32.756,50.36L27.9479,26.4167C27.6599,24.7047 26.2638,23.6175 24.2917,23.6175H17.4301L28.9996,18.8688L34.4088,46.0112C34.559,46.7735 35.2101,47.3108 35.9614,47.3108C36.0678,47.3108 36.2118,47.2796 36.312,47.2608C37.1822,47.0859 37.7332,46.2299 37.5641,45.3614L32.1049,18.019C31.9421,17.2005 31.4663,16.5132 30.7526,16.0696C30.2392,15.7509 29.6445,15.5635 29.0497,15.5697ZM51.087,19L48.6328,20.7683C48.5828,20.8057 48.5264,20.8245 48.4826,20.8682C47.7313,21.618 47.4871,22.7115 47.8816,23.6674C48.276,24.6172 49.2025,25 50.2355,25H78.3973C79.2863,25 80,24.4985 80,23.6175V19H51.087ZM79.3921,26.7501C79.0039,26.9188 78.5907,27 78.14,27H54.5C55.8899,32.5734 60.8347,36.4139 66.9137,36.4139C73.0867,36.4139 78.0962,32.461 79.3921,26.7501ZM57,40C54.1389,40 50.0728,41.1126 47.7313,43.062L34.7594,54.6088C34.6968,54.6963 34.678,54.7775 34.6091,54.8587C33.3695,56.3645 31.5164,57.2081 29.4003,57.2081H16.9292L28.0981,69.3547C29.4942,70.748 31.4851,71.604 33.4071,71.604C35.2352,71.604 36.8942,70.973 38.3154,69.7545L44,64.556V84.4005C44,85.2877 45.0455,86 45.9283,86H84.3933C85.2823,86 85.996,85.2877 85.996,84.4005V50.36C86.0148,49.7914 85.9647,49.2665 85.8959,48.7104C85.8833,48.6292 85.8583,48.5355 85.8458,48.4605C85.7644,47.9294 85.6517,47.417 85.4952,46.9109C85.4701,46.8297 85.4701,46.7422 85.4451,46.661C85.276,46.1549 85.0444,45.6863 84.794,45.2114C84.7689,45.1677 84.7689,45.1052 84.7439,45.0615C84.4747,44.5678 84.1429,44.1117 83.7923,43.6618C83.5669,43.3744 83.3478,43.0808 83.0911,42.8121C81.1002,40.7564 78.3924,40 75.4312,40H57ZM73.1243,42.8121H75.4281C77.5129,42.8121 79.4036,43.5869 80.7872,45.0115C81.1566,45.3926 81.4696,45.8175 81.7388,46.2611L52.89,82.8009H47.531V74.5032L73.1243,42.8121Z"
android:fillColor="#000000"/>
</vector>

19
OsmAnd/res/drawable/warnings_hazard.xml Normal file
View file

@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M87.0666,71.8838L50.9244,10.764C50.6259,10.2591 50.2514,9.8031 49.8143,9.4121C47.6425,7.4693 44.3575,7.4693 42.1857,9.4121C41.7486,9.8031 41.3741,10.2591 41.0756,10.764L4.9334,71.8838C4.3224,72.9172 4,74.0956 4,75.2961C4,78.9986 7.0014,82 10.7039,82H12.4H79.6H81.2961C84.9986,82 88,78.9986 88,75.2961C88,74.0956 87.6776,72.9172 87.0666,71.8838Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M46,14.2242L10.098,74.9378C10.0339,75.0463 10,75.1701 10,75.2961C10,75.6849 10.3151,76 10.7039,76H81.2961C81.6849,76 82,75.6849 82,75.2961C82,75.1701 81.9662,75.0463 81.902,74.9378L46,14.2242ZM50.9244,10.764L87.0666,71.8838C87.6776,72.9172 88,74.0956 88,75.2961C88,78.9986 84.9986,82 81.2961,82H10.7039C7.0014,82 4,78.9986 4,75.2961C4,74.0956 4.3224,72.9172 4.9334,71.8838L41.0756,10.764C41.3741,10.2591 41.7486,9.8031 42.1857,9.4121C44.3575,7.4693 47.6425,7.4693 49.8143,9.4121C50.2514,9.8031 50.6259,10.2591 50.9244,10.764Z"
android:fillColor="#F03434"
android:fillType="evenOdd"/>
<path
android:pathData="M46,34C43.8532,34 42.1708,35.8453 42.3688,37.983L44.0583,56.2298C44.1512,57.2328 44.9927,58 46,58C47.0073,58 47.8488,57.2328 47.9417,56.2298L49.6312,37.983C49.8291,35.8453 48.1468,34 46,34Z"
android:fillColor="#000000"/>
<path
android:pathData="M45.9999,62C43.7908,62 41.9999,63.7909 41.9999,66C41.9999,68.2091 43.7908,70 45.9999,70C48.2091,70 49.9999,68.2091 49.9999,66C49.9999,63.7909 48.2091,62 45.9999,62Z"
android:fillColor="#000000"/>
</vector>

19
OsmAnd/res/drawable/warnings_hazard_us.xml Normal file
View file

@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M87.0666,71.8838L50.9244,10.764C50.6259,10.2591 50.2514,9.8031 49.8143,9.4121C47.6425,7.4693 44.3575,7.4693 42.1857,9.4121C41.7486,9.8031 41.3741,10.2591 41.0756,10.764L4.9334,71.8838C4.3224,72.9172 4,74.0956 4,75.2961C4,78.9986 7.0014,82 10.7039,82H12.4H79.6H81.2961C84.9986,82 88,78.9986 88,75.2961C88,74.0956 87.6776,72.9172 87.0666,71.8838Z"
android:fillColor="#FFD200"/>
<path
android:pathData="M46,14.2242L10.098,74.9378C10.0339,75.0463 10,75.1701 10,75.2961C10,75.6849 10.3151,76 10.7039,76H81.2961C81.6849,76 82,75.6849 82,75.2961C82,75.1701 81.9662,75.0463 81.902,74.9378L46,14.2242ZM50.9244,10.764L87.0666,71.8838C87.6776,72.9172 88,74.0956 88,75.2961C88,78.9986 84.9986,82 81.2961,82H10.7039C7.0014,82 4,78.9986 4,75.2961C4,74.0956 4.3224,72.9172 4.9334,71.8838L41.0756,10.764C41.3741,10.2591 41.7486,9.8031 42.1857,9.4121C44.3575,7.4693 47.6425,7.4693 49.8143,9.4121C50.2514,9.8031 50.6259,10.2591 50.9244,10.764Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M46,34C43.8532,34 42.1708,35.8453 42.3688,37.983L44.0583,56.2298C44.1512,57.2328 44.9927,58 46,58C47.0073,58 47.8488,57.2328 47.9417,56.2298L49.6312,37.983C49.8291,35.8453 48.1468,34 46,34Z"
android:fillColor="#000000"/>
<path
android:pathData="M45.9999,62C43.7908,62 41.9999,63.7909 41.9999,66C41.9999,68.2091 43.7908,70 45.9999,70C48.2091,70 49.9999,68.2091 49.9999,66C49.9999,63.7909 48.2091,62 45.9999,62Z"
android:fillColor="#000000"/>
</vector>

13
OsmAnd/res/drawable/warnings_limit.xml Normal file
View file

@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M86,46C86,68.0914 68.0914,86 46,86C23.9086,86 6,68.0914 6,46C6,23.9086 23.9086,6 46,6C68.0914,6 86,23.9086 86,46Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M46,80C64.7777,80 80,64.7777 80,46C80,27.2223 64.7777,12 46,12C27.2223,12 12,27.2223 12,46C12,64.7777 27.2223,80 46,80ZM46,86C68.0914,86 86,68.0914 86,46C86,23.9086 68.0914,6 46,6C23.9086,6 6,23.9086 6,46C6,68.0914 23.9086,86 46,86Z"
android:fillColor="#F03434"
android:fillType="evenOdd"/>
</vector>

34
OsmAnd/res/drawable/warnings_pedestrian.xml Normal file
View file

@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<group>
<clip-path android:pathData="M0,0h92v92h-92z M 0,0"/>
<path
android:pathData="M87.0666 71.8838L50.9244 10.764C50.6259 10.2591 50.2514 9.80312 49.8143 9.41206C47.6425 7.4693 44.3575 7.4693 42.1857 9.41205C41.7486 9.80312 41.3741 10.2591 41.0756 10.764L4.93341 71.8838C4.32236 72.9172 4 74.0956 4 75.2961C4 78.9986 7.00144 82 10.7039 82H12.4H79.6H81.2961C84.9986 82 88 78.9986 88 75.2961C88 74.0956 87.6776 72.9172 87.0666 71.8838Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M46 14.2242L10.098 74.9378C10.0339 75.0463 10 75.1701 10 75.2961C10 75.6849 10.3151 76 10.7039 76H81.2961C81.6849 76 82 75.6849 82 75.2961C82 75.1701 81.9662 75.0463 81.902 74.9378L46 14.2242ZM50.9244 10.764L87.0666 71.8838C87.6776 72.9172 88 74.0956 88 75.2961C88 78.9986 84.9986 82 81.2961 82H10.7039C7.00144 82 4 78.9986 4 75.2961C4 74.0956 4.32236 72.9172 4.93341 71.8838L41.0756 10.764C41.3741 10.2591 41.7486 9.80312 42.1857 9.41205C44.3575 7.4693 47.6425 7.4693 49.8143 9.41206C50.2514 9.80312 50.6259 10.2591 50.9244 10.764Z"
android:fillColor="#F03434"
android:fillType="evenOdd"/>
<path
android:pathData="M45.1538 58H44.782L44.2443 60.38C44.0987 61.0246 43.7734 61.5906 43.3283 62.03L42 70H49L47.8231 62.9384C46.3018 62.6409 45.1538 61.3007 45.1538 59.6923V58Z"
android:fillColor="#000000"/>
<path
android:pathData="M50.9639 61.8555L53 70H59L55 58H51.7692V59.6923C51.7692 60.5194 51.4657 61.2756 50.9639 61.8555Z"
android:fillColor="#000000"/>
<path
android:pathData="M37.8665 58L37.6707 58.9823C37.3367 60.6573 38.3042 62.2414 39.8016 62.7937L38 70H32L36 58H37.8665Z"
android:fillColor="#000000"/>
<path
android:pathData="M33 58H28L21 70H28L33 58Z"
android:fillColor="#000000"/>
<path
android:pathData="M63 58H58L63 70H70L63 58Z"
android:fillColor="#000000"/>
<path
android:pathData="M47.8077 38.2093C49.2462 38.2093 50.4231 37.0372 50.4231 35.6047C50.4231 34.1721 49.2462 33 47.8077 33C46.3692 33 45.1923 34.1721 45.1923 35.6047C45.1923 37.0372 46.3692 38.2093 47.8077 38.2093ZM42.9692 42.6372L39.632 59.3734C39.4642 60.2151 40.1081 61 40.9664 61C41.6023 61 42.1534 60.5595 42.2935 59.9393L44.4077 50.5814L47.1538 53.186V59.6923C47.1538 60.4145 47.7393 61 48.4615 61C49.1838 61 49.7692 60.4145 49.7692 59.6923V51.2326L47.0231 48.6279L47.8077 44.7209C49.5077 46.6744 52.1231 47.9767 55 47.9767V45.3721C52.5154 45.3721 50.4231 44.0698 49.3769 42.2465L48.0692 40.1628C47.5462 39.3814 46.7615 38.8605 45.8462 38.8605C45.4538 38.8605 45.1923 38.9907 44.8 38.9907L38 41.8558V47.9767H40.6154V43.5488L42.9692 42.6372Z"
android:fillColor="#000000"/>
</group>
</vector>

28
OsmAnd/res/drawable/warnings_pedestrian_us.xml Normal file
View file

@ -0,0 +1,28 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M83.8787,40.8787L51.1213,8.1213C49.7631,6.7631 47.9209,6 46,6C44.0791,6 42.2369,6.7631 40.8787,8.1213L8.1213,40.8787C6.7631,42.2369 6,44.0791 6,46C6,47.9209 6.7631,49.7631 8.1213,51.1213L40.8787,83.8787C42.2369,85.2369 44.0791,86 46,86C47.9209,86 49.7631,85.2369 51.1213,83.8787L83.8787,51.1213C85.2369,49.7631 86,47.9209 86,46C86,44.0791 85.2369,42.2369 83.8787,40.8787Z"
android:fillColor="#FFD200"/>
<path
android:pathData="M79.4645,44.7071L47.2929,12.5355C46.95,12.1926 46.4849,12 46,12C45.5151,12 45.05,12.1926 44.7071,12.5355L12.5355,44.7071C12.1926,45.05 12,45.5151 12,46C12,46.4849 12.1926,46.95 12.5355,47.2929L44.7071,79.4645C45.05,79.8074 45.5151,80 46,80C46.4849,80 46.95,79.8074 47.2929,79.4645L79.4645,47.2929C79.8074,46.95 80,46.4849 80,46C80,45.5151 79.8074,45.05 79.4645,44.7071ZM49.4142,10.4142L81.5858,42.5858C82.4913,43.4913 83,44.7194 83,46C83,47.2806 82.4913,48.5087 81.5858,49.4142L49.4142,81.5858C48.5087,82.4913 47.2806,83 46,83C44.7194,83 43.4913,82.4913 42.5858,81.5858L10.4142,49.4142C9.5087,48.5087 9,47.2806 9,46C9,44.7194 9.5087,43.4913 10.4142,42.5858L42.5858,10.4142C43.4913,9.5087 44.7194,9 46,9C47.2806,9 48.5087,9.5087 49.4142,10.4142Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M52.4506,54V56H66V54H52.4506Z"
android:fillColor="#000000"/>
<path
android:pathData="M45.4615,54V56H44.5871L45.0389,54H45.4615Z"
android:fillColor="#000000"/>
<path
android:pathData="M26,56H37.2527L37.6515,54H26V56Z"
android:fillColor="#000000"/>
<path
android:pathData="M56,65H36V67H56V65Z"
android:fillColor="#000000"/>
<path
android:pathData="M48.2088,33.9535C49.8527,33.9535 51.1978,32.614 51.1978,30.9767C51.1978,29.3395 49.8527,28 48.2088,28C46.5648,28 45.2198,29.3395 45.2198,30.9767C45.2198,32.614 46.5648,33.9535 48.2088,33.9535ZM42.6791,39.014L38.4945,60H41.633L44.3231,48.093L47.4615,51.0698V60H50.4506V48.8372L47.3121,45.8605L48.2088,41.3953C50.1517,43.6279 53.1407,45.1163 56.4286,45.1163V42.1395C53.589,42.1395 51.1978,40.6512 50.0022,38.5674L48.5077,36.186C47.9099,35.293 47.0132,34.6977 45.967,34.6977C45.5187,34.6977 45.2198,34.8465 44.7714,34.8465L37,38.1209V45.1163H39.989V40.0558L42.6791,39.014Z"
android:fillColor="#000000"/>
</vector>

38
OsmAnd/res/drawable/warnings_railways.xml Normal file
View file

@ -0,0 +1,38 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M87.0666,71.8838L50.9244,10.764C50.6259,10.2591 50.2514,9.8031 49.8143,9.4121C47.6425,7.4693 44.3575,7.4693 42.1857,9.4121C41.7486,9.8031 41.3741,10.2591 41.0756,10.764L4.9334,71.8838C4.3224,72.9172 4,74.0956 4,75.2961C4,78.9986 7.0014,82 10.7039,82H12.4H79.6H81.2961C84.9986,82 88,78.9986 88,75.2961C88,74.0956 87.6776,72.9172 87.0666,71.8838Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M46,14.2242L10.098,74.9378C10.0339,75.0463 10,75.1701 10,75.2961C10,75.6849 10.3151,76 10.7039,76H81.2961C81.6849,76 82,75.6849 82,75.2961C82,75.1701 81.9662,75.0463 81.902,74.9378L46,14.2242ZM50.9244,10.764L87.0666,71.8838C87.6776,72.9172 88,74.0956 88,75.2961C88,78.9986 84.9986,82 81.2961,82H10.7039C7.0014,82 4,78.9986 4,75.2961C4,74.0956 4.3224,72.9172 4.9334,71.8838L41.0756,10.764C41.3741,10.2591 41.7486,9.8031 42.1857,9.4121C44.3575,7.4693 47.6425,7.4693 49.8143,9.4121C50.2514,9.8031 50.6259,10.2591 50.9244,10.764Z"
android:fillColor="#F03434"
android:fillType="evenOdd"/>
<path
android:pathData="M55,44C55,46.2091 53.2091,48 51,48C50.314,48 49.6683,47.8273 49.1041,47.523C48.3706,48.4243 47.2526,49 46,49C45.4593,49 44.9438,48.8927 44.4733,48.6983C43.9324,49.4845 43.0264,50 42,50H40V52H37C37.3309,50.3457 37.9437,48.7605 38.8117,47.3138L39,47C39,45.3431 40.3431,44 42,44C42.042,44 42.0838,44.0009 42.1254,44.0026C42.5685,42.276 44.1352,41 46,41C46.686,41 47.3317,41.1727 47.8959,41.477C48.6294,40.5757 49.7474,40 51,40C53.2091,40 55,41.7909 55,44Z"
android:fillColor="#000000"/>
<path
android:pathData="M51,51V61H58V53H59V51H51ZM56,53H53V56H56V53Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M57,64H36V67H30L35,62H59V66H57V64Z"
android:fillColor="#000000"/>
<path
android:pathData="M50,55V61H35L34,58L35,55H37V53H40V55H44V54H47V55H50Z"
android:fillColor="#000000"/>
<path
android:pathData="M39,69C40.1046,69 41,68.1046 41,67C41,65.8954 40.1046,65 39,65C37.8954,65 37,65.8954 37,67C37,68.1046 37.8954,69 39,69Z"
android:fillColor="#000000"/>
<path
android:pathData="M44,69C45.1046,69 46,68.1046 46,67C46,65.8954 45.1046,65 44,65C42.8954,65 42,65.8954 42,67C42,68.1046 42.8954,69 44,69Z"
android:fillColor="#000000"/>
<path
android:pathData="M51,67C51,68.1046 50.1046,69 49,69C47.8954,69 47,68.1046 47,67C47,65.8954 47.8954,65 49,65C50.1046,65 51,65.8954 51,67Z"
android:fillColor="#000000"/>
<path
android:pathData="M54,69C55.1046,69 56,68.1046 56,67C56,65.8954 55.1046,65 54,65C52.8954,65 52,65.8954 52,67C52,68.1046 52.8954,69 54,69Z"
android:fillColor="#000000"/>
</vector>

19
OsmAnd/res/drawable/warnings_railways_us.xml Normal file
View file

@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M86,46C86,68.0914 68.0914,86 46,86C23.9086,86 6,68.0914 6,46C6,23.9086 23.9086,6 46,6C68.0914,6 86,23.9086 86,46Z"
android:fillColor="#FFD200"/>
<path
android:pathData="M74.9243,69.0757L75.182,68.818L75.1519,68.7879C80.069,62.5065 83,54.5955 83,46C83,37.4045 80.069,29.4935 75.1519,23.2121L75.182,23.182L74.9242,22.9242C73.1986,20.764 71.2359,18.8014 69.0757,17.0757L68.818,16.818L68.7879,16.8481C62.5065,11.931 54.5955,9 46,9C37.4045,9 29.4935,11.931 23.2121,16.8481L23.182,16.818L22.9243,17.0757C20.764,18.8014 18.8014,20.764 17.0757,22.9243L16.818,23.182L16.8481,23.2121C11.931,29.4935 9,37.4045 9,46C9,54.5955 11.931,62.5065 16.8481,68.7879L16.818,68.818L17.0757,69.0757C18.8014,71.236 20.7641,73.1986 22.9243,74.9243L23.182,75.182L23.2121,75.1519C29.4935,80.069 37.4045,83 46,83C54.5955,83 62.5065,80.069 68.7879,75.1519L68.818,75.182L69.0757,74.9243C71.2359,73.1986 73.1986,71.2359 74.9243,69.0757ZM66.6494,73.0134C60.9248,77.396 53.7665,80 46,80C38.2335,80 31.0752,77.396 25.3506,73.0134L46,52.364L66.6494,73.0134ZM73.0134,66.6494L52.364,46L73.0134,25.3506C77.396,31.0752 80,38.2335 80,46C80,53.7665 77.396,60.9248 73.0134,66.6494ZM18.9866,66.6494L39.636,46L18.9866,25.3506C14.604,31.0752 12,38.2335 12,46C12,53.7665 14.604,60.9248 18.9866,66.6494ZM25.3506,18.9866L46,39.636L66.6494,18.9866C60.9248,14.604 53.7665,12 46,12C38.2335,12 31.0752,14.604 25.3506,18.9866Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M17.6311,56V37.24H22.3351C23.5671,37.24 24.6031,37.6693 25.4431,38.528C26.3018,39.3867 26.7311,40.4413 26.7311,41.692V43.428C26.7311,45.164 25.9938,46.4893 24.5191,47.404L27.3751,56H24.5191L21.9991,47.964H20.3191V56H17.6311ZM23.5951,44.996C23.7631,44.7907 23.8751,44.5573 23.9311,44.296C24.0058,44.0347 24.0431,43.7453 24.0431,43.428V41.692C24.0431,41.1133 23.8845,40.6467 23.5671,40.292C23.2498,39.9187 22.8018,39.732 22.2231,39.732H20.3191V45.584H22.1951C22.7551,45.584 23.2218,45.388 23.5951,44.996Z"
android:fillColor="#000000"/>
<path
android:pathData="M65.6311,56V37.24H70.3351C71.5671,37.24 72.6031,37.6693 73.4431,38.528C74.3018,39.3867 74.7311,40.4413 74.7311,41.692V43.428C74.7311,45.164 73.9938,46.4893 72.5191,47.404L75.3751,56H72.5191L69.9991,47.964H68.3191V56H65.6311ZM71.5951,44.996C71.7631,44.7907 71.8751,44.5573 71.9311,44.296C72.0058,44.0347 72.0431,43.7453 72.0431,43.428V41.692C72.0431,41.1133 71.8845,40.6467 71.5671,40.292C71.2498,39.9187 70.8018,39.732 70.2231,39.732H68.3191V45.584H70.1951C70.7551,45.584 71.2218,45.388 71.5951,44.996Z"
android:fillColor="#000000"/>
</vector>

29
OsmAnd/res/drawable/warnings_speed_camera.xml Normal file
View file

@ -0,0 +1,29 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M8,14C8,10.6863 10.6863,8 14,8H78C81.3137,8 84,10.6863 84,14V77C84,80.3137 81.3137,83 78,83H14C10.6863,83 8,80.3137 8,77V14Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M78,14H14L14,77H78V14ZM14,8C10.6863,8 8,10.6863 8,14V77C8,80.3137 10.6863,83 14,83H78C81.3137,83 84,80.3137 84,77V14C84,10.6863 81.3137,8 78,8H14Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M36,54C36,56.7614 33.7614,59 31,59C28.2386,59 26,56.7614 26,54C26,51.2386 28.2386,49 31,49C33.7614,49 36,51.2386 36,54Z"
android:fillColor="#000000"/>
<path
android:pathData="M43,37C44.6569,37 46,35.6569 46,34C46,32.3431 44.6569,31 43,31C41.3431,31 40,32.3431 40,34C40,35.6569 41.3431,37 43,37Z"
android:fillColor="#000000"/>
<path
android:pathData="M22,26C20.3431,26 19,27.3431 19,29V63C19,64.6569 20.3431,66 22,66H48C49.6569,66 51,64.6569 51,63V29C51,27.3431 49.6569,26 48,26H22ZM39,54C39,58.4183 35.4183,62 31,62C26.5817,62 23,58.4183 23,54C23,49.5817 26.5817,46 31,46C35.4183,46 39,49.5817 39,54ZM43,39C45.7614,39 48,36.7614 48,34C48,31.2386 45.7614,29 43,29C40.2386,29 38,31.2386 38,34C38,36.7614 40.2386,39 43,39Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M53,33H61V55H53V33Z"
android:fillColor="#000000"/>
<path
android:pathData="M65,39H63V57H53V59H65V54H73V42H65V39Z"
android:fillColor="#000000"/>
</vector>

Some files were not shown because too many files have changed in this diff Show more