mirror of
https://github.com/umap-project/umap.git
synced 2025-05-04 21:51:50 +02:00
Applying lebab against umap.icon.js
``` ./node_modules/lebab/bin/index.js --replace umap/static/umap/js/umap.icon.js --transform arrow,arrow-return,for-of,for-each,arg-rest,arg-spread,obj-method,obj-shorthand,no-strict,exponent,multi-var ./node_modules/lebab/bin/index.js --replace umap/static/umap/js/umap.icon.js --transform let,class,commonjs,template,default-param,destruct-param,includes ``` And the applying PrettierJS.
This commit is contained in:
parent
876108058c
commit
b34c79eae2
1 changed files with 33 additions and 37 deletions
|
@ -1,7 +1,7 @@
|
||||||
L.U.Icon = L.DivIcon.extend({
|
L.U.Icon = L.DivIcon.extend({
|
||||||
initialize: function (map, options) {
|
initialize(map, options) {
|
||||||
this.map = map
|
this.map = map
|
||||||
var default_options = {
|
const default_options = {
|
||||||
iconSize: null, // Made in css
|
iconSize: null, // Made in css
|
||||||
iconUrl: this.map.getDefaultOption('iconUrl'),
|
iconUrl: this.map.getDefaultOption('iconUrl'),
|
||||||
feature: null,
|
feature: null,
|
||||||
|
@ -14,23 +14,23 @@ L.U.Icon = L.DivIcon.extend({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_getIconUrl: function (name) {
|
_getIconUrl(name) {
|
||||||
var url
|
let url
|
||||||
if (this.feature && this.feature._getIconUrl(name))
|
if (this.feature && this.feature._getIconUrl(name))
|
||||||
url = this.feature._getIconUrl(name)
|
url = this.feature._getIconUrl(name)
|
||||||
else url = this.options[name + 'Url']
|
else url = this.options[`${name}Url`]
|
||||||
return this.formatUrl(url, this.feature)
|
return this.formatUrl(url, this.feature)
|
||||||
},
|
},
|
||||||
|
|
||||||
_getColor: function () {
|
_getColor() {
|
||||||
var color
|
let color
|
||||||
if (this.feature) color = this.feature.getOption('color')
|
if (this.feature) color = this.feature.getOption('color')
|
||||||
else if (this.options.color) color = this.options.color
|
else if (this.options.color) color = this.options.color
|
||||||
else color = this.map.getDefaultOption('color')
|
else color = this.map.getDefaultOption('color')
|
||||||
return color
|
return color
|
||||||
},
|
},
|
||||||
|
|
||||||
formatUrl: function (url, feature) {
|
formatUrl(url, feature) {
|
||||||
return L.Util.greedyTemplate(url || '', feature ? feature.extendedProperties() : {})
|
return L.Util.greedyTemplate(url || '', feature ? feature.extendedProperties() : {})
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -43,18 +43,18 @@ L.U.Icon.Default = L.U.Icon.extend({
|
||||||
className: 'umap-div-icon',
|
className: 'umap-div-icon',
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize: function (map, options) {
|
initialize(map, options) {
|
||||||
options = L.Util.extend({}, this.default_options, options)
|
options = L.Util.extend({}, this.default_options, options)
|
||||||
L.U.Icon.prototype.initialize.call(this, map, options)
|
L.U.Icon.prototype.initialize.call(this, map, options)
|
||||||
},
|
},
|
||||||
|
|
||||||
_setColor: function () {
|
_setColor() {
|
||||||
var color = this._getColor()
|
const color = this._getColor()
|
||||||
this.elements.container.style.backgroundColor = color
|
this.elements.container.style.backgroundColor = color
|
||||||
this.elements.arrow.style.borderTopColor = color
|
this.elements.arrow.style.borderTopColor = color
|
||||||
},
|
},
|
||||||
|
|
||||||
createIcon: function () {
|
createIcon() {
|
||||||
this.elements = {}
|
this.elements = {}
|
||||||
this.elements.main = L.DomUtil.create('div')
|
this.elements.main = L.DomUtil.create('div')
|
||||||
this.elements.container = L.DomUtil.create(
|
this.elements.container = L.DomUtil.create(
|
||||||
|
@ -63,7 +63,7 @@ L.U.Icon.Default = L.U.Icon.extend({
|
||||||
this.elements.main
|
this.elements.main
|
||||||
)
|
)
|
||||||
this.elements.arrow = L.DomUtil.create('div', 'icon_arrow', this.elements.main)
|
this.elements.arrow = L.DomUtil.create('div', 'icon_arrow', this.elements.main)
|
||||||
var src = this._getIconUrl('icon')
|
const src = this._getIconUrl('icon')
|
||||||
if (src) {
|
if (src) {
|
||||||
// An url.
|
// An url.
|
||||||
if (
|
if (
|
||||||
|
@ -85,8 +85,8 @@ L.U.Icon.Default = L.U.Icon.extend({
|
||||||
})
|
})
|
||||||
|
|
||||||
L.U.Icon.Circle = L.U.Icon.extend({
|
L.U.Icon.Circle = L.U.Icon.extend({
|
||||||
initialize: function (map, options) {
|
initialize(map, options) {
|
||||||
var default_options = {
|
const default_options = {
|
||||||
iconAnchor: new L.Point(6, 6),
|
iconAnchor: new L.Point(6, 6),
|
||||||
popupAnchor: new L.Point(0, -6),
|
popupAnchor: new L.Point(0, -6),
|
||||||
tooltipAnchor: new L.Point(6, 0),
|
tooltipAnchor: new L.Point(6, 0),
|
||||||
|
@ -96,11 +96,11 @@ L.U.Icon.Circle = L.U.Icon.extend({
|
||||||
L.U.Icon.prototype.initialize.call(this, map, options)
|
L.U.Icon.prototype.initialize.call(this, map, options)
|
||||||
},
|
},
|
||||||
|
|
||||||
_setColor: function () {
|
_setColor() {
|
||||||
this.elements.main.style.backgroundColor = this._getColor()
|
this.elements.main.style.backgroundColor = this._getColor()
|
||||||
},
|
},
|
||||||
|
|
||||||
createIcon: function () {
|
createIcon() {
|
||||||
this.elements = {}
|
this.elements = {}
|
||||||
this.elements.main = L.DomUtil.create('div')
|
this.elements.main = L.DomUtil.create('div')
|
||||||
this.elements.main.innerHTML = ' '
|
this.elements.main.innerHTML = ' '
|
||||||
|
@ -127,7 +127,7 @@ L.U.Icon.Ball = L.U.Icon.Default.extend({
|
||||||
className: 'umap-ball-icon',
|
className: 'umap-ball-icon',
|
||||||
},
|
},
|
||||||
|
|
||||||
createIcon: function () {
|
createIcon() {
|
||||||
this.elements = {}
|
this.elements = {}
|
||||||
this.elements.main = L.DomUtil.create('div')
|
this.elements.main = L.DomUtil.create('div')
|
||||||
this.elements.container = L.DomUtil.create(
|
this.elements.container = L.DomUtil.create(
|
||||||
|
@ -141,48 +141,44 @@ L.U.Icon.Ball = L.U.Icon.Default.extend({
|
||||||
return this.elements.main
|
return this.elements.main
|
||||||
},
|
},
|
||||||
|
|
||||||
_setColor: function () {
|
_setColor() {
|
||||||
var color = this._getColor('color'),
|
const color = this._getColor('color')
|
||||||
background
|
let background
|
||||||
if (L.Browser.ielt9) {
|
if (L.Browser.ielt9) {
|
||||||
background = color
|
background = color
|
||||||
} else if (L.Browser.webkit) {
|
} else if (L.Browser.webkit) {
|
||||||
background =
|
background = `-webkit-gradient( radial, 6 38%, 0, 6 38%, 8, from(white), to(${color}) )`
|
||||||
'-webkit-gradient( radial, 6 38%, 0, 6 38%, 8, from(white), to(' + color + ') )'
|
|
||||||
} else {
|
} else {
|
||||||
background =
|
background = `radial-gradient(circle at 6px 38% , white -4px, ${color} 8px) repeat scroll 0 0 transparent`
|
||||||
'radial-gradient(circle at 6px 38% , white -4px, ' +
|
|
||||||
color +
|
|
||||||
' 8px) repeat scroll 0 0 transparent'
|
|
||||||
}
|
}
|
||||||
this.elements.container.style.background = background
|
this.elements.container.style.background = background
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
var _CACHE_COLOR = {}
|
const _CACHE_COLOR = {}
|
||||||
L.U.Icon.Cluster = L.DivIcon.extend({
|
L.U.Icon.Cluster = L.DivIcon.extend({
|
||||||
options: {
|
options: {
|
||||||
iconSize: [40, 40],
|
iconSize: [40, 40],
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize: function (datalayer, cluster) {
|
initialize(datalayer, cluster) {
|
||||||
this.datalayer = datalayer
|
this.datalayer = datalayer
|
||||||
this.cluster = cluster
|
this.cluster = cluster
|
||||||
},
|
},
|
||||||
|
|
||||||
createIcon: function () {
|
createIcon() {
|
||||||
var container = L.DomUtil.create('div', 'leaflet-marker-icon marker-cluster'),
|
const container = L.DomUtil.create('div', 'leaflet-marker-icon marker-cluster')
|
||||||
div = L.DomUtil.create('div', '', container),
|
const div = L.DomUtil.create('div', '', container)
|
||||||
span = L.DomUtil.create('span', '', div),
|
const span = L.DomUtil.create('span', '', div)
|
||||||
backgroundColor = this.datalayer.getColor()
|
const backgroundColor = this.datalayer.getColor()
|
||||||
span.textContent = this.cluster.getChildCount()
|
span.textContent = this.cluster.getChildCount()
|
||||||
div.style.backgroundColor = backgroundColor
|
div.style.backgroundColor = backgroundColor
|
||||||
return container
|
return container
|
||||||
},
|
},
|
||||||
|
|
||||||
computeTextColor: function (el) {
|
computeTextColor(el) {
|
||||||
var color,
|
let color
|
||||||
backgroundColor = this.datalayer.getColor()
|
const backgroundColor = this.datalayer.getColor()
|
||||||
if (this.datalayer.options.cluster && this.datalayer.options.cluster.textColor) {
|
if (this.datalayer.options.cluster && this.datalayer.options.cluster.textColor) {
|
||||||
color = this.datalayer.options.cluster.textColor
|
color = this.datalayer.options.cluster.textColor
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue