Investigate error with ArcGIS remote layer (#849)

GeoNode · Feb 25, 2022 · 06e3328 · 06e3328
1 parent bfc14d7
commit 06e3328
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx b/geonode_mapstore_client/client/js/components/DetailsPanel/DetailsPanel.jsx
@@ -17,7 +17,7 @@ import Spinner from '@js/components/Spinner';
 import Message from '@mapstore/framework/components/I18N/Message';
 import tooltip from '@mapstore/framework/components/misc/enhancers/tooltip';
 import moment from 'moment';
-import { getResourceTypesInfo, getMetadataDetailUrl, ResourceTypes } from '@js/utils/ResourceUtils';
+import { getResourceTypesInfo, getMetadataDetailUrl, ResourceTypes, GXP_PTYPES } from '@js/utils/ResourceUtils';
 import debounce from 'lodash/debounce';
 import CopyToClipboardCmp from 'react-copy-to-clipboard';
 import { TextEditable, ThumbnailEditable } from '@js/components/ContentsEditable/';
@@ -489,7 +489,7 @@ function DetailsPanel({
                                 thumbnailUpdating={resourceThumbnailUpdating}
                             />
                             {
-                                (resource.resource_type === ResourceTypes.MAP || resource.resource_type === ResourceTypes.DATASET) &&
+                                ((resource.resource_type === ResourceTypes.MAP || resource.resource_type === ResourceTypes.DATASET) && (resource.ptype !== GXP_PTYPES.REST_IMG || resource.ptype !== GXP_PTYPES.REST_MAP)) &&
                                 ( <><MapThumbnailButtonToolTip
                                     variant="default"
                                     onClick={() => onClose(!enableMapViewer)}
@@ -502,7 +502,7 @@ function DetailsPanel({
                                 </>)
                             }
                             {isThumbnailChanged && <Button style={{
-                                left: (resource.resource_type === ResourceTypes.MAP || resource.resource_type === ResourceTypes.DATASET) ? '85px' : '50px'
+                                left: ((resource.resource_type === ResourceTypes.MAP || resource.resource_type === ResourceTypes.DATASET) && (resource.ptype !== GXP_PTYPES.REST_IMG || resource.ptype !== GXP_PTYPES.REST_MAP)) ? '85px' : '50px'
                             }} variant="primary" className="map-thumbnail apply-button" onClick={handleResourceThumbnailUpdate}><Message msgId={"gnhome.apply"} /></Button>}
                             </>
                                 : <MapThumbnailView

diff --git a/geonode_mapstore_client/client/js/plugins/FitBounds.jsx b/geonode_mapstore_client/client/js/plugins/FitBounds.jsx
@@ -22,9 +22,9 @@ function FitBoundsPlugin({ mapProjection, ...props }) {
             const [eMinx, eMiny, eMaxx, eMaxy] = MAX_EXTENT_WEB_MERCATOR;
             return [
                 minx < eMinx ? eMinx : minx,
-                miny < eMiny ? eMiny : miny,
+                (miny < eMiny || miny > eMaxy) ? eMiny : miny,
                 maxx > eMaxx ? eMaxx : maxx,
-                maxy > eMaxy ? eMaxy : maxy
+                (maxy > eMaxy || maxy < eMiny) ? eMaxy : maxy
             ];
         }
         return geometry;

diff --git a/geonode_mapstore_client/client/js/utils/ResourceUtils.js b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
@@ -39,7 +39,7 @@ function getExtentFromResource({ ll_bbox_polygon: llBboxPolygon }) {
     return bbox;
 }
 
-const GXP_PTYPES = {
+export const GXP_PTYPES = {
     'AUTO': 'gxp_wmscsource',
     'OWS': 'gxp_wmscsource',
     'WMS': 'gxp_wmscsource',
@@ -89,7 +89,7 @@ export const resourceToLayerConfig = (resource) => {
     switch (ptype) {
     case GXP_PTYPES.REST_MAP:
     case GXP_PTYPES.REST_IMG: {
-        const { url: arcgisUrl } = links.find(({ mime }) => mime === 'text/html') || {};
+        const { url: arcgisUrl } = links.find(({ mime, link_type: linkType }) => (mime === 'text/html' && linkType === 'image')) || {};
         return {
             perms,
             id: uuid(),

diff --git a/geonode_mapstore_client/client/themes/geonode/less/_details-panel.less b/geonode_mapstore_client/client/themes/geonode/less/_details-panel.less
@@ -179,6 +179,7 @@
     font-size: 0.9em;
     display: flex;
     flex: 1 1 auto;
+    flex-wrap: wrap;
     .fa-edit, .fa-check-circle{
         font-size: 0.9rem;
         margin: 0.2em 0 0 0;