Map / Add ESRI ArcGIS Rest support

schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml

@@ -2267,9 +2267,7 @@
     <label>Protocol</label>
     <description>Connection protocol to be used</description>
     <helper sort="true">
-      <option value="ESRI:AIMS--http--configuration">ArcIMS Map Service Configuration File (*.AXL)</option>
-      <option value="ESRI:AIMS--http-get-feature">ArcIMS Internet Feature Map Service</option>
-      <option value="ESRI:AIMS--http-get-image">ArcIMS Internet Image Map Service</option>
+      <option value="ESRI:REST">ArcGIS REST Services</option>
       <option value="GLG:KML-2.0-http-get-map">Google Earth KML service (ver 2.0)</option>
       <option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
       <option value="OGC:KML">OGC-KML Keyhole Markup Language</option>

schemas/iso19139/src/main/plugin/iso19139/loc/fre/labels.xml

@@ -4350,9 +4350,7 @@ la non-évaluation</b>, dans le cadre de métadonnées INSPIRE
     <help>Protocole de connexion utilisé, par exemple FTP.</help>
     <condition/>
     <helper sort="true">
-      <option value="ESRI:AIMS--http--configuration">Fichier configuration ArcIMS Map Service (*.AXL)</option>
-      <option value="ESRI:AIMS--http-get-feature">ArcIMS Internet Feature Map Service</option>
-      <option value="ESRI:AIMS--http-get-image">ArcIMS Internet Image Map Service</option>
+      <option value="ESRI:REST">ArcGIS REST Services</option>
       <option value="GLG:KML-2.0-http-get-map">Google Earth KML service (ver 2.0)</option>
       <option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
       <option value="OGC:KML">OGC-KML Keyhole Markup Language</option>

web-ui/src/main/resources/catalog/components/common/map/mapService.js

@@ -1449,6 +1449,67 @@
             return defer.promise;
           },
 
