From 1a513c1a962ce7c5048b3d9374c7645b1f447874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Mon, 6 Oct 2025 16:28:09 +0300 Subject: [PATCH 1/2] Loader changes --- applications/embedded-3d/main.js | 23 ++++++++--------------- applications/embedded/main.js | 21 +++++++-------------- applications/geoportal-3d/main.js | 24 +++++++++++------------- applications/geoportal/main.js | 24 +++++++++++------------- 4 files changed, 37 insertions(+), 55 deletions(-) diff --git a/applications/embedded-3d/main.js b/applications/embedded-3d/main.js index e596979..510abfc 100644 --- a/applications/embedded-3d/main.js +++ b/applications/embedded-3d/main.js @@ -8,20 +8,15 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/ui-components/bu import 'oskari-loader!oskari-frontend/packages/framework/bundle/divmanazer/bundle.js'; // 3D mapmodule and support for additional map layer types -// note: old loader -import 'oskari-loader!oskari-frontend/packages/mapping/olcs/mapmodule/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/olcs/map3dtiles/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapwmts/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/wfsvector/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapuserlayers/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/maparcgis/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/mapmodule/map3d_olcs'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/tiles3d'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/maparcgis'; +import 'oskari-bundle!oskari-frontend/bundles/framework/myplacesimport/mapuserlayers'; // additional map related bundles -// note: old loader -import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/drawtools/bundle.js'; -// note: new loader +import 'oskari-bundle!oskari-frontend/bundles/mapping/infobox'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/drawtools'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/toolbar'; import 'oskari-bundle!oskari-frontend/bundles/framework/coordinatetool'; import 'oskari-bundle!oskari-frontend/bundles/framework/publishedstatehandler'; // 3D related bundles @@ -33,9 +28,7 @@ import 'oskari-bundle!oskari-frontend/bundles/mapping/camera-controls-3d'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js'; // bundles that are loaded if the user has selected them to be shown on the embedded map -// note: old loader -import 'oskari-lazy-loader?maprotator!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; -// note: new loader +import 'oskari-lazy-bundle?maprotator!oskari-frontend/bundles/mapping/maprotator'; import 'oskari-lazy-bundle?maplegend!oskari-frontend/bundles/framework/maplegend'; import 'oskari-lazy-bundle?featuredata!oskari-frontend/bundles/framework/featuredata'; import 'oskari-lazy-bundle?statsgrid!oskari-frontend/bundles/statistics/statsgrid'; diff --git a/applications/embedded/main.js b/applications/embedded/main.js index e924b51..1eec757 100644 --- a/applications/embedded/main.js +++ b/applications/embedded/main.js @@ -8,19 +8,14 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/ui-components/bu import 'oskari-loader!oskari-frontend/packages/framework/bundle/divmanazer/bundle.js'; // 2D mapmodule and support for additional map layer types -// note: old loader -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapmodule/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapwmts/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/wfsvector/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapuserlayers/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/maparcgis/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/mapmodule/map2d_ol'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/maparcgis'; +import 'oskari-bundle!oskari-frontend/bundles/framework/myplacesimport/mapuserlayers'; // additional map related bundles -// note: old loader -import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/drawtools/bundle.js'; -// note: new loader +import 'oskari-bundle!oskari-frontend/bundles/mapping/infobox'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/drawtools'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/toolbar'; import 'oskari-bundle!oskari-frontend/bundles/framework/coordinatetool'; import 'oskari-bundle!oskari-frontend/bundles/framework/publishedstatehandler'; @@ -29,9 +24,7 @@ import 'oskari-bundle!oskari-frontend/bundles/framework/publishedstatehandler'; import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js'; // bundles that are loaded if the user has selected them to be shown on the embedded map -// note: old loader -import 'oskari-lazy-loader?maprotator!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; -// note: new loader +import 'oskari-lazy-bundle?maprotator!oskari-frontend/bundles/mapping/maprotator'; import 'oskari-lazy-bundle?maplegend!oskari-frontend/bundles/framework/maplegend'; import 'oskari-lazy-bundle?featuredata!oskari-frontend/bundles/framework/featuredata'; import 'oskari-lazy-bundle?statsgrid!oskari-frontend/bundles/statistics/statsgrid'; diff --git a/applications/geoportal-3d/main.js b/applications/geoportal-3d/main.js index edc2d52..ecd4c58 100644 --- a/applications/geoportal-3d/main.js +++ b/applications/geoportal-3d/main.js @@ -7,21 +7,18 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/ui-components/bu import 'oskari-loader!oskari-frontend/packages/framework/bundle/divmanazer/bundle.js'; // 3D mapmodule and support for additional map layer types -import 'oskari-loader!oskari-frontend/packages/mapping/olcs/mapmodule/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/olcs/map3dtiles/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapwmts/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/maparcgis/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/wfsvector/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapmyplaces/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapuserlayers/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/mapmodule/map3d_olcs'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/tiles3d'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/maparcgis'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/mapmyplaces'; +import 'oskari-bundle!oskari-frontend/bundles/framework/myplacesimport/mapuserlayers'; // additional map related bundles -import 'oskari-loader!oskari-frontend/packages/mapping/ol/drawtools/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/heatmap/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/userstyle/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/drawtools'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/infobox'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/toolbar'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/heatmap'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/userstyle'; // 3d related bundles import 'oskari-bundle!oskari-frontend/bundles/mapping/time-control-3d'; @@ -42,6 +39,7 @@ import 'oskari-bundle!oskari-frontend/bundles/framework/userguide'; import 'oskari-bundle!../../bundles/sample-info'; // lazy-loaded as these are not used for every user (allows mobile version etc) +import 'oskari-lazy-bundle?maprotator!oskari-frontend/bundles/mapping/maprotator'; import 'oskari-lazy-bundle?myplaces3!oskari-frontend/bundles/framework/myplaces3'; import 'oskari-lazy-bundle?myplacesimport!oskari-frontend/bundles/framework/myplacesimport'; import 'oskari-lazy-bundle?mydata!oskari-frontend/bundles/framework/mydata'; diff --git a/applications/geoportal/main.js b/applications/geoportal/main.js index 748b3f9..edb2149 100644 --- a/applications/geoportal/main.js +++ b/applications/geoportal/main.js @@ -7,20 +7,18 @@ import 'oskari-loader!oskari-frontend/packages/framework/bundle/ui-components/bu import 'oskari-loader!oskari-frontend/packages/framework/bundle/divmanazer/bundle.js'; // 2D mapmodule and support for additional map layer types -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapmodule/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapwmts/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/maparcgis/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/wfsvector/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapmyplaces/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/mapuserlayers/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/mapmodule/map2d_ol'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/maparcgis'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/mapmyplaces'; +import 'oskari-bundle!oskari-frontend/bundles/framework/myplacesimport/mapuserlayers'; // additional map related bundles -import 'oskari-loader!oskari-frontend/packages/mapping/ol/drawtools/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/toolbar/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/infobox/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/heatmap/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/maprotator/bundle.js'; -import 'oskari-loader!oskari-frontend/packages/mapping/ol/userstyle/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/drawtools'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/toolbar'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/infobox'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/heatmap'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/maprotator'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/userstyle'; // other bundles import 'oskari-bundle!oskari-frontend/bundles/framework/coordinatetool'; @@ -33,7 +31,7 @@ import 'oskari-bundle!oskari-frontend/bundles/framework/userguide'; import 'oskari-bundle!oskari-frontend/bundles/framework/findbycoordinates'; // support for 3D-layer type and 2d/3d switcher -import 'oskari-loader!oskari-frontend/packages/mapping/olcs/map3dtiles/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/mapping/tiles3d'; import 'oskari-bundle!oskari-frontend/bundles/mapping/dimension-change'; // app-specific (example) bundle. Remove from actual app!! From 73397feaaedf3200174b620b90069e7e2adca69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Mon, 6 Oct 2025 17:58:46 +0300 Subject: [PATCH 2/2] Migrate RPC --- applications/embedded-3d/main.js | 3 +-- applications/embedded/main.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/applications/embedded-3d/main.js b/applications/embedded-3d/main.js index 510abfc..70bf1a1 100644 --- a/applications/embedded-3d/main.js +++ b/applications/embedded-3d/main.js @@ -24,8 +24,7 @@ import 'oskari-bundle!oskari-frontend/bundles/mapping/time-control-3d'; import 'oskari-bundle!oskari-frontend/bundles/mapping/camera-controls-3d'; // RPC connector -// note: old loader -import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/framework/rpc'; // bundles that are loaded if the user has selected them to be shown on the embedded map import 'oskari-lazy-bundle?maprotator!oskari-frontend/bundles/mapping/maprotator'; diff --git a/applications/embedded/main.js b/applications/embedded/main.js index 1eec757..a9c4679 100644 --- a/applications/embedded/main.js +++ b/applications/embedded/main.js @@ -20,8 +20,7 @@ import 'oskari-bundle!oskari-frontend/bundles/framework/coordinatetool'; import 'oskari-bundle!oskari-frontend/bundles/framework/publishedstatehandler'; // RPC connector -// note: old loader -import 'oskari-loader!oskari-frontend/packages/framework/bundle/rpc/bundle.js'; +import 'oskari-bundle!oskari-frontend/bundles/framework/rpc'; // bundles that are loaded if the user has selected them to be shown on the embedded map import 'oskari-lazy-bundle?maprotator!oskari-frontend/bundles/mapping/maprotator';