Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve arcgis remote layer integration #1779

Merged
merged 3 commits into from
Jun 12, 2024
Merged

Improve arcgis remote layer integration #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
858a943
add support of arcgis layer from submodule and remove custom code
allyoucanmap May 21, 2024
f2a97c8
add legend to arcgis layers
allyoucanmap Jun 12, 2024
4b73a80
fix lint errors
allyoucanmap Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "geonode_mapstore_client/client/MapStore2"]
path = geonode_mapstore_client/client/MapStore2
url = https://github.com/geosolutions-it/MapStore2.git
branch = 2024.01.xx
branch = master
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Open in desktop
Submodule MapStore2 updated 265 files
117 changes: 56 additions & 61 deletions geonode_mapstore_client/client/js/apps/gn-catalogue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ getEndpoints()
pluginsConfigKey,
query,
configEpics,
mapType = 'openlayers',
onStoreInit,
targetId = 'ms-container',
settings
Expand All @@ -155,67 +154,63 @@ getEndpoints()

storeEpicsNamesToExclude(appEpics);

// register custom arcgis layer
import('@js/map/' + mapType + '/plugins/ArcGisMapServer')
.then(() => {
main({
targetId,
enableExtensions: true,
appComponent: withRoutes(routes)(ConnectedRouter),
loaderComponent: MainLoader,
initialState: {
defaultState: {
...securityState
}
},
themeCfg: null,
pluginsConfig: getPluginsConfigOverride(getPluginsConfiguration(localConfig.plugins, pluginsConfigKey)),
pluginsDef: {
plugins: {
...pluginsDefinition.plugins
},
requires: {
...requires,
...pluginsDefinition.requires
}
},
printEnabled: true,
rootReducerFunc: standardRootReducerFunc,
onStoreInit,
appReducers: {
...standardReducers,
gnresource,
resourceservice,
gnsettings,
security,
maptype,
print,
maplayout,
controls,
timeline,
dimension,
playback,
mapPopups,
catalog,
searchconfig,
widgets,
geostory,
gnsearch,
notifications,
context,
...pluginsDefinition.reducers
},
appEpics,
geoNodeConfiguration,
initialActions: [
// add some settings in the global state to make them accessible in the monitor state
// later we could use expression in localConfig
updateGeoNodeSettings.bind(null, settings),
loadPrintCapabilities.bind(null, getConfigProp('printUrl'))
]
main({
targetId,
enableExtensions: true,
appComponent: withRoutes(routes)(ConnectedRouter),
loaderComponent: MainLoader,
initialState: {
defaultState: {
...securityState
}
},
themeCfg: null,
pluginsConfig: getPluginsConfigOverride(getPluginsConfiguration(localConfig.plugins, pluginsConfigKey)),
pluginsDef: {
plugins: {
...pluginsDefinition.plugins
},
withExtensions(StandardApp));
});
requires: {
...requires,
...pluginsDefinition.requires
}
},
printEnabled: true,
rootReducerFunc: standardRootReducerFunc,
onStoreInit,
appReducers: {
...standardReducers,
gnresource,
resourceservice,
gnsettings,
security,
maptype,
print,
maplayout,
controls,
timeline,
dimension,
playback,
mapPopups,
catalog,
searchconfig,
widgets,
geostory,
gnsearch,
notifications,
context,
...pluginsDefinition.reducers
},
appEpics,
geoNodeConfiguration,
initialActions: [
// add some settings in the global state to make them accessible in the monitor state
// later we could use expression in localConfig
updateGeoNodeSettings.bind(null, settings),
loadPrintCapabilities.bind(null, getConfigProp('printUrl'))
]
},
withExtensions(StandardApp));
});

})
Expand Down
92 changes: 44 additions & 48 deletions geonode_mapstore_client/client/js/apps/gn-dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ document.addEventListener('DOMContentLoaded', function() {
geoNodeConfiguration,
pluginsConfigKey,
configEpics,
mapType = 'openlayers',
onStoreInit,
geoNodePageConfig,
targetId = 'ms-container',
Expand All @@ -84,54 +83,51 @@ document.addEventListener('DOMContentLoaded', function() {

storeEpicsNamesToExclude(appEpics);

import('@js/map/' + mapType + '/plugins/ArcGisMapServer')
.then(() => {
main({
targetId,
appComponent: withRoutes(routes)(ConnectedRouter),
pluginsConfig: getPluginsConfigOverride(getPluginsConfiguration(localConfig.plugins, pluginsConfigKey)),
loaderComponent: MainLoader,
pluginsDef: {
plugins: {
...pluginsDefinition.plugins
},
requires: {
...requires,
...pluginsDefinition.requires
}
main({
targetId,
appComponent: withRoutes(routes)(ConnectedRouter),
pluginsConfig: getPluginsConfigOverride(getPluginsConfiguration(localConfig.plugins, pluginsConfigKey)),
loaderComponent: MainLoader,
pluginsDef: {
plugins: {
...pluginsDefinition.plugins
},
requires: {
...requires,
...pluginsDefinition.requires
}
},
initialState: {
defaultState: {
maptype: {
mapType: 'openlayers'
},
initialState: {
defaultState: {
maptype: {
mapType: 'openlayers'
},
...securityState
}
},
themeCfg: null,
appReducers: {
dashboard,
gnresource,
gnsettings,
security,
maptype,
widgets
},
appEpics,
onStoreInit,
geoNodeConfiguration,
initialActions: [
// add some settings in the global state to make them accessible in the monitor state
// later we could use expression in localConfig
updateGeoNodeSettings.bind(null, settings),
...(geoNodePageConfig.resourceId !== undefined
? [ requestResourceConfig.bind(null, ResourceTypes.DASHBOARD, geoNodePageConfig.resourceId, {
readOnly: geoNodePageConfig.isEmbed
}) ]
: [])
]
});
});
...securityState
}
},
themeCfg: null,
appReducers: {
dashboard,
gnresource,
gnsettings,
security,
maptype,
widgets
},
appEpics,
onStoreInit,
geoNodeConfiguration,
initialActions: [
// add some settings in the global state to make them accessible in the monitor state
// later we could use expression in localConfig
updateGeoNodeSettings.bind(null, settings),
...(geoNodePageConfig.resourceId !== undefined
? [ requestResourceConfig.bind(null, ResourceTypes.DASHBOARD, geoNodePageConfig.resourceId, {
readOnly: geoNodePageConfig.isEmbed
}) ]
: [])
]
});
});

});
Expand Down
87 changes: 41 additions & 46 deletions geonode_mapstore_client/client/js/apps/gn-geostory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ document.addEventListener('DOMContentLoaded', function() {
pluginsConfigKey,
geoNodePageConfig,
configEpics,
mapType = 'openlayers',
onStoreInit,
targetId = 'ms-container',
settings
Expand All @@ -87,52 +86,48 @@ document.addEventListener('DOMContentLoaded', function() {

storeEpicsNamesToExclude(appEpics);

// register custom arcgis layer
import('@js/map/' + mapType + '/plugins/ArcGisMapServer')
.then(() => {
main({
targetId,
appComponent: withRoutes(routes)(ConnectedRouter),
pluginsConfig: getPluginsConfigOverride(getPluginsConfiguration(localConfig.plugins, pluginsConfigKey)),
loaderComponent: MainLoader,
pluginsDef: {
plugins: {
...pluginsDefinition.plugins
},
requires: {
...requires,
...pluginsDefinition.requires
}
main({
targetId,
appComponent: withRoutes(routes)(ConnectedRouter),
pluginsConfig: getPluginsConfigOverride(getPluginsConfiguration(localConfig.plugins, pluginsConfigKey)),
loaderComponent: MainLoader,
pluginsDef: {
plugins: {
...pluginsDefinition.plugins
},
requires: {
...requires,
...pluginsDefinition.requires
}
},
initialState: {
defaultState: {
maptype: {
mapType: 'openlayers'
},
initialState: {
defaultState: {
maptype: {
mapType: 'openlayers'
},
...securityState
}
},
themeCfg: null,
appReducers: {
geostory,
gnresource,
gnsettings,
security,
maptype
},
appEpics,
onStoreInit,
geoNodeConfiguration,
initialActions: [
// add some settings in the global state to make them accessible in the monitor state
// later we could use expression in localConfig
updateGeoNodeSettings.bind(null, settings),
...(geoNodePageConfig.resourceId !== undefined
? [ requestResourceConfig.bind(null, ResourceTypes.GEOSTORY, geoNodePageConfig.resourceId) ]
: [])
]
});
});
...securityState
}
},
themeCfg: null,
appReducers: {
geostory,
gnresource,
gnsettings,
security,
maptype
},
appEpics,
onStoreInit,
geoNodeConfiguration,
initialActions: [
// add some settings in the global state to make them accessible in the monitor state
// later we could use expression in localConfig
updateGeoNodeSettings.bind(null, settings),
...(geoNodePageConfig.resourceId !== undefined
? [ requestResourceConfig.bind(null, ResourceTypes.GEOSTORY, geoNodePageConfig.resourceId) ]
: [])
]
});
});

})
Expand Down
Loading
Loading