Skip to content

Commit e98677c

Browse files
authored
Merge pull request #12 from OpenGeoscience/data-ingestion
add tva.json for default data
2 parents 0352d10 + 0b70f5a commit e98677c

File tree

7 files changed

+177
-956
lines changed

7 files changed

+177
-956
lines changed

client/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ node_modules
1111
dist
1212
dist-ssr
1313
*.local
14+
.vite/*
1415

1516
# Editor directories and files
1617
.vscode/*

client/src/components/LayerTypeConfig.vue

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,53 @@ export default defineComponent({
327327
</span>
328328
</v-col>
329329
</v-row>
330+
<v-row
331+
v-if="actionItemVisible.has('selectColor')"
332+
dense
333+
align="center"
334+
justify="center"
335+
>
336+
<v-col cols="2">
337+
<v-tooltip text="Selected Color">
338+
<template #activator="{ props }">
339+
<v-icon
340+
class="pl-3"
341+
v-bind="props"
342+
>
343+
mdi-format-color-highlight
344+
</v-icon>
345+
</template>
346+
</v-tooltip>
347+
</v-col>
348+
<v-col cols="8">
349+
<v-icon @click="updateLayerTypeField('selectColor', !valueDisplayCheckbox('selectColor'))">
350+
{{
351+
valueDisplayCheckbox('selectColor') ? 'mdi-checkbox-marked' : 'mdi-checkbox-blank-outline' }}
352+
</v-icon>
353+
<span class="pl-2">Select Color</span>
354+
</v-col>
355+
<v-col>
356+
<v-menu
357+
:close-on-content-click="false"
358+
offset-y
359+
>
360+
<template #activator="{ props }">
361+
<div
362+
v-if="currentLayerType && currentLayerType.selectColor"
363+
class="color-square"
364+
:style="{ backgroundColor: currentLayerType.selectColor }"
365+
v-bind="props"
366+
/>
367+
</template>
368+
<v-color-picker
369+
v-if="currentLayerType"
370+
mode="hex"
371+
:model-value="currentLayerType.selectColor"
372+
@update:model-value="updateSelectColor('selectColor', $event)"
373+
/>
374+
</v-menu>
375+
</v-col>
376+
</v-row>
330377
<v-row
331378
v-if="actionItemVisible.has('hoverable')"
332379
dense
@@ -429,54 +476,6 @@ export default defineComponent({
429476
/>
430477
</v-col>
431478
</v-row>
432-
433-
<v-row
434-
v-if="actionItemVisible.has('selectColor')"
435-
dense
436-
align="center"
437-
justify="center"
438-
>
439-
<v-col cols="2">
440-
<v-tooltip text="Selected Color">
441-
<template #activator="{ props }">
442-
<v-icon
443-
class="pl-3"
444-
v-bind="props"
445-
>
446-
mdi-format-color-highlight
447-
</v-icon>
448-
</template>
449-
</v-tooltip>
450-
</v-col>
451-
<v-col cols="8">
452-
<v-icon @click="updateLayerTypeField('selectColor', !valueDisplayCheckbox('selectColor'))">
453-
{{
454-
valueDisplayCheckbox('selectColor') ? 'mdi-checkbox-marked' : 'mdi-checkbox-blank-outline' }}
455-
</v-icon>
456-
<span class="pl-2">Select Color</span>
457-
</v-col>
458-
<v-col>
459-
<v-menu
460-
:close-on-content-click="false"
461-
offset-y
462-
>
463-
<template #activator="{ props }">
464-
<div
465-
v-if="currentLayerType && currentLayerType.selectColor"
466-
class="color-square"
467-
:style="{ backgroundColor: currentLayerType.selectColor }"
468-
v-bind="props"
469-
/>
470-
</template>
471-
<v-color-picker
472-
v-if="currentLayerType"
473-
mode="hex"
474-
:model-value="currentLayerType.selectColor"
475-
@update:model-value="updateSelectColor('selectColor', $event)"
476-
/>
477-
</v-menu>
478-
</v-col>
479-
</v-row>
480479
<v-row
481480
v-if="actionItemVisible.has('color')"
482481
dense

0 commit comments

Comments
 (0)