diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml index d689bac..2bff4f8 100644 --- a/.github/workflows/npmpublish.yml +++ b/.github/workflows/npmpublish.yml @@ -29,19 +29,4 @@ jobs: - run: npm ci - run: npm publish --access public env: - NODE_AUTH_TOKEN: ${{secrets.npm_token}} - - publish-gpr: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: 14 - registry-url: https://npm.pkg.github.com/ - scope: '@triedeti' - - run: npm ci - - run: npm publish - env: - NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + NODE_AUTH_TOKEN: ${{secrets.npm_token}} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index abe06fc..2ce31a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@triedeti/threedigitaltwin", - "version": "1.0.10", + "version": "1.0.12", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b3436c8..7a7f308 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@triedeti/threedigitaltwin", - "version": "1.0.11", + "version": "1.0.12", "main": "dist/threedigitaltwin.js", "scripts": { "build": "npm install" @@ -36,4 +36,4 @@ "url": "https://github.com/triedeti/ThreeDigitalTwin/issues" }, "homepage": "https://github.com/triedeti/ThreeDigitalTwin#readme" -} \ No newline at end of file +} diff --git a/src/threedigitaltwin.js b/src/threedigitaltwin.js index 7522d60..512835f 100644 --- a/src/threedigitaltwin.js +++ b/src/threedigitaltwin.js @@ -315,10 +315,19 @@ export default class ThreeDigitalTwin { "features": [feature], }; if (feature.properties.asset_type_configuration) { - prop.depth = feature.properties.asset_type_configuration.options_extrudeSettings_depth; - prop.altitude = feature.properties.asset_type_configuration.options_altitude; - prop.material.color = feature.properties.asset_type_configuration.options_material_color.substring(0, 7); - prop.material.opacity = feature.properties.asset_type_configuration.options_material_opacity; + + if (feature.properties.asset_type_configuration.options_extrudeSettings_depth) + prop.depth = feature.properties.asset_type_configuration.options_extrudeSettings_depth; + + if (feature.properties.asset_type_configuration.options_altitude) + prop.altitude = feature.properties.asset_type_configuration.options_altitude; + + if (feature.properties.asset_type_configuration.options_material_color) + prop.material.color = feature.properties.asset_type_configuration.options_material_color.substring(0, 7); + + if (feature.properties.asset_type_configuration.options_material_opacity) + prop.material.opacity = feature.properties.asset_type_configuration.options_material_opacity; + this.loadLayer(layerCode, geojson_feature, prop, outline); } else { this.loadLayer(layerCode, geojson_feature, properties, outline);