Merge pull request #1044 from openlayers/units-from-ol

ahocevar · web-flow · commit 2811058f5d3d · 2023-11-30T17:40:06.000+01:00
Use direct import of METERS_PER_UNIT for legacy build compatibility
diff --git a/src/apply.js b/src/apply.js
@@ -21,13 +21,7 @@ import VectorTileLayer from 'ol/layer/VectorTile.js';
 import VectorTileSource, {defaultLoadFunction} from 'ol/source/VectorTile.js';
 import View from 'ol/View.js';
 import derefLayers from '@mapbox/mapbox-gl-style-spec/deref.js';
-import {
-  METERS_PER_UNIT,
-  equivalent,
-  fromLonLat,
-  get as getProjection,
-  getUserProjection,
-} from 'ol/proj.js';
+import {METERS_PER_UNIT} from 'ol/proj/Units.js';
 import {
   _colorWithOpacity,
   stylefunction as applyStyleFunction,
@@ -48,6 +42,12 @@ import {
   getTileJson,
   getZoomForResolution,
 } from './util.js';
+import {
+  equivalent,
+  fromLonLat,
+  get as getProjection,
+  getUserProjection,
+} from 'ol/proj.js';
 import {getFonts} from './text.js';
 import {getTopLeft} from 'ol/extent.js';
 import {hillshade} from './shaders.js';
diff --git a/test/test.html b/test/test.html
@@ -2,11 +2,11 @@
 <html>
 <head>
   <title>Test of the standalone build</title>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.14.1/css/ol.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.1.0/ol.css">
 </head>
 <body>
 <div id="map" style="height: 300px; width:300px;"></div>
-<script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.14.1/build/ol.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/ol@v8.1.0/dist/ol.js"></script>
 <script src="../dist/olms.js"></script>
 <script>
   olms.apply('map', ' https://demo.tegola.io/styles/hot-osm.json');
