Bugfix/127 intersect geometrycollection (#129)

* buffer all the things * buffer all the things * bump version * tweak version name
OnroerendErfgoed · Jun 9, 2021 · 3095fba · 3095fba
1 parent 58c05f4
commit 3095fba
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/dist/commonjs/gis-utils/map-util.d.ts.map b/dist/commonjs/gis-utils/map-util.d.ts.map
diff --git a/dist/commonjs/gis-utils/map-util.js b/dist/commonjs/gis-utils/map-util.js
diff --git a/dist/commonjs/gis-utils/map-util.js.map b/dist/commonjs/gis-utils/map-util.js.map
diff --git a/dist/native-modules/gis-utils/map-util.d.ts.map b/dist/native-modules/gis-utils/map-util.d.ts.map
diff --git a/dist/native-modules/gis-utils/map-util.js b/dist/native-modules/gis-utils/map-util.js
diff --git a/dist/native-modules/gis-utils/map-util.js.map b/dist/native-modules/gis-utils/map-util.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "oerelia",
   "description": "An Aurelia plugin project.",
-  "version": "0.9.6",
+  "version": "0.9.7-alpha.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/OnroerendErfgoed/oerelia.git"

diff --git a/src/gis-utils/map-util.ts b/src/gis-utils/map-util.ts
@@ -244,8 +244,10 @@ export class MapUtil {
 
   public static intersectPolygons(polygon1: ol.Feature, polygon2: ol.Feature): ol.Feature {
     const parser = new jsts.io.OL3Parser();
+    const writer = new jsts.io.GeoJSONWriter();
+
     parser.inject(ol.geom.Point, ol.geom.LineString, ol.geom.LinearRing, ol.geom.Polygon,
-      ol.geom.MultiPoint, ol.geom.MultiLineString, ol.geom.MultiPolygon);
+      ol.geom.MultiPoint, ol.geom.MultiLineString, ol.geom.MultiPolygon, ol.geom.GeometryCollection);
     const jstsGeom1 = parser.read(polygon1.getGeometry());
     const jstsGeom2 = parser.read(polygon2.getGeometry());
     const intersects = jstsGeom1.intersects(jstsGeom2);
@@ -255,8 +257,9 @@ export class MapUtil {
     }
 
     const jstsGeom = polygon2 ? jstsGeom1.intersection(jstsGeom2) : jstsGeom1;
-    const polygon = parser.write(jstsGeom);
-    const coords = polygon.getType() === 'Polygon' ? [polygon.getCoordinates()] : polygon.getCoordinates();
+    const buffered = jstsGeom.buffer(0);
+    const polygon = writer.write(buffered);
+    const coords = polygon.type === 'Polygon' ? [polygon.coordinates] : polygon.coordinates;
     if (coords[0].length > 0) {
       return new ol.Feature({
         geometry: new ol.geom.MultiPolygon(coords)