minor simplifications

matyasbach · Mar 26, 2020 · 2cd11c2 · 2cd11c2
1 parent 7040949
commit 2cd11c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/src/feature.js b/src/feature.js
@@ -10,13 +10,6 @@ export default function createFeature(id, type, geom, tags) {
         maxX: -Infinity,
         maxY: -Infinity
     };
-    calcBBox(feature);
-    return feature;
-}
-
-function calcBBox(feature) {
-    const geom = feature.geometry;
-    const type = feature.type;
 
     if (type === 'Point' || type === 'MultiPoint' || type === 'LineString') {
         calcLineBBox(feature, geom);
@@ -36,6 +29,8 @@ function calcBBox(feature) {
             calcLineBBox(feature, polygon[0]);
         }
     }
+
+    return feature;
 }
 
 function calcLineBBox(feature, geom) {

diff --git a/src/tile.js b/src/tile.js
@@ -18,26 +18,20 @@ export default function createTile(features, z, tx, ty, options) {
     };
     for (const feature of features) {
         addFeature(tile, feature, tolerance, options);
-
-        const minX = feature.minX;
-        const minY = feature.minY;
-        const maxX = feature.maxX;
-        const maxY = feature.maxY;
-
-        if (minX < tile.minX) tile.minX = minX;
-        if (minY < tile.minY) tile.minY = minY;
-        if (maxX > tile.maxX) tile.maxX = maxX;
-        if (maxY > tile.maxY) tile.maxY = maxY;
     }
     return tile;
 }
 
 function addFeature(tile, feature, tolerance, options) {
-
     const geom = feature.geometry;
     const type = feature.type;
     const simplified = [];
 
+    tile.minX = Math.min(tile.minX, feature.minX);
+    tile.minY = Math.min(tile.minY, feature.minY);
+    tile.maxX = Math.max(tile.maxX, feature.maxX);
+    tile.maxY = Math.max(tile.maxY, feature.maxY);
+
     if (type === 'Point' || type === 'MultiPoint') {
         for (let i = 0; i < geom.length; i += 3) {
             simplified.push(geom[i], geom[i + 1]);