From a3811bb437491b41dbef5d45eb7a0272ea31337d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Mon, 15 Apr 2024 12:15:14 +0300 Subject: [PATCH 1/3] More POI objects --- .../main/java/lt/lrv/basemap/layers/POI.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/vector/src/main/java/lt/lrv/basemap/layers/POI.java b/vector/src/main/java/lt/lrv/basemap/layers/POI.java index bd529218..a3f695d2 100644 --- a/vector/src/main/java/lt/lrv/basemap/layers/POI.java +++ b/vector/src/main/java/lt/lrv/basemap/layers/POI.java @@ -15,6 +15,18 @@ public class POI implements OpenMapTilesSchema.Poi { @Override public void processFeature(SourceFeature sf, FeatureCollector features) { if (sf.getSource().equals(Source.GRPK) && + sf.getSourceLayer().equals(Layer.GRPK_VIETOV_P) && + sf.canBePolygon() && + emptyToNull(sf.getString("VARDAS")) != null + ) { + var code = sf.getString("GKODAS"); + + switch (code) { + case "uur14" -> addFeature(FieldValues.CLASS_PARK, 5, sf, features); + case "uvu11" -> addFeature(FieldValues.CLASS_HARBOR, 1, sf, features); + case "ums0", "uhd6", "uhd10" -> addFeature(null, 15, sf, features); + } + } else if (sf.getSource().equals(Source.GRPK) && sf.getSourceLayer().equals(Layer.GRPK_VIETOV_T) && sf.isPoint() && emptyToNull(sf.getString("VARDAS")) != null && @@ -24,15 +36,22 @@ public void processFeature(SourceFeature sf, FeatureCollector features) { switch (code) { case "uur14" -> addFeature(FieldValues.CLASS_PARK, 5, sf, features); - case "uvp1" -> addFeature("cemetery", 10, sf, features); - case "unk0" -> addFeature("unknown", 15, sf, features); + case "uvp1" -> addFeature(FieldValues.CLASS_CEMETERY, 10, sf, features); + case "unk0" -> { + switch (sf.getString("OBJ_TIP")) { + case "SPORT" -> addFeature(FieldValues.CLASS_STADIUM, 10, sf, features); + case "KRAŠT" -> addFeature(FieldValues.CLASS_ATTRACTION, 10, sf, features); + default -> addFeature(null, 15, sf, features); + } + } } } } void addFeature(String clazz, int rank, SourceFeature sf, FeatureCollector features) { - features.point(this.name()) - .setBufferPixels(BUFFER_SIZE) + var feature = sf.isPoint() ? features.point(this.name()) : features.centroidIfConvex(this.name()); + + feature.setBufferPixels(BUFFER_SIZE) .putAttrs(LanguageUtils.getNames(sf.tags())) .setAttr(Fields.CLASS, clazz) .setAttr(Fields.RANK, rank) From c4189c45a377138a9963653a248c351061a0da5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Mon, 15 Apr 2024 12:15:34 +0300 Subject: [PATCH 2/3] Remove to Poi --- vector/src/main/java/lt/lrv/basemap/Basemap.java | 2 +- .../src/main/java/lt/lrv/basemap/layers/{POI.java => Poi.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename vector/src/main/java/lt/lrv/basemap/layers/{POI.java => Poi.java} (97%) diff --git a/vector/src/main/java/lt/lrv/basemap/Basemap.java b/vector/src/main/java/lt/lrv/basemap/Basemap.java index de82c1d2..2a588674 100644 --- a/vector/src/main/java/lt/lrv/basemap/Basemap.java +++ b/vector/src/main/java/lt/lrv/basemap/Basemap.java @@ -59,7 +59,7 @@ public Basemap() { new MountainPeak(), new Park(), new Place(), - new POI(), + new Poi(), new Transportation(), new TransportationName(), new Water(), diff --git a/vector/src/main/java/lt/lrv/basemap/layers/POI.java b/vector/src/main/java/lt/lrv/basemap/layers/Poi.java similarity index 97% rename from vector/src/main/java/lt/lrv/basemap/layers/POI.java rename to vector/src/main/java/lt/lrv/basemap/layers/Poi.java index a3f695d2..a8a5b206 100644 --- a/vector/src/main/java/lt/lrv/basemap/layers/POI.java +++ b/vector/src/main/java/lt/lrv/basemap/layers/Poi.java @@ -10,7 +10,7 @@ import static com.google.common.base.Strings.emptyToNull; -public class POI implements OpenMapTilesSchema.Poi { +public class Poi implements OpenMapTilesSchema.Poi { @Override public void processFeature(SourceFeature sf, FeatureCollector features) { From bda1930a454ca0978d0770a102bfaa2c935f10ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karolis=20Vy=C4=8Dius?= Date: Mon, 15 Apr 2024 12:22:35 +0300 Subject: [PATCH 3/3] Increase minzoom according to styles --- vector/src/main/java/lt/lrv/basemap/layers/Poi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/lt/lrv/basemap/layers/Poi.java b/vector/src/main/java/lt/lrv/basemap/layers/Poi.java index a8a5b206..1b12cbb2 100644 --- a/vector/src/main/java/lt/lrv/basemap/layers/Poi.java +++ b/vector/src/main/java/lt/lrv/basemap/layers/Poi.java @@ -56,7 +56,7 @@ void addFeature(String clazz, int rank, SourceFeature sf, FeatureCollector featu .setAttr(Fields.CLASS, clazz) .setAttr(Fields.RANK, rank) .setAttr(Fields.LEVEL, 0) - .setMinZoom(10) + .setMinZoom(12) .setPointLabelGridPixelSize(14, 64) .setSortKey(rank); }