Skip to content

Commit 6905857

Browse files
gberaudogberaudo
committed
Check with eslint
1 parent f70e883 commit 6905857

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+222
-282
lines changed

‎.eslintrc.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ rules:
3434
arguments: 2
3535
}
3636
}]
37+
'@typescript-eslint/consistent-type-imports': error
38+
'@typescript-eslint/no-unused-vars': [error, {vars: all, args: none}]
3739
overrides:
3840
- files: [ "examples/*.js" ]
3941
rules:

‎.gitignore

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/.build/
2-
/dist/
3-
/node_modules/
2+
/lib/
3+
/apidoc/
4+
dist/
5+
node_modules/
46
/examples/example-list.js
57
/compilation-stats.json
68
/*.zip
79
*.swp
8-
/out
9-
/types
10+
/*.tgz

‎buildtools/fix_paths.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ import fs from 'fs';
22
import path from 'path';
33

44
function handleFile(filePath) {
5+
if (filePath.endsWith('.d.ts')) {
6+
console.log('Skipping', filePath);
7+
return;
8+
}
59
fs.readFile(filePath, 'utf-8', (error, content) => {
610
if (error) {
711
console.error('Error reading the file:', error);
@@ -10,7 +14,7 @@ function handleFile(filePath) {
1014
const split = content.split('\n');
1115
let changed = false;
1216
const newSplit = split.map((line) => {
13-
if (!line.startsWith('import') || line.endsWith(".js';") || line.includes("from 'cesium")) {
17+
if (!(line.startsWith('import') || line.startsWith('export')) || !line.endsWith(';') || line.endsWith(".js';") || line.includes("from 'cesium") || line === 'export default OLCesium;') {
1418
return line;
1519
}
1620
let newline = undefined;

‎buildtools/webpack.library.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const extensionReplacerRegExp = new RegExp('\\.js$');
99
const nodeEnv = process.env['NODE_ENV'] || 'development';
1010
const filename = nodeEnv === 'development' ? 'olcesium-debug.js' : 'olcesium.js';
1111
export default {
12-
entry: './src/index.library.js',
12+
entry: './src/olcs.ts',
1313
output: {
1414
library: 'olcs_unused_var',
1515
filename,

‎buildtools/webpack.umd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
55
const nodeEnv = process.env['NODE_ENV'] || 'development';
66
const filename = nodeEnv === 'development' ? 'olcesium-debug.umd.js' : 'olcesium.umd.js';
77
export default {
8-
entry: './src/index.library.js',
8+
entry: './src/olcs.ts',
99
output: {
1010
library: 'olcs',
1111
filename,

‎examples/3dtiles.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.3dtiles
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import {transform} from 'ol/proj.js';
63
import olView from 'ol/View.js';
74
import {defaults as olControlDefaults} from 'ol/control.js';

‎examples/buildings.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<div>A building may be highlighted by clicking it on the OpenLayers map.
1414
<br/>It gets automatically selected in Cesium.
1515
<br/>If you see flickering in Cesium, please check your graphic card drivers.</div>
16-
<script src="inject_ol_cesium.js"></script>
16+
<script src="./inject_ol_cesium.js"></script>
1717
</body>
1818
</html>
19-

‎examples/buildings.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/**
2-
* @module examples.buildings
3-
*/
41
import olStyleStroke from 'ol/style/Stroke.js';
52
import olStyleFill from 'ol/style/Fill.js';
63
import olStyleStyle from 'ol/style/Style.js';
7-
import OLCesium from 'olcs/OLCesium.ts';
4+
import OLCesium from 'olcs';
85
import olView from 'ol/View.js';
96
import olFormatGeoJSON from 'ol/format/GeoJSON.js';
107
import olSourceVector from 'ol/source/Vector.js';

‎examples/customProj.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.customProj
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olView from 'ol/View.js';
63
import olSourceImageWMS from 'ol/source/ImageWMS.js';
74
import olSourceOSM from 'ol/source/OSM.js';

‎examples/exports.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.exports
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import {transform} from 'ol/proj.js';
63
import olView from 'ol/View.js';
74
import olSourceOSM from 'ol/source/OSM.js';

