Whitelabel Tile Server

.circleci/config.yml

@@ -409,6 +409,7 @@ jobs:
       - run:
           name: "Build .deb"
           command: |
+            cp ~/project/docker/martin-config.yaml config.yaml
             cp /tmp/workspace/martin/martin .
             ~/project/scripts/pack_deb.sh -v "0.$CIRCLE_BUILD_NUM" -d "Martin tile server for the Ehrenamtskarte app" -n "eak-martin" -s ~/project/scripts/eak-martin.service -C "/opt/ehrenamtskarte/martin/config.yaml" -M .
       - run:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "backend/ehrenamtskarte-maplibre-style"]
+	path = backend/ehrenamtskarte-maplibre-style
+	url = https://github.com/digitalfabrik/ehrenamtskarte-maplibre-style.git

administration/.env.development

@@ -1 +1 @@
-REACT_APP_API_BASE_URL=http://localhost:7000
+REACT_APP_API_BASE_URL=http://localhost:8000

administration/package.json

@@ -41,7 +41,6 @@
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "protobufjs-cli": "^1.0.2",
-    "run-script-os": "^1.1.6",
     "typescript": "^4.8.3"
   },
   "scripts": {
@@ -52,9 +51,7 @@
     "lint": "eslint . && prettier . --check",
     "format": "prettier . --write",
     "generate-graphql": "graphql-codegen --config graphql-codegen.yml",
-    "generate-protobuf": "run-script-os",
-    "generate-protobuf:linux": "mkdir -p src/generated && pbjs -t static-module -w es6 -o src/generated/protobuf.js ../specs/card_activate_model.proto --force-long && pbts -o src/generated/protobuf.d.ts src/generated/protobuf.js",
-    "generate-protobuf:win32": "mkdir src\\generated | pbjs -t static-module -w es6 -o src\\generated\\protobuf.js ..\\specs\\card_activate_model.proto --force-long | pbts -o src\\generated\\protobuf.d.ts src\\generated\\protobuf.js",
+    "generate-protobuf": "mkdir -p src/generated && pbjs -t static-module -w es6 -o src/generated/protobuf.js ../specs/card_activate_model.proto --force-long && pbts -o src/generated/protobuf.d.ts src/generated/protobuf.js",
     "postinstall": "npm run generate-protobuf && npm run generate-graphql"
   },
   "eslintConfig": {

backend/build.gradle.kts

@@ -78,3 +78,12 @@ tasks.withType<JavaExec>().configureEach {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
 }
+
+tasks.register<Copy>("copyStyle") {
+    from("$rootDir/ehrenamtskarte-maplibre-style/style.json")
+    into("$buildDir/resources/main/")
+}
+
+tasks.named("classes") {
+    dependsOn(tasks.named("copyStyle"))
+}

backend/src/main/kotlin/app/ehrenamtskarte/backend/application/webservice/ApplicationHandler.kt

@@ -0,0 +1,28 @@
+package app.ehrenamtskarte.backend.application.webservice
+
+import app.ehrenamtskarte.backend.auth.webservice.JwtService
+import io.javalin.http.Context
+import java.io.File
+
+class ApplicationHandler(private val applicationData: File) {
+
+    fun getPath(): String {
+        return "/application/{applicationId}/file/{fileIndex}"
+    }
+
+    fun handle(context: Context) {
+        if (JwtService.verifyRequest(context) !== null) {
+            val applicationId = context.pathParam("applicationId")
+            val fileIndex = context.pathParam("fileIndex")
+            val file = File(this.applicationData, "$applicationId/file/$fileIndex")
+            if (!file.isFile) {
+                context.status(404)
+            } else {
+                context.contentType("application/octet-stream")
+                context.result(file.inputStream())
+            }
+        } else {
+            context.status(404)
+        }
+    }
+}

backend/src/main/kotlin/app/ehrenamtskarte/backend/common/webservice/WebService.kt

@@ -1,7 +1,8 @@
 package app.ehrenamtskarte.backend.common.webservice
 
-import app.ehrenamtskarte.backend.application.webservice.registerApplicationJavalinHandler
+import app.ehrenamtskarte.backend.application.webservice.ApplicationHandler
 import app.ehrenamtskarte.backend.config.BackendConfiguration
+import app.ehrenamtskarte.backend.map.webservice.MapStyleHandler
 import io.javalin.Javalin
 import io.javalin.http.staticfiles.Location
 import java.io.File
@@ -50,6 +51,8 @@ class WebService {
         println("Goto http://$host:$port/graphiql/ for a graphical editor")
 
         val graphQLHandler = GraphQLHandler()
+        val mapStyleHandler = MapStyleHandler(config)
+        val applicationHandler = ApplicationHandler(applicationData)
 
         app.post("/") { ctx ->
             if (!production) {
@@ -59,6 +62,16 @@ class WebService {
             graphQLHandler.handle(ctx, applicationData)
         }
 
-        registerApplicationJavalinHandler(app, applicationData)
+        app.get(mapStyleHandler.getPath()) { ctx ->
+            if (!production) {
+                ctx.header("Access-Control-Allow-Headers: Authorization")
+                ctx.header("Access-Control-Allow-Origin: *")
+            }
+            mapStyleHandler.handle(ctx)
+        }
+
+        app.get(applicationHandler.getPath()) { ctx ->
+            applicationHandler.handle(ctx)
+        }
     }
 }

backend/src/main/kotlin/app/ehrenamtskarte/backend/config/BackendConfiguration.kt

@@ -16,13 +16,15 @@ val possibleBackendConfigurationFiles =
     )
 
 data class PostgresConfig(val url: String, val user: String, val password: String)
+data class MapConfig(val baseUrl: String)
 data class GeocodingConfig(val enabled: Boolean, val host: String)
 data class ProjectConfig(val id: String, val importUrl: String, val pipelineName: String)
 data class ServerConfig(val dataDirectory: String, val host: String, val port: String)
 
 data class BackendConfiguration(
     val production: Boolean,
     val server: ServerConfig,
+    val map: MapConfig,
     val postgres: PostgresConfig,
     val geocoding: GeocodingConfig,
     val projects: List<ProjectConfig>

backend/src/main/kotlin/app/ehrenamtskarte/backend/map/webservice/MapStyleHandler.kt

@@ -0,0 +1,90 @@
+package app.ehrenamtskarte.backend.map.webservice
+
+import app.ehrenamtskarte.backend.config.BackendConfiguration
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.ArrayNode
+import com.fasterxml.jackson.databind.node.JsonNodeFactory
+import com.fasterxml.jackson.databind.node.ObjectNode
+import io.javalin.http.Context
+import java.io.BufferedReader
+import java.io.IOException
+
+class MapStyleHandler(config: BackendConfiguration) {
+    private var styles: Map<String, String>
+
+    init {
+        val mapper = ObjectMapper()
+
+        this.styles = config.projects.associate { project ->
+            val style = loadStyle() ?: throw Exception("Unable to parse style.json")
+            val newStyle = patchStyle(style) { id: String, source: JsonNode ->
+                val newSource = source.deepCopy<ObjectNode>()
+
+                val baseUrl = config.map.baseUrl
+
+                if (id == "physical_stores") {
+                    val tiles = ArrayNode(JsonNodeFactory.instance)
+                    tiles.add(baseUrl + "?project_id=" + project.id)
+                    newSource.replace("tiles", tiles)
+                } else if (id == "physical_stores_clustered") {
+                    val tiles = ArrayNode(JsonNodeFactory.instance)
+                    tiles.add(baseUrl + "?clustered=true&project_id=" + project.id)
+                    newSource.replace("tiles", tiles)
+                }
+
+                Pair(id, newSource)
+            }
+
+            val json = mapper.writeValueAsString(newStyle) ?: throw Exception("Failed to create style.json")
+
+            Pair(project.id, json)
+        }
+    }
+
+    private fun patchStyle(
+        style: JsonNode,
+        patcher: (id: String, source: JsonNode) -> Pair<String, JsonNode>
+    ): JsonNode? {
+        val sources = style["sources"] ?: return null
+
+        val newSources = sources.fields().asSequence().map {
+            patcher(it.key, it.value)
+        }.toMap()
+
+        val newSourcesObject = ObjectNode(JsonNodeFactory.instance, newSources)
+
+        val newStyle = style.deepCopy<ObjectNode>() ?: return null
+
+        newStyle.replace("sources", newSourcesObject)
+
+        return newStyle
+    }
+
+    private fun loadStyle(): JsonNode? {
+        val mapper = ObjectMapper()
+        val resource =
+            ClassLoader.getSystemResource("style.json") ?: throw Error("Map style 'style.json' is missing missing!'")
+
+        val reader = BufferedReader(resource.openStream().reader(Charsets.UTF_8))
+        val text = reader.readText()
+        return mapper.readTree(text)
+    }
+
+    fun getPath(): String {
+        return "/project/{project_id}/map"
+    }
+
+    fun handle(context: Context) {
+        try {
+            val projectId: String = context.pathParam("project_id")
+            val style: String = this.styles[projectId]!!
+            context.result(style)
+            context.contentType("application/json")
+        } catch (e: IOException) {
+            context.res().sendError(500)
+        } catch (e: Throwable) {
+            println(e)
+        }
+    }
+}

backend/src/main/kotlin/app/ehrenamtskarte/backend/projects/database/Schema.kt

@@ -1,9 +1,17 @@
 package app.ehrenamtskarte.backend.projects.database
 
+import app.ehrenamtskarte.backend.stores.database.AcceptingStores
+import app.ehrenamtskarte.backend.stores.database.Addresses
+import app.ehrenamtskarte.backend.stores.database.Contacts
+import app.ehrenamtskarte.backend.stores.database.PhysicalStores
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
+import org.jetbrains.exposed.sql.deleteWhere
+import org.jetbrains.exposed.sql.select
 
 object Projects : IntIdTable() {
     val project = varchar("project", 50).uniqueIndex()
@@ -13,4 +21,43 @@ class ProjectEntity(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<ProjectEntity>(Projects)
 
     var project by Projects.project
+
+    fun deleteAssociatedStores() {
+        val project = this
+
+        val acceptingStoresDelete =
+            AcceptingStores.slice(AcceptingStores.id).select { AcceptingStores.projectId eq project.id }
+                .map { it[AcceptingStores.id] }
+
+        val contactsDelete =
+            (AcceptingStores innerJoin Contacts).slice(Contacts.id)
+                .select { AcceptingStores.projectId eq project.id }
+                .map { it[Contacts.id] }
+
+        val physicalStoresDelete =
+            (PhysicalStores innerJoin AcceptingStores).slice(PhysicalStores.id)
+                .select { AcceptingStores.projectId eq project.id }
+                .map { it[PhysicalStores.id] }
+
+        val addressesDelete =
+            ((PhysicalStores innerJoin Addresses) innerJoin AcceptingStores).slice(Addresses.id)
+                .select { AcceptingStores.projectId eq project.id }
+                .map { it[Addresses.id] }
+
+        PhysicalStores.deleteWhere {
+            id inList physicalStoresDelete
+        }
+
+        Addresses.deleteWhere {
+            id inList addressesDelete
+        }
+
+        AcceptingStores.deleteWhere {
+            id inList acceptingStoresDelete
+        }
+
+        Contacts.deleteWhere {
+            id inList contactsDelete
+        }
+    }
 }