Skip to content

Commit 081dca8

Browse files
Merge branch 'master' of https://github.com/GeoNode/geonode-mapstore-client into fix/view-permission-2291
2 parents 00bab7f + 11bcd4d commit 081dca8

File tree

526 files changed

+54
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

526 files changed

+54
-42
lines changed

geonode_mapstore_client/client/js/epics/gnresource.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ const resourceTypes = {
184184
...mapConfig,
185185
map: {
186186
...mapConfig.map,
187+
zoom: 20, // we are applying high zoom level to mitigate the initial tile blurring due to the zoom to event
187188
visualizationMode: ['3dtiles'].includes(subtype) ? VisualizationModes._3D : VisualizationModes._2D,
188189
layers: [
189190
...mapConfig.map.layers,

geonode_mapstore_client/client/js/plugins/CreateDataset/containers/CreateDataset.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,16 +374,16 @@ const CreateDataset = ({
374374
</table>
375375
</FlexBox>
376376

377-
<div>
377+
<FlexBox centerChildrenVertically gap="sm">
378378
<Button
379379
className="gn-attribute-button"
380380
variant="success"
381381
disabled={!!allErrors.length || loading}
382382
onClick={handleCreate}>
383383
<Message msgId="gnviewer.createNewDataset" />
384-
{loading ? <Spinner /> : null}
385384
</Button>
386-
</div>
385+
{loading ? <Spinner /> : null}
386+
</FlexBox>
387387
</FlexBox>
388388
</FlexBox>
389389
);

geonode_mapstore_client/client/js/plugins/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,10 @@ export const plugins = {
478478
UploadResourcePlugin: toModulePlugin(
479479
'UploadResource',
480480
() => import(/* webpackChunkName: 'plugins/upload-operation' */ '@js/plugins/UploadResource')
481+
),
482+
MapEditorPlugin: toModulePlugin(
483+
'MapEditor',
484+
() => import(/* webpackChunkName: 'plugins/map-editor' */ '@mapstore/framework/plugins/MapEditor')
481485
)
482486
};
483487

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
geonode-mapstore-client-vmaster-9fb24f5616a132faccb55f94c869c7cf26d97e45
1+
geonode-mapstore-client-vmaster-734812458d70adc4d05a269a4c2ced442743a60b

geonode_mapstore_client/static/mapstore/configs/localConfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2831,6 +2831,12 @@
28312831
}
28322832
]
28332833
}
2834+
},
2835+
{
2836+
"name": "MapEditor",
2837+
"cfg": {
2838+
"titleMsgId": "widgets.mapWidget.mapEditorTitle"
2839+
}
28342840
}
28352841
],
28362842
"map_viewer_mobile": [

geonode_mapstore_client/static/mapstore/dist/js/1030.af428db2195df6a3.chunk.js renamed to geonode_mapstore_client/static/mapstore/dist/js/1030.fff8dbb084f7b389.chunk.js

File renamed without changes.

geonode_mapstore_client/static/mapstore/dist/js/104.af428db2195df6a3.chunk.js renamed to geonode_mapstore_client/static/mapstore/dist/js/104.fff8dbb084f7b389.chunk.js

File renamed without changes.

geonode_mapstore_client/static/mapstore/dist/js/1092.af428db2195df6a3.chunk.js renamed to geonode_mapstore_client/static/mapstore/dist/js/1092.fff8dbb084f7b389.chunk.js

File renamed without changes.

geonode_mapstore_client/static/mapstore/dist/js/1111.af428db2195df6a3.chunk.js renamed to geonode_mapstore_client/static/mapstore/dist/js/1111.fff8dbb084f7b389.chunk.js

File renamed without changes.

geonode_mapstore_client/static/mapstore/dist/js/1141.af428db2195df6a3.chunk.js renamed to geonode_mapstore_client/static/mapstore/dist/js/1141.fff8dbb084f7b389.chunk.js

File renamed without changes.

0 commit comments

Comments
 (0)