Skip to content

Commit

Permalink
fix(core): resolve packaging issue causing excessive artifact size
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Deubler <[email protected]>
  • Loading branch information
TerminalTim committed Jul 25, 2024
1 parent 792dcf0 commit e752453
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 22 deletions.
3 changes: 1 addition & 2 deletions packages/common/src/Expressions/Expressions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
* License-Filename: LICENSE
*/
import {Context, Expression, JSONExpression} from './Expression';
import {ExpressionParser} from '@here/xyz-maps-common';
import {Definitions, Value} from './ExpressionParser';
import {ExpressionParser} from './ExpressionParser';

export * from './MathExpressions';
export * from './LogicalExpressions';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/features/Feature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import {JSUtils} from '@here/xyz-maps-common';
import {FeatureProvider} from '../providers/FeatureProvider';
import {GeoJSONFeature, GeoJSONBBox, GeoJSONCoordinate} from './GeoJSON';
import {TileLayer} from '@here/xyz-maps-core';
import {TileLayer} from '../layers/TileLayer';

/**
* represents a Feature in GeoJSON Feature format.
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/features/RTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
*/

import RBush from 'rbush/rbush.min.js';
import {Feature} from './Feature';
import {GeoJSONFeature} from '@here/xyz-maps-core';
import {GeoJSONFeature} from './GeoJSON';

type BBox = {
minX: number,
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/features/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
* License-Filename: LICENSE
*/

import {Feature} from '../features/Feature';
import {GeoJSONCoordinate, GeoJSONFeature} from '@here/xyz-maps-core';
import {GeoJSONCoordinate, GeoJSONFeature} from './GeoJSON';
type Point = number[];
type BBox = number[];
type Coordinates = Array<Point>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/
import {TileLayerOptions} from '../TileLayerOptions';
import {FeatureProvider} from '@here/xyz-maps-core';
import {FeatureProvider} from '../../providers/FeatureProvider';
import {ClusterFeatureProperties} from '../../features/ClusterFeature';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/providers/GeoSpace/SpaceProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* SPDX-License-Identifier: Apache-2.0
* License-Filename: LICENSE
*/
import {GeoJSONFeature} from '@here/xyz-maps-core';
import {GeoJSONFeature} from '../../features/GeoJSON';


import {JSUtils, Queue} from '@here/xyz-maps-common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import TileReceiver from './TileReceiver';
import {Tile} from '../../tile/Tile';
import TileProvider from '../TileProvider/TileProvider';
import {TileLoadDelegator} from './TileLoadDelegator';
import {tileUtils} from '@here/xyz-maps-core';
import {tileUtils} from '../../tile/TileUtils';

let UNDEF;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import {Tile} from '../../tile/Tile';
import {FeatureProvider} from '@here/xyz-maps-core';
import {FeatureProvider} from '../FeatureProvider';

let UNDEF;

Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/route/Route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
* License-Filename: LICENSE
*/
import {AStar, AStarNode, geotools} from '@here/xyz-maps-common';
import {Feature, FeatureProvider} from '@here/xyz-maps-core';
import {FeatureProvider} from '../providers/FeatureProvider';
import {Feature} from '../features/Feature';

type NodeData = { link: Feature, index: number };

Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/styles/GenericStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
* License-Filename: LICENSE
*/
import {Color, StyleExpression, StyleValueFunction, StyleZoomRange} from './LayerStyle';
import {LinearGradient} from '@here/xyz-maps-core';
import {JSONExpression} from '@here/xyz-maps-common';
import {LinearGradient} from './HeatmapStyle';

/**
* The Style object defines how certain features should be rendered.
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/features/ObjectManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {Map, JSUtils, geotools, vec3} from '@here/xyz-maps-common';
import {getClosestPntOnLine, intersectBBox, rayIntersectPlane} from '../geometry';
import {Navlink} from './link/Navlink';
import InternalEditor from '../IEditor';
import {Feature} from '@here/xyz-maps-editor';
import {Feature} from './feature/Feature';

type Options = {
ignore?: (feature: Navlink) => boolean
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/features/area/VirtualShape.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import InternalEditor from '../../IEditor';
import {Feature, FeatureProvider, GeoJSONFeature} from '@here/xyz-maps-core';
import {Area} from './Area';
import {AreaShape} from '@here/xyz-maps-editor';
import {AreaShape} from './AreaShape';

let UNDEF;

Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/features/line/LineTools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import {LineShape} from './LineShape';
import {getSegmentIndex, getPntAt} from '../../geometry';
import VirtualShape from './VirtualShape';
import {Line} from '@here/xyz-maps-editor';
import {Line} from './Line';
import {GeoJSONCoordinate} from '@here/xyz-maps-core';
import FeatureTools from '../feature/FeatureTools';

Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/features/link/NavlinkShape.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {Navlink} from './Navlink';
import {TurnRestrictionEditor} from '../../tools/turnrestriction/TrEditor';
import {Feature as EditableFeature} from '../feature/Feature';
import NavlinkTools from './NavlinkTools';
import {defaultBehavior} from '@here/xyz-maps-editor';
import {defaultBehavior} from '../line/LineShape';
import {dragFeatureCoordinate} from '../oTools';
import {Coordinate} from '../line/LineTools';

Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/features/location/LocationTools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {Navlink} from '../link/Navlink';
import {EditableFeatureProvider, GeoJSONCoordinate} from '@here/xyz-maps-core';
import {JSUtils} from '@here/xyz-maps-common';
import {Location} from './Location';
import {Feature} from '@here/xyz-maps-editor';
import {Feature} from '../feature/Feature';
import FeatureTools from '../feature/FeatureTools';
import {dragFeatureCoordinate} from '../oTools';

Expand Down
3 changes: 1 addition & 2 deletions packages/editor/src/features/oTools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ import LineTools from './line/LineTools';
import NavlinkTools from './link/NavlinkTools';
import LocationTools from './location/LocationTools';
import {Feature} from './feature/Feature';
import {Marker} from '@here/xyz-maps-editor';
import {Marker} from './marker/Marker';
import {geotools, vec3} from '@here/xyz-maps-common';
import {getClosestPntOnLine, rayIntersectPlane} from '../geometry';
import InternalEditor from '../IEditor';
import {GeoJSONCoordinate} from '@here/xyz-maps-core';

const tools = {
MARKER: MarkerTools,
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/tools/rangeSelector/MultiSelector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {Map} from '@here/xyz-maps-display';
import {Navlink} from '../../features/link/Navlink';
import {InternalRangeOptions} from './Range';
import {GeoJSONCoordinate, GeoJSONFeature} from '@here/xyz-maps-core';
import {Feature} from '@here/xyz-maps-editor';
import {Feature} from '../../features/feature/Feature';

type LineSegment = { id: number | string, coordinates: GeoJSONCoordinate[], feature?: Navlink | GeoJSONFeature };

Expand Down

0 comments on commit e752453

Please sign in to comment.