almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-05-04 05:31:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge d630f8dadc into e0ca66f186

Browse source
This commit is contained in:
Yohan Boniface 2024-11-09 21:18:22 +01:00 committed by GitHub
commit fc6faa09b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
umap/static/umap/js/modules/data/features.js
View file

@ -312,6 +312,7 @@ class Feature {
'properties._umap_options.showLabel',
'properties._umap_options.labelDirection',
'properties._umap_options.labelInteractive',
'properties._umap_options.labelImportance',
'properties._umap_options.outlink',
'properties._umap_options.outlinkTarget',
]

1
umap/static/umap/js/modules/data/layer.js
View file

@ -699,6 +699,7 @@ export class DataLayer extends ServerStored {
'options.showLabel',
'options.labelDirection',
'options.labelInteractive',
'options.labelImportance',
'options.outlinkTarget',
'options.interactive',
]

2
umap/static/umap/js/modules/rendering/ui.js
View file

@ -78,10 +78,12 @@ const FeatureMixin = {
const displayName = this.feature.getDisplayName(null)
let showLabel = this.feature.getOption('showLabel')
const oldLabelHover = this.feature.getOption('labelHover')
const importance = this.feature.getOption('labelImportance')
const options = {
direction: this.feature.getOption('labelDirection'),
interactive: this.feature.getOption('labelInteractive'),
className: `leaflet-tooltip-${importance}`,
}
if (oldLabelHover && showLabel) showLabel = null // Retrocompat.

12
umap/static/umap/js/modules/schema.js
View file

@ -250,6 +250,18 @@ export const SCHEMA = {
],
default: 'auto',
},
labelImportance: {
type: String,
impacts: ['data'],
label: translate('Label importance'),
inheritable: true,
choices: [
['low', translate('Default')],
['medium', translate('Medium')],
['high', translate('High')],
],
default: 'low',
},
labelInteractive: {
type: Boolean,
impacts: ['data'],

1
umap/static/umap/js/umap.js
View file

@ -1260,6 +1260,7 @@ U.Map = L.Map.extend({
'options.showLabel',
'options.labelDirection',
'options.labelInteractive',
'options.labelImportance',
'options.outlinkTarget',
]
builder = new U.FormBuilder(this, popupFields)

7
umap/static/umap/map.css
View file

@ -1214,6 +1214,13 @@ span.popup-icon {
.umap-edit-enabled .readonly {
cursor: not-allowed;
}
.leaflet-tooltip-medium {
font-weight: bold;
}
.leaflet-tooltip-high {
font-weight: bold;
font-size: 1.2rem;
}
/* ********************************* */