Merge pull request #1025 from openlayers/eblondel-core-util-namedexports

Eblondel core util namedexports

examples/icon-position.js

@@ -17,7 +17,7 @@ import olStyleFill from 'ol/style/Fill.js';
 import olMap from 'ol/Map.js';
 import olSourceVector from 'ol/source/Vector.js';
 import olLayerVector from 'ol/layer/Vector.js';
-import olcsCore from 'olcs/core.js';
+import {rotateAroundAxis, pickBottomPoint} from 'olcs/core.js';
 import {OLCS_ION_TOKEN} from './_common.js';
 
 
@@ -116,11 +116,10 @@ ol3d.enableAutoRenderLoop();
 
 // Tilt camera
 const camera = scene.camera;
-const pivot = olcsCore.pickBottomPoint(scene);
+const pivot = pickBottomPoint(scene);
 if (pivot) {
   const options = {};
   const transform = Cesium.Matrix4.fromTranslation(pivot);
   const axis = camera.right;
-  const rotateAroundAxis = olcsCore.rotateAroundAxis;
   rotateAroundAxis(camera, -Math.PI / 4, axis, transform, options);
 }

examples/rotate.js

@@ -1,7 +1,7 @@
 /**
  * @module examples.rotate
  */
-import olcsCore from 'olcs/core.js';
+import {computeSignedTiltAngleOnGlobe, pickBottomPoint, computeAngleToZenith, setHeadingUsingBottomCenter, rotateAroundAxis} from 'olcs/core.js';
 import OLCesium from 'olcs/OLCesium.js';
 import olView from 'ol/View.js';
 import {defaults as olControlDefaults} from 'ol/control.js';
