Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 161 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion packages/geo/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
"nosleep.js",
"striptags",
"ts-cacheable",
"ts-md5"
"ts-md5",
"@turf/helpers",
"@turf/boolean-intersects",
"@turf/buffer",
"@turf/intersect",
"@turf/line-intersect",
"@turf/point-on-feature"
],
"assets": [
{ "input": "", "glob": "**/*.them*.scss", "output": "" },
Expand Down
3 changes: 3 additions & 0 deletions packages/geo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
},
"dependencies": {
"@mat-datetimepicker/core": "^15.0.1",
"@turf/boolean-intersects": "^7.2.0",
"@turf/buffer": "^7.2.0",
"@turf/intersect": "^7.2.0",
"@turf/helpers": "^7.2.0",
"@turf/line-intersect": "^7.2.0",
"@turf/point-on-feature": "^7.2.0",
Expand Down
30 changes: 29 additions & 1 deletion packages/geo/src/lib/geometry/shared/geometry.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ import OlPoint from 'ol/geom/Point';
import OlPolygon from 'ol/geom/Polygon';
import * as olstyle from 'ol/style';

import { lineString } from '@turf/helpers';
import booleanIntersects from '@turf/boolean-intersects';
import buffer from '@turf/buffer';
import { Units, lineString } from '@turf/helpers';
import { feature as turfFeature } from '@turf/helpers';
import lineIntersect from '@turf/line-intersect';

import { FeatureGeometry } from '../../feature';
import {
GeometrySliceLineStringError,
GeometrySliceMultiPolygonError,
Expand Down Expand Up @@ -145,3 +149,27 @@ export function getMousePositionFromOlGeometryEvent(olEvent: BasicEvent) {
const olGeometryCast = olGeometry as OlPoint | OlLineString | OlCircle;
return olGeometryCast.getFlatCoordinates().slice(-2) as [number, number];
}

export function doesOlGeometryIntersects(
olGeometry1: OlGeometry,
olGeometry2: OlGeometry
): boolean {
const olGeoJSON = new OlGeoJSON();
const firstGeom = olGeoJSON.writeGeometryObject(olGeometry1);
const secondGeom = olGeoJSON.writeGeometryObject(olGeometry2);
return booleanIntersects(
firstGeom as FeatureGeometry,
secondGeom as FeatureGeometry
);
}

export function bufferOlGeometry(
olGeometry: OlGeometry,
dist: number,
units: Units = 'meters'
): FeatureGeometry {
const olGeoJSON = new OlGeoJSON();
const bufferedGeom = olGeoJSON.writeGeometryObject(olGeometry);
const buffered = buffer(turfFeature(bufferedGeom), dist, { units });
return buffered.geometry;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<igo-form
*ngIf="form$ | async as form"
[form]="form"
[formData]="data$ | async"
(submitForm)="onSubmit($event)"
>
<div *ngIf="form.fields.length" class="form-container">
<igo-form-field
*ngFor="let field of form.fields"
[field]="field"
></igo-form-field>
</div>

<div formButtons class="actions-container">
<button mat-stroked-button type="button" color="primary" (click)="clear()">
{{
'igo.geo.workspace.widget.interactiveSelection.reset.button' | translate
}}
</button>
<button
mat-flat-button
type="submit"
color="primary"
[disabled]="submitDisabled"
>
{{ submitButtonText$ | async | translate }}
</button>
</div>
</igo-form>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
:host {
.actions-container {
button:not(:last-child) {
margin-right: 8px;
}
}
.form-container {
width: 100%;
padding: 10px;

igo-form-field {
display: block;
height: auto;
}
}
}
Loading