Merge 2037714 into 3a1a566

openwisp · Jun 13, 2022 · 99474d2 · 99474d2
2 parents 3a1a566 + 2037714
commit 99474d2
Show file tree

Hide file tree

Showing 20 changed files with 1,321 additions and 1,414 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,11 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,9 +1,15 @@
 module.exports = {
-  "extends": ["airbnb", "prettier"],
-  "rules": {},
-  "env": {
-    "jest": true,
-    "browser": true,
-    "es6": true,
-  }
+  extends: ["airbnb", "prettier"],
+  rules: {
+    "no-underscore-dangle": "off",
+    "no-plusplus": "off",
+    "no-param-reassign": "off",
+    "class-methods-use-this": "off",
+    "no-restricted-syntax": "off",
+  },
+  env: {
+    jest: true,
+    browser: true,
+    es6: true,
+  },
 };
diff --git a/README.md b/README.md
diff --git a/examples/netjsonmap.html b/examples/netjsonmap.html
@@ -26,9 +26,14 @@
                     offset: [0, -10],
                 }
             },
-            mapTileConfig: ["http://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}", {
-                minZoom: 0.25, 
-                maxZoom: 18,
+            mapTileConfig: [{
+                label: "Blue Street",
+                urlTemplate: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+                options: {
+                    minZoom: 2, 
+                    maxZoom: 20,
+                    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+                }
             }],
             mapOptions: {
                 center: [46.86764405052012, 19.675998687744144],

diff --git a/package.json b/package.json
@@ -8,7 +8,8 @@
     "dev": "webpack-dev-server --open --hot --mode development",
     "start": "yarn dev",
     "build": "webpack --progress --hide-modules --mode production",
-    "coverage": "yarn test -- --coverage && cat ./coverage/lcov.info | coveralls",
+    "coverage": "jest --coverage",
+    "coveralls": "test -f ./coverage/lcov.info && cat ./coverage/lcov.info | coveralls || echo 'no coverage file found'",
     "precommit": "lint-staged",
     "lint": "eslint --ext .js src",
     "lint:fix": "eslint --fix --ext .js src",
@@ -36,7 +37,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.4.4",
     "acorn": "^6.0.0",
-    "coveralls": "^3.0.3",
+    "coveralls": "^3.1.1",
     "eslint": "^8.17.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.5.0",
@@ -45,14 +46,15 @@
     "eslint-plugin-react": "^7.30.0",
     "husky": "^0.14.3",
     "jest": "^24.8.0",
-    "prettier": "^2.6.2",
     "lint-staged": "^7.2.2",
+    "prettier": "^2.6.2",
     "webpack": "^4.17.2",
     "webpack-cli": "^3.1.0",
     "webpack-dev-server": "^3.1.7"
   },
   "dependencies": {
     "echarts": "^4.2.1",
-    "leaflet": "^1.5.1"
+    "leaflet": "^1.5.1",
+    "zrender": "^5.3.2"
   }
 }
diff --git a/src/css/netjsongraph-theme.css b/src/css/netjsongraph-theme.css
@@ -1,142 +1,145 @@
-h3{
-    display: block;
-    font-size: 1.17em;
-    margin-block-start: 1em;
-    margin-block-end: 1em;
-    margin-inline-start: 0px;
-    margin-inline-end: 0px;
-    font-weight: bold;
+h3 {
+  display: block;
+  font-size: 1.17em;
+  margin-block-start: 1em;
+  margin-block-end: 1em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+  font-weight: bold;
 }
 
 p {
-    display: block;
-    margin-block-start: 1em;
-    margin-block-end: 1em;
-    margin-inline-start: 0px;
-    margin-inline-end: 0px;
+  display: block;
+  margin-block-start: 1em;
+  margin-block-end: 1em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
 }
 
-#njg-indoorImgInput{
-    position: absolute;
-    right: 70px;
-    top: 20px;
-    width: 150px;
-    z-index: 1;
-}
-
-.switch-wrap{
-    position: absolute;
-    left: 50px;
-    bottom: 45px;
-    z-index: 1;
+#njg-indoorImgInput {
+  position: absolute;
+  right: 70px;
+  top: 20px;
+  width: 150px;
+  z-index: 1;
 }
 
-.switch-wrap input[type="checkbox"]{
-    height: 25px;
-    width: 60px;
-    opacity: 0;
-    margin:0;
-    padding:0;
-    position: absolute;
-    left: 5em;
-    top: 0;
-    z-index: 1;
-    cursor: pointer;
-}
-.switch-wrap label{
-    display: inline-block;
-    width: 60px;
-    height: 25px;
-    border: 1px solid #DFDFDF;
-    outline: none;
-    border-radius: 16px;
-    box-sizing: border-box;
-    background: #FFFFFF;
-    cursor: pointer;
-    transition: border-color .3s,background-color .3s;
-    vertical-align: middle;
-    position: relative;
-    margin: 0 5px;
+.switch-wrap {
+  position: absolute;
+  left: 50px;
+  bottom: 45px;
+  z-index: 1;
+}
+
+.switch-wrap input[type="checkbox"] {
+  height: 25px;
+  width: 60px;
+  opacity: 0;
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  left: 5em;
+  top: 0;
+  z-index: 1;
+  cursor: pointer;
+}
+.switch-wrap label {
+  display: inline-block;
+  width: 60px;
+  height: 25px;
+  border: 1px solid #dfdfdf;
+  outline: none;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background: #ffffff;
+  cursor: pointer;
+  transition: border-color 0.3s, background-color 0.3s;
+  vertical-align: middle;
+  position: relative;
+  margin: 0 5px;
 }
 .switch-wrap label::before {
-    content: '';
-    position: absolute;
-    top: 1px;
-    left: 2px;
-    transition: transform 0.3s;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    box-shadow: 0 1px 3px rgba(0,0,0,1);
-    background-color: #fff;
+  content: "";
+  position: absolute;
+  top: 1px;
+  left: 2px;
+  transition: transform 0.3s;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 1);
+  background-color: #fff;
 }
 .switch-wrap input[type="checkbox"]:checked + label {
-    background: grey;
+  background: grey;
 }
 .switch-wrap input[type="checkbox"]:checked + label:before {
-    transform: translateX(34px);
+  transform: translateX(34px);
 }
-.njg-date{
-    position: absolute;
-    right: 0;
-    bottom: 20px;
-    z-index: 1;
+.njg-date {
+  position: absolute;
+  right: 0;
+  bottom: 20px;
+  z-index: 1;
 }
 
 @font-face {
-    font-family: "iconfont";
-    src: url('iconfont.eot?t=1554537125905'); /* IE9 */
-    src: url('iconfont.eot?t=1554537125905#iefix') format('embedded-opentype'), /* IE6-IE8 */
-    url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALUAAsAAAAABoQAAAKGAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAqBEIEuATYCJAMICwYABCAFhG0HLRvRBcguoRzbUaRIzQw73HPLf7QTlBZ2D/IcIqjWsJ69DaJClJGADlmhijCpCBUFUgELGaHg/4X/3P9am73DJNR5j3rniUuYJZWV+Sv+d1DrkBIhatJGhdBMSonZDe5mGYwm3qYronsgVPRfaegmrtP2H/dOG0u7QOYDymWugZ+6AOOtgY41KLISyrjHcAqrwkXmf5xApQ4ZykLfyDjUyWhcIC5sU4W6gk+W5WS5UNqwNItbJcrTdQrcRN+Pf0pRR1JSoLK1814DOr6Kp7H/u+8oQPETcHUJCowBmdhqjK1IC5mSVhmr0gOOVRx81QcGcVStkP86KqwGbcB7Jr4neNTCBDL0jgKLk9zkWpoZV083Lk3aU+QEjguciAOc6rXwcih7x22pDzGBTA58/6i7Kf9X4OyAnUy7Lf+SwMWzebmVOkI2slFyqJCVI4UN6dZul2us9Ehnd6SGqrxTzKCfFY+pPRQE/8sGl1onvrwqg8/d6kiTDXOA8kvZg7+MP7AmW0JSppPz0J6M5rIkVFpOv8jV6GWqquX5LKG8wJchKdMOhXJ96IwfgxJVxqFUuWmoNKp/dZUmUlrkCow4YRDqnUNS6x4K9R7RGf8MJVq9Qqn6SEOlnWjasspA2A3zklQmA7UNtPUwEK6RG+LiUTJXPFXmhRF1kmRiB7GYK5ST/RSQXGJGsmqWmAUKGfrYx04jzwsxkqFDOucs5qiSz4umN+X00IcG8ySiYsSANBuQTRcKiKAxa6h8fhQxrfCoZAeiyTqJSAm7f1SUUxiA7pcFgxCP8kpilamEMQEJUsiH+tgg4vGEUNQ8yEF0LMeaEIlU5Hk9MVSW217h/7pNUInUKXhVobhUAwAAAA==') format('woff2'),
-    url('iconfont.woff?t=1554537125905') format('woff'),
-    url('iconfont.ttf?t=1554537125905') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-    url('iconfont.svg?t=1554537125905#iconfont') format('svg'); /* iOS 4.1- */
+  font-family: "iconfont";
+  src: url("iconfont.eot?t=1554537125905"); /* IE9 */
+  src: url("iconfont.eot?t=1554537125905#iefix") format("embedded-opentype"),
+    /* IE6-IE8 */
+      url("data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALUAAsAAAAABoQAAAKGAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAqBEIEuATYCJAMICwYABCAFhG0HLRvRBcguoRzbUaRIzQw73HPLf7QTlBZ2D/IcIqjWsJ69DaJClJGADlmhijCpCBUFUgELGaHg/4X/3P9am73DJNR5j3rniUuYJZWV+Sv+d1DrkBIhatJGhdBMSonZDe5mGYwm3qYronsgVPRfaegmrtP2H/dOG0u7QOYDymWugZ+6AOOtgY41KLISyrjHcAqrwkXmf5xApQ4ZykLfyDjUyWhcIC5sU4W6gk+W5WS5UNqwNItbJcrTdQrcRN+Pf0pRR1JSoLK1814DOr6Kp7H/u+8oQPETcHUJCowBmdhqjK1IC5mSVhmr0gOOVRx81QcGcVStkP86KqwGbcB7Jr4neNTCBDL0jgKLk9zkWpoZV083Lk3aU+QEjguciAOc6rXwcih7x22pDzGBTA58/6i7Kf9X4OyAnUy7Lf+SwMWzebmVOkI2slFyqJCVI4UN6dZul2us9Ehnd6SGqrxTzKCfFY+pPRQE/8sGl1onvrwqg8/d6kiTDXOA8kvZg7+MP7AmW0JSppPz0J6M5rIkVFpOv8jV6GWqquX5LKG8wJchKdMOhXJ96IwfgxJVxqFUuWmoNKp/dZUmUlrkCow4YRDqnUNS6x4K9R7RGf8MJVq9Qqn6SEOlnWjasspA2A3zklQmA7UNtPUwEK6RG+LiUTJXPFXmhRF1kmRiB7GYK5ST/RSQXGJGsmqWmAUKGfrYx04jzwsxkqFDOucs5qiSz4umN+X00IcG8ySiYsSANBuQTRcKiKAxa6h8fhQxrfCoZAeiyTqJSAm7f1SUUxiA7pcFgxCP8kpilamEMQEJUsiH+tgg4vGEUNQ8yEF0LMeaEIlU5Hk9MVSW217h/7pNUInUKXhVobhUAwAAAA==")
+      format("woff2"),
+    url("iconfont.woff?t=1554537125905") format("woff"),
+    url("iconfont.ttf?t=1554537125905") format("truetype"),
+    /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+      url("iconfont.svg?t=1554537125905#iconfont") format("svg"); /* iOS 4.1- */
 }
 
 .iconfont {
-    font-family: "iconfont" !important;
-    font-size: 30px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  font-family: "iconfont" !important;
+  font-size: 30px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-eye:hover{
-    color: red;
+.icon-eye:hover {
+  color: red;
 }
 
 .icon-eye:before {
-    content: "\e63f";
-    position: relative;
-    top: -2px;
+  content: "\e63f";
+  position: relative;
+  top: -2px;
 }
 
-.njg-selectIcon{
-    position: absolute;
-    right: 20px;
-    top: 20px;
-    z-index: 999;
-    width: 35px;
-    height: 35px; 
-    line-height: 35px;
-    text-align: center;
-    background: #fbfbfb;
-    border-radius: 4px;
-    box-shadow: 0 1px 5px rgba(0,0,0,0.65);
-    border: 1px solid #ccc;
-    color: #6d6357;
+.njg-selectIcon {
+  position: absolute;
+  right: 20px;
+  top: 20px;
+  z-index: 999;
+  width: 35px;
+  height: 35px;
+  line-height: 35px;
+  text-align: center;
+  background: #fbfbfb;
+  border-radius: 4px;
+  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.65);
+  border: 1px solid #ccc;
+  color: #6d6357;
 }
 
-.njg-searchInput{
+.njg-searchInput {
   width: 250px;
   height: 20px;
 }
-.njg-searchBtn{
+.njg-searchBtn {
   padding: 5px 10px;
   margin-left: 10px;
   background-color: white;
 }
-.njg-searchContainer{
+.njg-searchContainer {
   position: absolute;
   left: 300px;
   top: 10px;