Merge branch 'add-google-map'

pme123 · pme123 · commit 4508a6ebc1a8 · 2017-09-13T08:13:53.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -20,16 +20,17 @@ lazy val server = (project in file("server")).settings(
 
 lazy val client = (project in file("client")).settings(
   scalaVersion := scalaV,
-  persistLauncher := true,
+  scalaJSUseMainModuleInitializer := true,
   scalacOptions ++= Seq("-Xmax-classfile-name","78"),
-  persistLauncher in Test := false,
+  scalaJSUseMainModuleInitializer in Test := false,
   addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
   libraryDependencies ++= Seq(
     "org.scala-js" %%% "scalajs-dom" % "0.9.1",
     "org.scala-lang.modules" %% "scala-xml" % "1.0.6",
     "com.thoughtworks.binding" %%% "dom" % "11.0.0-M4",
     "com.thoughtworks.binding" %%% "futurebinding" % "11.0.0-M4",
-    "fr.hmil" %%% "roshttp" % "2.0.2"
+    "fr.hmil" %%% "roshttp" % "2.0.2",
+    "io.surfkit" %%% "scalajs-google-maps" % "0.0.3-SNAPSHOT"
   )
 ).enablePlugins(ScalaJSPlugin, ScalaJSWeb).
   dependsOn(sharedJs)
@@ -43,3 +44,5 @@ lazy val sharedJs = shared.js
 
 // loads the server project at sbt startup
 onLoad in Global := (Command.process("project server", _: State)) compose (onLoad in Global).value
+
+resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
diff --git a/client/src/main/scala/example/ScalaJSExample.scala b/client/src/main/scala/example/ScalaJSExample.scala
@@ -1,46 +1,24 @@
 package example
 
-import com.thoughtworks.binding.Binding.Var
-import com.thoughtworks.binding.{Binding, dom}
-import org.scalajs.dom.document
-import org.scalajs.dom.ext.Ajax
-import org.scalajs.dom.raw.{Event, HTMLElement}
-
-import scala.scalajs.concurrent.JSExecutionContext.Implicits.queue
+import google.maps.LatLng
+import org.scalajs.dom.{document, window}
 import scala.scalajs.js
-import scala.scalajs.js.JSON
-
-
 
 object ScalaJSExample extends js.JSApp {
 
-  implicit def makeIntellijHappy(x: scala.xml.Elem): Binding[HTMLElement] = ???
-
-  /**
-    * Ajax Request to server, updates data state with number
-    * of requests to count.
-    * @param data
-    */
-  def countRequest(data: Var[String]) = {
-    val url = "https://localhost:9000/count"
-    Ajax.get(url).foreach { case xhr =>
-      data.value = JSON.parse(xhr.responseText).count.toString
+  def main(): Unit = {
+    val initialize = js.Function {
+      val opts = google.maps.MapOptions(
+        center = new LatLng(51.201203, -1.724370),
+        zoom = 8,
+        panControl = false,
+        streetViewControl = false,
+        mapTypeControl = false)
+      new google.maps.Map(document.getElementById("map-canvas"), opts)
+      "" // this function needs a String as return type?!
     }
-  }
 
-  @dom
-  def render = {
-    val data = Var("")
-    countRequest(data) // initial population
-    <div>
-      <button onclick={event: Event => countRequest(data) }>
-        Boop
-      </button>
-      From Play: The server has been booped { data.bind } times. Shared Message: {shared.SharedMessages.itWorks}.
-    </div>
+    google.maps.event.addDomListener(window, "load", initialize)
   }
 
-  def main(): Unit = {
-    dom.render(document.body, render)
-  }
 }
diff --git a/server/app/views/index.scala.html b/server/app/views/index.scala.html
@@ -1,6 +1,8 @@
 @(message: String)
 
 @main("Play with Scala.js") {
+    <div id="map-canvas"></div>
+
   @scalajs.html.scripts("client",
     routes.Assets.versioned(_).toString,
     name => getClass.getResource(s"/public/$name") != null)
diff --git a/server/app/views/main.scala.html b/server/app/views/main.scala.html
@@ -7,6 +7,7 @@
     <title>@title</title>
     <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("stylesheets/main.css")">
     <link rel="shortcut icon" type="image/png" href="@routes.Assets.versioned("images/favicon.png")">
+    <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=API_KEY"></script>
   </head>
   <body>
    @content
diff --git a/server/public/stylesheets/main.css b/server/public/stylesheets/main.css
@@ -0,0 +1,4 @@
+#map-canvas {
+    width: 100%;
+    height: 800px;
+}
