Skip to content

Commit 50dca5e

Browse files
authored
Merge pull request #34 from slub/develop-patch-2.2.0
Patch input state update within mosaic maps views
2 parents 6693b20 + 1ff880f commit 50dca5e

File tree

4 files changed

+45
-43
lines changed

4 files changed

+45
-43
lines changed

Build/src/apps/mosaic_map/components/MosaicMapInputPanel/MosaicMapInputPanel.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ export const MosaicMapInputPanel = () => {
110110
const handleChange = (event) => {
111111
const field = event.target.id;
112112

113-
const type = inputFields.find((row) => row[field] !== undefined)[field]
114-
.type;
113+
const type = inputFields.find((row) => row.id === field).type;
115114

116115
let value;
117116

Build/src/util/parser.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,10 @@ export const readFeatures = function (records, srs_proj, trg_proj, is3d) {
151151
export const readMosaicMap = (mosaicMap) => {
152152
const { time_of_publication, ...rest } = mosaicMap;
153153

154-
return { time_of_publication: time_of_publication.split("-")[0], ...rest };
154+
return {
155+
time_of_publication: parseInt(time_of_publication.split("-")[0]),
156+
...rest,
157+
};
155158
};
156159

157160
export const serializeMosaicMap = (mosaicMap) => {

Resources/Public/Build/plugin-map-mosaic.css

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/Controls/LocateMeControl.css */
1+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/Controls/LocateMeControl.css */
22
.ol-control.ol-locate-me {
33
position: absolute;
44
background: rgba(255, 255, 255, 0.4);
@@ -8,7 +8,7 @@
88
left: 0.5em;
99
}
1010

11-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/DialogEditFeature/DialogEditFeatureRow/components/MarkerPicker.css */
11+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/DialogEditFeature/DialogEditFeatureRow/components/MarkerPicker.css */
1212
.vkf-marker-picker-root .marker-preview {
1313
display: flex;
1414
height: 34px;
@@ -37,7 +37,7 @@
3737
display: none;
3838
}
3939

40-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/Controls/LayerSpyControl.css */
40+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/Controls/LayerSpyControl.css */
4141
.ol-control.ol-layerspy {
4242
position: absolute;
4343
background: rgba(255, 255, 255, 0.4);
@@ -83,7 +83,7 @@
8383
left: 10px;
8484
}
8585

86-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/BasemapSelector/DialogAddWms.css */
86+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/BasemapSelector/DialogAddWms.css */
8787
.vkf-dialog-addwms .modal-dialog {
8888
margin-top: 25%;
8989
margin-bottom: 25%;
@@ -105,7 +105,7 @@
105105
display: inline-block;
106106
}
107107

108-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/FacetedSearch/FacetedSearch.css */
108+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/FacetedSearch/FacetedSearch.css */
109109
.facet-container {
110110
position: relative;
111111
margin: 0 -15px;
@@ -147,7 +147,7 @@
147147
overflow-y: auto;
148148
}
149149

150-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapSearch/components/MapSearchResultList/MapSearchResultList.css */
150+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapSearch/components/MapSearchResultList/MapSearchResultList.css */
151151
.vkf-mapsearch-result-list {
152152
position: relative;
153153
height: 100%;
@@ -230,7 +230,7 @@
230230
display: none;
231231
}
232232

233-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapSearch/components/MapSearchListElement/MapSearchListElement.css */
233+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapSearch/components/MapSearchListElement/MapSearchListElement.css */
234234
.vkf-mapsearch-record {
235235
cursor: pointer;
236236
list-style: none;
@@ -350,7 +350,7 @@
350350
}
351351
}
352352

353-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapSearch/components/ToggleFacetsButton/ToggleFacetsButton.css */
353+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapSearch/components/ToggleFacetsButton/ToggleFacetsButton.css */
354354
.vkf-toggle-facets {
355355
position: relative;
356356
height: 30px;
@@ -380,7 +380,7 @@
380380
}
381381
}
382382

383-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/LoadingSpinner/LoadingSpinner.css */
383+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/LoadingSpinner/LoadingSpinner.css */
384384
.lds-roller {
385385
display: inline-block;
386386
position: relative;
@@ -466,7 +466,7 @@
466466
}
467467
}
468468

469-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapSearch/MapSearch.css */
469+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapSearch/MapSearch.css */
470470
.mapsearch-container {
471471
height: auto;
472472
background: transparent;
@@ -535,7 +535,7 @@
535535
flex-grow: 1;
536536
}
537537

538-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/BasemapSelector/BasemapSelector.css */
538+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/BasemapSelector/BasemapSelector.css */
539539
.basemap-selector .basemap-selector-modal {
540540
position: absolute;
541541
top: 0;
@@ -636,7 +636,7 @@
636636
top: 90px;
637637
}
638638

639-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/MousePositionOnOff.css */
639+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/MousePositionOnOff.css */
640640
.ol-control.ol-mouse-position-box {
641641
display: none;
642642
}
@@ -665,7 +665,7 @@
665665
bottom: 60px;
666666
}
667667

