diff --git a/.gitignore b/.gitignore index afda252de125f2b994fd520882bd22188b48d830..d4c5e0c3f97f0941a0b78355cfceea61e8ee4c18 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .project .settings .gradle -.vscode bin build classes diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000000000000000000000000000000000..c29927f2c2eab502abdf27a5217048abc9124c58 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,18 @@ +{ + /* + * VS Code recommended extensions for nshmp-haz. + * + * For more information on extension, + * visit: https://code.visualstudio.com/docs/editor/extension-marketplace + */ + "recommendations": [ + "davidanson.vscode-markdownlint", + "editorconfig.editorconfig", + "gitlab.gitlab-workflow", + "jumpinjackie.vscode-map-preview", + "redhat.vscode-yaml", + "timonwong.shellcheck", + "vscjava.vscode-gradle", + "vscjava.vscode-java-pack", + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000000000000000000000000000000000..c32ef434c4bf042c624842f672ca5e014249b7f4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,31 @@ +{ + /* + * VS Code settings for nshmp-haz. + * + * For more information on settings, + * visit: https://code.visualstudio.com/docs/getstarted/settings + */ + "editor.rulers": [ + { + "column": 100 + } + ], + "editor.tabSize": 2, + "files.associations": { + "*.geojson": "json" + }, + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "automatic", + "java.import.generatesMetadataFilesAtProjectRoot": true, + "files.exclude": { + "**/.classpath": true, + "**/.DS_Store": true, + "**/.factorypath": true, + "**/.git": true, + "**/.gradle": true, + "**/.project": true, + "**/.settings": true, + "**/bin": true, + "**/node_modules": true, + } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000000000000000000000000000000000000..99096d8e096148b98495900ccbcda79718e722eb --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,29 @@ +{ + /* + * VS Code tasks for nshmp-haz. + * + * For more information on tasks, visit: https://code.visualstudio.com/docs/editor/tasks + */ + "version": "2.0.0", + "tasks": [ + /* + * Task to automatically run the `./gradlew eclipse` task on startup to + * keep the `.classpath` file updated. + */ + { + "label": "Update Classpath File", + "type": "shell", + "command": "./gradlew eclipse", + "windows": { + "command": "gradle.bat eclipse" + }, + "presentation": { + "close": true, + }, + "group": "none", + "runOptions": { + "runOn": "folderOpen" + } + } + ] +} diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 9e56816220d28aca57fff3b38ba9a908070d282f..5da88c0dc447518eafb7a3f595521b2da16671ba 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -9,67 +9,4 @@ ext { nshmpLibGradleDir = "${nshmpLib}/gradle" spotbugsDir = "${nshmpLib}/gradle" spotlessDir = "${nshmpLib}/src/main/resources" - - /* Multi-model repository paths for version tracking */ - repo_cous_2008 = '../nshm-cous-2008' - repo_cous_2014 = '../nshm-cous-2014' - repo_cous_2014b = '../nshm-cous-2014b' - repo_cous_2018 = '../nshm-cous-2018' - repo_hi_2020 = '../nshm-hi-2020' - repo_ak_2007 = '../nshm-ak-2007' - - /* Explicit model paths */ - model_wus_2008 = "${repo_cous_2008}/Western US" - model_ceus_2008 = "${repo_cous_2008}/Central & Eastern US" - model_wus_2014 = "${repo_cous_2014}/Western US" - model_ceus_2014 = "${repo_cous_2014}/Central & Eastern US" - model_wus_2014b = "${repo_cous_2014b}/Western US" - model_wus_2018 = "${repo_cous_2018}/Western US" - model_ceus_2018 = "${repo_cous_2018}/Central & Eastern US" - model_hi_2020 = "${repo_hi_2020}" - model_ak_2007 = "${repo_ak_2007}" - - /* Production models */ - prod_models = [ - [ - model_ak_2007, - 'models/ak/2007' - ], - [ - model_ceus_2008, - 'models/ceus/2008' - ], - [ - model_wus_2008, - 'models/wus/2008' - ], - [ - model_ceus_2014, - 'models/ceus/2014' - ], - [ - model_wus_2014, - 'models/wus/2014' - ], - [ - model_wus_2014b, - 'models/wus/2014b' - ] - ] - - /* Development models */ - dev_models = [ - [ - model_ceus_2018, - 'models/ceus/2018' - ], - [ - model_wus_2018, - 'models/wus/2018' - ], - [ - model_hi_2020, - 'models/hi/2020' - ] - ] } diff --git a/package-lock.json b/package-lock.json index fd03b78e351745759edce1f4fbeb016a832b3d8b..dc72624ba1f9b5786382c12356add218736ccc4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "nshmp-haz", "version": "2.0.0", "devDependencies": { "markdownlint-cli": "^0.31.1",