Merge pull request #124 from govlt/remove-power-layer

Remove power layer
govlt · Nov 17, 2024 · 19e4ce1 · 19e4ce1
2 parents a71e600 + fade013
commit 19e4ce1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 160 deletions.
diff --git a/vector/src/main/java/lt/lrv/basemap/Basemap.java b/vector/src/main/java/lt/lrv/basemap/Basemap.java
@@ -14,8 +14,6 @@
 public class Basemap extends ForwardingProfile {
     // For local development in order to speed up build it's recommended to comment out some GRPK layers
     static final String[] GRPK_LAYERS = {
-            Layers.GRPK_ELEKTR_L,
-            Layers.GRPK_ELEKTR_T,
             Layers.GRPK_GELEZINK,
             Layers.GRPK_HIDRO_L,
             Layers.GRPK_MISKAS_L,
@@ -27,7 +25,7 @@ public class Basemap extends ForwardingProfile {
             Layers.GRPK_VIETOV_T,
     };
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         var grpkGlobPattern = "{" + String.join(",", GRPK_LAYERS) + "}*.shp";
 
         Planetiler.create(Arguments.fromConfigFile(Path.of("config.properties")))
@@ -70,7 +68,6 @@ public Basemap(Planetiler runner) {
                                 new MountainPeak(),
                                 new ForestCompartment(config),
                                 new Park(),
-                                new Power(config),
                                 new Place(),
                                 new Poi(),
                                 new Transportation(),

diff --git a/vector/src/main/java/lt/lrv/basemap/constants/Layers.java b/vector/src/main/java/lt/lrv/basemap/constants/Layers.java
@@ -12,8 +12,6 @@ public class Layers {
     public static final String GRPK_RIBOS = "RIBOS";
     public static final String GRPK_VIETOV_P = "VIETOV_P";
     public static final String GRPK_VIETOV_T = "VIETOV_T";
-    public static final String GRPK_ELEKTR_L = "ELEKTR_L";
-    public static final String GRPK_ELEKTR_T = "ELEKTR_T";
 
     private Layers() {
     }

diff --git a/vector/src/main/java/lt/lrv/basemap/layers/Power.java b/vector/src/main/java/lt/lrv/basemap/layers/Power.java
diff --git a/vector/styles/bright/style.json b/vector/styles/bright/style.json
@@ -4013,79 +4013,6 @@
         "text-halo-width": 1.5
       }
     },
-    {
-      "id": "power-pole",
-      "type": "circle",
-      "source": "openmaptiles",
-      "source-layer": "power",
-      "paint": {
-        "circle-radius": 2,
-        "circle-color": "rgba(97, 97, 97, 0.8)"
-      },
-      "filter": [
-        "all",
-        [
-          "==",
-          "class",
-          "pole"
-        ]
-      ]
-    },
-    {
-      "id": "power-line",
-      "type": "line",
-      "source": "openmaptiles",
-      "source-layer": "power",
-      "filter": [
-        "all",
-        [
-          "==",
-          "class",
-          "line"
-        ]
-      ],
-      "paint": {
-        "line-width": 0.3,
-        "line-opacity": 0.7,
-        "line-color": "rgba(97, 97, 97, 1)"
-      },
-      "layout": {
-      }
-    },
-    {
-      "id": "power-line-label",
-      "type": "symbol",
-      "source": "openmaptiles",
-      "source-layer": "power",
-      "layout": {
-        "text-field": "{name:latin}",
-        "symbol-placement": "line",
-        "text-font": [
-          "Noto Sans Italic"
-        ],
-        "text-size": 9,
-        "text-offset": [
-          0,
-          -0.6
-        ]
-      },
-      "filter": [
-        "all",
-        [
-          "==",
-          "class",
-          "line"
-        ],
-        [
-          "has",
-          "name:latin"
-        ]
-      ],
-      "minzoom": 15,
-      "paint": {
-        "text-color": "rgba(97, 97, 97, 1)"
-      }
-    },
     {
       "id": "poi-level-3",
       "type": "symbol",