Merge a65818c into 393e076

examples/react-map-gl-draw/app.js

@@ -1,27 +1,24 @@
 import React, { Component } from 'react';
 import { render } from 'react-dom';
 import MapGL from 'react-map-gl';
+import { Editor, EditingMode } from 'react-map-gl-draw';
+
 import {
-  Editor,
-  SelectMode,
-  EditingMode,
   DrawPointMode,
   DrawLineStringMode,
   DrawRectangleMode,
-  DrawRectangleOneclickMode,
   DrawPolygonMode,
-} from 'react-map-gl-draw';
+} from '@nebula.gl/edit-modes';
+
 import { MODES } from './constants';
 import Toolbar from './toolbar';
 
 const MODE_TO_HANDLER = {
   [MODES.READ_ONLY]: null,
-  [MODES.SELECT]: SelectMode,
   [MODES.EDITING]: EditingMode,
   [MODES.DRAW_POINT]: DrawPointMode,
   [MODES.DRAW_PATH]: DrawLineStringMode,
   [MODES.DRAW_RECTANGLE]: DrawRectangleMode,
-  [MODES.DRAW_RECTANGLE_ONE_CLICK]: DrawRectangleOneclickMode,
   [MODES.DRAW_POLYGON]: DrawPolygonMode,
 };
 

examples/react-map-gl-draw/constants.js

@@ -1,9 +1,7 @@
 export const MODES = {
   READ_ONLY: 'READ_ONLY',
-  SELECT: 'SELECT',
   EDITING: 'EDITING',
   DRAW_POINT: 'DRAW_POINT',
-  DRAW_CIRCLE: 'DRAW_CIRCLE',
   DRAW_PATH: 'DRAW_PATH',
   DRAW_POLYGON: 'DRAW_POLYGON',
   DRAW_RECTANGLE: 'DRAW_RECTANGLE',

examples/react-map-gl-draw/toolbar.js

@@ -10,11 +10,6 @@ const ICON_MAP = [
   { id: MODES.DRAW_PATH, text: 'Draw Polyline', icon: 'icon-path.svg' },
   { id: MODES.DRAW_POLYGON, text: 'Draw Polygon', icon: 'icon-polygon.svg' },
   { id: MODES.DRAW_RECTANGLE, text: 'Draw Rectangle', icon: 'icon-rectangle.svg' },
-  {
-    id: MODES.DRAW_RECTANGLE_ONE_CLICK,
-    text: 'Draw Rectangle (One Click)',
-    icon: 'icon-rectangle.svg',
-  },
 ];
 
 const Container = styled.div`

examples/webpack.config.local.js

@@ -11,12 +11,12 @@ const resolve = require('path').resolve;
 const webpack = require('webpack');
 
 const LIB_DIR = resolve(__dirname, '..');
-const MAIN_SRC_DIR = resolve(LIB_DIR, './modules/main');
-const EDIT_MODES_SRC_DIR = resolve(LIB_DIR, './modules/edit-modes');
-const LAYERS_SRC_DIR = resolve(LIB_DIR, './modules/layers');
-const OVERLAYS_SRC_DIR = resolve(LIB_DIR, './modules/overlays');
-const EDITOR_SRC_DIR = resolve(LIB_DIR, './modules/editor');
-const REACT_EDITOR_LITE_SRC_DIR = resolve(LIB_DIR, './modules/react-map-gl-draw');
+const MAIN_SRC_DIR = resolve(LIB_DIR, './modules/main/src/');
+const EDIT_MODES_SRC_DIR = resolve(LIB_DIR, './modules/edit-modes/src/');
+const LAYERS_SRC_DIR = resolve(LIB_DIR, './modules/layers/src/');
+const OVERLAYS_SRC_DIR = resolve(LIB_DIR, './modules/overlays/src/');
+const EDITOR_SRC_DIR = resolve(LIB_DIR, './modules/editor/src/');
+const REACT_EDITOR_LITE_SRC_DIR = resolve(LIB_DIR, './modules/react-map-gl-draw/src');
 
 // const babelConfig = require('../babel.config');
 
@@ -33,6 +33,7 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR) {
     devtool: 'source-map',
 
     resolve: {
+      extensions: ['.js', '.ts', '.tsx'],
       alias: {
         'nebula.gl/dist': MAIN_SRC_DIR,
         'nebula.gl': MAIN_SRC_DIR,
@@ -70,10 +71,15 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR) {
       rules: [
         {
           // Unfortunately, webpack doesn't import library sourcemaps on its own...
-          test: /\.js$/,
+          test: /\.js$|\.ts$|\.tsx$/,
           use: ['source-map-loader'],
           enforce: 'pre',
         },
+        {
+          test: /\.tsx?$/,
+          use: 'ts-loader',
+          exclude: /node_modules/,
+        },
       ],
     },
     // Optional: Enables reading mapbox token from environment variable

jest.config.js

@@ -3,6 +3,6 @@ module.exports = {
   verbose: true,
   testURL: 'http://localhost/',
   collectCoverageFrom: ['modules/*/src/**/*.{ts,tsx}', '!**/node_modules/**'],
-  testPathIgnorePatterns: ['/node_modules/', '/website/'],
+  testPathIgnorePatterns: ['/node_modules/', '/lib/', '/website/'],
   "preset": "ts-jest"
 };

lib/examples/advanced/src/app.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=app.d.ts.map

lib/examples/advanced/src/example.d.ts

@@ -0,0 +1,60 @@
+import { Component } from 'react';
+import { GeoJsonEditMode } from 'nebula.gl';
+export default class Example extends Component<{}, {
+    viewport: Record<string, any>;
+    testFeatures: any;
+    mode: typeof GeoJsonEditMode;
+    modeConfig: any;
+    pointsRemovable: boolean;
+    selectedFeatureIndexes: number[];
+    editHandleType: string;
+    selectionTool?: string;
+    showGeoJson: boolean;
+    pathMarkerLayer: boolean;
+    featureMenu?: {
+        index: number;
+        x: number;
+        y: number;
+    };
+}> {
+    constructor(props: {});
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    _onChangeViewport: (viewport: Record<string, any>) => void;
+    _onLayerClick: (info: any) => void;
+    _resize: () => void;
+    _loadSample: (type: string) => void;
+    _copy: () => void;
+    _paste: () => void;
+    _download: () => void;
+    _parseStringJson: (json: string) => void;
+    _error: (err: any) => void;
+    _getHtmlColorForFeature(index: number, selected: boolean): string;
+    _getDeckColorForFeature(index: number, bright: number, alpha: number): number[];
+    _renderSelectFeatureCheckbox(index: number, featureType: string): JSX.Element;
+    _renderSelectFeatureCheckboxes(): any[];
+    _renderBooleanOperationControls(): JSX.Element;
+    _renderTwoClickPolygonControls(): JSX.Element;
+    _renderModifyModeControls(): JSX.Element;
+    _renderSplitModeControls(): JSX.Element;
+    _renderSnappingControls(): JSX.Element;
+    _renderMeasureDistanceControls(): JSX.Element;
+    _renderModeConfigControls(): any[];
+    _renderToolBox(): JSX.Element;
+    renderStaticMap(viewport: Record<string, any>): JSX.Element;
+    _featureMenuClick(action: string): void;
+    _renderFeatureMenu({ x, y }: {
+        x: number;
+        y: number;
+    }): JSX.Element;
+    customizeLayers(layers: Record<string, any>[]): void;
+    onEdit: ({ updatedData, editType, editContext }: {
+        updatedData: any;
+        editType: any;
+        editContext: any;
+    }) => void;
+    getFillColor: (feature: any, isSelected: any) => number[];
+    getLineColor: (feature: any, isSelected: any) => number[];
+    render(): JSX.Element;
+}
+//# sourceMappingURL=example.d.ts.map