Merge pull request #1314 from Artsdatabanken/vernikon

Ikon for naturvernområde
Artsdatabanken · Apr 25, 2019 · 3629cd0 · 3629cd0
2 parents 0c89fbc + e847561
commit 3629cd0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/src/Kodetre/Kodeliste/Bildeavatar.js b/src/Kodetre/Kodeliste/Bildeavatar.js
@@ -1,4 +1,3 @@
-import typesystem from "@artsdatabanken/typesystem";
 import { Avatar } from "@material-ui/core";
 import { withStyles } from "@material-ui/core/styles";
 import React, { Component } from "react";
@@ -31,9 +30,8 @@ class BildeAvatar extends Component {
     const { farge, farge0, classes, kode, url } = this.props;
     const size = this.props.size || "big";
     const prefiks = kode.substring(0, 2);
-    const parts = typesystem.splittKode(kode);
     const tekst = prefiks;
-    if ("AO_OR".indexOf(prefiks) >= 0 && parts.length > 1)
+    if ("AO,OR,VV".indexOf(prefiks) >= 0)
       return (
         <Avatar
           alt="logo"

diff --git a/src/Kodetre/Kodeliste/Kodelisteelement.js b/src/Kodetre/Kodeliste/Kodelisteelement.js
@@ -55,8 +55,6 @@ class Kodelisteelement extends React.Component {
       areal,
       størsteAreal
     } = this.props;
-    console.log("kodelee", parentkode, opplyst);
-    console.log(`lysOpp(${url}, ${opplyst}, ${meta.farge})`);
     return (
       <>
         <ListItem

diff --git a/src/MainDrawer/GitHub.js b/src/MainDrawer/GitHub.js
@@ -1,7 +1,7 @@
 import SvgIcon from "@material-ui/core/SvgIcon";
 import React from "react";
 
-const GitHub = props => {
+const GitHub = () => {
   return (
     <SvgIcon style={{ fill: "hsla(0, 0%, 0%, 0.54)" }}>
       <path d="M12 .3a12 12 0 0 0-3.8 23.4c.6.1.8-.3.8-.6v-2c-3.3.7-4-1.6-4-1.6-.6-1.4-1.4-1.8-1.4-1.8-1-.7.1-.7.1-.7 1.2 0 1.9 1.2 1.9 1.2 1 1.8 2.8 1.3 3.5 1 0-.8.4-1.3.7-1.6-2.7-.3-5.5-1.3-5.5-6 0-1.2.5-2.3 1.3-3.1-.2-.4-.6-1.6 0-3.2 0 0 1-.3 3.4 1.2a11.5 11.5 0 0 1 6 0c2.3-1.5 3.3-1.2 3.3-1.2.6 1.6.2 2.8 0 3.2.9.8 1.3 1.9 1.3 3.2 0 4.6-2.8 5.6-5.5 5.9.5.4.9 1 .9 2.2v3.3c0 .3.1.7.8.6A12 12 0 0 0 12 .3" />

diff --git a/src/MainDrawer/MainDrawer.js b/src/MainDrawer/MainDrawer.js
@@ -21,13 +21,13 @@ import {
   Landscape,
   BubbleChart,
   Layers,
-  Healing,
   AssignmentInd
 } from "@material-ui/icons";
 import React, { Component } from "react";
 import { withRouter } from "react-router-dom";
 import NavigationChevronLeftDouble from "../Grunnkart/NavigationChevronLeftDouble";
 import BildeAvatar from "../Kodetre/Kodeliste/Bildeavatar";
+import Naturvern from "./Naturvern";
 import GitHub from "./GitHub";
 import Innstillinger from "./Innstillinger";
 
@@ -86,7 +86,7 @@ class MainDrawer extends Component {
                 />
                 <Menyelement
                   onClick={this.handleClickNaturvernområde}
-                  icon={<Healing />}
+                  icon={<Naturvern />}
                   primary="Naturvernområde"
                 />
                 <Menyelement

diff --git a/src/MainDrawer/Naturvern.js b/src/MainDrawer/Naturvern.js
@@ -0,0 +1,11 @@
+import SvgIcon from "@material-ui/core/SvgIcon";
+import React from "react";
+
+const Naturvern = () => {
+  return (
+    <SvgIcon style={{ fill: "hsla(0, 0%, 0%, 0.54)" }}>
+      <path d="m 2.8461255,12.311837 v 9.943137 l 1.1043174,-0.440871 c 0.8260979,-0.333863 3.2658689,-1.181363 3.937876,-1.369696 0.038523,-0.01284 0.051364,-1.331173 0.051364,-6.416169 V 7.629189 h 3.9378751 3.937877 v 5.671398 c 0,3.120338 0.0086,5.671397 0.01284,5.671397 0.0086,0 0.556439,-0.07704 1.211325,-0.171212 1.309772,-0.188333 3.004771,-0.402348 3.56121,-0.449431 l 0.350984,-0.02996 V 10.342899 2.36442 H 11.89896 2.8461255 Z" />
+    </SvgIcon>
+  );
+};
+export default Naturvern;