null+****@clear*****
null+****@clear*****
2012年 6月 19日 (火) 18:23:52 JST
HAYASHI Kentaro 2012-06-19 18:23:52 +0900 (Tue, 19 Jun 2012) New Revision: afae02bc90913e77666be1e6b3e73d7010af4b10 https://github.com/groonga/groonga/commit/afae02bc90913e77666be1e6b3e73d7010af4b10 Log: doc: move 'return value' section to bottom Modified files: doc/locale/ja/LC_MESSAGES/functions.po doc/source/functions/geo_distance.txt Modified: doc/locale/ja/LC_MESSAGES/functions.po (+90 -86) =================================================================== --- doc/locale/ja/LC_MESSAGES/functions.po 2012-06-19 18:18:06 +0900 (49c48cc) +++ doc/locale/ja/LC_MESSAGES/functions.po 2012-06-19 18:23:52 +0900 (0e591fe) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-19 17:53\n" +"POT-Creation-Date: 2012-06-19 18:19\n" "PO-Revision-Date: 2011-05-09 00:36+0900\n" "Last-Translator: Kouhei Sutou <kou****@clear*****>\n" "Language-Team: Japanese\n" @@ -161,37 +161,23 @@ msgstr "" "``approximate_type`` を省略した場合、 ``geo_distance`` は二点間の距離を ``" "\"rectangle\"`` が指定されたものとして計算します。" -# f18ad5e74b9c45f783d38e24995b3abe -#: ../../../source/functions/geo_distance.txt:27 -msgid "Return value" -msgstr "返値" - -# 594a793a53bd46fc8daf8c2a62b200fd -#: ../../../source/functions/geo_distance.txt:29 -msgid "" -"``geo_distance`` returns the value of distance in float type. The unit of " -"return value is meter." -msgstr "" -"``geo_distance`` はFloat型の値を距離として返します。単位はメートルです。" - # cd5e20dad0b8499894cefbe0dcbef7c8 -#: ../../../source/functions/geo_distance.txt:33 +#: ../../../source/functions/geo_distance.txt:27 msgid "Usage" msgstr "使い方" # 7b106eaa12f94ffc9d75774e712493df -#: ../../../source/functions/geo_distance.txt:35 +#: ../../../source/functions/geo_distance.txt:29 msgid "``geo_distance`` is one of the groonga builtin functions." -msgstr "" -"``geo_distance`` はgroongaの組み込み関数の一つです。" +msgstr "``geo_distance`` はgroongaの組み込み関数の一つです。" # 79447dbd4788452aa475c3251e710d1b -#: ../../../source/functions/geo_distance.txt:37 +#: ../../../source/functions/geo_distance.txt:31 msgid "You can call a builtin function in :doc:`/reference/grn_expr`" msgstr "組み込み関数を :doc:`/reference/grn_expr` にて使うことができます。" # 0f305bac688748efa0aa9f3ba6331eda -#: ../../../source/functions/geo_distance.txt:39 +#: ../../../source/functions/geo_distance.txt:33 msgid "" "``geo_distance`` function calculates the value of distance (approximate " "value) between the coordinate of ``point1`` and the coordinate of ``point2``." @@ -200,7 +186,7 @@ msgstr "" "似値)を計算します。" # 0694c768b41341fa930f48546308c147 -#: ../../../source/functions/geo_distance.txt:44 +#: ../../../source/functions/geo_distance.txt:38 msgid "" "groonga provides three built in functions for calculating the value of " "distance. There are ``geo_distance()``, ``geo_distance2()`` and " @@ -219,7 +205,7 @@ msgstr "" "(point1, point2, \"ellipsoid\")`` を使用してください。" # e104cc660d534e88a06a49ffa76f81d6 -#: ../../../source/functions/geo_distance.txt:51 +#: ../../../source/functions/geo_distance.txt:45 msgid "" "Lets's learn about ``geo_distance`` usage with examples. This section shows " "simple usages." @@ -228,7 +214,7 @@ msgstr "" "を示します。" # 8a4435c84a4f43c7a66558dbde4cce1e -#: ../../../source/functions/geo_distance.txt:54 +#: ../../../source/functions/geo_distance.txt:48 msgid "" "Here are two schema definition and sample data to show usage. Those samples " "show how to calculate the value of distance between Tokyo and Sapporo." @@ -237,190 +223,196 @@ msgstr "" "プルは東京と札幌の距離の計算方法を示します。" # 1c96e92f7a3b4a0896351b7de85e2198 -#: ../../../source/functions/geo_distance.txt:57 +#: ../../../source/functions/geo_distance.txt:51 msgid "" "Using the column value of location for calculating the distance " "(``Stations`` table)" msgstr "距離の計算にlocationカラムの値を使う ( ``Stations`` テーブル)" # b7017435ec0b46ea8732d08a9e92997a -#: ../../../source/functions/geo_distance.txt:58 +#: ../../../source/functions/geo_distance.txt:52 msgid "" "Using the explicitly specified value of location for calculating the " "distance (``Geo`` table)" msgstr "距離の計算に明示的に指定した位置を使う ( ``Geo`` テーブル)" # 2779b99e1cab45ff90d73b16c14a0077 -#: ../../../source/functions/geo_distance.txt:61 +#: ../../../source/functions/geo_distance.txt:55 msgid "Using the column value of location" msgstr "locationカラムの値を使う" # 7b117efc374e4423a4cb9e2bfc2afab1 -#: ../../../source/functions/geo_distance.txt:63 +#: ../../../source/functions/geo_distance.txt:57 msgid "" "Here are a schema definition of ``Stations`` table and sample data to show " "usage." -msgstr "使用例を示すための ``Stations`` テーブルのスキーマ定義と" -"サンプルデータは以下の通りです。" +msgstr "" +"使用例を示すための ``Stations`` テーブルのスキーマ定義とサンプルデータは以下" +"の通りです。" # 445849f2af644a9a8de1ae399493aa69 -#: ../../../source/functions/geo_distance.txt:68 +#: ../../../source/functions/geo_distance.txt:62 msgid "" "There is a table named ``Stations``. ``Stations`` table has one column, " "``location``. ``location`` column stores the value of coordinate. The " "coordinate of Tokyo is stored as sample data." -msgstr "テーブルとして ``Stations`` があります。 ``Stations`` テーブルには" -" ``location`` カラムが存在します。 ``location`` カラムには座標の値を" -"保存します。東京の座標がサンプルデータとして保存されています。" +msgstr "" +"テーブルとして ``Stations`` があります。 ``Stations`` テーブルには " +"``location`` カラムが存在します。 ``location`` カラムには座標の値を保存しま" +"す。東京の座標がサンプルデータとして保存されています。" # 5929faa496bb47b582cde5e008aaec2d -#: ../../../source/functions/geo_distance.txt:75 +#: ../../../source/functions/geo_distance.txt:69 msgid "" "This sample shows that ``geo_distance`` use the value of ``location`` column " "and the value of coordinate [#]_ to calculate distance." -msgstr "このサンプルは ``geo_distance`` が ``location`` カラムと" -"座標値 [2]_ から距離を計算していることを示します。" +msgstr "" +"このサンプルは ``geo_distance`` が ``location`` カラムと座標値 [2]_ から距離" +"を計算していることを示します。" # 44d6b19124b9469389dd4961713668c3 -#: ../../../source/functions/geo_distance.txt:80 +#: ../../../source/functions/geo_distance.txt:74 msgid "Using the explicitly specified value of location" msgstr "明示的に指定した位置を使う" # 9e614385bab349a3bc8059f3422715a9 -#: ../../../source/functions/geo_distance.txt:82 +#: ../../../source/functions/geo_distance.txt:76 msgid "" "Here are a schema definition of ``Geo`` table and sample data to show usage." -msgstr "使用例を示すための ``Geo`` テーブルのスキーマ定義と" -"サンプルデータは以下の通りです。" +msgstr "" +"使用例を示すための ``Geo`` テーブルのスキーマ定義とサンプルデータは以下の通り" +"です。" # 677bb0fe4cc445a085ca76443035995d -#: ../../../source/functions/geo_distance.txt:87 +#: ../../../source/functions/geo_distance.txt:81 msgid "" "There is a table named ``Geo``. ``Geo`` table has one column, ``distance``. " "``distance`` column stores the value of distance." -msgstr "テーブルとして ``Geo`` があります。 ``Geo`` テーブルには ``distance`` " -"カラムがあります。 ``distance`` カラムは距離を保存します。" +msgstr "" +"テーブルとして ``Geo`` があります。 ``Geo`` テーブルには ``distance`` カラム" +"があります。 ``distance`` カラムは距離を保存します。" # d6a2da1f01a94fcb89dcbc342549db37 -#: ../../../source/functions/geo_distance.txt:93 +#: ../../../source/functions/geo_distance.txt:87 msgid "" "This sample shows that ``geo_distance`` use the coordinate of Tokyo and the " "coordinate of Sapporo to calculate distance." -msgstr "このサンプルは ``geo_distance`` が東京の座標と札幌の座標から距離を計算" -"していることを示します。" +msgstr "" +"このサンプルは ``geo_distance`` が東京の座標と札幌の座標から距離を計算してい" +"ることを示します。" # 18532e03e38c4f96970d5935b7432cba -#: ../../../source/functions/geo_distance.txt:97 +#: ../../../source/functions/geo_distance.txt:91 msgid "Parameters" msgstr "引数" # 852d1057fa6546bc9ab1ff1a04d6f857 -#: ../../../source/functions/geo_distance.txt:100 +#: ../../../source/functions/geo_distance.txt:94 msgid "Required parameter" msgstr "必須引数" # b90bfd8b177440e6b2a2ff7f128303f9 -#: ../../../source/functions/geo_distance.txt:102 +#: ../../../source/functions/geo_distance.txt:96 msgid "There are two required parameter, ``point1`` and ``point2``." msgstr "必須引数は二つあります。 ``point1`` と ``point2`` です。" -#: ../../../source/functions/geo_distance.txt:105 +#: ../../../source/functions/geo_distance.txt:99 msgid "``point1``" msgstr "" # 9b1a2e5d87524b94b57d4cbc0f5b885b -#: ../../../source/functions/geo_distance.txt:107 +#: ../../../source/functions/geo_distance.txt:101 msgid "" "It specifies the start point that you want to calculate the value of " "distance between two points." msgstr "計算しようとしている二点間の開始地点を指定します。" # 08a5d2b440ab42559403a3c7e4903ce1 -#: ../../../source/functions/geo_distance.txt:110 +#: ../../../source/functions/geo_distance.txt:104 msgid "You can specify the value of GeoPoint type. [#]_" msgstr "GeoPoint型の値を指定することができます。 [1]_" # cb3be32e3bed440fbedddd88be69fe9f -#: ../../../source/functions/geo_distance.txt:112 +#: ../../../source/functions/geo_distance.txt:106 msgid "See :doc:`/type` about GeoPoint." msgstr "GeoPoint型については :doc:`/type` を参照してください。" -#: ../../../source/functions/geo_distance.txt:115 +#: ../../../source/functions/geo_distance.txt:109 msgid "``point2``" msgstr "" # 471bcd5c71b74618b7a52ada00ecb7eb -#: ../../../source/functions/geo_distance.txt:117 +#: ../../../source/functions/geo_distance.txt:111 msgid "" "It specifies the end point that you want to calculate the value of distance " "between two points." msgstr "計算しようとしている二点間の終了地点を指定します。" # 93d1be8ed5cc4f09b686aca96c27caca -#: ../../../source/functions/geo_distance.txt:120 +#: ../../../source/functions/geo_distance.txt:114 msgid "" "You can specify the value of GeoPoint type or the string indicating the " "coordinate." msgstr "GeoPoint型の値か座標を表す文字列を指定することができます。" # 93d1be8ed5cc4f09b686aca96c27caca -#: ../../../source/functions/geo_distance.txt:123 +#: ../../../source/functions/geo_distance.txt:117 msgid "See :doc:`/type` about GeoPoint and the coordinate." msgstr "GeoPoint型や座標の表記については :doc:`/type` を参照してください。" # 063b335227cc45469a645aec28feca86 -#: ../../../source/functions/geo_distance.txt:126 +#: ../../../source/functions/geo_distance.txt:120 msgid "Optional parameter" msgstr "省略可能引数" # adaf6aea33734076a433a69a89e0b440 -#: ../../../source/functions/geo_distance.txt:128 +#: ../../../source/functions/geo_distance.txt:122 msgid "There is a optional parameter, ``approximate_type``." msgstr "省略可能な引数として ``approximate_type`` があります。" # 717449798dfd48c4b1d4197475ca41a4 # 3681f9b79a3b45ed96ce85e3429fc9c6 -#: ../../../source/functions/geo_distance.txt:131 +#: ../../../source/functions/geo_distance.txt:125 #: ../../../source/functions/geo_in_circle.txt:42 msgid "``approximate_type``" msgstr "" # 33db3c7afa984a5ba02cce4dcf90e9e0 -#: ../../../source/functions/geo_distance.txt:133 +#: ../../../source/functions/geo_distance.txt:127 msgid "" "It specifies how to approximate the geographical features for calculating " "the value of distance." msgstr "距離を計算するときに地形をどのように近似するかを指定します。" # 3fe88937ec054b13aecea52df2e77b0b -#: ../../../source/functions/geo_distance.txt:136 +#: ../../../source/functions/geo_distance.txt:130 msgid "" "You can specify the value of ``approximate_type`` by one of the followings." msgstr "``approximate_type`` の値は以下を指定することができます。" # b7c60aca823b476a9b03fc64ce99abae # a35c6823701045b8949f767b52a069f3 -#: ../../../source/functions/geo_distance.txt:138 -#: ../../../source/functions/geo_distance.txt:158 +#: ../../../source/functions/geo_distance.txt:132 +#: ../../../source/functions/geo_distance.txt:152 msgid "``rectangle``" msgstr "" # 6f4835ed8f0749a69480bae00c4f84aa # fadabcdcd119484db4483cb8213f3eee -#: ../../../source/functions/geo_distance.txt:139 -#: ../../../source/functions/geo_distance.txt:195 +#: ../../../source/functions/geo_distance.txt:133 +#: ../../../source/functions/geo_distance.txt:189 msgid "``sphere``" msgstr "" # 340afa18921d4a71b747c62774cf844c # ae833ce768ec428f8410659999fddbd0 -#: ../../../source/functions/geo_distance.txt:140 -#: ../../../source/functions/geo_distance.txt:211 +#: ../../../source/functions/geo_distance.txt:134 +#: ../../../source/functions/geo_distance.txt:205 msgid "``ellipsoid``" msgstr "" # 2f22ea4ca0984255b3d0fc55a20538e5 -#: ../../../source/functions/geo_distance.txt:144 +#: ../../../source/functions/geo_distance.txt:138 msgid "" "There is a limitation about ``geo_distance``. ``geo_distance`` can not " "calculate the value of distance between two points across meridian, euator " @@ -432,7 +424,7 @@ msgstr "" "が、将来的には修正される予定です。" # cdabfa7ff28a4538949fd09fea604612 -#: ../../../source/functions/geo_distance.txt:152 +#: ../../../source/functions/geo_distance.txt:146 msgid "" "There is a limitation about ``geo_distance`` above notice. But it relaxes " "the limitation if you use ``rectangle`` as approximate type. You can " @@ -444,14 +436,14 @@ msgstr "" "しく算出することができます。" # 6060a0e7b2064d03aa51c9da14fd9207 -#: ../../../source/functions/geo_distance.txt:160 +#: ../../../source/functions/geo_distance.txt:154 msgid "" "This parameter require to approximate the geographical features by square " "approximation." msgstr "この引数は地形を方形近似することを要求します。" # ada49c867dea4483b996867e86980020 -#: ../../../source/functions/geo_distance.txt:163 +#: ../../../source/functions/geo_distance.txt:157 msgid "" "Since the value of distance is calculated by simple formula, you can " "calculate the value of distance fast. But, the error of distance increases " @@ -461,16 +453,16 @@ msgstr "" "は誤差が増大します。" # 9649a83bf0474bba97cde2107fbd40d4 -#: ../../../source/functions/geo_distance.txt:167 +#: ../../../source/functions/geo_distance.txt:161 msgid "You can also specify ``rect`` as abbrev expression." msgstr "``rect`` を省略表記として指定することができます。" # 955a1b0b68b4498e9829d716ff0eefc8 # a24bf00cce7e4d67ab2d52c7f1e482f6 # a59e253aceca43c4be9cbb1e7a8eca82 -#: ../../../source/functions/geo_distance.txt:169 -#: ../../../source/functions/geo_distance.txt:205 -#: ../../../source/functions/geo_distance.txt:222 +#: ../../../source/functions/geo_distance.txt:163 +#: ../../../source/functions/geo_distance.txt:199 +#: ../../../source/functions/geo_distance.txt:216 msgid "" "Here is a sample about calculating the value of distance with column value." msgstr "カラムの値で距離を計算するサンプルは以下の通りです。" @@ -478,14 +470,14 @@ msgstr "カラムの値で距離を計算するサンプルは以下の通りで # ceea3a2f9b1d4700b37a56b6f8d25d33 # ca553b9ff94f4b3994bee2ab8c06620d # e4f23df1186f43ba9bec59745646b676 -#: ../../../source/functions/geo_distance.txt:174 +#: ../../../source/functions/geo_distance.txt:168 msgid "" "Here is a sample about calculating the value of distance with explicitly " "specified point." msgstr "明示的に位置を指定して距離を計算するサンプルは以下の通りです。" # 09f03cbda1dd47ab816d7837212ddce6 -#: ../../../source/functions/geo_distance.txt:181 +#: ../../../source/functions/geo_distance.txt:175 msgid "" "``geo_distance`` uses square approximation as default. If you omit " "``approximate_type``, ``geo_distance`` behaves like ``rectangle`` was " @@ -496,7 +488,7 @@ msgstr "" "れたものとして振舞います。" # 95487e11cab343329d7dde6ce752dc88 -#: ../../../source/functions/geo_distance.txt:185 +#: ../../../source/functions/geo_distance.txt:179 msgid "" "``geo_distance`` accepts the string indicating the coordinate as the value " "of ``point1`` when the value of ``approximate_type`` is ``\"rectangle\"``. " @@ -510,14 +502,14 @@ msgstr "" "``geo_distance`` は距離の値として0を返します。" # c2d459e1d5cf421fb810f8c34c9efbb7 -#: ../../../source/functions/geo_distance.txt:197 +#: ../../../source/functions/geo_distance.txt:191 msgid "" "This parameter require to approximate the geographical features by spherical " "approximation." msgstr "この引数は球面近似で地形を近似することを要求します。" # ae430be8c8d24905b3144a03794597ee -#: ../../../source/functions/geo_distance.txt:200 +#: ../../../source/functions/geo_distance.txt:194 msgid "" "It is slower than ``rectangle``, but the error of distance becomes smaller " "than ``rectangle``." @@ -526,19 +518,19 @@ msgstr "" "さくなります。" # 3e5dfacb65514829927cb8f277c89f8b -#: ../../../source/functions/geo_distance.txt:203 +#: ../../../source/functions/geo_distance.txt:197 msgid "You can also specify ``sphr`` as abbrev expression." msgstr "``sphr`` を省略表記として指定することができます。" # f5301b5d6bdd4beb8aefc4202b1ebd40 -#: ../../../source/functions/geo_distance.txt:213 +#: ../../../source/functions/geo_distance.txt:207 msgid "" "This parameter require to approximate the geographical features by ellipsoid " "approximation." msgstr "この引数は楕円近似で地形を近似することを要求します。" # 95b3f4b2e8cc4725a608cee269b9e176 -#: ../../../source/functions/geo_distance.txt:216 +#: ../../../source/functions/geo_distance.txt:210 msgid "" "It uses the calculation of distance by the formula of Hubeny. It is slower " "than ``sphere``, but the error of distance becomes smaller than ``sphere``." @@ -547,10 +539,23 @@ msgstr "" "``sphere`` より誤差は小さくなります。" # bde1f151c06c4cf388b020696da6c6e2 -#: ../../../source/functions/geo_distance.txt:220 +#: ../../../source/functions/geo_distance.txt:214 msgid "You can also specify ``ellip`` as abbrev expression." msgstr "``ellip`` を省略表記として指定することができます。" +# f18ad5e74b9c45f783d38e24995b3abe +#: ../../../source/functions/geo_distance.txt:219 +msgid "Return value" +msgstr "返値" + +# 594a793a53bd46fc8daf8c2a62b200fd +#: ../../../source/functions/geo_distance.txt:221 +msgid "" +"``geo_distance`` returns the value of distance in float type. The unit of " +"return value is meter." +msgstr "" +"``geo_distance`` はFloat型の値を距離として返します。単位はメートルです。" + # 25a1b8ba25cb4de8a6e6d6a73fb3af6f #: ../../../source/functions/geo_distance.txt:228 msgid "Footnote" @@ -812,4 +817,3 @@ msgstr "" #: ../../../source/functions/rand.txt:36 msgid "0 と max の間の数を表すInt32型の値を返します。" msgstr "" - Modified: doc/source/functions/geo_distance.txt (+6 -6) =================================================================== --- doc/source/functions/geo_distance.txt 2012-06-19 18:18:06 +0900 (8643ab0) +++ doc/source/functions/geo_distance.txt 2012-06-19 18:23:52 +0900 (96ce05f) @@ -23,12 +23,6 @@ The default value of ``approximate_type`` is ``"rectangle"``. If you omit ``approximate_type``, ``geo_distance`` calculates the value of distance as if ``"rectangle"`` was specified. -Return value ------------- - -``geo_distance`` returns the value of distance in float type. -The unit of return value is meter. - Usage ----- @@ -221,6 +215,12 @@ You can also specify ``ellip`` as abbrev expression. Here is a sample about calculating the value of distance with column value. +Return value +------------ + +``geo_distance`` returns the value of distance in float type. +The unit of return value is meter. + .. groonga-command .. include:: ../example/functions/geo_distance_location_ellipsoid.log -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下载
