@eturnity/eturnity_maths 7.20.0 → 7.24.0

package/.eslintrc.js

@@ -0,0 +1,28 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true
+  },
+  extends: 'eslint:recommended',
+  overrides: [
+    {
+      env: {
+        node: true
+      },
+      files: ['.eslintrc.{js,cjs}'],
+      parserOptions: {
+        sourceType: 'script'
+      }
+    }
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module'
+  },
+  rules: {
+    indent: ['error', 'tab'],
+    'linebreak-style': ['error', 'unix'],
+    quotes: ['error', 'single'],
+    semi: ['error', 'never']
+  }
+}

package/.prettierrc

@@ -0,0 +1,7 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "useTabs": false,
+    "trailingComma": "none",
+    "printWidth": 80
+  }

package/babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-    presets: [['@babel/preset-env', {targets: {node: 'current'}}]],
-  };
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }]]
+}

package/eslint.config.mjs

@@ -0,0 +1,10 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import pluginVue from "eslint-plugin-vue";
+
+
+export default [
+  {languageOptions: { globals: globals.browser }},
+  pluginJs.configs.recommended,
+  ...pluginVue.configs["flat/essential"],
+];

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "7.20.0",
+  "version": "7.24.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "prettier": "prettier --write \"**/*.js\""
   },
   "repository": {
     "type": "git",
@@ -27,7 +28,8 @@
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
     "babel-jest": "29.5.0",
-    "jest": "29.5.0"
+    "jest": "29.5.0",
+    "prettier": "2.8.8"
   },
   "description": ""
 }

package/src/config.js

@@ -1,72 +1,132 @@
 import theme from './assets/theme'
 
-export const polygonCloseTolerance=15
+export const polygonCloseTolerance = 15
 export const snapToPointTolerance = 15
 export const snapToIntersectionPointTolerance = 15
 export const snapToLineTolerance = 10
 export const distanceToCloseNode = 70
-export const mmTolerance=1
-export const earthRadius=6371008
+export const mmTolerance = 1
+export const earthRadius = 6371008
 
 export const layerColors = {
-  construction: { fillColor: 'transparent', strokeColor: theme.colors.blueElectric ,strokeWidth:3 },
-  roof: { fillColor: 'rgba(255, 255, 255, 0.1)', strokeColor: 'white' ,strokeWidth:0 },
-  roofInside: { fillColor: 'rgba(255, 255, 255, 0.1)', strokeColor: 'white' ,strokeWidth:1},
-  obstacle: { fillColor: theme.colors.red, strokeColor: 'red' ,strokeWidth:1 },
-  panel: { fillColor: 'rgba(115, 115, 229, 0.1)', strokeColor: '#ffffff'  ,strokeWidth:1},
-  user_deactivated_panel: { fillColor: 'rgba(115, 115, 229, 0.1)', strokeColor: 'white'  ,strokeWidth:4},
-  selectedPanel: { fillColor: '#0068DE80', strokeColor: theme.colors.blue  ,strokeWidth:1},
+  construction: {
+    fillColor: 'transparent',
+    strokeColor: theme.colors.blueElectric,
+    strokeWidth: 3
+  },
+  roof: {
+    fillColor: 'rgba(255, 255, 255, 0.1)',
+    strokeColor: 'white',
+    strokeWidth: 0
+  },
+  roofInside: {
+    fillColor: 'rgba(255, 255, 255, 0.1)',
+    strokeColor: 'white',
+    strokeWidth: 1
+  },
+  obstacle: { fillColor: theme.colors.red, strokeColor: 'red', strokeWidth: 1 },
+  panel: {
+    fillColor: 'rgba(115, 115, 229, 0.1)',
+    strokeColor: '#ffffff',
+    strokeWidth: 1
+  },
+  user_deactivated_panel: {
+    fillColor: 'rgba(115, 115, 229, 0.1)',
+    strokeColor: 'white',
+    strokeWidth: 4
+  },
+  selectedPanel: {
+    fillColor: '#0068DE80',
+    strokeColor: theme.colors.blue,
+    strokeWidth: 1
+  },
   snap: { fillColor: 'transparent', strokeColor: 'white' },
-  moduleField: { fillColor: 'rgba(255, 255, 255, 0.1)', strokeColor: 'white' ,strokeWidth:3 },
-  hoveredModuleFieldEdge: { strokeColor: theme.colors.blue ,strokeWidth:6 },
-  tmpModuleField: { fillColor: 'rgba(115, 115, 229, 0.4)', strokeColor: theme.colors.blue ,strokeWidth:2 },
-  selectedModuleField: {fillColor: '#0068DE80', strokeColor: theme.colors.blue ,strokeWidth:3},
-  highlight: { fillColor: 'rgba(255, 255, 255, 0.2)', strokeColor: 'white' ,strokeWidth:1 },
-  selectedRoof: { fillColor: '#0068DE80', strokeColor: 'white' ,strokeWidth:3 },
-  selectedObstacle: { fillColor: '#0068DE80', strokeColor: theme.colors.blue ,strokeWidth:2 },
-  selectedAndHighlighted: {fillColor: '#0068DEA0', strokeColor: theme.colors.blue ,strokeWidth:3},
-  flatWarning: {fillColor: '#ffff0090', strokeColor: 'yellow' ,strokeWidth:1},
-  customLength: { fillColor: 'transparent', strokeColor: theme.colors.blueElectric ,strokeWidth:1 }
+  moduleField: {
+    fillColor: 'rgba(255, 255, 255, 0.1)',
+    strokeColor: 'white',
+    strokeWidth: 3
+  },
+  hoveredModuleFieldEdge: { strokeColor: theme.colors.blue, strokeWidth: 6 },
+  tmpModuleField: {
+    fillColor: 'rgba(115, 115, 229, 0.4)',
+    strokeColor: theme.colors.blue,
+    strokeWidth: 2
+  },
+  selectedModuleField: {
+    fillColor: '#0068DE80',
+    strokeColor: theme.colors.blue,
+    strokeWidth: 3
+  },
+  highlight: {
+    fillColor: 'rgba(255, 255, 255, 0.2)',
+    strokeColor: 'white',
+    strokeWidth: 1
+  },
+  selectedRoof: {
+    fillColor: '#0068DE80',
+    strokeColor: 'white',
+    strokeWidth: 3
+  },
+  selectedObstacle: {
+    fillColor: '#0068DE80',
+    strokeColor: theme.colors.blue,
+    strokeWidth: 2
+  },
+  selectedAndHighlighted: {
+    fillColor: '#0068DEA0',
+    strokeColor: theme.colors.blue,
+    strokeWidth: 3
+  },
+  flatWarning: {
+    fillColor: '#ffff0090',
+    strokeColor: 'yellow',
+    strokeWidth: 1
+  },
+  customLength: {
+    fillColor: 'transparent',
+    strokeColor: theme.colors.blueElectric,
+    strokeWidth: 1
+  }
 }
 
