Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(web): remove unsupported plugin API and options #1187

Merged
merged 5 commits into from
Oct 23, 2024
Merged

refactor(web): remove unsupported plugin API and options #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
880e54f
remove layersInViewport
mkumbobeaty Oct 22, 2024
4f81f56
remove underline
mkumbobeaty Oct 22, 2024
a5bd517
update translation
mkumbobeaty Oct 22, 2024
57c9cfb
chore: format
airslice Oct 23, 2024
3514244
Merge branch 'main' into chore/remove-layersInViewport
airslice Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ...ures/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/TypographyInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ const TypographyInput: FC<Props> = ({ value, onChange }) => {
onChange={(v) => onChange?.({ ...value, italic: v })}
/>
</PropertyItem>
<PropertyItem title={t("underline")}>
<BooleanSelectorField
value={value?.underline}
onChange={(v) => onChange?.({ ...value, underline: v })}
/>
</PropertyItem>
</Wrapper>
);
};
Expand Down
2 changes: 1 addition & 1 deletion .../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const markerNodes: AppearanceNode[] = [
title: "Image Crop",
field: "select",
defaultValue: "none",
valueOptions: ["none", "rounded", "circle"]
valueOptions: ["none", "circle"]
},
{
id: "imageShadow",
Expand Down
1 change: 0 additions & 1 deletion web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export type Typography = {
fontWeight?: FontWeight;
color?: string;
italic?: boolean;
underline?: boolean;
};

export type Expression = {
Expand Down
16 changes: 0 additions & 16 deletions web/src/beta/features/Visualizer/Crust/Plugins/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ export default function ({
addLayer,
findFeatureById,
findFeaturesByIds,
layersInViewport,
selectLayer,
selectFeature,
selectFeatures,
Expand Down Expand Up @@ -218,7 +217,6 @@ export default function ({
addLayer,
findFeatureById,
findFeaturesByIds,
layersInViewport,
selectLayer,
selectFeature,
selectFeatures,
Expand Down Expand Up @@ -259,15 +257,13 @@ export default function ({
}),
[
engineName,
// viewer
getViewerProperty,
overrideViewerPropertyCommon,
getViewport,
captureScreen,
getInteractionMode,
getInEditor,
getIsBuilt,
// viewer tools
getLocationFromScreenCoordinate,
getScreenCoordinateFromPosition,
getTerrainHeightAsync,
Expand All @@ -277,10 +273,8 @@ export default function ({
cartesianToCartographic,
transformByOffsetOnScreen,
isPositionVisibleOnGlobe,
// viewer events
viewerEventsOn,
viewerEventsOff,
// camera
getCameraPosition,
getCameraFov,
getCameraAspectRatio,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 0 additions & 6 deletions web/src/beta/features/Visualizer/Crust/Plugins/hooks/useLayers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -189,7 +184,6 @@ export default ({
addLayer,
findFeatureById,
findFeaturesByIds,
layersInViewport,
selectLayer,
selectFeature,
selectFeatures,
Expand Down
5 changes: 0 additions & 5 deletions web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/commonReearth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export function commonReearth({
addLayer,
findFeatureById,
findFeaturesByIds,
layersInViewport,
selectLayer,
selectFeature,
selectFeatures,
Expand Down Expand Up @@ -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"];
Expand Down Expand Up @@ -300,9 +298,6 @@ export function commonReearth({
get findFeaturesByIds() {
return findFeaturesByIds;
},
get layersInViewport() {
return layersInViewport;
},
get select() {
return selectLayer;
},
Expand Down
1 change: 0 additions & 1 deletion web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/pluginAPIv1Types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ export type Reearth = {
| "selectedFeature"
| "overriddenLayers"
> & {
readonly layersInViewport?: () => LazyLayer[] | undefined;
readonly overriddenProperties?: Record<string, any>;
readonly overrideProperty?: (
properties: LayerSimple["properties"] | undefined
Expand Down
2 changes: 0 additions & 2 deletions web/src/beta/features/Visualizer/Crust/Plugins/pluginAPI/types/layers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?: (
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion web/src/beta/features/Visualizer/Crust/Plugins/storybook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion web/src/services/i18n/translations/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ font size: ''
font weight: ''
font color: ''
italic: ''
underline: ''
New node: ''
Style: ''
Empty: ''
Expand Down
1 change: 0 additions & 1 deletion web/src/services/i18n/translations/ja.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ font size: ''
font weight: ''
font color: ''
italic: ''
underline: ''
New node: ''
Style: ''
Empty: ''
Expand Down
Loading