xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extrusions default height, fix #409

Browse Source
This commit is contained in:
Emux
2017-09-26 19:13:58 +03:00
parent 0d7d75ccb5
commit 3b224d21fc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/rendertheme.xsd
View File

@@ -236,6 +236,8 @@
<xs:attribute name="line-color" type="tns:color" use="optional" /> <xs:attribute name="line-color" type="tns:color" use="optional" />
<xs:attribute name="side-color" type="tns:color" use="required" /> <xs:attribute name="side-color" type="tns:color" use="required" />
<xs:attribute name="top-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> </xs:complexType>
<!-- match elements --> <!-- match elements -->

4
vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java
View File

@@ -42,7 +42,6 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook {
private final static boolean POST_AA = false; private final static boolean POST_AA = false;
public static boolean TRANSLUCENT = true; public static boolean TRANSLUCENT = true;
public static int DEFAULT_HEIGHT = 12;
private static final Object BUILDING_DATA = BuildingLayer.class.getName(); private static final Object BUILDING_DATA = BuildingLayer.class.getName();
@@ -86,9 +85,8 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook {
if (v != null) if (v != null)
minHeight = (int) Float.parseFloat(v); minHeight = (int) Float.parseFloat(v);
/* 12m default */
if (height == 0) if (height == 0)
height = DEFAULT_HEIGHT * 100; height = extrusion.defaultHeight * 100;
ExtrusionBuckets ebs = get(tile); ExtrusionBuckets ebs = get(tile);

4
vtm/src/org/oscim/theme/styles/ExtrusionStyle.java
View File

@@ -1,6 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86 * Copyright 2016-2017 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * 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; colorSide = Color.TRANSPARENT;
colorTop = Color.TRANSPARENT; colorTop = Color.TRANSPARENT;
colorLine = Color.TRANSPARENT; colorLine = Color.TRANSPARENT;
defaultHeight = 0; defaultHeight = 12; // 12m default
return self(); return self();
} }