From 464c8a724758c6b11c2c91d0ba3967d83389b0d5 Mon Sep 17 00:00:00 2001 From: Zhao Gang Date: Wed, 13 Mar 2019 16:33:48 +0800 Subject: [PATCH] [localization] - Remove textField constant value check (#855) --- .../localization/LocalizationPlugin.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java index 4e3a72e16..e9688aeb1 100644 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java @@ -89,12 +89,6 @@ public final class LocalizationPlugin { private static final String STEP_REGEX = "\\[\"zoom\"], "; private static final String STEP_TEMPLATE = "[\"zoom\"], \"\", "; - // legacy token syntax - private static final String TOKEN_TEMPLATE = "{%s}"; - private static final String TOKEN_REGEX = "[{]((name).*?)[}]"; - private static final String TOKEN_NAME = "{name"; - private static final String TOKEN_ABBR = "{abbr}"; - // configuration private final MapboxMap mapboxMap; private MapLocale mapLocale; @@ -229,8 +223,6 @@ public void setMapLanguage(@NonNull MapLocale mapLocale) { } else { convertExpression(mapLocale, layer, textFieldProperty); } - } else { - convertToken(mapLocale, layer, textFieldProperty); } } } @@ -248,15 +240,6 @@ public void setMapLanguage(@NonNull MapLocale mapLocale) { } } - private void convertToken(@NonNull MapLocale mapLocale, Layer layer, PropertyValue textFieldProperty) { - String text = (String) textFieldProperty.getValue(); - if (text != null && (text.contains(TOKEN_NAME) || text.contains(TOKEN_ABBR))) { - layer.setProperties(textField(text.replaceAll( - TOKEN_REGEX, String.format(TOKEN_TEMPLATE, mapLocale.getMapLanguage()) - ))); - } - } - private void convertExpression(@NonNull MapLocale mapLocale, Layer layer, PropertyValue textFieldProperty) { Expression textFieldExpression = textFieldProperty.getExpression(); if (textFieldExpression != null) {