From 7cb10e1e65b41dcbfdbf5097c4197dae4810a6a0 Mon Sep 17 00:00:00 2001
From: Jussi Surma-Aho <L4929@student.jamk.fi>
Date: Thu, 6 Jun 2019 10:19:30 +0300
Subject: [PATCH] Tiny changes for the mock-up screenshot
---
src/App.js | 4 ----
src/components/DrawTools.js | 20 +++++++++++++-------
src/components/UserMap.js | 3 +--
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/App.js b/src/App.js
index 166c95f..7f1245d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -25,8 +25,4 @@ class App extends Component {
}
}
-function onChange(geojson) {
- console.log("geojson changed", geojson);
-}
-
export default App;
diff --git a/src/components/DrawTools.js b/src/components/DrawTools.js
index 2d0b701..23fb46a 100644
--- a/src/components/DrawTools.js
+++ b/src/components/DrawTools.js
@@ -1,10 +1,7 @@
import React, {Component} from 'react';
import {Â EditControl } from "react-leaflet-draw"
-import L from 'leaflet';
import {
FeatureGroup,
- GeoJSON,
- Marker
} from 'react-leaflet'
class DrawTools extends Component {
@@ -12,7 +9,7 @@ class DrawTools extends Component {
let type = e.layerType;
let layer = e.layer;
let geoJSON = layer.toGeoJSON();
- console.log(JSON.stringify(geoJSON, null, 4));
+ console.log(JSON.stringify(geoJSON, null, 4)); // makes the output readable in the console
this._onChange();
}
@@ -25,7 +22,11 @@ class DrawTools extends Component {
onCreated={this._onCreated}
draw={{
circle: {
- repeatMode: true // allows using the tool again after finishing the previous shape
+ repeatMode: true, // allows using the tool again after finishing the previous shape
+ shapeOptions: {
+ color: '#f9f10c',
+ opacity: 100
+ }
},
rectangle: {
repeatMode: true
@@ -38,11 +39,16 @@ class DrawTools extends Component {
message: '<strong>Oh snap!<strong> you can\'t draw that!' // Message that will show when intersect
},
shapeOptions: {
- color: '#97009c'
+ color: '#ed2572',
+ opacity: 100
}
},
polyline: {
- repeatMode: true
+ repeatMode: true,
+ shapeOptions: {
+ color: '#ed2572',
+ opacity: 100
+ }
},
marker: {
repeatMode: true
diff --git a/src/components/UserMap.js b/src/components/UserMap.js
index fc66dc9..40bc423 100644
--- a/src/components/UserMap.js
+++ b/src/components/UserMap.js
@@ -1,6 +1,5 @@
import React, {Component} from 'react';
import {
- GeoJSON,
Map,
TileLayer,
ZoomControl
@@ -18,7 +17,7 @@ class UserMap extends Component {
>
<TileLayer
attribution='Maanmittauslaitoksen kartta'
- url=" https://tiles.kartat.kapsi.fi/taustakartta/{z}/{x}/{y}.jpg"
+ url=" https://tiles.kartat.kapsi.fi/peruskartta/{z}/{x}/{y}.png"
/>'
<ZoomControl position='topright' />
<DrawTools position={this.props.position} />
--
GitLab