bruce-cesium 0.1.7 → 0.1.8

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, EntityFilterGetter, BatchedDataGetter, ObjectUtils, Tileset, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Color, HeightReference, Cartesian3, Entity, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian3, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -829,25 +829,60 @@ var EntityRenderEngine;
         function Render(params) {
             var entity = params.entity;
             var style = params.style;
-            var bColor = style.color ? Calculator.GetValue(style.color, entity, params.tags) : null;
-            var cColor = bColor ? colorToCColor(bColor) : Color.RED;
-            var size = style.size ? Calculator.GetValue(style.size, entity, params.tags) : null;
-            if (size == null) {
-                size = 30;
+            var type = style.Type;
+            var cEntity = null;
+            if (type == Style.EPointType.Icon) {
+                var icon = Calculator.GetValue(style.iconUrl, entity, params.tags);
+                var iconUrl = null;
+                if (typeof icon == "string") {
+                    iconUrl = icon;
+                }
+                if (!iconUrl && style.iconId) {
+                    iconUrl = ClientFile.GetUrl(params.api, style.iconId);
+                }
+                if (iconUrl) {
+                    var iconScale = +Calculator.GetValue(style.iconScale, entity, params.tags);
+                    if (!iconScale && iconScale != 0) {
+                        iconScale = 1;
+                    }
+                    if (iconScale > 0) {
+                        cEntity = new Entity({
+                            billboard: {
+                                horizontalOrigin: HorizontalOrigin.CENTER,
+                                verticalOrigin: VerticalOrigin.BOTTOM,
+                                image: iconUrl,
+                                heightReference: getHeightRef(style)
+                            },
+                            position: EntityUtils.GetPos(params.viewer, entity),
+                            show: false
+                        });
+                    }
+                }
             }
-            if (size <= 0) {
-                return null;
+            if (type == Style.EPointType.Cylinder) ;
+            if (!cEntity) {
+                var bColor = style.color ? Calculator.GetValue(style.color, entity, params.tags) : null;
+                var cColor = bColor ? colorToCColor(bColor) : Color.RED;
+                var size = style.size ? Calculator.GetValue(style.size, entity, params.tags) : null;
+                if (size == null) {
+                    size = 30;
+                }
+                if (size <= 0) {
+                    return null;
+                }
+                cEntity = new Entity({
+                    point: {
+                        pixelSize: size,
+                        color: cColor,
+                        heightReference: getHeightRef(style)
+                    },
+                    position: EntityUtils.GetPos(params.viewer, entity),
+                    show: false
+                });
+            }
+            if (cEntity) {
+                params.viewer.entities.add(cEntity);
             }
-            var cEntity = new Entity({
-                point: {
-                    pixelSize: size,
-                    color: cColor,
-                    heightReference: getHeightRef(style)
-                },
-                position: EntityUtils.GetPos(params.viewer, entity),
-                show: false
-            });
-            params.viewer.entities.add(cEntity);
             return cEntity;
         }
         Point.Render = Render;
@@ -882,7 +917,8 @@ var EntityRenderEngine;
                                 entity: entity,
                                 style: pStyle,
                                 tags: tags,
-                                viewer: params.viewer
+                                viewer: params.viewer,
+                                api: api
                             });
                             cEntity._renderGroup = getRenderGroupId(zoomItem);
                             cEntities[entity.Bruce.ID] = cEntity;