From ecf1cf2bfd0cfa95a3dcc6e60ebe68e47798c516 Mon Sep 17 00:00:00 2001 From: Langston Smith Date: Mon, 2 Jul 2018 20:15:36 -0700 Subject: [PATCH 1/4] added japanese and korean --- .../plugins/localization/MapLocale.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java index 600e5235e..ab2415b51 100644 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java @@ -90,9 +90,19 @@ public final class MapLocale { */ public static final String SIMPLIFIED_CHINESE = "name_zh-Hans"; + /** + * Japanese (if available, otherwise same as name) + */ + public static final String JAPANESE = "name_ja"; + + /** + * Korean (if available, otherwise same as name) + */ + public static final String KOREAN = "name_ko"; + @Retention(SOURCE) - @StringDef( {LOCAL_NAME, ENGLISH, FRENCH, SIMPLIFIED_CHINESE, ARABIC, SPANISH, GERMAN, PORTUGUESE, - RUSSIAN, CHINESE}) + @StringDef({LOCAL_NAME, ENGLISH, FRENCH, SIMPLIFIED_CHINESE, ARABIC, SPANISH, GERMAN, PORTUGUESE, + RUSSIAN, CHINESE, JAPANESE, KOREAN}) public @interface Languages { } @@ -111,63 +121,54 @@ public final class MapLocale { * UK Bounding Box extracted from Open Street Map */ static final LatLngBounds UK_BBOX = new LatLngBounds.Builder() - .include(new LatLng(59.360249, -8.623555)) .include(new LatLng(49.906193, 1.759)).build(); /** * Canada Bounding Box extracted from Open Street Map */ static final LatLngBounds CANADA_BBOX = new LatLngBounds.Builder() - .include(new LatLng(83.110626, -141.0)) .include(new LatLng(41.67598, -52.636291)).build(); /** * China Bounding Box extracted from Open Street Map */ static final LatLngBounds CHINA_BBOX = new LatLngBounds.Builder() - .include(new LatLng(53.56086, 73.557693)) .include(new LatLng(15.775416, 134.773911)).build(); /** * Germany Bounding Box extracted from Open Street Map */ static final LatLngBounds GERMANY_BBOX = new LatLngBounds.Builder() - .include(new LatLng(55.055637, 5.865639)) .include(new LatLng(47.275776, 15.039889)).build(); /** * Korea Bounding Box extracted from Open Street Map */ static final LatLngBounds KOREA_BBOX = new LatLngBounds.Builder() - .include(new LatLng(38.612446, 125.887108)) .include(new LatLng(33.190945, 129.584671)).build(); /** * Japan Bounding Box extracted from Open Street Map */ static final LatLngBounds JAPAN_BBOX = new LatLngBounds.Builder() - .include(new LatLng(45.52314, 122.93853)) .include(new LatLng(24.249472, 145.820892)).build(); /** * France Bounding Box extracted from Open Street Map */ static final LatLngBounds FRANCE_BBOX = new LatLngBounds.Builder() - .include(new LatLng(51.092804, -5.142222)) .include(new LatLng(41.371582, 9.561556)).build(); /** * Italy Bounding Box extracted from Open Street Map */ static final LatLngBounds ITALY_BBOX = new LatLngBounds.Builder() - .include(new LatLng(47.095196, 6.614889)) .include(new LatLng(36.652779, 18.513445)).build(); /** * Peoples Republic of China Bounding Box extracted from Open Street Map */ static final LatLngBounds PRC_BBOX = new LatLngBounds.Builder() - .include(new LatLng(53.56086, 73.557693)) .include(new LatLng(15.775416, 134.773911)).build(); /* From 69961f32b2c5270400dc03e0dab57ac50c1f1596 Mon Sep 17 00:00:00 2001 From: Langston Smith Date: Mon, 2 Jul 2018 21:00:38 -0700 Subject: [PATCH 2/4] more additions --- .../plugins/testapp/activity/LocalizationActivity.java | 6 ++++++ app/src/main/res/menu/menu_languages.xml | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/LocalizationActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/LocalizationActivity.java index 78040dc50..724f0fa06 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/LocalizationActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/LocalizationActivity.java @@ -164,6 +164,12 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.arabic: localizationPlugin.setMapLanguage(MapLocale.ARABIC); return true; + case R.id.japanese: + localizationPlugin.setMapLanguage(MapLocale.JAPANESE); + return true; + case R.id.korean: + localizationPlugin.setMapLanguage(MapLocale.KOREAN); + return true; case android.R.id.home: finish(); return true; diff --git a/app/src/main/res/menu/menu_languages.xml b/app/src/main/res/menu/menu_languages.xml index a9f780f63..0398c1972 100644 --- a/app/src/main/res/menu/menu_languages.xml +++ b/app/src/main/res/menu/menu_languages.xml @@ -48,5 +48,14 @@ android:title="Arabic" app:showAsAction="never"/> + + + \ No newline at end of file From fbd23efd4476a038804e3d8d32f078edf574776d Mon Sep 17 00:00:00 2001 From: langsmith Date: Tue, 3 Jul 2018 15:07:08 -0700 Subject: [PATCH 3/4] added missing boundingbox lines --- .../mapbox/mapboxsdk/plugins/localization/MapLocale.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java index ab2415b51..97350419d 100644 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java @@ -121,36 +121,42 @@ public final class MapLocale { * UK Bounding Box extracted from Open Street Map */ static final LatLngBounds UK_BBOX = new LatLngBounds.Builder() + .include(new LatLng(59.360249, -8.623555)) .include(new LatLng(49.906193, 1.759)).build(); /** * Canada Bounding Box extracted from Open Street Map */ static final LatLngBounds CANADA_BBOX = new LatLngBounds.Builder() + .include(new LatLng(83.110626, -141.0)) .include(new LatLng(41.67598, -52.636291)).build(); /** * China Bounding Box extracted from Open Street Map */ static final LatLngBounds CHINA_BBOX = new LatLngBounds.Builder() + .include(new LatLng(53.56086, 73.557693)) .include(new LatLng(15.775416, 134.773911)).build(); /** * Germany Bounding Box extracted from Open Street Map */ static final LatLngBounds GERMANY_BBOX = new LatLngBounds.Builder() + .include(new LatLng(55.055637, 5.865639)) .include(new LatLng(47.275776, 15.039889)).build(); /** * Korea Bounding Box extracted from Open Street Map */ static final LatLngBounds KOREA_BBOX = new LatLngBounds.Builder() + .include(new LatLng(38.612446, 125.887108)) .include(new LatLng(33.190945, 129.584671)).build(); /** * Japan Bounding Box extracted from Open Street Map */ static final LatLngBounds JAPAN_BBOX = new LatLngBounds.Builder() + .include(new LatLng(45.52314, 122.93853)) .include(new LatLng(24.249472, 145.820892)).build(); /** @@ -163,12 +169,14 @@ public final class MapLocale { * Italy Bounding Box extracted from Open Street Map */ static final LatLngBounds ITALY_BBOX = new LatLngBounds.Builder() + .include(new LatLng(47.095196, 6.614889)) .include(new LatLng(36.652779, 18.513445)).build(); /** * Peoples Republic of China Bounding Box extracted from Open Street Map */ static final LatLngBounds PRC_BBOX = new LatLngBounds.Builder() + .include(new LatLng(53.56086, 73.557693)) .include(new LatLng(15.775416, 134.773911)).build(); /* From 46e93524018cccb009ab6467d02763ba30a6c471 Mon Sep 17 00:00:00 2001 From: langsmith Date: Tue, 3 Jul 2018 15:07:32 -0700 Subject: [PATCH 4/4] added france bounding box line --- .../com/mapbox/mapboxsdk/plugins/localization/MapLocale.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java index 97350419d..50e462e5e 100644 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java @@ -163,6 +163,7 @@ public final class MapLocale { * France Bounding Box extracted from Open Street Map */ static final LatLngBounds FRANCE_BBOX = new LatLngBounds.Builder() + .include(new LatLng(51.092804, -5.142222)) .include(new LatLng(41.371582, 9.561556)).build(); /**