@ohuoy/easymap 1.0.19 → 1.0.21

package/lib/threebox-plugin/src/utils/utils.js

@@ -0,0 +1,424 @@
+//var THREE = require("../three.js");
+import * as THREE from '../three.module.js'
+import Constants from './constants.js'
+import validate from './validate.js'
+//var Constants = require("./constants.js");
+//var validate = require("./validate.js");
+
+var utils = {
+
+	prettyPrintMatrix: function (uglymatrix) {
+		for (var s = 0; s < 4; s++) {
+			var quartet = [uglymatrix[s],
+			uglymatrix[s + 4],
+			uglymatrix[s + 8],
+			uglymatrix[s + 12]];
+			console.log(quartet.map(function (num) { return num.toFixed(4) }))
+		}
+	},
+
+	makePerspectiveMatrix: function (fovy, aspect, near, far) {
+
+		var out = new THREE.Matrix4();
+		var f = 1.0 / Math.tan(fovy / 2),
+			nf = 1 / (near - far);
+
+		var newMatrix = [
+			f / aspect, 0, 0, 0,
+			0, f, 0, 0,
+			0, 0, (far + near) * nf, -1,
+			0, 0, (2 * far * near) * nf, 0
+		]
+
+		out.elements = newMatrix
+		return out;
+	},
+
+	//[jscastro] new orthographic matrix calculations https://en.wikipedia.org/wiki/Orthographic_projection and validated with https://bit.ly/3rPvB9Y
+	makeOrthographicMatrix: function (left, right, top, bottom, near, far) {
+		var out = new THREE.Matrix4();
+
+		const w = 1.0 / (right - left);
+		const h = 1.0 / (top - bottom);
+		const p = 1.0 / (far - near);
+
+		const x = (right + left) * w;
+		const y = (top + bottom) * h;
+		const z = near * p;
+
+		var newMatrix = [
+			2 * w, 0, 0, 0,
+			0, 2 * h, 0, 0,
+			0, 0, - 1 * p, 0,
+			- x, -y, -z, 1
+		]
+
+		out.elements = newMatrix
+		return out;
+	},
+
+	//gimme radians
+	radify: function (deg) {
+
+		function convert(degrees) {
+			degrees = degrees || 0;
+			return Math.PI * 2 * degrees / 360
+		}
+
+		if (typeof deg === 'object') {
+
+			//if [x,y,z] array of rotations
+			if (deg.length > 0) {
+				return deg.map(function (degree) {
+					return convert(degree)
+				})
+			}
+
+			// if {x: y: z:} rotation object
+			else {
+				return [convert(deg.x), convert(deg.y), convert(deg.z)]
+			}
+		}
+
+		//if just a number
+		else return convert(deg)
+	},
+
+	//gimme degrees
+	degreeify: function (rad) {
+		function convert(radians) {
+			radians = radians || 0;
+			return radians * 360 / (Math.PI * 2)
+		}
+
+		if (typeof rad === 'object') {
+			return [convert(rad.x), convert(rad.y), convert(rad.z)]
+		}
+
+		else return convert(rad)
+	},
+
+	projectToWorld: function (coords) {
+
+		// Spherical mercator forward projection, re-scaling to WORLD_SIZE
+
+		var projected = [
+			-Constants.MERCATOR_A * Constants.DEG2RAD * coords[0] * Constants.PROJECTION_WORLD_SIZE,
+			-Constants.MERCATOR_A * Math.log(Math.tan((Math.PI * 0.25) + (0.5 * Constants.DEG2RAD * coords[1]))) * Constants.PROJECTION_WORLD_SIZE
+		];
+
+		//z dimension, defaulting to 0 if not provided
+
+		if (!coords[2]) projected.push(0)
+		else {
+			var pixelsPerMeter = this.projectedUnitsPerMeter(coords[1]);
+			projected.push(coords[2] * pixelsPerMeter);
+		}
+
+		var result = new THREE.Vector3(projected[0], projected[1], projected[2]);
+
+		return result;
+	},
+
+	projectedUnitsPerMeter: function (latitude) {
+		return Math.abs(Constants.WORLD_SIZE / Math.cos(Constants.DEG2RAD * latitude) / Constants.EARTH_CIRCUMFERENCE);
+	},
+
+	_circumferenceAtLatitude: function (latitude) {
+		return Constants.EARTH_CIRCUMFERENCE * Math.cos(latitude * Math.PI / 180);
+	},
+
+	mercatorZfromAltitude: function (altitude, lat) {
+		return altitude / this._circumferenceAtLatitude(lat);
+	},
+
+	_scaleVerticesToMeters: function (centerLatLng, vertices) {
+		var pixelsPerMeter = this.projectedUnitsPerMeter(centerLatLng[1]);
+		var centerProjected = this.projectToWorld(centerLatLng);
+
+		for (var i = 0; i < vertices.length; i++) {
+			vertices[i].multiplyScalar(pixelsPerMeter);
+		}
+
+		return vertices;
+	},
+
+	projectToScreen: function (coords) {
+		console.log("WARNING: Projecting to screen coordinates is not yet implemented");
+	},
+
+	unprojectFromScreen: function (pixel) {
+		console.log("WARNING: unproject is not yet implemented");
+	},
+
+	//world units to lnglat
+	unprojectFromWorld: function (worldUnits) {
+
+		var unprojected = [
+			-worldUnits.x / (Constants.MERCATOR_A * Constants.DEG2RAD * Constants.PROJECTION_WORLD_SIZE),
+			2 * (Math.atan(Math.exp(worldUnits.y / (Constants.PROJECTION_WORLD_SIZE * (-Constants.MERCATOR_A)))) - Math.PI / 4) / Constants.DEG2RAD
+		];
+
+		var pixelsPerMeter = this.projectedUnitsPerMeter(unprojected[1]);
+
+		//z dimension
+		var height = worldUnits.z || 0;
+		unprojected.push(height / pixelsPerMeter);
+
+		return unprojected;
+	},
+
+	toScreenPosition: function (obj, camera) {
+		var vector = new THREE.Vector3();
+
+		var widthHalf = 0.5 * renderer.context.canvas.width;
+		var heightHalf = 0.5 * renderer.context.canvas.height;
+
+		obj.updateMatrixWorld();
+		vector.setFromMatrixPosition(obj.matrixWorld);
+		vector.project(camera);
+
+		vector.x = (vector.x * widthHalf) + widthHalf;
+		vector.y = - (vector.y * heightHalf) + heightHalf;
+
+		return {
+			x: vector.x,
+			y: vector.y
+		};
+
+	},
+
+	//get the center point of a feature
+	getFeatureCenter: function getFeatureCenter(feature, model, level) {
+		let center = [];
+		let latitude = 0;
+		let longitude = 0;
+		let height = 0;
+		//deep copy to avoid modifying the original array
+		let coordinates = [...feature.geometry.coordinates[0]];
+		if (feature.geometry.type === "Point") {
+			center = [...coordinates[0]];//deep copy
+		}
+		else {
+			//features in mapbox repeat the first coordinates at the end. We remove it.
+			if (feature.geometry.type === "MultiPolygon") coordinates = coordinates[0];
+			coordinates.splice(-1, 1);
+			coordinates.forEach(function (c) {
+				latitude += c[0];
+				longitude += c[1];
+			});
+			center = [latitude / coordinates.length, longitude / coordinates.length];
+		}
+		height = this.getObjectHeightOnFloor(feature, model, level);
+
+		(center.length < 3 ? center.push(height) : center[2] = height);
+
+		return center;
+	},
+
+	getObjectHeightOnFloor: function (feature, obj, level = feature.properties.level || 0) {
+		let floorHeightMin = (level * (feature.properties.levelHeight || 0));
+		//object height is modelSize.z + base_height or min_height configured for this object
+		let base = (feature.properties.base_height || feature.properties.min_height || 0);
+		//let height = ((obj && obj.model) ? obj.modelSize.z : (feature.properties.height - base));
+		let height = ((obj && obj.model) ? 0 : (feature.properties.height - base));
+		let objectHeight = height + base;
+		let modelHeightFloor = floorHeightMin + objectHeight;
+		return modelHeightFloor;
+	},
+
+	_flipMaterialSides: function (obj) {
+
+	},
+
+	// to improve precision, normalize a series of vector3's to their collective center, and move the resultant mesh to that center
+	normalizeVertices(vertices) {
+
+		let geometry = new THREE.BufferGeometry();
+		let positions = [];
+
+		for (var j = 0; j < vertices.length; j++) {
+			let p = vertices[j];
+			positions.push(p.x, p.y, p.z);
+			positions.push(p.x, p.y, p.z);
+		}
+		geometry.setAttribute('position', new THREE.BufferAttribute(new Float32Array(positions), 3));
+		geometry.computeBoundingSphere();
+		var center = geometry.boundingSphere.center;
+
+		var scaled = vertices.map(function (v3) {
+			var normalized = v3.sub(center);
+			return normalized;
+		});
+
+		return { vertices: scaled, position: center }
+	},
+
+	//flatten an array of Vector3's into a shallow array of values in x-y-z order, for bufferGeometry
+	flattenVectors(vectors) {
+		var flattenedArray = [];
+		for (let vertex of vectors) {
+			flattenedArray.push(vertex.x, vertex.y, vertex.z);
+		}
+		return flattenedArray
+	},
+
+	//convert a line/polygon to Vector3's
+
+	lnglatsToWorld: function (coords) {
+
+		var vector3 = coords.map(
+			function (pt) {
+				var p = utils.projectToWorld(pt);
+				var v3 = new THREE.Vector3(p.x, p.y, p.z);
+				return v3
+			}
+		);
+
+		return vector3
+	},
+
+	extend: function (original, addition) {
+		for (let key in addition) original[key] = addition[key];
+	},
+
+	clone: function (original) {
+		var clone = {};
+		for (let key in original) clone[key] = original[key];
+		return clone;
+	},
+
+	clamp: function(n, min, max) {
+		return Math.min(max, Math.max(min, n));
+	},
+
+	// retrieve object parameters from an options object
+	types: {
+
+		rotation: function (r, currentRotation) {
+
+			//[jscastro] rotation default 0
+			if (!r) { r = 0; };
+
+			// if number provided, rotate only in Z by that amount
+			if (typeof r === 'number') r = { z: r };
+
+			var degrees = this.applyDefault([r.x, r.y, r.z], currentRotation);
+			var radians = utils.radify(degrees);
+			return radians;
+
+		},
+
+		scale: function (s, currentScale) {
+			//[jscastro] scale default 1
+			if (!s) { s = 1; };
+			if (typeof s === 'number') return s = [s, s, s];
+			else return this.applyDefault([s.x, s.y, s.z], currentScale);
+		},
+
+		applyDefault: function (array, current) {
+
+			var output = array.map(function (item, index) {
+				item = item || current[index];
+				return item
+			})
+
+			return output
+		},
+
+	},
+
+	toDecimal: function (n, d) {
+		return Number(n.toFixed(d));
+	},
+
+	equal: function (obj1, obj2) {
+		const keys1 = Object.keys(obj1);
+		const keys2 = Object.keys(obj2);
+
+		if (keys1.length !== keys2.length) {
+			return false;
+		}
+		if (keys1.length == 0 && keys2.length == 0 && keys1 !== keys2) {
+			return false;
+		}
+
+		for (const key of keys1) {
+			const val1 = obj1[key];
+			const val2 = obj2[key];
+			const areObjects = this.isObject(val1) && this.isObject(val2);
+			if (
+				areObjects && !equal(val1, val2) ||
+				!areObjects && val1 !== val2
+			) {
+				return false;
+			}
+		}
+
+		return true;
+	},
+
+	isObject: function (object) {
+		return object != null && typeof object === 'object';
+	},
+
+	curveToLine: (curve, params) => {
+		let { width, color } = params;
+		let geometry = new THREE.BufferGeometry().setFromPoints(
+			curve.getPoints(100)
+		);
+
+		let material = new THREE.LineBasicMaterial({
+			color: color,
+			linewidth: width,
+		});
+
+		let line = new THREE.Line(geometry, material);
+
+		return line;
+	},
+
+	curvesToLines: (curves) => {
+		var colors = [0xff0000, 0x1eff00, 0x2600ff];
+		var lines = curves.map((curve, i) => {
+			let params = {
+				width: 3,
+				color: colors[i] || 'purple',
+			};
+			let curveline = curveToLine(curve, params);
+
+			return curveline;
+		});
+		return lines;
+	},
+
+	_validate: function (userInputs, defaults) {
+
+		userInputs = userInputs || {};
+		var validatedOutput = {};
+		utils.extend(validatedOutput, userInputs);
+
+		for (let key of Object.keys(defaults)) {
+
+			if (userInputs[key] === undefined) {
+				//make sure required params are present
+				if (defaults[key] === null) {
+					console.error(key + ' is required')
+					return;
+				}
+
+				else validatedOutput[key] = defaults[key]
+
+			}
+
+			else validatedOutput[key] = userInputs[key]
+		}
+
+		return validatedOutput
+	},
+	Validator: new validate(),
+	exposedMethods: ['projectToWorld', 'projectedUnitsPerMeter', 'extend', 'unprojectFromWorld']
+}
+export default utils;
+
+//module.exports = exports = utils

