Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Data/FlowCurves/EastKorea.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
longitude latitude
125.56 35.04
125.79 34.43
126.31 34.05
127.19 33.96
128.11 33.90
128.79 34.18
129.03 34.55
129.27 35.02
129.60 35.42
129.75 35.96
129.79 36.72
129.91 37.53
130.03 38.22
130.52 38.55
131.71 38.72
132.02 39.15
133.35 39.35
133.90 38.93
134.47 38.29
134.84 37.78
135.33 37.54
135.5961 37.7112
135.8521 37.873
30 changes: 30 additions & 0 deletions Data/FlowCurves/GulfStream.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
longitude latitude
-81.9583 24.099
-81.0417 24.2241
-80.3333 24.4742
-80 24.9745
-79.8333 25.6415
-79.7917 26.7254
-79.6667 27.6009
-79.8333 28.6015
-80 29.1435
-80.125 29.8105
-79.7917 30.7694
-79.2917 31.4364
-78.625 31.8116
-77.7917 31.895
-76.9583 32.0618
-76 32.7705
-75.7083 33.4792
-75.1667 34.4381
-74.5417 35.2719
-73.625 36.606
-72.5833 37.5231
-71.5417 38.2319
-70.2917 37.94
-68.6667 37.2313
-67.75 37.6482
-66.8333 38.482
-65.8333 38.4403
-65.0417 38.7321
-64.1667 38.8155
79 changes: 79 additions & 0 deletions Data/FlowCurves/Kuroshio.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
longitude latitude
126.17 11.24
125.72 12.12
125.48 12.69
124.74 13.61
124.44 14.35
123.30 15.20
122.64 16.07
122.95 17.00
122.80 18.20
122.40 19.02
121.38 19.86
120.64 20.38
119.92 20.67
119.35 21.20
119.47 21.78
120.13 21.99
120.78 21.75
121.26 21.91
121.65 22.80
121.9007 23.4462
122.2527 24.363
122.5727 25.0102
122.8927 25.199
123.5646 25.3877
124.2686 25.5226
124.7166 25.6844
125.1646 25.981
125.5166 26.2776
125.9645 26.6551
126.3485 27.3023
126.8925 27.7607
127.5005 28.4618
128.0764 29.0821
128.3964 29.6753
128.6524 30.0259
129.1324 30.1337
129.7084 30.0798
129.9963 29.6753
130.4443 29.4596
131.1163 29.4866
131.5963 29.891
131.7883 30.5652
131.8843 31.1045
132.2042 31.509
132.8122 31.9405
133.6442 32.264
134.2841 32.6416
135.1801 32.7494
136.1081 32.8573
136.876 32.7764
137.9 32.8303
138.9559 32.9652
139.5959 33.1809
139.8839 33.5854
140.3319 34.2056
140.7798 34.691
141.3558 35.1224
142.0278 35.5269
142.6038 35.8775
142.7958 36.2011
142.8598 36.6595
143.0837 37.037
143.7557 37.2258
144.4917 37.1449
145.3236 36.9561
145.8356 36.6595
145.9956 36.1471
146.0596 35.4191
146.1556 34.8797
146.4116 34.6101
146.7316 34.5831
147.1795 34.7449
147.4355 35.0955
147.5635 35.5
147.8835 35.9584
148.2995 36.4438
148.7475 36.7404
149.5154 37.091
55 changes: 55 additions & 0 deletions Data/FlowCurves/Tsushima.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
longitude latitude
127.19 33.96
128.11 33.90
128.67 33.88
129.32 33.97
130.1243 34.2595
130.6043 34.5292
130.9563 34.8528
131.2443 35.1224
131.5323 35.2842
131.9803 35.3651
132.3962 35.4191
132.6202 35.5539
132.7802 35.9314
132.9402 36.2011
133.3242 36.4438
133.5802 36.4977
133.8682 36.3629
134.2202 36.228
134.4761 36.255
134.8281 36.4438
135.1481 36.4977
135.5321 36.5516
135.7241 36.7134
135.7561 36.9022
135.5641 37.064
135.4361 37.2258
135.4361 37.4685
135.5961 37.7112
135.8521 37.873
136.0441 38.0887
136.1081 38.4392
136.1721 38.8437
136.3001 39.1673
136.62 39.3291
137.004 39.2752
137.388 39.1134
137.644 38.9516
137.868 38.9246
138.028 39.1134
138.028 39.3831
137.74 39.5718
137.324 39.7606
137.196 39.9763
137.292 40.246
137.516 40.5426
137.964 40.7314
138.6359 40.7853
139.1799 40.8392
139.4359 41.0549
139.7239 41.3246
140.20 41.27
140.80 41.56
141.26 41.60
141.99 41.26
1 change: 1 addition & 0 deletions Data/Settings.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ MapIcons Data/Settings/MapIcons.tsv
MenuIcons Data/Settings/MenuIcons.tsv
Persons Data/Settings/Persons.tsv
Territories Data/Settings/Territories.tsv
FlowCurves Data/Settings/FlowCurves.tsv
PlaceNames Data/Settings/PlaceNames.tsv
GeographicFeatures Data/Settings/GeographicFeatures.tsv
Genomes Data/Settings/Genomes.tsv
Expand Down
5 changes: 5 additions & 0 deletions Data/Settings/FlowCurves.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
key file_path type description min_size max_size first_year last_year color line_width
Test1 Data/FlowCurves/Kuroshio.tsv view_flow_curve 黒潮 0 200 -2500 1500 black 55.5
Test2 Data/FlowCurves/Tsushima.tsv view_flow_curve 対馬海流 0 200 -2500 1500 black 55.5
Test3 Data/FlowCurves/EastKorea.tsv view_flow_curve 東朝鮮暖流 0 200 -2500 1500 black 55.5
Test4 Data/FlowCurves/GulfStream.tsv view_flow_curve メキシコ湾流 0 200 -2500 1500 black 55.5
7 changes: 5 additions & 2 deletions Data/Settings/Territories.tsv
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
key file_path type description min_size max_size first_year last_year color line_width
TestTerritories Data/Territories/TestTerritories.tsv view_territory ??? 0 100 100 1000 black 55.5
TestTerritories Data/Territories/TestTerritories2.tsv view_territory ??? 0 100 100 1000 black 55.5
Territories1 Data/Territories/Sakishima/Shimotabaru.tsv view_territory 下田原文化 0 100 -2500 -1500 black 55.5
Territories2 Data/Territories/Sakishima/Mudoki.tsv view_territory 先島無土器文化 0 100 -200 1200 black 55.5
Territories3 Data/Territories/Ryukyu/Kaizuka.tsv view_territory 沖縄貝塚文化 0 100 -4400 1200 black 55.5
Territories4 Data/Territories/Lapita.tsv view_territory ラピタ文化 0 100 -1600 -500 black 55.5
Territories4 Data/Territories/Afanasievo.tsv view_territory ??? 0 200 -3300 -2500 black 55.5
10 changes: 10 additions & 0 deletions Data/Territories/Afanasievo.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
longitude latitude
90 53
102 50
108 48
90 44
85 44
80 46
82 50
86 52
90 53
10 changes: 10 additions & 0 deletions Data/Territories/Lapita.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
longitude latitude
166 -4
-171.8 -8
-171.8 -13.8
179 -17.8
170 -22
160 -22
152 -10
152 -4
166 -4
6 changes: 6 additions & 0 deletions Data/Territories/Ryukyu/Kaizuka.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
longitude latitude
126.9984881 27.34026222
126.4740218 25.89157499
129.8427092 26.81341226
130.2125251 28.67591147
126.9984881 27.34026222
6 changes: 6 additions & 0 deletions Data/Territories/Sakishima/Mudoki.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
longitude latitude
124.6292555 24.96411605
125.6646583 24.79521803
123.789828 23.97415958
122.8360816 24.45970535
124.6292555 24.96411605
6 changes: 6 additions & 0 deletions Data/Territories/Sakishima/Shimotabaru.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
longitude latitude
123.9400757 24.80411315
124.8872897 24.71513324
123.789828 23.97415958
122.8360816 24.45970535
123.9400757 24.80411315
7 changes: 0 additions & 7 deletions Data/Territories/TestTerritories.tsv

