Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some small fixes to Chinese skyculture and Chinese contemporary skycu… #1721

Closed
wants to merge 1 commit into from

Conversation

Kuanzin0562
Copy link

@Kuanzin0562 Kuanzin0562 commented Jun 6, 2021

Some small fixes to skycultures and star names

Description

  • Some small fixes to Chinese skyculture, such as constellationship, description and star names, based on Chinese and Western Contrast Stars Chart and Star Catalogue 1950.0(Star Catalogue) (Chinese: 中西对照恒星图表1950.0(星表分册)) and The History of Stellar Observation in China (Chinese: 中国恒星观测史).
  • Some small fixes to Chinese contemporary skyculture, such as asterism lines and star names, based on Chinese and Western Contrast Stars Chart and Star Catalogue 1950.0(Star Catalogue) (Chinese: 中西对照恒星图表1950.0(星表分册)) and The History of Stellar Observation in China (Chinese: 中国恒星观测史).
  • updated Bayer designations and Flamsteed designations of the stars according to Wikipedia and Simbad.
  • Some small fixes to Chinese translation of skycultures.

Fixes # (issue)

  • Some small fixes to Chinese skyculture:

    • In constellationship.fab:
      • 013 "Willow" (Chinese: 柳宿)
      • 016 "Ox" (Chinese: 牛宿)
      • 024 "Tail" (Chinese: 尾宿)
      • 037 "Rotten Gourd" (Chinese: 败瓜)
      • 072 "Tomb (Vassal of Rooftop)" (Chinese: 坟墓)
      • 101 "Canopy of the Emperor" (Chinese: 华盖)
      • 128 "Peafowl" (Chinese: 孔雀)
      • 246 "Celestial Farmland (In Ox Mansion)" (Chinese: 天田)
      • 249 "Celestial Yin Force" (Chinese: 天阴)
      • 308 "Pillars (In Net Mansion)" (Chinese: 柱)
    • Updated description.zh_CN.utf8, description.zh_HK.utf8 and description.zh_TW.utf8
    • In star_names.fab and star_names.zh_CN.fab:
      • Added star names to some double stars, such as HIP 99351 "Left Flag Added XXV" (Chinese: 左旗增五), and HIP 49319 "Extended Net IV" (Chinese: 张宿四)
      • Fixed star names of HIP 100565 "Celestial Hook Added IV?" (Chinese: 天钩增四) and HIP 56620 "Green Hill Added III*" (Chinese: 青丘增三)
  • Some small fixes to Chinese Contemporary skyculture:

    • In star_names.fab:
      • Added star names to some double stars, just like Chinese skyculture
      • Fixed star names of HIP 100565 "Celestial Hook Added IV?" and HIP 56620 "Green Hill Added III*"
    • In asterism_lines.fab, fixed lines of Xingguans:
      • 013 "Willow"
      • 016 "Ox"
      • 024 "Tail"
      • 037 "Rotten Gourd"
      • 072 "Tomb (Vassal of Rooftop)"
      • 101 "Canopy of the Emperor"
      • 128 "Peafowl"
      • 246 "Celestial Farmland (In Ox Mansion)"
      • 249 "Celestial Yin Force"
      • 308 "Pillars (In Net Mansion)"
  • Some small fixes to Western skyculture:

    • In star_names.fab, fixed HIP 42080 "Althiba I"
  • In stellarium/stars/default/name.fab, updated Bayer designations and Flamsteed designations of the stars according to Wikipedia and Simbad, such as "c1_Cap", "6_Cnc*" and many others

  • In stellarium/po/stellarium-skycultures/zh_CN.po, fixed some small problems to Chinese translation of skycultures.

Screenshots (if appropriate):

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • This change requires a documentation update

How Has This Been Tested?

Test Configuration:

  • Operating system: macOS Catalina, 10.15.7
  • Graphics Card: AMD Radeon R9 M370X 2 GB Intel Iris Pro 1536 MB

Checklist:

  • My code follows the code style of this project.
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

…lture,updated Bayer designations and Flamsteed designations of the stars,updated Chinese translation of skycultures.
@github-actions
Copy link

github-actions bot commented Jun 6, 2021

Great PR! Please pay attention to the following items before merging:

