From 58d94ae758d790c340799e15448e9f7dd351af16 Mon Sep 17 00:00:00 2001 From: Artemy Date: Thu, 3 Aug 2023 16:35:50 +0300 Subject: [PATCH] feat: australia, new zealand --- map/geo.geojson | 410 +++++++++++++++++++++++++- map/src/config.yaml | 3 +- map/src/countries/australia.geojson | 220 ++++++++++++++ map/src/countries/new_zealand.geojson | 164 +++++++++++ map/src/layers.yaml | 2 + map/src/properties.yaml | 26 +- package-lock.json | 40 ++- package.json | 2 +- 8 files changed, 833 insertions(+), 34 deletions(-) create mode 100644 map/src/countries/australia.geojson create mode 100644 map/src/countries/new_zealand.geojson diff --git a/map/geo.geojson b/map/geo.geojson index 4a79321..fca285c 100644 --- a/map/geo.geojson +++ b/map/geo.geojson @@ -1,12 +1,398 @@ { "type": "FeatureCollection", "features": [ + { + "type": "Feature", + "properties": { + "name": "new_zealand", + "fill": "#998fd0", + "stroke": "#c72db0", + "area": "445 511.29" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 166.21963930137503, + -45.796261316726465 + ], + [ + 166.6701554820075, + -46.504436438005804 + ], + [ + 167.4324992970798, + -46.64140620322259 + ], + [ + 167.285228332805, + -47.15049030901849 + ], + [ + 167.22458734751496, + -47.45596502826037 + ], + [ + 168.07356114157187, + -47.29757347463955 + ], + [ + 169.7801717275865, + -46.88471192658641 + ], + [ + 171.2182293787463, + -45.65113243428278 + ], + [ + 171.4867823136011, + -44.42690411712743 + ], + [ + 172.72559101309298, + -43.97353578811483 + ], + [ + 173.45328283657176, + -43.98600331526725 + ], + [ + 173.23670788910817, + -43.46640136928231 + ], + [ + 173.96439971258496, + -42.75175053002905 + ], + [ + 175.0650779424422, + -41.838839911012776 + ], + [ + 176.06998569867454, + -41.54126099641549 + ], + [ + 177.144197820457, + -40.3504127248164 + ], + [ + 178.27902334533604, + -39.27912457703114 + ], + [ + 178.7814772234522, + -38.034429366136926 + ], + [ + 178.50426129069848, + -37.3558109917933 + ], + [ + 177.2134746038135, + -37.43151951264868 + ], + [ + 176.329848818163, + -37.11441196565468 + ], + [ + 175.80140594635031, + -36.287891575570285 + ], + [ + 175.09103646279823, + -35.38192480485265 + ], + [ + 174.03415071917453, + -34.55846686728227 + ], + [ + 172.80400501758146, + -34.03602963765693 + ], + [ + 172.24909409380558, + -34.37610506733018 + ], + [ + 172.74288497402296, + -35.215539282978135 + ], + [ + 174.18094262518088, + -36.95859155421394 + ], + [ + 174.48414755163105, + -38.11944731474244 + ], + [ + 173.58319577018113, + -39.10097530059085 + ], + [ + 173.4272618025483, + -40.28084047523515 + ], + [ + 172.49165159553183, + -40.33369022771207 + ], + [ + 171.58203681618477, + -41.12799998902949 + ], + [ + 170.44718227586588, + -42.732644546313956 + ], + [ + 168.70591969825773, + -43.679776361483526 + ], + [ + 166.9213421311572, + -44.83377675676192 + ], + [ + 166.21963930137503, + -45.796261316726465 + ] + ] + ] + }, + "id": 0 + }, + { + "type": "Feature", + "properties": { + "name": "australia", + "fill": "#fb2a54", + "stroke": "#d63748", + "area": "9 312 415.61" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 112.4248736321004, + -26.657803407666016 + ], + [ + 114.173144578407, + -29.86600371328933 + ], + [ + 114.30898126797217, + -32.27500473464688 + ], + [ + 114.37444981904457, + -34.25870712619 + ], + [ + 116.07912449009217, + -35.679184943702055 + ], + [ + 119.52232785155775, + -35.28789693294439 + ], + [ + 124.52573049138175, + -34.35048589815378 + ], + [ + 130.05653801903907, + -32.91415402513695 + ], + [ + 135.89823184227748, + -36.05538691900294 + ], + [ + 138.8760942557294, + -36.9583654668543 + ], + [ + 140.29036242943903, + -38.10927646979268 + ], + [ + 142.54558468200696, + -39.35107036112948 + ], + [ + 144.2172857026698, + -40.58694646002479 + ], + [ + 145.05913480416956, + -42.37514394525365 + ], + [ + 145.5401904610345, + -43.99439417911672 + ], + [ + 146.90922740896167, + -44.23105773233084 + ], + [ + 148.38829377848333, + -43.18650875793229 + ], + [ + 149.125284372002, + -41.3160139289213 + ], + [ + 149.76677714855805, + -38.922603632823005 + ], + [ + 150.5978864053252, + -36.337412564415274 + ], + [ + 152.1684213413787, + -33.78012745923242 + ], + [ + 153.79934619138555, + -30.987047118807517 + ], + [ + 154.20747962003463, + -27.334489326962235 + ], + [ + 153.4985208975129, + -24.090438748554476 + ], + [ + 150.97522464170464, + -20.977400791588224 + ], + [ + 148.0485182416018, + -18.285625825102898 + ], + [ + 146.16109085978655, + -15.738604562575816 + ], + [ + 144.71965024963015, + -12.969147932650628 + ], + [ + 142.88046491154319, + -10.333003026432323 + ], + [ + 142.0575870932272, + -9.758633531448794 + ], + [ + 141.44856309633468, + -10.95148669913651 + ], + [ + 140.79358607462098, + -14.054601211062064 + ], + [ + 139.6670404236977, + -15.473256492493917 + ], + [ + 138.0550468190732, + -15.29696402246698 + ], + [ + 137.30555395158956, + -13.270992627603462 + ], + [ + 137.31146391131188, + -11.734597058868644 + ], + [ + 136.94971298528662, + -10.648904103054704 + ], + [ + 134.64103110592566, + -11.183059725571454 + ], + [ + 132.76694139864594, + -10.780593772123083 + ], + [ + 130.5866153622071, + -10.965344501104042 + ], + [ + 129.4098624510591, + -11.266089763736346 + ], + [ + 128.47290175492003, + -13.155006049630359 + ], + [ + 126.20624743399264, + -13.505753872765624 + ], + [ + 123.47025737713142, + -15.654903253768552 + ], + [ + 121.72962381395519, + -16.92264439175726 + ], + [ + 120.88286467523051, + -18.605889284643254 + ], + [ + 118.21914398957551, + -19.524465484752966 + ], + [ + 115.24048051930458, + -20.057515263967787 + ], + [ + 112.62210356271754, + -21.80298187854909 + ], + [ + 112.61146810709835, + -25.05172791240821 + ], + [ + 112.4248736321004, + -26.657803407666016 + ] + ] + ] + }, + "id": 1 + }, { "type": "Feature", "properties": { "name": "mexico", - "fill": "#e79f00", - "stroke": "#e79f00", + "fill": "#4edfc9", + "stroke": "#24721a", "area": "2 371 575.61" }, "geometry": { @@ -540,17 +926,14 @@ ] ] }, - "id": 0 + "id": 2 }, { "type": "Feature", "properties": { "name": "canada", - "fill": "#bc2700", - "stroke": "#bc2700", - "tags": [ - "NATO" - ], + "fill": "#c2aada", + "stroke": "#c2ca30", "area": "12 816 534.60" }, "geometry": { @@ -1844,17 +2227,14 @@ ] ] }, - "id": 1 + "id": 3 }, { "type": "Feature", "properties": { "name": "usa", - "fill": "#009abc", - "stroke": "#009abc", - "tags": [ - "NATO" - ], + "fill": "#ada533", + "stroke": "#04c5b9", "area": "10 616 317.76" }, "geometry": { @@ -3638,7 +4018,7 @@ ] ] }, - "id": 2 + "id": 4 } ] } \ No newline at end of file diff --git a/map/src/config.yaml b/map/src/config.yaml index c0e1122..faa9df6 100644 --- a/map/src/config.yaml +++ b/map/src/config.yaml @@ -1,5 +1,5 @@ # config is optional -# --- +--- # tags: # - tags # - for @@ -9,3 +9,4 @@ # new: "Properties" # for: "Polygons" # cities: false +generateColors: false diff --git a/map/src/countries/australia.geojson b/map/src/countries/australia.geojson new file mode 100644 index 0000000..a3045fd --- /dev/null +++ b/map/src/countries/australia.geojson @@ -0,0 +1,220 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + 138.8760942557294, + -36.9583654668543 + ], + [ + 140.29036242943903, + -38.10927646979268 + ], + [ + 142.54558468200696, + -39.35107036112948 + ], + [ + 144.2172857026698, + -40.58694646002479 + ], + [ + 145.05913480416956, + -42.37514394525365 + ], + [ + 145.5401904610345, + -43.99439417911672 + ], + [ + 146.90922740896167, + -44.23105773233084 + ], + [ + 148.38829377848333, + -43.18650875793229 + ], + [ + 149.125284372002, + -41.3160139289213 + ], + [ + 149.76677714855805, + -38.922603632823005 + ], + [ + 150.5978864053252, + -36.337412564415274 + ], + [ + 152.1684213413787, + -33.78012745923242 + ], + [ + 153.79934619138555, + -30.987047118807517 + ], + [ + 154.20747962003463, + -27.334489326962235 + ], + [ + 153.4985208975129, + -24.090438748554476 + ], + [ + 150.97522464170464, + -20.977400791588224 + ], + [ + 148.0485182416018, + -18.285625825102898 + ], + [ + 146.16109085978655, + -15.738604562575816 + ], + [ + 144.71965024963015, + -12.969147932650628 + ], + [ + 142.88046491154319, + -10.333003026432323 + ], + [ + 142.0575870932272, + -9.758633531448794 + ], + [ + 141.44856309633468, + -10.95148669913651 + ], + [ + 140.79358607462098, + -14.054601211062064 + ], + [ + 139.6670404236977, + -15.473256492493917 + ], + [ + 138.0550468190732, + -15.29696402246698 + ], + [ + 137.30555395158956, + -13.270992627603462 + ], + [ + 137.31146391131188, + -11.734597058868644 + ], + [ + 136.94971298528662, + -10.648904103054704 + ], + [ + 134.64103110592566, + -11.183059725571454 + ], + [ + 132.76694139864594, + -10.780593772123083 + ], + [ + 130.5866153622071, + -10.965344501104042 + ], + [ + 129.4098624510591, + -11.266089763736346 + ], + [ + 128.47290175492003, + -13.155006049630359 + ], + [ + 126.20624743399264, + -13.505753872765624 + ], + [ + 123.47025737713142, + -15.654903253768552 + ], + [ + 121.72962381395519, + -16.92264439175726 + ], + [ + 120.88286467523051, + -18.605889284643254 + ], + [ + 118.21914398957551, + -19.524465484752966 + ], + [ + 115.24048051930458, + -20.057515263967787 + ], + [ + 112.62210356271754, + -21.80298187854909 + ], + [ + 112.61146810709835, + -25.05172791240821 + ], + [ + 112.4248736321004, + -26.657803407666016 + ], + [ + 114.173144578407, + -29.86600371328933 + ], + [ + 114.30898126797217, + -32.27500473464688 + ], + [ + 114.37444981904457, + -34.25870712619 + ], + [ + 116.07912449009217, + -35.679184943702055 + ], + [ + 119.52232785155775, + -35.28789693294439 + ], + [ + 124.52573049138175, + -34.35048589815378 + ], + [ + 130.05653801903907, + -32.91415402513695 + ], + [ + 135.89823184227748, + -36.05538691900294 + ], + [ + 138.8760942557294, + -36.9583654668543 + ] + ] + ], + "type": "Polygon" + } + } + ] +} \ No newline at end of file diff --git a/map/src/countries/new_zealand.geojson b/map/src/countries/new_zealand.geojson new file mode 100644 index 0000000..0f3a82e --- /dev/null +++ b/map/src/countries/new_zealand.geojson @@ -0,0 +1,164 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + 172.24909409380558, + -34.37610506733018 + ], + [ + 172.74288497402296, + -35.215539282978135 + ], + [ + 174.18094262518088, + -36.95859155421394 + ], + [ + 174.48414755163105, + -38.11944731474244 + ], + [ + 173.58319577018113, + -39.10097530059085 + ], + [ + 173.4272618025483, + -40.28084047523515 + ], + [ + 172.49165159553183, + -40.33369022771207 + ], + [ + 171.58203681618477, + -41.12799998902949 + ], + [ + 170.44718227586588, + -42.732644546313956 + ], + [ + 168.70591969825773, + -43.679776361483526 + ], + [ + 166.9213421311572, + -44.83377675676192 + ], + [ + 166.21963930137503, + -45.796261316726465 + ], + [ + 166.6701554820075, + -46.504436438005804 + ], + [ + 167.4324992970798, + -46.64140620322259 + ], + [ + 167.285228332805, + -47.15049030901849 + ], + [ + 167.22458734751496, + -47.45596502826037 + ], + [ + 168.07356114157187, + -47.29757347463955 + ], + [ + 169.7801717275865, + -46.88471192658641 + ], + [ + 171.2182293787463, + -45.65113243428278 + ], + [ + 171.4867823136011, + -44.42690411712743 + ], + [ + 172.72559101309298, + -43.97353578811483 + ], + [ + 173.45328283657176, + -43.98600331526725 + ], + [ + 173.23670788910817, + -43.46640136928231 + ], + [ + 173.96439971258496, + -42.75175053002905 + ], + [ + 175.0650779424422, + -41.838839911012776 + ], + [ + 176.06998569867454, + -41.54126099641549 + ], + [ + 177.144197820457, + -40.3504127248164 + ], + [ + 178.27902334533604, + -39.27912457703114 + ], + [ + 178.7814772234522, + -38.034429366136926 + ], + [ + 178.50426129069848, + -37.3558109917933 + ], + [ + 177.2134746038135, + -37.43151951264868 + ], + [ + 176.329848818163, + -37.11441196565468 + ], + [ + 175.80140594635031, + -36.287891575570285 + ], + [ + 175.09103646279823, + -35.38192480485265 + ], + [ + 174.03415071917453, + -34.55846686728227 + ], + [ + 172.80400501758146, + -34.03602963765693 + ], + [ + 172.24909409380558, + -34.37610506733018 + ] + ] + ], + "type": "Polygon" + } + } + ] +} \ No newline at end of file diff --git a/map/src/layers.yaml b/map/src/layers.yaml index e0124c7..efe2ac3 100644 --- a/map/src/layers.yaml +++ b/map/src/layers.yaml @@ -2,4 +2,6 @@ - usa - canada - mexico +- australia +- new_zealand # - china diff --git a/map/src/properties.yaml b/map/src/properties.yaml index 7d5b9da..b4e4952 100644 --- a/map/src/properties.yaml +++ b/map/src/properties.yaml @@ -1,14 +1,14 @@ --- -usa: - fill: "#009abc" - stroke: "#009abc" - tags: - - NATO -canada: - fill: "#bc2700" - stroke: "#bc2700" - tags: - - NATO -mexico: - fill: "#e79f00" - stroke: "#e79f00" +# usa: +# fill: "#009abc" +# stroke: "#009abc" +# tags: +# - NATO +# canada: +# fill: "#bc2700" +# stroke: "#bc2700" +# tags: +# - NATO +# mexico: +# fill: "#e79f00" +# stroke: "#e79f00" diff --git a/package-lock.json b/package-lock.json index 99ba399..5bda083 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "cimengine-build-tools": "^1.3.2" + "cimengine-build-tools": "^1.4.2" } }, "node_modules/@turf/along": { @@ -1615,13 +1615,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", + "engines": { + "node": "*" + } + }, "node_modules/cimengine-build-tools": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/cimengine-build-tools/-/cimengine-build-tools-1.3.2.tgz", - "integrity": "sha512-iyOESfRFwfc+HADp1tPNrsIcApI4L3IQM5TVm9rcT3K6uCcl8eWa33ntdQ+/VThTMGUiEvP1SknCI91n5o/bzQ==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/cimengine-build-tools/-/cimengine-build-tools-1.4.2.tgz", + "integrity": "sha512-2oLvmZRg9VnWDuGY68hKLYOEJw/pIMwaDpU4hEw79WEe1ZUc1mWqCZVlFnLqTwlHQzLG5YzsG7gkPul3l0lreQ==", "dependencies": { "@turf/turf": "^6.5.0", "lodash": "^4.17.21", + "md5": "^2.3.0", "yaml": "^2.3.1", "yargs": "^17.7.2" }, @@ -1689,6 +1698,14 @@ "quickselect": "^2.0.0" } }, + "node_modules/crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", + "engines": { + "node": "*" + } + }, "node_modules/d3-array": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz", @@ -1902,6 +1919,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "node_modules/is-date-object": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", @@ -1944,6 +1966,16 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/md5": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", + "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", + "dependencies": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "~1.1.6" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", diff --git a/package.json b/package.json index 0be7d52..21144f2 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,6 @@ }, "homepage": "https://github.com/CIMEngine/worldmap#readme", "dependencies": { - "cimengine-build-tools": "^1.3.2" + "cimengine-build-tools": "^1.4.2" } }