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

Merge pull request #10957 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2021-02-20 16:53:59 +01:00 committed by GitHub
commit 0202c22c1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/main/java/net/osmand/osm/io/OsmBaseStorage.java
View file

@ -289,7 +289,8 @@ public class OsmBaseStorage {
entityInfo.put(entityId, currentParsedEntityInfo);
}
if (!supressWarnings && oldEntity != null) {
throw new UnsupportedOperationException("Entity with id=" + oldEntity.getId() +" is duplicated in osm map"); //$NON-NLS-1$ //$NON-NLS-2$
throw new UnsupportedOperationException(
"Entity with id=" + oldEntity.getId() + " is duplicated in osm map"); //$NON-NLS-1$ //$NON-NLS-2$
}
} else {
// System.gc();

BIN
OsmAnd/assets/Default_wikivoyage.travel.obf
View file

Binary file not shown.

BIN
OsmAnd/assets/fonts/RobotoSlab-Regular.ttf
View file

Binary file not shown.

19
OsmAnd/build-common.gradle
View file

@ -106,6 +106,14 @@ android {
}
}
clean.doFirst {
delete fileTree('assets') {
include '*.obf'
include 'fonts/**'
include 'feature_articles/**'
include 'voice/**'
}
}
task validateTranslate {
println "Validating translations"
@ -126,9 +134,15 @@ task validateTranslate {
}
}
task downloadDefaultWikivoyage {
doLast {
ant.get(src: 'https://builder.osmand.net/wikivoyage-gen/sqlite/Default_wikivoyage_2.travel.obf', dest: 'assets/Default_wikivoyage.travel.obf', skipexisting: 'true')
}
}
task downloadWorldMiniBasemap {
doLast {
ant.get(src: 'http://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
ant.get(src: 'https://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
}
}
@ -254,7 +268,8 @@ task collectExternalResources {
copyWidgetIconsHdpi,
copyWidgetIconsXhdpi,
copyPoiCategories,
downloadWorldMiniBasemap
downloadWorldMiniBasemap,
downloadDefaultWikivoyage
}
// Legacy core build

2
OsmAnd/res/layout/two_line_with_images_list_item.xml
View file

@ -100,7 +100,7 @@
android:paddingRight="@dimen/bottom_sheet_exit_button_margin"
android:text="@string/buy"
android:textColor="@color/text_color_tab_active_light"
android:visibility="visible" />
android:visibility="gone" />
</LinearLayout>