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

merge with master

Browse source
This commit is contained in:
madwasp79 2019-02-18 18:03:51 +02:00
parent 79351d932c
commit adc2ae1158
12 changed files with 77 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd-java/build.gradle
View file

@ -82,18 +82,17 @@ dependencies {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'com.google.code.gson:gson:2.8.2' testImplementation 'com.google.code.gson:gson:2.8.2'
testImplementation 'org.hamcrest:hamcrest-core:1.3' testImplementation 'org.hamcrest:hamcrest-core:1.3'
implementation 'commons-logging:commons-logging:1.2'
implementation group: 'commons-logging', name: 'commons-logging', version: '1.2' implementation 'org.json:json:20171018'
implementation group: 'org.json', name: 'json', version: '20171018'
implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1' implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
implementation 'org.beanshell:bsh-core:2.0b4' implementation 'org.beanshell:bsh-core:2.0b4'
implementation 'org.apache.commons:commons-compress:1.17' implementation 'org.apache.commons:commons-compress:1.17'
implementation 'com.moparisthebest:junidecode:0.1.1' implementation 'com.moparisthebest:junidecode:0.1.1'
implementation 'com.vividsolutions:jts-core:1.14.0' implementation 'com.vividsolutions:jts-core:1.14.0'
implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0' // implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
implementation 'net.sf.kxml:kxml2:2.1.8' implementation 'net.sf.kxml:kxml2:2.1.8'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/kuromoji-core-1.0-SNAPSHOT.jar')
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation files('libs/kuromoji-ipadic-1.0-SNAPSHOT.jar')
} }

BIN
OsmAnd-java/libs/kuromoji-core-1.0-SNAPSHOT.jar Normal file
View file

Binary file not shown.

BIN
OsmAnd-java/libs/kuromoji-ipadic-1.0-SNAPSHOT.jar Normal file
View file

Binary file not shown.

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

