From 3b224d21fc2fd1b1aaa9de04887fc6db726ffbf4 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Tue, 26 Sep 2017 19:13:58 +0300
Subject: [PATCH] Extrusions default height, fix #409

---
 resources/rendertheme.xsd                                  | 2 ++
 vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java | 4 +---
 vtm/src/org/oscim/theme/styles/ExtrusionStyle.java         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/rendertheme.xsd b/resources/rendertheme.xsd
index 906b3cde..f8025750 100644
--- a/resources/rendertheme.xsd
+++ b/resources/rendertheme.xsd
@@ -236,6 +236,8 @@
         <xs:attribute name="line-color" type="tns:color" use="optional" />
         <xs:attribute name="side-color" type="tns:color" use="required" />
         <xs:attribute name="top-color" type="tns:color" use="required" />
+        <!-- 12m default -->
+        <xs:attribute name="default-height" default="12" type="xs:positiveInteger" use="optional" />
     </xs:complexType>
 
     <!-- match elements -->
diff --git a/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java b/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java
index 49eed862..3c3bbfc2 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java
@@ -42,7 +42,6 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook {
 
     private final static boolean POST_AA = false;
     public static boolean TRANSLUCENT = true;
-    public static int DEFAULT_HEIGHT = 12;
 
     private static final Object BUILDING_DATA = BuildingLayer.class.getName();
 
@@ -86,9 +85,8 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook {
         if (v != null)
             minHeight = (int) Float.parseFloat(v);
 
-        /* 12m default */
         if (height == 0)
-            height = DEFAULT_HEIGHT * 100;
+            height = extrusion.defaultHeight * 100;
 
         ExtrusionBuckets ebs = get(tile);
 
diff --git a/vtm/src/org/oscim/theme/styles/ExtrusionStyle.java b/vtm/src/org/oscim/theme/styles/ExtrusionStyle.java
index c56fa2db..79747227 100644
--- a/vtm/src/org/oscim/theme/styles/ExtrusionStyle.java
+++ b/vtm/src/org/oscim/theme/styles/ExtrusionStyle.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -154,7 +154,7 @@ public class ExtrusionStyle extends RenderStyle<ExtrusionStyle> {
             colorSide = Color.TRANSPARENT;
             colorTop = Color.TRANSPARENT;
             colorLine = Color.TRANSPARENT;
-            defaultHeight = 0;
+            defaultHeight = 12; // 12m default
             return self();
         }