From 3797acc1f3d69e11922e19f7587be7d6eb95b5cb Mon Sep 17 00:00:00 2001 From: "Kishida, Keisuke" Date: Wed, 27 Nov 2024 14:58:48 +0900 Subject: [PATCH 01/11] feature-support HARP engine Signed-off-by: Keisuke Kishida --- LICENSE | 2 +- README.md | 2 +- docs/source/conf.py | 2 +- here_map_widget/LICENSE | 2 +- here_map_widget/__init__.py | 2 +- here_map_widget/_version.py | 2 +- here_map_widget/configs.py | 2 +- here_map_widget/map.py | 2 +- js/LICENSE | 2 +- js/lib/Map.js | 8 +++++--- js/lib/control/Control.js | 6 +++--- js/lib/control/DistanceMeasurementControl.js | 2 +- js/lib/control/FullscreenControl.js | 2 +- js/lib/control/LayersControl.js | 2 +- js/lib/control/MapSettingsControl.js | 2 +- js/lib/control/ScaleBar.js | 2 +- js/lib/control/SearchControl.js | 2 +- js/lib/control/SplitMapControl.js | 2 +- js/lib/control/WidgetControl.js | 2 +- js/lib/control/ZoomControl.js | 2 +- js/lib/control/ZoomRectangle.js | 2 +- js/lib/element/.Element.js.swp | Bin 0 -> 12288 bytes js/lib/element/Element.js | 6 +++--- js/lib/element/InfoBubble.js | 2 +- js/lib/element/Style.js | 2 +- js/lib/embed.js | 2 +- js/lib/extension.js | 2 +- js/lib/geometrys/Geometry.js | 6 +++--- js/lib/geometrys/LineString.js | 2 +- js/lib/geometrys/MultiLineString.js | 2 +- js/lib/geometrys/MultiPolygon.js | 2 +- js/lib/geometrys/Point.js | 2 +- js/lib/geometrys/Polygon.js | 2 +- js/lib/geometrys/Rect.js | 2 +- js/lib/geometrys/WKT.js | 2 +- js/lib/index.js | 2 +- js/lib/jupyter-map.js | 2 +- js/lib/labplugin.js | 2 +- js/lib/layers/GeoJSON.js | 2 +- js/lib/layers/Kml.js | 2 +- js/lib/layers/Layer.js | 6 +++--- js/lib/layers/ObjectLayer.js | 2 +- js/lib/layers/TileLayer.js | 2 +- js/lib/notebook.js | 2 +- js/lib/objects/Circle.js | 2 +- js/lib/objects/DomIcon.js | 2 +- js/lib/objects/DomMarker.js | 2 +- js/lib/objects/Group.js | 2 +- js/lib/objects/Icon.js | 2 +- js/lib/objects/Marker.js | 2 +- js/lib/objects/Object.js | 6 +++--- js/lib/objects/Overlay.js | 2 +- js/lib/objects/Polygon.js | 2 +- js/lib/objects/Polyline.js | 2 +- js/lib/objects/Rectangle.js | 2 +- js/lib/provider/HeatMap.js | 2 +- js/lib/provider/IML.js | 2 +- js/lib/provider/ImageTile.js | 2 +- js/lib/provider/MapTile.js | 2 +- js/lib/provider/MarkerCluster.js | 2 +- js/lib/provider/OMV.js | 10 ++++++---- js/lib/provider/Provider.js | 6 +++--- js/lib/provider/XYZ.js | 2 +- js/lib/service/DefaultLayers.js | 8 +++++--- js/lib/service/Platform.js | 2 +- js/lib/service/Service.js | 6 +++--- js/package.json | 2 +- js/webpack.config.js | 2 +- setup.py | 5 +++-- 69 files changed, 97 insertions(+), 90 deletions(-) create mode 100644 js/lib/element/.Element.js.swp diff --git a/LICENSE b/LICENSE index 3d6e59c..bfb0850 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (C) 2019-2021 HERE Europe B.V. +Copyright (C) 2019-2024 HERE Europe B.V. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index d8180d9..96f883e 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,6 @@ Below projects use `here-map-widget-for-jupyter` as plotting backend ## License -Copyright (C) 2019-2021 HERE Europe B.V. +Copyright (C) 2019-2024 HERE Europe B.V. Unless otherwise noted in `LICENSE` files for specific directories, the [LICENSE](https://github.com/heremaps/here-map-widget-for-jupyter/raw/master/LICENSE) in the root applies to all content in this repository. diff --git a/docs/source/conf.py b/docs/source/conf.py index b1713db..02ae621 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -16,7 +16,7 @@ def setup(app): # General information about the project. project = "HERE Map Widget for Jupyter" -copyright = "Copyright (C) 2019-2021 HERE Europe B.V." +copyright = "Copyright (C) 2019-2024 HERE Europe B.V." author = "HERE Europe B.V." exclude_patterns = [] diff --git a/here_map_widget/LICENSE b/here_map_widget/LICENSE index 3d6e59c..bfb0850 100644 --- a/here_map_widget/LICENSE +++ b/here_map_widget/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (C) 2019-2021 HERE Europe B.V. +Copyright (C) 2019-2024 HERE Europe B.V. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/here_map_widget/__init__.py b/here_map_widget/__init__.py index a72d30e..a5df340 100644 --- a/here_map_widget/__init__.py +++ b/here_map_widget/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 HERE Europe B.V. +# Copyright (C) 2019-2024 HERE Europe B.V. # SPDX-License-Identifier: MIT """HERE Map Widget for Jupyter - use HERE Maps API for diff --git a/here_map_widget/_version.py b/here_map_widget/_version.py index 34bd0ee..ab47ddd 100644 --- a/here_map_widget/_version.py +++ b/here_map_widget/_version.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 HERE Europe B.V. +# Copyright (C) 2019-2024 HERE Europe B.V. # SPDX-License-Identifier: MIT """Project version information.""" diff --git a/here_map_widget/configs.py b/here_map_widget/configs.py index 9750deb..e850f4e 100644 --- a/here_map_widget/configs.py +++ b/here_map_widget/configs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 HERE Europe B.V. +# Copyright (C) 2019-2024 HERE Europe B.V. # SPDX-License-Identifier: MIT """ diff --git a/here_map_widget/map.py b/here_map_widget/map.py index bb8161c..435cdf5 100644 --- a/here_map_widget/map.py +++ b/here_map_widget/map.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 HERE Europe B.V. +# Copyright (C) 2019-2024 HERE Europe B.V. # SPDX-License-Identifier: MIT """ diff --git a/js/LICENSE b/js/LICENSE index 3d6e59c..bfb0850 100644 --- a/js/LICENSE +++ b/js/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (C) 2019-2021 HERE Europe B.V. +Copyright (C) 2019-2024 HERE Europe B.V. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/js/lib/Map.js b/js/lib/Map.js index 848576a..3e760b2 100644 --- a/js/lib/Map.js +++ b/js/lib/Map.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' const DEFAULT_LOCATION = [20.5937, 78.9629]; @@ -207,12 +207,14 @@ export class MapView extends widgets.DOMWidgetView { create_map() { //Step 2: initialize a map var pixelRatio = window.devicePixelRatio || 1; + const engineType = H.Map.EngineType["HARP"]; var map = new H.Map(this.map_container, this.basemap, { center: { lat: this.model.get('center')[0], lng: this.model.get('center')[1] }, + engineType, zoom: this.model.get('zoom'), pixelRatio: pixelRatio }); @@ -463,4 +465,4 @@ export class MapView extends widgets.DOMWidgetView { } } -} \ No newline at end of file +} diff --git a/js/lib/control/Control.js b/js/lib/control/Control.js index 290af3b..ed7cff9 100644 --- a/js/lib/control/Control.js +++ b/js/lib/control/Control.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' export class ControlModel extends widgets.WidgetModel { defaults() { @@ -32,4 +32,4 @@ export class ControlView extends widgets.WidgetView { this.model_events(); }); } -} \ No newline at end of file +} diff --git a/js/lib/control/DistanceMeasurementControl.js b/js/lib/control/DistanceMeasurementControl.js index c90eefd..0f0b5da 100644 --- a/js/lib/control/DistanceMeasurementControl.js +++ b/js/lib/control/DistanceMeasurementControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/FullscreenControl.js b/js/lib/control/FullscreenControl.js index 8045922..94a3396 100644 --- a/js/lib/control/FullscreenControl.js +++ b/js/lib/control/FullscreenControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/LayersControl.js b/js/lib/control/LayersControl.js index b47bd30..47d0f74 100644 --- a/js/lib/control/LayersControl.js +++ b/js/lib/control/LayersControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/MapSettingsControl.js b/js/lib/control/MapSettingsControl.js index 156ffdf..5c598e5 100644 --- a/js/lib/control/MapSettingsControl.js +++ b/js/lib/control/MapSettingsControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/ScaleBar.js b/js/lib/control/ScaleBar.js index bbf478a..4c1f87a 100644 --- a/js/lib/control/ScaleBar.js +++ b/js/lib/control/ScaleBar.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/SearchControl.js b/js/lib/control/SearchControl.js index 1084388..9540f53 100644 --- a/js/lib/control/SearchControl.js +++ b/js/lib/control/SearchControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/SplitMapControl.js b/js/lib/control/SplitMapControl.js index 7f93f73..526366c 100644 --- a/js/lib/control/SplitMapControl.js +++ b/js/lib/control/SplitMapControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/WidgetControl.js b/js/lib/control/WidgetControl.js index 74a365d..a981bcb 100644 --- a/js/lib/control/WidgetControl.js +++ b/js/lib/control/WidgetControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/ZoomControl.js b/js/lib/control/ZoomControl.js index 1ccd3d3..7bc2352 100644 --- a/js/lib/control/ZoomControl.js +++ b/js/lib/control/ZoomControl.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/control/ZoomRectangle.js b/js/lib/control/ZoomRectangle.js index 79b4dfa..e3566b7 100644 --- a/js/lib/control/ZoomRectangle.js +++ b/js/lib/control/ZoomRectangle.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const control = require('./Control.js'); diff --git a/js/lib/element/.Element.js.swp b/js/lib/element/.Element.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..bcc0681e6a72bb74e13ef1cd5f691dd95ebcc324 GIT binary patch literal 12288 zcmeI2O=}ZD7=WiDc+jfoQ4eE1WK+7cX#}m6O0fo7Fi^j0Z*h`+(@fm#t~0Y~Yf%rL z6%QUgsXsvQ;7{-_{sT`I4sX(EZJsdVXn?6M3rGV z$k?f9YH9IPZ_n@$V>*g#`uK09-GT{U`b}S+ocL2;Z#mL8e5E}L##X(q@dDNKAb=i( z)~n^U=$b#xL2YD!3~blHFgsBlucV`oj~wHN4_)2vL^O^JkO4A42FL&zAOmE843L2x zXu!rp>@McLtH^z%sPXkbD;srjOBER)17v^ab38}I*L4lwo_d4W7f?jRC5iX1`S?q}=`@(Ou|+(WJ-W60-W#y%kLk#*!9 z@)UW31jt3iLv|w!`HHbWA}^80$Rp$-lIC8So#ksdtA@}AjrVH|@A7zg6d5=A3YPg)9yN-sib9NDJkL`yNeo)3P+27dbqkzW zYS{w|+GLsiz6FE9N*rm+TY)r&7oR&Xq~T!2VoHWDD}M>B5!bRhYr+(Zp7m6LFrf3O z+F+Iqkq>n?kNl-8=EVlwZm4bKTJf3$Fv&~P9nj$6YTbN3w;gG>o5ZWQw$fO!ADN+a z@MYnN)gmgp!3eoib1=8dv%sCZUp literal 0 HcmV?d00001 diff --git a/js/lib/element/Element.js b/js/lib/element/Element.js index 2718dd5..ce9c900 100644 --- a/js/lib/element/Element.js +++ b/js/lib/element/Element.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' export class ElementModel extends widgets.WidgetModel { defaults() { @@ -31,4 +31,4 @@ export class ElementView extends widgets.WidgetView { this.model_events(); }); } -} \ No newline at end of file +} diff --git a/js/lib/element/InfoBubble.js b/js/lib/element/InfoBubble.js index 4b2a6bc..3a8fa91 100644 --- a/js/lib/element/InfoBubble.js +++ b/js/lib/element/InfoBubble.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const element = require('./Element.js'); diff --git a/js/lib/element/Style.js b/js/lib/element/Style.js index 8ed2182..74119e4 100644 --- a/js/lib/element/Style.js +++ b/js/lib/element/Style.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const element = require('./Element.js'); diff --git a/js/lib/embed.js b/js/lib/embed.js index 4f9c5b8..c3125b1 100644 --- a/js/lib/embed.js +++ b/js/lib/embed.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/js/lib/extension.js b/js/lib/extension.js index 8a32a3b..bef90b1 100644 --- a/js/lib/extension.js +++ b/js/lib/extension.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/js/lib/geometrys/Geometry.js b/js/lib/geometrys/Geometry.js index cb38441..1a3d9d2 100644 --- a/js/lib/geometrys/Geometry.js +++ b/js/lib/geometrys/Geometry.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' export class GeometryModel extends widgets.WidgetModel { defaults() { @@ -30,4 +30,4 @@ export class GeometryView extends widgets.WidgetView { this.model_events(); }); } -} \ No newline at end of file +} diff --git a/js/lib/geometrys/LineString.js b/js/lib/geometrys/LineString.js index 1b02dd8..2325db7 100644 --- a/js/lib/geometrys/LineString.js +++ b/js/lib/geometrys/LineString.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/geometrys/MultiLineString.js b/js/lib/geometrys/MultiLineString.js index d15525b..cfc2fbe 100644 --- a/js/lib/geometrys/MultiLineString.js +++ b/js/lib/geometrys/MultiLineString.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/geometrys/MultiPolygon.js b/js/lib/geometrys/MultiPolygon.js index d9b04ab..a1333b7 100644 --- a/js/lib/geometrys/MultiPolygon.js +++ b/js/lib/geometrys/MultiPolygon.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/geometrys/Point.js b/js/lib/geometrys/Point.js index 9c4b859..b83b72a 100644 --- a/js/lib/geometrys/Point.js +++ b/js/lib/geometrys/Point.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/geometrys/Polygon.js b/js/lib/geometrys/Polygon.js index d28b83f..69a9d84 100644 --- a/js/lib/geometrys/Polygon.js +++ b/js/lib/geometrys/Polygon.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/geometrys/Rect.js b/js/lib/geometrys/Rect.js index 641f5cc..1f90f21 100644 --- a/js/lib/geometrys/Rect.js +++ b/js/lib/geometrys/Rect.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/geometrys/WKT.js b/js/lib/geometrys/WKT.js index ea557db..c0ee803 100644 --- a/js/lib/geometrys/WKT.js +++ b/js/lib/geometrys/WKT.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const geometry = require('./Geometry.js'); diff --git a/js/lib/index.js b/js/lib/index.js index 0443c41..dcf9a97 100644 --- a/js/lib/index.js +++ b/js/lib/index.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/js/lib/jupyter-map.js b/js/lib/jupyter-map.js index f4b2db5..fd39819 100644 --- a/js/lib/jupyter-map.js +++ b/js/lib/jupyter-map.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/js/lib/labplugin.js b/js/lib/labplugin.js index f52e95a..90a851f 100644 --- a/js/lib/labplugin.js +++ b/js/lib/labplugin.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/js/lib/layers/GeoJSON.js b/js/lib/layers/GeoJSON.js index cea0fde..537171c 100644 --- a/js/lib/layers/GeoJSON.js +++ b/js/lib/layers/GeoJSON.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const layer = require('./Layer.js'); diff --git a/js/lib/layers/Kml.js b/js/lib/layers/Kml.js index 0e1b2e4..c9dab5f 100644 --- a/js/lib/layers/Kml.js +++ b/js/lib/layers/Kml.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const layer = require('./Layer.js'); diff --git a/js/lib/layers/Layer.js b/js/lib/layers/Layer.js index 97d75bb..41ddabc 100644 --- a/js/lib/layers/Layer.js +++ b/js/lib/layers/Layer.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' export class LayerModel extends widgets.WidgetModel { defaults() { @@ -34,4 +34,4 @@ export class LayerView extends widgets.WidgetView { this.mapjs_events(); }); } -} \ No newline at end of file +} diff --git a/js/lib/layers/ObjectLayer.js b/js/lib/layers/ObjectLayer.js index 04d8157..058c279 100644 --- a/js/lib/layers/ObjectLayer.js +++ b/js/lib/layers/ObjectLayer.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const layer = require('./Layer.js'); diff --git a/js/lib/layers/TileLayer.js b/js/lib/layers/TileLayer.js index 3161d2b..5c8b243 100644 --- a/js/lib/layers/TileLayer.js +++ b/js/lib/layers/TileLayer.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const layer = require('./Layer.js'); diff --git a/js/lib/notebook.js b/js/lib/notebook.js index d54d12e..455d70f 100644 --- a/js/lib/notebook.js +++ b/js/lib/notebook.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/js/lib/objects/Circle.js b/js/lib/objects/Circle.js index c771c5f..9f81f75 100644 --- a/js/lib/objects/Circle.js +++ b/js/lib/objects/Circle.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/DomIcon.js b/js/lib/objects/DomIcon.js index e6747e5..d2d0b0a 100644 --- a/js/lib/objects/DomIcon.js +++ b/js/lib/objects/DomIcon.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/DomMarker.js b/js/lib/objects/DomMarker.js index 8c139c9..d4bb7eb 100644 --- a/js/lib/objects/DomMarker.js +++ b/js/lib/objects/DomMarker.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Group.js b/js/lib/objects/Group.js index 2ff3b25..ad6e993 100644 --- a/js/lib/objects/Group.js +++ b/js/lib/objects/Group.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Icon.js b/js/lib/objects/Icon.js index 81ba260..85cbc10 100644 --- a/js/lib/objects/Icon.js +++ b/js/lib/objects/Icon.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Marker.js b/js/lib/objects/Marker.js index 5b63a3a..cd50014 100644 --- a/js/lib/objects/Marker.js +++ b/js/lib/objects/Marker.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Object.js b/js/lib/objects/Object.js index aad9397..3cb4632 100644 --- a/js/lib/objects/Object.js +++ b/js/lib/objects/Object.js @@ -1,9 +1,9 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' const _ = require('lodash'); export class ObjectModel extends widgets.WidgetModel { @@ -34,4 +34,4 @@ export class ObjectView extends widgets.WidgetView { this.mapjs_events(); }); } -} \ No newline at end of file +} diff --git a/js/lib/objects/Overlay.js b/js/lib/objects/Overlay.js index 8b79bd4..20a64db 100644 --- a/js/lib/objects/Overlay.js +++ b/js/lib/objects/Overlay.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Polygon.js b/js/lib/objects/Polygon.js index 5fe7abd..0a3bc6a 100644 --- a/js/lib/objects/Polygon.js +++ b/js/lib/objects/Polygon.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Polyline.js b/js/lib/objects/Polyline.js index 88f6106..1090f02 100644 --- a/js/lib/objects/Polyline.js +++ b/js/lib/objects/Polyline.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/objects/Rectangle.js b/js/lib/objects/Rectangle.js index eee49d4..959f6be 100644 --- a/js/lib/objects/Rectangle.js +++ b/js/lib/objects/Rectangle.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const object = require('./Object.js'); diff --git a/js/lib/provider/HeatMap.js b/js/lib/provider/HeatMap.js index 8e44b4a..9d0e999 100644 --- a/js/lib/provider/HeatMap.js +++ b/js/lib/provider/HeatMap.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); diff --git a/js/lib/provider/IML.js b/js/lib/provider/IML.js index 1488197..4f0a06f 100644 --- a/js/lib/provider/IML.js +++ b/js/lib/provider/IML.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); diff --git a/js/lib/provider/ImageTile.js b/js/lib/provider/ImageTile.js index 022b39e..84b33d1 100644 --- a/js/lib/provider/ImageTile.js +++ b/js/lib/provider/ImageTile.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); diff --git a/js/lib/provider/MapTile.js b/js/lib/provider/MapTile.js index aac2565..2727a76 100644 --- a/js/lib/provider/MapTile.js +++ b/js/lib/provider/MapTile.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); diff --git a/js/lib/provider/MarkerCluster.js b/js/lib/provider/MarkerCluster.js index 074afb8..5845d44 100644 --- a/js/lib/provider/MarkerCluster.js +++ b/js/lib/provider/MarkerCluster.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); diff --git a/js/lib/provider/OMV.js b/js/lib/provider/OMV.js index f2d564a..f1b2222 100644 --- a/js/lib/provider/OMV.js +++ b/js/lib/provider/OMV.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); @@ -39,12 +39,14 @@ export class OMVView extends provider.ProviderView { return Promise.all([pltform_promise, style_promise]).then(result => { const pltform_view = result[0]; const style_view = result[1]; + const engineType = H.Map.EngineType["HARP"]; const platform = pltform_view !== null ? pltform_view.obj : null; - const st = style_view !== null ? style_view.obj : null; + const config = style_view !== null ? style_view.obj.po : null; + const st = new H.map.render.harp.Style(config); var omvService = platform.getOMVService({ path: this.model.get('path') }); - this.obj = new H.service.omv.Provider(omvService, st); + this.obj = new H.service.omv.Provider(omvService, st, {engineType, lg:"ja",}); }); } @@ -52,4 +54,4 @@ export class OMVView extends provider.ProviderView { mapjs_events() {} -} \ No newline at end of file +} diff --git a/js/lib/provider/Provider.js b/js/lib/provider/Provider.js index 4676684..f7ab903 100644 --- a/js/lib/provider/Provider.js +++ b/js/lib/provider/Provider.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' export class ProviderModel extends widgets.WidgetModel { defaults() { @@ -32,4 +32,4 @@ export class ProviderView extends widgets.WidgetView { this.mapjs_events(); }); } -} \ No newline at end of file +} diff --git a/js/lib/provider/XYZ.js b/js/lib/provider/XYZ.js index 9eeb611..f99c80d 100644 --- a/js/lib/provider/XYZ.js +++ b/js/lib/provider/XYZ.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const provider = require('./Provider.js'); diff --git a/js/lib/service/DefaultLayers.js b/js/lib/service/DefaultLayers.js index 3f01309..7c37c60 100644 --- a/js/lib/service/DefaultLayers.js +++ b/js/lib/service/DefaultLayers.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const service = require('./Service.js'); @@ -30,12 +30,14 @@ export class DefaultLayersView extends service.ServiceView { } create_obj() { var ppi = this.model.get('ppi') === null ? undefined : this.model.get('ppi'); + const engineType = H.Map.EngineType['HARP']; var platform = new H.service.Platform({ apikey: this.map_view.model.get('api_key') }); var defaultLayers = platform.createDefaultLayers({ tileSize: this.model.get('tile_size'), - ppi: ppi + ppi: ppi, + engineType, }); this.obj = _.get(defaultLayers, this.model.get('layer_name')); } @@ -46,4 +48,4 @@ export class DefaultLayersView extends service.ServiceView { // } -} \ No newline at end of file +} diff --git a/js/lib/service/Platform.js b/js/lib/service/Platform.js index cd6aab5..38cac6d 100644 --- a/js/lib/service/Platform.js +++ b/js/lib/service/Platform.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const service = require('./Service.js'); diff --git a/js/lib/service/Service.js b/js/lib/service/Service.js index 32ffe79..5b4fa90 100644 --- a/js/lib/service/Service.js +++ b/js/lib/service/Service.js @@ -1,10 +1,10 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ const widgets = require('@jupyter-widgets/base'); const _ = require('lodash'); -import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle' +import H from '@here/maps-api-for-javascript/bin/mapsjs.bundle.harp' export class ServiceModel extends widgets.WidgetModel { defaults() { @@ -31,4 +31,4 @@ export class ServiceView extends widgets.WidgetView { this.mapjs_events(); }); } -} \ No newline at end of file +} diff --git a/js/package.json b/js/package.json index 76f680e..f562872 100644 --- a/js/package.json +++ b/js/package.json @@ -51,7 +51,7 @@ "@jupyterlab/builder": "^3.0.0" }, "dependencies": { - "@here/maps-api-for-javascript": "^1.20.0", + "@here/maps-api-for-javascript": "^1.60.0", "@jupyter-widgets/base": "^2 || ^3 || ^4", "@phosphor/messaging": "^1.3.0", "@phosphor/widgets": "^1.9.3", diff --git a/js/webpack.config.js b/js/webpack.config.js index 32414d9..84506c7 100644 --- a/js/webpack.config.js +++ b/js/webpack.config.js @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 HERE Europe B.V. + Copyright (C) 2019-2024 HERE Europe B.V. SPDX-License-Identifier: MIT */ diff --git a/setup.py b/setup.py index f131fd6..6709f91 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 HERE Europe B.V. +# Copyright (C) 2019-2024 HERE Europe B.V. # SPDX-License-Identifier: MIT """Project setup file.""" @@ -45,7 +45,8 @@ cmdclass = create_cmdclass("jsdeps", data_files_spec=data_files_spec) js_command = combine_commands( - install_npm(js_dir, npm=["yarn"], build_cmd="build:extensions"), + #install_npm(js_dir, npm=["yarn"], build_cmd="build:extensions"), + install_npm(js_dir, npm=["npm"], build_cmd="build:extensions"), ensure_targets(jstargets), ) From d88acdab092fba9443156042b419a9bebe72445f Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 17:27:55 +0900 Subject: [PATCH 02/11] feature-support HARP engine again to follow guideline Signed-off-by: Keisuke Kishida --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6709f91..6d3ed7b 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ cmdclass = create_cmdclass("jsdeps", data_files_spec=data_files_spec) js_command = combine_commands( - #install_npm(js_dir, npm=["yarn"], build_cmd="build:extensions"), + # install_npm(js_dir, npm=["yarn"], build_cmd="build:extensions"), install_npm(js_dir, npm=["npm"], build_cmd="build:extensions"), ensure_targets(jstargets), ) From 39dc369333f07f78d9e1627a57c2d82d9c333b5c Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 08:48:11 +0000 Subject: [PATCH 03/11] feature-support HARP engine again to follow guideline #2 Signed-off-by: Keisuke Kishida --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3fed16..a6d979c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.8, 3.9] + python-version: [3.9,3.10,3.11,3.12] steps: - uses: actions/checkout@v2 @@ -35,7 +35,7 @@ jobs: run: mamba install python=${{ matrix.python-version }} pip nodejs jupyter-packaging - name: Mamba install JupyterLab 3 - run: mamba install jupyterlab=3 ipywidgets=7.6 + run: mamba install jupyterlab=3.5 ipywidgets=7.6 - name: Install here-map-widget-for-jupyter run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f64be8c..c6bef19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.8] + python-version: [3.12] steps: - uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: run: mamba install python=${{ matrix.python-version }} pip nodejs yarn jupyter-packaging - name: Mamba install JupyterLab 3 - run: mamba install jupyterlab=3 ipywidgets=7.6 + run: mamba install jupyterlab=3.5 ipywidgets=7.6 - name: Install tools run: | @@ -49,10 +49,10 @@ jobs: user: __token__ password: ${{ secrets.PYPI_TOKEN }} verbose: true - - name: Use Node.js 12 + - name: Use Node.js 22 uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 22 - name: Publish to NPM run: | cd js From 1f25c5a91700974bab9bf13718b2d7183031b651 Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 08:51:55 +0000 Subject: [PATCH 04/11] feature-support HARP engine again to follow guideline #3 Signed-off-by: Keisuke Kishida --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a6d979c..a3b3550 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.9,3.10,3.11,3.12] + python-version: [3.12] steps: - uses: actions/checkout@v2 @@ -34,7 +34,7 @@ jobs: - name: Mamba install dependencies run: mamba install python=${{ matrix.python-version }} pip nodejs jupyter-packaging - - name: Mamba install JupyterLab 3 + - name: Mamba install JupyterLab 3.5 run: mamba install jupyterlab=3.5 ipywidgets=7.6 - name: Install here-map-widget-for-jupyter diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6bef19..e03b728 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Mamba install dependencies run: mamba install python=${{ matrix.python-version }} pip nodejs yarn jupyter-packaging - - name: Mamba install JupyterLab 3 + - name: Mamba install JupyterLab 3.5 run: mamba install jupyterlab=3.5 ipywidgets=7.6 - name: Install tools From e99edca40db962529c496e95cacbe70e1451efbb Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 09:22:10 +0000 Subject: [PATCH 05/11] feature-support HARP engine again to follow guideline #4 Signed-off-by: Keisuke Kishida --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6d3ed7b..e565bc2 100644 --- a/setup.py +++ b/setup.py @@ -45,8 +45,8 @@ cmdclass = create_cmdclass("jsdeps", data_files_spec=data_files_spec) js_command = combine_commands( - # install_npm(js_dir, npm=["yarn"], build_cmd="build:extensions"), - install_npm(js_dir, npm=["npm"], build_cmd="build:extensions"), + install_npm(js_dir, npm=["yarn"], build_cmd="build:extensions"), + # install_npm(js_dir, npm=["npm"], build_cmd="build:extensions"), ensure_targets(jstargets), ) From 2581006c48b72d42a701d3aeb02eb980c06b1344 Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 09:31:52 +0000 Subject: [PATCH 06/11] feature-support HARP engine again to follow guideline #5 Signed-off-by: Keisuke Kishida --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3b3550..001c840 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,8 +34,8 @@ jobs: - name: Mamba install dependencies run: mamba install python=${{ matrix.python-version }} pip nodejs jupyter-packaging - - name: Mamba install JupyterLab 3.5 - run: mamba install jupyterlab=3.5 ipywidgets=7.6 + - name: Mamba install JupyterLab 3 + run: mamba install jupyterlab=3 ipywidgets=7.6 - name: Install here-map-widget-for-jupyter run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e03b728..53057c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,8 +28,8 @@ jobs: - name: Mamba install dependencies run: mamba install python=${{ matrix.python-version }} pip nodejs yarn jupyter-packaging - - name: Mamba install JupyterLab 3.5 - run: mamba install jupyterlab=3.5 ipywidgets=7.6 + - name: Mamba install JupyterLab 3 + run: mamba install jupyterlab=3 ipywidgets=7.6 - name: Install tools run: | From 4a954091ed886f19e3e2962d6627c9ed638f276f Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 09:40:13 +0000 Subject: [PATCH 07/11] feature-support HARP engine again to follow guideline #6 Signed-off-by: Keisuke Kishida --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 001c840..e215b1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.12] + python-version: [3.9] steps: - uses: actions/checkout@v2 @@ -35,7 +35,7 @@ jobs: run: mamba install python=${{ matrix.python-version }} pip nodejs jupyter-packaging - name: Mamba install JupyterLab 3 - run: mamba install jupyterlab=3 ipywidgets=7.6 + run: mamba install jupyterlab=3.5 ipywidgets=7.6 - name: Install here-map-widget-for-jupyter run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53057c7..f71d22a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.12] + python-version: [3.9] steps: - uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: run: mamba install python=${{ matrix.python-version }} pip nodejs yarn jupyter-packaging - name: Mamba install JupyterLab 3 - run: mamba install jupyterlab=3 ipywidgets=7.6 + run: mamba install jupyterlab=3.5 ipywidgets=7.6 - name: Install tools run: | From adc96f56fa84a1f18e8e2452441460c9c36c4404 Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 09:52:14 +0000 Subject: [PATCH 08/11] feature-support HARP engine again to follow guideline #7 Signed-off-by: Keisuke Kishida --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index cb1a54b..fece9cd 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ jupyter-sphinx==0.2.4a1 sphinx_rtd_theme pandas -geopandas +#geopandas here-map-widget-for-jupyter \ No newline at end of file From 1c61bda5d1c3bb29e286abb6a87a70f070d70215 Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 10:02:31 +0000 Subject: [PATCH 09/11] feature-support HARP engine again to follow guideline #8 Signed-off-by: Keisuke Kishida --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- docs/requirements.txt | 2 +- docs/source/api_reference/layer/{geodata.rst => .geodata.rst} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename docs/source/api_reference/layer/{geodata.rst => .geodata.rst} (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e215b1a..c90c1a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.9] + python-version: [3.12] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f71d22a..c6bef19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.9] + python-version: [3.12] steps: - uses: actions/checkout@v2 diff --git a/docs/requirements.txt b/docs/requirements.txt index fece9cd..cb1a54b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ jupyter-sphinx==0.2.4a1 sphinx_rtd_theme pandas -#geopandas +geopandas here-map-widget-for-jupyter \ No newline at end of file diff --git a/docs/source/api_reference/layer/geodata.rst b/docs/source/api_reference/layer/.geodata.rst similarity index 100% rename from docs/source/api_reference/layer/geodata.rst rename to docs/source/api_reference/layer/.geodata.rst From e9e0fe92ee1ba64078c67ad64aef1660c0c97c51 Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Wed, 27 Nov 2024 10:37:12 +0000 Subject: [PATCH 10/11] feature-support HARP engine again to follow guideline #9 Signed-off-by: Keisuke Kishida --- docs/source/api_reference/layer/.geodata.rst | 48 -------------------- 1 file changed, 48 deletions(-) delete mode 100644 docs/source/api_reference/layer/.geodata.rst diff --git a/docs/source/api_reference/layer/.geodata.rst b/docs/source/api_reference/layer/.geodata.rst deleted file mode 100644 index 9bba873..0000000 --- a/docs/source/api_reference/layer/.geodata.rst +++ /dev/null @@ -1,48 +0,0 @@ -GeoData Layer -============== - -``GeoData`` is an ``here-map-widget-for-jupyter`` class that allows you to visualize a `GeoDataFrame -`_ on the Map. - -Example -------- - -.. jupyter-execute:: - - from here_map_widget import Map, GeoData - import geopandas - import json - import os - - countries = geopandas.read_file(geopandas.datasets.get_path("naturalearth_lowres")) - - m = Map(api_key=os.environ["LS_API_KEY"], center=[52.3, 8.0], zoom=3) - - geo_data = GeoData( - geo_dataframe=countries, - style={ - "fillColor": "#3366cc", - }, - hover_style={"fillColor": "red"}, - show_bubble=True, - ) - m.add_layer(geo_data) - m - - -Attributes ----------- - -=================== ================= === -Attribute Type Doc -=================== ================= === -geo_data GeoDataFrame The GeoPandas dataframe to use -style dict The style to use for rendering GeoJSON data -disable_legacy_mode boolean Disable legacy mode for parsing GeoJSON data default ``True``. -style dict The style to use for rendering GeoJSON data. Example: {'fillColor': 'rgba(245, 176, 65, 0.5)', 'strokeColor': 'black', 'lineWidth': 10, 'lineCap': 'square', lineJoin: 'bevel'} -hover_style dict The style to use for rendering data when hovered over. Example: {'fillColor': 'rgba(245, 176, 65, 0.5)', 'strokeColor': 'black', 'lineWidth': 10} -evt_type string Event type to be used to apply hover_style, please check :ref:`allowed values `, default value is ``tap``. -show_bubble boolean To determine whether to show info bubble for space data or not -style_callback Callable object A callback function which is called for each feature to generate style for the feature -point_style dict The style to use for rendering Points in GeoJSON if not provided default Markers will be used. Example: {"strokeColor": 'white', "lineWidth": 1, "fillColor": "#1b468d", "fillOpacity": 0.7, "radius": 5}, radius should be between 2 to 8. -=================== ================= === From cc8e2e7992291508885f2e0197cf796f80ae171a Mon Sep 17 00:00:00 2001 From: Keisuke Kishida Date: Thu, 28 Nov 2024 02:56:35 +0000 Subject: [PATCH 11/11] feature-support HARP engine again to follow guideline #10 Signed-off-by: Keisuke Kishida --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c90c1a8..011f49d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: mamba-version: "*" channels: conda-forge diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6bef19..58f60a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: mamba-version: "*" channels: conda-forge