@evergis/react 2.0.220 → 2.0.221

package/dist/react.cjs.development.js

@@ -27,6 +27,7 @@ var _Symbol = require('@evergis/sgis/es/symbols/Symbol');
 var Poly$1 = require('@evergis/sgis/es/features/Poly');
 var Point = require('@evergis/sgis/es/symbols/point/Point');
 var PointFeature = require('@evergis/sgis/es/features/PointFeature');
+var Arc = require('@evergis/sgis/es/renders/Arc');
 var Render = require('@evergis/sgis/es/renders/Render');
 var SvgRender = require('@evergis/sgis/es/painters/DomPainter/SvgRender');
 var EventHandler = require('@evergis/sgis/es/EventHandler');
@@ -1657,44 +1658,6 @@ const createLabelSymbol = props => {
   });
 };
 
-function createShadowRender(position, _ref) {
-  let {
-    strokeWidth = 2,
-    shadowColor,
-    shadowSize,
-    size = 6
-  } = _ref;
-  const shadowDiameter = size + strokeWidth + shadowSize;
-  return new Poly.PolyRender(polygonCircleFromPoint(position, shadowDiameter), {
-    fillColor: 'transparent',
-    strokeColor: shadowColor,
-    strokeWidth: shadowSize,
-    enclosed: true
-  });
-}
-function getEditorPointRenderer(position, _ref2) {
-  let {
-    strokeColor,
-    strokeWidth,
-    shadowColor,
-    fillColor,
-    shadowSize,
-    size = 0
-  } = _ref2;
-  return [createShadowRender(position, {
-    strokeWidth,
-    strokeColor,
-    shadowSize,
-    shadowColor,
-    size
-  }), new Poly.PolyRender(polygonCircleFromPoint(position, size), {
-    fillColor,
-    strokeColor,
-    strokeWidth,
-    enclosed: true
-  })];
-}
-
 let ShadowedPointSymbol = /*#__PURE__*/function (_PointSymbol) {
   _inherits(ShadowedPointSymbol, _PointSymbol);
 
@@ -1715,64 +1678,101 @@ let ShadowedPointSymbol = /*#__PURE__*/function (_PointSymbol) {
         position
       } = feature.projectTo(crs);
       const pxPosition = [position[0] / resolution + (this.offset[0] || 0), -position[1] / resolution + (this.offset[1] || 0)];
-      const shadowRender = this.getShadow(pxPosition, feature);
-      const pointArc = this.getPoint(pxPosition, feature);
+      const shadowRender = this.getShadow(pxPosition, feature, position);
+      const pointArc = this.getPoint(pxPosition, feature, position);
       return shadowRender ? [shadowRender, pointArc] : [pointArc];
     }
   }, {
     key: "getShadow",
-    value: function getShadow(position, _feature) {
-      return ShadowedPointSymbol.getShadowArc(position, this);
+    value: function getShadow(position, _feature, mapCoordinates) {
+      return ShadowedPointSymbol.getShadowArc(position, this, mapCoordinates);
     }
   }, {
     key: "getPoint",
-    value: function getPoint(position, _feature) {
-      return ShadowedPointSymbol.getPointArc(position, this);
+    value: function getPoint(position, _feature, mapCoordinates) {
+      return ShadowedPointSymbol.getPointArc(position, this, mapCoordinates);
     }
   }], [{
     key: "getShadowArc",
-    value: function getShadowArc(position, _ref) {
+    value: function getShadowArc(position, _ref, mapCoordinates) {
       let {
         strokeWidth = 2,
         shadowColor,
         shadowSize,
         size = 6
       } = _ref;
-      return new Poly.PolyRender(polygonCircleFromPoint(position, size + strokeWidth + shadowSize), {
-        fillColor: 'transparent',
+      return new Arc.Arc(position, {
+        fillColor: "transparent",
         strokeColor: shadowColor,
         strokeWidth: shadowSize,
-        enclosed: true
+        radius: (size + strokeWidth + shadowSize) / 2,
+        mapCoordinates
       });
     }
   }, {
     key: "getPointArc",
-    value: function getPointArc(position, _ref2) {
+    value: function getPointArc(position, _ref2, mapCoordinates) {
       let {
         strokeWidth,
         fillColor,
         strokeColor,
         size = 6
       } = _ref2;
-      return new Poly.PolyRender(polygonCircleFromPoint(position, size), {
+      return new Arc.Arc(position, {
         fillColor,
         strokeColor,
         strokeWidth,
-        enclosed: true
+        radius: size / 2,
+        mapCoordinates
       });
     }
-  }, {
-    key: "getArcs",
-    value: function getArcs(position, params) {
-      const shadowRender = ShadowedPointSymbol.getShadowArc(position, params);
-      const pointRender = ShadowedPointSymbol.getPointArc(position, params);
-      return shadowRender ? [shadowRender, pointRender] : [pointRender];
-    }
   }]);
 
   return ShadowedPointSymbol;
 }(Point.PointSymbol);
 
+const getSimplifiedPolygonCoordinates = function getSimplifiedPolygonCoordinates(feature, crs, tolerance) {
+  if (tolerance === void 0) {
+    tolerance = 1;
+  }
+
+  const projected = feature.crs.equals(crs) ? feature.rings : feature.projectTo(crs).rings;
+  return math.simplifyCoordinates(projected, tolerance);
+};
+function createShadowRender(position, _ref) {
+  let {
+    strokeWidth = 1,
+    shadowColor,
+    shadowSize,
+    size = 3,
+    mapCoordinates
+  } = _ref;
+  const shadowRadius = (size + strokeWidth + shadowSize) / 2;
+  return new Arc.Arc(position, {
+    fillColor: "transparent",
+    strokeColor: shadowColor,
+    strokeWidth: shadowSize,
+    radius: shadowRadius,
+    mapCoordinates
+  });
+}
+function createPointRender(position, _ref2) {
+  let {
+    strokeColor,
+    strokeWidth,
+    fillColor,
+    size = 3,
+    mapCoordinates
+  } = _ref2;
+  const radius = size / 2;
+  return new Arc.Arc(position, {
+    fillColor,
+    strokeColor,
+    strokeWidth,
+    radius,
+    mapCoordinates
+  });
+}
 let ShadowedPolySymbol = /*#__PURE__*/function (_PolylineSymbol) {
   _inherits(ShadowedPolySymbol, _PolylineSymbol);
 
@@ -1792,9 +1792,10 @@ let ShadowedPolySymbol = /*#__PURE__*/function (_PolylineSymbol) {
 
       const coordinates = _get(_getPrototypeOf(ShadowedPolySymbol.prototype), "getRenderedCoordinates", this).call(this, feature, resolution, crs);
 
-      const polyRender = this.getPolyRender(coordinates, feature);
-      const shadowRender = this.getShadow(coordinates, feature);
-      const vertexRenders = this.getVertexRenders(coordinates);
+      const simplifiedFeatureCoordinates = getSimplifiedPolygonCoordinates(feature, crs);
+      const polyRender = this.getPolyRender(coordinates, feature, simplifiedFeatureCoordinates);
+      const shadowRender = this.getShadow(coordinates, feature, simplifiedFeatureCoordinates);
+      const vertexRenders = this.getVertexRenders(coordinates, simplifiedFeatureCoordinates);
       let renders = [polyRender];
 
       if (shadowRender) {
@@ -1809,42 +1810,66 @@ let ShadowedPolySymbol = /*#__PURE__*/function (_PolylineSymbol) {
     }
   }, {
     key: "getShadow",
-    value: function getShadow(coordinates, _feature) {
+    value: function getShadow(coordinates, _feature, mapCoordinates) {
       return new Poly.PolyRender(coordinates, {
         fillStyle: Poly.FillStyle.None,
         enclosed: this.enclose,
         strokeColor: this.shadowColor,
         strokeWidth: this.shadowSize,
-        lineDash: this.lineDash
+        lineDash: this.lineDash,
+        mapCoordinates
       });
     }
   }, {
     key: "getPolyRender",
-    value: function getPolyRender(coordinates, _feature) {
+    value: function getPolyRender(coordinates, _feature, mapCoordinates) {
       return new Poly.PolyRender(coordinates, {
         fillStyle: this.enclose ? Poly.FillStyle.Color : Poly.FillStyle.None,
         enclosed: this.enclose,
         fillColor: this.fillColor,
         strokeColor: this.strokeColor,
         strokeWidth: this.strokeWidth,
-        lineDash: this.lineDash
+        lineDash: this.lineDash,
+        mapCoordinates
       });
     }
   }, {
     key: "getVertexRenders",
-    value: function getVertexRenders(coordinates) {
+    value: function getVertexRenders(coordinates, mapCoordinates) {
       if (!this.showVertex) return;
-      const vertexCoordinates = coordinates.reduce((acc, curr) => {
-        return acc.concat(curr);
-      }, []);
-      return vertexCoordinates.map(coord => getEditorPointRenderer(coord, {
-        size: 6,
-        strokeWidth: 2,
-        shadowColor: this.shadowColor,
-        strokeColor: this.strokeColor,
-        shadowSize: this.vertexShadowSize !== undefined ? this.vertexShadowSize : 2,
-        fillColor: '#ffffff'
-      })).reduce((acc, curr) => acc.concat(curr), []);
+      const pointRenderers = [];
+      const shadowRenderers = [];
+
+      for (let i = 0; i < coordinates.length; i++) {
+        const ring = coordinates[i];
+
+        for (let j = 0; j < ring.length; j++) {
+          const point = ring[j];
+          const featurePoint = mapCoordinates[i][j];
+          const shadowRender = createShadowRender(point, {
+            size: 6,
+            strokeWidth: 2,
+            shadowColor: this.shadowColor,
+            strokeColor: this.strokeColor,
+            shadowSize: this.vertexShadowSize !== undefined ? this.vertexShadowSize : 2,
+            fillColor: 'transparent',
+            mapCoordinates: featurePoint
+          });
+          const pointRender = createPointRender(point, {
+            size: 6,
+            strokeWidth: 2,
+            shadowColor: this.shadowColor,
+            strokeColor: this.strokeColor,
+            shadowSize: this.vertexShadowSize !== undefined ? this.vertexShadowSize : 2,
+            fillColor: '#ffffff',
+            mapCoordinates: featurePoint
+          });
+          shadowRenderers.push(shadowRender);
+          pointRenderers.push(pointRender);
+        }
+      }
+
+      return [...pointRenderers, ...shadowRenderers];
     }
   }]);
 
@@ -1897,15 +1922,15 @@ let SelectedPointSymbol = /*#__PURE__*/function (_ShadowedPointSymbol) {
 
   _createClass(SelectedPointSymbol, [{
     key: "getShadow",
-    value: function getShadow(position, feature) {
+    value: function getShadow(position, feature, mapCoordinates) {
       if (feature.isSelected) {
-        return _get(_getPrototypeOf(SelectedPointSymbol.prototype), "getShadow", this).call(this, position, feature);
+        return _get(_getPrototypeOf(SelectedPointSymbol.prototype), "getShadow", this).call(this, position, feature, mapCoordinates);
       }
     }
   }, {
     key: "getPoint",
-    value: function getPoint(position, feature) {
-      const pointRender = _get(_getPrototypeOf(SelectedPointSymbol.prototype), "getPoint", this).call(this, position, feature);
+    value: function getPoint(position, feature, mapCoordinates) {
+      const pointRender = _get(_getPrototypeOf(SelectedPointSymbol.prototype), "getPoint", this).call(this, position, feature, mapCoordinates);
 
       if (feature.isSelected) {
         pointRender.strokeColor = this.selectedStrokeColor;
@@ -1933,15 +1958,15 @@ let SelectedPolySymbol = /*#__PURE__*/function (_ShadowedPolySymbol) {
 
   _createClass(SelectedPolySymbol, [{
     key: "getShadow",
-    value: function getShadow(coordinates, feature) {
+    value: function getShadow(coordinates, feature, mapCoordinates) {
       if (feature.isSelected) {
-        return _get(_getPrototypeOf(SelectedPolySymbol.prototype), "getShadow", this).call(this, coordinates, feature);
+        return _get(_getPrototypeOf(SelectedPolySymbol.prototype), "getShadow", this).call(this, coordinates, feature, mapCoordinates);
       }
     }
   }, {
     key: "getPolyRender",
-    value: function getPolyRender(coordinates, feature) {
-      const polyRender = _get(_getPrototypeOf(SelectedPolySymbol.prototype), "getPolyRender", this).call(this, coordinates, feature);
+    value: function getPolyRender(coordinates, feature, mapCoordinates) {
+      const polyRender = _get(_getPrototypeOf(SelectedPolySymbol.prototype), "getPolyRender", this).call(this, coordinates, feature, mapCoordinates);
 
       if (feature.isSelected) {
         polyRender.fillColor = this.selectedFillColor;
@@ -7294,6 +7319,8 @@ exports.createHiddenCondition = createHiddenCondition;
 exports.createLabelSymbol = createLabelSymbol;
 exports.createLegendSymbol = createLegendSymbol;
 exports.createOtherHiddenCondition = createOtherHiddenCondition;
+exports.createPointRender = createPointRender;
+exports.createShadowRender = createShadowRender;
 exports.createSvgGradient = createSvgGradient;
 exports.createValueTitle = createValueTitle;
 exports.createValueTitleFromCondition = createValueTitleFromCondition;
@@ -7344,6 +7371,7 @@ exports.getRangeValues = getRangeValues$1;
 exports.getScale = getScale$1;
 exports.getServiceConfiguration = getServiceConfiguration;
 exports.getSignFromConditionPart = getSignFromConditionPart;
+exports.getSimplifiedPolygonCoordinates = getSimplifiedPolygonCoordinates;
 exports.getSymbolParameterInfo = getSymbolParameterInfo;
 exports.getSymbolRenders = getSymbolRenders;
 exports.getSymbolStrokeWidth = getSymbolStrokeWidth;