Mercurial > gemma

changeset 522:8e82936b49f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Bernhard Reiter <bernhard@intevation.de>
date Mon, 27 Aug 2018 17:10:25 +0200
parents e5dab193207a (diff) 139214cecc8f (current diff)
children e86d6e016bbb
files
diffstat 3 files changed, 50 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Map.jsx	Mon Aug 27 17:09:51 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/**
- * Map comonent and integration point with open layers
- * Currently JSX was chosen to have more programmatic control
- * over resulting HTML
- *
- * May change in the future
- *
- */
-
-/*eslint no-unused-vars: ["error", { "args": "none" }]*/
-import "ol/ol.css";
-import { Map, View } from "ol";
-import TileLayer from "ol/layer/Tile";
-import OSM from "ol/source/OSM";
-import TileWMS from "ol/source/TileWMS.js";
-
-export default {
-  render(h) {
-    return <div id="map" />;
-  },
-  data() {
-    return {
-      lat: 6155376,
-      long: 1819178,
-      zoom: 11,
-      projection: "EPSG:3857"
-    };
-  },
-  mounted() {
-    new Map({
-      layers: [
-        new TileLayer({
-          source: new OSM()
-        }),
-        new TileLayer({
-          source: new TileWMS({
-            url: "https://demo.d4d-portal.info/wms",
-            params: { LAYERS: "d4d", VERSION: "1.1.1", TILED: true }
-          })
-        })
-      ],
-      target: "map",
-      view: new View({
-        center: [this.long, this.lat],
-        zoom: this.zoom,
-        projection: this.projection
-      })
-    });
-  }
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/components/Map.vue	Mon Aug 27 17:10:25 2018 +0200
@@ -0,0 +1,46 @@
+<template>
+  <div id="map"></div>
+</template>
+
+<style lang="sass">
+
+</style>
+
+<script>
+import "ol/ol.css";
+import { Map, View } from "ol";
+import TileLayer from "ol/layer/Tile";
+import OSM from "ol/source/OSM";
+import TileWMS from "ol/source/TileWMS.js";
+
+export default {
+  name: "map",
+  props: ["lat", "long", "zoom"],
+  data() {
+    return {
+      projection: "EPSG:3857"
+    };
+  },
+  mounted() {
+    new Map({
+      layers: [
+        new TileLayer({
+          source: new OSM()
+        }),
+        new TileLayer({
+          source: new TileWMS({
+            url: "https://demo.d4d-portal.info/wms",
+            params: { LAYERS: "d4d", VERSION: "1.1.1", TILED: true }
+          })
+        })
+      ],
+      target: "map",
+      view: new View({
+        center: [this.long, this.lat],
+        zoom: this.zoom,
+        projection: this.projection
+      })
+    });
+  }
+};
+</script>
--- a/client/src/views/Main.vue	Mon Aug 27 17:09:51 2018 +0200
+++ b/client/src/views/Main.vue	Mon Aug 27 17:10:25 2018 +0200
@@ -1,7 +1,10 @@
 <template>
   <div class="main d-flex">
     <Sidebar v-bind:isOverlay="true"></Sidebar>
-    <Map></Map>
+    <Map :lat="6155376"
+      :long="1819178"
+      :zoom="11"
+    ></Map>
   </div>
 </template>