Merge pull request #175 from VCityTeam/dev

2.31.9

.travis.yml

@@ -1,3 +1,9 @@
+# @format
+
+branches:
+  only:
+    - master
+
 os: linux
 dist: focal
 language: node_js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ud-viz",
-  "version": "2.31.6",
+  "version": "2.31.9",
   "description": "A collection of itowns plugins",
   "main": "src",
   "scripts": {
@@ -23,12 +23,12 @@
   "homepage": "https://github.com/VCityTeam/UD-Viz/",
   "peerDependencies": {},
   "dependencies": {
-    "proj4": "^2.7.0",
-    "three": "0.126.1",
     "detect-collisions": "^2.5.2",
-    "itowns": "^2.31.0",
+    "itowns": "^2.32.0",
     "jquery": "^3.6.0",
+    "proj4": "^2.7.0",
     "socket.io-client": "^4.0.0",
+    "three": "0.126.1",
     "vis-data": "^7.1.2",
     "vis-network": "^9.0.3"
   },

src/Components/SystemUtils/File.js

@@ -1,5 +1,7 @@
 /** @format */
 
+const jquery = require('jquery');
+
 module.exports = {
   downloadObjectAsJson: function (exportObj, exportName) {
     const dataStr =
@@ -12,4 +14,20 @@ module.exports = {
     downloadAnchorNode.click();
     downloadAnchorNode.remove();
   },
+  loadJSON(filePath) {
+    return new Promise((resolve, reject) => {
+      jquery.ajax({
+        type: 'GET',
+        url: filePath,
+        datatype: 'json',
+        success: (data) => {
+          resolve(data);
+        },
+        error: (e) => {
+          console.error(e);
+          reject();
+        },
+      });
+    });
+  },
 };

src/Components/SystemUtils/JSONUtils.js

@@ -11,7 +11,7 @@ module.exports = {
         } else {
           if (json2[key] != undefined) {
             json1[key] = json2[key];
-            console.log('overwrite ', json1);
+            // console.log('overwrite ', json1);
           }
         }
       }
@@ -20,19 +20,22 @@ module.exports = {
     traverse(jsonOverWrited, jsonModel);
   },
 
-  parseNumeric(json) {
-    const parse = function (j) {
-      for (let key in j) {
-        if (j[key] instanceof Object) {
-          parse(j[key]);
-        } else if (Type.isNumeric(j[key])) {
-          //console.log(j[key]);
-          j[key] = parseFloat(j[key]);
-          //console.log(j[key]);
-        }
+  parse(json, cb) {
+    for (let key in json) {
+      if (json[key] instanceof Object) {
+        this.parse(json[key], cb);
+      } else {
+        cb(json, key);
       }
-    };
+    }
+    return json;
+  },
 
-    return parse(json);
+  parseNumeric(json) {
+    return this.parse(json, function (j, key) {
+      if (Type.isNumeric(j[key])) {
+        j[key] = parseFloat(j[key]);
+      }
+    });
   },
 };