From 892ea925802e1805d309ca33e710c56388031324 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Wed, 11 Dec 2019 10:12:33 +0200
Subject: [PATCH] Render themes: revert tessellation in water areas except sea
 #224

---
 vtm-themes/resources/assets/vtm/default.xml       | 4 ++--
 vtm-themes/resources/assets/vtm/newtron.xml       | 4 ++--
 vtm-themes/resources/assets/vtm/openmaptiles.xml  | 4 ++--
 vtm-themes/resources/assets/vtm/osmagray.xml      | 4 ++--
 vtm-themes/resources/assets/vtm/osmarender.xml    | 4 ++--
 vtm-themes/resources/assets/vtm/tronrender.xml    | 4 ++--
 vtm/src/org/oscim/renderer/bucket/MeshBucket.java | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index dba79c32..36a1196d 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -106,7 +106,7 @@
     <!--water-->
     <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
     <!-- src="assets:textures/water.png" -->
-    <style-area fade="-1" fill="#99badf" id="water" mesh="true" />
+    <style-area fade="-1" fill="#99badf" id="water" />
 
     <!--###### LINE styles ######-->
 
@@ -168,7 +168,7 @@
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
-        <area use="water" />
+        <area mesh="true" 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 c44886b1..cdf877c2 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -74,7 +74,7 @@
     <style-area fade="15" fill="#ee404040" id="building" />
 
     <!--water-->
-    <style-area fill="#001223" id="water" mesh="true" />
+    <style-area fill="#001223" id="water" />
 
 
     <!--###### LINE styles ######-->
@@ -122,7 +122,7 @@
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
-        <area use="water" />
+        <area mesh="true" 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 1155c268..d600caa8 100644
--- a/vtm-themes/resources/assets/vtm/openmaptiles.xml
+++ b/vtm-themes/resources/assets/vtm/openmaptiles.xml
@@ -102,7 +102,7 @@
     <!--water-->
     <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
     <!-- src="assets:textures/water.png" -->
-    <style-area fade="-1" fill="#99badf" id="water" mesh="true" />
+    <style-area fade="-1" fill="#99badf" id="water" />
 
 
     <!--###### LINE styles ######-->
@@ -356,7 +356,7 @@
     <m k="layer" v="water">
         <m k="class">
             <m v="ocean|lake|river">
-                <area use="water" />
+                <area mesh="true" use="water" />
             </m>
         </m>
     </m>
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index b2e00d9b..5a04eadb 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -41,7 +41,7 @@
     <!--###### AREA styles ######-->
 
     <!--water-->
-    <style-area fill="#d0d0d0" id="water" mesh="true" />
+    <style-area fill="#d0d0d0" id="water" />
 
 
     <!--###### LINE styles ######-->
@@ -56,7 +56,7 @@
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
-        <area use="water" />
+        <area mesh="true" use="water" />
     </m>
 
     <m e="way" k="natural" v="nosea">
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index fa74a504..cdb7c022 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -41,7 +41,7 @@
     <!--###### AREA styles ######-->
 
     <!--water-->
-    <style-area fill="#b5d6f1" id="water" mesh="true" />
+    <style-area fill="#b5d6f1" id="water" />
 
 
     <!--###### LINE styles ######-->
@@ -56,7 +56,7 @@
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
-        <area use="water" />
+        <area mesh="true" use="water" />
     </m>
 
     <m e="way" k="natural" v="nosea">
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index a5d139b9..578bb705 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -73,7 +73,7 @@
     <style-area fade="15" fill="#ee606060" id="building" />
 
     <!--water-->
-    <style-area fill="#001223" id="water" mesh="true" />
+    <style-area fill="#001223" id="water" />
 
 
     <!--###### LINE styles ######-->
@@ -122,7 +122,7 @@
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
-        <area use="water" />
+        <area mesh="true" 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 e8c56ea0..2df07a92 100644
--- a/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2017 devemux86
+ * Copyright 2017-2019 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -102,7 +102,7 @@ public class MeshBucket extends RenderBucket {
         }
         if (!tess.tesselate()) {
             tess.dispose();
-            log.debug("error in tessellation {}", numPoints);
+            log.error("error in tessellation {}", numPoints);
             return;
         }