Skip to content
GitLab
Commit a5904da0 authored by Matthias Betz's avatar Matthias Betz
Browse files

Merge branch 'dev' of transfer.hft-stuttgart.de:lgl/smartvillages2 into dev 

# Conflicts:
#	src/index.js
parents 12fb48eb b74a3e17
Hide whitespace changes
Inline Side-by-side
plugin-assets/IFC_Icon_J_v01.svg 0 → 100644
View file @ a5904da0
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
viewBox="0 0 24 24"
version="1.1"
id="svg1"
inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
sodipodi:docname="IFC_Icon_J_v01.svg"
xml:space="preserve"
inkscape:export-filename="..\Export\IFC_Icon_I_v01.svg"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showborder="true"
showgrid="true"
inkscape:zoom="8"
inkscape:cx="-39.25"
inkscape:cy="13.3125"
inkscape:window-width="1920"
inkscape:window-height="1129"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g7"
showguides="false"><inkscape:grid
id="grid1"
units="px"
originx="0"
originy="0"
spacingx="1"
spacingy="1"
empcolor="#0099e5"
empopacity="0.30196078"
color="#0099e5"
opacity="0.14901961"
empspacing="5"
enabled="true"
visible="true" /></sodipodi:namedview><defs
id="defs1"><inkscape:path-effect
effect="powerclip"
message=""
id="path-effect45"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false" /><inkscape:path-effect
effect="powerclip"
message=""
id="path-effect42"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false" /><inkscape:path-effect
effect="powerclip"
message=""
id="path-effect40"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false" /><inkscape:path-effect
effect="powerclip"
message=""
id="path-effect39"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false" /><inkscape:path-effect
effect="powerclip"
message=""
id="path-effect32"
is_visible="true"
lpeversion="1"
inverse="true"
flatten="false"
hide_clip="false" /><inkscape:path-effect
effect="powermask"
id="path-effect31"
is_visible="true"
lpeversion="1"
uri="#mask-powermask-path-effect31"
invert="false"
hide_mask="false"
background="true"
background_color="#ffffffff" /><inkscape:path-effect
effect="powermask"
id="path-effect4"
is_visible="true"
lpeversion="1"
uri="#mask-powermask-path-effect4"
invert="false"
hide_mask="false"
background="true"
background_color="#ffffffff" /><inkscape:path-effect
effect="powermask"
id="path-effect3"
is_visible="true"
lpeversion="1"
uri="#mask-powermask-path-effect3"
invert="false"
hide_mask="false"
background="true"
background_color="#ffffffff" /><inkscape:path-effect
effect="powermask"
id="path-effect2"
is_visible="true"
lpeversion="1"
uri="#mask-powermask-path-effect2"
invert="false"
hide_mask="false"
background="true"
background_color="#ffffffff" /><filter
id="mask-powermask-path-effect5_inverse"
inkscape:label="filtermask-powermask-path-effect5"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect5_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect5_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect10_inverse"
inkscape:label="filtermask-powermask-path-effect10"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect10_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect10_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect14_inverse"
inkscape:label="filtermask-powermask-path-effect14"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect14_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect14_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect23_inverse"
inkscape:label="filtermask-powermask-path-effect23"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect23_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect23_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect25_inverse"
inkscape:label="filtermask-powermask-path-effect25"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect25_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect25_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect30_inverse"
inkscape:label="filtermask-powermask-path-effect30"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect30_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect30_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect34_inverse"
inkscape:label="filtermask-powermask-path-effect34"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect34_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect34_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><filter
id="mask-powermask-path-effect35_inverse"
inkscape:label="filtermask-powermask-path-effect35"
style="color-interpolation-filters:sRGB"
height="100"
width="100"
x="-50"
y="-50"><feColorMatrix
id="mask-powermask-path-effect35_primitive1"
values="1"
type="saturate"
result="fbSourceGraphic" /><feColorMatrix
id="mask-powermask-path-effect35_primitive2"
values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
in="fbSourceGraphic" /></filter><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath41"><path
id="path42"
style="display:none;fill:#ffffff;stroke-width:2"
d="m 18.3683,10.93003 c -3.059197,0 -5.546875,2.339421 -5.546875,5.216797 0,2.444357 3.668931,7.567191 4.404297,8.568359 l 1.142578,1.552735 1.140625,-1.552735 c 0.735366,-1.001168 4.40625,-6.124133 4.40625,-8.568359 0,-2.877376 -2.487678,-5.216797 -5.546875,-5.216797 z m -14.1347085,9.603286 -0.6191406,2.908203 3.8378906,0.814453 0.6171875,-2.90625 z"
inkscape:label="maske"
sodipodi:nodetypes="sscccssccccc" /><path
id="lpe_path-effect42"
style="display:block;fill:#ffffff;stroke-width:2"
class="powerclip"
d="M 8.625792,0.3474045 H 20.628746 V 20.730192 H 8.625792 Z M 18.3683,10.93003 c -3.059197,0 -5.546875,2.339421 -5.546875,5.216797 0,2.444357 3.668931,7.567191 4.404297,8.568359 l 1.142578,1.552735 1.140625,-1.552735 c 0.735366,-1.001168 4.40625,-6.124133 4.40625,-8.568359 0,-2.877376 -2.487678,-5.216797 -5.546875,-5.216797 z m -14.1347085,9.603286 -0.6191406,2.908203 3.8378906,0.814453 0.6171875,-2.90625 z" /></clipPath><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath45"><path
id="path45"
style="display:none;fill:#ffffff;stroke-width:2"
d="m 18.3683,10.311312 c -3.059197,0 -5.546875,2.339421 -5.546875,5.216797 0,2.444357 3.668931,7.567191 4.404297,8.568359 l 1.142578,1.552735 1.140625,-1.552735 c 0.735366,-1.001168 4.40625,-6.124133 4.40625,-8.568359 0,-2.877376 -2.487678,-5.216797 -5.546875,-5.216797 z m -14.1347085,9.603286 -0.6191406,2.908203 3.8378906,0.814453 0.6171875,-2.90625 z"
inkscape:label="maske"
sodipodi:nodetypes="sscccssccccc" /><path
id="lpe_path-effect45"
style="display:block;fill:#ffffff;stroke-width:2"
class="powerclip"
d="M -3.1345282,1.5764778 H 17.749159 V 25.466433 H -3.1345282 Z M 18.3683,10.311312 c -3.059197,0 -5.546875,2.339421 -5.546875,5.216797 0,2.444357 3.668931,7.567191 4.404297,8.568359 l 1.142578,1.552735 1.140625,-1.552735 c 0.735366,-1.001168 4.40625,-6.124133 4.40625,-8.568359 0,-2.877376 -2.487678,-5.216797 -5.546875,-5.216797 z m -14.1347085,9.603286 -0.6191406,2.908203 3.8378906,0.814453 0.6171875,-2.90625 z" /></clipPath></defs><g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Baum"
transform="translate(0,-0.61871843)"><path
style="baseline-shift:baseline;display:inline;overflow:visible;vector-effect:none;stroke-width:3.78418;enable-background:accumulate;stop-color:#000000"
d="m 13.625792,5.3474045 v 9.9550445 l 2.002954,0.427743 V 5.3474045 Z"
id="path4-8"
sodipodi:nodetypes="ccccc"
mask="none"
clip-path="url(#clipPath41)"
inkscape:path-effect="#path-effect42"
inkscape:original-d="m 13.625792,5.3474045 v 9.9550445 l 2.002954,0.427743 V 5.3474045 Z" /><path
style="baseline-shift:baseline;display:inline;overflow:visible;vector-effect:none;stroke-width:3.78418;enable-background:accumulate;stop-color:#000000"
d="m 12.713585,5.3400135 c 0,1.0219276 -0.415528,1.9976456 -1.152991,2.7050956 -0.737462,0.7074485 -1.5712512,1.0679705 -2.44296,1.0587195 l 0.35613,1.7432974 c 1.565215,0.06505 2.338446,-0.268896 3.468941,-1.353384 1.130495,-1.0844879 1.773833,-2.5871629 1.773833,-4.1537285 z"
id="path5-2"
sodipodi:nodetypes="csccscc" /><path
style="baseline-shift:baseline;display:inline;overflow:visible;vector-effect:none;stroke-width:3.78418;enable-background:accumulate;stop-color:#000000"
d="m 12.713585,1.6002563 c 0,1.0219286 -0.415528,1.9976461 -1.152991,2.7050959 -0.737462,0.7074495 -1.5712512,1.0679715 -2.44296,1.0587205 L 8.722463,7.3504323 c 1.565215,0.06505 3.089747,-0.511964 4.220242,-1.5964496 1.130495,-1.084485 1.773833,-2.5871606 1.773833,-4.1537264 z"
id="path10-4"
sodipodi:nodetypes="csccscc" /><path
style="baseline-shift:baseline;display:inline;overflow:visible;vector-effect:none;stroke-width:3.78418;enable-background:accumulate;stop-color:#000000"
d="m 16.719483,5.3400135 c 0,1.0219276 0.415528,1.9976456 1.152991,2.7050956 0.737462,0.7074485 1.571251,1.0679705 2.442959,1.0587195 l 0.395171,1.9863654 C 19.14539,11.155244 17.620858,10.57823 16.490363,9.493742 15.359868,8.4092541 14.71653,6.9065791 14.71653,5.3400135 Z"
id="use13-5"
sodipodi:nodetypes="csccscc" /><use
x="0"
y="0"
xlink:href="#path10-4"
id="use14-1"
transform="matrix(-1,0,0,1,29.433068,0)"
style="display:inline" /></g><g
inkscape:groupmode="layer"
id="g7"
inkscape:label="Haus1"
style="display:inline"><path
style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;stroke-width:3.78903;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
d="m 5.2939245,12.142264 v 2.107584 l 2.0055196,0.430768 v -2.538352 z"
id="path5"
sodipodi:nodetypes="ccccc" /><path
style="display:inline;fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
d="M 2.8768397,20.465232 2.8660447,11.473927 7.3187817,7.8686063 11.74733,11.5311 11.71653,19.465232 H 8.9264519 l -0.01105,-0.740252 c 0.01105,-2.830778 -3.2143546,-2.824126 -3.2143546,0 v 1.714827"
id="path7"
sodipodi:nodetypes="ccccccccc"
mask="none"
clip-path="url(#clipPath45)"
inkscape:path-effect="#path-effect45"
inkscape:original-d="M 2.8768397,20.465232 2.8660447,11.473927 7.3187817,7.8686063 11.74733,11.5311 11.71653,19.465232 H 8.9264519 l -0.01105,-0.740252 c 0.01105,-2.830778 -3.2143546,-2.824126 -3.2143546,0 v 1.714827" /></g><g
id="g33"
inkscape:label="Tropfen_Schlank"
transform="translate(0.29626406,0.21162752)"><path
d="m 18.093815,23.184693 -0.8232,-1.1914 c -0.5303,-0.7676 -3.1768,-4.6943 -3.1768,-6.5684 0,-2.2061 1.7939,-4 4,-4 2.2061,0 4,1.7939 4,4 0,1.874 -2.6465,5.8008 -3.1768,6.5684 z m 0,-9.7598 c -1.1025,0 -2,0.8975 -2,2 0,0.6621 0.9326,2.4746 2,4.1787 1.0674,-1.7041 2,-3.5166 2,-4.1787 0,-1.1025 -0.8975,-2 -2,-2 z"
fill="#2a2623"
stroke-width="0"
id="path1"
style="display:inline;fill:#000000" /></g></svg>
src/index.js
View file @ a5904da0
import { NotificationType, ToolboxType, WindowSlot } from '@vcmap/ui'; import {getPluginAssetUrl, NotificationType, ToolboxType, WindowSlot} from '@vcmap/ui';
import * as Cesium from '@vcmap-cesium/engine'; import * as Cesium from '@vcmap-cesium/engine';
import { import {
Cartesian3, Cartesian3,
...@@ -670,9 +670,9 @@ export default function smartVillagesPlugin(config, baseUrl) { ...@@ -670,9 +670,9 @@ export default function smartVillagesPlugin(config, baseUrl) {
const bimGroup = { const bimGroup = {
id: 'bim-functions', id: 'bim-functions',
type: ToolboxType.GROUP, type: ToolboxType.GROUP,
icon: 'ifc', icon: getPluginAssetUrl(app, name, 'plugin-assets/IFC_Icon_J_v01.svg'),
disabled: false, disabled: false,
title: 'BIM Funktionen', title: 'BIM- und Planungsfunktionen',
}; };
vcsApp.toolboxManager.add(bimGroup, name); vcsApp.toolboxManager.add(bimGroup, name);
......
src/objectList.vue
View file @ a5904da0
...@@ -156,9 +156,15 @@ async function loadCatalogsFromConfig(config) { ...@@ -156,9 +156,15 @@ async function loadCatalogsFromConfig(config) {
const entries = getCatalogEntries(catJson, linkPrefix); const entries = getCatalogEntries(catJson, linkPrefix);
if (!objLib.value[category]) { if (!objLib.value[category]) {
objLib.value[category] = entries; objLib.value[category] = { ...entries };
} else { } else {
Object.assign(objLib.value[category], entries); for (const [subCat, arr] of Object.entries(entries)) {
if (!objLib.value[category][subCat]) {
objLib.value[category][subCat] = [...arr];
} else {
objLib.value[category][subCat].push(...arr);
}
}
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal