You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/21 08:06:35 UTC
[isis] branch master updated: ISIS-2350 cleanup,
Sample for GeoLocation Map (based on OSM/leaflet) added
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 4912950 ISIS-2350 cleanup, Sample for GeoLocation Map (based on OSM/leaflet) added
4912950 is described below
commit 4912950f3abd6169d9968e53639ec8d9db26f54c
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Jun 21 10:06:11 2020 +0200
ISIS-2350 cleanup, Sample for GeoLocation Map (based on OSM/leaflet) added
---
incubator/clients/kroviz/build.gradle.kts | 32 ++++++++++------------
.../kroviz/core/model/DisplayModelWithLayout.kt | 2 --
.../org/apache/isis/client/kroviz/to/Link.kt | 2 --
.../org/apache/isis/client/kroviz/ui/kv/GeoMap.kt | 18 ++++++++++++
.../apache/isis/client/kroviz/ui/kv/RoMenuBar.kt | 7 +++++
.../apache/isis/client/kroviz/utils/IconManager.kt | 1 +
6 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/incubator/clients/kroviz/build.gradle.kts b/incubator/clients/kroviz/build.gradle.kts
index ae893df..913f63c 100644
--- a/incubator/clients/kroviz/build.gradle.kts
+++ b/incubator/clients/kroviz/build.gradle.kts
@@ -56,21 +56,18 @@ kotlin {
runTask {
outputFileName = "main.bundle.js"
devServer = KotlinWebpackConfig.DevServer(
- open = false,
- port = 3000,
- proxy = mapOf(
- "/kv/*" to "http://localhost:8080",
- "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
- ),
- contentBase = listOf("$buildDir/processedResources/Js/main")
+ open = false,
+ port = 3000,
+ proxy = mapOf(
+ "/kv/*" to "http://localhost:8080",
+ "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
+ ),
+ contentBase = listOf("$buildDir/processedResources/Js/main")
)
}
testTask {
-// enabled = true
useKarma {
useChromeHeadless()
-// useCoverage(true, true, true, true, true, true, true, true) // works
-// useConfigDirectory("$projectDir/karma.config.d")
}
}
}
@@ -98,6 +95,7 @@ kotlin {
implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
implementation("pl.treksoft:kvision-pace:$kvisionVersion")
implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+ implementation("pl.treksoft:kvision-maps:$kvisionVersion")
}
sourceSets["test"].dependencies {
implementation(kotlin("test-js"))
@@ -138,7 +136,7 @@ tasks {
doLast {
file("$buildDir/js/Gruntfile.js").run {
writeText(
- """
+ """
module.exports = function (grunt) {
grunt.initConfig({
pot: {
@@ -182,11 +180,11 @@ afterEvaluate {
exec {
executable = getNodeJsBinaryExecutable()
args(
- "$buildDir/js/node_modules/po2json/bin/po2json",
- it.absolutePath,
- "${it.parent}/${it.nameWithoutExtension}.json",
- "-f",
- "jed1.x"
+ "$buildDir/js/node_modules/po2json/bin/po2json",
+ it.absolutePath,
+ "${it.parent}/${it.nameWithoutExtension}.json",
+ "-f",
+ "jed1.x"
)
println("Converted ${it.name} to ${it.nameWithoutExtension}.json")
}
@@ -217,7 +215,7 @@ afterEvaluate {
group = "package"
destinationDirectory.set(file("$buildDir/libs"))
val distribution =
- project.tasks.getByName("browserProductionWebpack", KotlinWebpack::class).destinationDirectory!!
+ project.tasks.getByName("browserProductionWebpack", KotlinWebpack::class).destinationDirectory!!
from(distribution) {
include("*.*")
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt
index 0bbbf03..0b2b2da 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt
@@ -24,8 +24,6 @@ abstract class DisplayModelWithLayout : DisplayModel() {
val pls = propertyLayoutList.size
val pds = propertyDescriptionList.size
val descriptionsComplete = pds >= pls
- console.log("[DMWL.canBeDisplayed] $descriptionsComplete")
- console.log(this)
descriptionsComplete
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt
index 42176f8..e57e175 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt
@@ -20,8 +20,6 @@ data class Link(val rel: String = "",
: TransferObject {
fun argMap(): Map<String, Argument?>? {
- console.log("[Link.argMap]")
- console.log(this)
return when {
arguments.isNotEmpty() -> arguments
args.isNotEmpty() -> args
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/GeoMap.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/GeoMap.kt
new file mode 100644
index 0000000..933e7db
--- /dev/null
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/GeoMap.kt
@@ -0,0 +1,18 @@
+package org.apache.isis.client.kroviz.ui.kv
+
+import pl.treksoft.kvision.maps.maps
+import pl.treksoft.kvision.panel.SimplePanel
+import pl.treksoft.kvision.utils.pc
+import pl.treksoft.kvision.utils.vh
+
+// see -> kvision-kvision-maps.js
+// for 2.5D, buildings see https://osmbuildings.org/documentation/leaflet/
+class GeoMap : SimplePanel() {
+
+ init {
+ maps(53.65425, 10.1545, 15) {
+ width = 100.pc
+ height = 89.vh
+ }
+ }
+}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoMenuBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoMenuBar.kt
index 84edb4d..33e3e11 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoMenuBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoMenuBar.kt
@@ -78,6 +78,13 @@ object RoMenuBar : SimplePanel() {
).onClick {
UiManager.add(chartTitle, ChartFactory().build())
}
+
+ val mapTitle = "Sample Map"
+ ddLink(mapTitle,
+ icon = IconManager.find("Map")
+ ).onClick {
+ UiManager.add(mapTitle, GeoMap())
+ }
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt
index 07db56d..eb12228 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt
@@ -41,6 +41,7 @@ object IconManager {
"List" to "list",
"Log" to "history",
"Manager" to "manager",
+ "Map" to "map",
"Me" to "user",
"Notification" to "bell",
"Notifications" to "bell",