Skip to content

Commit

Permalink
Remove cesium import for now for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
ljowen committed Mar 5, 2024
1 parent 8bd8759 commit fa5ccad
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
14 changes: 2 additions & 12 deletions buildprocess/configureWebpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,12 @@ function configureWebpack(
["@babel/typescript", { allowNamespaces: true }]
],
plugins: [
// [
// "@babel/plugin-transform-modules-commonjs",
// ],
["@babel/plugin-transform-modules-commonjs"],
["@babel/plugin-proposal-decorators", { legacy: true }],
"@babel/plugin-proposal-class-properties",
"@babel/proposal-object-rest-spread",
"babel-plugin-styled-components",
// require.resolve("@babel/plugin-syntax-dynamic-import"),
require.resolve("@babel/plugin-syntax-dynamic-import"),
"babel-plugin-lodash"
],
assumptions: {
Expand Down Expand Up @@ -237,14 +235,6 @@ function configureWebpack(
type: "javascript/auto"
});

console.log(
"path: ",
path.resolve(
path.dirname(require.resolve("terriajs-cesium/package.json")),
"Source"
)
);

config.module.rules.push({
test: /\.js$/,
include: path.resolve(
Expand Down
12 changes: 7 additions & 5 deletions lib/ReactViews/BottomDock/Timeline/CesiumTimeline.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@ import PropTypes from "prop-types";
import React from "react";
import defined from "terriajs-cesium/Source/Core/defined";
import JulianDate from "terriajs-cesium/Source/Core/JulianDate";
import { WrappedTimeline } from "terriajs-cesium-widgets/Source/Timeline/Timeline";
// import WrappedTimeline from "terriajs-cesium-widgets/Source/Timeline/Timeline";
import CommonStrata from "../../../Models/Definition/CommonStrata";
import { formatDate, formatDateTime, formatTime } from "./DateFormats";

// console.log(WrappedTimeline);

const CesiumTimeline = createReactClass({
propTypes: {
terria: PropTypes.object.isRequired
},

componentDidMount() {
this.cesiumTimeline = new WrappedTimeline(
this.timelineContainer,
this.props.terria.timelineClock
);
// this.cesiumTimeline = new WrappedTimeline(
// this.timelineContainer,
// this.props.terria.timelineClock
// );

this.cesiumTimeline.makeLabel = (time) => {
if (defined(this.props.terria.timelineStack.top)) {
Expand Down

0 comments on commit fa5ccad

Please sign in to comment.