@artstesh/maps 1.1.18 → 1.1.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/maps-components-src-map.umd.js +8 -7
- package/dist/bundles/maps-components-src-map.umd.js.map +1 -1
- package/dist/bundles/maps-components.umd.js +8 -7
- package/dist/bundles/maps-components.umd.js.map +1 -1
- package/dist/esm2015/map/models/polygon.model.js +4 -4
- package/dist/esm2015/src/map/models/polygon.model.js +4 -4
- package/dist/fesm2015/maps-components-src-map.js +7 -7
- package/dist/fesm2015/maps-components-src-map.js.map +1 -1
- package/dist/fesm2015/maps-components.js +7 -7
- package/dist/fesm2015/maps-components.js.map +1 -1
- package/dist/map/models/polygon.model.d.ts +1 -1
- package/dist/src/map/models/polygon.model.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { IdGenerator } from '../common/id.generator';
|
|
2
2
|
import { Feature } from 'ol';
|
|
3
|
-
import { Circle } from 'ol/geom';
|
|
4
3
|
import { GeoJSON, WKT } from 'ol/format';
|
|
5
4
|
import { getCenter } from 'ol/extent';
|
|
6
5
|
import { MapConstants } from './map.constants';
|
|
6
|
+
import { circular } from 'ol/geom/Polygon';
|
|
7
7
|
export class PolygonModel {
|
|
8
8
|
constructor(feature, id, info) {
|
|
9
9
|
var _a, _b;
|
|
@@ -27,10 +27,10 @@ export class PolygonModel {
|
|
|
27
27
|
feature.setId(id);
|
|
28
28
|
return new PolygonModel(feature, id, info);
|
|
29
29
|
}
|
|
30
|
-
static circle(id, lat, lng, radius, info) {
|
|
31
|
-
let feature = new Feature(
|
|
30
|
+
static circle(id, lat, lng, radius, vertices = 32, info) {
|
|
31
|
+
let feature = new Feature(circular([lng, lat], radius, vertices));
|
|
32
32
|
feature.setId(id);
|
|
33
33
|
return new PolygonModel(feature, id, info);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9seWdvbi5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21vZGVscy9wb2x5Z29uLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDdEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQWdCLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFcEQsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBb0IsT0FBMEIsRUFBRSxFQUFvQixFQUFTLElBQTRCOztRQUE1QixTQUFJLEdBQUosSUFBSSxDQUF3QjtRQUN2RyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQzlDLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1FBQ3hCLElBQUksSUFBSSxDQUFDLElBQUk7WUFBRSxNQUFBLElBQUksQ0FBQyxRQUFRLDBDQUFFLEdBQUcsQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFBLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLDBDQUFFLFNBQVMsRUFBRyxDQUFDLENBQUM7SUFDOUUsQ0FBQztJQUlELElBQVcsT0FBTztRQUNoQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDdkIsQ0FBQztJQUVNLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBbUIsRUFBRSxJQUFZLEVBQUUsSUFBNEI7UUFDdkYsSUFBSSxPQUFPLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDOUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNsQixPQUFPLElBQUksWUFBWSxDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBbUIsRUFBRSxHQUFXLEVBQUUsSUFBNEI7UUFDbEYsSUFBSSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNsQixPQUFPLElBQUksWUFBWSxDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxNQUFNLENBQ2xCLEVBQW1CLEVBQ25CLEdBQVcsRUFDWCxHQUFXLEVBQ1gsTUFBYyxFQUNkLFdBQW1CLEVBQUUsRUFDckIsSUFBNEI7UUFFNUIsSUFBSSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQVcsUUFBUSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQzVFLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElkR2VuZXJhdG9yIH0gZnJvbSAnLi4vY29tbW9uL2lkLmdlbmVyYXRvcic7XG5pbXBvcnQgeyBGZWF0dXJlIH0gZnJvbSAnb2wnO1xuaW1wb3J0IHsgQ2lyY2xlLCBHZW9tZXRyeSB9IGZyb20gJ29sL2dlb20nO1xuaW1wb3J0IHsgR2VvSlNPTiwgV0tUIH0gZnJvbSAnb2wvZm9ybWF0JztcbmltcG9ydCB7IGdldENlbnRlciB9IGZyb20gJ29sL2V4dGVudCc7XG5pbXBvcnQgeyBNYXBDb25zdGFudHMgfSBmcm9tICcuL21hcC5jb25zdGFudHMnO1xuaW1wb3J0IFBvbHlnb24sIHsgY2lyY3VsYXIgfSBmcm9tICdvbC9nZW9tL1BvbHlnb24nO1xuXG5leHBvcnQgY2xhc3MgUG9seWdvbk1vZGVsIHtcbiAgcHVibGljIHJlYWRvbmx5IGlkOiBzdHJpbmcgfCBudW1iZXI7XG4gIHB1YmxpYyByZWFkb25seSBsYXQ6IG51bWJlcjtcbiAgcHVibGljIHJlYWRvbmx5IGxuZzogbnVtYmVyO1xuXG4gIHByaXZhdGUgY29uc3RydWN0b3IoZmVhdHVyZTogRmVhdHVyZTxHZW9tZXRyeT4sIGlkPzogc3RyaW5nIHwgbnVtYmVyLCBwdWJsaWMgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSkge1xuICAgIHRoaXMuaWQgPSBpZCA9PSBudWxsID8gSWRHZW5lcmF0b3IuZ2V0KCkgOiBpZDtcbiAgICB0aGlzLl9mZWF0dXJlID0gZmVhdHVyZTtcbiAgICBpZiAodGhpcy5pbmZvKSB0aGlzLl9mZWF0dXJlPy5zZXQoTWFwQ29uc3RhbnRzLkZlYXR1cmVJbmZvLCB0aGlzLmluZm8pO1xuICAgIFt0aGlzLmxuZywgdGhpcy5sYXRdID0gZ2V0Q2VudGVyKHRoaXMuX2ZlYXR1cmUuZ2V0R2VvbWV0cnkoKT8uZ2V0RXh0ZW50KCkhKTtcbiAgfVxuXG4gIHByaXZhdGUgX2ZlYXR1cmU6IEZlYXR1cmU8R2VvbWV0cnk+O1xuXG4gIHB1YmxpYyBnZXQgZmVhdHVyZSgpOiBGZWF0dXJlPEdlb21ldHJ5PiB7XG4gICAgcmV0dXJuIHRoaXMuX2ZlYXR1cmU7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGZyb21HZW9Kc29uKGlkOiBzdHJpbmcgfCBudW1iZXIsIGpzb246IHN0cmluZywgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSk6IFBvbHlnb25Nb2RlbCB7XG4gICAgbGV0IGZlYXR1cmUgPSBuZXcgR2VvSlNPTigpLnJlYWRGZWF0dXJlKGpzb24pO1xuICAgIGZlYXR1cmUuc2V0SWQoaWQpO1xuICAgIHJldHVybiBuZXcgUG9seWdvbk1vZGVsKGZlYXR1cmUsIGlkLCBpbmZvKTtcbiAgfVxuXG4gIHB1YmxpYyBzdGF0aWMgZnJvbVdLVChpZDogc3RyaW5nIHwgbnVtYmVyLCB3a3Q6IHN0cmluZywgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSk6IFBvbHlnb25Nb2RlbCB7XG4gICAgbGV0IGZlYXR1cmUgPSBuZXcgV0tUKCkucmVhZEZlYXR1cmUod2t0KTtcbiAgICBmZWF0dXJlLnNldElkKGlkKTtcbiAgICByZXR1cm4gbmV3IFBvbHlnb25Nb2RlbChmZWF0dXJlLCBpZCwgaW5mbyk7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGNpcmNsZShcbiAgICBpZDogc3RyaW5nIHwgbnVtYmVyLFxuICAgIGxhdDogbnVtYmVyLFxuICAgIGxuZzogbnVtYmVyLFxuICAgIHJhZGl1czogbnVtYmVyLFxuICAgIHZlcnRpY2VzOiBudW1iZXIgPSAzMixcbiAgICBpbmZvPzogeyBbaWQ6IHN0cmluZ106IGFueSB9LFxuICApOiBQb2x5Z29uTW9kZWwge1xuICAgIGxldCBmZWF0dXJlID0gbmV3IEZlYXR1cmU8R2VvbWV0cnk+KGNpcmN1bGFyKFtsbmcsIGxhdF0sIHJhZGl1cywgdmVydGljZXMpKTtcbiAgICBmZWF0dXJlLnNldElkKGlkKTtcbiAgICByZXR1cm4gbmV3IFBvbHlnb25Nb2RlbChmZWF0dXJlLCBpZCwgaW5mbyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { IdGenerator } from '../common/id.generator';
|
|
2
2
|
import { Feature } from 'ol';
|
|
3
|
-
import { Circle } from 'ol/geom';
|
|
4
3
|
import { GeoJSON, WKT } from 'ol/format';
|
|
5
4
|
import { getCenter } from 'ol/extent';
|
|
6
5
|
import { MapConstants } from './map.constants';
|
|
6
|
+
import { circular } from 'ol/geom/Polygon';
|
|
7
7
|
export class PolygonModel {
|
|
8
8
|
constructor(feature, id, info) {
|
|
9
9
|
var _a, _b;
|
|
@@ -27,10 +27,10 @@ export class PolygonModel {
|
|
|
27
27
|
feature.setId(id);
|
|
28
28
|
return new PolygonModel(feature, id, info);
|
|
29
29
|
}
|
|
30
|
-
static circle(id, lat, lng, radius, info) {
|
|
31
|
-
let feature = new Feature(
|
|
30
|
+
static circle(id, lat, lng, radius, vertices = 32, info) {
|
|
31
|
+
let feature = new Feature(circular([lng, lat], radius, vertices));
|
|
32
32
|
feature.setId(id);
|
|
33
33
|
return new PolygonModel(feature, id, info);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9seWdvbi5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21vZGVscy9wb2x5Z29uLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDdEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQWdCLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFcEQsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBb0IsT0FBMEIsRUFBRSxFQUFvQixFQUFTLElBQTRCOztRQUE1QixTQUFJLEdBQUosSUFBSSxDQUF3QjtRQUN2RyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQzlDLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1FBQ3hCLElBQUksSUFBSSxDQUFDLElBQUk7WUFBRSxNQUFBLElBQUksQ0FBQyxRQUFRLDBDQUFFLEdBQUcsQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFBLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLDBDQUFFLFNBQVMsRUFBRyxDQUFDLENBQUM7SUFDOUUsQ0FBQztJQUlELElBQVcsT0FBTztRQUNoQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDdkIsQ0FBQztJQUVNLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBbUIsRUFBRSxJQUFZLEVBQUUsSUFBNEI7UUFDdkYsSUFBSSxPQUFPLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDOUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNsQixPQUFPLElBQUksWUFBWSxDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBbUIsRUFBRSxHQUFXLEVBQUUsSUFBNEI7UUFDbEYsSUFBSSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNsQixPQUFPLElBQUksWUFBWSxDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxNQUFNLENBQ2xCLEVBQW1CLEVBQ25CLEdBQVcsRUFDWCxHQUFXLEVBQ1gsTUFBYyxFQUNkLFdBQW1CLEVBQUUsRUFDckIsSUFBNEI7UUFFNUIsSUFBSSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQVcsUUFBUSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQzVFLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElkR2VuZXJhdG9yIH0gZnJvbSAnLi4vY29tbW9uL2lkLmdlbmVyYXRvcic7XG5pbXBvcnQgeyBGZWF0dXJlIH0gZnJvbSAnb2wnO1xuaW1wb3J0IHsgQ2lyY2xlLCBHZW9tZXRyeSB9IGZyb20gJ29sL2dlb20nO1xuaW1wb3J0IHsgR2VvSlNPTiwgV0tUIH0gZnJvbSAnb2wvZm9ybWF0JztcbmltcG9ydCB7IGdldENlbnRlciB9IGZyb20gJ29sL2V4dGVudCc7XG5pbXBvcnQgeyBNYXBDb25zdGFudHMgfSBmcm9tICcuL21hcC5jb25zdGFudHMnO1xuaW1wb3J0IFBvbHlnb24sIHsgY2lyY3VsYXIgfSBmcm9tICdvbC9nZW9tL1BvbHlnb24nO1xuXG5leHBvcnQgY2xhc3MgUG9seWdvbk1vZGVsIHtcbiAgcHVibGljIHJlYWRvbmx5IGlkOiBzdHJpbmcgfCBudW1iZXI7XG4gIHB1YmxpYyByZWFkb25seSBsYXQ6IG51bWJlcjtcbiAgcHVibGljIHJlYWRvbmx5IGxuZzogbnVtYmVyO1xuXG4gIHByaXZhdGUgY29uc3RydWN0b3IoZmVhdHVyZTogRmVhdHVyZTxHZW9tZXRyeT4sIGlkPzogc3RyaW5nIHwgbnVtYmVyLCBwdWJsaWMgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSkge1xuICAgIHRoaXMuaWQgPSBpZCA9PSBudWxsID8gSWRHZW5lcmF0b3IuZ2V0KCkgOiBpZDtcbiAgICB0aGlzLl9mZWF0dXJlID0gZmVhdHVyZTtcbiAgICBpZiAodGhpcy5pbmZvKSB0aGlzLl9mZWF0dXJlPy5zZXQoTWFwQ29uc3RhbnRzLkZlYXR1cmVJbmZvLCB0aGlzLmluZm8pO1xuICAgIFt0aGlzLmxuZywgdGhpcy5sYXRdID0gZ2V0Q2VudGVyKHRoaXMuX2ZlYXR1cmUuZ2V0R2VvbWV0cnkoKT8uZ2V0RXh0ZW50KCkhKTtcbiAgfVxuXG4gIHByaXZhdGUgX2ZlYXR1cmU6IEZlYXR1cmU8R2VvbWV0cnk+O1xuXG4gIHB1YmxpYyBnZXQgZmVhdHVyZSgpOiBGZWF0dXJlPEdlb21ldHJ5PiB7XG4gICAgcmV0dXJuIHRoaXMuX2ZlYXR1cmU7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGZyb21HZW9Kc29uKGlkOiBzdHJpbmcgfCBudW1iZXIsIGpzb246IHN0cmluZywgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSk6IFBvbHlnb25Nb2RlbCB7XG4gICAgbGV0IGZlYXR1cmUgPSBuZXcgR2VvSlNPTigpLnJlYWRGZWF0dXJlKGpzb24pO1xuICAgIGZlYXR1cmUuc2V0SWQoaWQpO1xuICAgIHJldHVybiBuZXcgUG9seWdvbk1vZGVsKGZlYXR1cmUsIGlkLCBpbmZvKTtcbiAgfVxuXG4gIHB1YmxpYyBzdGF0aWMgZnJvbVdLVChpZDogc3RyaW5nIHwgbnVtYmVyLCB3a3Q6IHN0cmluZywgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSk6IFBvbHlnb25Nb2RlbCB7XG4gICAgbGV0IGZlYXR1cmUgPSBuZXcgV0tUKCkucmVhZEZlYXR1cmUod2t0KTtcbiAgICBmZWF0dXJlLnNldElkKGlkKTtcbiAgICByZXR1cm4gbmV3IFBvbHlnb25Nb2RlbChmZWF0dXJlLCBpZCwgaW5mbyk7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGNpcmNsZShcbiAgICBpZDogc3RyaW5nIHwgbnVtYmVyLFxuICAgIGxhdDogbnVtYmVyLFxuICAgIGxuZzogbnVtYmVyLFxuICAgIHJhZGl1czogbnVtYmVyLFxuICAgIHZlcnRpY2VzOiBudW1iZXIgPSAzMixcbiAgICBpbmZvPzogeyBbaWQ6IHN0cmluZ106IGFueSB9LFxuICApOiBQb2x5Z29uTW9kZWwge1xuICAgIGxldCBmZWF0dXJlID0gbmV3IEZlYXR1cmU8R2VvbWV0cnk+KGNpcmN1bGFyKFtsbmcsIGxhdF0sIHJhZGl1cywgdmVydGljZXMpKTtcbiAgICBmZWF0dXJlLnNldElkKGlkKTtcbiAgICByZXR1cm4gbmV3IFBvbHlnb25Nb2RlbChmZWF0dXJlLCBpZCwgaW5mbyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,9 +3,10 @@ import { Component, Injectable, ChangeDetectionStrategy, Input, ViewChild, NgMod
|
|
|
3
3
|
import * as i6 from '@angular/common';
|
|
4
4
|
import { CommonModule } from '@angular/common';
|
|
5
5
|
import { Feature, Collection } from 'ol';
|
|
6
|
-
import { Point
|
|
6
|
+
import { Point } from 'ol/geom';
|
|
7
7
|
import { GeoJSON, WKT } from 'ol/format';
|
|
8
8
|
import { getCenter, createEmpty, extend } from 'ol/extent';
|
|
9
|
+
import Polygon, { circular, fromExtent } from 'ol/geom/Polygon';
|
|
9
10
|
import { Control, Zoom } from 'ol/control';
|
|
10
11
|
import { get, useGeographic, transform } from 'ol/proj';
|
|
11
12
|
import { PostboyGenericMessage, PostboyCallbackMessage, PostboyExecutor, PostboyService, PostboyAbstractRegistrator } from '@artstesh/postboy';
|
|
@@ -19,14 +20,13 @@ import TileLayer from 'ol/layer/Tile';
|
|
|
19
20
|
import OSM from 'ol/source/OSM';
|
|
20
21
|
import { Vector as Vector$1 } from 'ol/layer';
|
|
21
22
|
import { bbox } from 'ol/loadingstrategy';
|
|
22
|
-
import Polygon, { fromExtent } from 'ol/geom/Polygon';
|
|
23
23
|
import Cluster from 'ol/source/Cluster';
|
|
24
24
|
import { combineLatest } from 'rxjs';
|
|
25
25
|
import Map from 'ol/Map';
|
|
26
26
|
import View from 'ol/View';
|
|
27
27
|
import Overlay from 'ol/Overlay';
|
|
28
28
|
import Style from 'ol/style/Style';
|
|
29
|
-
import { Icon, Circle
|
|
29
|
+
import { Icon, Circle, Fill, Stroke, Text } from 'ol/style';
|
|
30
30
|
import { METERS_PER_UNIT } from 'ol/proj/epsg4326';
|
|
31
31
|
|
|
32
32
|
class DestructibleComponent {
|
|
@@ -239,8 +239,8 @@ class PolygonModel {
|
|
|
239
239
|
feature.setId(id);
|
|
240
240
|
return new PolygonModel(feature, id, info);
|
|
241
241
|
}
|
|
242
|
-
static circle(id, lat, lng, radius, info) {
|
|
243
|
-
let feature = new Feature(
|
|
242
|
+
static circle(id, lat, lng, radius, vertices = 32, info) {
|
|
243
|
+
let feature = new Feature(circular([lng, lat], radius, vertices));
|
|
244
244
|
feature.setId(id);
|
|
245
245
|
return new PolygonModel(feature, id, info);
|
|
246
246
|
}
|
|
@@ -2600,7 +2600,7 @@ class MarkerStyleHelper {
|
|
|
2600
2600
|
*/
|
|
2601
2601
|
static circle(radius, fill, strokeColor, strokeWidth = 1) {
|
|
2602
2602
|
return new Style({
|
|
2603
|
-
image: new Circle
|
|
2603
|
+
image: new Circle({
|
|
2604
2604
|
radius,
|
|
2605
2605
|
fill: new Fill({ color: fill }),
|
|
2606
2606
|
stroke: new Stroke({ color: strokeColor, width: strokeWidth }),
|
|
@@ -2655,7 +2655,7 @@ class PolygonStyleHelper {
|
|
|
2655
2655
|
*/
|
|
2656
2656
|
static edit(fill, stroke, strokeWidth = 1, pinRadius = 5) {
|
|
2657
2657
|
return new Style({
|
|
2658
|
-
image: new Circle
|
|
2658
|
+
image: new Circle({
|
|
2659
2659
|
fill: new Fill({
|
|
2660
2660
|
color: stroke,
|
|
2661
2661
|
}),
|