package/lib/threebox-plugin/src/utils/validate.js

@@ -0,0 +1,115 @@
+// Type validator
+
+function Validate(){
+
+};
+
+Validate.prototype = {
+
+    Coords: function(input) {
+
+        if (input.constructor !== Array) {
+            console.error("Coords must be an array")
+            return
+        }
+
+        if (input.length < 2) {
+            console.error("Coords length must be at least 2")
+            return
+        }
+    
+        for (const member of input) {
+            if (member.constructor !== Number) {
+                console.error("Coords values must be numbers")
+                return
+            }
+        }
+
+        if (Math.abs(input[1]) > 90) {
+            console.error("Latitude must be between -90 and 90")
+            return                    
+        }
+
+        return input
+    },
+
+    Line: function(input) {
+
+        var scope = this;
+
+        if (input.constructor !== Array) {
+            console.error("Line must be an array")
+            return
+        }
+
+        for (const coord of input){
+            if (!scope.Coords(coord)) {
+                console.error("Each coordinate in a line must be a valid Coords type")
+                return                    
+            }
+
+        }
+
+        return input
+    },
+
+    Rotation: function(input) {
+
+        if (input.constructor === Number) input = {z: input}
+
+        else if (input.constructor === Object) {
+
+            for (const key of Object.keys(input)){
+
+                if (!['x', 'y', 'z'].includes(key)) {
+                    console.error('Rotation parameters must be x, y, or z')
+                    return                            
+                }
+                if (input[key].constructor !== Number) {
+                    console.error('Individual rotation values must be numbers')
+                    return
+                }
+            }
+        }
+
+        else {
+            console.error('Rotation must be an object or a number')
+            return
+        }
+
+        return input
+    },
+
+    Scale: function(input) {
+
+        if (input.constructor === Number) {
+            input = {x:input, y:input, z: input}
+        }
+        
+        else if (input.constructor === Object) {
+
+            for (const key of Object.keys(input)){
+
+                if (!['x', 'y', 'z'].includes(key)) {
+                    console.error('Scale parameters must be x, y, or z')
+                    return                            
+                }
+                if (input[key].constructor !== Number) {
+                    console.error('Individual scale values must be numbers')
+                    return
+                }
+            }
+        }
+
+        else {
+            console.error('Scale must be an object or a number')
+            return
+        }
+
+        return input
+    }
+
+}
+
+export default Validate
+//module.exports = exports = Validate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohuoy/easymap",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "self map easy use",
   "main": "main.js",
   "scripts": {
@@ -10,40 +10,40 @@
   "author": "weichong song",
   "license": "ISC",
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/l7": "file:lib/@antv/l7",
+    "@babel/runtime": "^7.7.7",
     "@mapbox/mapbox-gl-draw": "^1.5.0",
     "@mdi/js": "^7.4.47",
     "@turf/turf": "^6.5.0",
+    "d3-dsv": "^1.1.1",
+    "d3-hexbin": "^0.2.2",
+    "d3-scale": "^2",
+    "element-resize-detector": "^1.2.4",
+    "eventemitter3": "^4.0.0",
     "gcoord": "^1.0.6",
     "gif.js": "^0.2.0",
+    "hammerjs": "^2.0.8",
     "jszip": "^3.10.1",
     "mapbox-gl": "file:lib/mapbox-gl",
+    "regl": "1.6.1",
     "three": "^0.170.0",
     "threebox-plugin": "^2.2.7",
-    "@babel/runtime": "^7.7.7",
-    "eventemitter3": "^4.0.0",
-    "viewport-mercator-project": "^6.2.1",
-    "hammerjs": "^2.0.8",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "d3-dsv": "^1.1.1",
-    "element-resize-detector": "^1.2.4",
-    "d3-hexbin": "^0.2.2",
-    "d3-scale": "^2",
-    "regl": "1.6.1"
+    "viewport-mercator-project": "^6.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.24.7",
-    "@types/d3-dsv": "^1.0.36",
     "@babel/preset-env": "^7.24.7",
+    "@types/d3-dsv": "^1.0.36",
+    "@types/d3-hexbin": "^0.2.3",
+    "@types/d3-scale": "^2.1.1",
+    "@types/element-resize-detector": "^1.1.6",
+    "@types/hammerjs": "^2.0.36",
+    "@types/viewport-mercator-project": "^6.1.0",
     "babel-loader": "^9.1.3",
     "css-loader": "^7.1.2",
     "style-loader": "^4.0.0",
     "webpack": "^5.91.0",
-    "webpack-cli": "^5.1.4",
-    "@types/viewport-mercator-project": "^6.1.0",
-    "@types/hammerjs": "^2.0.36",
-    "@types/element-resize-detector": "^1.1.6",
-    "@types/d3-hexbin": "^0.2.3",
-    "@types/d3-scale": "^2.1.1"
+    "webpack-cli": "^5.1.4"
   }
 }

package/src/components/EasyMapMarker.js

@@ -54,6 +54,14 @@ export default class EasyMapMarker{
             throw new Error('no config')
         }
     }
+
+    setMarkerPopup(popup,_marker){
+        _marker = _marker ?  _marker : this.marker
+        if(_marker){
+            _marker.setPopup(popup)
+        }
+    }
+
     moveTo(location,zoom = 12.5){
         let _location = transform(location)
         this.marker.setLngLat(_location)

package/src/components/control/DrawBar.js

@@ -132,4 +132,9 @@ export default class DrawBar {
         }     
       }
     }
+
+    onRemove() {
+      this.drawEntity = null
+      this.drawing = false;
+  }
 }