diff --git a/html/images/sprites003.png b/html/images/sprites003.png deleted file mode 100644 index 7ab8f63..0000000 Binary files a/html/images/sprites003.png and /dev/null differ diff --git a/html/images/sprites004.png b/html/images/sprites004.png new file mode 100644 index 0000000..d10cc69 Binary files /dev/null and b/html/images/sprites004.png differ diff --git a/html/index.html b/html/index.html index 585ae83..265bde6 100644 --- a/html/index.html +++ b/html/index.html @@ -914,7 +914,7 @@ - + diff --git a/html/markers.js b/html/markers.js index ed2fb52..150e8c7 100644 --- a/html/markers.js +++ b/html/markers.js @@ -552,7 +552,7 @@ let shapes = { }, // Dassault Mirage F1 (ICAO MRF1) 'miragef1': { - viewBox:'-4 -3 32 32', + viewBox:'-4 -2 32 32', id: 63, w: 35, h: 35, @@ -601,7 +601,7 @@ let shapes = { w: 12, h: 12, noRotate: true, - svg: 'fixed_dark', + svg: 'fixed_dark', }, 'ground_tower': { id: 70, @@ -609,9 +609,18 @@ let shapes = { h: 18, strokeScale: 20, noRotate: true, - viewBox: "-25 -25 690 562", + viewBox: "-45 -50 730 587", path: 'M168.67 192c11 0 18.61-10.83 14.85-21.18-4.93-13.58-7.55-27.98-7.55-42.82s2.62-29.24 7.55-42.82C187.29 74.83 179.68 64 168.67 64h-17.73c-7.01 0-13.46 4.49-15.41 11.23C130.64 92.21 128 109.88 128 128c0 18.12 2.64 35.79 7.54 52.76 1.94 6.74 8.39 11.24 15.4 11.24h17.73zm-120.8-64c0-37.81 9.46-73.41 26.05-104.66C79.56 12.72 71.97 0 59.97 0H40.61c-6.27 0-12.13 3.59-14.73 9.31C8.22 48.13-1.31 91.41.15 137.12c1.24 38.89 10.78 75.94 26.53 109.73 2.62 5.63 8.41 9.14 14.61 9.14h18.87c12.02 0 19.6-12.74 13.94-23.37C57.43 201.39 47.87 165.84 47.87 128zM614.07 9.29C611.46 3.58 605.61 0 599.34 0h-19.43c-11.98 0-19.66 12.66-14.02 23.25 23.26 43.67 32.56 95.83 21.53 150.66-4.16 20.72-11.49 40.35-21.26 58.57-5.72 10.68 1.8 23.52 13.91 23.52h19.24c6.27 0 12.13-3.58 14.73-9.29C630.57 210.48 640 170.36 640 128s-9.42-82.48-25.93-118.71zM489.06 64h-17.73c-11.01 0-18.61 10.83-14.86 21.18 4.93 13.58 7.55 27.98 7.55 42.82s-2.62 29.24-7.55 42.82c-3.76 10.35 3.85 21.18 14.86 21.18h17.73c7.01 0 13.46-4.49 15.41-11.24 4.9-16.97 7.53-34.64 7.53-52.76 0-18.12-2.64-35.79-7.54-52.76-1.94-6.75-8.39-11.24-15.4-11.24zM372.7 187.76C389.31 173.1 400 151.89 400 128c0-44.18-35.82-80-80.01-80-5.52 0-10.92.56-16.12 1.62a79.525 79.525 0 0 0-28.61 12.04c-21.28 14.38-35.27 38.72-35.27 66.34 0 23.86 10.83 44.86 27.4 59.52L143.98 483.68c-3.4 8.16.46 17.52 8.62 20.92l14.78 6.16c8.16 3.4 17.53-.46 20.93-8.62L245.26 368h149.47l56.96 134.15c3.4 8.16 12.77 12.02 20.93 8.62l14.78-6.16c8.16-3.4 12.01-12.77 8.62-20.92L372.7 187.76zM320 96c17.65 0 32 14.36 32 32s-14.36 32-32 32-32-14.36-32-32 14.35-32 32-32zm-54.35 224l47.84-112.66c2.19.18 4.28.66 6.51.66 2.23 0 4.33-.48 6.52-.66L374.35 320h-108.7z', }, + // Puma, Super Puma, Oryx, Cougar (ICAO'S AS32 & AS3B & PUMA) + 'puma': { + id: 72, + w: 28, + h: 28, + viewBox: '0 0 32 32', + strokeScale: 1.2, + path: 'M15.9 28.57l-.17.02-.16-.35-3.9-.49v-1.27l3.79.06-.48-7.98-.58-2.42s-.06-.14-.42-.15c-.36 0-1 .05-1.05-.64v-.56L7.46 20.2s-.88-.2-.5-.6l5.96-5.78-.02-.65s0-.24.25-.2l.65-.01.28-.28v-2.41L6.85 2.89s.22-.87.6-.5l6.62 6.9.02-1.95s.25-1.72.85-2.65c0 0 .95-1.4 2.05 0 0 0 .65 1 .63 2.64V8.9l6.56-6.5s.93.18.48.6l-7.08 6.88-.04 2.65.1.1.9.02s.23 0 .24.28l-.01.85 5.87 6.04s-.26.81-.58.48l-5.32-5.57v.6s-.06.65-.7.64h-.63l-.26.18-.56 2.44-.4 8.12s.16.25.14.55l.16-.01.14-.4v-2.03h.33v2.21h.3v.64h-.3v2.32h-.33v-2.23l-.15-.36h-.17s-.01.37-.4 1.17z', + }, } { @@ -904,7 +913,11 @@ let TypeDesignatorIcons = { 'H60': ['blackhawk', 1], // 11t 'S92': ['blackhawk', 1], // 12t 'NH90': ['blackhawk', 1], // 11t - 'AS32': ['blackhawk', 0.96], // 9t + + // Puma, Super Puma, Oryx, Cougar (ICAO'S AS32 & AS3B & PUMA) + 'AS32': ['puma', 1], // 9t + 'AS3B': ['puma', 1], // 9t + 'PUMA': ['puma', 1], // 9t // 5 bladed 'EC55': ['s61', 0.92], // 5t diff --git a/html/script.js b/html/script.js index 333a9ce..ffd77c8 100644 --- a/html/script.js +++ b/html/script.js @@ -1370,7 +1370,7 @@ function webglAddLayer() { let glStyle = { symbol: { symbolType: 'image', - src: 'images/sprites003.png', + src: 'images/sprites004.png', size: [ 'get', 'size' ], offset: [0, 0], textureCoord: [ 'array',