@@ -96,7 +96,7 @@ OlcsControl.prototype.getHeading = function() {
  */
 OlcsControl.prototype.getTiltOnGlobe = function() {
   const scene = this.ol3d_.getCesiumScene();
-  const tiltOnGlobe = olcsCore.computeSignedTiltAngleOnGlobe(scene);
+  const tiltOnGlobe = computeSignedTiltAngleOnGlobe(scene);
   return -tiltOnGlobe;
 };
 
@@ -107,24 +107,24 @@ OlcsControl.prototype.getTiltOnGlobe = function() {
 OlcsControl.prototype.resetToNorthZenith = function(callback) {
   const scene = this.ol3d_.getCesiumScene();
   const camera = scene.camera;
-  const pivot = olcsCore.pickBottomPoint(scene);
+  const pivot = pickBottomPoint(scene);
 
   if (!pivot) {
     callback();
     return;
   }
 
   const currentHeading = this.getHeading();
-  const angle = olcsCore.computeAngleToZenith(scene, pivot);
+  const angle = computeAngleToZenith(scene, pivot);
 
   // Point to North
-  olcsCore.setHeadingUsingBottomCenter(scene, currentHeading, pivot);
+  setHeadingUsingBottomCenter(scene, currentHeading, pivot);
 
   // Go to zenith
   const transform = Cesium.Matrix4.fromTranslation(pivot);
   const axis = camera.right;
   const options = {callback};
-  olcsCore.rotateAroundAxis(camera, -angle, axis, transform, options);
+  rotateAroundAxis(camera, -angle, axis, transform, options);
 };
 
 
@@ -143,9 +143,9 @@ OlcsControl.prototype.rotate = function(angle) {
  */
 OlcsControl.prototype.setHeading = function(angle) {
   const scene = this.ol3d_.getCesiumScene();
-  const bottom = olcsCore.pickBottomPoint(scene);
+  const bottom = pickBottomPoint(scene);
   if (bottom) {
-    olcsCore.setHeadingUsingBottomCenter(scene, angle, bottom);
+    setHeadingUsingBottomCenter(scene, angle, bottom);
   }
 };
 
@@ -156,7 +156,7 @@ OlcsControl.prototype.setHeading = function(angle) {
 OlcsControl.prototype.tiltOnGlobe = function(angle) {
   const scene = this.ol3d_.getCesiumScene();
   const camera = scene.camera;
-  const pivot = olcsCore.pickBottomPoint(scene);
+  const pivot = pickBottomPoint(scene);
   if (!pivot) {
     // Could not find the bottom point
     return;
@@ -165,7 +165,6 @@ OlcsControl.prototype.tiltOnGlobe = function(angle) {
   const options = {};
   const transform = Cesium.Matrix4.fromTranslation(pivot);
   const axis = camera.right;
-  const rotateAroundAxis = olcsCore.rotateAroundAxis;
   rotateAroundAxis(camera, -angle, axis, transform, options);
 };
 

examples/vectors.js

@@ -28,7 +28,7 @@ import olInteractionDragAndDrop from 'ol/interaction/DragAndDrop.js';
 import olGeomMultiPolygon from 'ol/geom/MultiPolygon.js';
 import olLayerVector from 'ol/layer/Vector.js';
 import {transform} from 'ol/proj.js';
-import olcsCore from 'olcs/core.js';
+import {createMatrixAtCoordinates} from 'olcs/core.js';
 import {OLCS_ION_TOKEN} from './_common.js';
 
 
@@ -124,7 +124,7 @@ modelFeatures.forEach((feature) => {
     return {
       cesiumOptions: {
         url: 'data/Box.gltf',
-        modelMatrix: olcsCore.createMatrixAtCoordinates(center, rotation),
+        modelMatrix: createMatrixAtCoordinates(center, rotation),
         heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         minimumPixelSize: 64
       }

src/olcs/Camera.js

@@ -5,7 +5,7 @@
 import {unByKey as olObservableUnByKey} from 'ol/Observable.js';
 import {toRadians, toDegrees} from './math.js';
 import {getTransform} from 'ol/proj.js';
-import olcsCore, {calcDistanceForResolution, calcResolutionForDistance} from './core.js';
+import {pickCenterPoint, calcDistanceForResolution, calcResolutionForDistance} from './core.js';
 
 class Camera {
   /**
@@ -370,7 +370,7 @@ class Camera {
     // target & distance
     const ellipsoid = Cesium.Ellipsoid.WGS84;
     const scene = this.scene_;
-    const target = olcsCore.pickCenterPoint(scene);
+    const target = pickCenterPoint(scene);
 
     let bestTarget = target;
     if (!bestTarget) {

src/olcs/FeatureConverter.js

@@ -8,9 +8,9 @@ import olSourceCluster from 'ol/source/Cluster.js';
 import {circular as olCreateCircularPolygon} from 'ol/geom/Polygon.js';
 import {boundingExtent, getCenter} from 'ol/extent.js';
 import olGeomSimpleGeometry from 'ol/geom/SimpleGeometry.js';
-import olcsCore from './core.js';
+import {convertColorToCesium, olGeometryCloneTo4326, ol4326CoordinateToCesiumCartesian, ol4326CoordinateArrayToCsCartesians} from './core.js';
 import olcsCoreVectorLayerCounterpart from './core/VectorLayerCounterpart.js';
-import olcsUtil, {getUid, isGroundPolylinePrimitiveSupported} from './util.js';
+import {obj, getUid, isGroundPolylinePrimitiveSupported} from './util.js';
 
 
 /**
@@ -59,7 +59,7 @@ class FeatureConverter {
     const source = evt.target;
     console.assert(source instanceof olSourceVector);
 
-    const cancellers = olcsUtil.obj(source)['olcs_cancellers'];
+    const cancellers = obj(source)['olcs_cancellers'];
     if (cancellers) {
       const feature = evt.feature;
       if (feature) {
@@ -77,7 +77,7 @@ class FeatureConverter {
             cancellers[key]();
           }
         }
-        olcsUtil.obj(source)['olcs_cancellers'] = {};
+        obj(source)['olcs_cancellers'] = {};
       }
     }
   }
@@ -201,7 +201,7 @@ class FeatureConverter {
       olColor = fillColor;
     }
 
-    return olcsCore.convertColorToCesium(olColor);
+    return convertColorToCesium(olColor);
   }
 
   /**
@@ -321,7 +321,7 @@ class FeatureConverter {
    */
   olCircleGeometryToCesium(layer, feature, olGeometry, projection, olStyle) {
 
-    olGeometry = olcsCore.olGeometryCloneTo4326(olGeometry, projection);
+    olGeometry = olGeometryCloneTo4326(olGeometry, projection);
     console.assert(olGeometry.getType() == 'Circle');
 
     // ol.Coordinate
@@ -331,8 +331,8 @@ class FeatureConverter {
     point[0] += olGeometry.getRadius();
 
     // Cesium
-    center = olcsCore.ol4326CoordinateToCesiumCartesian(center);
-    point = olcsCore.ol4326CoordinateToCesiumCartesian(point);
+    center = ol4326CoordinateToCesiumCartesian(center);
+    point = ol4326CoordinateToCesiumCartesian(point);
 
     // Accurate computation of straight distance
     const radius = Cesium.Cartesian3.distance(center, point);
@@ -349,7 +349,7 @@ class FeatureConverter {
       const width = this.extractLineWidthFromOlStyle(olStyle);
       if (width) {
         const circlePolygon = olCreateCircularPolygon(olGeometry.getCenter(), radius);
-        const positions = olcsCore.ol4326CoordinateArrayToCsCartesians(circlePolygon.getLinearRing(0).getCoordinates());
+        const positions = ol4326CoordinateArrayToCsCartesians(circlePolygon.getLinearRing(0).getCoordinates());
         if (!isGroundPolylinePrimitiveSupported(this.scene)) {
           const color = this.extractColorFromOlStyle(olStyle, true);
           outlinePrimitive = this.createStackedGroundCorridors(layer, feature, width, color, positions);
@@ -444,10 +444,10 @@ class FeatureConverter {
    */
   olLineStringGeometryToCesium(layer, feature, olGeometry, projection, olStyle) {
 
-    olGeometry = olcsCore.olGeometryCloneTo4326(olGeometry, projection);
+    olGeometry = olGeometryCloneTo4326(olGeometry, projection);
     console.assert(olGeometry.getType() == 'LineString');
 
-    const positions = olcsCore.ol4326CoordinateArrayToCsCartesians(olGeometry.getCoordinates());
+    const positions = ol4326CoordinateArrayToCsCartesians(olGeometry.getCoordinates());
     const width = this.extractLineWidthFromOlStyle(olStyle);
 
     let outlinePrimitive;
@@ -506,7 +506,7 @@ class FeatureConverter {
    */
   olPolygonGeometryToCesium(layer, feature, olGeometry, projection, olStyle) {
 
-    olGeometry = olcsCore.olGeometryCloneTo4326(olGeometry, projection);
+    olGeometry = olGeometryCloneTo4326(olGeometry, projection);
     console.assert(olGeometry.getType() == 'Polygon');
 
     const heightReference = this.getHeightReference(layer, feature, olGeometry);
@@ -550,7 +550,7 @@ class FeatureConverter {
 
       for (let i = 0; i < rings.length; ++i) {
         const olPos = rings[i].getCoordinates();
-        const positions = olcsCore.ol4326CoordinateArrayToCsCartesians(olPos);
+        const positions = ol4326CoordinateArrayToCsCartesians(olPos);
         console.assert(positions && positions.length > 0);
         if (i == 0) {
           hierarchy.positions = positions;
@@ -707,7 +707,7 @@ class FeatureConverter {
         return;
       }
       const center = olGeometry.getCoordinates();
-      const position = olcsCore.ol4326CoordinateToCesiumCartesian(center);
+      const position = ol4326CoordinateToCesiumCartesian(center);
       let color;
       const opacity = imageStyle.getOpacity();
       if (opacity !== undefined) {
@@ -751,9 +751,9 @@ class FeatureConverter {
       };
       source.on(['removefeature', 'clear'],
           this.boundOnRemoveOrClearFeatureListener_);
-      let cancellers = olcsUtil.obj(source)['olcs_cancellers'];
+      let cancellers = obj(source)['olcs_cancellers'];
       if (!cancellers) {
-        cancellers = olcsUtil.obj(source)['olcs_cancellers'] = {};
+        cancellers = obj(source)['olcs_cancellers'] = {};
       }
 
       const fuid = getUid(feature);
@@ -801,7 +801,7 @@ class FeatureConverter {
       opt_newBillboardCallback
   ) {
     console.assert(olGeometry.getType() == 'Point');
-    olGeometry = olcsCore.olGeometryCloneTo4326(olGeometry, projection);
+    olGeometry = olGeometryCloneTo4326(olGeometry, projection);
 
     let modelPrimitive = null;
     const imageStyle = style.getImage();
@@ -926,7 +926,7 @@ class FeatureConverter {
     }
     const options = /** @type {Cesium.optionsLabelCollection} */ ({});
 
-    options.position = olcsCore.ol4326CoordinateToCesiumCartesian(extentCenter);
+    options.position = ol4326CoordinateToCesiumCartesian(extentCenter);
 
     options.text = text;
 
@@ -1016,7 +1016,7 @@ class FeatureConverter {
     }
 
     let color = outline ? stroke.getColor() : fill.getColor();
-    color = olcsCore.convertColorToCesium(color);
+    color = convertColorToCesium(color);
 
     if (outline && stroke.getLineDash()) {
       return Cesium.Material.fromType('Stripe', {

src/olcs/OLCesium.js

@@ -3,8 +3,8 @@
  */
 import olGeomPoint from 'ol/geom/Point.js';
 import {getTransform} from 'ol/proj.js';
-import olcsUtil from './util.js';
-import olcsCore from './core.js';
+import {supportsImageRenderingPixelated, imageRenderingValue} from './util.js';
+import {ol4326CoordinateToCesiumCartesian} from './core.js';
 import olcsAutoRenderLoop from './AutoRenderLoop.js';
 import olcsCamera from './Camera.js';
 import olcsRasterSynchronizer from './RasterSynchronizer.js';
@@ -130,9 +130,9 @@ class OLCesium {
     canvasAttribute.value = fillArea;
     this.canvas_.setAttributeNode(canvasAttribute);
 
-    if (olcsUtil.supportsImageRenderingPixelated()) {
+    if (supportsImageRenderingPixelated()) {
       // non standard CSS4
-      this.canvas_.style['imageRendering'] = olcsUtil.imageRenderingValue();
+      this.canvas_.style['imageRendering'] = imageRenderingValue();
     }
 
     this.canvas_.oncontextmenu = function() { return false; };
@@ -409,7 +409,7 @@ class OLCesium {
     }
 
     let resolutionScale = this.resolutionScale_;
-    if (!olcsUtil.supportsImageRenderingPixelated()) {
+    if (!supportsImageRenderingPixelated()) {
       resolutionScale *= window.devicePixelRatio || 1.0;
     }
     this.resolutionScaleChanged_ = false;
@@ -706,7 +706,7 @@ class OLCesium {
         console.assert(geometry instanceof olGeomPoint);
         const coo = geometry.getCoordinates();
         const coo4326 = to4326Transform(coo, undefined, coo.length);
-        return olcsCore.ol4326CoordinateToCesiumCartesian(coo4326);
+        return ol4326CoordinateToCesiumCartesian(coo4326);
       };
 
       // Create an invisible point entity for tracking.

src/olcs/RasterSynchronizer.js

@@ -4,7 +4,7 @@
 import olLayerGroup from 'ol/layer/Group.js';
 import {getUid, stableSort} from './util.js';
 import olcsAbstractSynchronizer from './AbstractSynchronizer.js';
-import olcsCore from './core.js';
+import {tileLayerToImageryLayer, updateCesiumLayerProperties} from './core.js';
 
 class RasterSynchronizer extends olcsAbstractSynchronizer {
   /**
@@ -77,7 +77,7 @@ class RasterSynchronizer extends olcsAbstractSynchronizer {
    * @protected
    */
   convertLayerToCesiumImageries(olLayer, viewProj) {
-    const result = olcsCore.tileLayerToImageryLayer(this.map, olLayer, viewProj);
+    const result = tileLayerToImageryLayer(this.map, olLayer, viewProj);
     return result ? [result] : null;
   }
 
@@ -97,7 +97,7 @@ class RasterSynchronizer extends olcsAbstractSynchronizer {
           // the compiler does not seem to be able to infer this
           console.assert(cesiumObjects);
           for (let i = 0; i < cesiumObjects.length; ++i) {
-            olcsCore.updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
+            updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
           }
         }));
       });
@@ -125,7 +125,7 @@ class RasterSynchronizer extends olcsAbstractSynchronizer {
       }
 
       for (let i = 0; i < cesiumObjects.length; ++i) {
-        olcsCore.updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
+        updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
       }
 
       // there is no way to modify Cesium layer extent,