diff --git a/html/images/sprites015.png b/html/images/sprites016.png similarity index 65% rename from html/images/sprites015.png rename to html/images/sprites016.png index 282a6ad..ddb8c62 100644 Binary files a/html/images/sprites015.png and b/html/images/sprites016.png differ diff --git a/html/index.html b/html/index.html index da226cb..3a37c24 100644 --- a/html/index.html +++ b/html/index.html @@ -1073,7 +1073,7 @@ - + diff --git a/html/markers.js b/html/markers.js index cb1d7a8..a15d6cb 100644 --- a/html/markers.js +++ b/html/markers.js @@ -701,6 +701,16 @@ let shapes = { strokeScale: 2.2, path: 'm 31.62,56.29 c -0.23,-0.11 -0.55,-0.86 -0.54,-1.56 l -7.58,2.71 c -0.17,-0.82 -0.12,-1.31 -0.01,-2.03 l 6.90,-6.31 c -0.23,-2.30 -0.51,-3.72 -1.19,-6.08 l -0.28,0.96 -1.13,0.01 -0.42,-1.31 -0.41,1.30 -1.23,-0.00 -0.50,-1.32 -0.21,-6.56 -18.70,1.18 c -0.24,-0.19 -0.38,-2.09 0.48,-3.21 L 26.26,28.95 C 28.75,24.52 29.87,18.91 30.59,9.77 L 29.53,10.42 30.71,8.40 c 0.30,-2.49 0.56,-4.45 1.29,-5.84 0.72,1.39 0.99,3.35 1.29,5.84 l 1.17,2.01 -1.05,-0.65 c 0.72,9.14 1.84,14.76 4.33,19.18 l 19.46,5.12 c 0.86,1.12 0.72,3.02 0.48,3.21 l -18.70,-1.18 -0.21,6.56 -0.50,1.32 -1.23,0.00 -0.41,-1.30 -0.42,1.31 -1.13,-0.01 -0.28,-0.96 c -0.68,2.36 -0.96,3.78 -1.19,6.08 l 6.90,6.31 c 0.10,0.72 0.15,1.22 -0.01,2.03 l -7.58,-2.71 c 0.01,0.70 -0.31,1.45 -0.54,1.56 l -0.37,0.63 z', }, + 'para': { + id: 80, + w: 25, + h: 25, + viewBox: '-4 -4 72 72', + strokeScale: 4, + accentMult: 0.8, + path: 'M 2.7004841,35.4 C 2.3957197,34.805237 2.3346108,34.071291 2.3487212,33.492639 2.3628316,32.913987 2.4133442,32.511354 2.7,32 9.5741879,27.222774 18.4208,24.315376 32,24.357064 45.579201,24.281104 54.425812,27.222774 61.3,32 c 0.276334,0.514345 0.356292,0.854368 0.375811,1.434709 C 61.69533,34.01505 61.609571,34.773946 61.3,35.4 51.576472,38.439657 40.678687,39.277517 32,39.189844 21.874148,39.356757 12.026431,38.677104 2.7004841,35.4 Z', + accent: 'm 25.330646,24.634523 c -0.449188,4.692891 -0.341936,9.773843 0.03756,14.466734 M 17.376491,25.852595 c -0.815196,4.431676 -0.563898,8.706157 -0.01788,12.689083 M 10.149939,28.044695 c -0.6932861,3.230546 -0.7067571,6.748219 0.03192,9.585637 M 39.107311,24.631007 c 0.449188,4.692891 0.396257,9.757568 0.01676,14.450459 M 47.08978,25.710067 c 0.815196,4.431676 0.618698,8.91815 0.07268,12.901076 M 54.371132,28.11416 c 0.693286,3.230546 0.706757,6.559392 -0.03192,9.39681', + }, } { @@ -994,6 +1004,8 @@ let TypeDesignatorIcons = { 'P3': ['p3_orion', 1], + 'PARA': ['para', 1], + 'DRON': ['uav', 1], 'Q1': ['uav', 1], 'Q4': ['uav', 1], diff --git a/html/script.js b/html/script.js index 8faf1d2..4de49e2 100644 --- a/html/script.js +++ b/html/script.js @@ -1944,7 +1944,7 @@ function webglAddLayer() { let glStyle = { symbol: { symbolType: 'image', - src: 'images/sprites015.png', + src: 'images/sprites016.png', size: [ 'get', 'size' ], offset: [0, 0], textureCoord: [ 'array',