Merge branch 'master' into snyk-upgrade-7c1ffa09e26f1133acb5c89d5eefc59c

Author: weskamm

README.md

@@ -1,6 +1,6 @@
 # react-geo-baseclient #
 
-[![Greenkeeper badge](https://badges.greenkeeper.io/terrestris/react-geo-baseclient.svg)](https://greenkeeper.io/)
+
 
 ## FAQ
 

greenkeeper.json

@@ -49,7 +49,7 @@
   "dependencies": {
     "@brainhubeu/react-carousel": "^1.13.40",
     "@terrestris/base-util": "^0.2.2",
-    "@terrestris/mapfish-print-manager": "^5.1.0",
+    "@terrestris/mapfish-print-manager": "^5.2.0",
     "@terrestris/ol-util": "^3.0.1",
     "@terrestris/react-geo": "^11.4.4",
     "@terrestris/vectortiles": "^0.3.0",
@@ -60,15 +60,15 @@
     "moment": "^2.24.0",
     "object-fit-polyfill": "^0.1.0",
     "ol": "^5.3.3",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-i18next": "^11.3.5",
-    "react-redux": "^7.1.3",
+    "react-redux": "^7.2.0",
     "redux": "^4.0.4",
     "redux-async-initial-state": "^0.3.0",
     "redux-thunk": "^2.3.0",
-    "redux-undo": "^1.0.0",
-    "tslib": "^1.11.1"
+    "tslib": "^1.11.1",
+    "redux-undo": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.4",

package-lock.json

@@ -11,17 +11,26 @@
   }
 
   .scalecombo-col {
+    @media only screen and (max-width: 768px) {
+      display: none;
+    }
     float: left;
     > span {
       padding-right: 5px;
     }
 
     .scalecombo {
+      @media only screen and (max-width: 768px) {
+        display: none;
+      }
       width: 150px !important;
     }
   }
 
   .crscombo-col {
+    @media only screen and (max-width: 768px) {
+      display: none;
+    }
     padding-left: 5px;
     > span {
       padding-right: 5px;
@@ -33,6 +42,9 @@
   }
 
   .ol-mouse-position {
+    @media only screen and (max-width: 768px) {
+      display: none;
+    }
     top: 0;
     right: 0;
     position: inherit;
@@ -41,10 +53,18 @@
 
   .imprint {
     justify-content: center;
+
+    @media only screen and (max-width: 768px) {
+      width: 100%;
+      float: right;
+    }
   }
 }
 
 #mouse-position {
+  @media only screen and (max-width: 768px) {
+    display: none;
+  }
   justify-content: flex-start;
   margin-right: 5px;
 }

package.json

@@ -24,6 +24,8 @@ import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
 // default props
 interface DefaultFooterProps {
+  imprintLink: string,
+  imprintText: string
 }
 
 interface FooterProps extends Partial<DefaultFooterProps>{
@@ -73,7 +75,6 @@ export class Footer extends React.Component<FooterProps, FooterState> {
    */
   constructor(props: FooterProps) {
     super(props);
-
     this.setProjection = this.setProjection.bind(this);
   }
 
@@ -194,6 +195,8 @@ export class Footer extends React.Component<FooterProps, FooterState> {
       map,
       mapScales,
       projection,
+      imprintLink,
+      imprintText,
       t
     } = this.props;
 
@@ -238,7 +241,10 @@ export class Footer extends React.Component<FooterProps, FooterState> {
             span={4}
             className="imprint footer-element"
           >
-            <a>{t('Imprint.title')} / {t('Imprint.privacypolicy')}</a>
+            <a
+              href={imprintLink ? imprintLink : 'https://www.terrestris.de/en/impressum'}
+            >
+              {imprintText ? imprintText : `${t('Imprint.title')} / ${t('Imprint.privacypolicy')}`}</a>
           </Col>
         </Row>
       </footer>