Add icons to taginfo project file

MarcusWolschon · Sep 28, 2023 · d815a15 · d815a15
1 parent 8f6d404
commit d815a15
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/de/blau/android/contract/Urls.java b/src/main/java/de/blau/android/contract/Urls.java
@@ -49,4 +49,6 @@ private Urls() {
     public static final String EGM96 = "https://github.com/simonpoole/egm96/raw/master/src/main/resources/EGM96.dat";
 
     public static final String GITHUB = "https://github.com/";
+
+    public static final String REMOTE_ICON_LOCATION = "https://simonpoole.github.io/beautified-JOSM-preset/icons/png/";
 }
diff --git a/src/main/java/de/blau/android/presets/PresetItem.java b/src/main/java/de/blau/android/presets/PresetItem.java
@@ -20,6 +20,7 @@
 import org.xmlpull.v1.XmlSerializer;
 
 import android.content.Context;
+import android.net.Uri;
 import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
@@ -87,7 +88,7 @@ public class PresetItem extends PresetElement {
      * Count of labels for naming
      */
     private int labelCounter = 0;
-    
+
     /**
      * Optional template for creating/formatting a name
      */
@@ -918,7 +919,7 @@ public String getNameTemplate() {
     public void setNameTemplate(@Nullable String nameTemplate) {
         this.nameTemplate = nameTemplate;
     }
-    
+
     /**
      * @return the fixed tags belonging to this item (unmodifiable)
      */
@@ -1299,8 +1300,17 @@ private static void appendEol(@NonNull StringBuilder jsonString) {
      */
     @NonNull
     private String tagToJSON(@NonNull String presetName, @NonNull String key, @Nullable StringWithDescription value) {
-        StringBuilder result = new StringBuilder(
-                "{\"description\":\"" + presetName + "\",\"key\": \"" + key + "\"" + (value == null ? "" : ",\"value\": \"" + value.getValue() + "\""));
+        StringBuilder result = new StringBuilder("{\"description\":\"" + presetName);
+        try {
+            Uri icon = Uri.parse(getIconpath());
+            final String lastPathSegment = icon.getLastPathSegment();
+            if (de.blau.android.util.Util.notEmpty(lastPathSegment)) {
+                result.append("\",\"icon_url\":" + "\"" + Urls.REMOTE_ICON_LOCATION + lastPathSegment);
+            }
+        } catch (Exception ex) {
+            // do nothing
+        }
+        result.append("\",\"key\": \"" + key + "\"" + (value == null ? "" : ",\"value\": \"" + value.getValue() + "\""));
         result.append(",\"object_types\": [");
         boolean first = true;
         if (appliesToNode) {