‎examples/fillstyle.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.vectors
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceOSM from 'ol/source/OSM.js';

‎examples/groundvectors.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.vectors
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceOSM from 'ol/source/OSM.js';

‎examples/icon-position.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.vectors
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium, {rotateAroundAxis, pickBottomPoint} from 'olcs';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceOSM from 'ol/source/OSM.js';
@@ -17,7 +14,6 @@ import olStyleFill from 'ol/style/Fill.js';
1714
import olMap from 'ol/Map.js';
1815
import olSourceVector from 'ol/source/Vector.js';
1916
import olLayerVector from 'ol/layer/Vector.js';
20-
import {rotateAroundAxis, pickBottomPoint} from 'olcs/core.ts';
2117
import {OLCS_ION_TOKEN} from './_common.js';
2218

2319

‎examples/image-static.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.image-static
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import {transform} from 'ol/proj.js';
63
import olView from 'ol/View.js';
74
import {defaults as olControlDefaults} from 'ol/control.js';

‎examples/imageWMS.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.main
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceImageWMS from 'ol/source/ImageWMS.js';

‎examples/kml.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.kml
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import {transform} from 'ol/proj.js';
63
import olView from 'ol/View.js';
74
import {defaults as olControlDefaults} from 'ol/control.js';

‎examples/layer-group.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
/**
2-
* @module examples.layer-group
3-
*/
41
import olMap from 'ol/Map.js';
52
import olView from 'ol/View.js';
63
import olLayerGroup from 'ol/layer/Group.js';
74
import olLayerTile from 'ol/layer/Tile.js';
85
import {fromLonLat} from 'ol/proj.js';
96
import olSourceOSM from 'ol/source/OSM.js';
107
import olSourceTileJSON from 'ol/source/TileJSON.js';
11-
import OLCesium from 'olcs/OLCesium.ts';
8+
import OLCesium from 'olcs';
129
import {OLCS_ION_TOKEN} from './_common.js';
1310