This file was deleted.

6 changes: 0 additions & 6 deletions Data/Territories/TestTerritories2.tsv

This file was deleted.

41 changes: 0 additions & 41 deletions Library/PAX_GRAPHICA/Key.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,47 +258,6 @@ namespace paxg {
return false;
}

class Coordinate {
public:
Coordinate(const paxs::MercatorDeg& coordinate_)
: coordinate(coordinate_){}

double getX() const {
return coordinate.x;
}
double getY() const {
return coordinate.y;
}

/// @brief Get coordinate as Vector2
/// @brief 座標をVector2として取得
/// @return Vector2<double> containing x and y coordinates
paxs::Vector2<double> getVector2() const {
return paxs::Vector2<double>(coordinate.x, coordinate.y);
}

void setX(const double x_) {
coordinate.x = x_;
}
void setY(const double y_) {
coordinate.y = y_;
}
void set(paxs::Vector2<double> position) {
coordinate.x = position.x;
coordinate.y = position.y;
}

double toEquirectangularRadY() const {
return coordinate.toEquirectangularRadY();
}
double toEquirectangularDegY() const {
return coordinate.toEquirectangularDegY();
}

private:
paxs::MercatorDeg coordinate; // マップ座標の中央
};

}

#endif // !PAX_GRAPHICA_KEY_HPP
Loading