@ -152,7 +152,7 @@ public class BinaryMapAddressReaderAdapter {
switch (tag) { switch (tag) {
case 0: case 0:
if (region.enName == null || region.enName.length() == 0) { if (region.enName == null || region.enName.length() == 0) {
region.enName = region.name == null ? "" : TransliterationHelper.getInstance().transliterateText(region.name); region.enName = region.name == null ? "" : TransliterationHelper.getInstance().transliterate(region.name);
} }
return; return;
case OsmandOdb.OsmAndAddressIndex.NAME_FIELD_NUMBER: case OsmandOdb.OsmAndAddressIndex.NAME_FIELD_NUMBER:

6
OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java
View file

@ -435,7 +435,7 @@ public class BinaryMapTransportReaderAdapter {
dataObject.setEnName(stringTable.get(dataObject.getEnName(false).charAt(0))); dataObject.setEnName(stringTable.get(dataObject.getEnName(false).charAt(0)));
} }
if(dataObject.getName().length() > 0 && dataObject.getName("en").length() == 0){ if(dataObject.getName().length() > 0 && dataObject.getName("en").length() == 0){
dataObject.setEnName(TransliterationHelper.getInstance().transliterateText(dataObject.getName())); dataObject.setEnName(TransliterationHelper.getInstance().transliterate(dataObject.getName()));
} }
if(dataObject.getOperator() != null && dataObject.getOperator().length() > 0){ if(dataObject.getOperator() != null && dataObject.getOperator().length() > 0){
dataObject.setOperator(stringTable.get(dataObject.getOperator().charAt(0))); dataObject.setOperator(stringTable.get(dataObject.getOperator().charAt(0)));
@ -547,7 +547,7 @@ public class BinaryMapTransportReaderAdapter {
case 0: case 0:
dataObject.setReferencesToRoutes(req.cacheTypes.toArray()); dataObject.setReferencesToRoutes(req.cacheTypes.toArray());
if(dataObject.getName("en").length() == 0){ if(dataObject.getName("en").length() == 0){
dataObject.setEnName(TransliterationHelper.getInstance().transliterateText(dataObject.getName())); dataObject.setEnName(TransliterationHelper.getInstance().transliterate(dataObject.getName()));
} }
return dataObject; return dataObject;
case OsmandOdb.TransportStop.ROUTES_FIELD_NUMBER : case OsmandOdb.TransportStop.ROUTES_FIELD_NUMBER :
@ -611,7 +611,7 @@ public class BinaryMapTransportReaderAdapter {
switch (tag) { switch (tag) {
case 0: case 0:
if (dataObject.getName("en").length() == 0) { if (dataObject.getName("en").length() == 0) {
dataObject.setEnName(TransliterationHelper.getInstance().transliterateText(dataObject.getName())); dataObject.setEnName(TransliterationHelper.getInstance().transliterate(dataObject.getName()));
} }
if (x != 0 || y != 0) { if (x != 0 || y != 0) {
dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, x, y); dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, x, y);

12
OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
View file

@ -261,7 +261,7 @@ public class RouteDataObject {
} }
String nmDef = names.get(region.nameTypeRule); String nmDef = names.get(region.nameTypeRule);
if(transliterate && nmDef != null && nmDef.length() > 0) { if(transliterate && nmDef != null && nmDef.length() > 0) {
return TransliterationHelper.getInstance().transliterateText(nmDef); return TransliterationHelper.getInstance().transliterate(nmDef);
} }
return nmDef; return nmDef;
} }
@ -295,7 +295,7 @@ public class RouteDataObject {
} }
String refDefault = names.get(region.refTypeRule); String refDefault = names.get(region.refTypeRule);
if(transliterate && refDefault != null && refDefault.length() > 0) { if(transliterate && refDefault != null && refDefault.length() > 0) {
return TransliterationHelper.getInstance().transliterateText(refDefault); return TransliterationHelper.getInstance().transliterate(refDefault);
} }
return refDefault; return refDefault;
} }
@ -358,13 +358,13 @@ public class RouteDataObject {
int k = kt[i]; int k = kt[i];
if(region.routeEncodingRules.size() > k) { if(region.routeEncodingRules.size() > k) {
if(!Algorithms.isEmpty(lang) && destinationTagLangFB.equals(region.routeEncodingRules.get(k).getTag())) { if(!Algorithms.isEmpty(lang) && destinationTagLangFB.equals(region.routeEncodingRules.get(k).getTag())) {
return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterateText(names.get(k)) : names.get(k)); return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterate(names.get(k)) : names.get(k));
} }
if(destinationTagFB.equals(region.routeEncodingRules.get(k).getTag())) { if(destinationTagFB.equals(region.routeEncodingRules.get(k).getTag())) {
return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterateText(names.get(k)) : names.get(k)); return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterate(names.get(k)) : names.get(k));
} }
if(!Algorithms.isEmpty(lang) && destinationTagLang.equals(region.routeEncodingRules.get(k).getTag())) { if(!Algorithms.isEmpty(lang) && destinationTagLang.equals(region.routeEncodingRules.get(k).getTag())) {
return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterateText(names.get(k)) : names.get(k)); return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterate(names.get(k)) : names.get(k));
} }
if(destinationTagDefault.equals(region.routeEncodingRules.get(k).getTag())) { if(destinationTagDefault.equals(region.routeEncodingRules.get(k).getTag())) {
destinationDefault = names.get(k); destinationDefault = names.get(k);
@ -372,7 +372,7 @@ public class RouteDataObject {
} }
} }
if(destinationDefault != null) { if(destinationDefault != null) {
return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterateText(destinationDefault) : destinationDefault); return destRef1 + ((transliterate) ? TransliterationHelper.getInstance().transliterate(destinationDefault) : destinationDefault);
} }
} }
return "".equals(destRef) ? null : destRef; return "".equals(destRef) ? null : destRef;

4
OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
View file

