@operato/scene-openlayers 8.0.0-beta.0 → 8.0.0-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@operato/scene-openlayers",
   "description": "OpenLayers component for things-scene",
-  "version": "8.0.0-beta.0",
+  "version": "8.0.0-beta.2",
   "license": "MIT",
   "things-scene": true,
   "author": "heartyoh",
@@ -32,8 +32,8 @@
   },
   "devDependencies": {
     "@hatiolab/prettier-config": "^1.0.0",
-    "@things-factory/builder": "^8.0.0-alpha",
-    "@things-factory/operato-board": "^8.0.0-alpha",
+    "@things-factory/builder": "^8.0.0-beta",
+    "@things-factory/operato-board": "^8.0.0-beta",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "@web/dev-server": "^0.1.28",
@@ -58,5 +58,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "b3cf6db1fbdcb9f4feac35560517fec3bb42c493"
+  "gitHead": "d6329b4f15ae63c2a99ec5b58ee1d527e88a4c36"
 }

package/CHANGELOG.md

@@ -1,254 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [8.0.0-beta.0](https://github.com/things-scene/operato-scene/compare/v8.0.0-alpha.12...v8.0.0-beta.0) (2025-01-07)
-
-
-### :bug: Bug Fix
-
-* @hatiolab/things-scene@^8.0.0-beta ([c32f4c0](https://github.com/things-scene/operato-scene/commit/c32f4c00decf244ca82ae17a41e33f269e1882e7))
-
-
-
-## [8.0.0-alpha.1](https://github.com/things-scene/operato-scene/compare/v8.0.0-alpha.0...v8.0.0-alpha.1) (2024-09-09)
-
-
-### :bug: Bug Fix
-
-* @hatiolab/things-scene dependency version ([01458eb](https://github.com/things-scene/operato-scene/commit/01458ebe9110906729fc9f8440ce1e5afe3e17bd))
-* update [@things-factory](https://github.com/things-factory)@^8.0.0-alpha ([1dc3163](https://github.com/things-scene/operato-scene/commit/1dc31638ed9d3fd0ecb2ac55be0ce541e5599ab8))
-
-
-
-## [8.0.0-alpha.0](https://github.com/things-scene/operato-scene/compare/v7.3.7...v8.0.0-alpha.0) (2024-09-01)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [7.0.1](https://github.com/things-scene/operato-scene/compare/v7.0.0...v7.0.1) (2024-06-30)
-
-
-### :bug: Bug Fix
-
-* things-factory@7.0.0 ([f4cfe44](https://github.com/things-scene/operato-scene/commit/f4cfe44cb565e7b8fdc0df210a722b6526871848))
-
-
-
-## [7.0.0](https://github.com/things-scene/operato-scene/compare/v7.0.0-rc.4...v7.0.0) (2024-06-30)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [7.0.0-rc.3](https://github.com/things-scene/operato-scene/compare/v7.0.0-rc.2...v7.0.0-rc.3) (2024-06-28)
-
-
-### :bug: Bug Fix
-
-* update dependencies version ([8629d93](https://github.com/things-scene/operato-scene/commit/8629d9375c84bc7b44c8a3604106345d87c21db5))
-
-
-
-## [7.0.0-rc.1](https://github.com/things-scene/operato-scene/compare/v7.0.0-rc.0...v7.0.0-rc.1) (2024-06-21)
-
-
-### :bug: Bug Fix
-
-* apply v7-rc dependencies ([eee5612](https://github.com/things-scene/operato-scene/commit/eee5612e1d569387c284a7c6c49d64ef44b6d701))
-
-
-
-## [7.0.0-rc.0](https://github.com/things-scene/operato-scene/compare/v2.0.0-beta.8...v7.0.0-rc.0) (2024-06-21)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [2.0.0-beta.0](https://github.com/things-scene/operato-scene/compare/v2.0.0-alpha.12...v2.0.0-beta.0) (2024-06-01)
-
-
-### :rocket: New Features
-
-* 2.0.0-beta.0 ([a2e2869](https://github.com/things-scene/operato-scene/commit/a2e28694eedf5bab0c54bcab5432d54ec59edd7f))
-
-
-### :bug: Bug Fix
-
-* allowJs in tsconfig option ([fa77174](https://github.com/things-scene/operato-scene/commit/fa771742188f21f177f0a85281570f59f0c478cf))
-
-
-
-## [2.0.0-alpha.12](https://github.com/things-scene/operato-scene/compare/v2.0.0-alpha.11...v2.0.0-alpha.12) (2024-05-11)
-
-
-### :bug: Bug Fix
-
-* ignore 'cache' folder for git and npm ([d70f811](https://github.com/things-scene/operato-scene/commit/d70f8118ff3e9248f80aa9435d6e6cbb8aacfcaf))
-
-
-
-## [2.0.0-alpha.9](https://github.com/things-scene/operato-scene/compare/v2.0.0-alpha.8...v2.0.0-alpha.9) (2024-04-11)
-
-
-### :bug: Bug Fix
-
-* things-factory@7.0.1 ([a9f4c18](https://github.com/things-scene/operato-scene/commit/a9f4c1873b80c540e4c2e16649e127ccffcf9a4c))
-
-
-
-## [2.0.0-alpha.6](https://github.com/things-scene/operato-scene/compare/v2.0.0-alpha.5...v2.0.0-alpha.6) (2024-03-24)
-
-
-### :bug: Bug Fix
-
-* translation ([266d423](https://github.com/things-scene/operato-scene/commit/266d423d9d6992464f45a437acc90ccf8ed33bf6))
-
-
-
-## [2.0.0-alpha.4](https://github.com/things-scene/operato-scene/compare/v2.0.0-alpha.3...v2.0.0-alpha.4) (2024-03-21)
-
-
-### :bug: Bug Fix
-
-* 컴포넌트 명 다국어 ([64e1f08](https://github.com/things-scene/operato-scene/commit/64e1f08af32d2ac193c3d31b0025f8d06f569ca4))
-
-
-
-## [2.0.0-alpha.0](https://github.com/things-scene/operato-scene/compare/v1.3.9...v2.0.0-alpha.0) (2024-01-14)
-
-
-### :bug: Bug Fix
-
-* 2.0.0-alpha.0 ([93274e3](https://github.com/things-scene/operato-scene/commit/93274e36c5d184f339f83899654dd48b4786ac2b))
-
-
-
-## [1.3.7](https://github.com/things-scene/operato-scene/compare/v1.3.6...v1.3.7) (2024-01-01)
-
-
-### :bug: Bug Fix
-
-* mpi module moved from things-factory ([47b743f](https://github.com/things-scene/operato-scene/commit/47b743fd19001f195db85e50b8f6e457a1573aa5))
-
-
-
-## [1.2.91](https://github.com/things-scene/operato-scene/compare/v1.2.90...v1.2.91) (2023-11-26)
-
-
-### :bug: Bug Fix
-
-* type errors in open-layers ([2cd497c](https://github.com/things-scene/operato-scene/commit/2cd497c51c3b7fcdfa32f72b172c816bcba87ba8))
-
-
-
-## [1.2.90](https://github.com/things-scene/operato-scene/compare/v1.2.89...v1.2.90) (2023-11-22)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [1.2.87](https://github.com/things-scene/operato-scene/compare/v1.2.86...v1.2.87) (2023-11-10)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [1.2.76](https://github.com/things-scene/operato-scene/compare/v1.2.75...v1.2.76) (2023-10-28)
-
-
-### :bug: Bug Fix
-
-* scene-tab ([ad62f96](https://github.com/things-scene/operato-scene/commit/ad62f967b149eb5adf8f2e0714d79e8a9dc7186c))
-
-
-
-## [1.2.73](https://github.com/things-scene/operato-scene/compare/v1.2.72...v1.2.73) (2023-10-22)
-
-
-### :bug: Bug Fix
-
-* add help for image-slider ([043d284](https://github.com/things-scene/operato-scene/commit/043d284d6878818079d27b685905b76a486d3fff))
-
-
-
-## [1.2.71](https://github.com/things-scene/operato-scene/compare/v1.2.70...v1.2.71) (2023-10-11)
-
-
-### :bug: Bug Fix
-
-* add bluetooth module ([4bba13c](https://github.com/things-scene/operato-scene/commit/4bba13c7ac29508d37f5751ea5abdded60fa314d))
-
-
-
-## [1.2.66](https://github.com/things-scene/operato-scene/compare/v1.2.65...v1.2.66) (2023-09-14)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [1.2.65](https://github.com/things-scene/operato-scene/compare/v1.2.64...v1.2.65) (2023-09-14)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [1.2.62](https://github.com/things-scene/operato-scene/compare/v1.2.61...v1.2.62) (2023-09-11)
-
-**Note:** Version bump only for package @operato/scene-openlayers
-
-
-
-
-
-## [1.2.60](https://github.com/things-scene/operato-scene/compare/v1.2.59...v1.2.60) (2023-09-08)
-
-
-### :bug: Bug Fix
-
-* add scene-auth module ([633fedd](https://github.com/things-scene/operato-scene/commit/633feddf91125bc45d1a4dae756588d6601ef859))
-
-
-
-## [1.2.56](https://github.com/things-scene/operato-scene/compare/v1.2.55...v1.2.56) (2023-09-05)
-
-
-### :bug: Bug Fix
-
-* help for openlayers ([1d08ef7](https://github.com/things-scene/operato-scene/commit/1d08ef7d7a5795b3bea2ef5a3bbc31deddc5d73d))
-* openlayers ([4e1c405](https://github.com/things-scene/operato-scene/commit/4e1c4051947f983ae23fd74c28be708d2aeef136))
-* openlayers icon ([7495944](https://github.com/things-scene/operato-scene/commit/7495944206026ec36f06415d93a32e0d2dd27091))
-
-
-
-## [1.2.55](https://github.com/things-scene/operato-scene/compare/v1.2.54...v1.2.55) (2023-09-03)
-
-
-### :bug: Bug Fix
-
-* openlayers ([b7b5e4b](https://github.com/things-scene/operato-scene/commit/b7b5e4bd843de1af28a0dba29e278545a3c9c46a))
-
-
-
-## [1.2.54](https://github.com/things-scene/operato-scene/compare/v1.2.53...v1.2.54) (2023-09-03)
-
-
-### :bug: Bug Fix
-
-* add openlayers module ([2e3aec2](https://github.com/things-scene/operato-scene/commit/2e3aec223d9b82afa18ad0953d1121c5e9ff9787))

package/src/groups/geography.ts

@@ -1,48 +0,0 @@
-const icon = `
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 35 35" style="enable-background:new 0 0 35 35;" xml:space="preserve">
-  <style type="text/css">
-    .st0{fill:{{strokeColor}};}
-  </style>
-  <g>
-    <g>
-      <path class="st0" d="M33.2,15.2v4.6h-4.6v-4.6H33.2 M34,14.4h-6.1v6.1H34V14.4L34,14.4z"/>
-    </g>
-    <g>
-      <g>
-        <path class="st0" d="M17.5,15.3l2.2,2.2l-2.2,2.2l-2.2-2.2L17.5,15.3 M17.5,14.2l-3.3,3.3l3.3,3.3l3.3-3.3L17.5,14.2L17.5,14.2z"
-          />
-      </g>
-      <g>
-        <path class="st0" d="M19.8,7.2v4.6h-4.6V7.2H19.8 M20.6,6.5h-6.1v6.1h6.1V6.5L20.6,6.5z"/>
-      </g>
-      <g>
-        <path class="st0" d="M19.8,23.1v4.6h-4.6v-4.6H19.8 M20.6,22.4h-6.1v6.1h6.1V22.4L20.6,22.4z"/>
-      </g>
-    </g>
-    <g>
-      <g>
-        <polygon class="st0" points="13.3,17.4 10.6,19.6 10.6,15.2 13.3,17.4 			"/>
-      </g>
-      <rect x="8.2" y="16.9" class="st0" width="3.4" height="0.9"/>
-    </g>
-    <g>
-      <g>
-        <polygon class="st0" points="26.8,17.4 24,19.6 24,15.2 26.8,17.4 			"/>
-      </g>
-      <rect x="21.7" y="16.9" class="st0" width="3.4" height="0.9"/>
-    </g>
-    <g>
-      <path class="st0" d="M4.1,15.2c1.3,0,2.3,1,2.3,2.3s-1,2.3-2.3,2.3s-2.3-1-2.3-2.3S2.8,15.2,4.1,15.2 M4.1,14.4
-        c-1.7,0-3.1,1.4-3.1,3.1c0,1.7,1.4,3.1,3.1,3.1s3.1-1.4,3.1-3.1C7.1,15.8,5.8,14.4,4.1,14.4L4.1,14.4z"/>
-    </g>
-  </g>
-</svg>
-`
-
-export const geography = {
-  name: 'geography',
-  description: 'a group of Geographic Components',
-  icon,
-  templates: []
-}

package/src/groups/index.ts

@@ -1,3 +0,0 @@
-import { geography } from './geography'
-
-export default [geography]

package/src/index.ts

@@ -1,2 +0,0 @@
-export { default as Openlayers } from './openlayers'
-export { default as OpenLayersMarker } from './ol-marker'

package/src/ol-marker.ts

@@ -1,310 +0,0 @@
-/*
- * Copyright © HatioLab Inc. All rights reserved.
- */
-
-import {
-  Component,
-  InfoWindow as SceneInfoWindow,
-  Properties,
-  RectPath,
-  Shape,
-  ComponentNature
-} from '@hatiolab/things-scene'
-import Openlayers from './openlayers'
-
-import 'ol/ol.css'
-import { Map, MapBrowserEvent, Overlay, View } from 'ol'
-import { fromLonLat } from 'ol/proj'
-import { Tile as TileLayer, Vector as VectorLayer } from 'ol/layer'
-import { OSM, Vector as VectorSource } from 'ol/source'
-import { Icon, Style } from 'ol/style'
-import { Feature } from 'ol'
-import { Geometry, Point } from 'ol/geom'
-
-const NATURE: ComponentNature = {
-  mutable: false,
-  resizable: true,
-  rotatable: true,
-  properties: [
-    {
-      type: 'id-input',
-      label: 'target-map',
-      name: 'targetMap',
-      property: {
-        component: 'openlayers'
-      }
-    },
-    {
-      type: 'number',
-      label: 'latitude',
-      name: 'lat',
-      property: {
-        step: 0.000001,
-        max: 90,
-        min: -90
-      }
-    },
-    {
-      type: 'number',
-      label: 'longitude',
-      name: 'lng',
-      property: {
-        step: 0.000001,
-        max: 180,
-        min: -180
-      }
-    },
-    {
-      type: 'select',
-      label: 'style',
-      name: 'style',
-      property: {
-        options: ['circle', 'marker']
-      }
-    }
-  ],
-  'value-property': 'latlng',
-  help: 'scene/component/ol-marker'
-}
-
-const MARKER_PATH = 'M10 0 C14.42 0 18 3.58 18 8 C18 12.42 14.42 16 10 16 C5.58 16 2 12.42 2 8 C2 3.58 5.58 0 10 0 Z'
-
-export default class OpenLayersMarker extends RectPath(Shape) {
-  _infoWindow: any
-  _marker: any
-  _map: Map | null = null
-
-  static markerStyle: Style = new Style({
-    image: new Icon({
-      anchor: [0.5, 1], // 이미지 중심 아래쪽을 지도 위치에 맞춤
-      src:
-        'data:image/svg+xml;charset=utf-8,' +
-        encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">' + MARKER_PATH + '</svg>')
-    })
-  })
-
-  dispose() {
-    this.detachFromOldOpenlayers(this.targetMap)
-
-    this.marker = null
-    delete this._infoWindow
-
-    super.dispose()
-  }
-
-  ready() {
-    super.ready()
-
-    if (this.isTemplate()) {
-      return
-    }
-
-    this.attachToNewOpenlayers(this.targetMap)
-  }
-
-  get map() {
-    return this._map
-  }
-
-  get infoWindow() {
-    if (!this._infoWindow) {
-      this._infoWindow = new Overlay({
-        element: document.getElementById('info')!,
-        positioning: 'bottom-center',
-        stopEvent: false
-      })
-    }
-
-    return this._infoWindow
-  }
-
-  findInfoWindow(type: string) {
-    var eventSetting = (this.state.event && this.state.event[type]) || {}
-
-    var infoWindow =
-      /* event spec v1.0 */ eventSetting.infoWindow ||
-      /* event spec v1.1 */ (eventSetting.action == 'infoWindow' && eventSetting.target)
-
-    if (infoWindow) {
-      return this.root.findById(infoWindow)
-    }
-  }
-
-  setInfoContent(sceneInfoWindow: SceneInfoWindow) {
-    var tpl = Component.template(sceneInfoWindow.model.frontSideTemplate)
-    var content = `<style>${sceneInfoWindow.model.style}</style>` + tpl(this)
-
-    this.infoWindow.setContent(content)
-  }
-
-  openInfoWindow(iw: SceneInfoWindow) {
-    this.setInfoContent(iw)
-
-    if (!this.map) return
-
-    this.infoWindow.open(this.map, this.marker)
-  }
-
-  onmarkerclick(e: MapBrowserEvent<UIEvent>) {
-    var iw = this.findInfoWindow('tap')
-    iw && this.openInfoWindow(iw)
-
-    // this.trigger('click', e.ya) ??????
-  }
-
-  onmarkermouseover(e: MapBrowserEvent<UIEvent>) {
-    var iw = this.findInfoWindow('hover')
-    iw && this.openInfoWindow(iw)
-  }
-
-  onmarkermouseout(e: MapBrowserEvent<UIEvent>) {
-    var iw = this.findInfoWindow('hover')
-    iw && this.infoWindow.close()
-  }
-
-  set marker(marker) {
-    this._marker = marker
-  }
-
-  get marker() {
-    return this._marker
-  }
-
-  render(context: CanvasRenderingContext2D) {
-    var { top, left, width, height } = this.state
-
-    context.translate(left, top)
-
-    // 마커 모양 그리기
-    context.beginPath()
-
-    context.moveTo(width / 2, height * 0.9)
-    context.bezierCurveTo(width / 2.3, height * 0.6, 0, height / 2, 0, height / 4)
-
-    context.ellipse(width / 2, height / 4, width / 2, height / 4, 0, Math.PI * 1, Math.PI * 0)
-
-    context.bezierCurveTo(width, height / 2, width / 1.7, height * 0.6, width / 2, height * 0.9)
-    context.closePath()
-
-    context.translate(-left, -top)
-  }
-
-  detachFromOldOpenlayers(map: Openlayers) {
-    if (this._marker && map) {
-      map.vectorSource?.removeFeature(this._marker)
-      this._marker = null
-    }
-  }
-
-  attachToNewOpenlayers(map: Openlayers) {
-    if (!this._marker && map) {
-      let {
-        lat,
-        lng,
-        style = 'circle',
-        fillStyle: fillColor,
-        alpha: fillOpacity = 1,
-        strokeStyle: strokeColor,
-        lineWidth: strokeWeight
-      } = this.state
-
-      const marker = new Feature<Geometry>({
-        type: style,
-        geometry: new Point(fromLonLat([lng || 0, lat || 0]))
-      })
-
-      map.vectorSource?.addFeatures([marker])
-
-      if (marker) {
-        //@ts-ignore
-        marker.on('click', this.onmarkerclick.bind(this))
-        //@ts-ignore
-        marker.on('mouseover', this.onmarkermouseover.bind(this))
-        //@ts-ignore
-        marker.on('mouseout', this.onmarkermouseout.bind(this))
-      }
-
-      this._marker = marker
-    }
-  }
-
-  onchangeTargetMap(after: string, before: string) {
-    const oldMap = this.root.findById(before) as Openlayers
-    const newMap = this.root.findById(after) as Openlayers
-
-    this.detachFromOldOpenlayers(oldMap)
-    this.attachToNewOpenlayers(newMap)
-  }
-
-  get targetMap() {
-    const { targetMap } = this.state
-    return this.root.findById(targetMap) as Openlayers
-  }
-
-  onchange(after: Properties, before: Properties) {
-    if ('targetMap' in after) {
-      this.onchangeTargetMap(after.targetMap, before.targetMap)
-    }
-
-    if ('lat' in after || 'lng' in after) {
-      var { lat, lng } = this.state
-      this.latlng = {
-        lat,
-        lng
-      }
-    }
-
-    if (('fillStyle' in after || 'strokeStyle' in after || 'lineWidth' in after) && this.marker) {
-      let {
-        fillStyle: fillColor,
-        alpha: fillOpacity = 1,
-        strokeStyle: strokeColor,
-        lineWidth: strokeWeight
-      } = this.state
-
-      this.marker.setIcon({
-        path: MARKER_PATH,
-        fillColor,
-        fillOpacity,
-        strokeColor,
-        strokeWeight
-      })
-    }
-
-    if ('style' in after) {
-      const { targetMap } = this.state
-      this.onchangeTargetMap(targetMap, targetMap)
-    }
-
-    super.onchange && super.onchange(after, before)
-  }
-
-  get latlng() {
-    return {
-      lat: this.getState('lat'),
-      lng: this.getState('lng')
-    }
-  }
-
-  set latlng(latlng) {
-    var { lat, lng } = latlng
-
-    if (this.marker) {
-      const geometry = this.marker.getGeometry()
-      if (geometry instanceof Point) {
-        geometry.setCoordinates(fromLonLat([lng, lat]))
-      }
-    }
-
-    this.setState({
-      lat,
-      lng
-    })
-  }
-
-  get nature() {
-    return NATURE
-  }
-}
-
-Component.register('ol-marker', OpenLayersMarker)