Mapsforge themes parser united with VTM opensciencemap#100

hjanetzek · Jul 5, 2018 · f2bf6cd · f2bf6cd
1 parent 40f2910
commit f2bf6cd
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 1,405 deletions.
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,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2018 devemux86
  * Copyright 2017 Longri
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -18,8 +18,6 @@
 
 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;
@@ -41,11 +39,7 @@ public boolean accept(File file) {
 
         try {
             ThemeFile theme = new ExternalRenderTheme(file.getAbsolutePath());
-            DefaultHandler renderThemeHandler;
-            if (ThemeUtils.isMapsforgeTheme(theme))
-                renderThemeHandler = new XmlMapsforgeThemeBuilder(theme);
-            else
-                renderThemeHandler = new XmlThemeBuilder(theme);
+            DefaultHandler renderThemeHandler = new XmlThemeBuilder(theme);
             XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
             xmlReader.setContentHandler(renderThemeHandler);
             xmlReader.parse(new InputSource(theme.getRenderThemeAsStream()));

diff --git a/vtm/src/org/oscim/theme/ThemeLoader.java b/vtm/src/org/oscim/theme/ThemeLoader.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2018 devemux86
  * Copyright 2017 Longri
  * Copyright 2017 Andrey Novikov
  *
@@ -46,11 +46,7 @@ public static IRenderTheme load(ThemeFile theme) throws ThemeException {
     }
 
     public static IRenderTheme load(ThemeFile theme, ThemeCallback themeCallback) throws ThemeException {
-        IRenderTheme t;
-        if (theme.isMapsforgeTheme())
-            t = Parameters.TEXTURE_ATLAS ? XmlMapsforgeAtlasThemeBuilder.read(theme, themeCallback) : XmlMapsforgeThemeBuilder.read(theme, themeCallback);
-        else
-            t = Parameters.TEXTURE_ATLAS ? XmlAtlasThemeBuilder.read(theme, themeCallback) : XmlThemeBuilder.read(theme, themeCallback);
+        IRenderTheme t = Parameters.TEXTURE_ATLAS ? XmlAtlasThemeBuilder.read(theme, themeCallback) : XmlThemeBuilder.read(theme, themeCallback);
         if (t != null)
             t.scaleTextSize(CanvasAdapter.getScale() * CanvasAdapter.textScale);
         return t;

diff --git a/vtm/src/org/oscim/theme/XmlAtlasThemeBuilder.java b/vtm/src/org/oscim/theme/XmlAtlasThemeBuilder.java
@@ -112,7 +112,7 @@ public XmlAtlasThemeBuilder(ThemeFile theme, ThemeCallback themeCallback,
 
     @Override
     RenderTheme createTheme(Rule[] rules) {
-        return new AtlasRenderTheme(mMapBackground, mTextScale, rules, mLevels, regionMap, atlasList);
+        return new AtlasRenderTheme(mMapBackground, mTextScale, rules, mLevels, mMapsforgeTheme, regionMap, atlasList);
     }
 
     @Override

diff --git a/vtm/src/org/oscim/theme/XmlMapsforgeAtlasThemeBuilder.java b/vtm/src/org/oscim/theme/XmlMapsforgeAtlasThemeBuilder.java