Files matching skycultures/**:

  • Did you remember to update po/stellarium-skycultures/POFILES.in and src/translations.h files respectively to changes in sky cultures?
  • Did you remember to define classification parameter in sky cultures?

This is an automatically generated QA checklist based on modified files

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding your first pull request to Stellarium. If you have questions, please do not hesitate to contact us.

Copy link
Member

@alex-w alex-w left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Western SC: Why many stars have asterisk in designation? Where is source for many strange designation for stars?

@@ -1,5 +1,4 @@
677|α_And
841|22_And
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HIP 841 = 22 And according to SIMBAD

stars/default/name.fab Show resolved Hide resolved
@@ -84,6 +84,7 @@
10176|59_And_A
10180|59_And_B
10340|60_And
10805|61_And*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

HIP 10805 = 61 And according to SIMBAD

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
10805|61_And*
10805|61_And*

according to V520_Persei and
Table of stars with Flamsteed designations

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where you see asterisk for 61 And? Just for note: asterisk and double asterisk in SIMBAD are not part of star designation, but this is part of SIMBAD designations, meaning star and double star respectively.

stars/default/name.fab Show resolved Hide resolved
113136|76_Aqr
113148|77_Aqr
113127|78_Aqr
113686|80_Aqr?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to SIMBAD this star hasn’t Flamesteed or Bayer designation. Where is source for it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
113686|80_Aqr?
113686|80_Aqr?

according to Table of stars with Flamsteed designations

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Wikipedia you may see that designation 80 Aqr maybe associated to HIP 113686.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not draw from all possible sources without giving references. A Wikipedia list without source is not good. I see "HD217563?" which further refers to HIP113686. But it's unclear who made the identification.

@alex-w I just noted name.fab is not described in Appendix C. We should add a section with guidelines and rules. Do you know all the sources for this list?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gzotti this list created according to few catalogs, I don’t remember all sources

@@ -1247,12 +1377,15 @@
7450|50_Cet
8102|52_Cet
8497|53_Cet
8588|54_Cet*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

12107|80_Cet
12247|81_Cet
12387|82_Cet
12390|83_Cet
12530|84_Cet
12647|85_Cet*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

12706|86_Cet
12828|87_Cet
12832|88_Cet*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This star hasn’t asterisk in designation

@@ -1309,6 +1448,7 @@
27628|β_Col
28199|γ_Col
30277|δ_Col
30277|3_CMa*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This star hasn’t asterisk in designation!

@@ -1360,6 +1502,7 @@
62886|35_Com
63355|36_Com
63462|37_Com
63462|13_CVn*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
63462|13_CVn*
63462|13_CVn*

According to 37_Com and Table of stars with Flamsteed designations

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This star hasn’t asterisk in designation

@alex-w
Copy link
Member

alex-w commented Jun 6, 2021

@sunshuwei please check the Chinese part of PR

skycultures/western/star_names.fab Show resolved Hide resolved
@@ -1449,19 +1592,29 @@
56802|ι_Crt
55874|κ_Crt
55598|λ_Crt
54742|ψ_Crt
53037|5_Crt*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

53740|7_Crt
53963|8_Crt*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

53740|7_Crt
53963|8_Crt*
54477|10_Crt*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

54682|11_Crt
55282|12_Crt
55598|13_Crt
55687|14_Crt
55705|15_Crt
55874|16_Crt
56280|17_Crt
56280|17_Crt*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

@@ -4252,6 +4670,7 @@
67231|84_UMa
67301|85_UMa
67848|86_UMa
67627|87_UMa*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

11767|1_UMi
5372|2_UMi
5372|2_UMi*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

61941|29_Vir
61960|30_Vir
61968|31_Vir
62267|32_Vir
62325|33_Vir
62394|34_Vir
62443|35_Vir
62541|36_Vir*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

69427|98_Vir
69701|99_Vir
69974|100_Vir
69829|101_Vir*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

@@ -4506,6 +4950,7 @@
103004|31_Vul
103200|32_Vul
103511|33_Vul
105411|34_Vul*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why asterisk added here?

Copy link
Member

@gzotti gzotti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @alex-w that @sunshuwei, who provided a very extensive description, should please review this. Mixing sources may be problematic to begin with. (The "western" is a special case and permanent working zone...) I would prefer to have exactly one source book (or more if they agree on the figures) implemented accurately, else this becomes a hodge-podge where always one or somebody else will "fix" something "corrected" recently by somebody else.

@alex-w
Copy link
Member

alex-w commented Jun 6, 2021

Please remove asterisk from designations, because this file contains modern designations.

@alex-w
Copy link
Member

alex-w commented Jun 6, 2021

Important note: all *.po files will be replaced by translations from Transifex!

@alex-w
Copy link
Member

alex-w commented Jun 6, 2021

@lvhaocheng Please extract all related to western skyculture stuff into separate pull request.

@Kuanzin0562
Copy link
Author

I will modify it later.

@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the has conflicts The pull request has conflicts label Jun 12, 2021
@alex-w
Copy link
Member

alex-w commented Jun 12, 2021

I've checked name.fab file and incorporated missed designations into main program (+refactoring to support multiple Bayer/Flamsteed designations)

@alex-w
Copy link
Member

alex-w commented Sep 12, 2021

@sunshuwei please check the Chinese part of PR

@lvhaocheng any news for resolving conflicts and changes in the PR?

@sunshuwei
Copy link
Contributor

@sunshuwei please check the Chinese part of PR

@lvhaocheng any news for resolving conflicts and changes in the PR?

OK

@sunshuwei
Copy link
Contributor

I think it's good for me.

Copy link
Member

@gzotti gzotti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not possible to resolve the duplicates? I have annotated a few, but it's getting too much.

@sunshuwei
Copy link
Contributor

I noticed that these are double stars indistinguishable by naked eye.

@sunshuwei
Copy link
Contributor

They are each a member of a double star.

Hundreds of years ago, astronomy officials used the naked eye to determine the names of stars.
So, in some cases a name should correspond to a pair of double stars.
When each member has a HIP number, Stellarium cannot treat a "double star" as one star.
I think it is reasonable to name each member of the double star or only the brighter one.

@gzotti
Copy link
Member

gzotti commented Sep 24, 2021

OK, in this case it may be useful to assign the name to the brighter of the pair. Else the screen is cluttered with too much text.

@sunshuwei
Copy link
Contributor

OK, in this case it may be useful to assign the name to the brighter of the pair. Else the screen is cluttered with too much text.

Yes, I think so.

@sunshuwei
Copy link
Contributor

I fixed some of them, others are open for discussion.
See #1952 #

@alex-w alex-w closed this May 22, 2022
@alex-w alex-w added the purpose: cultural astronomy Issues, pull requests and proposals with cultural astronomy purposes label Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has conflicts The pull request has conflicts purpose: cultural astronomy Issues, pull requests and proposals with cultural astronomy purposes
Development

Successfully merging this pull request may close these issues.

4 participants