Merge lp:~alexwolf/stellarium/MeteorShowers into lp:~cardinot/stellarium/MeteorShowers
- MeteorShowers
- Merge into MeteorShowers
Proposed by
Alexander Wolf
| Status: | Merged |
|---|---|
| Merged at revision: | 6402 |
| Proposed branch: | lp:~alexwolf/stellarium/MeteorShowers |
| Merge into: | lp:~cardinot/stellarium/MeteorShowers |
| Diff against target: |
1486 lines (+980/-415) 6 files modified
plugins/MeteorShowers/CMakeLists.txt (+1/-1) plugins/MeteorShowers/resources/showers.json (+956/-409) plugins/MeteorShowers/src/MeteorShower.cpp (+2/-2) plugins/MeteorShowers/src/MeteorShowers.cpp (+1/-1) plugins/MeteorShowers/src/gui/meteorShowerDialog.ui (+1/-1) plugins/MeteorShowers/src/translations.h (+19/-1) |
| To merge this branch: | bzr merge lp:~alexwolf/stellarium/MeteorShowers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marcos Cardinot | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Updated & formatted catalog of showers;
Updated version of plugin;
Added new lines for translations;
Fixed URL of catalog of showers;
Added small improvement for GUI;
To post a comment you must log in.
Revision history for this message
| Marcos Cardinot (cardinot) : | # |
review:
Approve
- 6402. By Marcos Cardinot
-
Merge with AlexWolf branch
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'plugins/MeteorShowers/CMakeLists.txt' |
| 2 | --- plugins/MeteorShowers/CMakeLists.txt 2013-12-05 23:32:18 +0000 |
| 3 | +++ plugins/MeteorShowers/CMakeLists.txt 2013-12-14 13:52:36 +0000 |
| 4 | @@ -1,6 +1,6 @@ |
| 5 | SET(METEORSHOWERS_MAJOR "0") |
| 6 | SET(METEORSHOWERS_MINOR "2") |
| 7 | -SET(METEORSHOWERS_PATCH "0") |
| 8 | +SET(METEORSHOWERS_PATCH "1") |
| 9 | SET(METEORSHOWERS_VERSION "${METEORSHOWERS_MAJOR}.${METEORSHOWERS_MINOR}.${METEORSHOWERS_PATCH}") |
| 10 | |
| 11 | IF(APPLE) |
| 12 | |
| 13 | === modified file 'plugins/MeteorShowers/resources/showers.json' |
| 14 | --- plugins/MeteorShowers/resources/showers.json 2013-12-13 18:28:02 +0000 |
| 15 | +++ plugins/MeteorShowers/resources/showers.json 2013-12-14 13:52:36 +0000 |
| 16 | @@ -1,429 +1,976 @@ |
| 17 | { |
| 18 | - "version": "0.3.0", |
| 19 | - "shortName": "meteor showers data", |
| 20 | - "showers": |
| 21 | + "shortName": "meteor showers data", |
| 22 | + "version": "0.2.1", |
| 23 | + "showers": |
| 24 | { |
| 25 | "QUA": |
| 26 | { |
| 27 | - "designation": "Quadrantids", |
| 28 | - "activity": |
| 29 | - [ |
| 30 | - { |
| 31 | - "year": "generic", |
| 32 | - "zhr": 100, |
| 33 | - "start": "12.28", |
| 34 | - "finish": "01.12", |
| 35 | - "peak": "01.04" |
| 36 | - }, |
| 37 | - { |
| 38 | - "year": "2011", |
| 39 | - "zhr": 120 |
| 40 | - } |
| 41 | - ], |
| 42 | + "designation": "Quadrantids", |
| 43 | + "activity": |
| 44 | + [ |
| 45 | + { |
| 46 | + "year": "generic", |
| 47 | + "zhr": -1, |
| 48 | + "variable": "60-200", |
| 49 | + "start": "12.28", |
| 50 | + "finish": "01.12", |
| 51 | + "peak": "01.04" |
| 52 | + }, |
| 53 | + { |
| 54 | + "year": "2008", |
| 55 | + "zhr": 120 |
| 56 | + }, |
| 57 | + { |
| 58 | + "year": "2009", |
| 59 | + "start": "01.01", |
| 60 | + "finish": "01.05", |
| 61 | + "peak": "01.03", |
| 62 | + "zhr": 120 |
| 63 | + }, |
| 64 | + { |
| 65 | + "year": "2011", |
| 66 | + "zhr": 120 |
| 67 | + }, |
| 68 | + { |
| 69 | + "year": "2012", |
| 70 | + "zhr": 120 |
| 71 | + } |
| 72 | + ], |
| 73 | "speed": 41, |
| 74 | "radiantAlpha": "230", |
| 75 | "radiantDelta": "49", |
| 76 | "driftAlpha": "1", |
| 77 | "driftDelta": "-0.3", |
| 78 | "parentObj": "Asteroid 2003 EH1", |
| 79 | - "pidx": 2.1 |
| 80 | - }, |
| 81 | - "ACE": |
| 82 | - { |
| 83 | - "designation": "α-Centaurids", |
| 84 | - "activity": |
| 85 | - [ |
| 86 | - { |
| 87 | - "year": "generic", |
| 88 | - "zhr": 6, |
| 89 | - "start": "01.28", |
| 90 | - "finish": "02.21", |
| 91 | - "peak": "02.08" |
| 92 | - }, |
| 93 | - { |
| 94 | - "year": "2011", |
| 95 | - "zhr": 6 |
| 96 | - } |
| 97 | - ], |
| 98 | - "speed": 56, |
| 99 | - "radiantAlpha": "210", |
| 100 | - "radiantDelta": "-59", |
| 101 | - "driftAlpha": "0", |
| 102 | - "driftDelta": "0", |
| 103 | - "pidx": 2.0 |
| 104 | - }, |
| 105 | - "GNO": |
| 106 | - { |
| 107 | - "designation": "γ-Normids", |
| 108 | - "activity": |
| 109 | - [ |
| 110 | - { |
| 111 | - "year": "generic", |
| 112 | - "zhr": 6, |
| 113 | - "start": "02.25", |
| 114 | - "finish": "03.22", |
| 115 | - "peak": "03.15" |
| 116 | - }, |
| 117 | - { |
| 118 | - "year": "2011", |
| 119 | - "zhr": 6 |
| 120 | - } |
| 121 | - |
| 122 | - ], |
| 123 | - "speed": 56, |
| 124 | - "radiantAlpha": "239", |
| 125 | - "radiantDelta": "-50", |
| 126 | - "driftAlpha": "0", |
| 127 | - "driftDelta": "0", |
| 128 | - "pidx": 2.4 |
| 129 | - }, |
| 130 | - "ETA": |
| 131 | - { |
| 132 | - "designation": "η-Aquariids", |
| 133 | - "activity": |
| 134 | - [ |
| 135 | - { |
| 136 | - "year": "generic", |
| 137 | - "zhr": 70, |
| 138 | - "start": "04.19", |
| 139 | - "finish": "05.28", |
| 140 | - "peak": "05.06" |
| 141 | - }, |
| 142 | - { |
| 143 | - "year": "2011" |
| 144 | - } |
| 145 | - |
| 146 | - ], |
| 147 | - "speed": 66, |
| 148 | - "radiantAlpha": "338", |
| 149 | - "radiantDelta": "-1", |
| 150 | - "driftAlpha": "0", |
| 151 | - "driftDelta": "0", |
| 152 | - "parentObj": "Comet 1P/Halley", |
| 153 | - "pidx": 2.4 |
| 154 | - }, |
| 155 | - "PAU": |
| 156 | - { |
| 157 | - "designation": "Piscis Austrinids", |
| 158 | - "activity": |
| 159 | - [ |
| 160 | - { |
| 161 | - "year": "generic", |
| 162 | - "zhr": 5, |
| 163 | - "start": "06.15", |
| 164 | - "finish": "08.10", |
| 165 | - "peak": "07.28" |
| 166 | - }, |
| 167 | - { |
| 168 | - "year": "2011" |
| 169 | - } |
| 170 | - |
| 171 | - ], |
| 172 | - "speed": 35, |
| 173 | - "radiantAlpha": "341", |
| 174 | - "radiantDelta": "-30", |
| 175 | - "driftAlpha": "0", |
| 176 | - "driftDelta": "0", |
| 177 | - "pidx": 3.2 |
| 178 | - }, |
| 179 | + "pidx": 2.1 |
| 180 | + }, |
| 181 | + "ACE": |
| 182 | + { |
| 183 | + "designation": "α-Centaurids", |
| 184 | + "activity": |
| 185 | + [ |
| 186 | + { |
| 187 | + "year": "generic", |
| 188 | + "zhr": -1, |
| 189 | + "variable": "5-20", |
| 190 | + "start": "01.28", |
| 191 | + "finish": "02.21", |
| 192 | + "peak": "02.08" |
| 193 | + }, |
| 194 | + { |
| 195 | + "year": "2008", |
| 196 | + "zhr": 5 |
| 197 | + }, |
| 198 | + { |
| 199 | + "year": "2010", |
| 200 | + "zhr": 6 |
| 201 | + }, |
| 202 | + { |
| 203 | + "year": "2011", |
| 204 | + "zhr": 6 |
| 205 | + } |
| 206 | + ], |
| 207 | + "speed": 56, |
| 208 | + "radiantAlpha": "210", |
| 209 | + "radiantDelta": "-59", |
| 210 | + "driftAlpha": "0", |
| 211 | + "driftDelta": "0", |
| 212 | + "pidx": 2.0 |
| 213 | + }, |
| 214 | + "GNO": |
| 215 | + { |
| 216 | + "designation": "γ-Normids", |
| 217 | + "activity": |
| 218 | + [ |
| 219 | + { |
| 220 | + "year": "generic", |
| 221 | + "zhr": 6, |
| 222 | + "start": "02.25", |
| 223 | + "finish": "03.22", |
| 224 | + "peak": "03.15" |
| 225 | + }, |
| 226 | + { |
| 227 | + "year": "2008", |
| 228 | + "zhr": 4 |
| 229 | + }, |
| 230 | + { |
| 231 | + "year": "2010", |
| 232 | + "zhr": 6 |
| 233 | + }, |
| 234 | + { |
| 235 | + "year": "2011", |
| 236 | + "zhr": 6 |
| 237 | + } |
| 238 | + ], |
| 239 | + "speed": 56, |
| 240 | + "radiantAlpha": "239", |
| 241 | + "radiantDelta": "-50", |
| 242 | + "driftAlpha": "0", |
| 243 | + "driftDelta": "0", |
| 244 | + "pidx": 2.4 |
| 245 | + }, |
| 246 | + "ETA": |
| 247 | + { |
| 248 | + "designation": "η-Aquariids", |
| 249 | + "activity": |
| 250 | + [ |
| 251 | + { |
| 252 | + "year": "generic", |
| 253 | + "zhr": -1, |
| 254 | + "variable": "40-85", |
| 255 | + "start": "04.19", |
| 256 | + "finish": "05.28", |
| 257 | + "peak": "05.06" |
| 258 | + }, |
| 259 | + { |
| 260 | + "year": "2008", |
| 261 | + "zhr": 70 |
| 262 | + }, |
| 263 | + { |
| 264 | + "year": "2009", |
| 265 | + "zhr": 85 |
| 266 | + }, |
| 267 | + { |
| 268 | + "year": "2011", |
| 269 | + "zhr": 70 |
| 270 | + } |
| 271 | + ], |
| 272 | + "speed": 66, |
| 273 | + "radiantAlpha": "338", |
| 274 | + "radiantDelta": "-1", |
| 275 | + "driftAlpha": "0", |
| 276 | + "driftDelta": "0", |
| 277 | + "parentObj": "Comet 1P/Halley", |
| 278 | + "pidx": 2.4 |
| 279 | + }, |
| 280 | + "PAU": |
| 281 | + { |
| 282 | + "designation": "Piscis Austrinids", |
| 283 | + "activity": |
| 284 | + [ |
| 285 | + { |
| 286 | + "year": "generic", |
| 287 | + "zhr": 5, |
| 288 | + "start": "06.15", |
| 289 | + "finish": "08.10", |
| 290 | + "peak": "07.28" |
| 291 | + }, |
| 292 | + { |
| 293 | + "year": "2008", |
| 294 | + "zhr": 5 |
| 295 | + }, |
| 296 | + { |
| 297 | + "year": "2009", |
| 298 | + "zhr": 5 |
| 299 | + } |
| 300 | + ], |
| 301 | + "speed": 35, |
| 302 | + "radiantAlpha": "341", |
| 303 | + "radiantDelta": "-30", |
| 304 | + "driftAlpha": "0", |
| 305 | + "driftDelta": "0", |
| 306 | + "pidx": 3.2 |
| 307 | + }, |
| 308 | "LYR": |
| 309 | { |
| 310 | "designation": "Lyrids", |
| 311 | - "activity": |
| 312 | - [ |
| 313 | - { |
| 314 | - "year": "generic", |
| 315 | - "zhr": 18, |
| 316 | - "start": "04.16", |
| 317 | - "finish": "04.25", |
| 318 | - "peak": "04.22" |
| 319 | - }, |
| 320 | - { |
| 321 | - "year": "2011", |
| 322 | - "zhr": 20 |
| 323 | - } |
| 324 | - |
| 325 | - ], |
| 326 | + "activity": |
| 327 | + [ |
| 328 | + { |
| 329 | + "year": "generic", |
| 330 | + "zhr": -1, |
| 331 | + "variable": "0-90", |
| 332 | + "start": "04.16", |
| 333 | + "finish": "04.25", |
| 334 | + "peak": "04.22" |
| 335 | + }, |
| 336 | + { |
| 337 | + "year": "1922", |
| 338 | + "zhr": 96 |
| 339 | + }, |
| 340 | + { |
| 341 | + "year": "1945", |
| 342 | + "zhr": 112 |
| 343 | + }, |
| 344 | + { |
| 345 | + "year": "1982", |
| 346 | + "zhr": 100 |
| 347 | + }, |
| 348 | + { |
| 349 | + "year": "2007", |
| 350 | + "zhr": 18 |
| 351 | + }, |
| 352 | + { |
| 353 | + "year": "2008", |
| 354 | + "zhr": 18 |
| 355 | + }, |
| 356 | + { |
| 357 | + "year": "2010", |
| 358 | + "zhr": 18 |
| 359 | + }, |
| 360 | + { |
| 361 | + "year": "2011", |
| 362 | + "zhr": 20 |
| 363 | + }, |
| 364 | + { |
| 365 | + "year": "2012", |
| 366 | + "zhr": 18 |
| 367 | + } |
| 368 | + ], |
| 369 | "speed": 49, |
| 370 | "radiantAlpha": "271", |
| 371 | "radiantDelta": "34", |
| 372 | "driftAlpha": "1", |
| 373 | "driftDelta": "0", |
| 374 | "parentObj": "Comet Thatcher (1861 I)", |
| 375 | - "pidx": 2.1 |
| 376 | - }, |
| 377 | - "JBO": |
| 378 | - { |
| 379 | - "designation": "June Bootids", |
| 380 | - "activity": |
| 381 | - [ |
| 382 | - { |
| 383 | - "year": "generic", |
| 384 | - "zhr": -1, |
| 385 | - "variable": "0-100", |
| 386 | - "start": "06.22", |
| 387 | - "finish": "07.02", |
| 388 | - "peak": "06.27" |
| 389 | - }, |
| 390 | - { |
| 391 | - "year": "2011" |
| 392 | - } |
| 393 | - |
| 394 | - ], |
| 395 | - "speed": 18, |
| 396 | - "radiantAlpha": "224", |
| 397 | - "radiantDelta": "48", |
| 398 | - "driftAlpha": "0", |
| 399 | - "driftDelta": "0", |
| 400 | - "parentObj": "Comet 7P/Pons-Winnecke", |
| 401 | - "pidx": 2.2 |
| 402 | - }, |
| 403 | - "SDA": |
| 404 | - { |
| 405 | - "designation": "Southern δ-Aquariids", |
| 406 | - "activity": |
| 407 | - [ |
| 408 | - { |
| 409 | - "year": "generic", |
| 410 | - "zhr": 16, |
| 411 | - "start": "07.12", |
| 412 | - "finish": "08.23", |
| 413 | - "peak": "07.30" |
| 414 | - }, |
| 415 | - { |
| 416 | - "year": "2011" |
| 417 | - } |
| 418 | - |
| 419 | - ], |
| 420 | - "speed": 41, |
| 421 | - "radiantAlpha": "339", |
| 422 | - "radiantDelta": "-16", |
| 423 | - "driftAlpha": "0", |
| 424 | - "driftDelta": "0", |
| 425 | - "parentObj": "Comet 96P/Machholz", |
| 426 | - "pidx": 3.2 |
| 427 | - }, |
| 428 | - "CAP": |
| 429 | - { |
| 430 | - "designation": "α-Capricornids", |
| 431 | - "activity": |
| 432 | - [ |
| 433 | - { |
| 434 | - "year": "generic", |
| 435 | - "zhr": 5, |
| 436 | - "start": "07.03", |
| 437 | - "finish": "08.15", |
| 438 | - "peak": "07.30" |
| 439 | - }, |
| 440 | - { |
| 441 | - "year": "2011" |
| 442 | - } |
| 443 | - |
| 444 | - ], |
| 445 | - "speed": 23, |
| 446 | - "radiantAlpha": "307", |
| 447 | - "radiantDelta": "-10", |
| 448 | - "driftAlpha": "0", |
| 449 | - "driftDelta": "0", |
| 450 | - "pidx": 2.5 |
| 451 | - }, |
| 452 | - "AUR": |
| 453 | - { |
| 454 | - "designation": "α-Aurigids", |
| 455 | - "activity": |
| 456 | - [ |
| 457 | - { |
| 458 | - "year": "generic", |
| 459 | - "zhr": 6, |
| 460 | - "start": "08.28", |
| 461 | - "finish": "09.05", |
| 462 | - "peak": "09.01" |
| 463 | - }, |
| 464 | - { |
| 465 | - "year": "2011" |
| 466 | - } |
| 467 | - |
| 468 | - ], |
| 469 | - "speed": 66, |
| 470 | - "radiantAlpha": "91", |
| 471 | - "radiantDelta": "+39", |
| 472 | - "driftAlpha": "0", |
| 473 | - "driftDelta": "0", |
| 474 | - "pidx": 2.6 |
| 475 | - }, |
| 476 | - "SPE": |
| 477 | - { |
| 478 | - "designation": "September ε-Perseids", |
| 479 | - "activity": |
| 480 | - [ |
| 481 | - { |
| 482 | - "year": "generic", |
| 483 | - "zhr": 5, |
| 484 | - "start": "09.04", |
| 485 | - "finish": "09.14", |
| 486 | - "peak": "09.09" |
| 487 | - }, |
| 488 | - { |
| 489 | - "year": "2011" |
| 490 | - } |
| 491 | - |
| 492 | - ], |
| 493 | - "speed": 64, |
| 494 | - "radiantAlpha": "47", |
| 495 | - "radiantDelta": "+40", |
| 496 | - "driftAlpha": "0", |
| 497 | - "driftDelta": "0", |
| 498 | - "pidx": 3.0 |
| 499 | - }, |
| 500 | - "DRA": |
| 501 | - { |
| 502 | - "designation": "Draconids", |
| 503 | - "activity": |
| 504 | - [ |
| 505 | - { |
| 506 | - "year": "generic", |
| 507 | - "zhr": -1, |
| 508 | - "variable": "20-700", |
| 509 | - "start": "10.06", |
| 510 | - "finish": "10.10", |
| 511 | - "peak": "10.08" |
| 512 | - }, |
| 513 | - { |
| 514 | - "year": "2011" |
| 515 | - } |
| 516 | - |
| 517 | - ], |
| 518 | - "speed": 20, |
| 519 | - "radiantAlpha": "262", |
| 520 | - "radiantDelta": "+54", |
| 521 | - "driftAlpha": "0", |
| 522 | - "driftDelta": "0", |
| 523 | - "pidx": 2.6 |
| 524 | - }, |
| 525 | - "LEO": |
| 526 | - { |
| 527 | - "designation": "Leonids", |
| 528 | - "activity": |
| 529 | - [ |
| 530 | - { |
| 531 | - "year": "generic", |
| 532 | - "zhr": -1, |
| 533 | - "variable": "5-20*", |
| 534 | - "start": "11.06", |
| 535 | - "finish": "11.30", |
| 536 | - "peak": "11.18" |
| 537 | - }, |
| 538 | - { |
| 539 | - "year": "2011" |
| 540 | - } |
| 541 | - |
| 542 | - ], |
| 543 | - "speed": 71, |
| 544 | - "radiantAlpha": "152", |
| 545 | - "radiantDelta": "+22", |
| 546 | - "driftAlpha": "0", |
| 547 | - "driftDelta": "0", |
| 548 | - "parentObj": "Comet 55P/Tempel-Tuttle", |
| 549 | - "pidx": 2.5 |
| 550 | - }, |
| 551 | - "PHO": |
| 552 | - { |
| 553 | - "designation": "Phoenicids", |
| 554 | - "activity": |
| 555 | - [ |
| 556 | - { |
| 557 | - "year": "generic", |
| 558 | - "zhr": -1, |
| 559 | - "variable": "0-100", |
| 560 | - "start": "11.28", |
| 561 | - "finish": "12.09", |
| 562 | - "peak": "12.06" |
| 563 | - }, |
| 564 | - { |
| 565 | - "year": "2011" |
| 566 | - } |
| 567 | - |
| 568 | - ], |
| 569 | - "speed": 18, |
| 570 | - "radiantAlpha": "18", |
| 571 | - "radiantDelta": "-53", |
| 572 | - "driftAlpha": "0", |
| 573 | - "driftDelta": "0", |
| 574 | - "pidx": 2.8 |
| 575 | - }, |
| 576 | - "PUP": |
| 577 | - { |
| 578 | - "designation": "Puppid-Velids", |
| 579 | - "activity": |
| 580 | - [ |
| 581 | - { |
| 582 | - "year": "generic", |
| 583 | - "zhr": 10, |
| 584 | - "start": "12.01", |
| 585 | - "finish": "12.15", |
| 586 | - "peak": "12.07" |
| 587 | - }, |
| 588 | - { |
| 589 | - "year": "2011" |
| 590 | - } |
| 591 | - |
| 592 | - ], |
| 593 | - "speed": 40, |
| 594 | - "radiantAlpha": "123", |
| 595 | - "radiantDelta": "-45", |
| 596 | - "driftAlpha": "0", |
| 597 | - "driftDelta": "0", |
| 598 | - "pidx": 2.9 |
| 599 | - }, |
| 600 | - "URS": |
| 601 | - { |
| 602 | - "designation": "Ursids", |
| 603 | - "activity": |
| 604 | - [ |
| 605 | - { |
| 606 | - "year": "generic", |
| 607 | - "zhr": -1, |
| 608 | - "variable": "10-50", |
| 609 | - "start": "12.17", |
| 610 | - "finish": "12.26", |
| 611 | - "peak": "12.23" |
| 612 | - }, |
| 613 | - { |
| 614 | - "year": "2011" |
| 615 | - } |
| 616 | - |
| 617 | - ], |
| 618 | - "speed": 33, |
| 619 | - "radiantAlpha": "217", |
| 620 | - "radiantDelta": "+76", |
| 621 | - "driftAlpha": "0", |
| 622 | - "driftDelta": "0", |
| 623 | - "pidx": 3.0 |
| 624 | - }, |
| 625 | - "PER": |
| 626 | - { |
| 627 | - "designation": "Perseids", |
| 628 | - "activity": |
| 629 | - [ |
| 630 | - { |
| 631 | - "year": "generic", |
| 632 | - "zhr": 100, |
| 633 | - "start": "07.17", |
| 634 | - "finish": "08.24", |
| 635 | - "peak": "08.13" |
| 636 | - }, |
| 637 | - { |
| 638 | - "year": "2011" |
| 639 | - } |
| 640 | - |
| 641 | - ], |
| 642 | - "speed": 59, |
| 643 | - "radiantAlpha": "48", |
| 644 | - "radiantDelta": "+58", |
| 645 | - "driftAlpha": "0", |
| 646 | - "driftDelta": "0", |
| 647 | - "parentObj": "Comet 109P/Swift-Tuttle", |
| 648 | - "pidx": 2.2 |
| 649 | - } |
| 650 | - } |
| 651 | + "pidx": 2.1 |
| 652 | + }, |
| 653 | + "JBO": |
| 654 | + { |
| 655 | + "designation": "June Bootids", |
| 656 | + "activity": |
| 657 | + [ |
| 658 | + { |
| 659 | + "year": "generic", |
| 660 | + "zhr": -1, |
| 661 | + "variable": "0-100", |
| 662 | + "start": "06.22", |
| 663 | + "finish": "07.02", |
| 664 | + "peak": "06.27" |
| 665 | + } |
| 666 | + ], |
| 667 | + "speed": 18, |
| 668 | + "radiantAlpha": "224", |
| 669 | + "radiantDelta": "48", |
| 670 | + "driftAlpha": "0.4", |
| 671 | + "driftDelta": "-0.2", |
| 672 | + "parentObj": "Comet 7P/Pons-Winnecke", |
| 673 | + "pidx": 2.2 |
| 674 | + }, |
| 675 | + "SDA": |
| 676 | + { |
| 677 | + "designation": "Southern δ-Aquariids", |
| 678 | + "activity": |
| 679 | + [ |
| 680 | + { |
| 681 | + "year": "generic", |
| 682 | + "zhr": 16, |
| 683 | + "start": "07.12", |
| 684 | + "finish": "08.23", |
| 685 | + "peak": "07.30" |
| 686 | + }, |
| 687 | + { |
| 688 | + "year": "2007", |
| 689 | + "zhr": 20, |
| 690 | + "start": "07.12", |
| 691 | + "finish": "08.19", |
| 692 | + "peak": "07.28" |
| 693 | + }, |
| 694 | + { |
| 695 | + "year": "2008", |
| 696 | + "zhr": 20, |
| 697 | + "start": "07.12", |
| 698 | + "finish": "08.19", |
| 699 | + "peak": "07.27" |
| 700 | + }, |
| 701 | + { |
| 702 | + "year": "2009", |
| 703 | + "zhr": 20, |
| 704 | + "start": "07.12", |
| 705 | + "finish": "08.19", |
| 706 | + "peak": "07.28" |
| 707 | + } |
| 708 | + ], |
| 709 | + "speed": 41, |
| 710 | + "radiantAlpha": "339", |
| 711 | + "radiantDelta": "-16", |
| 712 | + "driftAlpha": "0.75", |
| 713 | + "driftDelta": "0.15", |
| 714 | + "parentObj": "Comet 96P/Machholz", |
| 715 | + "pidx": 3.2 |
| 716 | + }, |
| 717 | + "CAP": |
| 718 | + { |
| 719 | + "designation": "α-Capricornids", |
| 720 | + "activity": |
| 721 | + [ |
| 722 | + { |
| 723 | + "year": "generic", |
| 724 | + "zhr": 5, |
| 725 | + "start": "07.03", |
| 726 | + "finish": "08.15", |
| 727 | + "peak": "07.30" |
| 728 | + }, |
| 729 | + { |
| 730 | + "year": "2007", |
| 731 | + "zhr": 4 |
| 732 | + }, |
| 733 | + { |
| 734 | + "year": "2008", |
| 735 | + "zhr": 4 |
| 736 | + }, |
| 737 | + { |
| 738 | + "year": "2009", |
| 739 | + "zhr": 4 |
| 740 | + } |
| 741 | + ], |
| 742 | + "speed": 23, |
| 743 | + "radiantAlpha": "307", |
| 744 | + "radiantDelta": "-10", |
| 745 | + "driftAlpha": "0", |
| 746 | + "driftDelta": "0", |
| 747 | + "pidx": 2.5 |
| 748 | + }, |
| 749 | + "AUR": |
| 750 | + { |
| 751 | + "designation": "α-Aurigids", |
| 752 | + "activity": |
| 753 | + [ |
| 754 | + { |
| 755 | + "year": "generic", |
| 756 | + "zhr": 6, |
| 757 | + "start": "08.28", |
| 758 | + "finish": "09.05", |
| 759 | + "peak": "09.01" |
| 760 | + }, |
| 761 | + { |
| 762 | + "year": "2009", |
| 763 | + "zhr": 7 |
| 764 | + } |
| 765 | + ], |
| 766 | + "speed": 66, |
| 767 | + "radiantAlpha": "91", |
| 768 | + "radiantDelta": "+39", |
| 769 | + "driftAlpha": "0", |
| 770 | + "driftDelta": "0", |
| 771 | + "pidx": 2.6 |
| 772 | + }, |
| 773 | + "SPE": |
| 774 | + { |
| 775 | + "designation": "September ε-Perseids", |
| 776 | + "activity": |
| 777 | + [ |
| 778 | + { |
| 779 | + "year": "generic", |
| 780 | + "zhr": 5, |
| 781 | + "start": "09.04", |
| 782 | + "finish": "09.14", |
| 783 | + "peak": "09.09" |
| 784 | + } |
| 785 | + ], |
| 786 | + "speed": 64, |
| 787 | + "radiantAlpha": "47", |
| 788 | + "radiantDelta": "+40", |
| 789 | + "driftAlpha": "0", |
| 790 | + "driftDelta": "0", |
| 791 | + "pidx": 3.0 |
| 792 | + }, |
| 793 | + "DRA": |
| 794 | + { |
| 795 | + "designation": "Draconids", |
| 796 | + "activity": |
| 797 | + [ |
| 798 | + { |
| 799 | + "year": "generic", |
| 800 | + "zhr": -1, |
| 801 | + "variable": "20-700", |
| 802 | + "start": "10.06", |
| 803 | + "finish": "10.10", |
| 804 | + "peak": "10.08" |
| 805 | + }, |
| 806 | + { |
| 807 | + "year": "1933", |
| 808 | + "zhr": 6000 |
| 809 | + }, |
| 810 | + { |
| 811 | + "year": "1946", |
| 812 | + "zhr": 6800 |
| 813 | + } |
| 814 | + ], |
| 815 | + "speed": 20, |
| 816 | + "radiantAlpha": "262", |
| 817 | + "radiantDelta": "+54", |
| 818 | + "driftAlpha": "0", |
| 819 | + "driftDelta": "0", |
| 820 | + "parentObj": "Comet 21P/Giacobini-Zinner", |
| 821 | + "pidx": 2.6 |
| 822 | + }, |
| 823 | + "LEO": |
| 824 | + { |
| 825 | + "designation": "Leonids", |
| 826 | + "activity": |
| 827 | + [ |
| 828 | + { |
| 829 | + "year": "generic", |
| 830 | + "zhr": -1, |
| 831 | + "variable": "5-20*", |
| 832 | + "start": "11.06", |
| 833 | + "finish": "11.30", |
| 834 | + "peak": "11.18" |
| 835 | + }, |
| 836 | + { |
| 837 | + "year": "1833", |
| 838 | + "zhr": 240000 |
| 839 | + }, |
| 840 | + { |
| 841 | + "year": "1866", |
| 842 | + "zhr": 5000 |
| 843 | + }, |
| 844 | + { |
| 845 | + "year": "1867", |
| 846 | + "zhr": 1000 |
| 847 | + }, |
| 848 | + { |
| 849 | + "year": "1868", |
| 850 | + "zhr": 1000 |
| 851 | + }, |
| 852 | + { |
| 853 | + "year": "1898", |
| 854 | + "zhr": 100 |
| 855 | + }, |
| 856 | + { |
| 857 | + "year": "1901", |
| 858 | + "zhr": 400 |
| 859 | + }, |
| 860 | + { |
| 861 | + "year": "1966", |
| 862 | + "zhr": 144000 |
| 863 | + }, |
| 864 | + { |
| 865 | + "year": "1998", |
| 866 | + "zhr": 2000 |
| 867 | + }, |
| 868 | + { |
| 869 | + "year": "1999", |
| 870 | + "zhr": 5000 |
| 871 | + }, |
| 872 | + { |
| 873 | + "year": "2000", |
| 874 | + "zhr": 480 |
| 875 | + }, |
| 876 | + { |
| 877 | + "year": "2001", |
| 878 | + "zhr": 3700 |
| 879 | + }, |
| 880 | + { |
| 881 | + "year": "2002", |
| 882 | + "zhr": 3000 |
| 883 | + }, |
| 884 | + { |
| 885 | + "year": "2006", |
| 886 | + "zhr": 78 |
| 887 | + }, |
| 888 | + { |
| 889 | + "year": "2007", |
| 890 | + "zhr": 35 |
| 891 | + }, |
| 892 | + { |
| 893 | + "year": "2008", |
| 894 | + "start": "11.14", |
| 895 | + "finish": "11.22", |
| 896 | + "peak": "11.17", |
| 897 | + "zhr": 99 |
| 898 | + }, |
| 899 | + { |
| 900 | + "year": "2009", |
| 901 | + "start": "11.10", |
| 902 | + "finish": "11.21", |
| 903 | + "peak": "11.17", |
| 904 | + "zhr": 79 |
| 905 | + }, |
| 906 | + { |
| 907 | + "year": "2010", |
| 908 | + "start": "11.10", |
| 909 | + "finish": "11.23", |
| 910 | + "peak": "11.17", |
| 911 | + "zhr": 32 |
| 912 | + }, |
| 913 | + { |
| 914 | + "year": "2011", |
| 915 | + "zhr": 22 |
| 916 | + }, |
| 917 | + { |
| 918 | + "year": 2012, |
| 919 | + "start": "11.06", |
| 920 | + "finish": "11.30", |
| 921 | + "peak": "11.17", |
| 922 | + "zhr": 61 |
| 923 | + } |
| 924 | + ], |
| 925 | + "speed": 71, |
| 926 | + "radiantAlpha": "152", |
| 927 | + "radiantDelta": "+22", |
| 928 | + "driftAlpha": "0.6", |
| 929 | + "driftDelta": "-0.25", |
| 930 | + "parentObj": "Comet 55P/Tempel-Tuttle", |
| 931 | + "pidx": 2.5 |
| 932 | + }, |
| 933 | + "PHO": |
| 934 | + { |
| 935 | + "designation": "Phoenicids", |
| 936 | + "activity": |
| 937 | + [ |
| 938 | + { |
| 939 | + "year": "generic", |
| 940 | + "zhr": -1, |
| 941 | + "variable": "0-100", |
| 942 | + "start": "11.28", |
| 943 | + "finish": "12.09", |
| 944 | + "peak": "12.06" |
| 945 | + } |
| 946 | + ], |
| 947 | + "speed": 18, |
| 948 | + "radiantAlpha": "18", |
| 949 | + "radiantDelta": "-53", |
| 950 | + "driftAlpha": "0", |
| 951 | + "driftDelta": "0", |
| 952 | + "pidx": 2.8 |
| 953 | + }, |
| 954 | + "PUP": |
| 955 | + { |
| 956 | + "designation": "Puppid-Velids", |
| 957 | + "activity": |
| 958 | + [ |
| 959 | + { |
| 960 | + "year": "generic", |
| 961 | + "zhr": 10, |
| 962 | + "start": "12.01", |
| 963 | + "finish": "12.15", |
| 964 | + "peak": "12.07" |
| 965 | + } |
| 966 | + ], |
| 967 | + "speed": 40, |
| 968 | + "radiantAlpha": "123", |
| 969 | + "radiantDelta": "-45", |
| 970 | + "driftAlpha": "0", |
| 971 | + "driftDelta": "0", |
| 972 | + "pidx": 2.9 |
| 973 | + }, |
| 974 | + "URS": |
| 975 | + { |
| 976 | + "designation": "Ursids", |
| 977 | + "activity": |
| 978 | + [ |
| 979 | + { |
| 980 | + "year": "generic", |
| 981 | + "zhr": -1, |
| 982 | + "variable": "10-50", |
| 983 | + "start": "12.17", |
| 984 | + "finish": "12.26", |
| 985 | + "peak": "12.23" |
| 986 | + } |
| 987 | + ], |
| 988 | + "speed": 33, |
| 989 | + "radiantAlpha": "217", |
| 990 | + "radiantDelta": "+76", |
| 991 | + "driftAlpha": "0", |
| 992 | + "driftDelta": "0", |
| 993 | + "pidx": 3.0 |
| 994 | + }, |
| 995 | + "PER": |
| 996 | + { |
| 997 | + "designation": "Perseids", |
| 998 | + "activity": |
| 999 | + [ |
| 1000 | + { |
| 1001 | + "year": "generic", |
| 1002 | + "zhr": 100, |
| 1003 | + "start": "07.17", |
| 1004 | + "finish": "08.24", |
| 1005 | + "peak": "08.13" |
| 1006 | + }, |
| 1007 | + { |
| 1008 | + "year": "1863", |
| 1009 | + "zhr": 215 |
| 1010 | + }, |
| 1011 | + { |
| 1012 | + "year": "2004", |
| 1013 | + "zhr": 200 |
| 1014 | + }, |
| 1015 | + { |
| 1016 | + "year": "2007", |
| 1017 | + "zhr": 93 |
| 1018 | + }, |
| 1019 | + { |
| 1020 | + "year": "2008", |
| 1021 | + "zhr": 116 |
| 1022 | + }, |
| 1023 | + { |
| 1024 | + "year": "2009", |
| 1025 | + "zhr": 173 |
| 1026 | + }, |
| 1027 | + { |
| 1028 | + "year": "2010", |
| 1029 | + "zhr": 142 |
| 1030 | + }, |
| 1031 | + { |
| 1032 | + "year": "2011", |
| 1033 | + "zhr": 100 |
| 1034 | + }, |
| 1035 | + { |
| 1036 | + "year": "2012", |
| 1037 | + "zhr": 100 |
| 1038 | + } |
| 1039 | + ], |
| 1040 | + "speed": 59, |
| 1041 | + "radiantAlpha": "48", |
| 1042 | + "radiantDelta": "+58", |
| 1043 | + "driftAlpha": "1.425", |
| 1044 | + "driftDelta": "0.2", |
| 1045 | + "parentObj": "Comet 109P/Swift-Tuttle", |
| 1046 | + "pidx": 2.2 |
| 1047 | + }, |
| 1048 | + "DLE": |
| 1049 | + { |
| 1050 | + "designation": "δ-Leonids", |
| 1051 | + "activity": |
| 1052 | + [ |
| 1053 | + { |
| 1054 | + "year": "generic", |
| 1055 | + "zhr": 2, |
| 1056 | + "start": "02.15", |
| 1057 | + "finish": "03.10", |
| 1058 | + "peak": "02.24" |
| 1059 | + } |
| 1060 | + ], |
| 1061 | + "speed": 23, |
| 1062 | + "radiantAlpha": "168", |
| 1063 | + "radiantDelta": "+16", |
| 1064 | + "driftAlpha": "0", |
| 1065 | + "driftDelta": "0", |
| 1066 | + "parentObj": "Asteroid (4450) Pan", |
| 1067 | + "pidx": 3.0 |
| 1068 | + }, |
| 1069 | + "PPU": |
| 1070 | + { |
| 1071 | + "designation": "π-Puppids", |
| 1072 | + "activity": |
| 1073 | + [ |
| 1074 | + { |
| 1075 | + "year": "generic", |
| 1076 | + "zhr": -1, |
| 1077 | + "variable": "0-40", |
| 1078 | + "start": "04.15", |
| 1079 | + "finish": "04.28", |
| 1080 | + "peak": "04.24" |
| 1081 | + } |
| 1082 | + ], |
| 1083 | + "speed": 18, |
| 1084 | + "radiantAlpha": "110", |
| 1085 | + "radiantDelta": "-45", |
| 1086 | + "driftAlpha": "0", |
| 1087 | + "driftDelta": "0", |
| 1088 | + "parentObj": "Comet 26P/Grigg-Skjellerup", |
| 1089 | + "pidx": 2.0 |
| 1090 | + }, |
| 1091 | + "JLY": |
| 1092 | + { |
| 1093 | + "designation": "June Lyrids", |
| 1094 | + "activity": |
| 1095 | + [ |
| 1096 | + { |
| 1097 | + "year": "generic", |
| 1098 | + "zhr": -1, |
| 1099 | + "variable": "0-5", |
| 1100 | + "start": "06.11", |
| 1101 | + "finish": "06.21", |
| 1102 | + "peak": "06.16" |
| 1103 | + } |
| 1104 | + ], |
| 1105 | + "speed": 31, |
| 1106 | + "radiantAlpha": "277", |
| 1107 | + "radiantDelta": "+35", |
| 1108 | + "driftAlpha": "0.8", |
| 1109 | + "driftDelta": "0", |
| 1110 | + "pidx": 3.0 |
| 1111 | + }, |
| 1112 | + "KCG": |
| 1113 | + { |
| 1114 | + "designation": "κ-Cygnids", |
| 1115 | + "activity": |
| 1116 | + [ |
| 1117 | + { |
| 1118 | + "year": "generic", |
| 1119 | + "zhr": 3, |
| 1120 | + "start": "08.03", |
| 1121 | + "finish": "08.25", |
| 1122 | + "peak": "08.18" |
| 1123 | + } |
| 1124 | + ], |
| 1125 | + "speed": 25, |
| 1126 | + "radiantAlpha": "286", |
| 1127 | + "radiantDelta": "+59", |
| 1128 | + "driftAlpha": "0", |
| 1129 | + "driftDelta": "0", |
| 1130 | + "pidx": 3.0 |
| 1131 | + }, |
| 1132 | + "ELY": |
| 1133 | + { |
| 1134 | + "designation": "ε-Lyrids", |
| 1135 | + "activity": |
| 1136 | + [ |
| 1137 | + { |
| 1138 | + "year": "generic", |
| 1139 | + "zhr": 3, |
| 1140 | + "start": "03.03", |
| 1141 | + "finish": "03.12", |
| 1142 | + "peak": "03.08" |
| 1143 | + } |
| 1144 | + ], |
| 1145 | + "speed": 44, |
| 1146 | + "radiantAlpha": "287", |
| 1147 | + "radiantDelta": "+44", |
| 1148 | + "driftAlpha": "0", |
| 1149 | + "driftDelta": "0", |
| 1150 | + "pidx": 3.0 |
| 1151 | + }, |
| 1152 | + "DAU": |
| 1153 | + { |
| 1154 | + "designation": "δ-Aurigids", |
| 1155 | + "activity": |
| 1156 | + [ |
| 1157 | + { |
| 1158 | + "year": "generic", |
| 1159 | + "zhr": 3, |
| 1160 | + "start": "09.18", |
| 1161 | + "finish": "10.10", |
| 1162 | + "peak": "09.28" |
| 1163 | + } |
| 1164 | + ], |
| 1165 | + "speed": 64, |
| 1166 | + "radiantAlpha": "82", |
| 1167 | + "radiantDelta": "+49", |
| 1168 | + "driftAlpha": "0", |
| 1169 | + "driftDelta": "0", |
| 1170 | + "pidx": 2.9 |
| 1171 | + }, |
| 1172 | + "EGE": |
| 1173 | + { |
| 1174 | + "designation": "ε-Geminids", |
| 1175 | + "activity": |
| 1176 | + [ |
| 1177 | + { |
| 1178 | + "year": "generic", |
| 1179 | + "zhr": 3, |
| 1180 | + "start": "10.14", |
| 1181 | + "finish": "10.27", |
| 1182 | + "peak": "10.18" |
| 1183 | + } |
| 1184 | + ], |
| 1185 | + "speed": 70, |
| 1186 | + "radiantAlpha": "102", |
| 1187 | + "radiantDelta": "+27", |
| 1188 | + "driftAlpha": "0", |
| 1189 | + "driftDelta": "0", |
| 1190 | + "pidx": 3.0 |
| 1191 | + }, |
| 1192 | + "STA": |
| 1193 | + { |
| 1194 | + "designation": "Southern Taurids", |
| 1195 | + "activity": |
| 1196 | + [ |
| 1197 | + { |
| 1198 | + "year": "generic", |
| 1199 | + "zhr": 5, |
| 1200 | + "start": "09.25", |
| 1201 | + "finish": "11.25", |
| 1202 | + "peak": "11.05" |
| 1203 | + } |
| 1204 | + ], |
| 1205 | + "speed": 27, |
| 1206 | + "radiantAlpha": "52", |
| 1207 | + "radiantDelta": "+15", |
| 1208 | + "driftAlpha": "0", |
| 1209 | + "driftDelta": "0", |
| 1210 | + "pidx": 2.3 |
| 1211 | + }, |
| 1212 | + "NTA": |
| 1213 | + { |
| 1214 | + "designation": "Northern Taurids", |
| 1215 | + "activity": |
| 1216 | + [ |
| 1217 | + { |
| 1218 | + "year": "generic", |
| 1219 | + "zhr": 5, |
| 1220 | + "start": "09.25", |
| 1221 | + "finish": "11.25", |
| 1222 | + "peak": "11.12" |
| 1223 | + } |
| 1224 | + ], |
| 1225 | + "speed": 29, |
| 1226 | + "radiantAlpha": "58", |
| 1227 | + "radiantDelta": "+22", |
| 1228 | + "driftAlpha": "0", |
| 1229 | + "driftDelta": "0", |
| 1230 | + "pidx": 2.3 |
| 1231 | + }, |
| 1232 | + "MON": |
| 1233 | + { |
| 1234 | + "designation": "Monocerotids", |
| 1235 | + "activity": |
| 1236 | + [ |
| 1237 | + { |
| 1238 | + "year": "generic", |
| 1239 | + "zhr": 2, |
| 1240 | + "start": "11.27", |
| 1241 | + "finish": "12.17", |
| 1242 | + "peak": "12.09" |
| 1243 | + } |
| 1244 | + ], |
| 1245 | + "speed": 42, |
| 1246 | + "radiantAlpha": "100", |
| 1247 | + "radiantDelta": "+8", |
| 1248 | + "driftAlpha": "0", |
| 1249 | + "driftDelta": "0", |
| 1250 | + "pidx": 3.0 |
| 1251 | + }, |
| 1252 | + "HYD": |
| 1253 | + { |
| 1254 | + "designation": "σ-Hydrids", |
| 1255 | + "activity": |
| 1256 | + [ |
| 1257 | + { |
| 1258 | + "year": "generic", |
| 1259 | + "zhr": 3, |
| 1260 | + "start": "12.03", |
| 1261 | + "finish": "12.15", |
| 1262 | + "peak": "12.12" |
| 1263 | + } |
| 1264 | + ], |
| 1265 | + "speed": 58, |
| 1266 | + "radiantAlpha": "127", |
| 1267 | + "radiantDelta": "+2", |
| 1268 | + "driftAlpha": "0", |
| 1269 | + "driftDelta": "0", |
| 1270 | + "pidx": 3.0 |
| 1271 | + }, |
| 1272 | + "GEM": |
| 1273 | + { |
| 1274 | + "designation": "Geminids", |
| 1275 | + "activity": |
| 1276 | + [ |
| 1277 | + { |
| 1278 | + "year": "generic", |
| 1279 | + "zhr": 120, |
| 1280 | + "start": "12.07", |
| 1281 | + "finish": "12.17", |
| 1282 | + "peak": "12.14" |
| 1283 | + }, |
| 1284 | + { |
| 1285 | + "year": "2006", |
| 1286 | + "zhr": 115 |
| 1287 | + }, |
| 1288 | + { |
| 1289 | + "year": "2007", |
| 1290 | + "zhr": 122 |
| 1291 | + }, |
| 1292 | + { |
| 1293 | + "year": "2008", |
| 1294 | + "zhr": 139 |
| 1295 | + }, |
| 1296 | + { |
| 1297 | + "year": "2009", |
| 1298 | + "zhr": 120 |
| 1299 | + }, |
| 1300 | + { |
| 1301 | + "year": "2010", |
| 1302 | + "zhr": 127 |
| 1303 | + }, |
| 1304 | + { |
| 1305 | + "year": "2011", |
| 1306 | + "zhr": 198 |
| 1307 | + }, |
| 1308 | + { |
| 1309 | + "year": "2012", |
| 1310 | + "zhr": 109 |
| 1311 | + } |
| 1312 | + ], |
| 1313 | + "speed": 35, |
| 1314 | + "radiantAlpha": "112", |
| 1315 | + "radiantDelta": "+33", |
| 1316 | + "driftAlpha": "0", |
| 1317 | + "driftDelta": "0", |
| 1318 | + "pidx": 2.6 |
| 1319 | + }, |
| 1320 | + "LMI": |
| 1321 | + { |
| 1322 | + "designation": "Leonis Minorids", |
| 1323 | + "activity": |
| 1324 | + [ |
| 1325 | + { |
| 1326 | + "year": "generic", |
| 1327 | + "zhr": 2, |
| 1328 | + "start": "10.19", |
| 1329 | + "finish": "10.27", |
| 1330 | + "peak": "10.24" |
| 1331 | + } |
| 1332 | + ], |
| 1333 | + "speed": 62, |
| 1334 | + "radiantAlpha": "162", |
| 1335 | + "radiantDelta": "+37", |
| 1336 | + "driftAlpha": "0", |
| 1337 | + "driftDelta": "0", |
| 1338 | + "pidx": 3.0 |
| 1339 | + }, |
| 1340 | + "DLM": |
| 1341 | + { |
| 1342 | + "designation": "December Leonis Minorids", |
| 1343 | + "activity": |
| 1344 | + [ |
| 1345 | + { |
| 1346 | + "year": "generic", |
| 1347 | + "zhr": 5, |
| 1348 | + "start": "12.05", |
| 1349 | + "finish": "02.04", |
| 1350 | + "peak": "12.20" |
| 1351 | + } |
| 1352 | + ], |
| 1353 | + "speed": 64, |
| 1354 | + "radiantAlpha": "161", |
| 1355 | + "radiantDelta": "+30", |
| 1356 | + "driftAlpha": "0", |
| 1357 | + "driftDelta": "0", |
| 1358 | + "pidx": 3.0 |
| 1359 | + }, |
| 1360 | + "COM": |
| 1361 | + { |
| 1362 | + "designation": "Comae Berenicids", |
| 1363 | + "activity": |
| 1364 | + [ |
| 1365 | + { |
| 1366 | + "year": "generic", |
| 1367 | + "zhr": 3, |
| 1368 | + "start": "12.12", |
| 1369 | + "finish": "12.23", |
| 1370 | + "peak": "12.16" |
| 1371 | + } |
| 1372 | + ], |
| 1373 | + "speed": 65, |
| 1374 | + "radiantAlpha": "175", |
| 1375 | + "radiantDelta": "+18", |
| 1376 | + "driftAlpha": "0", |
| 1377 | + "driftDelta": "0", |
| 1378 | + "pidx": 3.0 |
| 1379 | + }, |
| 1380 | + "ORI": |
| 1381 | + { |
| 1382 | + "designation": "Orionids", |
| 1383 | + "activity": |
| 1384 | + [ |
| 1385 | + { |
| 1386 | + "year": "generic", |
| 1387 | + "zhr": 25, |
| 1388 | + "start": "10.02", |
| 1389 | + "finish": "11.07", |
| 1390 | + "peak": "10.21" |
| 1391 | + } |
| 1392 | + ], |
| 1393 | + "speed": 66, |
| 1394 | + "radiantAlpha": "95", |
| 1395 | + "radiantDelta": "+16", |
| 1396 | + "driftAlpha": "0.64", |
| 1397 | + "driftDelta": "0.1", |
| 1398 | + "pidx": 2.5 |
| 1399 | + } |
| 1400 | + } |
| 1401 | } |
| 1402 | |
| 1403 | === modified file 'plugins/MeteorShowers/src/MeteorShower.cpp' |
| 1404 | --- plugins/MeteorShowers/src/MeteorShower.cpp 2013-12-13 20:26:47 +0000 |
| 1405 | +++ plugins/MeteorShowers/src/MeteorShower.cpp 2013-12-14 13:52:36 +0000 |
| 1406 | @@ -110,7 +110,7 @@ |
| 1407 | |
| 1408 | float MeteorShower::getSelectPriority(const StelCore*) const |
| 1409 | { |
| 1410 | - return 5.0; |
| 1411 | + return 3.0; |
| 1412 | } |
| 1413 | |
| 1414 | QString MeteorShower::getDesignation() const |
| 1415 | @@ -247,7 +247,7 @@ |
| 1416 | QTextStream oss(&str); |
| 1417 | |
| 1418 | if(flags&Name) |
| 1419 | - oss << "<h2>" << getNameI18n() << "</h2>"; |
| 1420 | + oss << "<h2>" << getNameI18n() << " (" << showerID <<")</h2>"; |
| 1421 | |
| 1422 | if(flags&Extra) |
| 1423 | oss << q_("Type: <b>%1</b>").arg(q_("meteor shower")) << "<br />"; |
| 1424 | |
| 1425 | === modified file 'plugins/MeteorShowers/src/MeteorShowers.cpp' |
| 1426 | --- plugins/MeteorShowers/src/MeteorShowers.cpp 2013-12-13 17:27:31 +0000 |
| 1427 | +++ plugins/MeteorShowers/src/MeteorShowers.cpp 2013-12-14 13:52:36 +0000 |
| 1428 | @@ -882,7 +882,7 @@ |
| 1429 | { |
| 1430 | conf->beginGroup("MeteorShowers"); |
| 1431 | |
| 1432 | - updateUrl = conf->value("url", "http://stellarium.astro.uni-altai.ru/showers.json").toString(); |
| 1433 | + updateUrl = conf->value("url", "http://stellarium.org/json/showers.json").toString(); |
| 1434 | updateFrequencyHours = conf->value("update_frequency_hours", 720).toInt(); |
| 1435 | lastUpdate = QDateTime::fromString(conf->value("last_update", "2013-12-10T12:00:00").toString(), Qt::ISODate); |
| 1436 | updatesEnabled = conf->value("updates_enabled", true).toBool(); |
| 1437 | |
| 1438 | === modified file 'plugins/MeteorShowers/src/gui/meteorShowerDialog.ui' |
| 1439 | --- plugins/MeteorShowers/src/gui/meteorShowerDialog.ui 2013-12-11 21:08:30 +0000 |
| 1440 | +++ plugins/MeteorShowers/src/gui/meteorShowerDialog.ui 2013-12-14 13:52:36 +0000 |
| 1441 | @@ -253,7 +253,7 @@ |
| 1442 | <string/> |
| 1443 | </property> |
| 1444 | <property name="text"> |
| 1445 | - <string>Enable display of distribution for meteor showers</string> |
| 1446 | + <string>Enable display of radiants of meteor showers</string> |
| 1447 | </property> |
| 1448 | </widget> |
| 1449 | </item> |
| 1450 | |
| 1451 | === modified file 'plugins/MeteorShowers/src/translations.h' |
| 1452 | --- plugins/MeteorShowers/src/translations.h 2013-12-08 02:17:53 +0000 |
| 1453 | +++ plugins/MeteorShowers/src/translations.h 2013-12-14 13:52:36 +0000 |
| 1454 | @@ -48,6 +48,22 @@ |
| 1455 | N_("Puppid-Velids"); |
| 1456 | N_("Ursids"); |
| 1457 | N_("Perseids"); |
| 1458 | + N_("δ-Leonids"); |
| 1459 | + N_("π-Puppids"); |
| 1460 | + N_("June Lyrids"); |
| 1461 | + N_("κ-Cygnids"); |
| 1462 | + N_("ε-Lyrids"); |
| 1463 | + N_("δ-Aurigids"); |
| 1464 | + N_("ε-Geminids"); |
| 1465 | + N_("Southern Taurids"); |
| 1466 | + N_("Northern Taurids"); |
| 1467 | + N_("Monocerotids"); |
| 1468 | + N_("σ-Hydrids"); |
| 1469 | + N_("Geminids"); |
| 1470 | + N_("Leonis Minorids"); |
| 1471 | + N_("December Leonis Minorids"); |
| 1472 | + N_("Comae Berenicids"); |
| 1473 | + N_("Orionids"); |
| 1474 | |
| 1475 | // List of parent objects for meteor showers |
| 1476 | N_("Asteroid 2003 EH1"); |
| 1477 | @@ -56,6 +72,8 @@ |
| 1478 | N_("Comet 55P/Tempel-Tuttle"); |
| 1479 | N_("Comet 96P/Machholz"); |
| 1480 | N_("Comet 109P/Swift-Tuttle"); |
| 1481 | - N_("Comet Thatcher"); |
| 1482 | + N_("Comet Thatcher (1861 I)"); |
| 1483 | + N_("Asteroid (4450) Pan"); |
| 1484 | + N_("Comet 26P/Grigg-Skjellerup"); |
| 1485 | } |
| 1486 | }; |
