Yeti updates (#895)

c2corg · Nov 30, 2019 · 3b1c162 · 3b1c162
1 parent d12348c
commit 3b1c162
Show file tree

Hide file tree

Showing 5 changed files with 154 additions and 63 deletions.
diff --git a/src/components/map/OlMap.vue b/src/components/map/OlMap.vue
@@ -379,8 +379,6 @@
         // keyboardEventTarget: this.keyboardEventTarget,
       });
 
-      this.view.on('change:resolution', this.onChangeResolution);
-
       this.map.on('moveend', this.sendBoundsToUrl);
       this.map.on('moveend', this.getBiodivSportsAreas);
       if (this.protectionAreasVisible) {
@@ -702,15 +700,6 @@
         return extent;
       },
 
-      onChangeResolution(event) {
-        const zoom = event.target.getZoom();
-
-        // we do not fire event for intermediate zoom
-        if (zoom === parseInt(zoom, 10)) {
-          this.$emit('zoom', zoom);
-        }
-      },
-
       onPointerMove(event) {
         let resultFeature = null;
 

diff --git a/src/components/yeti/ValidationButton.vue b/src/components/yeti/ValidationButton.vue
@@ -9,7 +9,6 @@
     </button>
     <p class="yetiForm-error" v-if="currentError">
       <span>
-        <strong>Info: </strong>
         {{ currentError }}
       </span>
     </p>
@@ -43,4 +42,17 @@
   opacity: 0.75;
 }
 
+.yetiForm-error span::before {
+  content: 'i';
+  display: inline-block;
+  width: 1rem;
+  height: 1rem;
+  background: rgba(0,60,136,0.5);
+  color: #fff;
+  border-radius: 50%;
+  font-size: 0.71rem;
+  font-weight: bold;
+  text-align: center;
+}
+
 </style>
diff --git a/src/js/libs/ol.js b/src/js/libs/ol.js
@@ -14,7 +14,7 @@ import ImageStatic from 'ol/source/ImageStatic';
 
 import WMTSTileGrid from 'ol/tilegrid/WMTS';
 
-import { Point, Polygon } from 'ol/geom';
+import { LineString, Point, Polygon } from 'ol/geom';
 
 import { Icon, Style, Circle, Fill, Stroke, Text } from 'ol/style';
 
@@ -77,6 +77,7 @@ export default {
   },
 
   geom: {
+    LineString,
     Point,
     Polygon
   },

diff --git a/src/views/document/utils/boxes/MapBox.vue b/src/views/document/utils/boxes/MapBox.vue
@@ -64,7 +64,7 @@
       showYetiButton() {
         // at least one of document activities is concerned by yeti
 
-        if (!this.document || !this.document.activities) {
+        if (!this.document || this.documentType !== 'route' || !this.document.activities) {
           return false;
         }