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

wip: rename labelSize to labelImportance

Browse source
This commit is contained in:
Yohan Boniface 2024-10-03 16:37:22 +02:00
parent 457338f10a
commit d630f8dadc
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -697,7 +697,7 @@ export class DataLayer {
'options.showLabel', 'options.showLabel',
'options.labelDirection', 'options.labelDirection',
'options.labelInteractive', 'options.labelInteractive',
'options.labelSize', 'options.labelImportance',
'options.outlinkTarget', 'options.outlinkTarget',
'options.interactive', 'options.interactive',
] ]

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

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

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

@ -250,6 +250,18 @@ export const SCHEMA = {
], ],
default: 'auto', 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: { labelInteractive: {
type: Boolean, type: Boolean,
impacts: ['data'], impacts: ['data'],
@ -264,18 +276,6 @@ export const SCHEMA = {
label: translate('Label key'), label: translate('Label key'),
inheritable: true, inheritable: true,
}, },
labelSize: {
type: String,
impacts: ['data'],
label: translate('Label font size'),
inheritable: true,
choices: [
['default', translate('Default')],
['medium', translate('Medium')],
['big', translate('Big')],
],
default: 'default',
},
licence: { licence: {
type: String, type: String,
impacts: ['ui'], impacts: ['ui'],

2
umap/static/umap/js/umap.js
View file

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

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

@ -1188,7 +1188,7 @@ span.popup-icon {
.leaflet-tooltip-medium { .leaflet-tooltip-medium {
font-weight: bold; font-weight: bold;
} }
.leaflet-tooltip-big { .leaflet-tooltip-high {
font-weight: bold; font-weight: bold;
font-size: 1.2rem; font-size: 1.2rem;
} }