diff --git a/html/images/sprites013.png b/html/images/sprites013.png deleted file mode 100644 index cf440ba..0000000 Binary files a/html/images/sprites013.png and /dev/null differ diff --git a/html/images/sprites015.png b/html/images/sprites015.png new file mode 100644 index 0000000..282a6ad Binary files /dev/null and b/html/images/sprites015.png differ diff --git a/html/index.html b/html/index.html index ad8f4ab..a519d97 100644 --- a/html/index.html +++ b/html/index.html @@ -1060,7 +1060,7 @@ - + diff --git a/html/markers.js b/html/markers.js index 7487724..377949c 100644 --- a/html/markers.js +++ b/html/markers.js @@ -10,6 +10,15 @@ let shapes = { strokeScale: 1.2, path: 'M16 1c-.17 0-.67.58-.9 1.03-.6 1.21-.6 1.15-.65 5.2-.04 2.97-.08 3.77-.18 3.9-.15.17-1.82 1.1-1.98 1.1-.08 0-.1-.25-.05-.83.03-.5.01-.92-.05-1.08-.1-.25-.13-.26-.71-.26-.82 0-.86.07-.78 1.5.03.6.08 1.17.11 1.25.05.12-.02.2-.25.33l-8 4.2c-.2.2-.18.1-.19 1.29 3.9-1.2 3.71-1.21 3.93-1.21.06 0 .1 0 .13.14.08.3.28.3.28-.04 0-.25.03-.27 1.16-.6.65-.2 1.22-.35 1.28-.35.05 0 .12.04.15.17.07.3.27.27.27-.08 0-.25.01-.27.7-.47.68-.1.98-.09 1.47-.1.18 0 .22 0 .26.18.06.34.22.35.27-.01.04-.2.1-.17 1.06-.14l1.07.02.05 4.2c.05 3.84.07 4.28.26 5.09.11.49.2.99.2 1.11 0 .19-.31.43-1.93 1.5l-1.93 1.26v1.02l4.13-.95.63 1.54c.05.07.12.09.19.09s.14-.02.19-.09l.63-1.54 4.13.95V29.3l-1.93-1.27c-1.62-1.06-1.93-1.3-1.93-1.49 0-.12.09-.62.2-1.11.19-.81.2-1.25.26-5.09l.05-4.2 1.07-.02c.96-.03 1.02-.05 1.06.14.05.36.21.35.27 0 .04-.17.08-.16.26-.16.49 0 .8-.02 1.48.1.68.2.69.21.69.46 0 .35.2.38.27.08.03-.13.1-.17.15-.17.06 0 .63.15 1.28.34 1.13.34 1.16.36 1.16.61 0 .35.2.34.28.04.03-.13.07-.14.13-.14.22 0 .03 0 3.93 1.2-.01-1.18.02-1.07-.19-1.27l-8-4.21c-.23-.12-.3-.21-.25-.33.03-.08.08-.65.11-1.25.08-1.43.04-1.5-.78-1.5-.58 0-.61.01-.71.26-.06.16-.08.58-.05 1.08.04.58.03.83-.05.83-.16 0-1.83-.93-1.98-1.1-.1-.13-.14-.93-.18-3.9-.05-4.05-.05-3.99-.65-5.2C16.67 1.58 16.17 1 16 1z', }, + 'blimp': { + id: 1, + w: 32, + h: 32, + viewBox: '-3.7 -3 32 32', + path: 'M12.4 26.77v-.81s.71-.24 1.42-1.7c0 0 .1.14.15.17.07.02 2.02.08 2.02.08s.18 0 .17-.3v-1.45s.14-.47-1.3-1.22c0 0 5.25-19.33-2.56-21.8-7.81 2.47-2.57 21.8-2.57 21.8-1.43.75-1.3 1.22-1.3 1.22s.02 1.16 0 1.46c0 .3.18.29.18.29s1.95-.06 2.01-.08c.06-.03.15-.17.15-.17.71 1.46 1.42 1.7 1.42 1.7v.81c0 .17.11.17.11.17s.1 0 .1-.17z', + accent: 'm12.48-.52-.18.25c-4.72 7.7-.1 26.23-.1 26.23l-.18.13m.03-26.57.25.21c4.72 7.7.1 26.23.1 26.23l.18.12', + accentMult: 0.8, + }, 'balloon': { id: 2, w: 13, @@ -706,7 +715,7 @@ let shapes = { const _ulac = ["cessna", 0.92]; let TypeDesignatorIcons = { - 'SHIP': ['balloon', 1], // Blimp + 'SHIP': ['blimp', 0.94], // Blimp 'BALL': ['balloon', 1], // Balloon 'A318': ['airliner', 0.90], // shortened a320 68t diff --git a/html/script.js b/html/script.js index 8fc66c5..7486a90 100644 --- a/html/script.js +++ b/html/script.js @@ -1781,7 +1781,7 @@ function webglAddLayer() { let glStyle = { symbol: { symbolType: 'image', - src: 'images/sprites013.png', + src: 'images/sprites015.png', size: [ 'get', 'size' ], offset: [0, 0], textureCoord: [ 'array',