diff --git a/OsmAnd-api/build.gradle b/OsmAnd-api/build.gradle
index 4fed658df7..4e2be4bc34 100644
--- a/OsmAnd-api/build.gradle
+++ b/OsmAnd-api/build.gradle
@@ -1,8 +1,7 @@
apply plugin: 'com.android.library'
+apply plugin: 'ivy-publish'
apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.osmandapp.osmand'
-version = '2.0.0'
android {
compileSdkVersion 28
@@ -26,6 +25,33 @@ android {
}
}
+afterEvaluate {
+ publishing {
+ repositories {
+ ivy {
+ url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
+ }
+ }
+
+ publications {
+ release(IvyPublication) {
+ // Applies the component for the release build variant.
+ from components.release
+ organisation = 'net.osmand'
+ module = 'android-aidl-lib'
+ revision = 'master-snapshot'
+ }
+ debug(IvyPublication) {
+ // Applies the component for the release build variant.
+ from components.debug
+ organisation = 'net.osmand'
+ module = 'android-aidl-lib'
+ revision = 'master-snapshot'
+ }
+ }
+ }
+}
+
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:support-annotations:28.0.0'
@@ -38,4 +64,4 @@ task sourcesJar(type: Jar) {
artifacts {
archives sourcesJar
-}
\ No newline at end of file
+}
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
index 7486576b61..8743940a74 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
@@ -1769,6 +1769,10 @@ public class BinaryMapIndexReader {
return limit != -1 && searchResults.size() > limit;
}
+ public void setLimit(int limit) {
+ this.limit = limit;
+ }
+
public boolean isCancelled() {
if (this.interrupted) {
return interrupted;
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
index e51f04df16..3ef6a54652 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
@@ -45,6 +45,9 @@ public class Amenity extends MapObject {
public static final String CONTENT_JSON = "content_json";
public static final String ROUTE_ID = "route_id";
public static final String ROUTE_SOURCE = "route_source";
+ public static final String COLOR = "color";
+ public static final String LANG_YES = "lang_yes";
+ public static final String GPX_ICON = "gpx_icon";
private String subType;
@@ -201,6 +204,15 @@ public class Amenity extends MapObject {
setAdditionalInfo(PHONE, phone);
}
+ public String getColor() {
+ return getAdditionalInfo(COLOR);
+ }
+
+ public String getGpxIcon() {
+ return getAdditionalInfo(GPX_ICON);
+ }
+
+
public String getContentLanguage(String tag, String lang, String defLang) {
if (lang != null) {
String translateName = getAdditionalInfo(tag + ":" + lang);
@@ -250,6 +262,17 @@ public class Amenity extends MapObject {
return l;
}
+ public String getTagSuffix(String tagPrefix) {
+ for (String infoTag : getAdditionalInfoKeys()) {
+ if (infoTag.startsWith(tagPrefix)) {
+ if (infoTag.length() > tagPrefix.length()) {
+ return infoTag.substring(tagPrefix.length());
+ }
+ }
+ }
+ return null;
+ }
+
public String getTagContent(String tag, String lang) {
if (lang != null) {
String translateName = getAdditionalInfo(tag + ":" + lang);
@@ -381,6 +404,4 @@ public class Amenity extends MapObject {
}
return a;
}
-
-
-}
+}
\ No newline at end of file
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Building.java b/OsmAnd-java/src/main/java/net/osmand/data/Building.java
index 7668d16a30..0adacd411a 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/Building.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/Building.java
@@ -106,25 +106,42 @@ public class Building extends MapObject {
public float interpolation(String hno) {
- if(getInterpolationType() != null || getInterpolationInterval() > 0
- //|| checkNameAsInterpolation() // disable due to situation in NL #4284
- ) {
+ if (getInterpolationType() != null || getInterpolationInterval() > 0
+ // || checkNameAsInterpolation() // disable due to situation in NL #4284
+ ) {
int num = Algorithms.extractFirstIntegerNumber(hno);
String fname = super.getName();
int numB = Algorithms.extractFirstIntegerNumber(fname);
- int numT = numB;
+ int numT = numB;
+ String sname = getName2();
+ if (getInterpolationType() == BuildingInterpolation.ALPHABETIC) {
+ if (num != numB) {
+ // currently not supported
+ return -1;
+ }
+ int hint = (int) hno.charAt(hno.length() - 1);
+ int fch = (int) fname.charAt(fname.length() - 1);
+ int sch = sname.charAt(sname.length() - 1);
+ if (fch == sch) {
+ return -1;
+ }
+ float res = ((float) hint - fch) / (((float) sch - fch));
+ if (res > 1 || res < 0) {
+ return -1;
+ }
+ return res;
+ }
if (num >= numB) {
- String sname = getName2();
- if(fname.contains("-") && sname == null){
+ if (fname.contains("-") && sname == null) {
int l = fname.indexOf('-');
sname = fname.substring(l + 1, fname.length());
}
if (sname != null) {
numT = Algorithms.extractFirstIntegerNumber(sname);
- if(numT < num) {
+ if (numT < num) {
return -1;
}
- }
+ }
if (getInterpolationType() == BuildingInterpolation.EVEN && num % 2 == 1) {
return -1;
}
@@ -137,8 +154,8 @@ public class Building extends MapObject {
} else {
return -1;
}
- if(numT > numB){
- return ((float)num - numB) / (((float)numT - numB));
+ if (numT > numB) {
+ return ((float) num - numB) / (((float) numT - numB));
}
return 0;
}
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
index 5c2faf0b51..d00bf9ffb2 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
@@ -719,9 +719,10 @@ public class SearchCoreFactory {
results.put(res.pt.getKeyName(), res);
}
}
- if (nmAdditional != null) {
- addAditonals(nmAdditional, results, types.getOtherMapCategory());
- }
+ // don't spam results with unsearchable additionals like 'description', 'email', ...
+ // if (nmAdditional != null) {
+ // addAditonals(nmAdditional, results, types.getOtherMapCategory());
+ // }
for (PoiCategory c : categories) {
PoiTypeResult res = checkPoiType(nm, c);
if(res != null) {
diff --git a/OsmAnd-telegram/AndroidManifest.xml b/OsmAnd-telegram/AndroidManifest.xml
index 4e8ab332dc..625e51ee8e 100644
--- a/OsmAnd-telegram/AndroidManifest.xml
+++ b/OsmAnd-telegram/AndroidManifest.xml
@@ -7,9 +7,7 @@
-
-
-
-
-
-
-
-
-1) {
- providers.add(0, providers.removeAt(passiveFirst))
- }
- for (provider in providers) {
- val location = convertLocation(service.getLastKnownLocation(provider))
- if (location != null) {
- return location
- }
- }
- return null
- }
-
-
private val gpsListener = object : LocationListener {
override fun onLocationChanged(location: Location?) {
if (location != null) {
@@ -120,7 +92,7 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
if (System.currentTimeMillis() - agpsDataLastTimeDownloaded > AGPS_TO_REDOWNLOAD) {
//force an updated check for internet connectivity here before destroying A-GPS-data
if (app.isInternetConnectionAvailable(true)) {
- redownloadAGPS()
+ //redownloadAGPS()
}
}
}
@@ -178,7 +150,6 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
agpsDataLastTimeDownloaded = 0L
e.printStackTrace()
}
-
}
private fun getGpsStatusListener(service: LocationManager): GpsStatus.Listener {
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt
index 29503dfa27..c3dde54e76 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt
@@ -153,6 +153,7 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
app().shareLocationHelper.updateLocation(firstLocation)
// request location updates
+ /*
val locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
try {
locationManager.requestLocationUpdates(serviceOffProvider, 0, 0f, this@TelegramService)
@@ -163,6 +164,7 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
Toast.makeText(this, R.string.gps_not_available, Toast.LENGTH_LONG).show()
log.debug("GPS location provider not available")
}
+ */
}
private fun startShareInfoUpdates() {
@@ -222,6 +224,8 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
if (!AndroidUtils.isLocationPermissionAvailable(app)) {
return null
}
+ var location: net.osmand.Location? = null
+ /*
val service = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
val ps = service.getProviders(true) ?: return null
val providers = ArrayList(ps)
@@ -233,24 +237,26 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
providers.add(0, providers.removeAt(passiveFirst))
}
// find location
- var location: net.osmand.Location? = null
for (provider in providers) {
val loc = convertLocation(service.getLastKnownLocation(provider))
if (loc != null && (location == null || loc.hasAccuracy() && loc.accuracy < location.accuracy)) {
location = loc
}
}
+ */
return location
}
private fun removeLocationUpdates() {
// remove updates
+ /*
val locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
try {
locationManager.removeUpdates(this)
} catch (e: SecurityException) {
log.debug("Location service permission not granted")
}
+ */
}
override fun onLocationChanged(l: Location?) {
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
index efdb35edf1..ae6805fae9 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
@@ -505,6 +505,7 @@ class TelegramSettings(private val app: TelegramApplication) {
val currentTimeMillis = System.currentTimeMillis()
val currentTime = currentTimeMillis / 1000
statusChangeTime = currentTimeMillis
+ /*
val lm = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
val gpsEnabled = try {
if (lm.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
@@ -518,6 +519,15 @@ class TelegramSettings(private val app: TelegramApplication) {
} catch (ex: Exception) {
false
}
+ */
+ val gpsEnabled = try {
+ val loc = app.locationProvider.lastKnownLocation
+ val gpsActive = loc != null && ((currentTimeMillis - loc.time) / 1000) < GPS_UPDATE_EXPIRED_TIME
+ val lastSentLocationExpired = ((currentTimeMillis - app.shareLocationHelper.lastLocationUpdateTime) / 1000) > GPS_UPDATE_EXPIRED_TIME
+ (gpsActive || !lastSentLocationExpired)
+ } catch (ex: Exception) {
+ false
+ }
var initializing = false
var sendChatsErrors = false
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
index 38535ad886..4026309f63 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
@@ -447,8 +447,10 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
}
private fun runOnUi(action: (() -> Unit)) {
- if (!paused) {
- runOnUiThread(action)
+ runOnUiThread {
+ if (!paused) {
+ action()
+ }
}
}
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 8552c2b293..a3f80f4c46 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -287,7 +287,6 @@ task collectHelpContentsAssets(type: Copy) {
include "about.html"
include "changes.html"
include "faq.html"
- include "technical-articles.html"
include "map-legend.html"
}
from("../../help/website/feature_articles") {
diff --git a/OsmAnd/build.gradle.lib b/OsmAnd/build.gradle.lib
index b5fd457270..6b0f4da990 100644
--- a/OsmAnd/build.gradle.lib
+++ b/OsmAnd/build.gradle.lib
@@ -174,7 +174,6 @@ task collectHelpContentsAssets(type: Copy) {
include "about.html"
include "changes.html"
include "faq.html"
- include "technical-articles.html"
include "map-legend.html"
}
from("../../help/website/feature_articles") {
diff --git a/OsmAnd/res/drawable/ic_action_name_field.xml b/OsmAnd/res/drawable/ic_action_name_field.xml
new file mode 100644
index 0000000000..5c340db2c2
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_name_field.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_overflow_menu_with_background.xml b/OsmAnd/res/drawable/ic_overflow_menu_with_background.xml
new file mode 100644
index 0000000000..d79b484f72
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_overflow_menu_with_background.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_switch_pad_32.xml b/OsmAnd/res/layout/bottom_sheet_item_with_switch_pad_32.xml
new file mode 100644
index 0000000000..4658df14df
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_switch_pad_32.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/track_segments_container.xml b/OsmAnd/res/layout/card_container.xml
similarity index 100%
rename from OsmAnd/res/layout/track_segments_container.xml
rename to OsmAnd/res/layout/card_container.xml
diff --git a/OsmAnd/res/layout/track_menu.xml b/OsmAnd/res/layout/track_menu.xml
index 598372776f..9d33f73e88 100644
--- a/OsmAnd/res/layout/track_menu.xml
+++ b/OsmAnd/res/layout/track_menu.xml
@@ -54,11 +54,15 @@
android:layout_weight="1"
android:orientation="vertical">
-
-
-
-
-
+