From 96c232dee48eb18d1906b3798d501fd5c634922b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Sun, 14 Apr 2024 10:09:22 +0300 Subject: [PATCH 1/3] Set min zoom for boundaries --- .../java/lt/lrv/basemap/layers/Boundary.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java b/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java index beb1c8ee..162e1aee 100644 --- a/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java +++ b/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java @@ -20,21 +20,22 @@ public void processFeature(SourceFeature sf, FeatureCollector features) { var code = sf.getString("GKODAS"); switch (code) { - case "as1", "fas1" -> addBoundaryFeature(2, sf, features); - case "as2" -> addBoundaryFeature(4, sf, features); - case "as3" -> addBoundaryFeature(5, sf, features); - case "as51" -> addBoundaryFeature(8, sf, features); + case "as1", "fas1" -> addBoundaryFeature(2, 0, sf, features); + case "as2" -> addBoundaryFeature(4, 5, sf, features); + case "as3" -> addBoundaryFeature(5, 8, sf, features); + case "as51" -> addBoundaryFeature(8, 10, sf, features); } } } - void addBoundaryFeature(int adminLevel, SourceFeature sf, FeatureCollector features) { + void addBoundaryFeature(int adminLevel, int minZoom, SourceFeature sf, FeatureCollector features) { features.line(this.name()) .setBufferPixels(BUFFER_SIZE) .setAttr(Fields.ADMIN_LEVEL, adminLevel) .setAttr(Fields.DISPUTED, 0) // TODO determine if border is maritime or not .setAttr(Fields.MARITIME, 0) + .setMinZoom(minZoom) .putAttrs(LanguageUtils.getNames(sf.tags())); } @@ -51,4 +52,9 @@ public List postProcess(int zoom, List i 4 ); } + + @Override + public String name() { + return "boundary"; + } } From e37b2190af840d379129824b6a3520e6632a7824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Sun, 14 Apr 2024 10:10:00 +0300 Subject: [PATCH 2/3] Remove fas1, because it doesn't exist --- vector/src/main/java/lt/lrv/basemap/layers/Boundary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java b/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java index 162e1aee..41be6f59 100644 --- a/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java +++ b/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java @@ -20,7 +20,7 @@ public void processFeature(SourceFeature sf, FeatureCollector features) { var code = sf.getString("GKODAS"); switch (code) { - case "as1", "fas1" -> addBoundaryFeature(2, 0, sf, features); + case "as1" -> addBoundaryFeature(2, 0, sf, features); case "as2" -> addBoundaryFeature(4, 5, sf, features); case "as3" -> addBoundaryFeature(5, 8, sf, features); case "as51" -> addBoundaryFeature(8, 10, sf, features); From 2fdf305edd8926a30793a03f815da2b8dbd63f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Mon, 15 Apr 2024 08:08:30 +0300 Subject: [PATCH 3/3] Remove name --- vector/src/main/java/lt/lrv/basemap/layers/Boundary.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java b/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java index 41be6f59..0100ccd3 100644 --- a/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java +++ b/vector/src/main/java/lt/lrv/basemap/layers/Boundary.java @@ -52,9 +52,4 @@ public List postProcess(int zoom, List i 4 ); } - - @Override - public String name() { - return "boundary"; - } }