From 5bf276e6179cb60c65ef1283ba96ab2c75a6bfd6 Mon Sep 17 00:00:00 2001
From: Manuel Kasper <mk@neon1.net>
Date: Thu, 30 May 2024 23:29:17 +0200
Subject: [PATCH] No overlap for area names, but reduce padding and font size

---
 maptiler_styles/swisstopo_sotlas.json.diff | 90 ++++++++++++++--------
 src/assets/swisstopo.json                  |  8 +-
 2 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/maptiler_styles/swisstopo_sotlas.json.diff b/maptiler_styles/swisstopo_sotlas.json.diff
index 2176c50..bb9fc01 100644
--- a/maptiler_styles/swisstopo_sotlas.json.diff
+++ b/maptiler_styles/swisstopo_sotlas.json.diff
@@ -1,5 +1,5 @@
---- style.json	2024-05-28 19:33:50
-+++ /Users/mk/Repositories/SOTLAS/sotlas-frontend/src/assets/swisstopo.json	2024-05-28 20:22:15
+--- style.json	2024-05-30 23:28:44
++++ /Users/mk/Repositories/SOTLAS/sotlas-frontend/src/assets/swisstopo.json	2024-05-30 23:27:01
 @@ -10,6 +10,72 @@
      "base_v1.0.0": {
        "url": "https://vectortiles.geo.admin.ch/tiles/ch.swisstopo.base.vt/v1.0.0/tiles.json",
@@ -74,10 +74,12 @@
    },
    "layers": [
 \ No newline at end of file
-@@ -24,10 +90,75 @@
+@@ -22,12 +88,77 @@
+       "paint": {
+         "background-color": "rgba(253, 253, 254, 1)"
        }
-     },
-     {
++    },
++    {
 +      "id": "background_water",
 +      "type": "fill",
 +      "source": "v3",
@@ -93,8 +95,8 @@
 +        "$type",
 +        "Polygon"
 +      ]
-+    },
-+    {
+     },
+     {
 +      "id": "background_boundary",
 +      "type": "line",
 +      "source": "v3",
@@ -248,10 +250,14 @@
            "interpolate",
            ["linear"],
 \ No newline at end of file
-@@ -2743,6 +2920,68 @@
-       ]
-     },
-     {
+@@ -2739,6 +2916,68 @@
+           "==",
+           ["geometry-type"],
+           "LineString"
++        ]
++      ]
++    },
++    {
 +      "id": "road_footway_sac",
 +      "type": "line",
 +      "source": "base_v1.0.0",
@@ -310,20 +316,14 @@
 +          "!in",
 +          "subclass",
 +          "mask_rock_via_ferrata"
-+        ]
-+      ]
-+    },
-+    {
-       "id": "road_path",
-       "type": "line",
-       "source": "base_v1.0.0",
-\ No newline at end of file
-@@ -3007,6 +3246,32 @@
-           "LineString"
          ]
        ]
-+    },
-+    {
+     },
+\ No newline at end of file
+@@ -3009,6 +3248,32 @@
+       ]
+     },
+     {
 +      "id": "skiing_trails_raster",
 +      "type": "raster",
 +      "metadata": {
@@ -348,9 +348,11 @@
 +        "raster-opacity": 0.6,
 +        "raster-resampling": "linear"
 +      }
-     },
-     {
++    },
++    {
        "id": "landcover_pt",
+       "type": "symbol",
+       "source": "base_v1.0.0",
 \ No newline at end of file
 @@ -9137,6 +9402,9 @@
        "source": "base_v1.0.0",
@@ -374,15 +376,23 @@
          "text-font": ["Frutiger Neue Italic"],
          "text-size": [
 \ No newline at end of file
-@@ -9524,7 +9795,7 @@
-         "symbol-placement": "point",
-         "text-keep-upright": true,
-         "symbol-avoid-edges": true,
--        "text-allow-overlap": false,
-+        "text-allow-overlap": true,
-         "text-letter-spacing": 0.02,
-         "text-pitch-alignment": "viewport",
-         "text-ignore-placement": false,
+@@ -9511,13 +9782,13 @@
+           ["exponential",1.25],
+           ["zoom"],
+           13,
+-          12,
++          10,
+           18,
+-          18
++          16
+         ],
+         "text-field": "{name:latin}",
+         "visibility": "visible",
+-        "text-padding": 40,
++        "text-padding": 2,
+         "symbol-spacing": 250,
+         "symbol-z-order": "auto",
+         "text-max-width": 99999,
 \ No newline at end of file
 @@ -10981,6 +11252,8 @@
              "rgba(27, 36, 62, 1)",
@@ -711,3 +721,15 @@
    ],
    "metadata": {
 \ No newline at end of file
+@@ -14347,8 +14917,8 @@
+         "preferredViewPanelType": "Verticality"
+       }
+     },
+-    "ga:version": "v1.16.0",
+-    "ga:publisher": "CI:0940ef4c-910c-49db-bfce-3f59ebe88db6",
++    "ga:version": "v1.15.0",
++    "ga:publisher": "CI:0785a98d-3308-4421-908f-645c15c1c467",
+     "ga:branch": "master"
+   },
+   "glyphs": "https://vectortiles.geo.admin.ch/fonts/{fontstack}/{range}.pbf",
+\ No newline at end of file
diff --git a/src/assets/swisstopo.json b/src/assets/swisstopo.json
index 9c1f939..bddae31 100644
--- a/src/assets/swisstopo.json
+++ b/src/assets/swisstopo.json
@@ -9782,20 +9782,20 @@
           ["exponential",1.25],
           ["zoom"],
           13,
-          12,
+          10,
           18,
-          18
+          16
         ],
         "text-field": "{name:latin}",
         "visibility": "visible",
-        "text-padding": 40,
+        "text-padding": 2,
         "symbol-spacing": 250,
         "symbol-z-order": "auto",
         "text-max-width": 99999,
         "symbol-placement": "point",
         "text-keep-upright": true,
         "symbol-avoid-edges": true,
-        "text-allow-overlap": true,
+        "text-allow-overlap": false,
         "text-letter-spacing": 0.02,
         "text-pitch-alignment": "viewport",
         "text-ignore-placement": false,