diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/ConditionsTab.tsx b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/ConditionsTab.tsx index d4426806f0..457fb3e37b 100644 --- a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/ConditionsTab.tsx +++ b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/ConditionsTab.tsx @@ -28,10 +28,10 @@ type Props = { export const styleConditionOperators: StyleConditionOperator[] = [ "===", "!==", - "<", "<=", - ">", ">=", + "<", + ">", "startsWith" ]; diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/TypographyInput.tsx b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/TypographyInput.tsx index 0690e314fd..4232e15e2f 100644 --- a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/TypographyInput.tsx +++ b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/TypographyInput.tsx @@ -80,12 +80,6 @@ const TypographyInput: FC = ({ value, onChange }) => { onChange={(v) => onChange?.({ ...value, italic: v })} /> - - onChange?.({ ...value, underline: v })} - /> - ); }; diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts index bf6926e4c4..0e2dafdfb1 100644 --- a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts +++ b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts @@ -97,7 +97,7 @@ export const markerNodes: AppearanceNode[] = [ title: "Image Crop", field: "select", defaultValue: "none", - valueOptions: ["none", "rounded", "circle"] + valueOptions: ["none", "circle"] }, { id: "imageShadow", diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts index c22fa434b6..6a532c1b9a 100644 --- a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts +++ b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts @@ -73,7 +73,6 @@ export type Typography = { fontWeight?: FontWeight; color?: string; italic?: boolean; - underline?: boolean; }; export type Expression = { diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/hooks/index.ts b/web/src/beta/features/Visualizer/Crust/Plugins/hooks/index.ts index 3f508f637e..0d135741f2 100644 --- a/web/src/beta/features/Visualizer/Crust/Plugins/hooks/index.ts +++ b/web/src/beta/features/Visualizer/Crust/Plugins/hooks/index.ts @@ -111,7 +111,6 @@ export default function ({ addLayer, findFeatureById, findFeaturesByIds, - layersInViewport, selectLayer, selectFeature, selectFeatures, @@ -218,7 +217,6 @@ export default function ({ addLayer, findFeatureById, findFeaturesByIds, - layersInViewport, selectLayer, selectFeature, selectFeatures, @@ -259,7 +257,6 @@ export default function ({ }), [ engineName, - // viewer getViewerProperty, overrideViewerPropertyCommon, getViewport, @@ -267,7 +264,6 @@ export default function ({ getInteractionMode, getInEditor, getIsBuilt, - // viewer tools getLocationFromScreenCoordinate, getScreenCoordinateFromPosition, getTerrainHeightAsync, @@ -277,10 +273,8 @@ export default function ({ cartesianToCartographic, transformByOffsetOnScreen, isPositionVisibleOnGlobe, - // viewer events viewerEventsOn, viewerEventsOff, - // camera getCameraPosition, getCameraFov, getCameraAspectRatio, @@ -300,19 +294,15 @@ export default function ({ move, moveOverTerrain, enableForceHorizontalRoll, - // camera events cameraEventsOn, cameraEventsOff, - // timeline getTimeline, - // layers getLayers, hideLayer, showLayer, addLayer, findFeatureById, findFeaturesByIds, - layersInViewport, selectLayer, selectFeature, selectFeatures, @@ -321,25 +311,19 @@ export default function ({ getFeaturesInScreenRect, bringToFront, sendToBack, - // layers events layersEventsOn, layersEventsOff, - // sketch getSketchTool, setSketchTool, getSketchOptions, overrideSketchOptions, - // sketch events sketchEventsOn, sketchEventsOff, - // extension getExtensionList, - // deprecated deprecated, cameraDeprecated, layersDeprecated, sketchDeprecated, - // others overrideViewerProperty, pluginInstances, clientStorage, diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/hooks/useLayers.ts b/web/src/beta/features/Visualizer/Crust/Plugins/hooks/useLayers.ts index 289bf4733e..d4625dfe12 100644 --- a/web/src/beta/features/Visualizer/Crust/Plugins/hooks/useLayers.ts +++ b/web/src/beta/features/Visualizer/Crust/Plugins/hooks/useLayers.ts @@ -64,11 +64,6 @@ export default ({ [engineRef] ); - const layersInViewport = useCallback(() => { - return layersRef?.findAll( - (layer) => !!engineRef?.inViewport(layer?.property?.default?.location) - ); - }, [engineRef, layersRef]); const selectLayer = useCallback( (layerId: string | undefined) => { @@ -189,7 +184,6 @@ export default ({ addLayer, findFeatureById, findFeaturesByIds, - layersInViewport, selectLayer, selectFeature, selectFeatures, diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/commonReearth.ts b/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/commonReearth.ts index b8f8adbd40..66d05962bb 100644 --- a/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/commonReearth.ts +++ b/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/commonReearth.ts @@ -66,7 +66,6 @@ export function commonReearth({ addLayer, findFeatureById, findFeaturesByIds, - layersInViewport, selectLayer, selectFeature, selectFeatures, @@ -148,7 +147,6 @@ export function commonReearth({ addLayer: GlobalThis["reearth"]["layers"]["add"]; findFeatureById: GlobalThis["reearth"]["layers"]["findFeatureById"]; findFeaturesByIds: GlobalThis["reearth"]["layers"]["findFeaturesByIds"]; - layersInViewport: GlobalThis["reearth"]["layers"]["layersInViewport"]; selectLayer: GlobalThis["reearth"]["layers"]["select"]; selectFeature: GlobalThis["reearth"]["layers"]["selectFeature"]; selectFeatures: GlobalThis["reearth"]["layers"]["selectFeatures"]; @@ -300,9 +298,6 @@ export function commonReearth({ get findFeaturesByIds() { return findFeaturesByIds; }, - get layersInViewport() { - return layersInViewport; - }, get select() { return selectLayer; }, diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/pluginAPIv1Types.ts b/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/pluginAPIv1Types.ts index 1bc080a4a0..cf43b6b676 100644 --- a/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/pluginAPIv1Types.ts +++ b/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/pluginAPIv1Types.ts @@ -84,7 +84,6 @@ export type Reearth = { | "selectedFeature" | "overriddenLayers" > & { - readonly layersInViewport?: () => LazyLayer[] | undefined; readonly overriddenProperties?: Record; readonly overrideProperty?: ( properties: LayerSimple["properties"] | undefined diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/types/layers.ts b/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/types/layers.ts index ec61ec8755..55d8aee3e0 100644 --- a/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/types/layers.ts +++ b/web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/types/layers.ts @@ -46,7 +46,6 @@ export declare type Layers = { layerId: string, featureId: string[] ) => Feature[] | undefined; - readonly layersInViewport?: () => LazyLayer[] | undefined; readonly select?: (layerId: string | undefined) => void; readonly selectFeature?: (layerId?: string, featureId?: string) => void; readonly selectFeatures?: ( @@ -56,7 +55,6 @@ export declare type Layers = { readonly selectedFeature?: ComputedFeature; readonly bringToFront?: (layerId: string) => void; readonly sendToBack?: (layerId: string) => void; - readonly getLayersInViewport?: () => LazyLayer[] | undefined; readonly getFeaturesInScreenRect: ( rect: [x: number, y: number, width: number, height: number], // TODO: Get condition as expression for plugin diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/storybook.tsx b/web/src/beta/features/Visualizer/Crust/Plugins/storybook.tsx index cdfb8a81a9..d1668b34a9 100644 --- a/web/src/beta/features/Visualizer/Crust/Plugins/storybook.tsx +++ b/web/src/beta/features/Visualizer/Crust/Plugins/storybook.tsx @@ -199,7 +199,6 @@ export const context: Context = { selectedFeature: undefined, bringToFront: act("layers.bringToFront"), sendToBack: act("layers.sendToBack"), - getLayersInViewport: act("layers.getLayersInViewport"), getFeaturesInScreenRect: act("layers.getFeaturesInScreenRect"), on: act("layers.on"), off: act("layers.off") diff --git a/web/src/services/i18n/translations/en.yml b/web/src/services/i18n/translations/en.yml index 2651717e37..555010e995 100644 --- a/web/src/services/i18n/translations/en.yml +++ b/web/src/services/i18n/translations/en.yml @@ -123,7 +123,6 @@ font size: '' font weight: '' font color: '' italic: '' -underline: '' New node: '' Style: '' Empty: '' diff --git a/web/src/services/i18n/translations/ja.yml b/web/src/services/i18n/translations/ja.yml index 3703bc59be..d4554c55b5 100644 --- a/web/src/services/i18n/translations/ja.yml +++ b/web/src/services/i18n/translations/ja.yml @@ -123,7 +123,6 @@ font size: '' font weight: '' font color: '' italic: '' -underline: '' New node: '' Style: '' Empty: ''