From fade013a9b4d4eb4fa5739dec2169b5f36702b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Sun, 17 Nov 2024 18:20:37 +0200 Subject: [PATCH] Remove power layer --- .../src/main/java/lt/lrv/basemap/Basemap.java | 5 +- .../java/lt/lrv/basemap/constants/Layers.java | 2 - .../java/lt/lrv/basemap/layers/Power.java | 81 ------------------- vector/styles/bright/style.json | 73 ----------------- 4 files changed, 1 insertion(+), 160 deletions(-) delete mode 100644 vector/src/main/java/lt/lrv/basemap/layers/Power.java diff --git a/vector/src/main/java/lt/lrv/basemap/Basemap.java b/vector/src/main/java/lt/lrv/basemap/Basemap.java index 02680e38..7906b170 100644 --- 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 index cc43facb..107be586 100644 --- 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 deleted file mode 100644 index 4d245a61..00000000 --- a/vector/src/main/java/lt/lrv/basemap/layers/Power.java +++ /dev/null @@ -1,81 +0,0 @@ -package lt.lrv.basemap.layers; - -import com.onthegomap.planetiler.FeatureCollector; -import com.onthegomap.planetiler.FeatureMerge; -import com.onthegomap.planetiler.ForwardingProfile; -import com.onthegomap.planetiler.VectorTile; -import com.onthegomap.planetiler.config.PlanetilerConfig; -import com.onthegomap.planetiler.reader.SourceFeature; -import lt.lrv.basemap.constants.Layers; -import lt.lrv.basemap.constants.Source; -import lt.lrv.basemap.openmaptiles.Layer; -import lt.lrv.basemap.utils.LanguageUtils; - -import java.util.List; - -// Based on https://github.com/openmaptiles/openmaptiles/pull/1235 -public class Power implements Layer, ForwardingProfile.LayerPostProcesser { - - static final double BUFFER_SIZE = 4.0; - - final PlanetilerConfig config; - - public Power(PlanetilerConfig config) { - this.config = config; - } - - @Override - public void processFeature(SourceFeature sf, FeatureCollector features) { - if (sf.getSource().equals(Source.GRPK)) { - if (Layers.GRPK_ELEKTR_L.equals(sf.getSourceLayer()) && - "ie6".equals(sf.getTag("GKODAS")) && - sf.canBeLine() - ) { - addLineFeature(sf, features); - } else if (Layers.GRPK_ELEKTR_T.equals(sf.getSourceLayer()) && sf.isPoint()) { - addPoleFeature(features); - } - } - } - - void addLineFeature(SourceFeature sf, FeatureCollector features) { - var voltage = sf.getLong("ITAMPA"); - var name = voltage != 0 ? String.format("%d kV", voltage) : null; - - features.line(this.name()) - .setBufferPixels(BUFFER_SIZE) - .setAttr(Fields.CLASS, FieldValues.CLASS_LINE) - .putAttrs(LanguageUtils.getNames(name)) - .setMinPixelSize(0) - .setPixelTolerance(0) - .setMinZoom(14); - } - - void addPoleFeature(FeatureCollector features) { - features.point(this.name()) - .setBufferPixels(BUFFER_SIZE) - .setAttr(Fields.CLASS, FieldValues.CLASS_POLE) - .setMinZoom(14); - } - - @Override - public List postProcess(int zoom, List items) { - items = FeatureMerge.mergeMultiPoint(items); - - return FeatureMerge.mergeLineStrings(items, 0, config.tolerance(zoom), BUFFER_SIZE); - } - - @Override - public String name() { - return "power"; - } - - static class Fields { - public static final String CLASS = "class"; - } - - static class FieldValues { - public static final String CLASS_POLE = "pole"; - public static final String CLASS_LINE = "line"; - } -} diff --git a/vector/styles/bright/style.json b/vector/styles/bright/style.json index 9918c8ed..cb91be42 100644 --- 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",