@mapcomponents/react-maplibre 0.1.56 → 0.1.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +11 -0
- package/.eslintrc.js +20 -0
- package/.github/workflows/check-formatting.yml +46 -0
- package/.prettierignore +11 -0
- package/.prettierrc.json +6 -0
- package/CHANGELOG.md +20 -0
- package/coverage/clover.xml +232 -80
- package/coverage/coverage-final.json +43 -37
- package/coverage/lcov-report/index.html +71 -26
- package/coverage/lcov-report/src/components/MapLibreMap/MapLibreMap.tsx.html +83 -83
- package/coverage/lcov-report/src/components/MapLibreMap/index.html +1 -1
- package/coverage/lcov-report/src/components/MlCenterPosition/MlCenterPosition.tsx.html +66 -66
- package/coverage/lcov-report/src/components/MlCenterPosition/index.html +1 -1
- package/coverage/lcov-report/src/components/MlCreatePdfButton/MlCreatePdfButton.tsx.html +30 -30
- package/coverage/lcov-report/src/components/MlCreatePdfButton/index.html +1 -1
- package/coverage/lcov-report/src/components/MlCreatePdfForm/MlCreatePdfForm.tsx.html +202 -0
- package/coverage/lcov-report/src/components/MlCreatePdfForm/index.html +116 -0
- package/coverage/lcov-report/src/components/MlFeatureEditor/MlFeatureEditor.tsx.html +99 -99
- package/coverage/lcov-report/src/components/MlFeatureEditor/index.html +1 -1
- package/coverage/lcov-report/src/components/MlFillExtrusionLayer/MlFillExtrusionLayer.tsx.html +66 -66
- package/coverage/lcov-report/src/components/MlFillExtrusionLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlFollowGps/MlFollowGps.tsx.html +221 -221
- package/coverage/lcov-report/src/components/MlFollowGps/index.html +1 -1
- package/coverage/lcov-report/src/components/MlGPXViewer/MlGPXViewer.tsx.html +308 -308
- package/coverage/lcov-report/src/components/MlGPXViewer/gpxConverter.js.html +497 -497
- package/coverage/lcov-report/src/components/MlGPXViewer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlGeoJsonLayer/MlGeoJsonLayer.tsx.html +85 -85
- package/coverage/lcov-report/src/components/MlGeoJsonLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.tsx.html +469 -0
- package/coverage/lcov-report/src/components/MlGeojsonLayerWithSource/index.html +116 -0
- package/coverage/lcov-report/src/components/MlImageMarkerLayer/MlImageMarkerLayer.tsx.html +140 -140
- package/coverage/lcov-report/src/components/MlImageMarkerLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlLayer/MlLayer.tsx.html +37 -37
- package/coverage/lcov-report/src/components/MlLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlLayerMagnify/MlLayerMagnify.tsx.html +179 -179
- package/coverage/lcov-report/src/components/MlLayerMagnify/index.html +1 -1
- package/coverage/lcov-report/src/components/MlLayerSwipe/MlLayerSwipe.tsx.html +113 -113
- package/coverage/lcov-report/src/components/MlLayerSwipe/index.html +1 -1
- package/coverage/lcov-report/src/components/MlLayerSwitcher/MlLayerSwitcher.js.html +181 -181
- package/coverage/lcov-report/src/components/MlLayerSwitcher/components/LayerBox.js.html +58 -58
- package/coverage/lcov-report/src/components/MlLayerSwitcher/components/index.html +1 -1
- package/coverage/lcov-report/src/components/MlLayerSwitcher/index.html +1 -1
- package/coverage/lcov-report/src/components/MlMarker/MlMarker.tsx.html +108 -108
- package/coverage/lcov-report/src/components/MlMarker/index.html +1 -1
- package/coverage/lcov-report/src/components/MlMeasureTool/MlMeasureTool.tsx.html +39 -39
- package/coverage/lcov-report/src/components/MlMeasureTool/index.html +1 -1
- package/coverage/lcov-report/src/components/MlNavigationCompass/MlNavigationCompass.tsx.html +183 -183
- package/coverage/lcov-report/src/components/MlNavigationCompass/index.html +1 -1
- package/coverage/lcov-report/src/components/MlNavigationTools/MlNavigationTools.tsx.html +163 -163
- package/coverage/lcov-report/src/components/MlNavigationTools/index.html +1 -1
- package/coverage/lcov-report/src/components/MlOsmLayer/MlOsmLayer.js.html +50 -50
- package/coverage/lcov-report/src/components/MlOsmLayer/MlOsmLayer.stories_.js.html +30 -30
- package/coverage/lcov-report/src/components/MlOsmLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlScaleReference/MlScaleReference.js.html +89 -89
- package/coverage/lcov-report/src/components/MlScaleReference/index.html +11 -11
- package/coverage/lcov-report/src/components/MlShareMapState/MlShareMapState.js.html +204 -204
- package/coverage/lcov-report/src/components/MlShareMapState/index.html +1 -1
- package/coverage/lcov-report/src/components/MlSpatialElevationProfile/MlSpatialElevationProfile.js.html +180 -180
- package/coverage/lcov-report/src/components/MlSpatialElevationProfile/index.html +1 -1
- package/coverage/lcov-report/src/components/MlThreeJsLayer/MlThreeJsLayer.js.html +163 -163
- package/coverage/lcov-report/src/components/MlThreeJsLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlTransitionGeoJsonLayer/MlTransitionGeoJsonLayer.tsx.html +136 -136
- package/coverage/lcov-report/src/components/MlTransitionGeoJsonLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlUseMapDebugger/MlUseMapDebugger.js.html +53 -53
- package/coverage/lcov-report/src/components/MlUseMapDebugger/index.html +1 -1
- package/coverage/lcov-report/src/components/MlVectorTileLayer/MlVectorTileLayer.tsx.html +123 -123
- package/coverage/lcov-report/src/components/MlVectorTileLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlWmsFeatureInfoPopup/MlWmsFeatureInfoPopup.js.html +35 -35
- package/coverage/lcov-report/src/components/MlWmsFeatureInfoPopup/index.html +1 -1
- package/coverage/lcov-report/src/components/MlWmsLayer/MlWmsLayer.tsx.html +155 -155
- package/coverage/lcov-report/src/components/MlWmsLayer/index.html +1 -1
- package/coverage/lcov-report/src/components/MlWmsLoader/MlWmsLoader.tsx.html +255 -255
- package/coverage/lcov-report/src/components/MlWmsLoader/index.html +1 -1
- package/coverage/lcov-report/src/contexts/MapContext.tsx.html +66 -66
- package/coverage/lcov-report/src/contexts/SimpleDataContext.js.html +1 -1
- package/coverage/lcov-report/src/contexts/SimpleDataProvider.js.html +48 -48
- package/coverage/lcov-report/src/contexts/index.html +1 -1
- package/coverage/lcov-report/src/hooks/exportMap/index.html +131 -0
- package/coverage/lcov-report/src/hooks/exportMap/index.ts.html +175 -0
- package/coverage/lcov-report/src/hooks/exportMap/lib.ts.html +646 -0
- package/coverage/lcov-report/src/hooks/index.html +48 -18
- package/coverage/lcov-report/src/hooks/useLayer.ts.html +230 -188
- package/coverage/lcov-report/src/hooks/useLayerEvent.js.html +232 -0
- package/coverage/lcov-report/src/hooks/useMap.ts.html +72 -69
- package/coverage/lcov-report/src/hooks/useMapState.ts.html +145 -145
- package/coverage/lcov-report/src/hooks/useSource.ts.html +337 -0
- package/coverage/lcov-report/src/hooks/useWms.js.html +72 -72
- package/coverage/lcov-report/src/index.html +1 -1
- package/coverage/lcov-report/src/index.ts.html +14 -2
- package/coverage/lcov.info +450 -153
- package/dist/components/MlCreatePdfForm/MlCreatePdfForm.d.ts +24 -0
- package/dist/components/MlCreatePdfForm/MlCreatePdfForm.stories.d.ts +13 -0
- package/dist/components/MlCreatePdfForm/lib/PdfContext.d.ts +21 -0
- package/dist/components/MlCreatePdfForm/lib/PdfForm.d.ts +10 -0
- package/dist/components/MlCreatePdfForm/lib/PdfPreview.d.ts +13 -0
- package/dist/components/MlCreatePdfForm/lib/pdf.templates.d.ts +11 -0
- package/dist/components/MlFeatureEditor/lib/create_vertex.d.ts +1 -1
- package/dist/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.d.ts +22 -0
- package/dist/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.stories.d.ts +10 -0
- package/dist/components/MlLayerSwipe/MlLayerSwipe.d.ts +1 -1
- package/dist/components/MlWmsLayer/MlWmsLayer.d.ts +2 -2
- package/dist/decorators/MapContextDecoratorHooks.d.ts +2 -0
- package/dist/decorators/ThemeWrapper.d.ts +1 -0
- package/dist/hooks/exportMap/index.d.ts +11 -0
- package/dist/hooks/exportMap/lib.d.ts +36 -0
- package/dist/hooks/useLayer.d.ts +6 -5
- package/dist/hooks/useLayerEvent.d.ts +2 -0
- package/dist/hooks/useMap.d.ts +1 -1
- package/dist/hooks/useMapState.stories.d.ts +2 -2
- package/dist/hooks/useSource.d.ts +17 -0
- package/dist/hooks/useSources.stories.d.ts +13 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.esm.js +479 -190
- package/dist/index.esm.js.map +1 -1
- package/eslintErrorTest.js +10 -0
- package/package.json +7 -1
- package/public/thumbnails/MlCreatePdfForm.png +0 -0
- package/src/components/MapLibreMap/MapLibreMap.stories.js +72 -72
- package/src/components/MapLibreMap/MapLibreMap.test.js +60 -60
- package/src/components/MapLibreMap/MapLibreMap.tsx +82 -82
- package/src/components/MapLibreMap/lib/MapLibreGlWrapper.test.js +343 -343
- package/src/components/MapLibreMap/lib/MapLibreGlWrapper.ts +619 -619
- package/src/components/MlBasicComponent.js +25 -25
- package/src/components/MlCenterPosition/MlCenterPosition.stories.js +6 -6
- package/src/components/MlCenterPosition/MlCenterPosition.tsx +65 -65
- package/src/components/MlComponentTemplate/MlComponentTemplate.stories.js +5 -5
- package/src/components/MlComponentTemplate/MlComponentTemplate.tsx +23 -23
- package/src/components/MlCreatePdfButton/{MlCreatePdfButton.meta.json → MlCreatePdfButton.meta_.json} +0 -0
- package/src/components/MlCreatePdfButton/MlCreatePdfButton.stories.js +16 -16
- package/src/components/MlCreatePdfButton/MlCreatePdfButton.tsx +29 -29
- package/src/components/MlCreatePdfButton/lib/createPdf.ts +175 -175
- package/src/components/MlCreatePdfButton/lib/nominatimMap.ts +51 -51
- package/src/components/MlCreatePdfForm/MlCreatePdfForm.doc.de.md +3 -0
- package/src/components/MlCreatePdfForm/MlCreatePdfForm.meta.json +15 -0
- package/src/components/MlCreatePdfForm/MlCreatePdfForm.stories.tsx +152 -0
- package/src/components/MlCreatePdfForm/MlCreatePdfForm.tsx +39 -0
- package/src/components/MlCreatePdfForm/lib/PdfContext.tsx +53 -0
- package/src/components/MlCreatePdfForm/lib/PdfForm.tsx +161 -0
- package/src/components/MlCreatePdfForm/lib/PdfPreview.tsx +399 -0
- package/src/components/MlCreatePdfForm/lib/pdf.templates.ts +82 -0
- package/src/components/MlFeatureEditor/MlFeatureEditor.stories.js +55 -55
- package/src/components/MlFeatureEditor/MlFeatureEditor.test.js +105 -105
- package/src/components/MlFeatureEditor/MlFeatureEditor.tsx +119 -119
- package/src/components/MlFeatureEditor/custom-direct-select-mode.js +208 -208
- package/src/components/MlFeatureEditor/custom-polygon-mode.js +148 -148
- package/src/components/MlFeatureEditor/custom-select-mode.js +314 -314
- package/src/components/MlFeatureEditor/lib/common_selectors.js +34 -34
- package/src/components/MlFeatureEditor/lib/constants.js +61 -61
- package/src/components/MlFeatureEditor/lib/constrain_feature_movement.js +51 -51
- package/src/components/MlFeatureEditor/lib/create_midpoint.js +30 -30
- package/src/components/MlFeatureEditor/lib/create_supplementary_points.js +82 -82
- package/src/components/MlFeatureEditor/lib/create_vertex.js +16 -16
- package/src/components/MlFeatureEditor/lib/double_click_zoom.js +23 -23
- package/src/components/MlFeatureEditor/lib/euclidean_distance.js +3 -3
- package/src/components/MlFeatureEditor/lib/features_at.js +23 -23
- package/src/components/MlFeatureEditor/lib/get_features_and_set_cursor.js +15 -15
- package/src/components/MlFeatureEditor/lib/is_click.js +8 -8
- package/src/components/MlFeatureEditor/lib/is_event_at_coordinates.js +2 -2
- package/src/components/MlFeatureEditor/lib/is_tap.js +6 -6
- package/src/components/MlFeatureEditor/lib/map_event_to_bounding_box.js +4 -4
- package/src/components/MlFeatureEditor/lib/mode_handler.js +105 -105
- package/src/components/MlFeatureEditor/lib/mouse_event_point.js +5 -5
- package/src/components/MlFeatureEditor/lib/move_features.js +33 -33
- package/src/components/MlFeatureEditor/lib/sort_features.js +25 -25
- package/src/components/MlFeatureEditor/lib/string_set.js +36 -36
- package/src/components/MlFeatureEditor/lib/string_sets_are_equal.js +2 -2
- package/src/components/MlFeatureEditor/lib/theme.js +230 -230
- package/src/components/MlFeatureEditor/lib/to_dense_array.js +1 -1
- package/src/components/MlFeatureEditor/lib/utils.js +40 -40
- package/src/components/MlFillExtrusionLayer/MlFillExtrusionLayer.stories.js +9 -9
- package/src/components/MlFillExtrusionLayer/MlFillExtrusionLayer.test.js +4 -4
- package/src/components/MlFillExtrusionLayer/MlFillExtrusionLayer.tsx +65 -65
- package/src/components/MlFollowGps/MlFollowGps.stories.js +6 -6
- package/src/components/MlFollowGps/MlFollowGps.test.js +44 -44
- package/src/components/MlFollowGps/MlFollowGps.tsx +220 -220
- package/src/components/MlGPXViewer/MlGPXViewer.stories.js +15 -15
- package/src/components/MlGPXViewer/MlGPXViewer.test.js +12 -12
- package/src/components/MlGPXViewer/MlGPXViewer.tsx +345 -345
- package/src/components/MlGPXViewer/gpxConverter.js +496 -496
- package/src/components/MlGPXViewer/util/GeoJsonContext.ts +4 -4
- package/src/components/MlGPXViewer/util/GeoJsonProvider.tsx +16 -16
- package/src/components/MlGeoJsonLayer/MlGeoJsonLayer.stories.js +34 -34
- package/src/components/MlGeoJsonLayer/MlGeoJsonLayer.test.js +8 -8
- package/src/components/MlGeoJsonLayer/MlGeoJsonLayer.tsx +84 -84
- package/src/components/MlGeoJsonLayer/util/getDefaultLayerTypeByGeometry.ts +21 -21
- package/src/components/MlGeoJsonLayer/util/getDefaultPaintPropsByType.ts +27 -27
- package/src/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.doc.de.md +3 -0
- package/src/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.meta_.json +15 -0
- package/src/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.stories.js +19 -0
- package/src/components/MlGeojsonLayerWithSource/MlGeojsonLayerWithSource.tsx +128 -0
- package/src/components/MlImageMarkerLayer/MlImageMarkerLayer.stories.js +28 -28
- package/src/components/MlImageMarkerLayer/MlImageMarkerLayer.test.js +8 -8
- package/src/components/MlImageMarkerLayer/MlImageMarkerLayer.tsx +162 -162
- package/src/components/MlLayer/MlLayer.stories.js +5 -5
- package/src/components/MlLayer/MlLayer.test.js +86 -86
- package/src/components/MlLayer/MlLayer.tsx +36 -36
- package/src/components/MlLayerMagnify/MlLayerMagnify.stories.js +21 -21
- package/src/components/MlLayerMagnify/MlLayerMagnify.test.js +54 -54
- package/src/components/MlLayerMagnify/MlLayerMagnify.tsx +201 -201
- package/src/components/MlLayerSwipe/MlLayerSwipe.stories.js +20 -20
- package/src/components/MlLayerSwipe/MlLayerSwipe.test.js +54 -54
- package/src/components/MlLayerSwipe/MlLayerSwipe.tsx +130 -130
- package/src/components/MlLayerSwitcher/MlLayerSwitcher.js +194 -194
- package/src/components/MlLayerSwitcher/MlLayerSwitcher.stories.js +85 -85
- package/src/components/MlLayerSwitcher/components/LayerBox.js +57 -57
- package/src/components/MlMarker/MlMarker.stories.js +7 -7
- package/src/components/MlMarker/MlMarker.tsx +119 -119
- package/src/components/MlMeasureTool/MlMeasureTool.stories.js +64 -64
- package/src/components/MlMeasureTool/MlMeasureTool.tsx +38 -38
- package/src/components/MlNavigationCompass/MlNavigationCompass.stories.js +45 -45
- package/src/components/MlNavigationCompass/MlNavigationCompass.test.js +40 -40
- package/src/components/MlNavigationCompass/MlNavigationCompass.tsx +192 -192
- package/src/components/MlNavigationTools/MlNavigationTools.stories.js +18 -18
- package/src/components/MlNavigationTools/MlNavigationTools.tsx +173 -173
- package/src/components/MlOsmLayer/MlOsmLayer.js +49 -49
- package/src/components/MlOsmLayer/MlOsmLayer.stories_.js +29 -29
- package/src/components/MlOsmLayer/MlOsmLayer.test.js +8 -8
- package/src/components/MlScaleReference/MlScaleReference.js +82 -82
- package/src/components/MlScaleReference/MlScaleReference.stories.js +33 -35
- package/src/components/MlShareMapState/MlShareMapState.js +203 -203
- package/src/components/MlShareMapState/MlShareMapState.stories.js +68 -68
- package/src/components/MlSpatialElevationProfile/MlSpatialElevationProfile.js +201 -201
- package/src/components/MlSpatialElevationProfile/MlSpatialElevationProfile.stories.js +35 -35
- package/src/components/MlSpatialElevationProfile/MlSpatialElevationProfile.test.js +8 -8
- package/src/components/MlThreeJsLayer/MlThreeJsLayer.js +186 -186
- package/src/components/MlThreeJsLayer/MlThreeJsLayer.stories.js +21 -21
- package/src/components/MlThreeJsLayer/MlThreeJsLayer.test.js +24 -24
- package/src/components/MlThreeJsLayer/lib/GLTFLoader.js +3327 -3327
- package/src/components/MlTransitionGeoJsonLayer/MlTransitionGeoJsonLayer.stories.js +31 -30
- package/src/components/MlTransitionGeoJsonLayer/MlTransitionGeoJsonLayer.test.js +8 -8
- package/src/components/MlTransitionGeoJsonLayer/MlTransitionGeoJsonLayer.tsx +146 -146
- package/src/components/MlTransitionGeoJsonLayer/util/transitionFunctions.js +207 -207
- package/src/components/MlUseMapDebugger/MlUseMapDebugger.js +52 -52
- package/src/components/MlUseMapDebugger/MlUseMapDebugger.stories.js +13 -13
- package/src/components/MlVectorTileLayer/MlVectorTileLayer.stories.js +27 -27
- package/src/components/MlVectorTileLayer/MlVectorTileLayer.test.js +27 -27
- package/src/components/MlVectorTileLayer/MlVectorTileLayer.tsx +137 -137
- package/src/components/MlWmsFeatureInfoPopup/MlWmsFeatureInfoPopup.js +34 -34
- package/src/components/MlWmsFeatureInfoPopup/MlWmsFeatureInfoPopup.stories.js +7 -7
- package/src/components/MlWmsLayer/MlWmsLayer.stories.js +26 -26
- package/src/components/MlWmsLayer/MlWmsLayer.test.js +8 -8
- package/src/components/MlWmsLayer/MlWmsLayer.tsx +167 -167
- package/src/components/MlWmsLoader/MlWmsLoader.stories.js +27 -27
- package/src/components/MlWmsLoader/MlWmsLoader.tsx +254 -254
- package/src/contexts/MapComponentsProvider.test.js +229 -229
- package/src/contexts/MapContext.tsx +65 -65
- package/src/contexts/SimpleDataProvider.js +47 -47
- package/src/contexts/SimpleDataProvider.test.js +29 -29
- package/src/custom.d.tsx +14 -14
- package/src/decorators/MapContextDecorator.js +23 -25
- package/src/decorators/MapContextDecoratorHooks.js +34 -0
- package/src/decorators/MultiMapContextDecorator.js +63 -63
- package/src/decorators/NoNavToolsDecorator.js +17 -17
- package/src/decorators/ThemeWrapper.jsx +9 -0
- package/src/hooks/assets/pointWG.json +13 -0
- package/src/hooks/exportMap/index.ts +30 -0
- package/src/hooks/exportMap/lib.ts +187 -0
- package/src/hooks/useLayer.test.js +188 -188
- package/src/hooks/useLayer.ts +194 -180
- package/src/hooks/useLayerEvent.js +49 -0
- package/src/hooks/useMap.ts +67 -66
- package/src/hooks/useMapState.stories.js +78 -78
- package/src/hooks/useMapState.ts +161 -161
- package/src/hooks/useSource.ts +84 -0
- package/src/hooks/useSources.stories.js +232 -0
- package/src/hooks/useWms.js +71 -71
- package/src/index.ts +4 -0
- package/src/setupTests.js +86 -86
- package/src/ui_components/ImageLoader.js +62 -62
- package/src/ui_components/Legend.js +34 -34
- package/src/ui_components/LoadingOverlay.js +29 -29
- package/src/ui_components/LoadingOverlayContext.js +68 -68
- package/src/ui_components/Sidebar.js +80 -80
- package/src/ui_components/Tooltip.js +9 -9
- package/src/ui_components/TopToolbar.js +23 -23
- package/src/util/layerRemovalTest.js +111 -111
- package/src/util/sourceRemovalTest.js +103 -103
|
@@ -490,195 +490,195 @@ import PropTypes from "prop-types";
|
|
|
490
490
|
* @component
|
|
491
491
|
*/
|
|
492
492
|
const MlThreeJsLayer = (props) => {
|
|
493
|
-
|
|
493
|
+
const mapContext = useContext(MapContext);
|
|
494
494
|
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
495
|
+
const layerName = "3d-model";
|
|
496
|
+
const [showLayer, setShowLayer] = useState(true);
|
|
497
|
+
const showLayerRef = useRef(true);
|
|
498
|
+
const initializedRef = useRef(false);
|
|
499
|
+
const mapRef = useRef(null);
|
|
500
|
+
const initFuncRef = useRef(props.init);
|
|
501
501
|
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
502
|
+
const cleanup = () => {
|
|
503
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (mapRef.current && mapRef.current.style) {
|
|
504
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (mapRef.current.getLayer(layerName)) {
|
|
505
|
+
mapRef.current.removeLayer(layerName);
|
|
506
|
+
}
|
|
507
|
+
mapRef.current = null;
|
|
508
|
+
}
|
|
509
|
+
};
|
|
510
510
|
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
<span class="cstat-no" title="statement not covered" >
|
|
514
|
-
|
|
511
|
+
useEffect(() => {
|
|
512
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof initFuncRef.current === "function") {
|
|
513
|
+
<span class="cstat-no" title="statement not covered" > initFuncRef.current();</span>
|
|
514
|
+
}
|
|
515
515
|
|
|
516
|
-
|
|
517
|
-
|
|
516
|
+
return cleanup;
|
|
517
|
+
}, []);
|
|
518
518
|
|
|
519
|
-
|
|
520
|
-
|
|
519
|
+
useEffect(() => {
|
|
520
|
+
if (!mapContext.mapExists(props.mapId) || initializedRef.current) return;
|
|
521
521
|
|
|
522
|
-
|
|
523
|
-
|
|
522
|
+
initializedRef.current = true;
|
|
523
|
+
mapRef.current = mapContext.getMap(props.mapId);
|
|
524
524
|
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
525
|
+
mapRef.current.setCenter([7.099771581806502, 50.73395746209983]);
|
|
526
|
+
mapRef.current.setZoom(15);
|
|
527
|
+
mapRef.current.setPitch(45);
|
|
528
528
|
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
529
|
+
// parameters to ensure the model is georeferenced correctly on the map
|
|
530
|
+
var modelOrigin = [7.099771581806502, 50.73395746209983];
|
|
531
|
+
// 50.73395746209983, 7.099771581806502
|
|
532
|
+
var modelAltitude = 0;
|
|
533
|
+
var modelRotate = [Math.PI / 2, 90, 0];
|
|
534
534
|
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
535
|
+
var modelAsMercatorCoordinate = maplibregl.MercatorCoordinate.fromLngLat(
|
|
536
|
+
modelOrigin,
|
|
537
|
+
modelAltitude
|
|
538
|
+
);
|
|
539
539
|
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
540
|
+
// transformation parameters to position, rotate and scale the 3D model onto the map
|
|
541
|
+
var modelTransform = {
|
|
542
|
+
translateX: modelAsMercatorCoordinate.x + 0.0000008,
|
|
543
|
+
translateY: modelAsMercatorCoordinate.y + 0.0000018,
|
|
544
|
+
translateZ: modelAsMercatorCoordinate.z,
|
|
545
|
+
rotateX: modelRotate[0],
|
|
546
|
+
rotateY: modelRotate[1],
|
|
547
|
+
rotateZ: modelRotate[2],
|
|
548
|
+
/* Since our 3D model is in real world meters, a scale transform needs to be
|
|
549
|
+
* applied since the CustomLayerInterface expects units in MercatorCoordinates.
|
|
550
|
+
*/
|
|
551
|
+
scale: modelAsMercatorCoordinate.meterInMercatorCoordinateUnits() + 0.00000003,
|
|
552
|
+
};
|
|
553
553
|
|
|
554
|
-
|
|
554
|
+
//var THREE = window.THREE;
|
|
555
555
|
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
<span class="cstat-no" title="statement not covered" >
|
|
563
|
-
<span class="cstat-no" title="statement not covered" >
|
|
556
|
+
// configuration of the custom layer for a 3D model per the CustomLayerInterface
|
|
557
|
+
var customLayer = {
|
|
558
|
+
id: "3d-model",
|
|
559
|
+
type: "custom",
|
|
560
|
+
renderingMode: "3d",
|
|
561
|
+
onAdd: <span class="fstat-no" title="function not covered" >fu</span>nction (map, gl) {
|
|
562
|
+
<span class="cstat-no" title="statement not covered" > this.camera = new THREE.Camera();</span>
|
|
563
|
+
<span class="cstat-no" title="statement not covered" > this.scene = new THREE.Scene();</span>
|
|
564
564
|
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
<span class="cstat-no" title="statement not covered" >
|
|
568
|
-
<span class="cstat-no" title="statement not covered" >
|
|
565
|
+
// create two three.js lights to illuminate the model
|
|
566
|
+
var directionalLight = <span class="cstat-no" title="statement not covered" >new THREE.DirectionalLight(0xffffff);</span>
|
|
567
|
+
<span class="cstat-no" title="statement not covered" > directionalLight.position.set(0, -70, 100).normalize();</span>
|
|
568
|
+
<span class="cstat-no" title="statement not covered" > this.scene.add(directionalLight);</span>
|
|
569
569
|
|
|
570
|
-
|
|
571
|
-
<span class="cstat-no" title="statement not covered" >
|
|
572
|
-
<span class="cstat-no" title="statement not covered" >
|
|
570
|
+
var directionalLight2 = <span class="cstat-no" title="statement not covered" >new THREE.DirectionalLight(0xffffff);</span>
|
|
571
|
+
<span class="cstat-no" title="statement not covered" > directionalLight2.position.set(0, 70, 100).normalize();</span>
|
|
572
|
+
<span class="cstat-no" title="statement not covered" > this.scene.add(directionalLight2);</span>
|
|
573
573
|
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
<span class="cstat-no" title="statement not covered" >
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
<span class="fstat-no" title="function not covered" >
|
|
580
|
-
<span class="cstat-no" title="statement not covered" >
|
|
581
|
-
<span class="cstat-no" title="statement not covered" >
|
|
582
|
-
<span class="cstat-no" title="statement not covered" >
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
<span class="cstat-no" title="statement not covered" >
|
|
574
|
+
// use the three.js GLTF loader to add the 3D model to the three.js scene
|
|
575
|
+
var loader = <span class="cstat-no" title="statement not covered" >new GLTFLoader();</span>
|
|
576
|
+
<span class="cstat-no" title="statement not covered" > loader.load(</span>
|
|
577
|
+
"assets/3D/godzilla_simple.glb",
|
|
578
|
+
//"https://docs.mapbox.com/mapbox-gl-js/assets/34M_17/34M_17.gltf",
|
|
579
|
+
<span class="fstat-no" title="function not covered" > fu</span>nction (gltf) {
|
|
580
|
+
<span class="cstat-no" title="statement not covered" > this.scene.add(gltf.scene);</span>
|
|
581
|
+
<span class="cstat-no" title="statement not covered" > if (typeof props.onDone === "function") {</span>
|
|
582
|
+
<span class="cstat-no" title="statement not covered" > props.onDone();</span>
|
|
583
|
+
}
|
|
584
|
+
}.bind(this)
|
|
585
|
+
);
|
|
586
|
+
<span class="cstat-no" title="statement not covered" > this.map = map;</span>
|
|
587
587
|
|
|
588
|
-
|
|
589
|
-
<span class="cstat-no" title="statement not covered" >
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
588
|
+
// use the Mapbox GL JS map canvas for three.js
|
|
589
|
+
<span class="cstat-no" title="statement not covered" > this.renderer = new THREE.WebGLRenderer({</span>
|
|
590
|
+
canvas: map.getCanvas(),
|
|
591
|
+
context: gl,
|
|
592
|
+
antialias: true,
|
|
593
|
+
});
|
|
594
594
|
|
|
595
|
-
<span class="cstat-no" title="statement not covered" >
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
595
|
+
<span class="cstat-no" title="statement not covered" > this.renderer.autoClear = false;</span>
|
|
596
|
+
},
|
|
597
|
+
render: <span class="fstat-no" title="function not covered" >fu</span>nction (gl, matrix) {
|
|
598
|
+
var rotationX = <span class="cstat-no" title="statement not covered" >new THREE.Matrix4().makeRotationAxis(</span>
|
|
599
|
+
new THREE.Vector3(1, 0, 0),
|
|
600
|
+
modelTransform.rotateX
|
|
601
|
+
);
|
|
602
|
+
var rotationY = <span class="cstat-no" title="statement not covered" >new THREE.Matrix4().makeRotationAxis(</span>
|
|
603
|
+
new THREE.Vector3(0, 1, 0),
|
|
604
|
+
modelTransform.rotateY
|
|
605
|
+
);
|
|
606
|
+
var rotationZ = <span class="cstat-no" title="statement not covered" >new THREE.Matrix4().makeRotationAxis(</span>
|
|
607
|
+
new THREE.Vector3(0, 0, 1),
|
|
608
|
+
modelTransform.rotateZ
|
|
609
|
+
);
|
|
610
610
|
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
611
|
+
var m = <span class="cstat-no" title="statement not covered" >new THREE.Matrix4().fromArray(matrix);</span>
|
|
612
|
+
var l = <span class="cstat-no" title="statement not covered" >new THREE.Matrix4()</span>
|
|
613
|
+
.makeTranslation(
|
|
614
|
+
modelTransform.translateX,
|
|
615
|
+
modelTransform.translateY,
|
|
616
|
+
modelTransform.translateZ
|
|
617
|
+
)
|
|
618
|
+
.scale(
|
|
619
|
+
new THREE.Vector3(modelTransform.scale, -modelTransform.scale, modelTransform.scale)
|
|
620
|
+
)
|
|
621
|
+
.multiply(rotationX)
|
|
622
|
+
.multiply(rotationY)
|
|
623
|
+
.multiply(rotationZ);
|
|
624
624
|
|
|
625
|
-
<span class="cstat-no" title="statement not covered" >
|
|
626
|
-
<span class="cstat-no" title="statement not covered" >
|
|
627
|
-
<span class="cstat-no" title="statement not covered" >
|
|
628
|
-
<span class="cstat-no" title="statement not covered" >
|
|
629
|
-
|
|
630
|
-
|
|
625
|
+
<span class="cstat-no" title="statement not covered" > this.camera.projectionMatrix = m.multiply(l);</span>
|
|
626
|
+
<span class="cstat-no" title="statement not covered" > this.renderer.resetState();</span>
|
|
627
|
+
<span class="cstat-no" title="statement not covered" > this.renderer.render(this.scene, this.camera);</span>
|
|
628
|
+
<span class="cstat-no" title="statement not covered" > this.map.triggerRepaint();</span>
|
|
629
|
+
},
|
|
630
|
+
};
|
|
631
631
|
|
|
632
|
-
|
|
632
|
+
mapRef.current.addLayer(customLayer);
|
|
633
633
|
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
634
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (mapRef.current.getLayer(layerName)) {
|
|
635
|
+
mapRef.current.setLayoutProperty(layerName, "visibility", "visible");
|
|
636
|
+
}
|
|
637
|
+
}, [mapContext.mapIds, mapContext, props]);
|
|
638
638
|
|
|
639
|
-
|
|
640
|
-
|
|
639
|
+
useEffect(() => {
|
|
640
|
+
if (!mapRef.current) return;
|
|
641
641
|
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
<span class="cstat-no" title="statement not covered" >
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
642
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (mapRef.current.getLayer(layerName)) {
|
|
643
|
+
// toggle layer visibility by changing the layout object's visibility property
|
|
644
|
+
if (showLayer) {
|
|
645
|
+
mapRef.current.setLayoutProperty(layerName, "visibility", "visible");
|
|
646
|
+
} else <span class="missing-if-branch" title="else path not taken" >E</span>{
|
|
647
|
+
<span class="cstat-no" title="statement not covered" > mapRef.current.setLayoutProperty(layerName, "visibility", "none");</span>
|
|
648
|
+
}
|
|
649
|
+
}
|
|
650
|
+
//
|
|
651
|
+
}, [showLayer, mapContext]);
|
|
652
652
|
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
<span class="cstat-no" title="statement not covered" >
|
|
660
|
-
<span class="cstat-no" title="statement not covered" >
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
653
|
+
return (
|
|
654
|
+
<>
|
|
655
|
+
<Button
|
|
656
|
+
color="primary"
|
|
657
|
+
variant={showLayer ? "contained" : <span class="branch-1 cbranch-no" title="branch not covered" >"outlined"}</span>
|
|
658
|
+
onClick={<span class="fstat-no" title="function not covered" >()</span> => {
|
|
659
|
+
<span class="cstat-no" title="statement not covered" > setShowLayer(!showLayer);</span>
|
|
660
|
+
<span class="cstat-no" title="statement not covered" > showLayerRef.current = !showLayer;</span>
|
|
661
|
+
}}
|
|
662
|
+
>
|
|
663
|
+
3D
|
|
664
|
+
</Button>
|
|
665
|
+
</>
|
|
666
|
+
);
|
|
667
667
|
};
|
|
668
668
|
|
|
669
669
|
MlThreeJsLayer.propTypes = {
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
670
|
+
/**
|
|
671
|
+
* Id of the target MapLibre instance in mapContext
|
|
672
|
+
*/
|
|
673
|
+
mapId: PropTypes.string,
|
|
674
|
+
/**
|
|
675
|
+
* function that gets called when initialized
|
|
676
|
+
*/
|
|
677
|
+
init: PropTypes.func,
|
|
678
|
+
/**
|
|
679
|
+
* function that gets called when models are loaded
|
|
680
|
+
*/
|
|
681
|
+
onDone: PropTypes.func,
|
|
682
682
|
};
|
|
683
683
|
|
|
684
684
|
export default MlThreeJsLayer;</pre></td></tr></table></pre>
|
|
@@ -688,7 +688,7 @@ export default MlThreeJsLayer;</pre></td></tr></table></pre>
|
|
|
688
688
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
689
689
|
Code coverage generated by
|
|
690
690
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
691
|
-
at
|
|
691
|
+
at Tue Oct 04 2022 11:59:51 GMT+0000 (Coordinated Universal Time)
|
|
692
692
|
</div>
|
|
693
693
|
<script src="../../../prettify.js"></script>
|
|
694
694
|
<script>
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
102
102
|
Code coverage generated by
|
|
103
103
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
104
|
-
at
|
|
104
|
+
at Tue Oct 04 2022 11:59:51 GMT+0000 (Coordinated Universal Time)
|
|
105
105
|
</div>
|
|
106
106
|
<script src="../../../prettify.js"></script>
|
|
107
107
|
<script>
|