@artstesh/maps 6.0.12 → 6.0.14
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/esm2022/map/models/polygon.model.mjs +4 -4
- package/dist/esm2022/src/map/models/polygon.model.mjs +4 -4
- package/dist/fesm2022/maps-components-src-map.mjs +7 -7
- package/dist/fesm2022/maps-components-src-map.mjs.map +1 -1
- package/dist/fesm2022/maps-components.mjs +7 -7
- package/dist/fesm2022/maps-components.mjs.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
|
info;
|
|
9
9
|
id;
|
|
@@ -31,10 +31,10 @@ export class PolygonModel {
|
|
|
31
31
|
feature.setId(id);
|
|
32
32
|
return new PolygonModel(feature, id, info);
|
|
33
33
|
}
|
|
34
|
-
static circle(id, lat, lng, radius, info) {
|
|
35
|
-
let feature = new Feature(
|
|
34
|
+
static circle(id, lat, lng, radius, vertices = 32, info) {
|
|
35
|
+
let feature = new Feature(circular([lng, lat], radius, vertices));
|
|
36
36
|
feature.setId(id);
|
|
37
37
|
return new PolygonModel(feature, id, info);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9seWdvbi5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21vZGVscy9wb2x5Z29uLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDdEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQWdCLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFcEQsTUFBTSxPQUFPLFlBQVk7SUFLc0Q7SUFKN0QsRUFBRSxDQUFrQjtJQUNwQixHQUFHLENBQVM7SUFDWixHQUFHLENBQVM7SUFFNUIsWUFBb0IsT0FBMEIsRUFBRSxFQUFvQixFQUFTLElBQTRCO1FBQTVCLFNBQUksR0FBSixJQUFJLENBQXdCO1FBQ3ZHLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDOUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxJQUFJLENBQUMsSUFBSTtZQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZFLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFHLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRU8sUUFBUSxDQUFvQjtJQUVwQyxJQUFXLE9BQU87UUFDaEIsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3ZCLENBQUM7SUFFTSxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQW1CLEVBQUUsSUFBWSxFQUFFLElBQTRCO1FBQ3ZGLElBQUksT0FBTyxHQUFHLElBQUksT0FBTyxFQUFFLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzlDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFTSxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQW1CLEVBQUUsR0FBVyxFQUFFLElBQTRCO1FBQ2xGLElBQUksT0FBTyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFTSxNQUFNLENBQUMsTUFBTSxDQUNsQixFQUFtQixFQUNuQixHQUFXLEVBQ1gsR0FBVyxFQUNYLE1BQWMsRUFDZCxXQUFtQixFQUFFLEVBQ3JCLElBQTRCO1FBRTVCLElBQUksT0FBTyxHQUFHLElBQUksT0FBTyxDQUFXLFFBQVEsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1RSxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLE9BQU8sSUFBSSxZQUFZLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJZEdlbmVyYXRvciB9IGZyb20gJy4uL2NvbW1vbi9pZC5nZW5lcmF0b3InO1xuaW1wb3J0IHsgRmVhdHVyZSB9IGZyb20gJ29sJztcbmltcG9ydCB7IENpcmNsZSwgR2VvbWV0cnkgfSBmcm9tICdvbC9nZW9tJztcbmltcG9ydCB7IEdlb0pTT04sIFdLVCB9IGZyb20gJ29sL2Zvcm1hdCc7XG5pbXBvcnQgeyBnZXRDZW50ZXIgfSBmcm9tICdvbC9leHRlbnQnO1xuaW1wb3J0IHsgTWFwQ29uc3RhbnRzIH0gZnJvbSAnLi9tYXAuY29uc3RhbnRzJztcbmltcG9ydCBQb2x5Z29uLCB7IGNpcmN1bGFyIH0gZnJvbSAnb2wvZ2VvbS9Qb2x5Z29uJztcblxuZXhwb3J0IGNsYXNzIFBvbHlnb25Nb2RlbCB7XG4gIHB1YmxpYyByZWFkb25seSBpZDogc3RyaW5nIHwgbnVtYmVyO1xuICBwdWJsaWMgcmVhZG9ubHkgbGF0OiBudW1iZXI7XG4gIHB1YmxpYyByZWFkb25seSBsbmc6IG51bWJlcjtcblxuICBwcml2YXRlIGNvbnN0cnVjdG9yKGZlYXR1cmU6IEZlYXR1cmU8R2VvbWV0cnk+LCBpZD86IHN0cmluZyB8IG51bWJlciwgcHVibGljIGluZm8/OiB7IFtpZDogc3RyaW5nXTogYW55IH0pIHtcbiAgICB0aGlzLmlkID0gaWQgPT0gbnVsbCA/IElkR2VuZXJhdG9yLmdldCgpIDogaWQ7XG4gICAgdGhpcy5fZmVhdHVyZSA9IGZlYXR1cmU7XG4gICAgaWYgKHRoaXMuaW5mbykgdGhpcy5fZmVhdHVyZT8uc2V0KE1hcENvbnN0YW50cy5GZWF0dXJlSW5mbywgdGhpcy5pbmZvKTtcbiAgICBbdGhpcy5sbmcsIHRoaXMubGF0XSA9IGdldENlbnRlcih0aGlzLl9mZWF0dXJlLmdldEdlb21ldHJ5KCk/LmdldEV4dGVudCgpISk7XG4gIH1cblxuICBwcml2YXRlIF9mZWF0dXJlOiBGZWF0dXJlPEdlb21ldHJ5PjtcblxuICBwdWJsaWMgZ2V0IGZlYXR1cmUoKTogRmVhdHVyZTxHZW9tZXRyeT4ge1xuICAgIHJldHVybiB0aGlzLl9mZWF0dXJlO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBmcm9tR2VvSnNvbihpZDogc3RyaW5nIHwgbnVtYmVyLCBqc29uOiBzdHJpbmcsIGluZm8/OiB7IFtpZDogc3RyaW5nXTogYW55IH0pOiBQb2x5Z29uTW9kZWwge1xuICAgIGxldCBmZWF0dXJlID0gbmV3IEdlb0pTT04oKS5yZWFkRmVhdHVyZShqc29uKTtcbiAgICBmZWF0dXJlLnNldElkKGlkKTtcbiAgICByZXR1cm4gbmV3IFBvbHlnb25Nb2RlbChmZWF0dXJlLCBpZCwgaW5mbyk7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGZyb21XS1QoaWQ6IHN0cmluZyB8IG51bWJlciwgd2t0OiBzdHJpbmcsIGluZm8/OiB7IFtpZDogc3RyaW5nXTogYW55IH0pOiBQb2x5Z29uTW9kZWwge1xuICAgIGxldCBmZWF0dXJlID0gbmV3IFdLVCgpLnJlYWRGZWF0dXJlKHdrdCk7XG4gICAgZmVhdHVyZS5zZXRJZChpZCk7XG4gICAgcmV0dXJuIG5ldyBQb2x5Z29uTW9kZWwoZmVhdHVyZSwgaWQsIGluZm8pO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBjaXJjbGUoXG4gICAgaWQ6IHN0cmluZyB8IG51bWJlcixcbiAgICBsYXQ6IG51bWJlcixcbiAgICBsbmc6IG51bWJlcixcbiAgICByYWRpdXM6IG51bWJlcixcbiAgICB2ZXJ0aWNlczogbnVtYmVyID0gMzIsXG4gICAgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSxcbiAgKTogUG9seWdvbk1vZGVsIHtcbiAgICBsZXQgZmVhdHVyZSA9IG5ldyBGZWF0dXJlPEdlb21ldHJ5PihjaXJjdWxhcihbbG5nLCBsYXRdLCByYWRpdXMsIHZlcnRpY2VzKSk7XG4gICAgZmVhdHVyZS5zZXRJZChpZCk7XG4gICAgcmV0dXJuIG5ldyBQb2x5Z29uTW9kZWwoZmVhdHVyZSwgaWQsIGluZm8pO1xuICB9XG59XG4iXX0=
|
|
@@ -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
|
info;
|
|
9
9
|
id;
|
|
@@ -31,10 +31,10 @@ export class PolygonModel {
|
|
|
31
31
|
feature.setId(id);
|
|
32
32
|
return new PolygonModel(feature, id, info);
|
|
33
33
|
}
|
|
34
|
-
static circle(id, lat, lng, radius, info) {
|
|
35
|
-
let feature = new Feature(
|
|
34
|
+
static circle(id, lat, lng, radius, vertices = 32, info) {
|
|
35
|
+
let feature = new Feature(circular([lng, lat], radius, vertices));
|
|
36
36
|
feature.setId(id);
|
|
37
37
|
return new PolygonModel(feature, id, info);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9seWdvbi5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hcHMtY29tcG9uZW50cy9zcmMvbWFwL21vZGVscy9wb2x5Z29uLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDdEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQWdCLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFcEQsTUFBTSxPQUFPLFlBQVk7SUFLc0Q7SUFKN0QsRUFBRSxDQUFrQjtJQUNwQixHQUFHLENBQVM7SUFDWixHQUFHLENBQVM7SUFFNUIsWUFBb0IsT0FBMEIsRUFBRSxFQUFvQixFQUFTLElBQTRCO1FBQTVCLFNBQUksR0FBSixJQUFJLENBQXdCO1FBQ3ZHLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDOUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxJQUFJLENBQUMsSUFBSTtZQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZFLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFHLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRU8sUUFBUSxDQUFvQjtJQUVwQyxJQUFXLE9BQU87UUFDaEIsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3ZCLENBQUM7SUFFTSxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQW1CLEVBQUUsSUFBWSxFQUFFLElBQTRCO1FBQ3ZGLElBQUksT0FBTyxHQUFHLElBQUksT0FBTyxFQUFFLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzlDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFTSxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQW1CLEVBQUUsR0FBVyxFQUFFLElBQTRCO1FBQ2xGLElBQUksT0FBTyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFTSxNQUFNLENBQUMsTUFBTSxDQUNsQixFQUFtQixFQUNuQixHQUFXLEVBQ1gsR0FBVyxFQUNYLE1BQWMsRUFDZCxXQUFtQixFQUFFLEVBQ3JCLElBQTRCO1FBRTVCLElBQUksT0FBTyxHQUFHLElBQUksT0FBTyxDQUFXLFFBQVEsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1RSxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLE9BQU8sSUFBSSxZQUFZLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJZEdlbmVyYXRvciB9IGZyb20gJy4uL2NvbW1vbi9pZC5nZW5lcmF0b3InO1xuaW1wb3J0IHsgRmVhdHVyZSB9IGZyb20gJ29sJztcbmltcG9ydCB7IENpcmNsZSwgR2VvbWV0cnkgfSBmcm9tICdvbC9nZW9tJztcbmltcG9ydCB7IEdlb0pTT04sIFdLVCB9IGZyb20gJ29sL2Zvcm1hdCc7XG5pbXBvcnQgeyBnZXRDZW50ZXIgfSBmcm9tICdvbC9leHRlbnQnO1xuaW1wb3J0IHsgTWFwQ29uc3RhbnRzIH0gZnJvbSAnLi9tYXAuY29uc3RhbnRzJztcbmltcG9ydCBQb2x5Z29uLCB7IGNpcmN1bGFyIH0gZnJvbSAnb2wvZ2VvbS9Qb2x5Z29uJztcblxuZXhwb3J0IGNsYXNzIFBvbHlnb25Nb2RlbCB7XG4gIHB1YmxpYyByZWFkb25seSBpZDogc3RyaW5nIHwgbnVtYmVyO1xuICBwdWJsaWMgcmVhZG9ubHkgbGF0OiBudW1iZXI7XG4gIHB1YmxpYyByZWFkb25seSBsbmc6IG51bWJlcjtcblxuICBwcml2YXRlIGNvbnN0cnVjdG9yKGZlYXR1cmU6IEZlYXR1cmU8R2VvbWV0cnk+LCBpZD86IHN0cmluZyB8IG51bWJlciwgcHVibGljIGluZm8/OiB7IFtpZDogc3RyaW5nXTogYW55IH0pIHtcbiAgICB0aGlzLmlkID0gaWQgPT0gbnVsbCA/IElkR2VuZXJhdG9yLmdldCgpIDogaWQ7XG4gICAgdGhpcy5fZmVhdHVyZSA9IGZlYXR1cmU7XG4gICAgaWYgKHRoaXMuaW5mbykgdGhpcy5fZmVhdHVyZT8uc2V0KE1hcENvbnN0YW50cy5GZWF0dXJlSW5mbywgdGhpcy5pbmZvKTtcbiAgICBbdGhpcy5sbmcsIHRoaXMubGF0XSA9IGdldENlbnRlcih0aGlzLl9mZWF0dXJlLmdldEdlb21ldHJ5KCk/LmdldEV4dGVudCgpISk7XG4gIH1cblxuICBwcml2YXRlIF9mZWF0dXJlOiBGZWF0dXJlPEdlb21ldHJ5PjtcblxuICBwdWJsaWMgZ2V0IGZlYXR1cmUoKTogRmVhdHVyZTxHZW9tZXRyeT4ge1xuICAgIHJldHVybiB0aGlzLl9mZWF0dXJlO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBmcm9tR2VvSnNvbihpZDogc3RyaW5nIHwgbnVtYmVyLCBqc29uOiBzdHJpbmcsIGluZm8/OiB7IFtpZDogc3RyaW5nXTogYW55IH0pOiBQb2x5Z29uTW9kZWwge1xuICAgIGxldCBmZWF0dXJlID0gbmV3IEdlb0pTT04oKS5yZWFkRmVhdHVyZShqc29uKTtcbiAgICBmZWF0dXJlLnNldElkKGlkKTtcbiAgICByZXR1cm4gbmV3IFBvbHlnb25Nb2RlbChmZWF0dXJlLCBpZCwgaW5mbyk7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGZyb21XS1QoaWQ6IHN0cmluZyB8IG51bWJlciwgd2t0OiBzdHJpbmcsIGluZm8/OiB7IFtpZDogc3RyaW5nXTogYW55IH0pOiBQb2x5Z29uTW9kZWwge1xuICAgIGxldCBmZWF0dXJlID0gbmV3IFdLVCgpLnJlYWRGZWF0dXJlKHdrdCk7XG4gICAgZmVhdHVyZS5zZXRJZChpZCk7XG4gICAgcmV0dXJuIG5ldyBQb2x5Z29uTW9kZWwoZmVhdHVyZSwgaWQsIGluZm8pO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBjaXJjbGUoXG4gICAgaWQ6IHN0cmluZyB8IG51bWJlcixcbiAgICBsYXQ6IG51bWJlcixcbiAgICBsbmc6IG51bWJlcixcbiAgICByYWRpdXM6IG51bWJlcixcbiAgICB2ZXJ0aWNlczogbnVtYmVyID0gMzIsXG4gICAgaW5mbz86IHsgW2lkOiBzdHJpbmddOiBhbnkgfSxcbiAgKTogUG9seWdvbk1vZGVsIHtcbiAgICBsZXQgZmVhdHVyZSA9IG5ldyBGZWF0dXJlPEdlb21ldHJ5PihjaXJjdWxhcihbbG5nLCBsYXRdLCByYWRpdXMsIHZlcnRpY2VzKSk7XG4gICAgZmVhdHVyZS5zZXRJZChpZCk7XG4gICAgcmV0dXJuIG5ldyBQb2x5Z29uTW9kZWwoZmVhdHVyZSwgaWQsIGluZm8pO1xuICB9XG59XG4iXX0=
|
|
@@ -3,9 +3,10 @@ import { Component, Injectable, ChangeDetectionStrategy, Input, ViewChild, NgMod
|
|
|
3
3
|
import * as i4 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 {
|
|
@@ -245,8 +245,8 @@ class PolygonModel {
|
|
|
245
245
|
feature.setId(id);
|
|
246
246
|
return new PolygonModel(feature, id, info);
|
|
247
247
|
}
|
|
248
|
-
static circle(id, lat, lng, radius, info) {
|
|
249
|
-
let feature = new Feature(
|
|
248
|
+
static circle(id, lat, lng, radius, vertices = 32, info) {
|
|
249
|
+
let feature = new Feature(circular([lng, lat], radius, vertices));
|
|
250
250
|
feature.setId(id);
|
|
251
251
|
return new PolygonModel(feature, id, info);
|
|
252
252
|
}
|
|
@@ -2628,7 +2628,7 @@ class MarkerStyleHelper {
|
|
|
2628
2628
|
*/
|
|
2629
2629
|
static circle(radius, fill, strokeColor, strokeWidth = 1) {
|
|
2630
2630
|
return new Style({
|
|
2631
|
-
image: new Circle
|
|
2631
|
+
image: new Circle({
|
|
2632
2632
|
radius,
|
|
2633
2633
|
fill: new Fill({ color: fill }),
|
|
2634
2634
|
stroke: new Stroke({ color: strokeColor, width: strokeWidth }),
|
|
@@ -2683,7 +2683,7 @@ class PolygonStyleHelper {
|
|
|
2683
2683
|
*/
|
|
2684
2684
|
static edit(fill, stroke, strokeWidth = 1, pinRadius = 5) {
|
|
2685
2685
|
return new Style({
|
|
2686
|
-
image: new Circle
|
|
2686
|
+
image: new Circle({
|
|
2687
2687
|
fill: new Fill({
|
|
2688
2688
|
color: stroke,
|
|
2689
2689
|
}),
|