Dependencies update, ol 6

package.json

@@ -24,9 +24,9 @@
   },
   "homepage": "https://gp.sookoll.ee",
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "babel-eslint": "^10.0.2",
+    "@babel/core": "^7.6.2",
+    "@babel/preset-env": "^7.6.2",
+    "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "clean-webpack-plugin": "^0.1.19",
     "copy-webpack-plugin": "^4.6.0",
@@ -37,21 +37,21 @@
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^7.0.1",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-standard": "^4.0.1",
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
     "mini-css-extract-plugin": "^0.4.5",
     "style-loader": "^0.23.1",
-    "stylus": "^0.54.5",
+    "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
-    "webpack": "^4.37.0",
-    "webpack-cli": "^3.3.6",
-    "webpack-dev-server": "^3.7.2",
+    "webpack": "^4.41.0",
+    "webpack-cli": "^3.3.9",
+    "webpack-dev-server": "^3.8.1",
     "webpack-pwa-manifest": "^4.0.0",
     "workbox-webpack-plugin": "^3.6.3"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.9.0",
+    "@fortawesome/fontawesome-free": "^5.11.2",
     "@mapbox/polyline": "^1.1.0",
     "@turf/line-slice-along": "^5.1.5",
     "bootstrap": "^4.3.1",
@@ -63,11 +63,11 @@
     "mgrs": "^1.0.0",
     "mini-toastr": "^0.8.1",
     "nosleep.js": "^0.7.0",
-    "ol": "^5.3.3",
+    "ol": "^6.0.0-beta.15",
     "popper.js": "^1.15.0",
     "proj4": "^2.5.0",
     "qrious": "^4.0.2",
     "randomcolor": "^0.5.4",
-    "sortablejs": "^1.9.0"
+    "sortablejs": "^1.10.0"
   }
 }

src/config/settings.js

@@ -45,7 +45,7 @@ export const apiUrls = {
   },
   wmsexamples: {
     'Kataster': 'http://kaart.maaamet.ee/wms/alus?layers=TOPOYKSUS_6569,TOPOYKSUS_7793&SRS=EPSG:3301&title=Kataster',
-    'Looduskaitse': 'https://gsavalik.envir.ee/geoserver/eelis/ows?layers=kr_kaitseala,kr_hoiuala,kr_hooldatav_skv,kr_looduslik_skv,kr_reservaat,kr_ramsar,kr_vep,plk,kr_kohalik_objekt_pv,kr_yksikobjekti_kaitsetsoon,kr_kohalik_objekt,kr_yksikobjektid&SRS=EPSG:3301&opacity=0.9&title=Looduskaitse',
+    'Looduskaitse': 'https://gsavalik.envir.ee/geoserver/eelis/ows?layers=kr_kaitseala,kr_hoiuala,kr_hooldatav_skv,kr_looduslik_skv,kr_reservaat,kr_vep,plk,kr_kohalik_objekt_pv,kr_yksikobjekti_kaitsetsoon,kr_kohalik_objekt,kr_yksikobjektid&SRS=EPSG:3301&opacity=0.9&title=Looduskaitse',
     'Pärandkultuur': 'https://gsavalik.envir.ee/geoserver/eelis/ows?layers=pk_objekt_metsas&SRS=EPSG:3301&title=Pärandkultuur'
   }
 }

src/geop/components/layer/FileLayer.js

@@ -4,7 +4,7 @@ import { getState } from 'Utilities/store'
 import log from 'Utilities/log'
 import { createLayer, dataProjection } from './LayerCreator'
 import Component from 'Geop/Component'
-import GPXFormat from './GPXFormat'
+import GPXFormat from 'Utilities/GPXFormat'
 import GeoJSONFormat from 'ol/format/GeoJSON'
 import KMLFormat from 'ol/format/KML'
 import DragAndDrop from 'ol/interaction/DragAndDrop'
@@ -106,7 +106,6 @@ class FileLayer extends Component {
         const conf = this.fileTypes.geojson.writeFeaturesObject(e.features)
         conf.title = e.file.name
         const layer = this.createLayer(conf)
-        console.log(layer.get('conf').color)
         if (layer) {
           this.state.layers.push(layer)
           log('success', `${t('Added')} ${conf.features.length} ${t('features')}`)

src/geop/components/layer/WMSLayer.js

@@ -143,7 +143,7 @@ class WMSLayer extends Component {
       conf.url = constructURL(urlComponents)
       conf.id = uid()
       conf.title = urlComponents.query.title || conf.params.LAYERS
-      conf.opacity = urlComponents.query.opacity || 1
+      conf.opacity = Number(urlComponents.query.opacity) || 1
       conf.crossOrigin = 'anonymous'
       return createLayer(conf)
     } else {

src/geop/components/map/MapEngine.js

@@ -121,19 +121,6 @@ class MapEngine extends Component {
         })
       })
     })
-    /* this.map.on('pointermove', e => {
-      if (e.dragging) {
-        return
-      }
-      const pixel = this.map.getEventPixel(e.originalEvent)
-      const hit = this.map.forEachLayerAtPixel(pixel, () => true, {
-        layerFilter: layer => {
-          return !!this.getLayer('layers', layer.get('id'))
-        }
-      })
-      console.log(hit)
-      this.el.css('cursor', hit ? 'pointer' : '')
-    }) */
     // run que
     const que = getState('map/que')
     que.forEach(item => {

src/geop/components/layer/GPXFormat.js → src/geop/utilities/GPXFormat.js

@@ -3,7 +3,7 @@ import Point from 'ol/geom/Point'
 import LineString from 'ol/geom/LineString'
 import MultiLineString from 'ol/geom/MultiLineString'
 import Feature from 'ol/Feature'
-import { transformWithOptions } from 'ol/format/Feature'
+import { transformGeometryWithOptions } from 'ol/format/Feature'
 import GeometryLayout from 'ol/geom/GeometryLayout'
 import { includes } from 'ol/array'
 import { makeStructureNS, makeObjectPropertySetter, parseNode, pushParseAndPop,
@@ -193,7 +193,7 @@ function readWpt (node, objectStack) {
   const coordinates = appendCoordinate([], layoutOptions, node, values)
   const layout = applyLayoutOptions(layoutOptions, coordinates)
   const geometry = new Point(coordinates, layout)
-  transformWithOptions(geometry, false, options)
+  transformGeometryWithOptions(geometry, false, options)
   const feature = new Feature(geometry)
   feature.setProperties(values)
   feature.set('wpt', xml2js(node))
@@ -289,7 +289,7 @@ function readRte (node, objectStack) {
   delete values['layoutOptions']
   const layout = applyLayoutOptions(layoutOptions, flatCoordinates)
   const geometry = new LineString(flatCoordinates, layout)
-  transformWithOptions(geometry, false, options)
+  transformGeometryWithOptions(geometry, false, options)
   const feature = new Feature(geometry)
   feature.setProperties(values)
   return feature
@@ -318,7 +318,7 @@ function readTrk (node, objectStack) {
   delete values['layoutOptions']
   const layout = applyLayoutOptions(layoutOptions, flatCoordinates, ends)
   const geometry = new MultiLineString(flatCoordinates, layout, ends)
-  transformWithOptions(geometry, false, options)
+  transformGeometryWithOptions(geometry, false, options)
   const feature = new Feature(geometry)
   feature.setProperties(values)
   return feature