14 Commits

Author SHA1 Message Date
bot
6df13a044b Merge pull request 'Update dependency androidx.compose.ui:ui-tooling to v1.9.3' (#300) from renovate/androidx.compose.ui-ui-tooling-1.x into main 2025-10-09 04:00:57 +02:00
bot
68fb0023da Merge pull request 'Update dependency androidx.compose.material:material to v1.9.3' (#299) from renovate/androidx.compose.material-material-1.x into main 2025-10-09 04:00:53 +02:00
Renovate Bot
686982c096 Update dependency androidx.compose.ui:ui-tooling to v1.9.3 2025-10-09 02:00:52 +00:00
Renovate Bot
84898895df Update dependency androidx.compose.material:material to v1.9.3 2025-10-09 02:00:49 +00:00
soraefir
472237ba8f wip 2025-10-07 22:38:21 +02:00
Renovate Bot
2ae7e1fb8c Lock file maintenance 2025-10-04 02:00:41 +00:00
Renovate Bot
ed4d751dce Update dependency mapshaper to v0.6.113 2025-10-01 02:00:38 +00:00
Renovate Bot
b5274d2113 Lock file maintenance 2025-09-28 02:00:47 +00:00
Renovate Bot
d7ad8ebd74 Lock file maintenance 2025-09-27 02:01:04 +00:00
Renovate Bot
43a521de16 Update dependency androidx.compose.material3:material3 to v1.4.0 2025-09-27 02:00:37 +00:00
Renovate Bot
4cf8c497a8 Update dependency androidx.navigation:navigation-compose to v2.9.5 2025-09-26 04:00:37 +02:00
Renovate Bot
fd57b5dee4 Update dependency androidx.compose.ui:ui-tooling to v1.9.2 2025-09-26 02:00:30 +00:00
Renovate Bot
49b80dc3b9 Update dependency androidx.compose.material:material to v1.9.2 2025-09-25 04:00:37 +02:00
Renovate Bot
c0e3943700 Update dependency androidx.compose:compose-bom to v2025.09.01 2025-09-25 02:00:27 +00:00
5 changed files with 87 additions and 80 deletions

View File

@@ -95,12 +95,16 @@ aboutLibraries {
} }
dependencies { dependencies {
implementation 'androidx.compose.material3:material3:1.3.2' implementation 'androidx.compose.material3:material3:1.4.0'
implementation 'androidx.navigation:navigation-compose:2.9.4' implementation "androidx.compose.material:material:1.9.3"
implementation 'androidx.compose.material:material-icons-extended:1.7.8'
implementation 'androidx.navigation:navigation-compose:2.9.5'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui'
implementation "androidx.compose.material:material:1.9.1"
implementation "androidx.activity:activity-ktx:1.11.0" implementation "androidx.activity:activity-ktx:1.11.0"
implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -115,6 +119,6 @@ dependencies {
implementation 'com.mikepenz:aboutlibraries-core:12.2.4' implementation 'com.mikepenz:aboutlibraries-core:12.2.4'
implementation platform('androidx.compose:compose-bom:2025.09.00') implementation platform('androidx.compose:compose-bom:2025.09.01')
debugImplementation 'androidx.compose.ui:ui-tooling:1.9.1' debugImplementation 'androidx.compose.ui:ui-tooling:1.9.3'
} }

View File

@@ -19,13 +19,15 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import net.helcel.beans.R import net.helcel.beans.R
import net.helcel.beans.activity.sub.EditPlaceScreen import net.helcel.beans.activity.sub.EditPlaceScreen
import net.helcel.beans.countries.World import net.helcel.beans.countries.World
@Preview
@Composable @Composable
fun EditScreen(onExit:()->Unit) { fun EditScreen(onExit:()->Unit = {}) {
SysTheme { SysTheme {
Scaffold( Scaffold(
topBar = { topBar = {

View File

@@ -18,6 +18,7 @@ import androidx.compose.material.TopAppBar
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.DateRange import androidx.compose.material.icons.filled.DateRange
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.Percent
import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Settings
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@@ -82,7 +83,7 @@ class MainScreen : ComponentActivity() {
Icon(Icons.Default.Edit, contentDescription = "Edit") Icon(Icons.Default.Edit, contentDescription = "Edit")
} }
IconButton(onClick = { nav.navigate("stats") }){ IconButton(onClick = { nav.navigate("stats") }){
Icon(Icons.Default.DateRange, contentDescription = "Stats") Icon(Icons.Default.Percent, contentDescription = "Stats")
} }
IconButton(onClick = { nav.navigate("settings") }) { IconButton(onClick = { nav.navigate("settings") }) {
Icon(Icons.Default.Settings, contentDescription = "Settings") Icon(Icons.Default.Settings, contentDescription = "Settings")

View File

@@ -118,9 +118,10 @@ fun settingsNav(): NavHostController {
return navController return navController
} }
@Preview
@Composable @Composable
fun SettingsMainScreen(onExit: ()->Unit = {}) { fun SettingsMainScreen(onExit: ()->Unit = {}) {
var nav: NavHostController? = null val nav: NavHostController = settingsNav()
SysTheme { SysTheme {
Scaffold( Scaffold(
topBar = { topBar = {
@@ -128,7 +129,7 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
title = { Text(stringResource(R.string.action_settings)) }, title = { Text(stringResource(R.string.action_settings)) },
navigationIcon = { navigationIcon = {
IconButton(onClick = { IconButton(onClick = {
if(nav!=null && !nav!!.popBackStack()) if(!nav.popBackStack())
onExit() onExit()
}) { }) {
Icon( Icon(
@@ -141,13 +142,12 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
} }
) { innerPadding -> ) { innerPadding ->
Box(modifier = Modifier.padding(innerPadding)) { Box(modifier = Modifier.padding(innerPadding)) {
nav = settingsNav() SettingsScreen()
} }
} }
} }
} }
@Preview
@Composable @Composable
fun SettingsScreen(navController: NavHostController = settingsNav()) { fun SettingsScreen(navController: NavHostController = settingsNav()) {
val context = LocalContext.current val context = LocalContext.current

138
yarn.lock
View File

@@ -3,25 +3,26 @@
"@asamuzakjp/css-color@^4.0.3": "@asamuzakjp/css-color@^4.0.3":
version "4.0.4" version "4.0.5"
resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-4.0.4.tgz#3c0a94e98593829d60f68916116814e8fbbdba6d" resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-4.0.5.tgz#cc533095241d8a56c49614591955280ab8c4bb02"
integrity sha512-cKjSKvWGmAziQWbCouOsFwb14mp1betm8Y7Fn+yglDMUUu3r9DCbJ9iJbeFDenLMqFbIMC0pQP8K+B8LAxX3OQ== integrity sha512-lMrXidNhPGsDjytDy11Vwlb6OIGrT3CmLg3VWNFyWkLWtijKl7xjvForlh8vuj0SHGjgl4qZEQzUmYTeQA2JFQ==
dependencies: dependencies:
"@csstools/css-calc" "^2.1.4" "@csstools/css-calc" "^2.1.4"
"@csstools/css-color-parser" "^3.0.10" "@csstools/css-color-parser" "^3.1.0"
"@csstools/css-parser-algorithms" "^3.0.5" "@csstools/css-parser-algorithms" "^3.0.5"
"@csstools/css-tokenizer" "^3.0.4" "@csstools/css-tokenizer" "^3.0.4"
lru-cache "^11.1.0" lru-cache "^11.2.1"
"@asamuzakjp/dom-selector@^6.5.4": "@asamuzakjp/dom-selector@^6.5.4":
version "6.5.5" version "6.5.7"
resolved "https://registry.yarnpkg.com/@asamuzakjp/dom-selector/-/dom-selector-6.5.5.tgz#72bbf54a07bbae7dd5a1732318d3fe6a6717625c" resolved "https://registry.yarnpkg.com/@asamuzakjp/dom-selector/-/dom-selector-6.5.7.tgz#d4dd57957e4b699266cc75a690190b3d1b5258bf"
integrity sha512-kI2MX9pmImjxWT8nxDZY+MuN6r1jJGe7WxizEbsAEPB/zxfW5wYLIiPG1v3UKgEOOP8EsDkp0ZL99oRFAdPM8g== integrity sha512-cvdTPsi2qC1c22UppvuVmx/PDwuc6+QQkwt9OnwQD6Uotbh//tb2XDF0OoK2V0F4b8d02LIwNp3BieaDMAhIhA==
dependencies: dependencies:
"@asamuzakjp/nwsapi" "^2.3.9" "@asamuzakjp/nwsapi" "^2.3.9"
bidi-js "^1.0.3" bidi-js "^1.0.3"
css-tree "^3.1.0" css-tree "^3.1.0"
is-potential-custom-element-name "^1.0.1" is-potential-custom-element-name "^1.0.1"
lru-cache "^11.2.2"
"@asamuzakjp/nwsapi@^2.3.9": "@asamuzakjp/nwsapi@^2.3.9":
version "2.3.9" version "2.3.9"
@@ -38,7 +39,7 @@
resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65" resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ== integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
"@csstools/css-color-parser@^3.0.10": "@csstools/css-color-parser@^3.1.0":
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0" resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA== integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
@@ -97,9 +98,9 @@
integrity sha512-pQaoQTBvDf7p7d/3ZHDaxWaU62guSYB9KQ6vvecshELunzpdN5tbgw0d+SVO1eYaTlrxX3Nvi7F9DI8FcoJePg== integrity sha512-pQaoQTBvDf7p7d/3ZHDaxWaU62guSYB9KQ6vvecshELunzpdN5tbgw0d+SVO1eYaTlrxX3Nvi7F9DI8FcoJePg==
"@rollup/rollup-linux-x64-gnu@^4.44.1": "@rollup/rollup-linux-x64-gnu@^4.44.1":
version "4.52.0" version "4.52.4"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.0.tgz#214b534701614c7502603e2a083bb9f072ae8500" resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.4.tgz#aa9d5b307c08f05d3454225bb0a2b4cc87eeb2e1"
integrity sha512-nmSVN+F2i1yKZ7rJNKO3G7ZzmxJgoQBQZ/6c4MuS553Grmr7WqR7LLDcYG53Z2m9409z3JLt4sCOhLdbKQ3HmA== integrity sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==
"@tmcw/togeojson@^5.6.0": "@tmcw/togeojson@^5.6.0":
version "5.8.1" version "5.8.1"
@@ -1586,22 +1587,17 @@
integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg== integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
"@types/node@*": "@types/node@*":
version "24.5.2" version "24.6.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446" resolved "https://registry.yarnpkg.com/@types/node/-/node-24.6.2.tgz#59b99878b6fed17e698e7d09e51c729c5877736a"
integrity sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ== integrity sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==
dependencies: dependencies:
undici-types "~7.12.0" undici-types "~7.13.0"
"@types/node@^10.0.3": "@types/node@^10.0.3":
version "10.17.60" version "10.17.60"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
"@types/node@^7.0.31":
version "7.10.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.10.14.tgz#06fa7319b8131b969a8da4a14c487e6f28abacf7"
integrity sha512-29GS75BE8asnTno3yB6ubOJOO0FboExEqNJy4bpz0GSmW/8wPTNL4h9h63c6s1uTrOopCmJYe/4yJLh5r92ZUA==
"@types/node@^8.0.0": "@types/node@^8.0.0":
version "8.10.66" version "8.10.66"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
@@ -1675,7 +1671,7 @@ call-bound@^1.0.2:
call-bind-apply-helpers "^1.0.2" call-bind-apply-helpers "^1.0.2"
get-intrinsic "^1.3.0" get-intrinsic "^1.3.0"
caseless@~0.12.0: caseless@^0.12.0, caseless@~0.12.0:
version "0.12.0" version "0.12.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
@@ -1697,7 +1693,7 @@ commander@7.0.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2" resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
concat-stream@^1.4.6, concat-stream@^1.6.0: concat-stream@^1.6.0, concat-stream@^1.6.2:
version "1.6.2" version "1.6.2"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -1739,9 +1735,9 @@ css-tree@^3.1.0:
source-map-js "^1.0.1" source-map-js "^1.0.1"
cssstyle@^5.3.0: cssstyle@^5.3.0:
version "5.3.0" version "5.3.1"
resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-5.3.0.tgz#9d0750a5bda34351464850e5524c414435b8d72c" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-5.3.1.tgz#f55a9cc73d12705da8a341261d5e85003fe3a441"
integrity sha512-RveJPnk3m7aarYQ2bJ6iw+Urh55S6FzUiqtBq+TihnTDP4cI8y/TYDqGOyqgnG1J1a6BxJXZsV9JFSTulm9Z7g== integrity sha512-g5PC9Aiph9eiczFpcgUhd9S4UUO3F+LHGRIi5NUMZ+4xtoIYbHNZwZnWA2JsFGe8OU8nl4WyaEFiZuGuxlutJQ==
dependencies: dependencies:
"@asamuzakjp/css-color" "^4.0.3" "@asamuzakjp/css-color" "^4.0.3"
"@csstools/css-syntax-patches-for-csstree" "^1.0.14" "@csstools/css-syntax-patches-for-csstree" "^1.0.14"
@@ -1822,9 +1818,9 @@ depd@~2.0.0:
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
detect-libc@^2.0.1: detect-libc@^2.0.1:
version "2.1.0" version "2.1.1"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.0.tgz#3ca811f60a7b504b0480e5008adacc660b0b8c4f" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.1.tgz#9f1e511ace6bb525efea4651345beac424dac7b9"
integrity sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg== integrity sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==
dunder-proto@^1.0.1: dunder-proto@^1.0.1:
version "1.0.1" version "1.0.1"
@@ -1911,6 +1907,11 @@ function-bind@^1.1.2:
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
geographiclib-geodesic@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/geographiclib-geodesic/-/geographiclib-geodesic-2.2.0.tgz#aa4eebfa798d4c80f8a2c3e28cbb76ecc3295622"
integrity sha512-cIedo9VTYb0DFufodgibDmVfsWe9EASqb/kUByl09xc6PZYvLvlc89BHCThtGTPf2OII/zWJGxsR3Uz6O7QOVw==
geographiclib@1.48.0: geographiclib@1.48.0:
version "1.48.0" version "1.48.0"
resolved "https://registry.yarnpkg.com/geographiclib/-/geographiclib-1.48.0.tgz#8ff2ae185ad380f675db6a243935fadd147def82" resolved "https://registry.yarnpkg.com/geographiclib/-/geographiclib-1.48.0.tgz#8ff2ae185ad380f675db6a243935fadd147def82"
@@ -1997,15 +1998,13 @@ html-encoding-sniffer@^4.0.0:
dependencies: dependencies:
whatwg-encoding "^3.1.1" whatwg-encoding "^3.1.1"
http-basic@^6.0.0: http-basic@^8.1.1:
version "6.0.0" version "8.1.3"
resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-6.0.0.tgz#1d63df8f891e1e25e0c2c84d7a2d94702d6ae229" resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-8.1.3.tgz#a7cabee7526869b9b710136970805b1004261bbf"
integrity sha512-7ScbVjuiReYe8S+OZOpNjoKGXrbhJHIrQQe7eq1TpLTJkxH8MPKvnTUzq/TNLjww1hdFQy8yUIC42wuLhCjYcQ== integrity sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==
dependencies: dependencies:
"@types/concat-stream" "^1.6.0" caseless "^0.12.0"
"@types/node" "^7.0.31" concat-stream "^1.6.2"
caseless "~0.12.0"
concat-stream "^1.4.6"
http-response-object "^3.0.1" http-response-object "^3.0.1"
parse-cache-control "^1.0.1" parse-cache-control "^1.0.1"
@@ -2107,15 +2106,15 @@ keygrip@~1.1.0:
dependencies: dependencies:
tsscmp "1.0.6" tsscmp "1.0.6"
lru-cache@^11.1.0: lru-cache@^11.2.1, lru-cache@^11.2.2:
version "11.2.1" version "11.2.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.1.tgz#d426ac471521729c6c1acda5f7a633eadaa28db2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.2.tgz#40fd37edffcfae4b2940379c0722dc6eeaa75f24"
integrity sha512-r8LA6i4LP4EeWOhqBaZZjDWwehd1xUJPCJd9Sv300H0ZmcUER4+JPh7bqqZeqs1o5pgtgvXm+d9UGrB5zZGDiQ== integrity sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==
mapshaper@^0.6.79: mapshaper@^0.6.79:
version "0.6.112" version "0.6.113"
resolved "https://registry.yarnpkg.com/mapshaper/-/mapshaper-0.6.112.tgz#aad0cb293e0c14e6fa3c11df9c08925b39189a4c" resolved "https://registry.yarnpkg.com/mapshaper/-/mapshaper-0.6.113.tgz#23fadfd247c4b53c892655aa796f470504e77cf1"
integrity sha512-p4ToK7SANYXtxIFLYnLVUHvHGmn2J4afS14lJ/2Kc7hzFoSCvlnlfzHypcesl9q0u2SJ0jhDKANGoNxbRX22vg== integrity sha512-eN37+sb5pE084b6pVgRUsM5s5aFwwilYZQm8AN/FN8jD7hzoQ48aBwvd+QNzrIYSf/ZknbT9tYa4QuaoR1KRWg==
dependencies: dependencies:
"@placemarkio/tokml" "^0.3.3" "@placemarkio/tokml" "^0.3.3"
"@tmcw/togeojson" "^5.6.0" "@tmcw/togeojson" "^5.6.0"
@@ -2130,6 +2129,7 @@ mapshaper@^0.6.79:
delaunator "^5.0.0" delaunator "^5.0.0"
fflate "0.8.2" fflate "0.8.2"
flatbush "^3.2.1" flatbush "^3.2.1"
geographiclib-geodesic "^2.2.0"
geokdbush "^1.1.0" geokdbush "^1.1.0"
iconv-lite "^0.6.3" iconv-lite "^0.6.3"
idb-keyval "^6.2.0" idb-keyval "^6.2.0"
@@ -2138,7 +2138,7 @@ mapshaper@^0.6.79:
msgpackr "^1.10.1" msgpackr "^1.10.1"
opn "^5.3.0" opn "^5.3.0"
rw "~1.3.3" rw "~1.3.3"
sync-request "5.0.0" sync-request "6.1.0"
tinyqueue "^2.0.3" tinyqueue "^2.0.3"
optionalDependencies: optionalDependencies:
"@rollup/rollup-linux-x64-gnu" "^4.44.1" "@rollup/rollup-linux-x64-gnu" "^4.44.1"
@@ -2437,26 +2437,26 @@ symbol-tree@^3.2.4:
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
sync-request@5.0.0: sync-request@6.1.0:
version "5.0.0" version "6.1.0"
resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-5.0.0.tgz#b815d5c6e16193392ec4139a4881db5e90e88676" resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68"
integrity sha512-NKhEA4WacR3mRBIFz1niXrIUTrUVFtP2spzrLMINangebvJ/EFyVv+LMJKvVl6UIrJM4Fburnnj91lRnqb4WkA== integrity sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==
dependencies: dependencies:
http-response-object "^3.0.1" http-response-object "^3.0.1"
sync-rpc "^1.2.0" sync-rpc "^1.2.1"
then-request "^5.0.0" then-request "^6.0.0"
sync-rpc@^1.2.0: sync-rpc@^1.2.1:
version "1.3.6" version "1.3.6"
resolved "https://registry.yarnpkg.com/sync-rpc/-/sync-rpc-1.3.6.tgz#b2e8b2550a12ccbc71df8644810529deb68665a7" resolved "https://registry.yarnpkg.com/sync-rpc/-/sync-rpc-1.3.6.tgz#b2e8b2550a12ccbc71df8644810529deb68665a7"
integrity sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw== integrity sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==
dependencies: dependencies:
get-port "^3.1.0" get-port "^3.1.0"
then-request@^5.0.0: then-request@^6.0.0:
version "5.0.0" version "6.0.2"
resolved "https://registry.yarnpkg.com/then-request/-/then-request-5.0.0.tgz#7a23f616799597621de8cfebc77c61fd28c00d64" resolved "https://registry.yarnpkg.com/then-request/-/then-request-6.0.2.tgz#ec18dd8b5ca43aaee5cb92f7e4c1630e950d4f0c"
integrity sha512-A3uIVLD33SAvB10PfsxLuQBMV8GVC/6xKBMPOvkJchi6251e5AMJ+Yy+RVKsVsnj0iYNhN2E5SkNSi58H19wsw== integrity sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==
dependencies: dependencies:
"@types/concat-stream" "^1.6.0" "@types/concat-stream" "^1.6.0"
"@types/form-data" "0.0.33" "@types/form-data" "0.0.33"
@@ -2465,7 +2465,7 @@ then-request@^5.0.0:
caseless "~0.12.0" caseless "~0.12.0"
concat-stream "^1.6.0" concat-stream "^1.6.0"
form-data "^2.2.0" form-data "^2.2.0"
http-basic "^6.0.0" http-basic "^8.1.1"
http-response-object "^3.0.1" http-response-object "^3.0.1"
promise "^8.0.0" promise "^8.0.0"
qs "^6.4.0" qs "^6.4.0"
@@ -2480,17 +2480,17 @@ tinyqueue@^2.0.0, tinyqueue@^2.0.3:
resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"
integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA== integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==
tldts-core@^7.0.15: tldts-core@^7.0.16:
version "7.0.15" version "7.0.16"
resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-7.0.15.tgz#68b12802db18f65279f647687608bf7fa582fb5b" resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-7.0.16.tgz#f94a42b1f571ee7e4d5c58a4a3486d557b093c14"
integrity sha512-YBkp2VfS9VTRMPNL2PA6PMESmxV1JEVoAr5iBlZnB5JG3KUrWzNCB3yNNkRa2FZkqClaBgfNYCp8PgpYmpjkZw== integrity sha512-XHhPmHxphLi+LGbH0G/O7dmUH9V65OY20R7vH8gETHsp5AZCjBk9l8sqmRKLaGOxnETU7XNSDUPtewAy/K6jbA==
tldts@^7.0.5: tldts@^7.0.5:
version "7.0.15" version "7.0.16"
resolved "https://registry.yarnpkg.com/tldts/-/tldts-7.0.15.tgz#0d08f6145856b016790fe4be27079d53f1c3a5a3" resolved "https://registry.yarnpkg.com/tldts/-/tldts-7.0.16.tgz#8eecb4c15608a23e5b360d64d74f937fb9dbe6aa"
integrity sha512-heYRCiGLhtI+U/D0V8YM3QRwPfsLJiP+HX+YwiHZTnWzjIKC+ZCxQRYlzvOoTEc6KIP62B1VeAN63diGCng2hg== integrity sha512-5bdPHSwbKTeHmXrgecID4Ljff8rQjv7g8zKQPkCozRo2HWWni+p310FSn5ImI+9kWw9kK4lzOB5q/a6iv0IJsw==
dependencies: dependencies:
tldts-core "^7.0.15" tldts-core "^7.0.16"
topojson-client@3.x: topojson-client@3.x:
version "3.1.0" version "3.1.0"
@@ -2535,10 +2535,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
undici-types@~7.12.0: undici-types@~7.13.0:
version "7.12.0" version "7.13.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.12.0.tgz#15c5c7475c2a3ba30659529f5cdb4674b622fafb" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.13.0.tgz#a20ba7c0a2be0c97bd55c308069d29d167466bff"
integrity sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ== integrity sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==
util-deprecate@~1.0.1: util-deprecate@~1.0.1:
version "1.0.2" version "1.0.2"