668-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/PermalinkControl/components/MapViewInput/MapViewInput.css */
668+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/PermalinkControl/components/MapViewInput/MapViewInput.css */
669669
.vkf-permalink-exporter .permalink-exporter-content .upload-button {
670670
color: transparent;
671671
}
@@ -685,7 +685,7 @@
685685
background: transparent;
686686
}
687687

688-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/PermalinkControl/PermalinkExporter.css */
688+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/PermalinkControl/PermalinkExporter.css */
689689
.vkf-permalink-exporter {
690690
width: 400px;
691691
color: white;
@@ -786,7 +786,7 @@
786786
max-width: calc(85vw - 40px);
787787
}
788788

789-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/PermalinkControl/PermalinkControl.css */
789+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/PermalinkControl/PermalinkControl.css */
790790
.ol-permalink .content-container {
791791
position: absolute;
792792
top: 0;
@@ -813,7 +813,7 @@
813813
top: 160px;
814814
}
815815

816-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/DialogEditFeature/DialogEditFeatureRow/DialogEditFeatureRow.css */
816+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/DialogEditFeature/DialogEditFeatureRow/DialogEditFeatureRow.css */
817817
.vkf-feature-edit-dialog-row input {
818818
background: transparent;
819819
border: none;
@@ -842,7 +842,7 @@
842842
background-color: #f7f7f7;
843843
}
844844

845-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/LayerManagement/LayerManagementEntry/components/DragButton/DragButton.css */
845+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/LayerManagement/LayerManagementEntry/components/DragButton/DragButton.css */
846846
.vkf-drag-button {
847847
position: relative;
848848
width: 25px;
@@ -872,7 +872,7 @@
872872
background-color: #00b19e;
873873
}
874874

875-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/components/DialogEditFeature/DialogEditFeature.css */
875+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/components/DialogEditFeature/DialogEditFeature.css */
876876
.vkf-feature-edit-dialog-root {
877877
width: 392px;
878878
}
@@ -899,7 +899,7 @@
899899
justify-content: space-between;
900900
}
901901

902-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/MapWrapper/MapWrapper.css */
902+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/MapWrapper/MapWrapper.css */
903903
.ol-viewport {
904904
background-color: white;
905905
}
@@ -1316,7 +1316,7 @@
13161316
right: 15px;
13171317
}
13181318

1319-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/PlacenameSearch/Autocomplete/Autocomplete.css */
1319+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/PlacenameSearch/Autocomplete/Autocomplete.css */
13201320
.vkf-autocomplete-container .autocomplete-dropdown {
13211321
position: absolute;
13221322
padding: 0;
@@ -1352,7 +1352,7 @@
13521352
background: #00b19e;
13531353
}
13541354

1355-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/PlacenameSearch/PlacenameSearch.css */
1355+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/PlacenameSearch/PlacenameSearch.css */
13561356
.gazetteersearch-container {
13571357
position: relative;
13581358
height: auto;
@@ -1667,7 +1667,7 @@
16671667
border-top-color: #6c6c6c;
16681668
}
16691669

1670-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/TimeSlider/TimeSlider.css */
1670+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/TimeSlider/TimeSlider.css */
16711671
.timeslider-container {
16721672
position: relative;
16731673
margin-bottom: 20px;
@@ -1760,7 +1760,7 @@
17601760
}
17611761
}
17621762

1763-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/components/SpatialTemporalSearch/SpatialTemporalSearch.css */
1763+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/components/SpatialTemporalSearch/SpatialTemporalSearch.css */
17641764
.spatialsearch-container {
17651765
position: absolute;
17661766
top: 15px;
@@ -1785,7 +1785,7 @@
17851785
flex-direction: column;
17861786
}
17871787

1788-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/georeferencer/components/ControlDropDown/ControlDropDown.css */
1788+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/georeferencer/components/ControlDropDown/ControlDropDown.css */
17891789
.vkf-control-dropdown .btn-dropdown-vkf-control .dropdown-toggle {
17901790
position: relative;
17911791
border: 1px solid rgba(255, 255, 255, 0.5);
@@ -1862,7 +1862,7 @@
18621862
fill: #00655a;
18631863
}
18641864

1865-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/MosaicMapSelectorDropdown/MosaicMapSelectorDropdown.css */
1865+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/MosaicMapSelectorDropdown/MosaicMapSelectorDropdown.css */
18661866
.control-toggle-mosaic-map .btn-dropdown-vkf-control .control-option.create-new-mosaic-map {
18671867
border-top: 1px solid #00655a;
18681868
}
@@ -1881,7 +1881,7 @@
18811881
font-size: 12px;
18821882
}
18831883

