clean-up: CPU-intensive prepare() moved out of synchronized block

openmaptiles · Dec 12, 2023 · 57c2547 · 57c2547
1 parent c8c4b24
commit 57c2547
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/org/openmaptiles/layers/Transportation.java b/src/main/java/org/openmaptiles/layers/Transportation.java
@@ -262,18 +262,22 @@ public void processNaturalEarth(String table, SourceFeature feature,
     // once, but just to be safe synchronize updates to that field
     if (feature.hasTag("iso_a2", "GB")) {
       try {
-        Geometry boundary = feature.polygon().buffer(GeoUtils.metersToPixelAtEquator(0, 10_000) / 256d);
+        var prepared = PreparedGeometryFactory.prepare(
+          feature.polygon().buffer(GeoUtils.metersToPixelAtEquator(0, 10_000) / 256d)
+        );
         synchronized (this) {
-          greatBritain = PreparedGeometryFactory.prepare(boundary);
+          greatBritain = prepared;
         }
       } catch (GeometryException e) {
         LOGGER.error("Failed to get Great Britain Polygon: " + e);
       }
     } else if (feature.hasTag("iso_a2", "IE")) {
       try {
-        Geometry boundary = feature.polygon().buffer(GeoUtils.metersToPixelAtEquator(0, 10_000) / 256d);
+        var prepared = PreparedGeometryFactory.prepare(
+          feature.polygon().buffer(GeoUtils.metersToPixelAtEquator(0, 10_000) / 256d)
+        );
         synchronized (this) {
-          ireland = PreparedGeometryFactory.prepare(boundary);
+          ireland = prepared;
         }
       } catch (GeometryException e) {
         LOGGER.error("Failed to get Ireland Polygon: " + e);