Fix web app build

Update layer ordering of route and stops
dellisd · Mar 30, 2024 · c7d7211 · c7d7211
1 parent 49330fb
commit c7d7211
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,7 @@
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
+
 plugins {
   alias(libs.plugins.kotlin.multiplatform) apply false
   alias(libs.plugins.kotlin.jvm) apply false
@@ -23,3 +27,7 @@ spotless {
     endWithNewline()
   }
 }
+
+plugins.withType(YarnPlugin::class.java) {
+  the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.WARNING
+}
diff --git a/web/Dockerfile b/web/Dockerfile
@@ -3,7 +3,7 @@ FROM gradle:jdk17 AS builder
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 
-RUN gradle :web:jsBrowserWebpack
+RUN gradle :web:jsBrowserDistribution
 
 FROM nginx:1.23.0
 

diff --git a/web/src/jsMain/kotlin/ca/derekellis/reroute/map/MapView.kt b/web/src/jsMain/kotlin/ca/derekellis/reroute/map/MapView.kt
@@ -83,6 +83,16 @@ private fun MapContent(
         }
       },
     ) {
+      val routeGeojson = remember(routeFeatures) {
+        JSON.parse<GeoJsonObject>(FeatureCollection(routeFeatures.toList()).json())
+      }
+      GeoJsonSource("routes", routeGeojson) {
+        LineLayer("route-lines") {
+          lineWidth(5.0)
+          lineColor(get("color"))
+        }
+      }
+
       GeoJsonSource("stops", url = "/api/data/geojson") {
         CircleLayer("stop-circles") {
           circleColor(hsl(4.1, 89.6, 58.4))
@@ -96,16 +106,6 @@ private fun MapContent(
           )
         }
       }
-
-      val routeGeojson = remember(routeFeatures) {
-        JSON.parse<GeoJsonObject>(FeatureCollection(routeFeatures.toList()).json())
-      }
-      GeoJsonSource("routes", routeGeojson) {
-        LineLayer("route-lines") {
-          lineWidth(5.0)
-          lineColor(get("color"))
-        }
-      }
     }
   }
 }