+          addEsriRestFromScratch: function(map, url, name, createOnly, md) {
+            var defer = $q.defer();
+            var $this = this;
+
+            var serviceUrl = url.replace(/(.*\/MapServer).*/, '$1')
+            var layer = url.replace(/.*\/([^\/]*)\/MapServer\/?(.*)/, '$2');
+            name = url.replace(/.*\/([^\/]*)\/MapServer\/?(.*)/, '$1 $2');
+
+            if (!isLayerInMap(map, name, url)) {
+              gnWmsQueue.add(url, name);
+              var params = {};
+              if (layer != '') {
+                params.LAYERS = layer;
+              }
+              var layerOptions = {
+                url: url,
+                opacity: 1,
+                visible: true,
+                source: new ol.source.ImageArcGISRest({
+                  // ratio: 1.01,
+                  params: params,
+                  url: serviceUrl
+                })
+              };
+
+              olL = new ol.layer.Image(layerOptions);
+
+              olL.set('name', name);
+              olL.set('label', name);
+              olL.displayInLayerManager = true;
+              // FIXME: Layer tree visibility toggle does not work
+              olL.visible = layerOptions.visible;
+
+              var finishCreation = function() {
+                $q.resolve(olL).
+                    then(gnViewerSettings.getPreAddLayerPromise).
+                    finally(
+                    function() {
+                      if (!createOnly) {
+                        map.addLayer(olL);
+                      }
+                      gnWmsQueue.removeFromQueue(url, name);
+                      defer.resolve(olL);
+                    });
+              };
+
+              var feedMdPromise = md ?
+                $q.resolve(md).then(function(md) {
+                  olL.set('md', md);
+                }) : $this.feedLayerMd(olL);
+
+              feedMdPromise.then(finishCreation);
+            } else {
+              var olL = getTheLayerFromMap(map, name, url);
+                if(olL && md) {
+                  olL.set('md', md);
+                }
+            }
+            return defer.promise;
+          },
+
           /**
            * Call a WMS getCapabilities and create ol3 layers for all items.
            * Add them to the map if `createOnly` is false;

web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js

@@ -80,7 +80,7 @@
           };
 
           var addWMSToMap = gnViewerSettings.resultviewFns.addMdLayerToMap;
-
+          var addEsriRestToMap = gnViewerSettings.resultviewFns.addMdLayerToMap;
 
           var addWFSToMap = function(link, md) {
             var url = $filter('gnLocalized')(link.url) || link.url;
@@ -209,6 +209,11 @@
               label: 'addToMap',
               action: addWFSToMap
             },
+            'ESRI:REST' : {
+              iconClass: 'fa-globe',
+              label: 'addToMap',
+              action: addEsriRestToMap
+            },
             'ATOM' : {
               iconClass: 'fa-globe',
               label: 'download'
@@ -350,6 +355,8 @@
                 } else {
                   return 'WMSSERVICE';
                 }
+              } else if (protocolOrType.match(/esri/i)) {
+                return 'ESRI:REST';
               } else if (protocolOrType.match(/wmts/i)) {
                 return 'WMTS';
               } else if (protocolOrType.match(/tms/i)) {

web-ui/src/main/resources/catalog/components/metadataactions/partials/related.html

@@ -114,6 +114,12 @@ <h2>{{::title}}</h2>
                   sosLinkDetails</span>
           </div>
 
+          <div data-ng-switch-when="ESRI:REST">
+            <span data-translate=""
+                  data-translate-values="{url:'{{r.url | gnLocalized: lang}}', layer:'{{r.title | gnLocalized: lang}}'}">
+                  esriRestLinkDetails</span>
+          </div>
+
           <div data-ng-switch-when="WCS">
             <p class="text-muted">
             <span data-translate=""

web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js

@@ -72,7 +72,7 @@
         angular.extend(md, {
           links: md.getLinksByType('LINK'),
           downloads: md.getLinksByType('DOWNLOAD'),
-          layers: md.getLinksByType('OGC', 'kml'),
+          layers: md.getLinksByType('OGC', 'kml', 'ESRI:REST'),
           contacts: md.getContacts(),
           overviews: md.getThumbnails() ? md.getThumbnails().list : undefined
         });

web-ui/src/main/resources/catalog/components/viewer/ViewerDirective.js

@@ -170,20 +170,20 @@
               };
 
               function addLayerFromLocation(config) {
-                if (angular.isUndefined(config.name)) {
+                if (angular.isUndefined(config.name) && config.type !== 'esrirest') {
                   // This is a service without a layer name
                   // Display the add layer from service panel
 
                   gnViewerService.openTool('addLayers', 'services');
                   scope.activeTools.addLayers = true;
                   scope.addLayerTabs.services = true;
                   scope.addLayerUrl[config.type || 'wms'] = config.url;
-                } else if (config.name) {
+                } else if (config.name || config.type === 'esrirest') {
                   gnViewerService.openTool('layers');
 
                   var loadLayerPromise = gnMap[
-                      config.type === 'wmts' ?
-                      'addWmtsFromScratch' : 'addWmsFromScratch'
+                      config.type === 'wmts' ? 'addWmtsFromScratch' :
+                        (config.type === 'esrirest' ? 'addEsriRestFromScratch' : 'addWmsFromScratch')
                       ](
                       scope.map, config.url,
                       config.name, undefined, config.md);

web-ui/src/main/resources/catalog/js/CatController.js

@@ -160,7 +160,7 @@ goog.require('gn_alert');
           'linkTypes': {
             'links': ['LINK', 'kml'],
             'downloads': ['DOWNLOAD'],
-            'layers': ['OGC'],
+            'layers': ['OGC', 'ESRI:REST'],
             'maps': ['ows']
           },
           'isFilterTagsDisplayedInSearch': false,

web-ui/src/main/resources/catalog/lib/ngeo/ngeo-debug.js

@@ -77765,7 +77765,7 @@ ol.source.ImageArcGISRest.prototype.getRequestUrl_ = function(extent, size, pixe
   params['BBOX'] = extent.join(',');
   params['BBOXSR'] = srid;
   params['IMAGESR'] = srid;
-  params['DPI'] = 90 * pixelRatio;
+  params['DPI'] = Math.round(90 * pixelRatio);
 
   var url = this.url_;
 

web-ui/src/main/resources/catalog/locales/en-search.json

@@ -53,6 +53,7 @@
   "noRecordFoundWithResourceRegistered": "No record found with one or more WMS layers registered.",
   "noRecordFoundWithResourceRegisteredmap": "No record found with one or more maps registered.",
   "tmsLinkDetails":"This dataset is published in the view service (TMS) available at <a href='{{url}}' target='_blank'>{{url}}</a> with identifier <strong>{{layer}}</strong>.",
+  "esriRestLinkDetails": "ESRI REST service <a href='{{url}}' target='_blank'>{{url}}</a>.",
   "wmsLinkDetails": "This dataset is published in the view service (WMS) available at <a href='{{url}}' target='_blank'>{{url}}</a> with layer name <strong>{{layer}}</strong>.",
   "wmsServiceLinkDetails": "This dataset is published in the view service (WMS) available at <a href='{{url}}' target='_blank'>{{url}}</a>.",
   "wmtsLinkDetails": "This dataset is published in the view service (WMTS) available at <a href='{{url}}' target='_blank'>{{url}}</a> with identifier <strong>{{layer}}</strong>.",

web-ui/src/main/resources/catalog/views/default/config.js

@@ -110,7 +110,8 @@
               'OGC:WMTS',
               'OGC:WMS-1.1.1-http-get-map',
               'OGC:WMS-1.3.0-http-get-map',
-              'OGC:WFS'
+              'OGC:WFS',
+              'ESRI:REST'
               ],
             services: [
               'OGC:WMS-1.3.0-http-get-capabilities',

web-ui/src/main/resources/catalog/views/default/module.js

@@ -273,7 +273,9 @@
         addMdLayerToMap: function (link, md) {
           var config = {
             uuid: md ? md.getUuid() : null,
-            type: link.protocol.indexOf('WMTS') > -1 ? 'wmts' : 'wms',
+            type:
+              link.protocol.indexOf('WMTS') > -1 ? 'wmts' :
+              (link.protocol == 'ESRI:REST' ? 'esrirest' : 'wms'),
             url: $filter('gnLocalized')(link.url) || link.url
           };