Skip to content

Feature support harp engine #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.8, 3.9]
python-version: [3.12]

steps:
- 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
Expand All @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: [3.8]
python-version: [3.12]
steps:
- 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
Expand All @@ -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: |
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
48 changes: 0 additions & 48 deletions docs/source/api_reference/layer/geodata.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
2 changes: 1 addition & 1 deletion here_map_widget/LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion here_map_widget/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion here_map_widget/_version.py
Original file line number Diff line number Diff line change
@@ -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."""
Expand Down
2 changes: 1 addition & 1 deletion here_map_widget/configs.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2019-2021 HERE Europe B.V.
# Copyright (C) 2019-2024 HERE Europe B.V.
# SPDX-License-Identifier: MIT

"""
Expand Down
2 changes: 1 addition & 1 deletion here_map_widget/map.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2019-2021 HERE Europe B.V.
# Copyright (C) 2019-2024 HERE Europe B.V.
# SPDX-License-Identifier: MIT

"""
Expand Down
2 changes: 1 addition & 1 deletion js/LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 5 additions & 3 deletions js/lib/Map.js
Original file line number Diff line number Diff line change
@@ -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];

Expand Down Expand Up @@ -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
});
Expand Down Expand Up @@ -463,4 +465,4 @@ export class MapView extends widgets.DOMWidgetView {
}
}

}
}
6 changes: 3 additions & 3 deletions js/lib/control/Control.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down Expand Up @@ -32,4 +32,4 @@ export class ControlView extends widgets.WidgetView {
this.model_events();
});
}
}
}
2 changes: 1 addition & 1 deletion js/lib/control/DistanceMeasurementControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/FullscreenControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/LayersControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/MapSettingsControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/ScaleBar.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/SearchControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/SplitMapControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/WidgetControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/ZoomControl.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/control/ZoomRectangle.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
Binary file added js/lib/element/.Element.js.swp
Binary file not shown.
6 changes: 3 additions & 3 deletions js/lib/element/Element.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -31,4 +31,4 @@ export class ElementView extends widgets.WidgetView {
this.model_events();
});
}
}
}
2 changes: 1 addition & 1 deletion js/lib/element/InfoBubble.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/element/Style.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/embed.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2019-2021 HERE Europe B.V.
Copyright (C) 2019-2024 HERE Europe B.V.
SPDX-License-Identifier: MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion js/lib/extension.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2019-2021 HERE Europe B.V.
Copyright (C) 2019-2024 HERE Europe B.V.
SPDX-License-Identifier: MIT
*/

Expand Down
6 changes: 3 additions & 3 deletions js/lib/geometrys/Geometry.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -30,4 +30,4 @@ export class GeometryView extends widgets.WidgetView {
this.model_events();
});
}
}
}
2 changes: 1 addition & 1 deletion js/lib/geometrys/LineString.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/geometrys/MultiLineString.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/geometrys/MultiPolygon.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion js/lib/geometrys/Point.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
Loading
Loading