-export const baseEdgeOfModuleField=theme.colors.blueElectric
-export const maximumGapLimit=500
-export const defaultBaseHeight=3000
-export const colorArrayBase=[
-  "#FF5656",
-  "#FDB813",
-  "#505CA6",
-  "#C84E4E",
-  "#8392EE",
-  "#6CD5D5",
-  "#90A650",
-  "#D27CCA",
-  "#6276DF",
+export const baseEdgeOfModuleField = theme.colors.blueElectric
+export const maximumGapLimit = 500
+export const defaultBaseHeight = 3000
+export const colorArrayBase = [
+  '#FF5656',
+  '#FDB813',
+  '#505CA6',
+  '#C84E4E',
+  '#8392EE',
+  '#6CD5D5',
+  '#90A650',
+  '#D27CCA',
+  '#6276DF'
 ]
-export const colorArray=colorArrayBase.map(c=>c+"c0")
-export const layerTools={
-  map:[],
-  roof:["drawRoof","selectRoof"],
-  obstacle:["drawObstacle"],
-  margin:["selectMargin"],
-  panel:["selectModuleField"],
+export const colorArray = colorArrayBase.map((c) => c + 'c0')
+export const layerTools = {
+  map: [],
+  roof: ['drawRoof', 'selectRoof'],
+  obstacle: ['drawObstacle'],
+  margin: ['selectMargin'],
+  panel: ['selectModuleField']
 }
 //3D visualisation:
-export const beamRadius=0.05
-export const maxMargin=2500
-export const node3DRadius=0.05
-export const beamColor="#ffffff"
-export const node3DColor="white"
-export const beamOpacity=0.3
-export const node3dOpacity=0.3
-export const dimMarginColor='#ff000020'
+export const beamRadius = 0.05
+export const maxMargin = 2500
+export const node3DRadius = 0.05
+export const beamColor = '#ffffff'
+export const node3DColor = 'white'
+export const beamOpacity = 0.3
+export const node3dOpacity = 0.3
+export const dimMarginColor = '#ff000020'
 export const hitOption = {
   segments: true,
   stroke: true,
   fill: true,
   tolerance: 10
 }
-export const zoomFactor=Math.exp(Math.log(2)/10)
+export const zoomFactor = Math.exp(Math.log(2) / 10)
 export const hitOptionPolygonStrict = {
   segments: false,
   stroke: false,
@@ -74,4 +134,4 @@ export const hitOptionPolygonStrict = {
   tolerance: 0
 }
 
-export const dragHeightSensitivity=20
+export const dragHeightSensitivity = 20

package/src/coords.js

@@ -1,24 +1,24 @@
 export function toRealityRefFunction(canvasSize, mmPerPx, layoutOffset) {
-    return (point) => {
-      let realityX = (point.x - layoutOffset.x) * mmPerPx
-      // let realityY = -(point.y - layoutOffset.y - (canvasSize.height*layoutOffset.zoom)/(100 * 2)) * mmPerPx
-      let realityY = -( point.y - layoutOffset.y) * mmPerPx
-  
-      return { x: realityX, y: realityY, z: point.z }
-    }
+  return (point) => {
+    let realityX = (point.x - layoutOffset.x) * mmPerPx
+    // let realityY = -(point.y - layoutOffset.y - (canvasSize.height*layoutOffset.zoom)/(100 * 2)) * mmPerPx
+    let realityY = -(point.y - layoutOffset.y) * mmPerPx
+
+    return { x: realityX, y: realityY, z: point.z }
   }
-  export function toCanvasRefFunction(canvasSize, mmPerPx, layoutOffset) {
-    return (point) => {
-      if (!point) {
-        console.error('no point', point)
-      }
-      if (!canvasSize) {
-        console.error('no canvas Size')
-        return null
-      }
-      let canvasX = layoutOffset.x + point.x / mmPerPx
-      let canvasY = layoutOffset.y - point.y / mmPerPx
-  
-      return { x: canvasX, y: canvasY, z: point.z }
+}
+export function toCanvasRefFunction(canvasSize, mmPerPx, layoutOffset) {
+  return (point) => {
+    if (!point) {
+      console.error('no point', point)
+    }
+    if (!canvasSize) {
+      console.error('no canvas Size')
+      return null
     }
-  }
+    let canvasX = layoutOffset.x + point.x / mmPerPx
+    let canvasY = layoutOffset.y - point.y / mmPerPx
+
+    return { x: canvasX, y: canvasY, z: point.z }
+  }
+}

package/src/geo.js

@@ -1,107 +1,118 @@
-import {
-  earthRadius
-} from './config'
+import { earthRadius } from './config'
 
-  
-export function lon2tile(lon,zoom) { return (Math.floor((lon+180)/360*Math.pow(2,zoom))); }
-export function lat2tile(lat,zoom)  { return (Math.floor((1-Math.log(Math.tan(lat*Math.PI/180) + 1/Math.cos(lat*Math.PI/180))/Math.PI)/2 *Math.pow(2,zoom))); }
-export function tile2long(x,z) {
-    return (x/Math.pow(2,z)*360-180);
-   }
-export function tile2lat(y,z) {
-    var n=Math.PI-2*Math.PI*y/Math.pow(2,z);
-    return (180/Math.PI*Math.atan(0.5*(Math.exp(n)-Math.exp(-n))));
-   }
-export function latLngToTileXY(lat,lng,zoom){
-    const xTile = lon2tile(lng,zoom)
-    const yTile = lat2tile(lat,zoom)
-    return {
-      x:xTile,
-      y:yTile
-    }
+export function lon2tile(lon, zoom) {
+  return Math.floor(((lon + 180) / 360) * Math.pow(2, zoom))
+}
+export function lat2tile(lat, zoom) {
+  return Math.floor(
+    ((1 -
+      Math.log(
+        Math.tan((lat * Math.PI) / 180) + 1 / Math.cos((lat * Math.PI) / 180)
+      ) /
+        Math.PI) /
+      2) *
+      Math.pow(2, zoom)
+  )
+}
+export function tile2long(x, z) {
+  return (x / Math.pow(2, z)) * 360 - 180
+}
+export function tile2lat(y, z) {
+  var n = Math.PI - (2 * Math.PI * y) / Math.pow(2, z)
+  return (180 / Math.PI) * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n)))
+}
+export function latLngToTileXY(lat, lng, zoom) {
+  const xTile = lon2tile(lng, zoom)
+  const yTile = lat2tile(lat, zoom)
+  return {
+    x: xTile,
+    y: yTile
   }
-  
-  export function tileXYZToLatLng(x,y,zoom){
-        const longitude=tile2long(x,zoom)
-        const latitude=tile2lat(y,zoom)
-        return {lat: latitude,lng: longitude};
-    }
+}
 
-  export function tileToCorners(x,y,zoom,lat,lng){
-    const tileAltitude=0
-    const tileLatLng=tileXYZToLatLng(x,y,zoom)
-    const deltaLat=tileLatLng.lat-lat
-    const deltaLng=tileLatLng.lng-lng
-    let { x:x_mm, y:y_mm }=deltaLatLngToDistance(deltaLat, deltaLng, lat)
-    let size=(earthRadius * 2000 * Math.PI / Math.pow(2.0, zoom))*Math.cos(lat*Math.PI/180)
-    let corner0={
-      x:x_mm,
-      y:y_mm,
-      z:tileAltitude
-    }
-    let corner1={
-      x:x_mm+size,
-      y:y_mm,
-      z:tileAltitude
-    }
-    let corner2={
-      x:x_mm+size,
-      y:y_mm-size,
-      z:tileAltitude
-    }
-    let corner3={
-      x:x_mm,
-      y:y_mm-size,
-      z:tileAltitude
-    }
-    return [
-      corner3,
-      corner0,
-      corner1,
-      corner2,
-    ]
-  }
-  export function distanceToDeltaLatLng(x, y, latitude) {
-    //x,y,z in ENU coords
-    let lat = (180 / Math.PI) * (y / 1000) / earthRadius
-    let lng =((180 / Math.PI) * (x / 1000) / earthRadius)/(Math.cos(((latitude) * Math.PI) / 180))
-    return { lat, lng }
-  }
-  export function deltaLatLngToDistance(deltaLat, deltaLng, latitude) {
-    //x,y,z in ENU coords
-    let y=earthRadius * deltaLat *1000/(180 / Math.PI)
-    let x=earthRadius* deltaLng * 1000 *(Math.cos(((latitude) * Math.PI) / 180))/(180 / Math.PI)
-    return { x, y }
+export function tileXYZToLatLng(x, y, zoom) {
+  const longitude = tile2long(x, zoom)
+  const latitude = tile2lat(y, zoom)
+  return { lat: latitude, lng: longitude }
+}
+
+export function tileToCorners(x, y, zoom, lat, lng) {
+  const tileAltitude = 0
+  const tileLatLng = tileXYZToLatLng(x, y, zoom)
+  const deltaLat = tileLatLng.lat - lat
+  const deltaLng = tileLatLng.lng - lng
+  let { x: x_mm, y: y_mm } = deltaLatLngToDistance(deltaLat, deltaLng, lat)
+  let size =
+    ((earthRadius * 2000 * Math.PI) / Math.pow(2.0, zoom)) *
+    Math.cos((lat * Math.PI) / 180)
+  let corner0 = {
+    x: x_mm,
+    y: y_mm,
+    z: tileAltitude
   }
-  
-  export function datum2spherical(lat1, lat2, lng1, lng2) {
-    const earthOrigin = Math.PI * earthRadius
-  
-    //const d = earthRadius * arccos[(sin(lat1) * sin(lat2)) + cos(lat1) * cos(lat2) * cos(lng2 – lng1)]
-    const averageLat = (lat1 + lat2) / 2
-    const x =
-      1000 *
-      earthRadius *
-      arccos(
-        sin(averageLat) * sin(averageLat) +
-          cos(averageLat) * cos(averageLat) * cos(lng2 - lng1)
-      )
-    const y =
-      1000 * earthRadius * arccos(sin(lat1) * sin(lat2) + cos(lat1) * cos(lat2))
-  
-    // const x = longitude * earthOrigin / 180.0;
-    // let y = Math.log(Math.tan((90 + latitude) * Math.PI / 360.0)) / (Math.PI / 180.0);
-  
-    // y = y * earthOrigin / 180.0;
-  
-    return { x, y }
+  let corner1 = {
+    x: x_mm + size,
+    y: y_mm,
+    z: tileAltitude
   }
-  function cos(deg) {
-    return Math.cos((deg * Math.PI) / 180)
+  let corner2 = {
+    x: x_mm + size,
+    y: y_mm - size,
+    z: tileAltitude
   }
-  function sin(deg) {
-    return Math.sin((deg * Math.PI) / 180)
+  let corner3 = {
+    x: x_mm,
+    y: y_mm - size,
+    z: tileAltitude
   }
-  function arccos(val) {
-    return Math.acos(val)
-  }
+  return [corner3, corner0, corner1, corner2]
+}
+export function distanceToDeltaLatLng(x, y, latitude) {
+  //x,y,z in ENU coords
+  let lat = ((180 / Math.PI) * (y / 1000)) / earthRadius
+  let lng =
+    ((180 / Math.PI) * (x / 1000)) /
+    earthRadius /
+    Math.cos((latitude * Math.PI) / 180)
+  return { lat, lng }
+}
+export function deltaLatLngToDistance(deltaLat, deltaLng, latitude) {
+  //x,y,z in ENU coords
+  let y = (earthRadius * deltaLat * 1000) / (180 / Math.PI)
+  let x =
+    (earthRadius * deltaLng * 1000 * Math.cos((latitude * Math.PI) / 180)) /
+    (180 / Math.PI)
+  return { x, y }
+}
+
+export function datum2spherical(lat1, lat2, lng1, lng2) {
+  const earthOrigin = Math.PI * earthRadius
+
+  //const d = earthRadius * arccos[(sin(lat1) * sin(lat2)) + cos(lat1) * cos(lat2) * cos(lng2 – lng1)]
+  const averageLat = (lat1 + lat2) / 2
+  const x =
+    1000 *
+    earthRadius *
+    arccos(
+      sin(averageLat) * sin(averageLat) +
+        cos(averageLat) * cos(averageLat) * cos(lng2 - lng1)
+    )
+  const y =
+    1000 * earthRadius * arccos(sin(lat1) * sin(lat2) + cos(lat1) * cos(lat2))
+
+  // const x = longitude * earthOrigin / 180.0;
+  // let y = Math.log(Math.tan((90 + latitude) * Math.PI / 360.0)) / (Math.PI / 180.0);
+
+  // y = y * earthOrigin / 180.0;
+
+  return { x, y }
+}
+function cos(deg) {
+  return Math.cos((deg * Math.PI) / 180)
+}
+function sin(deg) {
+  return Math.sin((deg * Math.PI) / 180)
+}
+function arccos(val) {
+  return Math.acos(val)
+}