Skip to content

Commit

Permalink
HARP-12299 Upgrade harp.gl / three.js versions
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan Stichbury <[email protected]>
  • Loading branch information
nzjony committed Nov 5, 2020
1 parent eeff7b7 commit 275cf83
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 160 deletions.
6 changes: 3 additions & 3 deletions examples/choropleth.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title></title>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.css"
href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/leaflet.css"
/>
<style>
html,
Expand Down Expand Up @@ -47,10 +47,10 @@
<body>
<div id="map" style="height: 100%;"></div>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.js"
src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/leaflet.js"
charset="utf-8"
></script>
<script src="https://unpkg.com/three@0.117.1/build/three.min.js" charset="utf-8"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.min.js" charset="utf-8"></script>
<script src="./build/example_choropleth.bundle.js" charset="utf-8"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion examples/helloworld.html
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ <h2 class="harp-gl-header">Location</h2>
src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.js"
charset="utf-8"
></script>
<script src="https://unpkg.com/three@0.117.1/build/three.min.js" charset="utf-8"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.min.js" charset="utf-8"></script>
<script src="./build/example_basic.bundle.js" charset="utf-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions examples/simplejs-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<body>
<div id="map" style="height: 100%;"></div>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.js"
src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.0/leaflet.js"
charset="utf-8"
></script>
<script src="https://unpkg.com/three@0.117.1/build/three.min.js" charset="utf-8"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.min.js" charset="utf-8"></script>
<script src="./vendor/harp.min.js"></script>
<script src="./vendor/harp-leaflet.js"></script>
<script src="./build/example_simplejs.bundle.js" charset="utf-8"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/src/decoder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ declare let self: Worker & {
importScripts(..._scripts: string[]): void;
};

self.importScripts("https://unpkg.com/three@0.117.1/build/three.min.js");
self.importScripts("https://unpkg.com/three@0.120.1/build/three.min.js");

import { OmvTileDecoderService, OmvTilerService } from "@here/harp-omv-datasource/index-worker";

Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@here/harp-leaflet",
"version": "0.2.3",
"version": "0.2.4",
"description": "Leaflet plugin for harp.gl maps",
"author": {
"name": "HERE Europe B.V.",
Expand Down Expand Up @@ -33,12 +33,12 @@
"yarn": ">=1.11.1"
},
"devDependencies": {
"@here/harp-geoutils": "^0.16.0",
"@here/harp-map-theme": "^0.16.0",
"@here/harp-mapview": "^0.16.0",
"@here/harp-omv-datasource": "^0.16.0",
"@here/harp-test-utils": "^0.16.0",
"@here/harp.gl": "^0.16.0",
"@here/harp-geoutils": "^0.21.0",
"@here/harp-map-theme": "^0.21.1",
"@here/harp-mapview": "^0.21.1",
"@here/harp-omv-datasource": "^0.21.1",
"@here/harp-test-utils": "^0.21.0",
"@here/harp.gl": "^0.21.1",
"@types/chai": "^4.2.5",
"@types/leaflet": "^1.5.1",
"@types/mocha": "^7.0.2",
Expand All @@ -51,7 +51,7 @@
"karma-chrome-launcher": "^3.1.0",
"karma-mocha": "^2.0.1",
"karma-spec-reporter": "^0.0.32",
"leaflet": "^1.5.1",
"leaflet": "^1.7.1",
"mocha": "^7.2.0",
"prettier": "^2.0.5",
"rollup": "^2.15.0",
Expand All @@ -60,7 +60,7 @@
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-typescript2": "^0.27.1",
"sinon": "^9.0.2",
"three": "0.117.1",
"three": "^0.120.1",
"ts-loader": "^7.0.5",
"tslint": "^6.1.2",
"tslint-config-prettier": "^1.18.0",
Expand All @@ -75,8 +75,8 @@
"semver": "7.3.2"
},
"peerDependencies": {
"@here/harp-geoutils": "^0.16.0",
"@here/harp-mapview": "^0.16.0",
"leaflet": "^1.6.0"
"@here/harp-geoutils": "^0.21.0",
"@here/harp-mapview": "^0.21.1",
"leaflet": "^1.7.1"
}
}
Loading

0 comments on commit 275cf83

Please sign in to comment.