From a81626c79d6c6a8ab3afb18a8d25196d907a1916 Mon Sep 17 00:00:00 2001
From: Jonathan Stichbury <2533428+nzjony@users.noreply.github.com>
Date: Thu, 5 Nov 2020 14:12:49 +0100
Subject: [PATCH] HARP-12299 Numerous fixes: - Removed links to unpkg /
 cloudfare and pack resources instead - Fix broken example_simplejs example -
 Fix rollup export - use setTheme instead of ThemeLoader - fixed
 example_simplejs.ts

Signed-off-by: Jonathan Stichbury <2533428+nzjony@users.noreply.github.com>
---
 examples/choropleth.html         | 12 +++---------
 examples/helloworld.html         | 12 +++---------
 examples/simplejs-test.html      | 12 +++---------
 examples/src/decoder.ts          |  2 +-
 examples/src/example_basic.ts    |  3 +--
 examples/src/example_simplejs.ts | 21 ++++++++-------------
 package.json                     |  2 +-
 rollup.config.js                 |  2 +-
 webpack.config.js                |  9 +++++++++
 9 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/examples/choropleth.html b/examples/choropleth.html
index c64c324..314a514 100644
--- a/examples/choropleth.html
+++ b/examples/choropleth.html
@@ -3,10 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <title></title>
-        <link
-            rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/leaflet.css"
-        />
+        <link rel="stylesheet" href="./vendor/leaflet.css" />
         <style>
             html,
             body {
@@ -46,11 +43,8 @@
     </head>
     <body>
         <div id="map" style="height: 100%;"></div>
-        <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/leaflet.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/leaflet.js" charset="utf-8"></script>
+        <script src="./vendor/three.min.js" charset="utf-8"></script>
         <script src="./build/example_choropleth.bundle.js" charset="utf-8"></script>
     </body>
 </html>
diff --git a/examples/helloworld.html b/examples/helloworld.html
index 3159277..3852672 100644
--- a/examples/helloworld.html
+++ b/examples/helloworld.html
@@ -3,10 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <title></title>
-        <link
-            rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.css"
-        />
+        <link rel="stylesheet" href="./vendor/leaflet.css" />
         <style>
             html,
             body {
@@ -201,11 +198,8 @@ <h2 class="harp-gl-header">Location</h2>
             </div>
         </div>
 
-        <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.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/leaflet.js" charset="utf-8"></script>
+        <script src="./vendor/three.min.js" charset="utf-8"></script>
         <script src="./build/example_basic.bundle.js" charset="utf-8"></script>
     </body>
 </html>
diff --git a/examples/simplejs-test.html b/examples/simplejs-test.html
index 7d89cae..9e47068 100644
--- a/examples/simplejs-test.html
+++ b/examples/simplejs-test.html
@@ -3,10 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <title></title>
-        <link
-            rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.css"
-        />
+        <link rel="stylesheet" href="vendor/leaflet.css" />
         <style>
             html,
             body {
@@ -18,11 +15,8 @@
     </head>
     <body>
         <div id="map" style="height: 100%;"></div>
-        <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.0/leaflet.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/leaflet.js" charset="utf-8"></script>
+        <script src="./vendor/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>
diff --git a/examples/src/decoder.ts b/examples/src/decoder.ts
index 2b63ab8..6a668da 100644
--- a/examples/src/decoder.ts
+++ b/examples/src/decoder.ts
@@ -8,7 +8,7 @@ declare let self: Worker & {
     importScripts(..._scripts: string[]): void;
 };
 
-self.importScripts("https://unpkg.com/three@0.120.1/build/three.min.js");
+self.importScripts("../vendor/three.min.js");
 
 import { OmvTileDecoderService, OmvTilerService } from "@here/harp-omv-datasource/index-worker";
 
diff --git a/examples/src/example_basic.ts b/examples/src/example_basic.ts
index 660e0d1..b4e9882 100644
--- a/examples/src/example_basic.ts
+++ b/examples/src/example_basic.ts
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ThemeLoader } from "@here/harp-mapview";
 import { APIFormat, AuthenticationMethod, OmvDataSource } from "@here/harp-omv-datasource";
 import { HarpGL } from "harp-leaflet";
 import * as L from "leaflet";
@@ -67,7 +66,7 @@ installButtonGroupHandler(
     {
         default: "theme-berlin-base",
         onChange: async (themeUri) => {
-            harpGL.mapView.theme = await ThemeLoader.load(themeUri);
+            harpGL.mapView.setTheme(themeUri);
         },
     }
 );
diff --git a/examples/src/example_simplejs.ts b/examples/src/example_simplejs.ts
index 9f17ac0..1259c8d 100644
--- a/examples/src/example_simplejs.ts
+++ b/examples/src/example_simplejs.ts
@@ -3,32 +3,27 @@
  * Licensed under Apache 2.0, see full license in LICENSE
  * SPDX-License-Identifier: Apache-2.0
  */
+import { APIFormat, OmvDataSource } from "@here/harp-omv-datasource";
+import { HarpGL } from "harp-leaflet";
+import L from "leaflet";
 import * as config from "./config";
 
-interface ILeafletExtended {
-    HarpGL: any;
-}
-
-// @ts-ignore
-const LE: typeof L & ILeafletExtended = L as any;
-declare let harp: typeof import("@here/harp-omv-datasource") & typeof import("@here/harp-geoutils");
-
-const map = LE.map("map", {
+const map = L.map("map", {
     // wheelDebounceTime: 10
 }).setView([38.912753, -77.032194], 15);
 
-LE.marker([38.912753, -77.032194])
+L.marker([38.912753, -77.032194])
     .bindPopup("Hello <b>Harp GL</b>!<br>Whoa, it works!")
     .addTo(map)
     .openPopup();
 
-const harpGL = new LE.HarpGL({
+const harpGL = new HarpGL({
     theme: "resources/harp-map-theme/berlin_tilezen_night_reduced.json",
 }).addTo(map);
 
-const dataSource = new harp.OmvDataSource({
+const dataSource = new OmvDataSource({
     baseUrl: "https://xyz.api.here.com/tiles/osmbase/512/all",
-    apiFormat: harp.APIFormat.XYZMVT,
+    apiFormat: APIFormat.XYZMVT,
     styleSetName: config.styleSetName,
     maxZoomLevel: 17,
     authenticationCode: config.accessToken,
diff --git a/package.json b/package.json
index 720cfc4..c982a45 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@here/harp-leaflet",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Leaflet plugin for harp.gl maps",
   "author": {
     "name": "HERE Europe B.V.",
diff --git a/rollup.config.js b/rollup.config.js
index 6aec402..c8608b5 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -37,7 +37,7 @@ export default {
             "@here/harp-omv-datasource": "harp",
         },
         file: "./build/harp-leaflet.js",
-        name: "L.HarpGL",
+        name: "HarpGL",
         format: "umd",
     },
 };
diff --git a/webpack.config.js b/webpack.config.js
index 0024f1f..3226e19 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,6 +13,7 @@ const entries = glob.sync("./examples/src/*.ts").reduce(
 );
 
 const harpMapThemePath = path.dirname(require.resolve("@here/harp-map-theme/package.json"));
+const leafletDist = path.dirname(require.resolve("leaflet/dist/leaflet.js"));
 
 module.exports = {
     context: dir,
@@ -52,11 +53,19 @@ module.exports = {
                 from: require.resolve("@here/harp.gl/dist/harp-decoders.min.js"),
                 to: "vendor/",
             },
+            {
+                from: require.resolve("three/build/three.min.js"),
+                to: "vendor/",
+            },
             {
                 from: path.join(harpMapThemePath, "resources/"),
                 to: "resources/harp-map-theme",
                 toType: "dir",
             },
+            {
+                from: leafletDist,
+                to: "vendor/",
+            },
         ]),
     ],
     devServer: {