1411
const layer0 = new olLayerTile({

‎examples/lazy.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
/**
2-
* @module examples.lazy
3-
*/
41
import {transform} from 'ol/proj.js';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceOSM from 'ol/source/OSM.js';
85
import olLayerTile from 'ol/layer/Tile.js';
96
import olMap from 'ol/Map.js';
10-
import olcsContribManager from 'olcs/contrib/Manager.ts';
7+
import {ContribManager} from 'olcs';
118
import {OLCS_ION_TOKEN} from './_common.js';
129

1310
const ol2d = new olMap({
@@ -28,7 +25,7 @@ const ol2d = new olMap({
2825
})
2926
});
3027

31-
window['manager'] = new olcsContribManager(window.CESIUM_URL, {
28+
window['manager'] = new ContribManager(window.CESIUM_URL, {
3229
map: ol2d,
3330
cameraExtentInRadians: [0.0897, 0.7923, 0.2003, 0.8417],
3431
cesiumIonDefaultAccessToken: OLCS_ION_TOKEN

‎examples/main.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.main
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import {transform} from 'ol/proj.js';
63
import olView from 'ol/View.js';
74
import {defaults as olControlDefaults} from 'ol/control.js';
@@ -58,4 +55,3 @@ window['toggleTime'] = function() {
5855
timeElt.style.display = 'none';
5956
}
6057
};
61-

‎examples/mvt.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.mvt
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olMap from 'ol/Map.js';
63
import './_proj21781.js';
74
import TileLayer from 'ol/layer/Tile.js';

‎examples/overlay.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.overlay
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olMap from 'ol/Map.js';
63
import olSourceOSM from 'ol/source/OSM.js';
74
import olLayerTile from 'ol/layer/Tile.js';

‎examples/print.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
/**
2-
* @module examples.print
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium, {takeScreenshot, autoDrawMask, computeRectangle} from 'olcs';
52
import {transform} from 'ol/proj.js';
63
import olView from 'ol/View.js';
74
import {defaults as olControlDefaults} from 'ol/control.js';
85
import olSourceOSM from 'ol/source/OSM.js';
96
import olLayerTile from 'ol/layer/Tile.js';
107
import olMap from 'ol/Map.js';
118
import {OLCS_ION_TOKEN} from './_common.js';
12-
import {takeScreenshot} from 'olcs/print/takeCesiumScreenshot.ts';
13-
import {autoDrawMask} from 'olcs/print/drawCesiumMask.ts';
14-
import {computeRectangle} from 'olcs/print/computeRectangle.ts';
9+
1510

1611
Cesium.Ion.defaultAccessToken = OLCS_ION_TOKEN;
1712
const ol2d = new olMap({

‎examples/rastersync.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
/**
2-
* @module examples.rastersync
3-
*/
41
import olSourceTileWMS from 'ol/source/TileWMS.js';
52
import StadiaMaps from 'ol/source/StadiaMaps.js';
6-
import OLCesium from 'olcs/OLCesium.ts';
3+
import OLCesium from 'olcs';
74
import olLayerGroup from 'ol/layer/Group.js';
85
import olMap from 'ol/Map.js';
96
import olSourceTileJSON from 'ol/source/TileJSON.js';

‎examples/rotate.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
/**
2-
* @module examples.rotate
3-
*/
4-
import {computeSignedTiltAngleOnGlobe, pickBottomPoint, computeAngleToZenith, setHeadingUsingBottomCenter, rotateAroundAxis} from 'olcs/core.ts';
5-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium, {computeSignedTiltAngleOnGlobe, pickBottomPoint, computeAngleToZenith, setHeadingUsingBottomCenter, rotateAroundAxis} from 'olcs';
62
import olView from 'ol/View.js';
73
import {defaults as olControlDefaults} from 'ol/control.js';
84
import olSourceOSM from 'ol/source/OSM.js';

‎examples/selection.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/**
2-
* @module examples.selection
3-
*/
41
import olStyleStroke from 'ol/style/Stroke.js';
52
import olStyleFill from 'ol/style/Fill.js';
63
import olStyleStyle from 'ol/style/Style.js';
7-
import OLCesium from 'olcs/OLCesium.ts';
4+
import OLCesium from 'olcs';
85
import olView from 'ol/View.js';
96
import olFormatGeoJSON from 'ol/format/GeoJSON.js';
107
import olSourceVector from 'ol/source/Vector.js';

‎examples/sidebyside.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.sidebyside
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olSourceOSM from 'ol/source/OSM.js';
63
import olLayerTile from 'ol/layer/Tile.js';
74
import olMap from 'ol/Map.js';

‎examples/synthvectors.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
/**
2-
* @module examples.synthvectors
3-
*/
41
import olLayerVector from 'ol/layer/Vector.js';
52
import olSourceVector from 'ol/source/Vector.js';
63
import olStyleFill from 'ol/style/Fill.js';
74
import olStyleCircle from 'ol/style/Circle.js';
85
import olStyleStyle from 'ol/style/Style.js';
9-
import OLCesium from 'olcs/OLCesium.ts';
6+
import OLCesium from 'olcs';
107
import olView from 'ol/View.js';
118
import olMap from 'ol/Map.js';
129
import olSourceOSM from 'ol/source/OSM.js';

‎examples/tracking.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.tracking
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceOSM from 'ol/source/OSM.js';

‎examples/vectors.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.vectors
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium, {createMatrixAtCoordinates} from 'olcs';
52
import olView from 'ol/View.js';
63
import {defaults as olControlDefaults} from 'ol/control.js';
74
import olSourceOSM from 'ol/source/OSM.js';
@@ -28,7 +25,6 @@ import olInteractionDragAndDrop from 'ol/interaction/DragAndDrop.js';
2825
import olGeomMultiPolygon from 'ol/geom/MultiPolygon.js';
2926
import olLayerVector from 'ol/layer/Vector.js';
3027
import {transform} from 'ol/proj.js';
31-
import {createMatrixAtCoordinates} from 'olcs/core.ts';
3228
import {OLCS_ION_TOKEN} from './_common.js';
3329

3430

‎examples/wmts.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* @module examples.wmts
3-
*/
4-
import OLCesium from 'olcs/OLCesium.ts';
1+
import OLCesium from 'olcs';
52

63
import Map from 'ol/Map.js';
74
import View from 'ol/View.js';

0 commit comments

Comments
 (0)