Merge branch 'master' into lilja_bust_size

imas · Jul 5, 2024 · 92d1a14 · 92d1a14
2 parents 5d58539 + 488a6b8
commit 92d1a14
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 8 deletions.
diff --git a/.rdflint/rdflint-config.yml b/.rdflint/rdflint-config.yml
@@ -5,19 +5,20 @@ rules:
     query: |
       PREFIX schema: <http://schema.org/>
       PREFIX imas: <https://sparql.crssnky.xyz/imasrdf/URIs/imas-schema.ttl#>
-      SELECT ?s ?fn ?gn ?nm ?fnk ?gnk ?nmk
+      SELECT ?s ?fn ?gn ?an ?nm ?fnk ?gnk ?ank ?nmk
       WHERE {
-       ?s schema:familyName ?fn; schema:givenName ?gn; schema:name ?nm;
-         imas:familyNameKana ?fnk; imas:givenNameKana ?gnk; imas:nameKana ?nmk.
-       FILTER(LANG(?fn) = 'ja' && LANG(?gn) = 'ja' && LANG(?nm) = 'ja'
-         && LANG(?fnk) = 'ja' && LANG(?gnk) = 'ja' && LANG(?nmk) = 'ja')
+       ?s schema:familyName ?fn; schema:givenName ?gn; schema:additionalName ?an; schema:name ?nm;
+         imas:familyNameKana ?fnk; imas:givenNameKana ?gnk; imas:additionalNameKana ?ank; imas:nameKana ?nmk.
+       FILTER(LANG(?fn) = 'ja' && LANG(?gn) = 'ja'  && LANG(?an) = 'ja' && LANG(?nm) = 'ja'
+         && LANG(?fnk) = 'ja' && LANG(?gnk) = 'ja'  && LANG(?ank) = 'ja' && LANG(?nmk) = 'ja')
       }
     valid: |
       while(rs.hasNext()) {
         r = rs.next()
         jn = [r.getLiteral("fn").value + r.getLiteral("gn").value,
               r.getLiteral("gn").value + r.getLiteral("fn").value,
               r.getLiteral("fn").value + "・" + r.getLiteral("gn").value,
+              r.getLiteral("gn").value + "・" + r.getLiteral("an").value + "・" + r.getLiteral("fn").value,
               r.getLiteral("gn").value + "・" + r.getLiteral("fn").value]
         nm = r.getLiteral("nm").value
         if (!(nm in jn)) {
@@ -27,6 +28,7 @@ rules:
         jnk = [r.getLiteral("fnk").value + r.getLiteral("gnk").value,
                r.getLiteral("gnk").value + r.getLiteral("fnk").value,
                r.getLiteral("fnk").value + "・" + r.getLiteral("gnk").value,
+              r.getLiteral("gnk").value + "・" + r.getLiteral("ank").value + "・" + r.getLiteral("fnk").value,
                r.getLiteral("gnk").value + "・" + r.getLiteral("fnk").value]
         nmk = r.getLiteral("nmk").value
         if (!(nmk in jnk)) {
@@ -37,15 +39,16 @@ rules:
     target: "RDFs/.*"
     query: |
       PREFIX schema: <http://schema.org/>
-      SELECT ?s ?fn ?gn ?nm
+      SELECT ?s ?fn ?gn ?an ?nm
       WHERE {
-       ?s schema:familyName ?fn; schema:givenName ?gn; schema:name ?nm
-       FILTER(LANG(?fn) = 'en' && LANG(?gn) = 'en' && LANG(?nm) = 'en')
+       ?s schema:familyName ?fn; schema:givenName ?gn; schema:additionalName ?an; schema:name ?nm
+       FILTER(LANG(?fn) = 'en' && LANG(?gn) = 'en' && LANG(?an) = 'en' && LANG(?nm) = 'en')
       }
     valid: |
       while(rs.hasNext()) {
         r = rs.next()
         jn = [r.getLiteral("fn").value + " " + r.getLiteral("gn").value,
+              r.getLiteral("gn").value + " " + r.getLiteral("an").value + " " + r.getLiteral("fn").value,
               r.getLiteral("gn").value + " " + r.getLiteral("fn").value]
         nm = r.getLiteral("nm").value
         if (!(nm in jn)) {

diff --git a/RDFs/876.rdf b/RDFs/876.rdf
@@ -173,4 +173,100 @@
     <rdf:type rdf:resource="https://sparql.crssnky.xyz/imasrdf/URIs/imas-schema.ttl#Idol"/>
   </rdf:Description>
 
+  <rdf:Description rdf:about="Kamizuru_Cosmo">
+    <rdf:type rdf:resource="https://sparql.crssnky.xyz/imasrdf/URIs/imas-schema.ttl#Idol"/>
+    <schema:familyName xml:lang="ja">上水流</schema:familyName>
+    <schema:familyName xml:lang="en">Kamizuru</schema:familyName>
+    <imas:familyNameKana xml:lang="ja">かみずる</imas:familyNameKana>
+    <schema:givenName xml:lang="ja">宇宙</schema:givenName>
+    <schema:givenName xml:lang="en">Cosmo</schema:givenName>
+    <imas:givenNameKana xml:lang="ja">こすも</imas:givenNameKana>
+    <schema:name xml:lang="ja">上水流宇宙</schema:name>
+    <schema:name xml:lang="en">Cosmo Kamizuru</schema:name>
+    <imas:nameKana xml:lang="ja">かみずるこすも</imas:nameKana>
+    <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">上水流宇宙</rdfs:label>
+    <imas:Brand xml:lang="en">va-liv</imas:Brand>
+    <schema:memberOf rdf:resource="876Production"/>
+    <foaf:age rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">17</foaf:age>
+    <schema:height rdf:datatype="http://www.w3.org/2001/XMLSchema#float">162</schema:height>
+    <schema:birthDate rdf:datatype="http://www.w3.org/2001/XMLSchema#gMonthDay">--09-12</schema:birthDate>
+    <imas:Constellation xml:lang="ja">蠍座</imas:Constellation>
+    <schema:gender rdf:datatype="http://www.w3.org/2001/XMLSchema#string">female</schema:gender>
+    <imas:BloodType rdf:datatype="http://www.w3.org/2001/XMLSchema#string">B</imas:BloodType>
+    <schema:birthPlace xml:lang="ja">東京</schema:birthPlace>
+    <imas:Hobby xml:lang="ja">イラストを描くこと</imas:Hobby>
+    <imas:Hobby xml:lang="ja">ゲーム</imas:Hobby>
+    <imas:Hobby xml:lang="ja">食べること</imas:Hobby>
+    <imas:Talent xml:lang="ja">書道</imas:Talent>
+    <imas:Talent xml:lang="ja">地獄耳</imas:Talent>
+    <imas:Color rdf:datatype="http://www.w3.org/2001/XMLSchema#hexBinary">56CCF2</imas:Color>
+    <imas:IdolListURL rdf:resource="https://idollist.idolmaster-official.jp/detail/210004"/>
+  </rdf:Description>
+
+  <rdf:Description rdf:about="Tomori_Manaka">
+    <rdf:type rdf:resource="https://sparql.crssnky.xyz/imasrdf/URIs/imas-schema.ttl#Idol"/>
+    <schema:familyName xml:lang="ja">灯里</schema:familyName>
+    <schema:familyName xml:lang="en">Tomori</schema:familyName>
+    <imas:familyNameKana xml:lang="ja">ともり</imas:familyNameKana>
+    <schema:givenName xml:lang="ja">愛夏</schema:givenName>
+    <schema:givenName xml:lang="en">Manaka</schema:givenName>
+    <imas:givenNameKana xml:lang="ja">まなか</imas:givenNameKana>
+    <schema:name xml:lang="ja">灯里愛夏</schema:name>
+    <schema:name xml:lang="en">Manaka Tomori</schema:name>
+    <imas:nameKana xml:lang="ja">ともりまなか</imas:nameKana>
+    <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">灯里愛夏</rdfs:label>
+    <imas:Brand xml:lang="en">va-liv</imas:Brand>
+    <schema:memberOf rdf:resource="876Production"/>
+    <foaf:age rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">18</foaf:age>
+    <schema:height rdf:datatype="http://www.w3.org/2001/XMLSchema#float">158</schema:height>
+    <schema:birthDate rdf:datatype="http://www.w3.org/2001/XMLSchema#gMonthDay">--07-01</schema:birthDate>
+    <imas:Constellation xml:lang="ja">蟹座</imas:Constellation>
+    <schema:gender rdf:datatype="http://www.w3.org/2001/XMLSchema#string">female</schema:gender>
+    <imas:BloodType rdf:datatype="http://www.w3.org/2001/XMLSchema#string">B</imas:BloodType>
+    <schema:birthPlace xml:lang="ja">福岡</schema:birthPlace>
+    <imas:Hobby xml:lang="ja">アイドル研究</imas:Hobby>
+    <imas:Hobby xml:lang="ja">カフェで読書</imas:Hobby>
+    <imas:Hobby xml:lang="ja">ミュージカル</imas:Hobby>
+    <imas:Talent xml:lang="ja">料理</imas:Talent>
+    <imas:Talent xml:lang="ja">利きアイス</imas:Talent>
+    <imas:Color rdf:datatype="http://www.w3.org/2001/XMLSchema#hexBinary">FF4554</imas:Color>
+    <imas:IdolListURL rdf:resource="https://idollist.idolmaster-official.jp/detail/210003"/>
+  </rdf:Description>
+
+  <rdf:Description rdf:about="Sara_Letora_Oliveira_Utagawa">
+    <rdf:type rdf:resource="https://sparql.crssnky.xyz/imasrdf/URIs/imas-schema.ttl#Idol"/>
+    <schema:familyName xml:lang="ja">オリヴェイラ・ウタガワ</schema:familyName>
+    <schema:familyName xml:lang="en">Oliveira Utagawa</schema:familyName>
+    <imas:familyNameKana xml:lang="ja">おりゔぇいら・うたがわ</imas:familyNameKana>
+    <schema:givenName xml:lang="ja">サラ</schema:givenName>
+    <schema:givenName xml:lang="en">Sara</schema:givenName>
+    <imas:givenNameKana xml:lang="ja">さら</imas:givenNameKana>
+    <schema:additionalName xml:lang="ja">レトラ</schema:additionalName>
+    <schema:additionalName xml:lang="en">Letora</schema:additionalName>
+    <imas:additionalNameKana xml:lang="ja">れとら</imas:additionalNameKana>
+    <schema:name xml:lang="ja">サラ・レトラ・オリヴェイラ・ウタガワ</schema:name>
+    <schema:name xml:lang="en">Sara Letora Oliveira Utagawa</schema:name>
+    <imas:nameKana xml:lang="ja">さら・れとら・おりゔぇいら・うたがわ</imas:nameKana>
+    <schema:alternateName xml:lang="ja">レトラ</schema:alternateName>
+    <schema:alternateName xml:lang="en">Letora</schema:alternateName>
+    <imas:alternateNameKana xml:lang="ja">れとら</imas:alternateNameKana>
+    <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">レトラ</rdfs:label>
+    <imas:Brand xml:lang="en">va-liv</imas:Brand>
+    <schema:memberOf rdf:resource="876Production"/>
+    <foaf:age rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">20</foaf:age>
+    <schema:height rdf:datatype="http://www.w3.org/2001/XMLSchema#float">159</schema:height>
+    <schema:birthDate rdf:datatype="http://www.w3.org/2001/XMLSchema#gMonthDay">--11-11</schema:birthDate>
+    <imas:Constellation xml:lang="ja">蠍座</imas:Constellation>
+    <schema:gender rdf:datatype="http://www.w3.org/2001/XMLSchema#string">female</schema:gender>
+    <imas:BloodType rdf:datatype="http://www.w3.org/2001/XMLSchema#string">O</imas:BloodType>
+    <schema:birthPlace xml:lang="ja">埼玉</schema:birthPlace>
+    <imas:Hobby xml:lang="ja">寝ること</imas:Hobby>
+    <imas:Hobby xml:lang="ja">ネイル・メイク</imas:Hobby>
+    <imas:Hobby xml:lang="ja">雑貨集め</imas:Hobby>
+    <imas:Talent xml:lang="ja">歌</imas:Talent>
+    <imas:Talent xml:lang="ja">古着リメイク</imas:Talent>
+    <imas:Color rdf:datatype="http://www.w3.org/2001/XMLSchema#hexBinary">D7F930</imas:Color>
+    <imas:IdolListURL rdf:resource="https://idollist.idolmaster-official.jp/detail/210005"/>
+  </rdf:Description>
+
 </rdf:RDF>
diff --git a/URIs/imas-schema.ttl b/URIs/imas-schema.ttl
@@ -114,6 +114,10 @@ imas:familyNameKana     a   rdf:Property ;
     rdfs:comment            "姓のよみがなを表すプロパティ" ;
     rdfs:label              "姓よみがな"@ja .
 
+imas:additionalNameKana a   rdf:Property ;
+    rdfs:comment            "ミドルネームのよみがなを表すプロパティ" ;
+    rdfs:label              "ミドルネームよみがな"@ja .
+
 imas:givenNameKana      a   rdf:Property ;
     rdfs:comment            "名のよみがなを表すプロパティ" ;
     rdfs:label              "名よみがな"@ja .

diff --git a/constraints/IdolShape.ttl b/constraints/IdolShape.ttl
@@ -31,6 +31,7 @@ imas-shape:IdolShape a sh:NodeShape;
             "ShinyColors"@en
             "Xenoglossia"@en
             "Gakuen"@en
+            "va-liv"@en
             "Other"@en  # 判断に迷う場合はここ
         );
     ];
@@ -78,6 +79,13 @@ imas-shape:IdolShape a sh:NodeShape;
         sh:datatype rdf:langString;
         sh:languageIn ("ja");
     ];
+    sh:property [
+        sh:name "ミドルネームの仮名の制約";
+        sh:description "仮名は日本語なのでlang=ja";
+        sh:path imas:additionalNameKana;
+        sh:datatype rdf:langString;
+        sh:languageIn ("ja");
+    ];
     sh:property [
         sh:name "上の名前の仮名の制約";
         sh:description "仮名は日本語なのでlang=ja";