Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat_geoloc #371

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Feat_geoloc #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e97e65
Merge pull request #243 from PnX-SI/develop
camillemonchicourt Aug 23, 2023
b24a584
Merge remote-tracking branch 'origin/develop' into main
amandine-sahl Dec 5, 2023
24bdc9e
Merge branch 'develop' - release 0.7.2
amandine-sahl Feb 27, 2024
02f5fd5
Merge remote-tracking branch 'origin/develop'
amandine-sahl May 3, 2024
c0490b9
Update monitoring-map.component.html
pierre56 Oct 2, 2024
bedc7e5
Update monitoring-object.component.html
pierre56 Oct 2, 2024
8b0837a
Merge pull request #1 from pierre56/patch-2
pierre56 Oct 2, 2024
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
2 changes: 1 addition & 1 deletion frontend/app/components/monitoring-map/monitoring-map.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="geometry" class="monitoring-map-container">
<pnx-map [height]="heightMap" [ngClass]="{ 'hide-draw-form': !(bEdit && obj && obj.config['geometry_type']) }">
<pnx-map [height]="heightMap" [geolocation]="true" [ngClass]="{ 'hide-draw-form': !(bEdit && obj && obj.config['geometry_type']) }">

<pnx-draw-form
[parentFormControl]="
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/monitoring-object/monitoring-object.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ <h2>Chargement en cours</h2>
<pnx-monitoring-map
*ngIf="heightMap"
[obj]="obj"
[geolocation]="true"
[bEdit]="bEdit"
[objForm]="objForm"
[(objectsStatus)]="objectsStatus"
Expand Down