From f9313b94ef7fbe92a6c6d28ff0e1ff13b314c21a Mon Sep 17 00:00:00 2001
From: Bertil Chapuis <bchapuis@gmail.com>
Date: Thu, 9 Nov 2023 23:29:51 +0100
Subject: [PATCH] Improve building style

---
 .run/basemap-dev.run.xml                           |  7 ++++++-
 .../org/apache/baremaps/server/TileResource.java   |  5 +++++
 basemap/layers/building/extrusion.js               | 14 +++++++-------
 basemap/layers/building/shape.js                   |  7 +++++++
 basemap/layers/building/tileset.js                 |  4 ++--
 basemap/tileset.js                                 |  2 +-
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.run/basemap-dev.run.xml b/.run/basemap-dev.run.xml
index 4b61bfcdb..af9438a44 100644
--- a/.run/basemap-dev.run.xml
+++ b/.run/basemap-dev.run.xml
@@ -2,8 +2,13 @@
   <configuration default="false" name="basemap-dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.baremaps.cli.Baremaps" />
     <module name="baremaps-cli" />
-    <option name="PROGRAM_PARAMETERS" value="map dev --tileset tileset.js --style style.js" />
+    <option name="PROGRAM_PARAMETERS" value="map dev --tileset tileset.js --style style.js --log-level DEBUG" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/baremaps-server/src/main/java/org/apache/baremaps/server/TileResource.java b/baremaps-server/src/main/java/org/apache/baremaps/server/TileResource.java
index 4cc84227c..bb074b949 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/TileResource.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/TileResource.java
@@ -29,6 +29,8 @@
 import org.apache.baremaps.tilestore.TileCoord;
 import org.apache.baremaps.tilestore.TileStore;
 import org.apache.baremaps.tilestore.TileStoreException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A resource that provides access to the tiles.
@@ -37,6 +39,8 @@
 @javax.ws.rs.Path("/")
 public class TileResource {
 
+  private static final Logger logger = LoggerFactory.getLogger(TileResource.class);
+
   public static final String TILE_ENCODING = "gzip";
 
   public static final String TILE_TYPE = "application/vnd.mapbox-vector-tile";
@@ -68,6 +72,7 @@ public Response getTile(@PathParam("z") int z, @PathParam("x") int x, @PathParam
         return Response.status(204).build();
       }
     } catch (TileStoreException ex) {
+      logger.error("Error while reading tile.", ex);
       return Response.status(404).build();
     }
   }
diff --git a/basemap/layers/building/extrusion.js b/basemap/layers/building/extrusion.js
index 2c28e5ed7..0c0dca5c0 100644
--- a/basemap/layers/building/extrusion.js
+++ b/basemap/layers/building/extrusion.js
@@ -25,7 +25,7 @@ export default {
     layout: {
         visibility: 'visible',
     },
-    minzoom: 16,
+    minzoom: 15,
     paint: {
         "fill-extrusion-color": [
             "case",
@@ -37,27 +37,27 @@ export default {
             'interpolate',
             ['linear'],
             ['zoom'],
-            16,
+            15,
             0,
-            17,
+            16,
             ['get', "extrusion:base"]
         ],
         "fill-extrusion-height": [
             'interpolate',
             ['linear'],
             ['zoom'],
-            16,
+            15,
             0,
-            17,
+            16,
             ['get', "extrusion:height"]
         ],
         "fill-extrusion-opacity": [
             'interpolate',
             ['linear'],
             ['zoom'],
-            16,
+            15,
             0,
-            17,
+            16,
             0.8
         ]
     },
diff --git a/basemap/layers/building/shape.js b/basemap/layers/building/shape.js
index d5f0116ca..12a3f1548 100644
--- a/basemap/layers/building/shape.js
+++ b/basemap/layers/building/shape.js
@@ -29,5 +29,12 @@ export default {
         'fill-antialias': false,
         'fill-color': theme.buildingShapeFillColor,
         'fill-outline-color': theme.buildingShapeFillOutlineColor,
+        'fill-opacity': [
+            'interpolate',
+            ['linear'],
+            ['zoom'],
+            13, 0,
+            13.5, 1
+        ]
     },
 }
diff --git a/basemap/layers/building/tileset.js b/basemap/layers/building/tileset.js
index 47c962e17..fab6f3472 100644
--- a/basemap/layers/building/tileset.js
+++ b/basemap/layers/building/tileset.js
@@ -36,7 +36,7 @@ export default {
                                                                        THEN tags ->> 'building:height'
                                                                    WHEN tags ->> 'building:levels' ~ '^[0-9\\\\\\\\.]+$'
                                                                        THEN tags ->> 'building:levels'
-                                                                   ELSE '2' END)::real * 3),
+                                                                   ELSE '2' END)::real * 3) as tags,
                     geom 
                 FROM osm_ways 
                 WHERE tags ? 'building'`,
@@ -59,7 +59,7 @@ export default {
                                                                        THEN tags ->> 'building:height'
                                                                    WHEN tags ->> 'building:levels' ~ '^[0-9\\\\\\\\.]+$'
                                                                        THEN tags ->> 'building:levels'
-                                                                   ELSE '2' END)::real * 3),
+                                                                   ELSE '2' END)::real * 3) as tags,
                     geom 
                 FROM osm_relations 
                 WHERE tags ? 'building'`,
diff --git a/basemap/tileset.js b/basemap/tileset.js
index 611d8e1af..31d5520c3 100644
--- a/basemap/tileset.js
+++ b/basemap/tileset.js
@@ -64,6 +64,6 @@ export default {
     power,
     railway,
     route,
-    //waterway,
+    waterway,
   ]
 }