diff --git a/map/geo.geojson b/map/geo.geojson index 407a3ba..4523ac2 100644 --- a/map/geo.geojson +++ b/map/geo.geojson @@ -1,6 +1,546 @@ { "type": "FeatureCollection", "features": [ + { + "type": "Feature", + "properties": { + "name": "mexico", + "fill": "#e79f00", + "stroke": "#e79f00" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -117.37965475637597, + 32.44197267953365 + ], + [ + -117.19328679662503, + 32.172881903158654 + ], + [ + -116.80195975904499, + 31.505068733527338 + ], + [ + -116.55661039658732, + 30.76271545031821 + ], + [ + -115.7977350664051, + 29.653268564800285 + ], + [ + -115.36409202058698, + 28.65169590952351 + ], + [ + -115.46679695249115, + 28.06926440128359 + ], + [ + -115.00462062737041, + 27.508963730275426 + ], + [ + -114.1943928312361, + 26.81856520043671 + ], + [ + -113.45834081925501, + 26.609596794300515 + ], + [ + -112.75081795502518, + 26.22123061337699 + ], + [ + -112.36282154560872, + 25.414843888853795 + ], + [ + -112.57963996298983, + 24.83626183683829 + ], + [ + -111.87782292831012, + 24.28097124641897 + ], + [ + -110.95918437072153, + 23.86942322393074 + ], + [ + -110.26307316559195, + 22.926845288398482 + ], + [ + -109.86366509707523, + 22.774362215071775 + ], + [ + -107.74109650438542, + 22.421422993834838 + ], + [ + -106.78252536697033, + 21.62271476309502 + ], + [ + -106.11494330959201, + 20.167515569995786 + ], + [ + -105.77718715022233, + 19.654922586962385 + ], + [ + -103.37512605031584, + 17.917075724318906 + ], + [ + -99.74274097240904, + 16.48063158909818 + ], + [ + -96.891513975772, + 15.617321139728986 + ], + [ + -95.9345953262162, + 15.560889480871168 + ], + [ + -94.82144506040571, + 16.08697615257519 + ], + [ + -93.8823625453146, + 15.89668062545556 + ], + [ + -93.28569374496455, + 15.444749392460338 + ], + [ + -92.55775780853817, + 14.75154709083759 + ], + [ + -92.2339296868265, + 14.521512983731157 + ], + [ + -92.18570145171147, + 14.575816275200793 + ], + [ + -92.17684320444563, + 14.632963179276587 + ], + [ + -92.1443629644706, + 14.680574236354857 + ], + [ + -92.16601645778728, + 14.732934429094229 + ], + [ + -92.1827476223173, + 14.833572476834604 + ], + [ + -92.14239338477228, + 14.880188407699592 + ], + [ + -92.14239338477228, + 14.938206403040638 + ], + [ + -92.12861388902516, + 15.003814425866494 + ], + [ + -92.07841715451804, + 15.047541929798456 + ], + [ + -92.06070065998635, + 15.069402319514097 + ], + [ + -92.21227511320399, + 15.260347236723007 + ], + [ + -91.73172076697341, + 16.073168309873026 + ], + [ + -90.44557706934002, + 16.072131086317597 + ], + [ + -90.42884482450418, + 16.13737913370963 + ], + [ + -90.44065582085878, + 16.22812325631243 + ], + [ + -90.42097082693459, + 16.303711427992198 + ], + [ + -90.38356933847831, + 16.380214746239943 + ], + [ + -90.4465613205179, + 16.42742404398436 + ], + [ + -90.52095517205223, + 16.456408421929666 + ], + [ + -90.62064755286033, + 16.49632097037278 + ], + [ + -90.64525380893343, + 16.58406850004677 + ], + [ + -90.66690730895485, + 16.674604618708102 + ], + [ + -90.73186778890489, + 16.740593542950293 + ], + [ + -90.79682826885538, + 16.77923359140368 + ], + [ + -90.91198548331298, + 16.836707900790145 + ], + [ + -90.99231940426598, + 16.875013804012582 + ], + [ + -91.06515388763472, + 16.903267758253406 + ], + [ + -91.10747662457185, + 16.976708149843716 + ], + [ + -91.18031110167898, + 17.018123399661505 + ], + [ + -91.23739758405944, + 17.100926392275824 + ], + [ + -91.32480849280037, + 17.164885326586145 + ], + [ + -91.42913896761694, + 17.209079348774637 + ], + [ + -91.42629759383239, + 17.24827205498225 + ], + [ + -90.98836347021151, + 17.24827205498225 + ], + [ + -90.99144518310828, + 17.80735940079539 + ], + [ + -89.15549058793002, + 17.80094462774224 + ], + [ + -89.15549661225124, + 17.943563923060154 + ], + [ + -89.04457265930441, + 18.006869778158148 + ], + [ + -88.98287121047778, + 17.960052007675557 + ], + [ + -88.92740923400433, + 17.917839443119206 + ], + [ + -88.86917415870715, + 17.888812469246474 + ], + [ + -88.7915273916448, + 17.978516836619036 + ], + [ + -88.71595994491821, + 18.07015325833028 + ], + [ + -88.70209445079999, + 18.183478469457967 + ], + [ + -88.60226289314758, + 18.263157375021862 + ], + [ + -88.51352373079078, + 18.47238683499056 + ], + [ + -88.43726351313973, + 18.488167422628592 + ], + [ + -88.25354432499957, + 18.47172949577066 + ], + [ + -88.24429014656803, + 18.41312050146206 + ], + [ + -88.02868171302806, + 18.410489354914077 + ], + [ + -88.03145481185183, + 18.15639524678187 + ], + [ + -87.92746360596436, + 18.16100647929801 + ], + [ + -87.90042589243359, + 18.14190200951552 + ], + [ + -87.86576215713777, + 18.187354043275235 + ], + [ + -87.84704374007828, + 18.18406081533068 + ], + [ + -87.7908884888986, + 18.189329950192246 + ], + [ + -87.65707945530865, + 18.28824890633139 + ], + [ + -87.41787863572226, + 18.842531431202303 + ], + [ + -87.19617509381354, + 19.690310581895503 + ], + [ + -86.67347700656958, + 20.364513892316694 + ], + [ + -86.55830624158347, + 21.23410571416761 + ], + [ + -86.95697427422762, + 21.73696674379393 + ], + [ + -87.94921471102978, + 21.74519584752555 + ], + [ + -89.1370588622609, + 21.598410069658726 + ], + [ + -90.42165585633569, + 21.23551929495079 + ], + [ + -90.60770093823632, + 20.5568433326182 + ], + [ + -90.90891678512263, + 19.60830483630103 + ], + [ + -91.42275558275244, + 19.115170220614658 + ], + [ + -92.60990039106984, + 18.72966716628308 + ], + [ + -93.82362306823012, + 18.578577346793196 + ], + [ + -94.75384847773239, + 18.72966716628308 + ], + [ + -96.01186760296429, + 19.70007942113088 + ], + [ + -96.95095155505258, + 20.656348580289816 + ], + [ + -97.2521674019389, + 21.5654530496722 + ], + [ + -97.58881777704137, + 22.411566539805605 + ], + [ + -97.6596920939559, + 23.853531669826182 + ], + [ + -97.42751316979206, + 25.104563844813484 + ], + [ + -97.18419944456167, + 25.52340403900685 + ], + [ + -97.1164324089626, + 25.866012971541934 + ], + [ + -97.1261781381014, + 25.90659287128563 + ], + [ + -97.53063241661418, + 25.94125520345078 + ], + [ + -98.68380568305368, + 26.132189485796275 + ], + [ + -99.12316996233503, + 26.44424297801804 + ], + [ + -99.53060363708296, + 27.529177778419765 + ], + [ + -100.31332855618905, + 28.28680118766816 + ], + [ + -100.60057470838024, + 29.065792528371688 + ], + [ + -101.38367766278729, + 29.682475747211242 + ], + [ + -102.62288751225091, + 29.744729475990752 + ], + [ + -103.23812927490485, + 28.98600393620876 + ], + [ + -104.3939255517482, + 29.575126669700737 + ], + [ + -104.93500927951658, + 30.511109804049127 + ], + [ + -105.92695151250828, + 31.374643112029972 + ], + [ + -106.51343697276349, + 31.91223516980702 + ], + [ + -108.16544664046671, + 31.733359782508956 + ], + [ + -108.1797146857931, + 31.36180807614261 + ], + [ + -110.89791246226395, + 31.310451619202453 + ], + [ + -114.79305897973846, + 32.523058395725826 + ], + [ + -114.71023041862377, + 32.713382573073346 + ], + [ + -117.25331361438418, + 32.53740476377489 + ], + [ + -117.2652185920399, + 32.53896303702481 + ], + [ + -117.37965475637597, + 32.44197267953365 + ] + ] + ] + }, + "id": 0 + }, { "type": "Feature", "properties": { @@ -1302,7 +1842,7 @@ ] ] }, - "id": 0 + "id": 1 }, { "type": "Feature", @@ -2331,6 +2871,10 @@ -97.53063241661418, 25.94125520345078 ], + [ + -97.1261781381014, + 25.90659287128563 + ], [ -96.89345146515261, 25.886647849882706 @@ -3091,7 +3635,7 @@ ] ] }, - "id": 1 + "id": 2 } ] } \ No newline at end of file diff --git a/map/src/countries.json b/map/src/countries.json index 55170e6..306586a 100644 --- a/map/src/countries.json +++ b/map/src/countries.json @@ -14,5 +14,13 @@ "date": "April 17, 1982", "img": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Flag_of_Canada_%28Pantone%29.svg/125px-Flag_of_Canada_%28Pantone%29.svg.png", "about": "https://en.wikipedia.org/wiki/Canada" + }, + { + "idc": "mexico", + "description": "Mexico officially the United Mexican States, is a country in the southern portion of North America.", + "name": "United Mexican States", + "date": "September 27, 1821", + "img": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Flag_of_Mexico.svg/125px-Flag_of_Mexico.svg.png", + "about": "https://en.wikipedia.org/wiki/Mexico" } ] diff --git a/map/src/countries/mexico.geojson b/map/src/countries/mexico.geojson new file mode 100644 index 0000000..4f021f5 --- /dev/null +++ b/map/src/countries/mexico.geojson @@ -0,0 +1,480 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + -117.19328679662503, + 32.172881903158654 + ], + [ + -116.80195975904499, + 31.505068733527338 + ], + [ + -116.55661039658732, + 30.76271545031821 + ], + [ + -115.7977350664051, + 29.653268564800285 + ], + [ + -115.36409202058698, + 28.65169590952351 + ], + [ + -115.46679695249115, + 28.06926440128359 + ], + [ + -115.00462062737041, + 27.508963730275426 + ], + [ + -114.1943928312361, + 26.81856520043671 + ], + [ + -113.45834081925501, + 26.609596794300515 + ], + [ + -112.75081795502518, + 26.22123061337699 + ], + [ + -112.36282154560872, + 25.414843888853795 + ], + [ + -112.57963996298983, + 24.83626183683829 + ], + [ + -111.87782292831012, + 24.28097124641897 + ], + [ + -110.95918437072153, + 23.86942322393074 + ], + [ + -110.26307316559195, + 22.926845288398482 + ], + [ + -109.86366509707523, + 22.774362215071775 + ], + [ + -107.74109650438542, + 22.421422993834838 + ], + [ + -106.78252536697033, + 21.62271476309502 + ], + [ + -106.11494330959201, + 20.167515569995786 + ], + [ + -105.77718715022233, + 19.654922586962385 + ], + [ + -103.37512605031584, + 17.917075724318906 + ], + [ + -99.74274097240904, + 16.48063158909818 + ], + [ + -96.891513975772, + 15.617321139728986 + ], + [ + -95.9345953262162, + 15.560889480871168 + ], + [ + -94.82144506040571, + 16.08697615257519 + ], + [ + -93.8823625453146, + 15.89668062545556 + ], + [ + -93.28569374496455, + 15.444749392460338 + ], + [ + -92.55775780853817, + 14.75154709083759 + ], + [ + -92.2339296868265, + 14.521512983731157 + ], + [ + -92.18570145171147, + 14.575816275200793 + ], + [ + -92.17684320444563, + 14.632963179276587 + ], + [ + -92.1443629644706, + 14.680574236354857 + ], + [ + -92.16601645778728, + 14.732934429094229 + ], + [ + -92.1827476223173, + 14.833572476834604 + ], + [ + -92.14239338477228, + 14.880188407699592 + ], + [ + -92.14239338477228, + 14.938206403040638 + ], + [ + -92.12861388902516, + 15.003814425866494 + ], + [ + -92.07841715451804, + 15.047541929798456 + ], + [ + -92.06070065998635, + 15.069402319514097 + ], + [ + -92.21227511320399, + 15.260347236723007 + ], + [ + -91.73172076697341, + 16.073168309873026 + ], + [ + -90.44557706934002, + 16.072131086317597 + ], + [ + -90.42884482450418, + 16.13737913370963 + ], + [ + -90.44065582085878, + 16.22812325631243 + ], + [ + -90.42097082693459, + 16.303711427992198 + ], + [ + -90.38356933847831, + 16.380214746239943 + ], + [ + -90.4465613205179, + 16.42742404398436 + ], + [ + -90.52095517205223, + 16.456408421929666 + ], + [ + -90.62064755286033, + 16.49632097037278 + ], + [ + -90.64525380893343, + 16.58406850004677 + ], + [ + -90.66690730895485, + 16.674604618708102 + ], + [ + -90.73186778890489, + 16.740593542950293 + ], + [ + -90.79682826885538, + 16.77923359140368 + ], + [ + -90.91198548331298, + 16.836707900790145 + ], + [ + -90.99231940426598, + 16.875013804012582 + ], + [ + -91.06515388763472, + 16.903267758253406 + ], + [ + -91.10747662457185, + 16.976708149843716 + ], + [ + -91.18031110167898, + 17.018123399661505 + ], + [ + -91.23739758405944, + 17.100926392275824 + ], + [ + -91.32480849280037, + 17.164885326586145 + ], + [ + -91.42913896761694, + 17.209079348774637 + ], + [ + -91.42629759383239, + 17.24827205498225 + ], + [ + -90.98836347021151, + 17.24827205498225 + ], + [ + -90.99144518310828, + 17.80735940079539 + ], + [ + -89.15549058793002, + 17.80094462774224 + ], + [ + -89.15549661225124, + 17.943563923060154 + ], + [ + -89.04457265930441, + 18.006869778158148 + ], + [ + -88.98287121047778, + 17.960052007675557 + ], + [ + -88.92740923400433, + 17.917839443119206 + ], + [ + -88.86917415870715, + 17.888812469246474 + ], + [ + -88.7915273916448, + 17.978516836619036 + ], + [ + -88.71595994491821, + 18.07015325833028 + ], + [ + -88.70209445079999, + 18.183478469457967 + ], + [ + -88.60226289314758, + 18.263157375021862 + ], + [ + -88.51352373079078, + 18.47238683499056 + ], + [ + -88.43726351313973, + 18.488167422628592 + ], + [ + -88.25354432499957, + 18.47172949577066 + ], + [ + -88.24429014656803, + 18.41312050146206 + ], + [ + -88.02868171302806, + 18.410489354914077 + ], + [ + -88.03145481185183, + 18.15639524678187 + ], + [ + -87.92746360596436, + 18.16100647929801 + ], + [ + -87.90042589243359, + 18.14190200951552 + ], + [ + -87.86576215713777, + 18.187354043275235 + ], + [ + -87.84704374007828, + 18.18406081533068 + ], + [ + -87.7908884888986, + 18.189329950192246 + ], + [ + -87.65707945530865, + 18.28824890633139 + ], + [ + -87.41787863572226, + 18.842531431202303 + ], + [ + -87.19617509381354, + 19.690310581895503 + ], + [ + -86.67347700656958, + 20.364513892316694 + ], + [ + -86.55830624158347, + 21.23410571416761 + ], + [ + -86.95697427422762, + 21.73696674379393 + ], + [ + -87.94921471102978, + 21.74519584752555 + ], + [ + -89.1370588622609, + 21.598410069658726 + ], + [ + -90.42165585633569, + 21.23551929495079 + ], + [ + -90.60770093823632, + 20.5568433326182 + ], + [ + -90.90891678512263, + 19.60830483630103 + ], + [ + -91.42275558275244, + 19.115170220614658 + ], + [ + -92.60990039106984, + 18.72966716628308 + ], + [ + -93.82362306823012, + 18.578577346793196 + ], + [ + -94.75384847773239, + 18.72966716628308 + ], + [ + -96.01186760296429, + 19.70007942113088 + ], + [ + -96.95095155505258, + 20.656348580289816 + ], + [ + -97.2521674019389, + 21.5654530496722 + ], + [ + -97.58881777704137, + 22.411566539805605 + ], + [ + -97.6596920939559, + 23.853531669826182 + ], + [ + -97.42751316979206, + 25.104563844813484 + ], + [ + -97.18419944456167, + 25.52340403900685 + ], + [ + -97.1164324089626, + 25.866012971541934 + ], + [ + -97.14300715076051, + 25.97666660684368 + ], + [ + -97.37115630147355, + 26.054897338208747 + ], + [ + -98.91579815350299, + 28.75398491489527 + ], + [ + -103.25104093681402, + 32.142612749284496 + ], + [ + -113.78724213728925, + 33.031216057293506 + ], + [ + -116.96550373470718, + 32.79298632875923 + ], + [ + -117.37965475637597, + 32.44197267953365 + ], + [ + -117.19328679662503, + 32.172881903158654 + ] + ] + ], + "type": "Polygon" + } + } + ] +} \ No newline at end of file diff --git a/map/src/layers.yaml b/map/src/layers.yaml index a059dab..e0124c7 100644 --- a/map/src/layers.yaml +++ b/map/src/layers.yaml @@ -1,4 +1,5 @@ # ids of countries - usa - canada +- mexico # - china diff --git a/map/src/properties.yaml b/map/src/properties.yaml index e7fe5d1..7d5b9da 100644 --- a/map/src/properties.yaml +++ b/map/src/properties.yaml @@ -9,3 +9,6 @@ canada: stroke: "#bc2700" tags: - NATO +mexico: + fill: "#e79f00" + stroke: "#e79f00"