Mapsforge themes compatibility (#388) opensciencemap#100

Longri · devemux86 · commit b695d43fee05 · 2017-09-03T18:02:35.000+03:00
diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
@@ -61,6 +61,9 @@
         <activity
             android:name=".MapsforgeMapActivity$MapFilePicker"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".MapsforgeMapActivity$ThemeFilePicker"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MapsforgeStyleActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
diff --git a/vtm-android-example/res/menu/theme_menu.xml b/vtm-android-example/res/menu/theme_menu.xml
@@ -20,6 +20,9 @@
         <item
             android:id="@+id/theme_newtron"
             android:title="@string/theme_newtron" />
+        <item
+            android:id="@+id/theme_load"
+            android:title="@string/theme_load" />
     </group>
 
     <item
diff --git a/vtm-android-example/res/values/strings.xml b/vtm-android-example/res/values/strings.xml
@@ -17,5 +17,6 @@
     <string name="style_1">Show nature</string>
     <string name="style_2">Hide nature</string>
     <string name="menu_gridlayer">Grid</string>
+    <string name="theme_load">load theme extern</string>
 
 </resources>
diff --git a/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java b/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
  * Copyright 2016 devemux86
+ * Copyright 2017 Longri
  *
  * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -17,12 +18,16 @@
 
 import org.oscim.theme.ExternalRenderTheme;
 import org.oscim.theme.ThemeFile;
+import org.oscim.theme.ThemeUtils;
+import org.oscim.theme.XmlMapsforgeThemeBuilder;
 import org.oscim.theme.XmlThemeBuilder;
 import org.oscim.tiling.TileSource.OpenResult;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
 
 import java.io.File;
+import java.io.FileInputStream;
 
 import javax.xml.parsers.SAXParserFactory;
 
@@ -34,9 +39,15 @@ public final class ValidRenderTheme implements ValidFileFilter {
 
     @Override
     public boolean accept(File file) {
+
         try {
             ThemeFile theme = new ExternalRenderTheme(file.getAbsolutePath());
-            XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder(theme);
+            DefaultHandler renderThemeHandler;
+            if(ThemeUtils.isMapsforgeTheme(new FileInputStream(file))) {
+                renderThemeHandler = new XmlMapsforgeThemeBuilder(theme);
+            }else{
+                renderThemeHandler = new XmlThemeBuilder(theme);
+            }
             XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
             xmlReader.setContentHandler(renderThemeHandler);
             xmlReader.parse(new InputSource(theme.getRenderThemeAsStream()));
diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2014 Hannes Janetzek
  * Copyright 2016-2017 devemux86
+ * Copyright 2017 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -25,6 +26,7 @@
 import org.oscim.android.filepicker.FilePicker;
 import org.oscim.android.filepicker.FilterByFileExtension;
 import org.oscim.android.filepicker.ValidMapFile;
+import org.oscim.android.filepicker.ValidRenderTheme;
 import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
 import org.oscim.layers.TileGridLayer;
@@ -38,12 +40,14 @@
 import org.oscim.scalebar.MapScaleBar;
 import org.oscim.scalebar.MapScaleBarLayer;
 import org.oscim.scalebar.MetricUnitAdapter;
+import org.oscim.theme.ExternalRenderTheme;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.source.mapfile.MapFileTileSource;
 import org.oscim.tiling.source.mapfile.MapInfo;
 
 public class MapsforgeMapActivity extends MapActivity {
     private static final int SELECT_MAP_FILE = 0;
+    private static final int SELECT_THEME_FILE = 1;
 
     private TileGridLayer mGridLayer;
     private DefaultMapScaleBar mMapScaleBar;
@@ -71,6 +75,13 @@ public MapFilePicker() {
         }
     }
 
+    public static class ThemeFilePicker extends FilePicker {
+        public ThemeFilePicker() {
+            setFileDisplayFilter(new FilterByFileExtension(".xml"));
+            setFileSelectFilter(new ValidRenderTheme());
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.theme_menu, menu);
@@ -106,6 +117,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 item.setChecked(true);
                 return true;
 
+            case R.id.theme_load:
+                startActivityForResult(new Intent(MapsforgeMapActivity.this, ThemeFilePicker.class),
+                        SELECT_THEME_FILE);
+                return true;
+
             case R.id.gridlayer:
                 if (item.isChecked()) {
                     item.setChecked(false);
@@ -163,6 +179,20 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
 
                 mPrefs.clear();
             }
+        } else if (requestCode == SELECT_THEME_FILE) {
+            if (resultCode != RESULT_OK || intent == null || intent.getStringExtra(FilePicker.SELECTED_FILE) == null) {
+                finish();
+                return;
+            }
+
+            String themePath = intent.getStringExtra(FilePicker.SELECTED_FILE);
+
+            ExternalRenderTheme externalRenderTheme = new ExternalRenderTheme(themePath);
+            try {
+                mMap.setTheme(externalRenderTheme, true);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidCanvas.java b/vtm-android/src/org/oscim/android/canvas/AndroidCanvas.java
@@ -21,6 +21,7 @@
 
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.RectF;
 
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
@@ -96,4 +97,12 @@ public int getHeight() {
     public int getWidth() {
         return canvas.getWidth();
     }
+
+    @Override
+    public void fillRectangle(int x, int y, int width, int height, int color) {
+        RectF rec = new RectF(x, y, x + width, y + height);
+        android.graphics.Paint paint = new android.graphics.Paint();
+        paint.setColor(color);
+        canvas.drawRect(rec, paint);
+    }
 }
diff --git a/vtm-desktop/src/org/oscim/awt/AwtCanvas.java b/vtm-desktop/src/org/oscim/awt/AwtCanvas.java
@@ -183,12 +183,7 @@ public void drawLine(float x1, float y1, float x2, float y2, Paint paint) {
 
     @Override
     public void fillColor(int color) {
-        java.awt.Color awtColor = color == Color.TRANSPARENT ? TRANSPARENT : new java.awt.Color(color);
-        Composite originalComposite = this.canvas.getComposite();
-        this.canvas.setComposite(AlphaComposite.getInstance(color == Color.TRANSPARENT ? AlphaComposite.CLEAR : AlphaComposite.SRC_OVER));
-        this.canvas.setColor(awtColor);
-        this.canvas.fillRect(0, 0, getWidth(), getHeight());
-        this.canvas.setComposite(originalComposite);
+        fillRectangle(0, 0, getWidth(), getHeight(), color);
     }
 
     @Override
@@ -200,4 +195,14 @@ public int getHeight() {
     public int getWidth() {
         return this.bitmap != null ? this.bitmap.getWidth() : 0;
     }
+
+    @Override
+    public void fillRectangle(int x, int y, int width, int height, int color) {
+        java.awt.Color awtColor = color == Color.TRANSPARENT ? TRANSPARENT : new java.awt.Color(color);
+        Composite originalComposite = this.canvas.getComposite();
+        this.canvas.setComposite(AlphaComposite.getInstance(color == Color.TRANSPARENT ? AlphaComposite.CLEAR : AlphaComposite.SRC_OVER));
+        this.canvas.setColor(awtColor);
+        this.canvas.fillRect(x, y, width, height);
+        this.canvas.setComposite(originalComposite);
+    }
 }
diff --git a/vtm-ios/src/org/oscim/ios/backend/IosCanvas.java b/vtm-ios/src/org/oscim/ios/backend/IosCanvas.java
@@ -159,4 +159,12 @@ public int getHeight() {
     public int getWidth() {
         return this.cgBitmapContext != null ? (int) this.cgBitmapContext.getWidth() : 0;
     }
+
+    @Override
+    public void fillRectangle(int x, int y, int width, int height, int color) {
+        CGRect rect = new CGRect(x, y, width, height);
+        setFillColor(this.cgBitmapContext, (color));
+        this.cgBitmapContext.setBlendMode(CGBlendMode.Normal);
+        this.cgBitmapContext.fillRect(rect);
+    }
 }
diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/logging/BaseAppender.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/logging/BaseAppender.java
@@ -51,13 +51,18 @@ public abstract class BaseAppender extends AppenderBase<ILoggingEvent> {
     }
 
     @Override
-    protected void append(ILoggingEvent eventObject) {
-        if (eventObject != null && canLogClass(eventObject.getLoggerName())) {
-            stringBuilder.append(doLayout(eventObject));
-            String areaText = stringBuilder.toString();
-            this.textArea.setText(areaText);
-            this.textArea.setCaretPosition(areaText.length());
-        }
+    protected void append(final ILoggingEvent eventObject) {
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                if (eventObject != null && canLogClass(eventObject.getLoggerName())) {
+                    textArea.append(doLayout(eventObject));
+                    textArea.setCaretPosition(textArea.getDocument().getLength());
+                }
+            }
+        });
+        thread.start();
+
 //TODO set Highlight for LogLevel [WARN], [ERROR]
     }
 
diff --git a/vtm-web/src/org/oscim/gdx/client/GwtCanvas.java b/vtm-web/src/org/oscim/gdx/client/GwtCanvas.java
@@ -2,6 +2,7 @@
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016-2017 devemux86
  * Copyright 2017 nebular
+ * Copyright 2017 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -124,4 +125,9 @@ public int getHeight() {
     public int getWidth() {
         return this.bitmap != null ? this.bitmap.getWidth() : 0;
     }
+
+    @Override
+    public void fillRectangle(int x, int y, int width, int height, int color) {
+        // TODO
+    }
 }
diff --git a/vtm/resources/assets/shaders/linetex_layer_tex.glsl b/vtm/resources/assets/shaders/linetex_layer_tex.glsl
@@ -43,10 +43,15 @@ uniform sampler2D tex;
 uniform float u_mode;
 void
 main(){
-  if (u_mode == 1.0) {
-    vec4 c=texture2D(tex,vec2(abs(mod(v_st.s+1.0,2.0)),(v_st.t+1.0)*0.5));
+  if (u_mode >= 1.0) {
+
+    float step= 2.0;
+    if (u_mode == 3.0){// dashed texture
+        step =1.0;
+    }
+    vec4 c=texture2D(tex,vec2(abs(mod(v_st.s+1.0,step)),(v_st.t+1.0)*0.5));
     float fuzz=fwidth(c.a);
-    gl_FragColor=(c * u_color) *smoothstep(0.5-fuzz,0.5+fuzz,c.a);
+    gl_FragColor=(c * u_color) * smoothstep(0.5-fuzz,0.5+fuzz,c.a);
   }
   else {
     /* distance on perpendicular to the line */
diff --git a/vtm/src/org/oscim/backend/canvas/Canvas.java b/vtm/src/org/oscim/backend/canvas/Canvas.java
@@ -58,4 +58,6 @@ public interface Canvas {
     int getHeight();
 
     int getWidth();
+
+    void fillRectangle(int x, int y, int width, int height, int color);
 }
diff --git a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
@@ -359,7 +359,7 @@ public static RenderBucket draw(RenderBucket b, GLViewport v,
                 LineTexBucket lb = (LineTexBucket) b;
                 LineStyle line = lb.line.current();
 
-                gl.uniform1f(shader.uMode, line.texture != null ? 1 : 0);
+                gl.uniform1f(shader.uMode, line.dashTexture? 3 : line.texture != null ? 1 : 0);
 
                 if (line.texture != null)
                     line.texture.bind();
diff --git a/vtm/src/org/oscim/theme/ThemeLoader.java b/vtm/src/org/oscim/theme/ThemeLoader.java
@@ -18,11 +18,21 @@
  */
 package org.oscim.theme;
 
+
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.theme.IRenderTheme.ThemeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
 
 public class ThemeLoader {
 
+    private static final Logger log = LoggerFactory.getLogger(ThemeLoader.class);
+
     public static boolean USE_ATLAS;
     public static boolean POT_TEXTURES;
 
@@ -46,8 +56,21 @@ public static IRenderTheme load(ThemeFile theme) throws ThemeException {
         return load(theme, null);
     }
 
+
+
     public static IRenderTheme load(ThemeFile theme, ThemeCallback themeCallback) throws ThemeException {
-        IRenderTheme t = USE_ATLAS ? XmlAtlasThemeBuilder.read(theme, themeCallback) : XmlThemeBuilder.read(theme, themeCallback);
+        IRenderTheme t = null;
+
+        try {
+            if(ThemeUtils.isMapsforgeTheme(theme.getRenderThemeAsStream())){
+                t = USE_ATLAS ? XmlMapsforgeAtlasThemeBuilder.read(theme, themeCallback) : XmlMapsforgeThemeBuilder.read(theme, themeCallback);
+            }else{
+                t = USE_ATLAS ? XmlAtlasThemeBuilder.read(theme, themeCallback) : XmlThemeBuilder.read(theme, themeCallback);
+            }
+        } catch (IOException | ParserConfigurationException | SAXException e) {
+            e.printStackTrace();
+        }
+
         if (t != null)
             t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1));
         return t;
diff --git a/vtm/src/org/oscim/theme/ThemeUtils.java b/vtm/src/org/oscim/theme/ThemeUtils.java
diff --git a/vtm/src/org/oscim/theme/XmlMapsforgeAtlasThemeBuilder.java b/vtm/src/org/oscim/theme/XmlMapsforgeAtlasThemeBuilder.java
diff --git a/vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java b/vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java
diff --git a/vtm/src/org/oscim/theme/styles/LineStyle.java b/vtm/src/org/oscim/theme/styles/LineStyle.java

Original file line number	Diff line number	Diff line change
`@@ -159,4 +159,12 @@ public int getHeight() {`
`159`	`159`	`public int getWidth() {`
`160`	`160`	`return this.cgBitmapContext != null ? (int) this.cgBitmapContext.getWidth() : 0;`
`161`	`161`	`}`
	`162`	`+`
	`163`	`+ @Override`
	`164`	`+ public void fillRectangle(int x, int y, int width, int height, int color) {`
	`165`	`+ CGRect rect = new CGRect(x, y, width, height);`
	`166`	`+ setFillColor(this.cgBitmapContext, (color));`
	`167`	`+ this.cgBitmapContext.setBlendMode(CGBlendMode.Normal);`
	`168`	`+ this.cgBitmapContext.fillRect(rect);`
	`169`	`+ }`
`162`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`* Copyright 2013 Hannes Janetzek`
`3`	`3`	`* Copyright 2016-2017 devemux86`
`4`	`4`	`* Copyright 2017 nebular`
	`5`	`+ * Copyright 2017 Longri`
`5`	`6`	`*`
`6`	`7`	`* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).`
`7`	`8`	`*`
`@@ -124,4 +125,9 @@ public int getHeight() {`
`124`	`125`	`public int getWidth() {`
`125`	`126`	`return this.bitmap != null ? this.bitmap.getWidth() : 0;`
`126`	`127`	`}`
	`128`	`+`
	`129`	`+ @Override`
	`130`	`+ public void fillRectangle(int x, int y, int width, int height, int color) {`
	`131`	`+ // TODO`
	`132`	`+ }`
`127`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,6 @@ public interface Canvas {`
`58`	`58`	`int getHeight();`
`59`	`59`
`60`	`60`	`int getWidth();`
	`61`	`+`
	`62`	`+ void fillRectangle(int x, int y, int width, int height, int color);`
`61`	`63`	`}`