@ -184,7 +184,7 @@ public abstract class MapObject implements Comparable<MapObject> {
return nm; return nm;
} }
if (transliterate) { if (transliterate) {
return TransliterationHelper.getInstance().transliterateText(getName()); return TransliterationHelper.getInstance().transliterate(getName());
// return Junidecode.unidecode(getName()); // return Junidecode.unidecode(getName());
} }
} }
@ -197,7 +197,7 @@ public abstract class MapObject implements Comparable<MapObject> {
if (!Algorithms.isEmpty(enName)) { if (!Algorithms.isEmpty(enName)) {
return this.enName; return this.enName;
} else if (!Algorithms.isEmpty(getName()) && transliterate) { } else if (!Algorithms.isEmpty(getName()) && transliterate) {
return TransliterationHelper.getInstance().transliterateText(getName()); return TransliterationHelper.getInstance().transliterate(getName());
// return Junidecode.unidecode(getName()); // return Junidecode.unidecode(getName());
} }
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$

23
OsmAnd-java/src/main/java/net/osmand/util/TransliterationHelper.java
View file

@ -19,11 +19,12 @@ public class TransliterationHelper {
private static String country = DEFAULT; private static String country = DEFAULT;
private Tokenizer tokenizer; private static Tokenizer tokenizer;
private Map<String, String> katakanaMap = new HashMap<>(); private static Map<String, String> katakanaMap = new HashMap<>();
private TransliterationHelper(){} private TransliterationHelper() {
}
static { static {
try { try {
@ -45,8 +46,8 @@ public class TransliterationHelper {
return country; return country;
} }
public String transliterateText(String text) { public static String transliterate(String text) {
if(tokenizer==null){ if (tokenizer == null) {
tokenizer = new Tokenizer(); tokenizer = new Tokenizer();
} }
switch (country) { switch (country) {
@ -58,12 +59,11 @@ public class TransliterationHelper {
return text; return text;
} }
private String japanese2Romaji(String input) { private static String japanese2Romaji(String text) {
boolean capitalizeWords = true; boolean capitalizeWords = true;
List<Token> tokens = tokenizer.tokenize(text);
List<Token> tokens = tokenizer.tokenize(input);
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (katakanaMap.isEmpty()) { if (katakanaMap.isEmpty()) {
@ -94,8 +94,7 @@ public class TransliterationHelper {
builder.append(romaji.substring(1)); builder.append(romaji.substring(1));
} else { } else {
if (token.getSurface() if (token.getSurface()
.equals(token.getPronunciation())) .equals(token.getPronunciation())) {
{
romaji = romaji.toUpperCase(); romaji = romaji.toUpperCase();
} }
builder.append(romaji); builder.append(romaji);
@ -107,7 +106,7 @@ public class TransliterationHelper {
return builder.toString(); return builder.toString();
} }
private String convertKanaToRomaji(String s) { private static String convertKanaToRomaji(String s) {
StringBuilder t = new StringBuilder(); StringBuilder t = new StringBuilder();
for (int i = 0; i < s.length(); i++) { for (int i = 0; i < s.length(); i++) {
if (i <= s.length() - 2) { if (i <= s.length() - 2) {
@ -132,7 +131,7 @@ public class TransliterationHelper {
return t.toString(); return t.toString();
} }
private void initKanaMap(){ private static void initKanaMap() {
katakanaMap.put("ア", "a"); katakanaMap.put("ア", "a");
katakanaMap.put("イ", "i"); katakanaMap.put("イ", "i");
katakanaMap.put("ウ", "u"); katakanaMap.put("ウ", "u");

97
OsmAnd/build.gradle
View file

@ -373,59 +373,50 @@ task appStart(type: Exec) {
project.logger.warn("Analytics enabled for free version: $analytics") project.logger.warn("Analytics enabled for free version: $analytics")
dependencies { dependencies {
implementation project(path: ':OsmAnd-java', configuration: 'android') implementation project(path: ':OsmAnd-java', configuration: 'android')
if (analytics) { if (analytics) {
implementation 'com.google.firebase:firebase-core:12.0.1' implementation 'com.google.firebase:firebase-core:12.0.1'
implementation 'com.google.firebase:firebase-messaging:12.0.1' implementation 'com.google.firebase:firebase-messaging:12.0.1'
implementation 'com.google.firebase:firebase-iid:12.0.1' implementation 'com.google.firebase:firebase-iid:12.0.1'
implementation 'com.google.firebase:firebase-config:12.0.1' implementation 'com.google.firebase:firebase-config:12.0.1'
implementation 'com.facebook.android:facebook-android-sdk:4.31.0' implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
} }
implementation 'com.android.support:multidex:1.0.1' implementation 'com.android.support:multidex:1.0.1'
implementation 'com.android.support:gridlayout-v7:27.1.1' implementation 'com.android.support:gridlayout-v7:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1' implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:customtabs:27.1.1' implementation 'com.android.support:customtabs:27.1.1'
implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs') implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
implementation 'commons-logging:commons-logging:1.2'
implementation group: 'commons-logging', name: 'commons-logging', version: '1.2' implementation 'commons-codec:commons-codec:1.11'
implementation 'commons-codec:commons-codec:1.11' implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1' implementation 'org.beanshell:bsh-core:2.0b4'
implementation 'org.beanshell:bsh-core:2.0b4' implementation 'org.apache.commons:commons-compress:1.17'
implementation 'org.apache.commons:commons-compress:1.17' implementation 'com.moparisthebest:junidecode:0.1.1'
implementation 'com.moparisthebest:junidecode:0.1.1' implementation 'org.immutables:gson:2.5.0'
implementation 'org.immutables:gson:2.5.0' implementation 'com.vividsolutions:jts-core:1.14.0'
implementation 'com.vividsolutions:jts-core:1.14.0' implementation 'com.squareup.picasso:picasso:2.71828'
// JS core
implementation 'com.squareup.picasso:picasso:2.71828' implementation 'org.mozilla:rhino:1.7.9'
// JS core // size restrictions
implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9' // implementation 'com.ibm.icu:icu4j:50.1'
// implementation 'net.sf.trove4j:trove4j:3.0.3'
qtcoreImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
qtcoredebugImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
// size restrictions qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
// implementation 'com.ibm.icu:icu4j:50.1' qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
// implementation 'net.sf.trove4j:trove4j:3.0.3' qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
qtcoreImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs') implementation('com.getkeepsafe.taptargetview:taptargetview:1.12.0') {
qtcoredebugImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs') exclude group: 'com.android.support'
}
legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" implementation('com.github.HITGIF:TextFieldBoxes:1.3.5') {
qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" exclude group: 'com.android.support'
qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" }
qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
exclude group: 'com.android.support'
}
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
implementation ("com.github.HITGIF:TextFieldBoxes:1.3.5"){
exclude group: 'com.android.support'
}
implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
} }
if(analytics) { if(analytics) {
println "Apply GMS plugin" println "Apply GMS plugin"

4
OsmAnd/src/net/osmand/plus/poi/NominatimPoiFilter.java
View file

@ -137,7 +137,7 @@ public class NominatimPoiFilter extends PoiUIFilter {
a.setId(Long.parseLong(parser.getAttributeValue("", "place_id"))); //$NON-NLS-1$ //$NON-NLS-2$ a.setId(Long.parseLong(parser.getAttributeValue("", "place_id"))); //$NON-NLS-1$ //$NON-NLS-2$
String name = parser.getAttributeValue("", "display_name"); //$NON-NLS-1$//$NON-NLS-2$ String name = parser.getAttributeValue("", "display_name"); //$NON-NLS-1$//$NON-NLS-2$
a.setName(name); a.setName(name);
a.setEnName(TransliterationHelper.getInstance().transliterateText(getName())); a.setEnName(TransliterationHelper.getInstance().transliterate(getName()));
a.setSubType(parser.getAttributeValue("", "type")); //$NON-NLS-1$//$NON-NLS-2$ a.setSubType(parser.getAttributeValue("", "type")); //$NON-NLS-1$//$NON-NLS-2$
PoiType pt = poiTypes.getPoiTypeByKey(a.getSubType()); PoiType pt = poiTypes.getPoiTypeByKey(a.getSubType());
a.setType(pt != null ? pt.getCategory() : poiTypes.getOtherPoiCategory()); a.setType(pt != null ? pt.getCategory() : poiTypes.getOtherPoiCategory());
@ -153,7 +153,7 @@ public class NominatimPoiFilter extends PoiUIFilter {
String name = parser.getText(); String name = parser.getText();
if (name != null) { if (name != null) {
a.setName(name); a.setName(name);
a.setEnName(TransliterationHelper.getInstance().transliterateText(getName())); a.setEnName(TransliterationHelper.getInstance().transliterate(getName()));
} }
} }
} }

2
OsmAnd/src/net/osmand/plus/render/TextRenderer.java
View file

@ -241,7 +241,7 @@ public class TextRenderer {
TextDrawInfo text = rc.textToDraw.get(i); TextDrawInfo text = rc.textToDraw.get(i);
if (text.text != null && text.text.length() > 0) { if (text.text != null && text.text.length() > 0) {
if (preferredLocale.length() > 0) { if (preferredLocale.length() > 0) {
text.text = TransliterationHelper.getInstance().transliterateText(text.text); text.text = TransliterationHelper.getInstance().transliterate(text.text);
} }

2
gradle.properties
View file

@ -6,7 +6,7 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# #
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit