Skip to content

Commit 6535723

Browse files
committed
fix errors in prepareLayer and update version
1 parent 6e7e052 commit 6535723

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

.github/workflows/npmpublish.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,4 @@ jobs:
2929
- run: npm ci
3030
- run: npm publish --access public
3131
env:
32-
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
33-
34-
publish-gpr:
35-
needs: build
36-
runs-on: ubuntu-latest
37-
steps:
38-
- uses: actions/checkout@v2
39-
- uses: actions/setup-node@v1
40-
with:
41-
node-version: 14
42-
registry-url: https://npm.pkg.github.com/
43-
scope: '@triedeti'
44-
- run: npm ci
45-
- run: npm publish
46-
env:
47-
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
32+
NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@triedeti/threedigitaltwin",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"main": "dist/threedigitaltwin.js",
55
"scripts": {
66
"build": "npm install"
@@ -36,4 +36,4 @@
3636
"url": "https://github.com/triedeti/ThreeDigitalTwin/issues"
3737
},
3838
"homepage": "https://github.com/triedeti/ThreeDigitalTwin#readme"
39-
}
39+
}

src/threedigitaltwin.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,19 @@ export default class ThreeDigitalTwin {
315315
"features": [feature],
316316
};
317317
if (feature.properties.asset_type_configuration) {
318-
prop.depth = feature.properties.asset_type_configuration.options_extrudeSettings_depth;
319-
prop.altitude = feature.properties.asset_type_configuration.options_altitude;
320-
prop.material.color = feature.properties.asset_type_configuration.options_material_color.substring(0, 7);
321-
prop.material.opacity = feature.properties.asset_type_configuration.options_material_opacity;
318+
319+
if (feature.properties.asset_type_configuration.options_extrudeSettings_depth)
320+
prop.depth = feature.properties.asset_type_configuration.options_extrudeSettings_depth;
321+
322+
if (feature.properties.asset_type_configuration.options_altitude)
323+
prop.altitude = feature.properties.asset_type_configuration.options_altitude;
324+
325+
if (feature.properties.asset_type_configuration.options_material_color)
326+
prop.material.color = feature.properties.asset_type_configuration.options_material_color.substring(0, 7);
327+
328+
if (feature.properties.asset_type_configuration.options_material_opacity)
329+
prop.material.opacity = feature.properties.asset_type_configuration.options_material_opacity;
330+
322331
this.loadLayer(layerCode, geojson_feature, prop, outline);
323332
} else {
324333
this.loadLayer(layerCode, geojson_feature, properties, outline);

0 commit comments

Comments
 (0)