Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
camino
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
pnm-public
camino
Commits
f4bdf494
Unverified
Commit
f4bdf494
authored
1 year ago
by
vmaubert
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fix(titre): supprime les boutons obsolètes sous la carte d’un titre (#824)
parent
df4cf453
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/ui/src/components/_common/map.tsx
+2
-36
2 additions, 36 deletions
packages/ui/src/components/_common/map.tsx
packages/ui/src/components/_common/perimetre.tsx
+0
-1
0 additions, 1 deletion
packages/ui/src/components/_common/perimetre.tsx
with
2 additions
and
37 deletions
packages/ui/src/components/_common/map.tsx
+
2
−
36
View file @
f4bdf494
...
...
@@ -9,7 +9,6 @@ import { caminoDefineComponent } from '@/utils/vue-tsx-utils'
import
{
TitresStatutIds
}
from
'
camino-common/src/static/titresStatuts
'
import
{
layersBuild
,
TitreWithPoint
}
from
'
@/components/titres/mapUtil
'
import
{
useRouter
}
from
'
vue-router
'
import
{
ButtonIcon
}
from
'
../_ui/button-icon
'
import
{
titreApiClient
}
from
'
../titre/titre-api-client
'
import
{
isNotNullNorUndefined
}
from
'
camino-common/src/typescript-tools
'
...
...
@@ -17,20 +16,17 @@ export interface Props {
geojson
:
GeoJsonObject
points
?:
{
nom
:
string
;
coordonnees
:
{
x
:
number
;
y
:
number
}
}[]
titreTypeId
:
TitreTypeId
isMain
?:
boolean
titreId
?:
string
loading
:
boolean
}
export
const
CaminoCommonMap
=
caminoDefineComponent
<
Props
>
([
'
geojson
'
,
'
points
'
,
'
titreTypeId
'
,
'
isMain
'
,
'
titreId
'
,
'
loading
'
],
props
=>
{
export
const
CaminoCommonMap
=
caminoDefineComponent
<
Props
>
([
'
geojson
'
,
'
points
'
,
'
titreTypeId
'
,
'
titreId
'
,
'
loading
'
],
props
=>
{
const
map
=
ref
<
typeof
CaminoMap
|
null
>
(
null
)
const
markersVisible
=
ref
<
boolean
>
(
true
)
const
patternVisible
=
ref
<
boolean
>
(
true
)
const
router
=
useRouter
()
const
isMain
=
computed
(()
=>
props
.
isMain
??
false
)
const
points
=
computed
(()
=>
props
.
points
??
[])
const
centrer
=
()
=>
{
...
...
@@ -153,38 +149,8 @@ export const CaminoCommonMap = caminoDefineComponent<Props>(['geojson', 'points'
geojsonLayers
=
{
geojsonLayers
.
value
}
markerLayers
=
{
markerLayers
.
value
}
additionalOverlayLayers
=
{
additionalOverlayLayers
.
value
}
class
=
"map map-detail
mb-s
"
class
=
"map map-detail"
/>
<
div
class
=
{
`
${
isMain
.
value
?
'
container
'
:
''
}
`
}
>
<
div
class
=
"tablet-blobs"
>
<
div
class
=
{
`
${
!
isMain
.
value
?
'
px-s
'
:
''
}
tablet-blob-1-2`
}
>
<
div
class
=
"flex mb-s"
>
<
button
class
=
"btn-border pill px-m py-s"
onClick
=
{
()
=>
centrer
()
}
>
Centrer
</
button
>
</
div
>
</
div
>
<
div
class
=
"desktop-blob-1-2 desktop-flex"
>
<
div
class
=
{
`
${
markersVisible
.
value
?
'
active
'
:
''
}
mb-s mr-xs`
}
>
<
ButtonIcon
class
=
"btn-border p-s rnd-s"
title
=
{
`
${
markersVisible
.
value
?
'
Masque
'
:
'
Affiche
'
}
les marqueurs`
}
onClick
=
{
()
=>
(
markersVisible
.
value
=
!
markersVisible
.
value
)
}
icon
=
"marker-ungrouped"
/>
</
div
>
<
div
class
=
{
`
${
patternVisible
.
value
?
'
active
'
:
''
}
mb-s mr-xs`
}
>
<
ButtonIcon
class
=
"btn-border p-s rnd-s"
title
=
{
`
${
patternVisible
.
value
?
'
Masque
'
:
'
Affiche
'
}
la trame`
}
onClick
=
{
()
=>
(
patternVisible
.
value
=
!
patternVisible
.
value
)
}
icon
=
"pattern"
/>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
)
})
This diff is collapsed.
Click to expand it.
packages/ui/src/components/_common/perimetre.tsx
+
0
−
1
View file @
f4bdf494
...
...
@@ -94,7 +94,6 @@ export const Perimetre = defineComponent<Props>((props: Props) => {
titreId
=
{
props
.
titreId
}
points
=
{
props
.
points
}
titreTypeId
=
{
props
.
titreTypeId
}
isMain
=
{
props
.
isMain
}
loading
=
{
props
.
loading
}
/>
)
:
null
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment