@vcmap/core 6.0.0-rc.4 → 6.0.0-rc.6
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/dist/cesium.d.ts +11 -0
- package/dist/index.d.ts +23 -16
- package/dist/index.js +21 -14
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +15 -2
- package/dist/src/layer/cesium/clusterContext.d.ts +8 -14
- package/dist/src/layer/cesium/clusterContext.js +62 -41
- package/dist/src/layer/cesium/clusterContext.js.map +1 -1
- package/dist/src/layer/cesium/vectorCesiumImpl.d.ts +2 -3
- package/dist/src/layer/cesium/vectorCesiumImpl.js +16 -10
- package/dist/src/layer/cesium/vectorCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorContext.d.ts +10 -53
- package/dist/src/layer/cesium/vectorContext.js +88 -172
- package/dist/src/layer/cesium/vectorContext.js.map +1 -1
- package/dist/src/layer/geojsonHelpers.d.ts +1 -1
- package/dist/src/layer/geojsonHelpers.js +5 -10
- package/dist/src/layer/geojsonHelpers.js.map +1 -1
- package/dist/src/layer/oblique/obliqueHelpers.js +6 -6
- package/dist/src/layer/oblique/obliqueHelpers.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +0 -37
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.d.ts +8 -3
- package/dist/src/layer/vectorProperties.js +30 -5
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/map/baseOLMap.js +1 -1
- package/dist/src/map/baseOLMap.js.map +1 -1
- package/dist/src/map/obliqueMap.d.ts +3 -0
- package/dist/src/map/obliqueMap.js +27 -6
- package/dist/src/map/obliqueMap.js.map +1 -1
- package/dist/src/map/vcsMap.d.ts +8 -0
- package/dist/src/map/vcsMap.js +11 -0
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/oblique/helpers.js +5 -5
- package/dist/src/oblique/helpers.js.map +1 -1
- package/dist/src/oblique/obliqueDataSet.js +4 -4
- package/dist/src/oblique/obliqueDataSet.js.map +1 -1
- package/dist/src/ol/geom/geometryCollection.js +19 -2
- package/dist/src/ol/geom/geometryCollection.js.map +1 -1
- package/dist/src/style/arcStyle.js +1 -0
- package/dist/src/style/arcStyle.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +5 -1
- package/dist/src/util/editor/createFeatureSession.js +48 -4
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.d.ts +10 -4
- package/dist/src/util/editor/editFeaturesSession.js +74 -37
- package/dist/src/util/editor/editFeaturesSession.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.d.ts +5 -1
- package/dist/src/util/editor/editGeometrySession.js +77 -55
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/editorHelpers.d.ts +12 -6
- package/dist/src/util/editor/editorHelpers.js +47 -20
- package/dist/src/util/editor/editorHelpers.js.map +1 -1
- package/dist/src/util/editor/editorSessionHelpers.d.ts +5 -0
- package/dist/src/util/editor/editorSessionHelpers.js +1 -0
- package/dist/src/util/editor/editorSessionHelpers.js.map +1 -1
- package/dist/src/util/editor/editorSymbols.d.ts +1 -1
- package/dist/src/util/editor/editorSymbols.js +1 -1
- package/dist/src/util/editor/editorSymbols.js.map +1 -1
- package/dist/src/util/editor/interactions/createBBoxInteraction.d.ts +1 -0
- package/dist/src/util/editor/interactions/createBBoxInteraction.js +20 -16
- package/dist/src/util/editor/interactions/createBBoxInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createCircleInteraction.js +1 -1
- package/dist/src/util/editor/interactions/createCircleInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createLineStringInteraction.js +3 -3
- package/dist/src/util/editor/interactions/createLineStringInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createPointInteraction.js +1 -1
- package/dist/src/util/editor/interactions/createPointInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createPolygonInteraction.d.ts +4 -0
- package/dist/src/util/editor/interactions/createPolygonInteraction.js +9 -3
- package/dist/src/util/editor/interactions/createPolygonInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/creationSnapping.d.ts +26 -0
- package/dist/src/util/editor/interactions/creationSnapping.js +139 -0
- package/dist/src/util/editor/interactions/creationSnapping.js.map +1 -0
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js +3 -2
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/insertVertexInteraction.d.ts +3 -1
- package/dist/src/util/editor/interactions/insertVertexInteraction.js +14 -6
- package/dist/src/util/editor/interactions/insertVertexInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/layerSnapping.d.ts +19 -0
- package/dist/src/util/editor/interactions/layerSnapping.js +87 -0
- package/dist/src/util/editor/interactions/layerSnapping.js.map +1 -0
- package/dist/src/util/editor/interactions/translateVertexInteraction.js +2 -2
- package/dist/src/util/editor/interactions/translateVertexInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/translationSnapping.d.ts +25 -0
- package/dist/src/util/editor/interactions/translationSnapping.js +179 -0
- package/dist/src/util/editor/interactions/translationSnapping.js.map +1 -0
- package/dist/src/util/editor/snappingHelpers.d.ts +44 -0
- package/dist/src/util/editor/snappingHelpers.js +329 -0
- package/dist/src/util/editor/snappingHelpers.js.map +1 -0
- package/dist/src/util/editor/transformation/create2DHandlers.js +26 -26
- package/dist/src/util/editor/transformation/create2DHandlers.js.map +1 -1
- package/dist/src/util/editor/transformation/create3DHandlers.js +65 -14
- package/dist/src/util/editor/transformation/create3DHandlers.js.map +1 -1
- package/dist/src/util/editor/transformation/scaleInteraction.js +27 -5
- package/dist/src/util/editor/transformation/scaleInteraction.js.map +1 -1
- package/dist/src/util/editor/transformation/transformationHandler.js +56 -38
- package/dist/src/util/editor/transformation/transformationHandler.js.map +1 -1
- package/dist/src/util/editor/transformation/transformationTypes.d.ts +2 -0
- package/dist/src/util/editor/transformation/transformationTypes.js +4 -0
- package/dist/src/util/editor/transformation/transformationTypes.js.map +1 -1
- package/dist/src/util/featureconverter/arcToCesium.d.ts +5 -19
- package/dist/src/util/featureconverter/arcToCesium.js +15 -42
- package/dist/src/util/featureconverter/arcToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/circleToCesium.d.ts +2 -27
- package/dist/src/util/featureconverter/circleToCesium.js +84 -63
- package/dist/src/util/featureconverter/circleToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/clampedPrimitive.d.ts +2 -0
- package/dist/src/util/featureconverter/clampedPrimitive.js +29 -0
- package/dist/src/util/featureconverter/clampedPrimitive.js.map +1 -0
- package/dist/src/util/featureconverter/convert.d.ts +26 -7
- package/dist/src/util/featureconverter/convert.js +221 -44
- package/dist/src/util/featureconverter/convert.js.map +1 -1
- package/dist/src/util/featureconverter/extent3D.d.ts +4 -3
- package/dist/src/util/featureconverter/extent3D.js +4 -3
- package/dist/src/util/featureconverter/extent3D.js.map +1 -1
- package/dist/src/util/featureconverter/lineStringToCesium.d.ts +12 -27
- package/dist/src/util/featureconverter/lineStringToCesium.js +85 -107
- package/dist/src/util/featureconverter/lineStringToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/pointHelpers.d.ts +8 -11
- package/dist/src/util/featureconverter/pointHelpers.js +134 -120
- package/dist/src/util/featureconverter/pointHelpers.js.map +1 -1
- package/dist/src/util/featureconverter/pointToCesium.d.ts +14 -17
- package/dist/src/util/featureconverter/pointToCesium.js +47 -96
- package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/polygonToCesium.d.ts +2 -26
- package/dist/src/util/featureconverter/polygonToCesium.js +62 -72
- package/dist/src/util/featureconverter/polygonToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/storeyHelpers.d.ts +17 -0
- package/dist/src/util/featureconverter/storeyHelpers.js +78 -0
- package/dist/src/util/featureconverter/storeyHelpers.js.map +1 -0
- package/dist/src/util/featureconverter/vectorGeometryFactory.d.ts +54 -0
- package/dist/src/util/featureconverter/vectorGeometryFactory.js +278 -0
- package/dist/src/util/featureconverter/vectorGeometryFactory.js.map +1 -0
- package/dist/src/util/featureconverter/vectorHeightInfo.d.ts +86 -0
- package/dist/src/util/featureconverter/vectorHeightInfo.js +242 -0
- package/dist/src/util/featureconverter/vectorHeightInfo.js.map +1 -0
- package/dist/src/util/geometryHelpers.d.ts +22 -1
- package/dist/src/util/geometryHelpers.js +65 -2
- package/dist/src/util/geometryHelpers.js.map +1 -1
- package/dist/src/util/mapCollection.js +8 -0
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/math.d.ts +6 -2
- package/dist/src/util/math.js +34 -12
- package/dist/src/util/math.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js +3 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/helpers.d.ts +2 -9
- package/dist/tests/unit/helpers/helpers.js +2 -8
- package/dist/tests/unit/helpers/helpers.js.map +1 -1
- package/index.ts +74 -35
- package/package.json +3 -3
- package/src/cesium/cesium.d.ts +11 -0
- package/src/layer/cesium/clusterContext.ts +82 -91
- package/src/layer/cesium/vectorCesiumImpl.ts +17 -11
- package/src/layer/cesium/vectorContext.ts +120 -348
- package/src/layer/geojsonHelpers.ts +9 -12
- package/src/layer/oblique/obliqueHelpers.ts +6 -6
- package/src/layer/vectorLayer.ts +0 -71
- package/src/layer/vectorProperties.ts +46 -9
- package/src/map/baseOLMap.ts +1 -1
- package/src/map/obliqueMap.ts +46 -6
- package/src/map/vcsMap.ts +20 -2
- package/src/oblique/helpers.ts +11 -5
- package/src/oblique/obliqueDataSet.ts +4 -4
- package/src/ol/geom/geometryCollection.js +21 -2
- package/src/ol/ol.d.ts +15 -2
- package/src/style/arcStyle.ts +1 -0
- package/src/util/editor/createFeatureSession.ts +64 -6
- package/src/util/editor/editFeaturesSession.ts +105 -39
- package/src/util/editor/editGeometrySession.ts +118 -75
- package/src/util/editor/editorHelpers.ts +78 -30
- package/src/util/editor/editorSessionHelpers.ts +7 -0
- package/src/util/editor/editorSymbols.ts +1 -1
- package/src/util/editor/interactions/createBBoxInteraction.ts +25 -16
- package/src/util/editor/interactions/createCircleInteraction.ts +1 -1
- package/src/util/editor/interactions/createLineStringInteraction.ts +9 -3
- package/src/util/editor/interactions/createPointInteraction.ts +1 -1
- package/src/util/editor/interactions/createPolygonInteraction.ts +16 -3
- package/src/util/editor/interactions/creationSnapping.ts +226 -0
- package/src/util/editor/interactions/editGeometryMouseOverInteraction.ts +3 -2
- package/src/util/editor/interactions/insertVertexInteraction.ts +27 -7
- package/src/util/editor/interactions/layerSnapping.ts +136 -0
- package/src/util/editor/interactions/translateVertexInteraction.ts +8 -2
- package/src/util/editor/interactions/translationSnapping.ts +302 -0
- package/src/util/editor/snappingHelpers.ts +490 -0
- package/src/util/editor/transformation/create2DHandlers.ts +38 -26
- package/src/util/editor/transformation/create3DHandlers.ts +84 -22
- package/src/util/editor/transformation/scaleInteraction.ts +28 -5
- package/src/util/editor/transformation/transformationHandler.ts +72 -41
- package/src/util/editor/transformation/transformationTypes.ts +5 -0
- package/src/util/featureconverter/arcToCesium.ts +25 -95
- package/src/util/featureconverter/circleToCesium.ts +127 -113
- package/src/util/featureconverter/clampedPrimitive.ts +70 -0
- package/src/util/featureconverter/convert.ts +446 -114
- package/src/util/featureconverter/extent3D.ts +13 -6
- package/src/util/featureconverter/lineStringToCesium.ts +132 -179
- package/src/util/featureconverter/pointHelpers.ts +271 -214
- package/src/util/featureconverter/pointToCesium.ts +111 -175
- package/src/util/featureconverter/polygonToCesium.ts +98 -117
- package/src/util/featureconverter/storeyHelpers.ts +104 -0
- package/src/util/featureconverter/vectorGeometryFactory.ts +601 -0
- package/src/util/featureconverter/vectorHeightInfo.ts +393 -0
- package/src/util/geometryHelpers.ts +79 -5
- package/src/util/mapCollection.ts +8 -0
- package/src/util/math.ts +59 -12
- package/dist/src/util/featureconverter/featureconverterHelper.d.ts +0 -35
- package/dist/src/util/featureconverter/featureconverterHelper.js +0 -404
- package/dist/src/util/featureconverter/featureconverterHelper.js.map +0 -1
- package/src/util/featureconverter/featureconverterHelper.ts +0 -672
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointHelpers.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointHelpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pointHelpers.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,KAAK,EACL,8BAA8B,EAC9B,gBAAgB,EAChB,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,EACxB,gBAAgB,EAChB,gBAAgB,EAEhB,QAAQ,EACR,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,SAAS,EAET,cAAc,EACd,qBAAqB,EACrB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAc,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAyB,EACvB,oBAAoB,EACpB,sBAAsB,GAEvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EACL,yBAAyB,GAG1B,MAAM,uBAAuB,CAAC;AAE/B,SAAS,4BAA4B,CACnC,SAA4B,EAC5B,SAAkB,EAClB,KAAiB,EACjB,MAAkB;IAElB,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAClC,IAAI,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAErC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,aAAa,EAAE;QAC9C,GAAG;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,GAAG,CAAC,cAAuB;YACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;gBAClC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACxD,YAAY,GAAG,QAAQ,CAAC;gBACxB,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;gBACnE,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;gBACjE,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;aACjE;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,4BAA4B,CACnC,SAA4B,EAC5B,KAAiB;IAEjB,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAClC,IAAI,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAEjC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,aAAa,EAAE;QAC9C,GAAG;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,GAAG,CAAC,cAAuB;YACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;gBAClC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACxD,YAAY,GAAG,QAAQ,CAAC;aACzB;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,4BAA4B,GAAG,IAAI,UAAU,EAAE,CAAC;AAEtD,SAAS,oBAAoB,CAC3B,SAA4B,EAC5B,KAAiB,EACjB,gBAAkC,EAClC,eAAgC,EAChC,KAAY,EACZ,WAAuB,EACvB,MAAmB;IAEnB,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,CAAC,eAA6B,EAAQ,EAAE;QACpE,eAAe,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;QACzC,YAAY,CAAC,WAAW,CACtB,eAAe,EACf,SAAS,EACT,4BAA4B,CAC7B,CAAC;QAEF,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,MAAM,EAAE;YACV,OAAO,CAAC,cAAc,CACpB,mBAAmB,EACnB,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE,CAAC,EAC9D,mBAAmB,CACpB,CAAC;SACH;QACD,MAAM,SAAS,GAAG,UAAU,CAAC,4BAA4B,CACvD,4BAA4B,EAC5B,gBAAgB,CACjB,CAAC;QAEF,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,QAAQ,CACtC,SAAS,EACT,mBAAmB,EACnB,IAAI,OAAO,EAAE,CACd,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,CAAC,YAAY,CACxC,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,CAChB,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;IACpE,IAAI,MAAM,EAAE;QACV,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACtD,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC;QACnC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;KAC3C;IAED,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClD,SAAS,CAAC,OAAO,GAAG,GAAS,EAAE;QAC7B,eAAe,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAgB,EAChB,QAAoB,EACpB,WAAuB,EACvB,gBAAkC,EAClC,KAAY,EACZ,UAA4B,EAC5B,KAAa;IAEb,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CACnD,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,IAAI,CACb,CAAC;IACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC;IAC9B,IAAI,KAAwB,CAAC;IAC7B,IAAI,IAAI,YAAY,SAAS,EAAE;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,OAAO,EAAE;YACX,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAW,CAAC,CAAC;SAClE;KACF;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAClC,UAAU,CAAC,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EACnE,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EACxB,IAAI,OAAO,EAAE,CACd,CAAC;IAEF,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC;QACtC,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;QAClC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW;QACX,YAAY;QACZ,KAAK;QACL,GAAG,sBAAsB;KAC1B,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,GAAS,EAAE;QACpC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,kBAAkB,CAAC,MAAM;SAChC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,kBAAkB,EAAE,CAAC;KACtB;SAAM;QACL,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACtD,QAAQ,EAAE,CAAC;YACX,kBAAkB,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACtD,4BAA4B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KAC5C;IACD,IACE,yBAAyB,CAAC,UAAU,CAAC,eAAe,CAAC;QACpD,UAAwD,CAAC,WAAW;YACnE,IAAI,EACN;QACA,oBAAoB,CAClB,KAAK,EACL,KAAK,EACL,gBAAgB,EAChB,UAAU,CAAC,eAAe,EAC1B,KAAK,EACL,WAAW,CACZ,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CACrC,OAAyC,EACzC,KAAY,EACZ,OAAiB;IAEjB,IAAI,QAAQ,CAAC;IACb,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EAAE;QAClE,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,uBAAuB,CAAC,OAAO,CAAC,eAAe,CAAC;YACtD,CAAC,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KACnD;SAAM,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,EAAE;QAC1E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE;YACjD,OAAO,CAAC,eAAgB,CAAC,KAAK,GAAG,UAAU,CAAC,SAAS,CACnD,OAAO,CAAC,eAAgB,CAAC,KAAK,CAC/B,CAAC;SACH;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE;YACtD,OAAO,CAAC,eAAgB,CAAC,UAAU,GAAG,UAAU,CAAC,SAAS,CACxD,OAAO,CAAC,eAAgB,CAAC,UAAU,CACpC,CAAC;SACH;QACD,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC;YACvD,CAAC,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KACpD;IACD,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,EAAE;QAChE,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,qBAAqB,CAAC,OAAO,CAAC,eAAe,CAAC;YACpD,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KACjD;IACD,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC,EAAE;QAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAClD,OAAO,CAAC,eAAe,CAAC,OAAO,GAAG,UAAU,CAAC,SAAS,CACpD,OAAO,CAAC,eAAe,CAAC,OAAO,CAChC,CAAC;SACH;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAClD,OAAO,CAAC,eAAe,CAAC,OAAO,GAAG,UAAU,CAAC,SAAS,CACpD,OAAO,CAAC,eAAe,CAAC,OAAO,CAChC,CAAC;SACH;QACD,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,eAAe,CAAC;YACjD,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KAC9C;IAED,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,gBAAgB,CAAC;YAC1B,QAAQ;YACR,UAAU,EAAE;gBACV,KAAK,EAAE,8BAA8B,CAAC,SAAS,CAAC,KAAK,CAAC;aACvD;SACF,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,OAAgB,EAChB,KAAY,EACZ,QAAoB,EACpB,WAAuB,EACvB,gBAAkC,EAClC,KAAY,EACZ,UAA4B;IAE5B,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,IAAI,CAAC;IACT,IAAI,MAAM,CAAC;IACX,IAAI,UAAU,YAAY,YAAY,EAAE;QACtC,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAM,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;KACjC;SAAM,IAAI,UAAU,EAAE;QACrB,+EAA+E;QAC/E,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,8HAA8H;KAC3J;IAED,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,EAAE,CAAC;KACX;IACD,IAAI,SAA4B,CAAC;IACjC,IAAI,IAAI,EAAE;QACR,SAAS,GAAG,cAAc,CACxB,IAAI,CAAC,QAAQ,EAAe,EAC5B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CACrB,CAAC,CAAC,yBAAyB;KAC7B;IACD,IAAI,WAA8B,CAAC;IACnC,IAAI,MAAM,EAAE;QACV,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;KACvE;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CACnD,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,IAAI,CACb,CAAC;IACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAE/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACrD,IAAI,MAA8B,CAAC;IACnC,IAAI,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE;QACjD,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC/D,OAAO,CAAC,cAAc,CACpB,mBAAmB,EACnB,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE,CAAC,EAC9D,mBAAmB,CACpB,CAAC;KACH;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,4BAA4B,CACvD,QAAQ,EACR,gBAAgB,CACjB,CAAC;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAClC,SAAS,EACT,mBAAmB,EACnB,IAAI,OAAO,EAAE,CACd,CAAC;IAEF,IAAI,SAAS,CAAC;IACd,IAAI,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE;QAC3C,MAAM,cAAc,GAAG,cAAc,CACnC,OAAO,CAAC,gBAAgB,CAAC,cAAc,EACvC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CACrB,CAAC;QACF,SAAS,GAAG,IAAI,kBAAkB,CAAC;YACjC,WAAW,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC;YACrC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;gBACnC,KAAK,EAAE,cAAc;aACtB,CAAC;SACH,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,CACtB,WAAoB,EACpB,iBAA8C,EAC9C,mBAAwC,EAC7B,EAAE;QACb,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;YAC9B,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YAClC,iBAAiB,EAAE,iBAAiB,CAAC,MAAM,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACa;YACvB,WAAW;YACX,UAAU,EAAE,IAAI,0BAA0B,CAAC;gBACzC,WAAW;gBACX,IAAI,EAAE,IAAI;aACX,CAAC;YACF,mBAAmB;YACnB,YAAY;YACZ,GAAG,OAAO,CAAC,gBAAgB,CAAC,iBAAiB;SAC9C,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,IAAI,MAAM,EAAE;gBACV,4BAA4B,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;aACnE;iBAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxC,4BAA4B,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;aAChD;SACF;QAED,IACE,yBAAyB,CAAC,UAAU,CAAC,eAAe,CAAC;YACpD,UAAwD,CAAC,WAAW;gBACnE,IAAI,EACN;YACA,oBAAoB,CAClB,SAAS,EACT,KAAK,EACL,gBAAgB,EAChB,UAAU,CAAC,eAAe,EAC1B,KAAK,EACL,WAAW,EACX,MAAM,CACP,CAAC;SACH;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,IAAI,SAAS,EAAE;QACb,cAAc,CAAC,IAAI,CACjB,eAAe,CACb,SAAS,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAClC,CAAC,8BAA8B,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,EACrE,SAAS,CACV,CACF,CAAC;KACH;SAAM,IAAI,SAAS,EAAE;QACpB,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,cAAc,CAAC,IAAI,CACjB,eAAe,CACb,IAAI,EACJ,CAAC,8BAA8B,CAAC,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC,EACvE,SAAS,CACV,CACF,CAAC;KACH;IACD,IAAI,WAAW,EAAE;QACf,cAAc,CAAC,IAAI,CACjB,eAAe,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE;YACpD,8BAA8B,CAC5B,OAAO,CAAC,gBAAgB,EACxB,WAAW,EACX,IAAI,CACL;SACF,CAAC,CACH,CAAC;KACH;IAED,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnC,IAAI,EAAE,WAAW;QACjB,IAAI;QACJ,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,OAAgB,EAChB,KAAY,EACZ,QAAoB,EACpB,WAAuB,EACvB,gBAAkC,EAClC,UAA4B,EAC5B,KAAY;IAEZ,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,QAAQ,KAAK,OAAO,EAAE;QACxB,MAAM,YAAY,GAAG,MAAM,eAAe,CACxC,OAAO,EACP,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,KAAK,EACL,UAAU,EACV,KAAK,CACN,CAAC;QAEF,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C;IAED,IAAI,QAAQ,KAAK,WAAW,EAAE;QAC5B,OAAO,mBAAmB,CACxB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,KAAK,EACL,UAAU,CACX,CAAC;KACH;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { Cartesian3, HeightReference, type
|
|
1
|
+
import { Cartesian3, HeightReference, type Scene, Billboard, Label } from '@vcmap-cesium/engine';
|
|
2
2
|
import { type Style } from 'ol/style.js';
|
|
3
3
|
import type { Coordinate } from 'ol/coordinate.js';
|
|
4
4
|
import type { Feature } from 'ol/index.js';
|
|
5
5
|
import type { Point } from 'ol/geom.js';
|
|
6
6
|
import VectorProperties from '../../layer/vectorProperties.js';
|
|
7
|
-
import
|
|
8
|
-
import {
|
|
9
|
-
|
|
10
|
-
export type BillboardOptions =
|
|
11
|
-
export declare function getBillboardOptions(feature: Feature, style: Style, heightReference: HeightReference, vectorProperties: VectorProperties): BillboardOptions | null;
|
|
12
|
-
export type LabelOptions =
|
|
7
|
+
import { ConvertedItem } from './convert.js';
|
|
8
|
+
import { RelativeHeightReference, VectorHeightInfo } from './vectorHeightInfo.js';
|
|
9
|
+
import { CesiumGeometryOption } from './vectorGeometryFactory.js';
|
|
10
|
+
export type BillboardOptions = Billboard.ConstructorOptions;
|
|
11
|
+
export declare function getBillboardOptions(feature: Feature, style: Style, heightReference: HeightReference, vectorProperties: VectorProperties): Partial<BillboardOptions> | null;
|
|
12
|
+
export type LabelOptions = Label.ConstructorOptions;
|
|
13
13
|
/**
|
|
14
14
|
* extracts cesium label options from a feature and style
|
|
15
15
|
* @param feature
|
|
@@ -18,19 +18,16 @@ export type LabelOptions = LabelGraphics.ConstructorOptions;
|
|
|
18
18
|
* @param heightReference
|
|
19
19
|
* @param vectorProperties
|
|
20
20
|
*/
|
|
21
|
-
export declare function getLabelOptions(feature: Feature, style: Style, heightReference: HeightReference, vectorProperties: VectorProperties): LabelOptions | null;
|
|
21
|
+
export declare function getLabelOptions(feature: Feature, style: Style, heightReference: HeightReference, vectorProperties: VectorProperties): Partial<LabelOptions> | null;
|
|
22
22
|
/**
|
|
23
23
|
* validates if a point is renderable
|
|
24
24
|
*/
|
|
25
25
|
export declare function validatePoint(point: Point): boolean;
|
|
26
|
+
export declare function getLineGeometries(heightInfo: VectorHeightInfo<RelativeHeightReference | HeightReference.NONE>, position: Cartesian3, wgs84Coords: Coordinate, style: Style): CesiumGeometryOption<'line'>[];
|
|
26
27
|
/**
|
|
27
|
-
*
|
|
28
|
-
* @param
|
|
29
|
-
* @param
|
|
28
|
+
* Sets the correct height on the wgs84Coords depending on the height info
|
|
29
|
+
* @param geometry
|
|
30
|
+
* @param heightInfo
|
|
30
31
|
*/
|
|
31
|
-
export declare function
|
|
32
|
-
|
|
33
|
-
wgs84Positions: Coordinate[];
|
|
34
|
-
};
|
|
35
|
-
export declare function getLineGeometries(wgs84Positions: Coordinate[], heightInfo: VectorHeightInfo, positions: Cartesian3[], style: Style): PolylineGeometry[];
|
|
36
|
-
export default function pointToCesium(feature: Feature, style: Style, geometries: Point[], vectorProperties: VectorProperties, scene: Scene, context: AsyncCesiumVectorContext): Promise<void>;
|
|
32
|
+
export declare function getWgs84CoordinatesForPoint(geometry: Point, heightInfo: VectorHeightInfo): Coordinate;
|
|
33
|
+
export declare function getPointPrimitives(feature: Feature, geometry: Point, style: Style, vectorProperties: VectorProperties, scene: Scene, heightInfo: VectorHeightInfo): Promise<(CesiumGeometryOption | ConvertedItem)[]>;
|
|
@@ -1,17 +1,11 @@
|
|
|
1
|
-
import { Cartesian3, Color,
|
|
1
|
+
import { Cartesian3, Color, VerticalOrigin, Cartesian2, LabelStyle, HorizontalOrigin, } from '@vcmap-cesium/engine';
|
|
2
2
|
import { Icon } from 'ol/style.js';
|
|
3
3
|
import ImageState from 'ol/ImageState.js';
|
|
4
4
|
import { parseNumber } from '@vcsuite/parsers';
|
|
5
|
-
import { createLinePrimitive, getHeightInfo, } from './featureconverterHelper.js';
|
|
6
|
-
import Projection from '../projection.js';
|
|
7
5
|
import { createLineGeometries } from './lineStringToCesium.js';
|
|
8
6
|
import { getCesiumColor } from '../../style/styleHelpers.js';
|
|
9
|
-
import {
|
|
10
|
-
|
|
11
|
-
return geometries.map((point) => {
|
|
12
|
-
return point.getCoordinates();
|
|
13
|
-
});
|
|
14
|
-
}
|
|
7
|
+
import { getModelOrPointPrimitiveOptions } from './pointHelpers.js';
|
|
8
|
+
import { isClampedHeightReference, mercatorToWgs84TransformerForHeightInfo, } from './vectorHeightInfo.js';
|
|
15
9
|
export function getBillboardOptions(feature, style, heightReference, vectorProperties) {
|
|
16
10
|
const imageStyle = style.getImage();
|
|
17
11
|
if (imageStyle) {
|
|
@@ -41,18 +35,17 @@ export function getBillboardOptions(feature, style, heightReference, vectorPrope
|
|
|
41
35
|
image = imageStyle.getImage(1);
|
|
42
36
|
}
|
|
43
37
|
const options = {
|
|
44
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
45
|
-
// @ts-ignore
|
|
46
|
-
image,
|
|
47
38
|
color,
|
|
48
39
|
scale: imageStyle.getScaleArray()[0],
|
|
49
40
|
heightReference,
|
|
50
41
|
verticalOrigin: VerticalOrigin.BOTTOM,
|
|
51
42
|
id: feature.getId(),
|
|
52
43
|
};
|
|
44
|
+
// @ts-expect-error: cesium types are wrong here
|
|
45
|
+
options.image = image;
|
|
53
46
|
options.eyeOffset = vectorProperties.getEyeOffset(feature);
|
|
54
47
|
options.scaleByDistance = vectorProperties.getScaleByDistance(feature);
|
|
55
|
-
if (heightReference
|
|
48
|
+
if (isClampedHeightReference(heightReference)) {
|
|
56
49
|
options.disableDepthTestDistance = Number.POSITIVE_INFINITY;
|
|
57
50
|
}
|
|
58
51
|
return options;
|
|
@@ -135,7 +128,7 @@ export function getLabelOptions(feature, style, heightReference, vectorPropertie
|
|
|
135
128
|
options.verticalOrigin = verticalOrigin;
|
|
136
129
|
options.eyeOffset = vectorProperties.getEyeOffset(feature);
|
|
137
130
|
options.scaleByDistance = vectorProperties.getScaleByDistance(feature);
|
|
138
|
-
if (heightReference
|
|
131
|
+
if (isClampedHeightReference(heightReference)) {
|
|
139
132
|
options.disableDepthTestDistance = Number.POSITIVE_INFINITY;
|
|
140
133
|
}
|
|
141
134
|
return options;
|
|
@@ -155,98 +148,56 @@ export function validatePoint(point) {
|
|
|
155
148
|
}
|
|
156
149
|
return false;
|
|
157
150
|
}
|
|
158
|
-
|
|
159
|
-
* returns positions (cartesian3) and WGS84 coordinates
|
|
160
|
-
* @param coordinates
|
|
161
|
-
* @param heightInfo
|
|
162
|
-
*/
|
|
163
|
-
export function getCartesian3AndWGS84FromCoordinates(coordinates, heightInfo) {
|
|
164
|
-
const wgs84Positions = new Array(coordinates.length);
|
|
165
|
-
const positions = new Array(coordinates.length);
|
|
166
|
-
const heightValue = heightInfo.groundLevel +
|
|
167
|
-
heightInfo.storeyHeightsAboveGround.reduce((sum, currentValue) => sum + currentValue, 0);
|
|
168
|
-
coordinates.forEach((coord, index) => {
|
|
169
|
-
wgs84Positions[index] = Projection.mercatorToWgs84(coord, true);
|
|
170
|
-
positions[index] = Cartesian3.fromDegrees(coord[0], coord[1], heightValue);
|
|
171
|
-
});
|
|
172
|
-
return {
|
|
173
|
-
positions,
|
|
174
|
-
wgs84Positions,
|
|
175
|
-
};
|
|
176
|
-
}
|
|
177
|
-
export function getLineGeometries(wgs84Positions, heightInfo, positions, style) {
|
|
178
|
-
const lineGeometries = [];
|
|
151
|
+
export function getLineGeometries(heightInfo, position, wgs84Coords, style) {
|
|
179
152
|
const heightValueCorrection = heightInfo.skirt +
|
|
180
|
-
heightInfo.storeyHeightsBelowGround.reduce((sum, currentValue) => sum + currentValue, 0)
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
const secondPoint = Cartesian3.fromDegrees(pointPosition[0], pointPosition[1], heightValue);
|
|
186
|
-
const linePositions = [positions[i], secondPoint];
|
|
187
|
-
lineGeometries.push(...createLineGeometries({ positions: linePositions }, style));
|
|
188
|
-
}
|
|
189
|
-
return lineGeometries;
|
|
153
|
+
heightInfo.storeyHeightsBelowGround.reduce((sum, currentValue) => sum + currentValue, 0) +
|
|
154
|
+
heightInfo.storeyHeightsAboveGround.reduce((sum, currentValue) => sum + currentValue, 0);
|
|
155
|
+
const secondPoint = Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2] - heightValueCorrection);
|
|
156
|
+
const linePositions = [position, secondPoint];
|
|
157
|
+
return createLineGeometries({ positions: linePositions }, heightInfo, style);
|
|
190
158
|
}
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
const { positions, wgs84Positions } = getCartesian3AndWGS84FromCoordinates(coordinates, heightInfo);
|
|
205
|
-
let modelOrPrimitiveOptions = null;
|
|
206
|
-
if (feature.get('olcs_modelUrl')) {
|
|
207
|
-
modelOrPrimitiveOptions = await getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene, style);
|
|
208
|
-
}
|
|
209
|
-
else if (feature.get('olcs_primitiveOptions')) {
|
|
210
|
-
modelOrPrimitiveOptions = await getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene);
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
modelOrPrimitiveOptions =
|
|
214
|
-
(await getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene, style)) ??
|
|
215
|
-
(await getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene));
|
|
216
|
-
}
|
|
217
|
-
if (heightInfo.extruded && style.getStroke()) {
|
|
218
|
-
const lineGeometries = getLineGeometries(wgs84Positions, heightInfo, positions, style);
|
|
219
|
-
if (lineGeometries.length) {
|
|
220
|
-
heightReference = HeightReference.NONE;
|
|
221
|
-
const linePrimitive = createLinePrimitive(scene, vectorProperties, allowPicking, feature, lineGeometries, style, false);
|
|
222
|
-
if (linePrimitive) {
|
|
223
|
-
context.addPrimitives([linePrimitive], feature, allowPicking);
|
|
224
|
-
}
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
if (modelOrPrimitiveOptions) {
|
|
228
|
-
if (modelOrPrimitiveOptions.options.autoScale) {
|
|
229
|
-
context.addScaledPrimitives(modelOrPrimitiveOptions.primitives, feature, allowPicking);
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
context.addPrimitives(modelOrPrimitiveOptions.primitives, feature, allowPicking);
|
|
159
|
+
/**
|
|
160
|
+
* Sets the correct height on the wgs84Coords depending on the height info
|
|
161
|
+
* @param geometry
|
|
162
|
+
* @param heightInfo
|
|
163
|
+
*/
|
|
164
|
+
export function getWgs84CoordinatesForPoint(geometry, heightInfo) {
|
|
165
|
+
const transformer = mercatorToWgs84TransformerForHeightInfo(heightInfo);
|
|
166
|
+
const wgs84Coords = transformer(geometry.getCoordinates());
|
|
167
|
+
if (!isClampedHeightReference(heightInfo.heightReference)) {
|
|
168
|
+
// points get rendered at the top of the extrusion. we must add this to the Z value
|
|
169
|
+
const extrusionHeight = heightInfo.storeyHeightsAboveGround.reduce((sum, currentValue) => sum + currentValue, 0);
|
|
170
|
+
if (extrusionHeight) {
|
|
171
|
+
wgs84Coords[2] += extrusionHeight;
|
|
233
172
|
}
|
|
234
173
|
}
|
|
235
|
-
|
|
236
|
-
|
|
174
|
+
return wgs84Coords;
|
|
175
|
+
}
|
|
176
|
+
export async function getPointPrimitives(feature, geometry, style, vectorProperties, scene, heightInfo) {
|
|
177
|
+
const wgs84Coords = getWgs84CoordinatesForPoint(geometry, heightInfo);
|
|
178
|
+
const position = Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2]);
|
|
179
|
+
const pointPrimitives = await getModelOrPointPrimitiveOptions(feature, style, position, wgs84Coords, vectorProperties, heightInfo, scene);
|
|
180
|
+
if (pointPrimitives.length === 0) {
|
|
181
|
+
const bbOptions = getBillboardOptions(feature, style, heightInfo.heightReference, vectorProperties);
|
|
237
182
|
if (bbOptions) {
|
|
238
|
-
|
|
239
|
-
|
|
183
|
+
pointPrimitives.push({
|
|
184
|
+
type: 'billboard',
|
|
185
|
+
item: { ...bbOptions, position },
|
|
240
186
|
});
|
|
241
|
-
context.addBillboards(bbOptionsperPosition, feature, allowPicking);
|
|
242
187
|
}
|
|
243
|
-
const labelOptions = getLabelOptions(feature, style, heightReference, vectorProperties);
|
|
188
|
+
const labelOptions = getLabelOptions(feature, style, heightInfo.heightReference, vectorProperties);
|
|
244
189
|
if (labelOptions) {
|
|
245
|
-
|
|
246
|
-
|
|
190
|
+
pointPrimitives.push({
|
|
191
|
+
type: 'label',
|
|
192
|
+
item: { ...labelOptions, position },
|
|
247
193
|
});
|
|
248
|
-
context.addLabels(labelOptionsPerPosition, feature, allowPicking);
|
|
249
194
|
}
|
|
250
195
|
}
|
|
196
|
+
if (!isClampedHeightReference(heightInfo.heightReference) &&
|
|
197
|
+
heightInfo.extruded &&
|
|
198
|
+
style.getStroke()) {
|
|
199
|
+
pointPrimitives.push(...getLineGeometries(heightInfo, position, wgs84Coords, style));
|
|
200
|
+
}
|
|
201
|
+
return pointPrimitives;
|
|
251
202
|
}
|
|
252
203
|
//# sourceMappingURL=pointToCesium.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointToCesium.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,
|
|
1
|
+
{"version":3,"file":"pointToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointToCesium.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,9 @@
|
|
|
1
|
-
import { PolygonGeometry, PolygonOutlineGeometry, GroundPolylineGeometry, PolylineGeometry, type Scene } from '@vcmap-cesium/engine';
|
|
2
|
-
import type { Style } from 'ol/style.js';
|
|
3
1
|
import type { Polygon } from 'ol/geom.js';
|
|
4
|
-
import
|
|
5
|
-
import type { Feature } from 'ol/index.js';
|
|
6
|
-
import type VectorProperties from '../../layer/vectorProperties.js';
|
|
7
|
-
import type { AsyncCesiumVectorContext } from '../../layer/cesium/vectorContext.js';
|
|
8
|
-
export type PolygonGeometryOptions = ConstructorParameters<typeof PolygonGeometry>[0];
|
|
9
|
-
export type PolylineGeometryOptions = ConstructorParameters<typeof PolylineGeometry>[0];
|
|
10
|
-
export declare function createSolidGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean, extrudedHeight?: number): PolygonGeometry[];
|
|
11
|
-
export declare function createOutlineGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean, extrudedHeight?: number): PolygonOutlineGeometry[];
|
|
12
|
-
export declare function createFillGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean): PolygonGeometry[];
|
|
13
|
-
export declare function getLineGeometryOptions(options: PolygonGeometryOptions, style: Style): PolylineGeometryOptions[];
|
|
14
|
-
export declare function createGroundLineGeometries(options: PolygonGeometryOptions, style: Style): GroundPolylineGeometry[];
|
|
15
|
-
export declare function createLineGeometries(options: PolygonGeometryOptions, style: Style): PolylineGeometry[];
|
|
16
|
-
export declare function getGeometryOptions(geometry: Polygon, positionHeightAdjustment: number, perPositionHeight: boolean, groundLevelOrMinHeight: number): PolygonGeometryOptions;
|
|
17
|
-
export declare function getCoordinates(geometries: Polygon[]): Coordinate[];
|
|
2
|
+
import { VectorGeometryFactory } from './vectorGeometryFactory.js';
|
|
18
3
|
/**
|
|
19
4
|
* TODO maybe add validation Functions to OpenlayersMap
|
|
20
5
|
* validates if a polygon is renderable
|
|
21
6
|
* @param polygon
|
|
22
7
|
*/
|
|
23
8
|
export declare function validatePolygon(polygon: Polygon): boolean;
|
|
24
|
-
|
|
25
|
-
* converts a polygon to a a cesium primitive, with optional labels
|
|
26
|
-
* @param feature
|
|
27
|
-
* @param style
|
|
28
|
-
* @param geometries
|
|
29
|
-
* @param vectorProperties
|
|
30
|
-
* @param scene
|
|
31
|
-
* @param context
|
|
32
|
-
*/
|
|
33
|
-
export default function polygonToCesium(feature: Feature, style: Style, geometries: Polygon[], vectorProperties: VectorProperties, scene: Scene, context: AsyncCesiumVectorContext): void;
|
|
9
|
+
export declare function getPolygonGeometryFactory(): VectorGeometryFactory<'polygon'>;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { Cartesian3, PolygonGeometry, PerInstanceColorAppearance, PolygonOutlineGeometry, GroundPolylineGeometry, PolygonHierarchy, PolylineGeometry, } from '@vcmap-cesium/engine';
|
|
2
2
|
import { parseNumber } from '@vcsuite/parsers';
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
import { getFlatCoordinatesFromSimpleGeometry } from '../geometryHelpers.js';
|
|
6
|
-
export function createSolidGeometries(options, height, perPositionHeight, extrudedHeight) {
|
|
3
|
+
import { mercatorToCartesianTransformerForHeightInfo, } from './vectorHeightInfo.js';
|
|
4
|
+
function createPolygonGeometry(options, height, perPositionHeight, extrudedHeight) {
|
|
7
5
|
const polygonOptions = {
|
|
8
6
|
...options,
|
|
9
7
|
perPositionHeight,
|
|
@@ -12,23 +10,42 @@ export function createSolidGeometries(options, height, perPositionHeight, extrud
|
|
|
12
10
|
if (!perPositionHeight) {
|
|
13
11
|
polygonOptions.height = height;
|
|
14
12
|
}
|
|
15
|
-
return
|
|
13
|
+
return new PolygonGeometry(polygonOptions);
|
|
16
14
|
}
|
|
17
|
-
|
|
15
|
+
function createSolidGeometries(options, heightInfo, height, perPositionHeight, extrudedHeight) {
|
|
18
16
|
return [
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
vertexFormat: PerInstanceColorAppearance.FLAT_VERTEX_FORMAT,
|
|
25
|
-
}),
|
|
17
|
+
{
|
|
18
|
+
type: 'solid',
|
|
19
|
+
geometry: createPolygonGeometry(options, height, perPositionHeight, extrudedHeight),
|
|
20
|
+
heightInfo,
|
|
21
|
+
},
|
|
26
22
|
];
|
|
27
23
|
}
|
|
28
|
-
|
|
29
|
-
return
|
|
24
|
+
function createOutlineGeometries(options, heightInfo, height, perPositionHeight, extrudedHeight) {
|
|
25
|
+
return [
|
|
26
|
+
{
|
|
27
|
+
type: 'outline',
|
|
28
|
+
geometry: new PolygonOutlineGeometry({
|
|
29
|
+
...options,
|
|
30
|
+
height: perPositionHeight ? undefined : height,
|
|
31
|
+
extrudedHeight,
|
|
32
|
+
perPositionHeight,
|
|
33
|
+
vertexFormat: PerInstanceColorAppearance.FLAT_VERTEX_FORMAT,
|
|
34
|
+
}),
|
|
35
|
+
heightInfo,
|
|
36
|
+
},
|
|
37
|
+
];
|
|
38
|
+
}
|
|
39
|
+
function createFillGeometries(options, heightInfo, height, perPositionHeight) {
|
|
40
|
+
return [
|
|
41
|
+
{
|
|
42
|
+
type: 'fill',
|
|
43
|
+
geometry: createPolygonGeometry(options, height, perPositionHeight),
|
|
44
|
+
heightInfo,
|
|
45
|
+
},
|
|
46
|
+
];
|
|
30
47
|
}
|
|
31
|
-
|
|
48
|
+
function getLineGeometryOptions(options, style) {
|
|
32
49
|
const width = parseNumber(style.getStroke()?.getWidth(), 1.0);
|
|
33
50
|
const geometryOptions = [];
|
|
34
51
|
geometryOptions.push({
|
|
@@ -43,32 +60,28 @@ export function getLineGeometryOptions(options, style) {
|
|
|
43
60
|
});
|
|
44
61
|
return geometryOptions;
|
|
45
62
|
}
|
|
46
|
-
|
|
47
|
-
return getLineGeometryOptions(options, style).map((option) => {
|
|
48
|
-
|
|
49
|
-
|
|
63
|
+
function createGroundLineGeometries(options, heightInfo, style) {
|
|
64
|
+
return getLineGeometryOptions(options, style).map((option) => ({
|
|
65
|
+
type: 'groundLine',
|
|
66
|
+
geometry: new GroundPolylineGeometry(option),
|
|
67
|
+
heightInfo,
|
|
68
|
+
}));
|
|
50
69
|
}
|
|
51
|
-
|
|
52
|
-
return getLineGeometryOptions(options, style).map((option) => {
|
|
53
|
-
|
|
54
|
-
|
|
70
|
+
function createLineGeometries(options, heightInfo, style) {
|
|
71
|
+
return getLineGeometryOptions(options, style).map((option) => ({
|
|
72
|
+
type: 'line',
|
|
73
|
+
geometry: new PolylineGeometry(option),
|
|
74
|
+
heightInfo,
|
|
75
|
+
}));
|
|
55
76
|
}
|
|
56
|
-
|
|
77
|
+
function getGeometryOptions(geometry, heightInfo) {
|
|
57
78
|
let hieraryPositions;
|
|
58
79
|
const holes = [];
|
|
59
80
|
const rings = geometry.getLinearRings();
|
|
81
|
+
const coordinateTransformer = mercatorToCartesianTransformerForHeightInfo(heightInfo);
|
|
60
82
|
for (let i = 0; i < rings.length; i++) {
|
|
61
83
|
const coords = rings[i].getCoordinates();
|
|
62
|
-
const positions = coords.map(
|
|
63
|
-
const wgs84Coords = Projection.mercatorToWgs84(coord);
|
|
64
|
-
if (!perPositionHeight && groundLevelOrMinHeight) {
|
|
65
|
-
wgs84Coords[2] = groundLevelOrMinHeight;
|
|
66
|
-
}
|
|
67
|
-
else if (wgs84Coords[2] != null) {
|
|
68
|
-
wgs84Coords[2] += positionHeightAdjustment;
|
|
69
|
-
}
|
|
70
|
-
return Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2]);
|
|
71
|
-
});
|
|
84
|
+
const positions = coords.map(coordinateTransformer);
|
|
72
85
|
// make sure the last and first vertex is identical.
|
|
73
86
|
if (!Cartesian3.equals(positions[0], positions[positions.length - 1])) {
|
|
74
87
|
positions.push(positions[0]);
|
|
@@ -84,28 +97,6 @@ export function getGeometryOptions(geometry, positionHeightAdjustment, perPositi
|
|
|
84
97
|
polygonHierarchy: new PolygonHierarchy(hieraryPositions, holes),
|
|
85
98
|
};
|
|
86
99
|
}
|
|
87
|
-
export function getCoordinates(geometries) {
|
|
88
|
-
const coordinates = [];
|
|
89
|
-
geometries.forEach((polygon) => {
|
|
90
|
-
coordinates.push(...getFlatCoordinatesFromSimpleGeometry(polygon));
|
|
91
|
-
});
|
|
92
|
-
return coordinates;
|
|
93
|
-
}
|
|
94
|
-
let geometryFactory = null;
|
|
95
|
-
function getGeometryFactory() {
|
|
96
|
-
if (!geometryFactory) {
|
|
97
|
-
geometryFactory = {
|
|
98
|
-
getCoordinates,
|
|
99
|
-
getGeometryOptions,
|
|
100
|
-
createSolidGeometries,
|
|
101
|
-
createOutlineGeometries,
|
|
102
|
-
createFillGeometries,
|
|
103
|
-
createGroundLineGeometries,
|
|
104
|
-
createLineGeometries,
|
|
105
|
-
};
|
|
106
|
-
}
|
|
107
|
-
return geometryFactory;
|
|
108
|
-
}
|
|
109
100
|
/**
|
|
110
101
|
* TODO maybe add validation Functions to OpenlayersMap
|
|
111
102
|
* validates if a polygon is renderable
|
|
@@ -135,21 +126,20 @@ export function validatePolygon(polygon) {
|
|
|
135
126
|
}
|
|
136
127
|
return false;
|
|
137
128
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
129
|
+
let geometryFactory;
|
|
130
|
+
export function getPolygonGeometryFactory() {
|
|
131
|
+
if (!geometryFactory) {
|
|
132
|
+
geometryFactory = {
|
|
133
|
+
type: 'polygon',
|
|
134
|
+
getGeometryOptions,
|
|
135
|
+
createSolidGeometries,
|
|
136
|
+
createOutlineGeometries,
|
|
137
|
+
createFillGeometries,
|
|
138
|
+
createGroundLineGeometries,
|
|
139
|
+
createLineGeometries,
|
|
140
|
+
validateGeometry: validatePolygon,
|
|
141
|
+
};
|
|
150
142
|
}
|
|
151
|
-
|
|
152
|
-
const validGeometries = geometries.filter((polygon) => validatePolygon(polygon));
|
|
153
|
-
addPrimitivesToContext(feature, style, validGeometries, vectorProperties, scene, polygonGeometryFactory, context);
|
|
143
|
+
return geometryFactory;
|
|
154
144
|
}
|
|
155
145
|
//# sourceMappingURL=polygonToCesium.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polygonToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/polygonToCesium.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,0BAA0B,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"polygonToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/polygonToCesium.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { HeightReference } from '@vcmap-cesium/engine';
|
|
2
|
+
import { RelativeHeightReference, VectorHeightInfo } from './vectorHeightInfo.js';
|
|
3
|
+
/**
|
|
4
|
+
* @param extrudedHeight should be a number > 0
|
|
5
|
+
* @param storeyHeights
|
|
6
|
+
* @param storeyNumber
|
|
7
|
+
*/
|
|
8
|
+
export declare function getStoreyHeights(extrudedHeight: number, storeyHeights: number[], storeyNumber: number): number[];
|
|
9
|
+
export declare function validateStoreys(storeys: number, storeyHeights: number[]): void;
|
|
10
|
+
export type StoreyOptions = {
|
|
11
|
+
currentHeight: number;
|
|
12
|
+
extrudedHeight: number;
|
|
13
|
+
};
|
|
14
|
+
export declare function getStoreyOptions(heightInfo: VectorHeightInfo<RelativeHeightReference | HeightReference.NONE>, geometryHeight: number): {
|
|
15
|
+
storeys: StoreyOptions[];
|
|
16
|
+
skirtLevel: number;
|
|
17
|
+
};
|