Removed unneeded diagram height extractor cod from a previous itterat…

…ion.
avisi-cloud · Oct 20, 2023 · fe4478d · fe4478d
1 parent 4de7676
commit fe4478d
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 19 deletions.
diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/SiteGenerator.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/SiteGenerator.kt
@@ -19,7 +19,6 @@ fun copySiteWideAssets(exportDir: File) {
     copySiteWideAsset(exportDir, "/css/admonition.css")
     copySiteWideAsset(exportDir, "/js/admonition.js")
     copySiteWideAsset(exportDir, "/js/reformat-mermaid.js")
-    copySiteWideAsset(exportDir, "/js/svg-pan-zoom.js")
     copySiteWideAsset(exportDir, "/js/svg-pan-zoom-modal.js")
     copySiteWideAsset(exportDir, "/css/treeview.css")
     copySiteWideAsset(exportDir, "/js/treeview.js")

diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/DiagramViewModel.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/DiagramViewModel.kt
@@ -7,7 +7,6 @@ data class DiagramViewModel(
     val name: String,
     val svg: String?,
     val diagramWidthInPixels: Int?,
-    val diagramHeightInPixels: Int?,
     val svgLocation: ImageViewModel,
     val pngLocation: ImageViewModel,
     val pumlLocation: ImageViewModel
@@ -27,7 +26,6 @@ data class DiagramViewModel(
                 name,
                 svg,
                 extractDiagramWidthInPixels(svg),
-                extractDiagramHeightInPixels(svg),
                 ImageViewModel(pageViewModel, "/svg/${key}.svg"),
                 ImageViewModel(pageViewModel, "/png/${key}.png"),
                 ImageViewModel(pageViewModel, "/puml/${key}.puml")
@@ -41,13 +39,5 @@ data class DiagramViewModel(
                     ?.let { it.groupValues[1].toInt() }
                     ?: throw IllegalStateException("No viewBox attribute found in SVG!")
             else null
-
-        private fun extractDiagramHeightInPixels(svg: String?) =
-            if (svg != null)
-                "viewBox=\"\\d+ \\d+ \\d+ (\\d+)\"".toRegex()
-                    .find(svg)
-                    ?.let { it.groupValues[1].toInt() }
-                    ?: throw IllegalStateException("No viewBox attribute found in SVG!")
-            else null
     }
 }
diff --git a/...nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemComponentPageViewModelTest.kt b/...nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemComponentPageViewModelTest.kt
@@ -34,7 +34,6 @@ class SoftwareSystemComponentPageViewModelTest : ViewModelTest() {
                 "Software system - Backend - Components",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/component-1.svg"),
                 ImageViewModel(viewModel, "/png/component-1.png"),
                 ImageViewModel(viewModel, "/puml/component-1.puml")
@@ -44,7 +43,6 @@ class SoftwareSystemComponentPageViewModelTest : ViewModelTest() {
                 "Software system - Backend - Components",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/component-2.svg"),
                 ImageViewModel(viewModel, "/png/component-2.png"),
                 ImageViewModel(viewModel, "/puml/component-2.puml")

diff --git a/...nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerPageViewModelTest.kt b/...nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerPageViewModelTest.kt
@@ -33,7 +33,6 @@ class SoftwareSystemContainerPageViewModelTest : ViewModelTest() {
                 "Software system - Containers",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/container-1.svg"),
                 ImageViewModel(viewModel, "/png/container-1.png"),
                 ImageViewModel(viewModel, "/puml/container-1.puml")
@@ -43,7 +42,6 @@ class SoftwareSystemContainerPageViewModelTest : ViewModelTest() {
                 "Software system - Containers",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/container-2.svg"),
                 ImageViewModel(viewModel, "/png/container-2.png"),
                 ImageViewModel(viewModel, "/puml/container-2.puml")

diff --git a/...n/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContextPageViewModelTest.kt b/...n/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContextPageViewModelTest.kt
@@ -24,7 +24,6 @@ class SoftwareSystemContextPageViewModelTest : ViewModelTest() {
                 "Software system - System Context",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/context-1.svg"),
                 ImageViewModel(viewModel, "/png/context-1.png"),
                 ImageViewModel(viewModel, "/puml/context-1.puml")
@@ -34,7 +33,6 @@ class SoftwareSystemContextPageViewModelTest : ViewModelTest() {
                 "Software system - System Context",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/context-2.svg"),
                 ImageViewModel(viewModel, "/png/context-2.png"),
                 ImageViewModel(viewModel, "/puml/context-2.puml")

diff --git a/...l/avisi/structurizr/site/generatr/site/model/SoftwareSystemDeploymentPageViewModelTest.kt b/...l/avisi/structurizr/site/generatr/site/model/SoftwareSystemDeploymentPageViewModelTest.kt
@@ -33,7 +33,6 @@ class SoftwareSystemDeploymentPageViewModelTest : ViewModelTest() {
                 "Software system - Deployment - Default",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/deployment-1.svg"),
                 ImageViewModel(viewModel, "/png/deployment-1.png"),
                 ImageViewModel(viewModel, "/puml/deployment-1.puml")
@@ -43,7 +42,6 @@ class SoftwareSystemDeploymentPageViewModelTest : ViewModelTest() {
                 "Software system - Deployment - Default",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
-                900,
                 ImageViewModel(viewModel, "/svg/deployment-2.svg"),
                 ImageViewModel(viewModel, "/png/deployment-2.png"),
                 ImageViewModel(viewModel, "/puml/deployment-2.puml")