1884-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/ListElement/MosaicMapSelectedMapListElement/MosaicMapSelectedMapListElement.css */
1884+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/ListElement/MosaicMapSelectedMapListElement/MosaicMapSelectedMapListElement.css */
18851885
.vkf-mapsearch-record.vkf-mosaic-map-selected-list-element {
18861886
cursor: default;
18871887
}
@@ -1918,7 +1918,7 @@
19181918
color: #00655a;
19191919
}
19201920

1921-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/SelectedMapList/SelectedMapList.css */
1921+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/SelectedMapList/SelectedMapList.css */
19221922
.mapsearch-container .header-container {
19231923
height: 122px;
19241924
min-height: 122px;
@@ -1979,7 +1979,7 @@
19791979
transform: scale(1.2);
19801980
}
19811981

1982-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/ListElement/MosaicMapSearchListElement/MosaicMapSearchListElement.css */
1982+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/ListElement/MosaicMapSearchListElement/MosaicMapSearchListElement.css */
19831983
.vkf-mosaic-map-result-list-element.selected li {
19841984
outline: 4px solid #00b19e;
19851985
outline-offset: -4px;
@@ -2031,12 +2031,12 @@
20312031
-webkit-transform: rotate(-45deg);
20322032
}
20332033

2034-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/map/layouts/HorizontalLayout/HorizontalLayout.css */
2034+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/map/layouts/HorizontalLayout/HorizontalLayout.css */
20352035
.ol-map-large:fullscreen .vkf-horizontal-layout .spatialsearch-container {
20362036
display: none;
20372037
}
20382038

2039-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/layouts/MosaicMapLayout.css */
2039+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/layouts/MosaicMapLayout.css */
20402040
.selected-maps-container {
20412041
position: absolute;
20422042
top: 15px;
@@ -2048,7 +2048,7 @@
20482048
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
20492049
}
20502050

2051-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/georeferencer/components/ControlButton/ControlButton.css */
2051+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/georeferencer/components/ControlButton/ControlButton.css */
20522052
button.vkf-control-button {
20532053
position: relative;
20542054
border: 1px solid rgba(255, 255, 255, 0.5);
@@ -2096,7 +2096,7 @@ button.vkf-control-button.save:hover {
20962096
border-color: #005c00;
20972097
}
20982098

2099-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/Modal/Modal.css */
2099+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/Modal/Modal.css */
21002100
.vkf-modal .modal-header {
21012101
position: relative;
21022102
background: #00b19e;
@@ -2136,15 +2136,15 @@ button.vkf-control-button.save:hover {
21362136
padding: 0;
21372137
}
21382138

2139-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/ToolbarControls/SaveMosaicMapButton/SaveMosaicMapButton.css */
2139+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/ToolbarControls/SaveMosaicMapButton/SaveMosaicMapButton.css */
21402140
.vkf-modal {
21412141
top: 40%;
21422142
}
21432143
.vkf-modal .vkf-modal-description-container {
21442144
padding: 16px;
21452145
}
21462146

2147-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/ToolbarControls/DeleteMosaicMapButton/DeleteMosaicMapButton.css */
2147+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/ToolbarControls/DeleteMosaicMapButton/DeleteMosaicMapButton.css */
21482148
.vkf-control-button.delete-mosaic-map-button {
21492149
background-color: #e60000;
21502150
}
@@ -2166,7 +2166,7 @@ button.vkf-control-button.save:hover {
21662166
padding: 16px;
21672167
}
21682168

2169-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/MosaicMapInputPanel/components/SaveIndicator/SaveIndicator.css */
2169+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/MosaicMapInputPanel/components/SaveIndicator/SaveIndicator.css */
21702170
.vkf-mosaic-map-save-indicator {
21712171
align-items: center;
21722172
display: flex;
@@ -2194,7 +2194,7 @@ button.vkf-control-button.save:hover {
21942194
margin-bottom: 0;
21952195
}
21962196

2197-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/components/MosaicMapInputPanel/MosaicMapInputPanel.css */
2197+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/components/MosaicMapInputPanel/MosaicMapInputPanel.css */
21982198
.vk-mosaic-map-input-panel-content {
21992199
display: flex;
22002200
flex-direction: column;
@@ -2258,7 +2258,7 @@ button.vkf-control-button.save:hover {
22582258
margin-bottom: 4px;
22592259
}
22602260

2261-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/components/Notifications/Notifications.css */
2261+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/components/Notifications/Notifications.css */
22622262
.vkf-notifications {
22632263
position: absolute;
22642264
bottom: 30px;
@@ -2273,7 +2273,7 @@ button.vkf-control-button.save:hover {
22732273
opacity: 0.99;
22742274
}
22752275

2276-
/* ../../../../../tmp/tmp-294500-pDJvZbSRfsjq/Build/src/apps/mosaic_map/AppMosaicMap.css */
2276+
/* ../../../../../../../tmp/tmp-44273-oEqoaI4Tg7Jj/Build/src/apps/mosaic_map/AppMosaicMap.css */
22772277
.vkf-app-mosaic-map-container {
22782278
inset: 85px 0 40px;
22792279
padding: 0;

0 commit comments

Comments
 (0)