Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
ac03ba31
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ac03ba31
编写于
2月 26, 2021
作者:
N
Nikita Mikhailov
提交者:
Nikita Mikhaylov
3月 11, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move to spherical point
上级
94b6cadb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
215 addition
and
214 deletion
+215
-214
src/Functions/geometryConverters.h
src/Functions/geometryConverters.h
+2
-1
tests/queries/0_stateless/01302_polygons_distance.reference
tests/queries/0_stateless/01302_polygons_distance.reference
+2
-2
tests/queries/0_stateless/01308_polygon_area.reference
tests/queries/0_stateless/01308_polygon_area.reference
+1
-1
tests/queries/0_stateless/01720_country_perimeter_and_area.reference
...es/0_stateless/01720_country_perimeter_and_area.reference
+210
-210
未找到文件。
src/Functions/geometryConverters.h
浏览文件 @
ac03ba31
...
@@ -51,7 +51,8 @@ using CartesianPolygon = Polygon<CartesianPoint>;
...
@@ -51,7 +51,8 @@ using CartesianPolygon = Polygon<CartesianPoint>;
using
CartesianMultiPolygon
=
MultiPolygon
<
CartesianPoint
>
;
using
CartesianMultiPolygon
=
MultiPolygon
<
CartesianPoint
>
;
using
CartesianGeometry
=
Geometry
<
CartesianPoint
>
;
using
CartesianGeometry
=
Geometry
<
CartesianPoint
>
;
using
GeographicPoint
=
boost
::
geometry
::
model
::
point
<
Float64
,
2
,
boost
::
geometry
::
cs
::
geographic
<
boost
::
geometry
::
degree
>>
;
// using GeographicPoint = boost::geometry::model::point<Float64, 2, boost::geometry::cs::geographic<boost::geometry::degree>>;
using
GeographicPoint
=
boost
::
geometry
::
model
::
point
<
Float64
,
2
,
boost
::
geometry
::
cs
::
spherical_equatorial
<
boost
::
geometry
::
degree
>>
;
using
GeographicRing
=
Ring
<
GeographicPoint
>
;
using
GeographicRing
=
Ring
<
GeographicPoint
>
;
using
GeographicPolygon
=
Polygon
<
GeographicPoint
>
;
using
GeographicPolygon
=
Polygon
<
GeographicPoint
>
;
using
GeographicMultiPolygon
=
MultiPolygon
<
GeographicPoint
>
;
using
GeographicMultiPolygon
=
MultiPolygon
<
GeographicPoint
>
;
...
...
tests/queries/0_stateless/01302_polygons_distance.reference
浏览文件 @
ac03ba31
0
0
1.2727922061357855
1.2727922061357855
2088389.0786590837
0.3274195462417724
2088389.0786590837
0.3274195462417724
tests/queries/0_stateless/01308_polygon_area.reference
浏览文件 @
ac03ba31
25
25
3848183.73456666
9.387703638370358e-8
tests/queries/0_stateless/01720_country_perimeter_and_area.reference
浏览文件 @
ac03ba31
Dhekelia Sovereign Base Area
118700.71332743947
Dhekelia Sovereign Base Area
0.0186259930051051
Kyrgyzstan
3742755.753455118
7
Kyrgyzstan
0.586832396109190
7
-------------------------------------
-------------------------------------
Dhekelia Sovereign Base Area
127533079.61976177
Dhekelia Sovereign Base Area
0.000003139488070896512
Kyrgyzstan
198994443077.2897
Kyrgyzstan
0.004895645023822883
-------------------------------------
-------------------------------------
Aruba
71530.8169588391
Aruba
0.011249330810410983
Afghanistan
5224885.3545075
Afghanistan
0.8199216326776404
Albania
1090187.4767125107
Albania
0.17108622597702605
Andorra
96608.22292958506
Andorra
0.015145740647213184
Ashmore and Cartier Islands
7075.513574803439
Ashmore and Cartier Islands
0.001111472909012953
Austria
2079483.7812992004
Austria
0.3258464621357028
Burundi
895672.5688732249
Burundi
0.1409500621452211
Belgium
1145320.4034536863
Belgium
0.1794463601873955
Benin
1996227.432786925
Benin
0.31426073515874664
Burkina Faso
3272627.9559958726
Burkina Faso
0.5144381682226761
Bulgaria
1966608.6256809386
Bulgaria
0.3083164214454252
Bahrain
135865.35144442634
Bahrain
0.02137170357214413
Bosnia and Herzegovina
1314472.5089314817
Bosnia and Herzegovina
0.20611959113245232
Bajo Nuevo Bank (Petrel Is.)
798.5024071067089
Bajo Nuevo Bank (Petrel Is.)
0.0001254597070361587
Saint Barthelemy
21002.79956662945
Saint Barthelemy
0.0032990108720812672
Belarus
2738937.888108089
Belarus
0.42899119772830474
Bolivia
5901370.411116252
Bolivia
0.9279328001326348
Barbados
89709.25425638427
Barbados
0.014116142490651021
Bhutan
1020220.377607534
8
Bhutan
0.160173505876633
8
Botswana
3751204.2234685505
Botswana
0.5896697538755427
Central African Republic
4935021.375483403
Central African Republic
0.7760222837198817
Switzerland
1479396.11162234
8
Switzerland
0.231885151251040
8
Clipperton Island
8943.110565971054
Clipperton Island
0.0014072924221565273
Cameroon
5085955.35665887
Cameroon
0.8001045813665599
Republic of Congo
4387669.050264364
Republic of Congo
0.6904316055863188
Coral Sea Islands
741.2981931483673
Coral Sea Islands
0.00011634674137689659
Curaçao
132255.62069611502
Curaçao
0.02078862020307983
Czech Republic
1728745.5762353
Czech Republic
0.2708588915805718
Djibouti
822712.605195561
Djibouti
0.12937731543684822
Dominica
127657.27781178526
Dominica
0.020094439807419574
Algeria
7355738.071028232
Algeria
1.1549683948032776
Ethiopia
5222397.978393792
Ethiopia
0.8210654364815099
Georgia
1711022.4699848779
Georgia
0.26823008017781313
Ghana
2579014.0679307193
Ghana
0.4056578143818251
Gibraltar
8949.393307056409
Gibraltar
0.0014059440610631154
Guinea
4038096.38611949
4
Guinea
0.635085375587733
4
Gambia
1227696.9901731263
Gambia
0.19279774895359095
Guatemala
1928473.281308392
8
Guatemala
0.303095356150903
8
Guam
129159.86773557645
Guam
0.020321390076536976
Heard Island and McDonald Islands
110694.18305654383
Heard Island and McDonald Islands
0.017334896920453105
Hungary
1670527.817374739
Hungary
0.2617732480910806
Isle of Man
119741.44999597034
Isle of Man
0.01875803631141408
Iraq
3484768.0455186
02
Iraq
0.54698612195024
02
Israel
1231355.8285483832
Israel
0.19353851895699914
Jamaica
640475.0393226973
Jamaica
0.10055860979159512
Jersey
53782.09990861479
Jersey
0.008427337812134537
Jordan
1682881.4223134723
Jordan
0.2642243503964102
Baykonur Cosmodrome
285958.2051707919
Baykonur Cosmodrome
0.04482995477542441
Siachen Glacier
246828.859148545
Siachen Glacier
0.03872116827341272
Kosovo
559361.192206697
1
Kosovo
0.0877317299140816
1
Laos
4388593.852659078
Laos
0.6899867972760174
Lebanon
616321.1250347663
Lebanon
0.09676977254650951
Liberia
1882745.8183724133
Liberia
0.2961649538030388
Libya
6071430.840188828
Libya
0.9538430912224716
Saint Lucia
106590.9440833618
Saint Lucia
0.016786201647759867
Liechtenstein
59223.767796493725
Liechtenstein
0.009288582116863231
Lesotho
784230.710246981
6
Lesotho
0.1231587490032075
6
Luxembourg
263259.6340049926
Luxembourg
0.04125996057810259
Latvia
1564007.8893204194
Latvia
0.24488610945731157
Saint Martin
41679.927927619785
Saint Martin
0.006547834154217771
Morocco
5613899.215291766
Morocco
0.8817924249630141
Monaco
16615.29788851603
Monaco
0.0026049777439637527
Moldova
1324452.8981204226
Moldova
0.20765701819586885
Macedonia
719730.443335498
9
Macedonia
0.112883107433005
9
Mali
7242105.215854456
Mali
1.1385970015559317
Montenegro
749552.5839768916
Montenegro
0.11756794062084858
Mongolia
7290806.371346894
Mongolia
1.142306166871007
Montserrat
42062.88573332693
Montserrat
0.006620100691409788
Namibia
5366121.742836174
Namibia
0.843464957679987
Niger
5586104.20515515
Niger
0.8780744302377772
Norfolk Island
31266.364157565444
Norfolk Island
0.004912027225339993
Niue
62852.941582168394
Niue
0.009881892958363517
Nepal
2595695.4382788637
Nepal
0.4076113675280835
Nauru
19827.484632710733
Nauru
0.0031205159769295255
Poland
3122958.442935865
4
Poland
0.4892206948827131
4
Paraguay
3484527.6286960323
Paraguay
0.5475256537493991
Qatar
595374.2491908007
Qatar
0.09362771431858698
Romania
2813197.348484092
Romania
0.44095021664473105
Rwanda
822216.3985928788
Rwanda
0.1293663890297039
Western Sahara
2986353.4822476567
Western Sahara
0.4691920993279596
Scarborough Reef
1261.3332800666965
Scarborough Reef
0.00019842225207367386
South Sudan
4822971.30624122
7
South Sudan
0.758419084255653
7
Senegal
3743831.189306996
Senegal
0.5883247226863264
Serranilla Bank
1518.3172992831614
Serranilla Bank
0.0002389083935906293
Singapore
96986.71084909553
Singapore
0.015233384733369614
San Marino
29309.53472866584
San Marino
0.004596873449598911
Somaliland
1970173.4652249564
Somaliland
0.3096791489207226
Somalia
4371311.2360761175
Somalia
0.6879915318072617
Republic of Serbia
1892739.48526361
Republic of Serbia
0.29677234233404165
Suriname
2050665.431914176
3
Suriname
0.3225524334297620
3
Slovakia
1266500.5762728006
Slovakia
0.19843599488831584
Slovenia
938838.9392746043
Slovenia
0.14713148471782736
Swaziland
536594.8070282809
Swaziland
0.08434161089555517
Sint Maarten
24187.8553936788
6
Sint Maarten
0.003795530536530929
6
Syria
2273589.0858773263
Syria
0.35675522352394456
Chad
5787996.089203358
Chad
0.9102578296637189
Togo
1652100.5245926627
Togo
0.2600585482954555
Uganda
2434653.1095533115
Uganda
0.38301730108810556
Uruguay
1963705.040506292
Uruguay
0.3083564407046887
Vatican
427.24440132886207
Vatican
0.00006702452496391445
Akrotiri Sovereign Base Area
85251.32121367387
Akrotiri Sovereign Base Area
0.013376747415600219
Zambia
5601771.605527663
Zambia
0.8807923488623808
Zimbabwe
2897547.4523945283
Zimbabwe
0.4553903789902945
-------------------------------------
-------------------------------------
Aruba
169577139.16920504
Aruba
0.0000041986375296795025
Afghanistan
642167900289.4739
Afghanistan
0.015826481758320493
Albania
28333199169.93513
Albania
0.0006971811189621746
Andorra
452435114.7617939
Andorra
0.00001112355564980348
Ashmore and Cartier Islands
2696604.9276267616
Ashmore and Cartier Islands
6.66668338977609e-8
Austria
83991121342.6868
Austria
0.0020634744883290235
Burundi
27040491570.2986
Burundi
0.000669169243101558
Belgium
30672391961.48937
Belgium
0.0007529367590741593
Benin
116112410615.07138
Benin
0.00287239734953164
Burkina Faso
272767288599.06683
Burkina Faso
0.006746218025419332
Bulgaria
112764344245.5939
Bulgaria
0.0027733372191197786
Bahrain
585431263.0854981
Bahrain
0.00001443842547561405
Bosnia and Herzegovina
51828357836.835045
Bosnia and Herzegovina
0.0012742491201009779
Bajo Nuevo Bank (Petrel Is.)
29452.023965717835
Bajo Nuevo Bank (Petrel Is.)
8.864825701897049e-10
Saint Barthelemy
24595825.379134282
Saint Barthelemy
6.036607210116289e-7
Belarus
207495810096.24286
Belarus
0.005090738074359067
Bolivia
1086795900906.9404
Bolivia
0.026865324735758436
Barbados
444196434.0171095
Barbados
0.0000109856680212211
Bhutan
40362932122.222435
Bhutan
0.0009961026696220909
Botswana
579022741104.1897
Botswana
0.01430200501713062
Central African Republic
617982165549.6404
Central African Republic
0.015290667187215962
Switzerland
41437057095.20376
Switzerland
0.0010181463734151514
Clipperton Island
5042420.197242386
Clipperton Island
1.2373029819547803e-7
Cameroon
464311319438.17255
Cameroon
0.011488908713113137
Republic of Congo
344887275569.75
Republic of Congo
0.008534881807187833
Coral Sea Islands
20628.814559882598
Coral Sea Islands
5.121674593493771e-10
Curaçao
463207585.46491855
Curaçao
0.000011457378136273848
Czech Republic
78760344660.91792
Czech Republic
0.0019339153549488386
Djibouti
21846149319.499916
Djibouti
0.000540370985929321
Dominica
730475415.656727
Dominica
0.000018056168258583246
Algeria
2308849474061.9604
Algeria
0.05696762706232162
Ethiopia
1127370045818.119
Ethiopia
0.02789047634482515
Georgia
69572475312.24843
Georgia
0.0017113229913929072
Ghana
238667399375.48102
Ghana
0.0059048504621945965
Gibraltar
3831411.4171073083
Gibraltar
9.095456688875715e-8
Guinea
244302369135.0428
Guinea
0.006043151808047173
Gambia
10500266198.29469
7
Gambia
0.000259681639528070
7
Guatemala
108814357557.89536
Guatemala
0.0026901925526205263
Guam
564430992.5413051
Guam
0.000013952443476670549
Heard Island and McDonald Islands
395072268.1670339
Heard Island and McDonald Islands
0.000009688375334192321
Hungary
93204530848.81223
Hungary
0.0022899094702118978
Isle of Man
574622349.496232
Isle of Man
0.00001410012284549863
Iraq
437362923804.678
2
Iraq
0.01078068959878981
2
Israel
21904844963.57914
Israel
0.0005400181032289429
Jamaica
11032909044.896214
Jamaica
0.00027268062650994383
Jersey
119197004.74288748
Jersey
0.0000029236161155167853
Jordan
88852268122.99756
Jordan
0.002191215069390572
Baykonur Cosmodrome
6501480908.525035
Baykonur Cosmodrome
0.00015978303781425133
Siachen Glacier
2088368280.595157
6
Siachen Glacier
0.000051387961526291
6
Kosovo
10914986124.47776
Kosovo
0.0002684178325412152
Laos
228111317612.30957
Laos
0.005637555524983489
Lebanon
9999649538.15191
8
Lebanon
0.000246443646154473
8
Liberia
95296808053.31937
Liberia
0.002357973807538481
Libya
1623756106692.00
4
Libya
0.04007251280883935
4
Saint Lucia
604940965.7686977
Saint Lucia
0.000014963842166249258
Liechtenstein
136883538.3183111
Liechtenstein
0.0000033722024322722466
Lesotho
30106906647.33149
Lesotho
0.0007426290112070925
Luxembourg
2607643781.0226917
Luxembourg
0.00006405006804909529
Latvia
64575248440.09302
Latvia
0.00158313668683266
Saint Martin
68198732.01942295
Saint Martin
0.00000168759530251474
Morocco
591718146420.0958
Morocco
0.014595589778269167
Monaco
18750590.193543613
Monaco
4.6325700981005285e-7
Moldova
33208636022.8237
3
Moldova
0.000815863946082391
3
Macedonia
25384586736.42653
Macedonia
0.0006245180554490506
Mali
1252723270900.2302
Mali
0.03096381132470007
Montenegro
13729482523.613796
Montenegro
0.00033762445623993013
Mongolia
1564646094133.3677
Mongolia
0.038446609480001344
Montserrat
99396603.21002583
Montserrat
0.0000024620326175206004
Namibia
822688081865.0547
Namibia
0.020320978539029165
Niger
1181298791001.2363
Niger
0.02919849042641136
Norfolk Island
41003910.8372144
Norfolk Island
0.0000010150641235563077
Niue
220827518.96565723
Niue
0.000005450796200539049
Nepal
147103938320.9306
Nepal
0.003629565673884544
Nauru
28765050.65120624
Nauru
7.119067469952887e-7
Poland
313439831446.58765
Poland
0.0076921097527402876
Paraguay
399899482418.9460
4
Paraguay
0.00987584312867056
4
Qatar
11150102955.086788
Qatar
0.0002752610716836153
Romania
236371949926.43573
Romania
0.005809479702080411
Rwanda
25305141874.683277
Rwanda
0.0006262235765421803
Western Sahara
90483117057.2362
4
Western Sahara
0.002234452965203069
4
Scarborough Reef
93421.29269397438
Scarborough Reef
2.4176335726807567e-9
South Sudan
626858281405.9783
South Sudan
0.015509656314462458
Senegal
196219387423.09302
Senegal
0.00485201810074574
Serranilla Bank
100843.54356614068
Serranilla Bank
2.6035559945372385e-9
Singapore
510505392.29170656
Singapore
0.000012633505579848072
San Marino
60357700.76923006
San Marino
0.0000014830814619737624
Somaliland
167406759212.9871
Somaliland
0.0041412916217828406
Somalia
471815737592.64276
Somalia
0.011674654119996183
Republic of Serbia
77573594972.73866
Republic of Serbia
0.001907268740192651
Suriname
145124645519.15808
Suriname
0.0035911641359236534
Slovakia
48456085451.1240
5
Slovakia
0.001190158742892209
5
Slovenia
20327209680.63761
Slovenia
0.0004995546076509384
Swaziland
17113505052.204178
Swaziland
0.00042234053226485263
Sint Maarten
23405778.740159098
Sint Maarten
5.772865969377286e-7
Syria
185944843149.37875
Syria
0.004581243750467663
Chad
1266282203998.255
Chad
0.0313064894302088
Togo
56863540226.407555
Togo
0.0014067991034602252
Uganda
241852803539.3894
7
Uganda
0.00598515904865432
7
Uruguay
177347712583.76038
Uruguay
0.0043716082436750115
Vatican
10535.27369925663
Vatican
3.002600504657064e-10
Akrotiri Sovereign Base Area
98415737.60517946
Akrotiri Sovereign Base Area
0.0000024314362587592923
Zambia
751913038381.5402
Zambia
0.018594119224502336
Zimbabwe
389330493219.1703
Zimbabwe
0.009621356779606268
-------------------------------------
-------------------------------------
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录