From 92937667d8ff8c92976a570091d83d4896c56c57 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Fri, 11 May 2018 14:24:16 +0300
Subject: [PATCH] Render themes: use tessellation in water areas, fix #224
---
vtm-themes/resources/assets/vtm/default.xml | 4 ++--
vtm-themes/resources/assets/vtm/newtron.xml | 4 ++--
vtm-themes/resources/assets/vtm/openmaptiles.xml | 9 +++------
vtm-themes/resources/assets/vtm/osmagray.xml | 8 +++++---
vtm-themes/resources/assets/vtm/osmarender.xml | 8 +++++---
vtm-themes/resources/assets/vtm/tronrender.xml | 4 ++--
vtm/src/org/oscim/renderer/bucket/MeshBucket.java | 2 +-
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index a62ee6a9..651f6b1d 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -95,7 +95,7 @@
<!--water-->
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
<!-- src="assets:textures/water.png" -->
- <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
+ <style-area fade="-1" fill="#99badf" id="water" mesh="true" />
<!--###### LINE styles ######-->
@@ -157,7 +157,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
- <area mesh="true" use="water" />
+ <area use="water" />
</m>
<m e="way" k="natural" v="nosea">
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index 5ed6ffd3..b5b8e313 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -73,7 +73,7 @@
<style-area fade="15" fill="#ee202020" id="building" />
<!--water-->
- <style-area fill="#001223" id="water" />
+ <style-area fill="#001223" id="water" mesh="true" />
<!--###### LINE styles ######-->
@@ -121,7 +121,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
- <area mesh="true" use="water" />
+ <area use="water" />
</m>
<m e="way" k="natural" v="nosea">
diff --git a/vtm-themes/resources/assets/vtm/openmaptiles.xml b/vtm-themes/resources/assets/vtm/openmaptiles.xml
index 4613eb68..5453f06d 100644
--- a/vtm-themes/resources/assets/vtm/openmaptiles.xml
+++ b/vtm-themes/resources/assets/vtm/openmaptiles.xml
@@ -96,7 +96,7 @@
<!--water-->
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
<!-- src="assets:textures/water.png" -->
- <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
+ <style-area fade="-1" fill="#99badf" id="water" mesh="true" />
<!--###### LINE styles ######-->
@@ -344,11 +344,8 @@
<m k="layer" v="water">
<m k="class">
- <m v="ocean|lake">
- <area mesh="true" use="water" />
- </m>
- <m v="river">
- <area mesh="true" use="water" />
+ <m v="ocean|lake|river">
+ <area use="water" />
</m>
</m>
</m>
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index 5e068fca..a7c32370 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -38,7 +38,9 @@
<!--###### AREA styles ######-->
- <!--no styles-->
+
+ <!--water-->
+ <style-area fill="#d0d0d0" id="water" mesh="true" />
<!--###### LINE styles ######-->
@@ -53,7 +55,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
- <area fill="#d0d0d0" mesh="true" />
+ <area use="water" />
</m>
<m e="way" k="natural" v="nosea">
@@ -311,7 +313,7 @@
<m k="natural" v="water">
- <area fill="#d0d0d0" />
+ <area use="water" />
<caption area-size="0.4" fill="#3b3b3b" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
</m>
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index ccf60a93..cc5589c7 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -38,7 +38,9 @@
<!--###### AREA styles ######-->
- <!--no styles-->
+
+ <!--water-->
+ <style-area fill="#b5d6f1" id="water" mesh="true" />
<!--###### LINE styles ######-->
@@ -53,7 +55,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
- <area fill="#b5d6f1" mesh="true" />
+ <area use="water" />
</m>
<m e="way" k="natural" v="nosea">
@@ -311,7 +313,7 @@
<m k="natural" v="water">
- <area fill="#b5d6f1" />
+ <area use="water" />
<caption area-size="0.4" fill="#404000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
</m>
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index 687a3159..cdec3a3f 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -72,7 +72,7 @@
<style-area fade="15" fill="#ee202020" id="building" />
<!--water-->
- <style-area fill="#001223" id="water" />
+ <style-area fill="#001223" id="water" mesh="true" />
<!--###### LINE styles ######-->
@@ -121,7 +121,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
- <area mesh="true" use="water" />
+ <area use="water" />
</m>
<m e="way" k="natural" v="nosea">
diff --git a/vtm/src/org/oscim/renderer/bucket/MeshBucket.java b/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
index 3579a93f..b3e6a437 100644
--- a/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
@@ -101,7 +101,7 @@ public class MeshBucket extends RenderBucket {
}
if (!tess.tesselate()) {
tess.dispose();
- log.error("error in tessellation {}", numPoints);
+ log.debug("error in tessellation {}", numPoints);
return;
}