Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Combine buildArea/buildRectangle in Pl3xmapMapProvider

Browse Source
This commit is contained in:
James Lyne 2022-01-14 20:52:37 +00:00
parent 6b232f387b
commit 61b6b820aa
1 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/providers/Pl3xmapMapProvider.ts
View File

@ -262,9 +262,6 @@ export default class Pl3xmapMapProvider extends MapProvider {
break; break;
case 'rectangle': case 'rectangle':
areas.set(`area-${areas.size}`, Pl3xmapMapProvider.buildRectangle(marker));
break;
case 'polygon': case 'polygon':
areas.set(`area-${areas.size}`, Pl3xmapMapProvider.buildArea(marker)); areas.set(`area-${areas.size}`, Pl3xmapMapProvider.buildArea(marker));
break; break;
@ -307,7 +304,18 @@ export default class Pl3xmapMapProvider extends MapProvider {
}; };
} }
private static buildRectangle(area: any): LiveAtlasAreaMarker { private static buildArea(area: any): LiveAtlasAreaMarker {
let points = area.points;
if(area.type === 'rectangle') {
points = [
{x: area.points[0].x, y: 0, z: area.points[0].z},
{x: area.points[0].x, y: 0, z: area.points[1].z},
{x: area.points[1].x, y: 0, z: area.points[1].z},
{x: area.points[1].x, y: 0, z: area.points[0].z},
];
}
return { return {
style: { style: {
stroke: typeof area.stroke !== 'undefined' ? !!area.stroke : true, stroke: typeof area.stroke !== 'undefined' ? !!area.stroke : true,
@ -319,38 +327,8 @@ export default class Pl3xmapMapProvider extends MapProvider {
fillOpacity: area.fillOpacity || 0.2, fillOpacity: area.fillOpacity || 0.2,
fillRule: area.fillRule, fillRule: area.fillRule,
}, },
points: [
{x: area.points[0].x, y: 0, z: area.points[0].z},
{x: area.points[0].x, y: 0, z: area.points[1].z},
{x: area.points[1].x, y: 0, z: area.points[1].z},
{x: area.points[1].x, y: 0, z: area.points[0].z},
],
location: getMiddleFromPoints(area.points),
outline: false,
tooltip: area.tooltip ? stripHTML(area.tooltip) : '',
tooltipHTML: area.tooltip,
popup: area.popup,
isPopupHTML: true,
};
}
private static buildArea(area: any): LiveAtlasAreaMarker {
const points = this.addY(area.points);
return {
style: {
stroke: typeof area.stroke !== 'undefined' ? !!area.stroke : true,
color: area.color || '#3388ff',
weight: area.weight || 3,
opacity: typeof area.opacity !== 'undefined' ? area.opacity : 1,
fill: typeof area.fill !== 'undefined' ? !!area.fill : true,
fillColor: area.fillColor || area.color || '#3388ff',
fillOpacity: area.fillOpacity || 0.2,
fillRule: area.fillRule,
},
points, points,
location: getMiddleFromPoints(points), location: getMiddleFromPoints(area.points),
outline: false, outline: false,
tooltip: area.tooltip ? stripHTML(area.tooltip) : '', tooltip: area.tooltip ? stripHTML(area.tooltip) : '',