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